edge-state-machine 0.0.1 → 0.0.2

data/lib/edge-state-machine.rb

@@ -1,7 +1,7 @@
 require "edge-state-machine/event"
 require "edge-state-machine/machine"
 require "edge-state-machine/state"
-require "edge-state-machine/state_transition"
+require "edge-state-machine/transition"
 require "edge-state-machine/version"
 
 module EdgeStateMachine
@@ -35,7 +35,9 @@ module EdgeStateMachine
     def define_state_query_method(state_name)
       name = "#{state_name}?"
       undef_method(name) if method_defined?(name)
-      class_eval "def #{name}; current_state.to_s == %(#{state_name}) end"
+      define_method(name) do
+        current_state.to_s == state_name.to_s
+      end
     end
   end
 

data/lib/edge-state-machine/event.rb

@@ -100,7 +100,7 @@ module EdgeStateMachine
 
     def transitions(trans_opts)
       Array(trans_opts[:from]).each do |s|
-        @transitions << StateTransition.new(trans_opts.merge({:from => s.to_sym}))
+        @transitions << Transition.new(trans_opts.merge({:from => s.to_sym}))
       end
     end
   end

data/lib/edge-state-machine/{state_transition.rb → transition.rb}

@@ -1,5 +1,5 @@
 module EdgeStateMachine
-  class StateTransition
+  class Transition
     attr_reader :from, :to, :options
 
     def initialize(opts)

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

@@ -1,3 +1,3 @@
 module EdgeStateMachine
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/{active_record_helper.rb → active_record/active_record_helper.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
 require 'active_record'
 require 'active_support/core_ext/module/aliasing'
-require 'migrations/create_orders'
-require 'migrations/create_traffic_lights'
+require 'active_record/migrations/create_orders'
+require 'active_record/migrations/create_traffic_lights'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/spec/{active_record_spec.rb → active_record/active_record_spec.rb}

@@ -1,4 +1,4 @@
-require 'active_record_helper'
+require 'active_record/active_record_helper'
 
 ActiveRecord::Base.establish_connection(:adapter  => "sqlite3", :database => ":memory:")
 

data/spec/event_spec.rb

@@ -42,9 +42,9 @@ describe EdgeStateMachine::Event do
     @success.should == @event.success
   end
 
-  it "should create StateTransitions" do
-    EdgeStateMachine::StateTransition.should_receive(:new).with(:to => :closed, :from => :open)
-    EdgeStateMachine::StateTransition.should_receive(:new).with(:to => :closed, :from => :received)
+  it "should create Transitions" do
+    EdgeStateMachine::Transition.should_receive(:new).with(:to => :closed, :from => :open)
+    EdgeStateMachine::Transition.should_receive(:new).with(:to => :closed, :from => :received)
     new_event
   end
 

data/spec/{mongoid_spec.rb → mongoid/mongoid_spec.rb}

@@ -1,4 +1,4 @@
-require 'mongoid_helper'
+require 'mongoid/mongoid_helper'
 
 class MongoTrafficLight
   include Mongoid::Document

data/spec/state_spec.rb

@@ -38,154 +38,59 @@ end
 
 describe EdgeStateMachine::State do
 
-  describe "general methods" do
-    before do
-      @state_name = :astate
-      @machine = StateTestSubject.state_machine
-      @options = { :crazy_custom_key => "key", :machine => @machine }
-    end
-
-    it "should set the name" do
-      new_state.name.should == :astate
-    end
-
-    it "should set the display_name from name" do
-      new_state.display_name.should == "Astate"
-    end
-
-    it "should set the display_name from options" do
-      new_state(:display => "A State").display_name.should == "A State"
-    end
-
-    it "should set the options and expose them as options" do
-      @options.delete(:machine)
-      new_state.options.should == @options
-    end
-
-    it "should be equal to a symbol of the same name" do
-      new_state.should == :astate
-    end
-
-    it "should be equal with a State with the same name" do
-      new_state.should == new_state
-    end
-
-    it "should send a message to the record for an action if the action is present as a symbol" do
-      state = new_state(:entering => :foo)
-      record = mock
-      record.should_receive(:foo)
-      state.call_action(:entering, record)
-    end
-
-    it "should send a message to the record for an action if the action is present as a string" do
-      state = new_state(:entering => "foo")
-
-      record = mock
-      record.should_receive(:foo)
-
-      state.call_action(:entering, record)
-    end
-
-    it "should call a proc, passing in the record for an action if the action is present" do
-      state = new_state(:entering => Proc.new {|r| r.foobar})
-
-      record = mock
-      record.should_receive(:foobar)
-
-      state.call_action(:entering, record)
-    end
+  before do
+    @state_name = :astate
+    @machine = StateTestSubject.state_machine
+    @options = { :crazy_custom_key => "key", :machine => @machine }
   end
 
-  describe "state transitions" do
-    it "should set from, to, and opts attr readers" do
-      opts = {:from => "foo", :to => "bar", :guard => "g"}
-      st = EdgeStateMachine::StateTransition.new(opts)
-
-      st.from.should == opts[:from]
-      st.to.should == opts[:to]
-      st.options.should == opts
-    end
-
-    it "should pass equality check if from and to are the same" do
-      opts = {:from => "foo", :to => "bar", :guard => "g"}
-      st = EdgeStateMachine::StateTransition.new(opts)
-      obj = EdgeStateMachine::StateTransition.new(opts)
-      obj.should == st
-    end
-
-    it "should fail equality check if from are not the same" do
-      opts = {:from => "foo", :to => "bar", :guard => "g"}
-      st = EdgeStateMachine::StateTransition.new(opts)
-      obj = EdgeStateMachine::StateTransition.new(opts.merge({:from => "blah"}))
-      obj.should_not == st
-    end
-
-    it "should fail equality check if to are not the same" do
-      opts = {:from => "foo", :to => "bar", :guard => "g"}
-      st = EdgeStateMachine::StateTransition.new(opts)
-      obj = EdgeStateMachine::StateTransition.new(opts.merge({:to => "blah"}))
-      obj.should_not == st
-    end
+  it "should set the name" do
+    new_state.name.should == :astate
   end
 
-  describe "state transition callbacks" do
-    before do
-      @car = Car.new
-    end
-
-    it "should execute callback defined via 'on_transition'" do
-      @car.should_receive(:start_engine)
-      @car.turn_key!
-    end
-
-    it "should execute multiple callbacks defined via 'on_transition' in the same order they were defined" do
-      @car.should_receive(:start_engine).ordered
-      @car.should_receive(:loosen_handbrake).ordered
-      @car.should_receive(:push_gas_pedal).ordered
-      @car.start_driving!
-    end
+  it "should set the display_name from name" do
+    new_state.display_name.should == "Astate"
+  end
 
-    it "should pass event when calling event_fired_callback" do
-      @car.should_receive(:event_fired).with(:parked, :driving, :start_driving)
-      @car.start_driving!
-    end
+  it "should set the display_name from options" do
+    new_state(:display => "A State").display_name.should == "A State"
   end
 
-  describe "state transition guard check" do
-    it "should return true of there is no guard" do
-      opts = {:from => "foo", :to => "bar"}
-      st = EdgeStateMachine::StateTransition.new(opts)
-      st.perform(nil).should == true
-    end
+  it "should set the options and expose them as options" do
+    @options.delete(:machine)
+    new_state.options.should == @options
+  end
 
-    it "should call the method on the object if guard is a symbol" do
-      opts = {:from => "foo", :to => "bar", :guard => :test_guard}
-      st = EdgeStateMachine::StateTransition.new(opts)
+  it "should be equal to a symbol of the same name" do
+    new_state.should == :astate
+  end
 
-      obj = mock
-      obj.should_receive(:test_guard)
+  it "should be equal with a State with the same name" do
+    new_state.should == new_state
+  end
 
-      st.perform(obj)
-    end
+  it "should send a message to the record for an action if the action is present as a symbol" do
+    state = new_state(:entering => :foo)
+    record = mock
+    record.should_receive(:foo)
+    state.call_action(:entering, record)
+  end
 
-    it "should call the method on the object if guard is a string" do
-      opts = {:from => "foo", :to => "bar", :guard => "test_guard"}
-      st = EdgeStateMachine::StateTransition.new(opts)
+  it "should send a message to the record for an action if the action is present as a string" do
+    state = new_state(:entering => "foo")
 
-      obj = mock
-      obj.should_receive(:test_guard)
+    record = mock
+    record.should_receive(:foo)
 
-      st.perform(obj)
-    end
+    state.call_action(:entering, record)
+  end
 
-    it "should call the proc passing the object if the guard is a proc" do
-      opts = {:from => "foo", :to => "bar", :guard => Proc.new {|o| o.test_guard}}
-      st = EdgeStateMachine::StateTransition.new(opts)
+  it "should call a proc, passing in the record for an action if the action is present" do
+    state = new_state(:entering => Proc.new {|r| r.foobar})
 
-      obj = mock
-      obj.should_receive(:test_guard)
+    record = mock
+    record.should_receive(:foobar)
 
-      st.perform(obj)
-    end
+    state.call_action(:entering, record)
   end
 end

data/spec/transition_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe EdgeStateMachine::State do
+  it "should set from, to, and opts attr readers" do
+    opts = {:from => "foo", :to => "bar", :guard => "g"}
+    st = EdgeStateMachine::Transition.new(opts)
+
+    st.from.should == opts[:from]
+    st.to.should == opts[:to]
+    st.options.should == opts
+  end
+
+  it "should pass equality check if from and to are the same" do
+    opts = {:from => "foo", :to => "bar", :guard => "g"}
+    st = EdgeStateMachine::Transition.new(opts)
+    obj = EdgeStateMachine::Transition.new(opts)
+    obj.should == st
+  end
+
+  it "should fail equality check if from are not the same" do
+    opts = {:from => "foo", :to => "bar", :guard => "g"}
+    st = EdgeStateMachine::Transition.new(opts)
+    obj = EdgeStateMachine::Transition.new(opts.merge({:from => "blah"}))
+    obj.should_not == st
+  end
+
+  it "should fail equality check if to are not the same" do
+    opts = {:from => "foo", :to => "bar", :guard => "g"}
+    st = EdgeStateMachine::Transition.new(opts)
+    obj = EdgeStateMachine::Transition.new(opts.merge({:to => "blah"}))
+    obj.should_not == st
+  end
+end
+
+describe "state transition guard check" do
+  it "should return true of there is no guard" do
+    opts = {:from => "foo", :to => "bar"}
+    st = EdgeStateMachine::Transition.new(opts)
+    st.perform(nil).should == true
+  end
+
+  it "should call the method on the object if guard is a symbol" do
+    opts = {:from => "foo", :to => "bar", :guard => :test_guard}
+    st = EdgeStateMachine::Transition.new(opts)
+
+    obj = mock
+    obj.should_receive(:test_guard)
+
+    st.perform(obj)
+  end
+
+  it "should call the method on the object if guard is a string" do
+    opts = {:from => "foo", :to => "bar", :guard => "test_guard"}
+    st = EdgeStateMachine::Transition.new(opts)
+
+    obj = mock
+    obj.should_receive(:test_guard)
+
+    st.perform(obj)
+  end
+
+  it "should call the proc passing the object if the guard is a proc" do
+    opts = {:from => "foo", :to => "bar", :guard => Proc.new {|o| o.test_guard}}
+    st = EdgeStateMachine::Transition.new(opts)
+
+    obj = mock
+    obj.should_receive(:test_guard)
+
+    st.perform(obj)
+  end
+end

metadata

@@ -1,111 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: edge-state-machine
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.0.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Dan Persa
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-23 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &20230980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *20230980
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &20230400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mongoid
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *20230400
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: &20229600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *20229600
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: &20228540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *20228540
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &20227760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *20227760
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &20226340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *20226340
 description: Lightweight state machine extracted from ActiveModel
-email: 
+email:
 - dan.persa@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -118,50 +96,42 @@ files:
 - lib/edge-state-machine/event.rb
 - lib/edge-state-machine/machine.rb
 - lib/edge-state-machine/state.rb
-- lib/edge-state-machine/state_transition.rb
+- lib/edge-state-machine/transition.rb
 - lib/edge-state-machine/version.rb
 - lib/mongoid/edge-state-machine.rb
-- spec/active_record_helper.rb
-- spec/active_record_spec.rb
+- spec/active_record/active_record_helper.rb
+- spec/active_record/active_record_spec.rb
+- spec/active_record/migrations/create_orders.rb
+- spec/active_record/migrations/create_traffic_lights.rb
 - spec/event_spec.rb
 - spec/machine_spec.rb
-- spec/migrations/create_orders.rb
-- spec/migrations/create_traffic_lights.rb
-- spec/mongoid_helper.rb
-- spec/mongoid_spec.rb
+- spec/mongoid/mongoid_helper.rb
+- spec/mongoid/mongoid_spec.rb
 - spec/spec_helper.rb
 - spec/state_spec.rb
-has_rdoc: true
+- spec/transition_spec.rb
 homepage: http://github.com/danpersa/edge-state-machine
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: edge-state-machine
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: State machine extracted from ActiveModel
 test_files: []
-