From 505c56bfa18a041f8f73e50568de62f240e063db Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 19 Mar 2013 11:18:15 -0700 Subject: [PATCH] rename pipeline invocation to pipeline instance. refs #1416 --- ...js.coffee => pipeline_instances.js.coffee} | 0 ...s.css.scss => pipeline_instances.css.scss} | 2 +- ...er.rb => pipeline_instances_controller.rb} | 2 +- .../pipeline_instances_controller.rb | 2 ++ .../pipeline_invocations_controller.rb | 2 -- app/helpers/pipeline_instances_helper.rb | 2 ++ app/helpers/pipeline_invocations_helper.rb | 2 -- ...ine_invocation.rb => pipeline_instance.rb} | 2 +- .../index.html.erb | 2 +- config/routes.rb | 4 ++-- ...ipeline_invocation_to_pipeline_instance.rb | 21 +++++++++++++++++++ db/schema.rb | 10 ++++----- ...invocations.yml => pipeline_instances.yml} | 0 ... => pipeline_instances_controller_test.rb} | 2 +- .../helpers/pipeline_instances_helper_test.rb | 4 ++++ .../pipeline_invocations_helper_test.rb | 4 ---- ...tion_test.rb => pipeline_instance_test.rb} | 2 +- 17 files changed, 42 insertions(+), 21 deletions(-) rename app/assets/javascripts/{pipeline_invocations.js.coffee => pipeline_instances.js.coffee} (100%) rename app/assets/stylesheets/{pipeline_invocations.css.scss => pipeline_instances.css.scss} (60%) rename app/controllers/orvos/v1/{pipeline_invocations_controller.rb => pipeline_instances_controller.rb} (56%) create mode 100644 app/controllers/pipeline_instances_controller.rb delete mode 100644 app/controllers/pipeline_invocations_controller.rb create mode 100644 app/helpers/pipeline_instances_helper.rb delete mode 100644 app/helpers/pipeline_invocations_helper.rb rename app/models/{pipeline_invocation.rb => pipeline_instance.rb} (98%) rename app/views/{pipeline_invocations => pipeline_instances}/index.html.erb (88%) create mode 100644 db/migrate/20130319180730_rename_pipeline_invocation_to_pipeline_instance.rb rename test/fixtures/{pipeline_invocations.yml => pipeline_instances.yml} (100%) rename test/functional/{pipeline_invocations_controller_test.rb => pipeline_instances_controller_test.rb} (67%) create mode 100644 test/unit/helpers/pipeline_instances_helper_test.rb delete mode 100644 test/unit/helpers/pipeline_invocations_helper_test.rb rename test/unit/{pipeline_invocation_test.rb => pipeline_instance_test.rb} (58%) diff --git a/app/assets/javascripts/pipeline_invocations.js.coffee b/app/assets/javascripts/pipeline_instances.js.coffee similarity index 100% rename from app/assets/javascripts/pipeline_invocations.js.coffee rename to app/assets/javascripts/pipeline_instances.js.coffee diff --git a/app/assets/stylesheets/pipeline_invocations.css.scss b/app/assets/stylesheets/pipeline_instances.css.scss similarity index 60% rename from app/assets/stylesheets/pipeline_invocations.css.scss rename to app/assets/stylesheets/pipeline_instances.css.scss index cc3b7af0d8..aa58dccfbf 100644 --- a/app/assets/stylesheets/pipeline_invocations.css.scss +++ b/app/assets/stylesheets/pipeline_instances.css.scss @@ -1,3 +1,3 @@ -// Place all the styles related to the PipelineInvocations controller here. +// Place all the styles related to the PipelineInstances controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/orvos/v1/pipeline_invocations_controller.rb b/app/controllers/orvos/v1/pipeline_instances_controller.rb similarity index 56% rename from app/controllers/orvos/v1/pipeline_invocations_controller.rb rename to app/controllers/orvos/v1/pipeline_instances_controller.rb index 7e4fe3c7a4..af68503ee1 100644 --- a/app/controllers/orvos/v1/pipeline_invocations_controller.rb +++ b/app/controllers/orvos/v1/pipeline_instances_controller.rb @@ -1,4 +1,4 @@ -class Orvos::V1::PipelineInvocationsController < ApplicationController +class Orvos::V1::PipelineInstancesController < ApplicationController accept_attribute_as_json :components, Hash accept_attribute_as_json :properties, Hash end diff --git a/app/controllers/pipeline_instances_controller.rb b/app/controllers/pipeline_instances_controller.rb new file mode 100644 index 0000000000..afb9949f4b --- /dev/null +++ b/app/controllers/pipeline_instances_controller.rb @@ -0,0 +1,2 @@ +class PipelineInstancesController < ApplicationController +end diff --git a/app/controllers/pipeline_invocations_controller.rb b/app/controllers/pipeline_invocations_controller.rb deleted file mode 100644 index 4982ed7d5e..0000000000 --- a/app/controllers/pipeline_invocations_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class PipelineInvocationsController < ApplicationController -end diff --git a/app/helpers/pipeline_instances_helper.rb b/app/helpers/pipeline_instances_helper.rb new file mode 100644 index 0000000000..8ad94c4b3b --- /dev/null +++ b/app/helpers/pipeline_instances_helper.rb @@ -0,0 +1,2 @@ +module PipelineInstancesHelper +end diff --git a/app/helpers/pipeline_invocations_helper.rb b/app/helpers/pipeline_invocations_helper.rb deleted file mode 100644 index 2d8ead42ec..0000000000 --- a/app/helpers/pipeline_invocations_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module PipelineInvocationsHelper -end diff --git a/app/models/pipeline_invocation.rb b/app/models/pipeline_instance.rb similarity index 98% rename from app/models/pipeline_invocation.rb rename to app/models/pipeline_instance.rb index 32e8a4f57a..3f79d5b713 100644 --- a/app/models/pipeline_invocation.rb +++ b/app/models/pipeline_instance.rb @@ -1,4 +1,4 @@ -class PipelineInvocation < OrvosModel +class PipelineInstance < OrvosModel include AssignUuid include KindAndEtag include CommonApiTemplate diff --git a/app/views/pipeline_invocations/index.html.erb b/app/views/pipeline_instances/index.html.erb similarity index 88% rename from app/views/pipeline_invocations/index.html.erb rename to app/views/pipeline_instances/index.html.erb index 125704e1b9..7354c576c5 100644 --- a/app/views/pipeline_invocations/index.html.erb +++ b/app/views/pipeline_instances/index.html.erb @@ -21,7 +21,7 @@ <% status = o.success ? 'success' : (o.success == false ? 'failure' : 'pending') %> - + <%= status %> diff --git a/config/routes.rb b/config/routes.rb index c55c518036..ec0e375736 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,7 +10,7 @@ Server::Application.routes.draw do resources :links resources :nodes resources :pipelines - resources :pipeline_invocations + resources :pipeline_instances # The priority is based upon order of creation: # first created -> highest priority. @@ -80,7 +80,7 @@ Server::Application.routes.draw do resources :links resources :nodes resources :pipelines - resources :pipeline_invocations + resources :pipeline_instances resources :specimens resources :groups resources :logs diff --git a/db/migrate/20130319180730_rename_pipeline_invocation_to_pipeline_instance.rb b/db/migrate/20130319180730_rename_pipeline_invocation_to_pipeline_instance.rb new file mode 100644 index 0000000000..dcd033a0e3 --- /dev/null +++ b/db/migrate/20130319180730_rename_pipeline_invocation_to_pipeline_instance.rb @@ -0,0 +1,21 @@ +class RenamePipelineInvocationToPipelineInstance < ActiveRecord::Migration + def up + rename_table :pipeline_invocations, :pipeline_instances + rename_index :pipeline_instances, :index_pipeline_invocations_on_created_at, :index_pipeline_instances_on_created_at + rename_index :pipeline_instances, :index_pipeline_invocations_on_modified_at, :index_pipeline_instances_on_modified_at + rename_index :pipeline_instances, :index_pipeline_invocations_on_uuid, :index_pipeline_instances_on_uuid + Link.update_all({head_kind:'orvos#pipeline_invocation'}, ['head_kind=?','orvos#pipeline_instance']) + Link.update_all({tail_kind:'orvos#pipeline_invocation'}, ['tail_kind=?','orvos#pipeline_instance']) + Log.update_all({object_kind:'orvos#pipeline_invocation'}, ['object_kind=?','orvos#pipeline_instance']) + end + + def down + Link.update_all({head_kind:'orvos#pipeline_instance'}, ['head_kind=?','orvos#pipeline_invocation']) + Link.update_all({tail_kind:'orvos#pipeline_instance'}, ['tail_kind=?','orvos#pipeline_invocation']) + Log.update_all({object_kind:'orvos#pipeline_instance'}, ['object_kind=?','orvos#pipeline_invocation']) + rename_index :pipeline_instances, :index_pipeline_instances_on_created_at, :index_pipeline_invocations_on_created_at + rename_index :pipeline_instances, :index_pipeline_instances_on_modified_at, :index_pipeline_invocations_on_modified_at + rename_index :pipeline_instances, :index_pipeline_instances_on_uuid, :index_pipeline_invocations_on_uuid + rename_table :pipeline_instances, :pipeline_invocations + end +end diff --git a/db/schema.rb b/db/schema.rb index a5ee9a8aea..8704b60880 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20130319165853) do +ActiveRecord::Schema.define(:version => 20130319180730) do create_table "api_client_authorizations", :force => true do |t| t.string "api_token", :null => false @@ -216,7 +216,7 @@ ActiveRecord::Schema.define(:version => 20130319165853) do add_index "nodes", ["slot_number"], :name => "index_nodes_on_slot_number", :unique => true add_index "nodes", ["uuid"], :name => "index_nodes_on_uuid", :unique => true - create_table "pipeline_invocations", :force => true do |t| + create_table "pipeline_instances", :force => true do |t| t.string "uuid" t.string "owner" t.datetime "created_at" @@ -232,9 +232,9 @@ ActiveRecord::Schema.define(:version => 20130319165853) do t.text "properties" end - add_index "pipeline_invocations", ["created_at"], :name => "index_pipeline_invocations_on_created_at" - add_index "pipeline_invocations", ["modified_at"], :name => "index_pipeline_invocations_on_modified_at" - add_index "pipeline_invocations", ["uuid"], :name => "index_pipeline_invocations_on_uuid", :unique => true + add_index "pipeline_instances", ["created_at"], :name => "index_pipeline_instances_on_created_at" + add_index "pipeline_instances", ["modified_at"], :name => "index_pipeline_instances_on_modified_at" + add_index "pipeline_instances", ["uuid"], :name => "index_pipeline_instances_on_uuid", :unique => true create_table "pipelines", :force => true do |t| t.string "uuid" diff --git a/test/fixtures/pipeline_invocations.yml b/test/fixtures/pipeline_instances.yml similarity index 100% rename from test/fixtures/pipeline_invocations.yml rename to test/fixtures/pipeline_instances.yml diff --git a/test/functional/pipeline_invocations_controller_test.rb b/test/functional/pipeline_instances_controller_test.rb similarity index 67% rename from test/functional/pipeline_invocations_controller_test.rb rename to test/functional/pipeline_instances_controller_test.rb index 10dfae1081..b225f03813 100644 --- a/test/functional/pipeline_invocations_controller_test.rb +++ b/test/functional/pipeline_instances_controller_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class PipelineInvocationsControllerTest < ActionController::TestCase +class PipelineInstancesControllerTest < ActionController::TestCase test "should get index" do get :index diff --git a/test/unit/helpers/pipeline_instances_helper_test.rb b/test/unit/helpers/pipeline_instances_helper_test.rb new file mode 100644 index 0000000000..45749cba62 --- /dev/null +++ b/test/unit/helpers/pipeline_instances_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class PipelineInstancesHelperTest < ActionView::TestCase +end diff --git a/test/unit/helpers/pipeline_invocations_helper_test.rb b/test/unit/helpers/pipeline_invocations_helper_test.rb deleted file mode 100644 index bf0fca95ca..0000000000 --- a/test/unit/helpers/pipeline_invocations_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class PipelineInvocationsHelperTest < ActionView::TestCase -end diff --git a/test/unit/pipeline_invocation_test.rb b/test/unit/pipeline_instance_test.rb similarity index 58% rename from test/unit/pipeline_invocation_test.rb rename to test/unit/pipeline_instance_test.rb index df4bed2095..9b4c7c3787 100644 --- a/test/unit/pipeline_invocation_test.rb +++ b/test/unit/pipeline_instance_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class PipelineInvocationTest < ActiveSupport::TestCase +class PipelineInstanceTest < ActiveSupport::TestCase # test "the truth" do # assert true # end -- 2.30.2