seam 0.0.17 → 0.0.18

data/lib/seam/flow.rb

@@ -20,11 +20,20 @@ module Seam
                              created_at:      Time.parse(Time.now.to_s),
                              next_execute_at: Time.parse(Time.now.to_s),
                              next_step:       self.steps.first.name.to_s,
-                             flow:            ActiveSupport::HashWithIndifferentAccess.new(self.to_hash),
+                             flow:            the_flow_from,
                              data:            ActiveSupport::HashWithIndifferentAccess.new(data)
                            } )
     end
 
+    def the_flow_from
+      hash = self.to_hash
+      flow = ActiveSupport::HashWithIndifferentAccess.new hash
+      flow['steps'].each do |step|
+        step['id'] = SecureRandom.uuid.to_s
+      end
+      flow
+    end
+
     def to_hash
       { 
         steps: self.steps.map { |x| x.to_hash },

data/lib/seam/step.rb

@@ -1,5 +1,6 @@
 module Seam
   class Step
+    attr_accessor :id
     attr_accessor :name
     attr_accessor :type
     attr_accessor :arguments
@@ -10,6 +11,7 @@ module Seam
 
     def to_hash
       {
+        id:        id,
         name:      name,
         type:      type,
         arguments: get_arguments

data/lib/seam/version.rb

@@ -1,3 +1,3 @@
 module Seam
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

data/lib/seam/worker.rb

@@ -102,6 +102,7 @@ module Seam
       run = { 
               started_at:  Time.now,
               step:        step, 
+              step_id:     current_step['id'],
               data_before: stamping_the_history? ? effort.data.clone : nil
             }
       @current_run = HashWithIndifferentAccess.new run

data/spec/seam/flow_spec.rb

@@ -63,7 +63,9 @@ describe "flow" do
         Timecop.freeze now
 
         @expected_uuid = SecureRandom.uuid.to_s
-        SecureRandom.expects(:uuid).returns @expected_uuid
+        SecureRandom.stubs(:uuid).returns(@expected_uuid)
+                                 .then.returns(1)
+                                 .then.returns(2)
 
         @effort = flow.start( { first_name: 'John' } )
       end
@@ -92,6 +94,13 @@ describe "flow" do
         effort = Seam::Effort.find @effort.id
         effort.to_hash.contrast_with! @effort.to_hash, [:id, :created_at]
       end
+
+      it "should set unique identifiers on the flow ids" do
+        effort = Seam::Effort.find @effort.id
+        effort.flow['steps'][0]['id'].must_equal '1'
+        effort.flow['steps'][1]['id'].must_equal '2'
+      end
+
     end
   end
 

data/spec/seam/step_spec.rb

@@ -3,9 +3,11 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe Seam::Step do
   describe "initialize" do
     it "should allow values to be set with the constructor" do
-      step = Seam::Step.new( { name: 'a name',
+      step = Seam::Step.new( { id:   'an id',
+                               name: 'a name',
                                type: 'a type',
                                arguments: ['1234', 2] } )
+      step.id.must_equal 'an id'
       step.name.must_equal 'a name'
       step.type.must_equal 'a type'
       step.arguments.count.must_equal 2
@@ -16,10 +18,12 @@ describe Seam::Step do
 
   describe "to hash" do
     it "should allow values to be set with the constructor" do
-      step = Seam::Step.new( { name: 'a name',
+      step = Seam::Step.new( { id:   'an id',
+                               name: 'a name',
                                type: 'a type',
                                arguments: ['1234', 2] } )
       step = Seam::Step.new step.to_hash
+      step.id.must_equal 'an id'
       step.name.must_equal 'a name'
       step.type.must_equal 'a type'
       step.arguments.count.must_equal 2

data/spec/seam/worker_spec.rb

@@ -605,6 +605,7 @@ describe "worker" do
 
       effort.history.count.must_equal 1
       effort.history[0].contrast_with!( {
+                                          "step_id" => effort.flow['steps'][0]['id'],
                                           "started_at"=> Time.now, 
                                           "step"=>"wait_for_attempting_contact_stage",
                                           "stopped_at" => Time.now, 
@@ -621,7 +622,14 @@ describe "worker" do
       effort.next_step.must_equal "wait_for_attempting_contact_stage"
 
       effort.history.count.must_equal 1
-      effort.history[0].contrast_with!({"started_at"=> Time.now, "step"=>"wait_for_attempting_contact_stage", "stopped_at" => Time.now, "result" => "try_again_in", "try_again_on" => Time.now + 1.day } )
+      effort.history[0].contrast_with!( {
+                                          "step_id" => effort.flow['steps'][0]['id'],
+                                          "started_at"=> Time.now,
+                                          "step"=>"wait_for_attempting_contact_stage",
+                                          "stopped_at" => Time.now,
+                                          "result" => "try_again_in",
+                                          "try_again_on" => Time.now + 1.day 
+                                        } )
 
       # THE NEXT DAY
       Timecop.freeze Time.parse('27/12/2013')
@@ -634,7 +642,13 @@ describe "worker" do
       effort.next_step.must_equal "wait_for_attempting_contact_stage"
 
       effort.history.count.must_equal 2
-      effort.history[1].contrast_with!({"started_at"=> Time.now, "step"=>"wait_for_attempting_contact_stage", "stopped_at" => Time.now, "result" => "try_again_in" } )
+      effort.history[1].contrast_with!( {
+                                          "step_id" => effort.flow['steps'][0]['id'],
+                                          "started_at"=> Time.now, 
+                                          "step"=>"wait_for_attempting_contact_stage",
+                                          "stopped_at" => Time.now,
+                                          "result" => "try_again_in" 
+                                        } )
 
       # THE NEXT DAY
       Timecop.freeze Time.parse('28/12/2013')
@@ -647,7 +661,13 @@ describe "worker" do
       effort.next_step.must_equal "determine_if_postcard_should_be_sent"
 
       effort.history.count.must_equal 3
-      effort.history[2].contrast_with!({"started_at"=> Time.now, "step"=>"wait_for_attempting_contact_stage", "stopped_at" => Time.now, "result" => "move_to_next_step" } )
+      effort.history[2].contrast_with!( { 
+                                          "step_id" => effort.flow['steps'][0]['id'],
+                                          "started_at"=> Time.now,
+                                          "step"=>"wait_for_attempting_contact_stage",
+                                          "stopped_at" => Time.now,
+                                          "result" => "move_to_next_step" 
+                                        } )
 
       # KEEP GOING
       send_postcard_if_necessary_worker.execute_all
@@ -657,7 +677,13 @@ describe "worker" do
       effort.next_step.must_equal "send_postcard_if_necessary"
 
       effort.history.count.must_equal 4
-      effort.history[3].contrast_with!({"started_at"=> Time.now, "step"=>"determine_if_postcard_should_be_sent", "stopped_at" => Time.now, "result" => "move_to_next_step" } )
+      effort.history[3].contrast_with!( { 
+                                          "step_id" => effort.flow['steps'][1]['id'],
+                                          "started_at"=> Time.now,
+                                          "step"=>"determine_if_postcard_should_be_sent",
+                                          "stopped_at" => Time.now,
+                                          "result" => "move_to_next_step" 
+                                        } )
       
       # KEEP GOING
       send_postcard_if_necessary_worker.execute_all
@@ -667,7 +693,13 @@ describe "worker" do
       effort.next_step.must_equal nil
 
       effort.history.count.must_equal 5
-      effort.history[4].contrast_with!({"started_at"=> Time.now, "step"=>"send_postcard_if_necessary", "stopped_at" => Time.now, "result" => "move_to_next_step" } )
+      effort.history[4].contrast_with!( {
+                                          "step_id" => effort.flow['steps'][2]['id'],
+                                          "started_at"=> Time.now,
+                                          "step"=>"send_postcard_if_necessary",
+                                          "stopped_at" => Time.now,
+                                          "result" => "move_to_next_step" 
+                                        } )
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seam
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -230,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3036186920062924532
+      hash: -2525093840974074880
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -239,10 +239,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3036186920062924532
+      hash: -2525093840974074880
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Simple workflows