motion-state-machine 0.8.2 → 0.8.3

data/Rakefile

@@ -4,11 +4,11 @@ $:.unshift("/Library/RubyMotion/lib")
 
 require 'rubygems'
 require 'rake'
-require 'motion/project'
+require 'motion/project/template/ios'
 require "bundler/gem_tasks"
-
 Bundler.setup
 Bundler.require
+Bundler::GemHelper.install_tasks
 
 Motion::Project::App.setup do |app|
   app.name = 'Spec Suite'

data/lib/motion-state-machine/base.rb

@@ -55,7 +55,8 @@ module StateMachine
     # @return [StateMachine::Base] a new StateMachine object
 
     def initialize(options)
-      super
+      super(options)
+
       @name = options[:name] || "State machine"
       @verbose = !!options[:verbose]
       @state_symbols_to_states = {}
@@ -73,6 +74,8 @@ module StateMachine
 
   		@current_state = waiting_for_start_state
       @current_state.send :enter!
+
+      self
     end
 
 

data/lib/motion-state-machine/state.rb

@@ -351,28 +351,27 @@ module StateMachine
       possible_transitions =
         @transition_map[event_type][event_trigger_value]
 
-      unless possible_transitions.empty?
-        allowed_transitions = possible_transitions.select(&:allowed?)
-
-        if allowed_transitions.empty?
-          @state_machine.log "All transitions are disallowed for "\
-            "#{event_type}:#{event_trigger_value}."
-        elsif allowed_transitions.count > 1
-          list = allowed_transitions.collect do |t|
-            "-> #{t.options[:to]}"
-          end
-          raise RuntimeError,
-            "Not sure which transition to trigger "\
-            "when #{symbol} while #{self} (allowed: #{list}). "\
-            "Please make sure guard conditions exclude each other."
-        else
-          transition = allowed_transitions.first
-          unless transition.nil?
-            transition.send :unguarded_execute
-          end
+      return if possible_transitions.empty?
+      allowed_transitions = possible_transitions.select(&:allowed?)
+
+      if allowed_transitions.empty?
+        @state_machine.log "All transitions are disallowed for "\
+          "#{event_type}:#{event_trigger_value}."
+      elsif allowed_transitions.count > 1
+        list = allowed_transitions.collect do |t|
+          "-> #{t.options[:to]}"
+        end
+        raise RuntimeError,
+          "Not sure which transition to trigger "\
+          "when #{symbol} while #{self} (allowed: #{list}). "\
+          "Please make sure guard conditions exclude each other."
+      else
+        transition = allowed_transitions.first
+        unless transition.nil?
+          transition.send :unguarded_execute
         end
-
       end
+
     end
 
   end

data/lib/motion-state-machine/transition.rb

@@ -332,7 +332,7 @@ module StateMachine
       @state_machine.log "Starting timeout -> #{options[:to]}, "\
         "after #{options[:after]}"
       delay = event_trigger_value
-      interval = 0
+      interval = Dispatch::TIME_FOREVER
       leeway = @options[:leeway] || 0.001
       queue = @state_machine.initial_queue
       @timer = Dispatch::Source.timer(delay, interval, leeway, queue) do
@@ -374,15 +374,17 @@ module StateMachine
     end
 
     def arm
-      NSNotificationCenter.defaultCenter.addObserver self,
-        selector: :handle_in_initial_queue,
-        name:event_trigger_value,
-        object:nil
-      @state_machine.log "Registered notification #{event_trigger_value}"
+      @observer = NSNotificationCenter.defaultCenter.addObserverForName event_trigger_value, 
+        object: nil, 
+        queue: NSOperationQueue.mainQueue, 
+        usingBlock: -> notification {
+          handle_in_initial_queue
+          state_machine.log "Registered notification #{event_trigger_value}"
+        }      
     end
 
     def unarm
-      NSNotificationCenter.defaultCenter.removeObserver self
+      NSNotificationCenter.defaultCenter.removeObserver @observer
       @state_machine.log "Removed as observer"
     end
 

data/lib/motion-state-machine/version.rb

@@ -1,3 +1,3 @@
 module StateMachine
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/spec/benchmark_spec.rb

@@ -8,28 +8,26 @@ class LoopingThreeStateMachine < StateMachine::Base
 	attr_accessor :steps, :loops
 	attr_accessor :is_dead
 
-	def initialize
-    super(start_state: :first_state)
-
-    @steps = 0
-    @loops = 0
-
-		self.when :first_state do |state|
-      state.transition_to :second_state, on: :next,
-        action: proc { @steps += 1 }
-    end
-
-  	self.when :second_state do |state|
-      state.transition_to :third_state, on: :next,
-        action: proc { @steps += 1 }
+  def initialize
+    super(start_state: :first_state).tap do |fsm|
+      fsm.steps = 0
+      fsm.loops = 0
+
+      fsm.when :first_state do |state|
+        state.transition_to :second_state, on: :next,
+          action: proc { @steps += 1 }
+      end
+
+      fsm.when :second_state do |state|
+        state.transition_to :third_state, on: :next,
+          action: proc { @steps += 1 }
+      end
+
+      fsm.when :third_state do |state|
+        state.transition_to :first_state, on: :next,
+          action: proc { @steps += 1; @loops += 1 }
+      end
     end
-
-  	self.when :third_state do |state|
-      state.transition_to :first_state, on: :next,
-        action: proc { @steps += 1; @loops += 1 }
-    end
-
-    self
   end
 end
 
@@ -62,8 +60,6 @@ describe LoopingThreeStateMachine do
 
     handle_time = NSDate.date.timeIntervalSinceDate started_on
 
-    send_time.should < 0.2
-
     frequency = event_count / handle_time
     frequency.should > 10000
 

data/spec/notification_transition_spec.rb

@@ -21,11 +21,13 @@ describe StateMachine::NotificationTransition do
       @fired.should == false
 
       NSNotificationCenter.defaultCenter.postNotificationName "SomeNotification", object: nil
+      sleep 0.1
       @state_machine.current_state.symbol.should == :notified
       @fired.should == true
       @fired = false
 
       NSNotificationCenter.defaultCenter.postNotificationName "SomeNotification", object: nil
+      sleep 0.1
       @state_machine.current_state.symbol.should == :notified
       @fired.should == false
     end
@@ -49,6 +51,7 @@ describe StateMachine::NotificationTransition do
       @fired = false
 
       NSNotificationCenter.defaultCenter.postNotificationName "SomeNotification", object: nil
+      sleep 0.1
       @state_machine.current_state.symbol.should == :notified
       @fired.should == false
     end

data/spec/timed_transition_spec.rb

@@ -1,11 +1,12 @@
 describe StateMachine::TimedTransition do
 
   before do
+    @count = 0
     @state_machine = StateMachine::Base.new start_state: :timing_out
-    action = proc { @fired = true }
+    action = proc { @fired = true; @count = @count + 1 }
     @state_machine.when :timing_out do |state|
       @transition = state.transition_to(:timed_out, after: 0.5, action: action).first
-      state.transition_to :canceled, on: :cancel
+      state.transition_to :cancelled, on: :cancel
     end
   end
 
@@ -24,7 +25,7 @@ describe StateMachine::TimedTransition do
       @fired.should == false
     end
 
-    it "it should execute at the given time if not cancelled" do
+    it "executes at the given time if not cancelled" do
       sleep 0.49
       @state_machine.current_state.symbol.should == :timing_out
       @fired.should == false
@@ -33,16 +34,25 @@ describe StateMachine::TimedTransition do
       @fired.should == true
     end
 
-    it "should not execute if leaving the state before timeout" do
+    it "is not executed if leaving the state before timeout" do
       sleep 0.49
       @fired.should == false
       @other_queue.async do
         @state_machine.event :cancel
       end
       sleep 0.02
-      @state_machine.current_state.symbol.should == :canceled
+      @state_machine.current_state.symbol.should == :cancelled
       @fired.should == false
     end
+
+    it "does not repeat (regression test)" do
+      sleep 0.49
+      @state_machine.current_state.symbol.should == :timing_out
+      sleep 0.02
+      @state_machine.current_state.symbol.should == :timed_out
+      sleep 1.0
+      @count.should == 1
+    end
   end
 
 end

data/spec/transition_spec.rb

@@ -58,16 +58,16 @@ describe StateMachine::Transition do
 
     describe "#unguarded_execute" do
       it "should call its source state's exit method if not internal" do
-        exit_action_called = false
+        @exit_action_called = false
         @state_machine.when(:awake) do |state|
           state.on_exit do
-            exit_action_called = true
+            @exit_action_called = true
           end
         end
         @state_machine.start!
-        exit_action_called.should == false
+        @exit_action_called.should == false
         @transition.send :unguarded_execute
-        exit_action_called.should == true
+        @exit_action_called.should == true
       end
 
       it "should not call its source state's exit method if internal" do
@@ -85,16 +85,16 @@ describe StateMachine::Transition do
       end
 
       it "should call its destination state's enter method if not internal" do
-        entry_action_called = false
+        @entry_action_called = false
         @state_machine.when(:tired) do |state|
           state.on_entry do
-            entry_action_called = true
+            @entry_action_called = true
           end
         end
         @state_machine.start!
-        entry_action_called.should == false
+        @entry_action_called.should == false
         @transition.send :unguarded_execute
-        entry_action_called.should == true
+        @entry_action_called.should == true
       end
 
       it "should not call its destination state's enter method if internal" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-state-machine
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70164739051240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164739051240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A finite state machine for RubyMotion with a flavor of Grand Central
   Dispatch.
 email:
@@ -62,21 +67,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1755037909543191418
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1755037909543191418
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Comes with a nice syntax for state and transition definition. Supports triggering