rails_workflow 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a4a91bde072f32b2d60750cd516e78436d0f40c
-  data.tar.gz: ad83c4e78cdb420eab39a914602b10cddbdf1c6f
+  metadata.gz: 30d3cf67a04d1c32bc4de672d12602975eea40d9
+  data.tar.gz: 23739dee3e634f7c9fa5bbc07f91c3fa4c48196e
 SHA512:
-  metadata.gz: 263eda34d917a4f69ffa40dd16d6570bdad760c6512f256bd915b167622d7ce14d1820ff3b321ff1407bfd70d76e1aaf916d68551ed79a14e2881bafb6d5aa08
-  data.tar.gz: d9e44b26185ee60e66b48b01dbeda448be9ca018ec7db78dd7d2d7fda4e846697eac12466f02e263503c97617b846b1153c3a13dc8a7a3f064c1caefec5f6c25
+  metadata.gz: 74a02a60d5da5b12b88e64721defdd1b2073204e0dbcdd5ec07ab8ac487bb663962c1fde9d96cde0c0c806e3b718cb79f5419b88803047e093d97f28d67e379f
+  data.tar.gz: 4fd7cb5faa4609798daa31f3ca9e39c0680137758a61aef95e6e4cf874a97576cc50bf2789a3a2d1bb055ce96d340380c32443faba41e6abcefb22d8a56957a3

data/app/concerns/rails_workflow/operation_templates/dependencies.rb

@@ -18,6 +18,8 @@ module RailsWorkflow
       included do
         scope :independent_only, -> { where(dependencies: nil) }
 
+        serialize :dependencies, JSON
+
         def resolve_dependency operation
           true
         end

data/app/concerns/rails_workflow/operations/dependencies.rb

@@ -17,6 +17,8 @@ module RailsWorkflow
 
       included do
 
+        serialize :dependencies, JSON
+
         # def dependencies=(dependencies)
         #   write_attribute(:dependencies, dependencies.to_json.to_s)
         # end

data/app/controllers/rails_workflow/operation_templates_controller.rb

@@ -22,7 +22,7 @@ module RailsWorkflow
 
 
     def create
-      @operation_template = OperationTemplate.create(permitted_params)
+      @operation_template = @process_template.operations.create(permitted_params)
       redirect_to process_template_operation_templates_url
     end
 

data/app/models/rails_workflow/context.rb

@@ -3,6 +3,8 @@ module RailsWorkflow
     belongs_to :parent, polymorphic: true
     attr_accessor :data
 
+    serialize :body, JSON
+
     before_save :serialize_data
     after_find :init_data
 

data/db/migrate/{20150625034602_create_workflow_processes.rb → 20150629171932_create_workflow_processes.rb}

@@ -45,7 +45,7 @@ class CreateWorkflowProcesses < ActiveRecord::Migration
       :rails_workflow_contexts => [
         [:integer,  :parent_id],
         [:string,   :parent_type],
-        [:json,     :body],
+        [:text,     :body],
         [:datetime, :created_at],
         [:datetime, :updated_at],
       ],
@@ -66,7 +66,7 @@ class CreateWorkflowProcesses < ActiveRecord::Migration
           [:uuid,     :uuid],
           [:string,   :tag],
           [:text,     :source],
-          [:json,     :dependencies],
+          [:text,     :dependencies],
           [:string,   :operation_class],
           [:integer,  :process_template_id],
           [:datetime, :created_at],
@@ -94,7 +94,7 @@ class CreateWorkflowProcesses < ActiveRecord::Migration
           [:datetime, :updated_at],
           [:integer,  :process_id],
           [:integer,  :template_id],
-          [:json,     :dependencies],
+          [:text,     :dependencies],
           [:integer,  :child_process_id],
           [:integer,  :assignment_id],
           [:string,   :assignment_type],
@@ -147,8 +147,9 @@ class CreateWorkflowProcesses < ActiveRecord::Migration
         [RailsWorkflow::OperationTemplate, :dependencies],
         [RailsWorkflow::Context, :body]
     ].map do |check|
-      if check[0].columns_hash[check[1].to_s].sql_type != "json"
-        change_column check[0].table_name, check[1], "JSON USING #{check[1]}::JSON"
+      if check[0].columns_hash[check[1].to_s].sql_type == "json"
+        # change_column check[0].table_name, check[1], "JSON USING #{check[1]}::JSON"
+        change_column check[0].table_name, check[1], :text
       end
     end
   end

data/lib/generators/rails_workflow/install/templates/create_workflow_processes.rb

@@ -45,7 +45,7 @@ class CreateWorkflowProcesses < ActiveRecord::Migration
       :rails_workflow_contexts => [
         [:integer,  :parent_id],
         [:string,   :parent_type],
-        [:json,     :body],
+        [:text,     :body],
         [:datetime, :created_at],
         [:datetime, :updated_at],
       ],
@@ -66,7 +66,7 @@ class CreateWorkflowProcesses < ActiveRecord::Migration
           [:uuid,     :uuid],
           [:string,   :tag],
           [:text,     :source],
-          [:json,     :dependencies],
+          [:text,     :dependencies],
           [:string,   :operation_class],
           [:integer,  :process_template_id],
           [:datetime, :created_at],
@@ -94,7 +94,7 @@ class CreateWorkflowProcesses < ActiveRecord::Migration
           [:datetime, :updated_at],
           [:integer,  :process_id],
           [:integer,  :template_id],
-          [:json,     :dependencies],
+          [:text,     :dependencies],
           [:integer,  :child_process_id],
           [:integer,  :assignment_id],
           [:string,   :assignment_type],
@@ -147,8 +147,9 @@ class CreateWorkflowProcesses < ActiveRecord::Migration
         [RailsWorkflow::OperationTemplate, :dependencies],
         [RailsWorkflow::Context, :body]
     ].map do |check|
-      if check[0].columns_hash[check[1].to_s].sql_type != "json"
-        change_column check[0].table_name, check[1], "JSON USING #{check[1]}::JSON"
+      if check[0].columns_hash[check[1].to_s].sql_type == "json"
+        # change_column check[0].table_name, check[1], "JSON USING #{check[1]}::JSON"
+        change_column check[0].table_name, check[1], :text
       end
     end
   end

data/lib/rails_workflow/version.rb

@@ -1,3 +1,3 @@
 module RailsWorkflow
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/controllers/rails_workflow/operation_templates_controller_spec.rb

@@ -73,6 +73,8 @@ module RailsWorkflow
                             operation_template: valid_attributes
                         }, valid_session, use_route: :workflow
           }.to change(OperationTemplate, :count).by(1)
+
+          expect(@template.operations.count).to eq 1
         end
 
         it "creates a new CustomOperationTemplate" do

data/spec/dummy/config/database.yml.semaphore

@@ -1,16 +1,11 @@
 defaults: &defaults
   adapter: postgresql
   encoding: unicode
-  username: username
+  username: postgres
+  password: postgres
   host: localhost
   port: 5432
-  pool: 14
-  reaping_frequency: 10
 
-development:
+test:
   <<: *defaults
-  database: wf_def
-
-test: &test
-  <<: *defaults
-  database: wf_test
+  database: wf_test

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150625034602) do
+ActiveRecord::Schema.define(version: 20150629171932) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -27,7 +27,7 @@ ActiveRecord::Schema.define(version: 20150625034602) do
   create_table "rails_workflow_contexts", force: :cascade do |t|
     t.integer  "parent_id"
     t.string   "parent_type"
-    t.json     "body"
+    t.text     "body"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -49,7 +49,7 @@ ActiveRecord::Schema.define(version: 20150625034602) do
   create_table "rails_workflow_operation_templates", force: :cascade do |t|
     t.string   "title"
     t.text     "source"
-    t.json     "dependencies"
+    t.text     "dependencies"
     t.string   "operation_class"
     t.integer  "process_template_id"
     t.datetime "created_at"
@@ -81,7 +81,7 @@ ActiveRecord::Schema.define(version: 20150625034602) do
     t.datetime "updated_at"
     t.integer  "process_id"
     t.integer  "template_id"
-    t.json     "dependencies"
+    t.text     "dependencies"
     t.integer  "child_process_id"
     t.integer  "assignment_id"
     t.string   "assignment_type"