state_shifter 0.8.0 → 0.8.1

data/Gemfile

@@ -8,7 +8,8 @@ source "http://rubygems.org"
 group :development do
   gem 'activerecord', '~> 3.2.x'
   gem 'sqlite3'
-  gem "rspec", "~> 2.8.0"
+  gem 'rspec-nc'
+  gem "rspec", "~> 2.9.0"
   gem "yard", "~> 0.7"
   gem 'redcarpet' 
   gem "rdoc", "~> 3.12"

data/Gemfile.lock

@@ -28,19 +28,23 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     redcarpet (2.1.1)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rspec-nc (0.0.4)
+      rspec (~> 2.9)
+      terminal-notifier (~> 1.4.2)
     simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     sqlite3 (1.3.6)
+    terminal-notifier (1.4.2)
     tzinfo (0.3.33)
     yard (0.8.2.1)
 
@@ -53,7 +57,8 @@ DEPENDENCIES
   jeweler (~> 1.8.4)
   rdoc (~> 3.12)
   redcarpet
-  rspec (~> 2.8.0)
+  rspec (~> 2.9.0)
+  rspec-nc
   simplecov
   sqlite3
   yard (~> 0.7)

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/examples/advanced.rb

@@ -41,14 +41,14 @@ class Advanced
     end
 
     state :notify_stakeholders do
-      on_entry :send_notification_to_stakeholders
+      on_entry :send_notification, :stakeholders, :organizers
       event :stakeholders_notified => :cancelled
     end
 
     state :cancelled
 
     state :notify_pending_users do
-      on_entry :send_notification_to_pending_users
+      on_entry :send_notification, :pending_users
       event :pending_users_notified => :finalized
     end
 
@@ -80,6 +80,10 @@ class Advanced
 
   ###
 
+  def send_notification to
+    #
+  end
+
   def entries_deadline_reached?
     true
   end

data/examples/malformed_events.rb

@@ -12,22 +12,6 @@ class MalformedEvents
       event :submit => :being_reviewed
     end
 
-    state :being_reviewed do
-      event :accept => :accepted, :if => :cool_article?
-      event :reject => :rejected, :if => :bad_article?
-    end
-
-    state :accepted
-    state :rejected
-
-  end
-
-  def cool_article?
-    true
-  end
-
-  def bad_article?
-    false
   end
-
+  
 end

data/examples/malformed_persistence.rb

@@ -13,85 +13,10 @@ class MalformedPersistence
       event :abort_initialized_contest => :finalized
     end
 
-    state :running do
-
-      on_entry do |previous_state, trigger_event|
-        running_entry previous_state, trigger_event
-      end
-
-      event :abort_running_contest => :notify_stakeholders 
-      event :changed_properties
-      event :keep_users_engaged
-      event :deadline_reached => :notify_organizers, :if => :entries_deadline_reached?
-      event :spots_filled  => :notify_organizers, :if => :spots_filled?
-      event :deadline_reached_without_approvals  => :notify_pending_users, :if => :entries_deadline_reached_without_approvals?
-      event :deadline_reached_without_entries => :finalized, :if => :entries_deadline_reached_without_entries?
-    end
-
-    state :notify_organizers do
-      on_entry :send_notification_to_organizers
-      event :organizers_notified => :awaiting_organizer_reply
-    end
-
-    state :awaiting_organizer_reply do
-      event :organizer_confirmation_missing => :notify_stakeholders, :if => :organizer_confirmation_deadline_reached?
-      event :keep_organizers_engaged
-      event :organizer_confirmation_received => :notify_approved_users
-      event :organizer_has_more_tickets  => :running
-    end
-
-    state :notify_stakeholders do
-      on_entry :send_notification_to_stakeholders
-      event :stakeholders_notified => :cancelled
-    end
-
-    state :cancelled
-
-    state :notify_pending_users do
-      on_entry :send_notification_to_pending_users
-      event :pending_users_notified => :finalized
-    end
-
-    state :notify_approved_users do
-      on_entry :send_notification_to_approved_users
-      event :approved_users_notified => :send_list_to_organizers
-     end
-
-    state :send_list_to_organizers do
-      on_entry :send_guestlist_to_organizers
-      event :list_sent_to_organizers => :awaiting_attendance
-    end
-
-    state :awaiting_attendance do
-      event :remind_to_fill_in_report => :create_report_filling_requests
-    end
-
-    state :create_report_filling_requests do
-      on_entry :send_report_filling_requests
-      event :finalize => :finalized
-    end
-
-    state :finalized
-
-    on_transition do |from,to,trigger_event, duration|
-      benchmark from, to, trigger_event, duration
-    end
   end
 
   persist_attribute :lollies
 
   ###
 
-  def entries_deadline_reached?
-    true
-  end
-
-  def running_entry previous_state, trigger_event
-    #
-  end
-
-  def benchmark from, to, trigger_event, duration
-    #
-  end
-
 end

data/examples/malformed_states.rb

@@ -12,22 +12,6 @@ class MalformedStates
       event :review => :being_reviewed
     end
 
-    state :being_reviewed do
-      event :accept => :accepted, :if => :cool_article?
-      event :reject => :rejected, :if => :bad_article?
-    end
-
-    state :accepted
-    state :rejected
-
-  end
-
-  def cool_article?
-    true
-  end
-
-  def bad_article?
-    false
   end
-
+  
 end

data/lib/state_shifter/definition/active_record_integration_methods.rb

@@ -4,18 +4,22 @@ module StateShifter
 
       class ::StateShifter::Definition::StatePersistenceAttributeNotPresent < RuntimeError; end 
 
-      def get_current_state
+      def check_attr_presence
         raise StatePersistenceAttributeNotPresent unless self.attribute_names.include? self.class.persist_attr_name.to_s
+      end
+
+      def get_current_state
+        check_attr_presence
         read_attribute self.class.persist_attr_name
       end
 
       def set_current_state value
-        raise StatePersistenceAttributeNotPresent unless self.attribute_names.include? self.class.persist_attr_name.to_s
+        check_attr_presence
         update_attribute self.class.persist_attr_name, value
       end
 
       def write_initial_state
-        raise StatePersistenceAttributeNotPresent unless self.attribute_names.include? self.class.persist_attr_name.to_s
+        raise StatePersistenceAttributeNotPresent unless self.attribute_names.include?(self.class.persist_attr_name.to_s)
         write_attribute self.class.persist_attr_name, self.class.state_machine_definition.initial_state.name.to_sym
       end
 

data/lib/state_shifter/definition/class_methods.rb

@@ -43,7 +43,7 @@ module StateShifter
               
                 this_event = state_machine_definition.get(:event, event_name)
                 
-                current_state == this_event.from && !check_guards(event_name).is_a?(Array) 
+                current_state.to_sym == this_event.from.to_sym && !check_guards(event_name).is_a?(Array) 
               
               end
 

data/lib/state_shifter/definition/contents.rb

@@ -51,11 +51,12 @@ module StateShifter
         @current_state.events[event_name.to_sym] = this_event
       end
 
-      def on_entry event_name=nil, &proc_contents
+      def on_entry event_name=nil, *event_args, &proc_contents
         if event_name.nil?
           @current_state.entry_callback = proc_contents
         else
           @current_state.entry_callback = event_name
+          @current_state.entry_callback_args = ( event_args.size == 1 ? event_args.first : event_args )
         end
       end
 

data/lib/state_shifter/definition/instance_methods.rb

@@ -59,8 +59,9 @@ module StateShifter
         proc_or_method_name = current_state_def.entry_callback
 
         if proc_or_method_name.is_a?(Symbol)
+          method_args = current_state_def.entry_callback_args
           begin
-            self.send proc_or_method_name  
+            self.send proc_or_method_name, method_args
           rescue NoMethodError
             raise ::StateShifter::CallbackMethodNotDefined, proc_or_method_name
           end

data/lib/state_shifter/state.rb

@@ -3,12 +3,13 @@ module StateShifter
   class State
   
     attr_reader :name, :events
-    attr_accessor :entry_callback
+    attr_accessor :entry_callback, :entry_callback_args
 
     def initialize name
       @name = name
       @events = {}
       @entry_callback = nil
+      @entry_callback_args = []
     end
 
     def has_entry_callback?

data/spec/state_shifter_spec.rb

@@ -159,6 +159,23 @@ describe 'Advanced state machine functionality' do
     @advanced.deadline_reached!
   end
 
+  it 'state on_entry callbacks with an argument should work' do
+    @advanced.forced_start
+    @advanced.stub!(:entries_deadline_reached_without_approvals?).and_return(true)
+
+    # method name only with args
+    @advanced.should_receive(:send_notification).with(:pending_users)
+    @advanced.deadline_reached_without_approvals!
+  end
+
+  it 'state on_entry callbacks with an array of arguments should work' do
+    @advanced.forced_start
+
+    # method name only with args
+    @advanced.should_receive(:send_notification).with([:stakeholders, :organizers])
+    @advanced.abort_running_contest!
+  end
+
   it 'the on_transition callback should work' do
     @advanced.should_receive(:benchmark).with(:initialized, :running, :forced_start!, an_instance_of(Float)).and_return(nil)
     @advanced.forced_start!

data/state_shifter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "state_shifter"
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bruno Antunes"]
-  s.date = "2012-08-27"
+  s.date = "2012-08-28"
   s.description = "state_shifter is a gem that adds state machine behavior to a class"
   s.email = "sardaukar.siet@gmail.com"
   s.extra_rdoc_files = [
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-    ".rspec",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -57,7 +56,8 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<activerecord>, ["~> 3.2.x"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rspec-nc>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.9.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.7"])
       s.add_development_dependency(%q<redcarpet>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
@@ -67,7 +67,8 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<activerecord>, ["~> 3.2.x"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rspec-nc>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.9.0"])
       s.add_dependency(%q<yard>, ["~> 0.7"])
       s.add_dependency(%q<redcarpet>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -78,7 +79,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activerecord>, ["~> 3.2.x"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rspec-nc>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.9.0"])
     s.add_dependency(%q<yard>, ["~> 0.7"])
     s.add_dependency(%q<redcarpet>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_shifter
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-nc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +180,6 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
-- .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -205,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3920605756095371187
+      hash: -2251984499056087548
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/.rspec

@@ -1 +0,0 @@
---color