aasm 3.0.24 → 3.1.1

data/spec/unit/transition_spec.rb

@@ -4,46 +4,46 @@ describe 'transitions' do
 
   it 'should raise an exception when whiny' do
     process = ProcessWithNewDsl.new
-    lambda { process.stop! }.should raise_error(AASM::InvalidTransition)
-    process.should be_sleeping
+    expect { process.stop! }.to raise_error(AASM::InvalidTransition)
+    expect(process).to be_sleeping
   end
 
   it 'should not raise an exception when not whiny' do
     silencer = Silencer.new
-    silencer.smile!.should be_false
-    silencer.should be_silent
+    expect(silencer.smile!).to be_false
+    expect(silencer).to be_silent
   end
 
   it 'should not raise an exception when superclass not whiny' do
     sub = SubClassing.new
-    sub.smile!.should be_false
-    sub.should be_silent
+    expect(sub.smile!).to be_false
+    expect(sub).to be_silent
   end
 
   it 'should not raise an exception when from is nil even if whiny' do
     silencer = Silencer.new
-    silencer.smile_any!.should be_true
-    silencer.should be_smiling
+    expect(silencer.smile_any!).to be_true
+    expect(silencer).to be_smiling
   end
 
   it 'should call the block when success' do
     silencer = Silencer.new
     success = false
-    lambda {
+    expect {
       silencer.smile_any! do
         success = true
       end
-    }.should change { success }.to(true)
+    }.to change { success }.to(true)
   end
 
   it 'should not call the block when failure' do
     silencer = Silencer.new
     success = false
-    lambda {
+    expect {
       silencer.smile! do
         success = true
       end
-    }.should_not change { success }.to(true)
+    }.not_to change { success }.to(true)
   end
 
 end
@@ -56,9 +56,9 @@ describe AASM::Transition do
     opts = {:from => 'foo', :to => 'bar', :guard => 'g'}
     st = AASM::Transition.new(opts)
 
-    st.from.should == opts[:from]
-    st.to.should == opts[:to]
-    st.opts.should == opts
+    expect(st.from).to eq(opts[:from])
+    expect(st.to).to eq(opts[:to])
+    expect(st.opts).to eq(opts)
   end
 
   it 'should pass equality check if from and to are the same' do
@@ -66,10 +66,10 @@ describe AASM::Transition do
     st = AASM::Transition.new(opts)
 
     obj = double('object')
-    obj.stub(:from).and_return(opts[:from])
-    obj.stub(:to).and_return(opts[:to])
+    allow(obj).to receive(:from).and_return(opts[:from])
+    allow(obj).to receive(:to).and_return(opts[:to])
 
-    st.should == obj
+    expect(st).to eq(obj)
   end
 
   it 'should fail equality check if from are not the same' do
@@ -77,10 +77,10 @@ describe AASM::Transition do
     st = AASM::Transition.new(opts)
 
     obj = double('object')
-    obj.stub(:from).and_return('blah')
-    obj.stub(:to).and_return(opts[:to])
+    allow(obj).to receive(:from).and_return('blah')
+    allow(obj).to receive(:to).and_return(opts[:to])
 
-    st.should_not == obj
+    expect(st).not_to eq(obj)
   end
 
   it 'should fail equality check if to are not the same' do
@@ -88,10 +88,10 @@ describe AASM::Transition do
     st = AASM::Transition.new(opts)
 
     obj = double('object')
-    obj.stub(:from).and_return(opts[:from])
-    obj.stub(:to).and_return('blah')
+    allow(obj).to receive(:from).and_return(opts[:from])
+    allow(obj).to receive(:to).and_return('blah')
 
-    st.should_not == obj
+    expect(st).not_to eq(obj)
   end
 end
 
@@ -100,7 +100,7 @@ describe AASM::Transition, '- when performing guard checks' do
     opts = {:from => 'foo', :to => 'bar'}
     st = AASM::Transition.new(opts)
 
-    st.perform(nil).should be_true
+    expect(st.perform(nil)).to be_true
   end
 
   it 'should call the method on the object if guard is a symbol' do
@@ -108,7 +108,7 @@ describe AASM::Transition, '- when performing guard checks' do
     st = AASM::Transition.new(opts)
 
     obj = double('object')
-    obj.should_receive(:test)
+    expect(obj).to receive(:test)
 
     st.perform(obj)
   end
@@ -118,7 +118,7 @@ describe AASM::Transition, '- when performing guard checks' do
     st = AASM::Transition.new(opts)
 
     obj = double('object')
-    obj.should_receive(:test)
+    expect(obj).to receive(:test)
 
     st.perform(obj)
   end
@@ -128,7 +128,7 @@ describe AASM::Transition, '- when performing guard checks' do
     st = AASM::Transition.new(opts)
 
     obj = double('object')
-    obj.should_receive(:test)
+    expect(obj).to receive(:test)
 
     st.perform(obj)
   end
@@ -139,9 +139,9 @@ describe AASM::Transition, '- when executing the transition with a Proc' do
     opts = {:from => 'foo', :to => 'bar', :on_transition => Proc.new {|o| o.test}}
     st = AASM::Transition.new(opts)
     args = {:arg1 => '1', :arg2 => '2'}
-    obj = double('object')
+    obj = double('object', :aasm => 'aasm')
 
-    opts[:on_transition].should_receive(:call).with(any_args)
+    expect(opts[:on_transition]).to receive(:call).with(any_args)
 
     st.execute(obj, args)
   end
@@ -150,9 +150,9 @@ describe AASM::Transition, '- when executing the transition with a Proc' do
     opts = {:from => 'foo', :to => 'bar', :on_transition => Proc.new {||}}
     st = AASM::Transition.new(opts)
     args = {:arg1 => '1', :arg2 => '2'}
-    obj = double('object')
+    obj = double('object', :aasm => 'aasm')
 
-    opts[:on_transition].should_receive(:call).with(no_args)
+    expect(opts[:on_transition]).to receive(:call).with(no_args)
 
     st.execute(obj, args)
   end
@@ -163,9 +163,9 @@ describe AASM::Transition, '- when executing the transition with an :on_transtio
     opts = {:from => 'foo', :to => 'bar', :on_transition => 'test'}
     st = AASM::Transition.new(opts)
     args = {:arg1 => '1', :arg2 => '2'}
-    obj = double('object')
+    obj = double('object', :aasm => 'aasm')
 
-    obj.should_receive(:test)
+    expect(obj).to receive(:test)
 
     st.execute(obj, args)
   end
@@ -174,9 +174,9 @@ describe AASM::Transition, '- when executing the transition with an :on_transtio
     opts = {:from => 'foo', :to => 'bar', :on_transition => :test}
     st = AASM::Transition.new(opts)
     args = {:arg1 => '1', :arg2 => '2'}
-    obj = double('object')
+    obj = double('object', :aasm => 'aasm')
 
-    obj.should_receive(:test)
+    expect(obj).to receive(:test)
 
     st.execute(obj, args)
   end
@@ -185,30 +185,45 @@ describe AASM::Transition, '- when executing the transition with an :on_transtio
     opts = {:from => 'foo', :to => 'bar', :on_transition => :test}
     st = AASM::Transition.new(opts)
     args = {:arg1 => '1', :arg2 => '2'}
-    obj = double('object')
+    obj = double('object', :aasm => 'aasm')
 
-    obj.class.class_eval do
-      define_method(:test) {|*args| 'success'}
+    def obj.test(args)
+      "arg1: #{args[:arg1]} arg2: #{args[:arg2]}"
     end
 
     return_value = st.execute(obj, args)
 
-    return_value.should == 'success'
+    expect(return_value).to eq('arg1: 1 arg2: 2')
   end
 
   it 'should NOT pass args if the target method does NOT accept them' do
     opts = {:from => 'foo', :to => 'bar', :on_transition => :test}
     st = AASM::Transition.new(opts)
     args = {:arg1 => '1', :arg2 => '2'}
-    obj = double('object')
+    obj = double('object', :aasm => 'aasm')
+
+    def obj.test
+      'success'
+    end
+
+    return_value = st.execute(obj, args)
+
+    expect(return_value).to eq('success')
+  end
+
+  it 'should allow accessing the from_state and the to_state' do
+    opts = {:from => 'foo', :to => 'bar', :on_transition => :test}
+    st = AASM::Transition.new(opts)
+    args = {:arg1 => '1', :arg2 => '2'}
+    obj = double('object', :aasm => AASM::InstanceBase.new('object'))
 
-    obj.class.class_eval do
-      define_method(:test) {|*args| 'success'}
+    def obj.test(args)
+      "from: #{aasm.from_state} to: #{aasm.to_state}"
     end
 
     return_value = st.execute(obj, args)
 
-    return_value.should == 'success'
+    expect(return_value).to eq('from: foo to: bar')
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 3.0.24
+  version: 3.1.1
 platform: ruby
 authors:
 - Scott Barron
@@ -11,162 +11,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.15
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.15
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-debug-completion
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.25'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: AASM is a continuation of the acts as state machine rails plugin, built
   for plain Ruby objects.
 email: scott@elitists.net, ttilley@gmail.com, aasm@mt7.de
@@ -174,9 +104,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".travis.yml"
 - API
 - CHANGELOG.md
 - Gemfile
@@ -185,10 +115,12 @@ files:
 - README.md
 - Rakefile
 - aasm.gemspec
+- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_4.0.gemfile
+- gemfiles/rails_4.1.gemfile
 - lib/aasm.rb
 - lib/aasm/aasm.rb
 - lib/aasm/base.rb
-- lib/aasm/deprecated/aasm.rb
 - lib/aasm/errors.rb
 - lib/aasm/event.rb
 - lib/aasm/instance_base.rb
@@ -201,6 +133,7 @@ files:
 - lib/aasm/state_machine.rb
 - lib/aasm/transition.rb
 - lib/aasm/version.rb
+- spec/database.rb
 - spec/database.yml
 - spec/en.yml
 - spec/en_deprecated_style.yml
@@ -209,10 +142,10 @@ files:
 - spec/models/auth_machine.rb
 - spec/models/bar.rb
 - spec/models/callback_new_dsl.rb
-- spec/models/callback_old_dsl.rb
 - spec/models/conversation.rb
 - spec/models/father.rb
 - spec/models/foo.rb
+- spec/models/guardian.rb
 - spec/models/invalid_persistor.rb
 - spec/models/mongoid/no_scope_mongoid.rb
 - spec/models/mongoid/simple_mongoid.rb
@@ -228,12 +161,12 @@ files:
 - spec/models/transactor.rb
 - spec/models/validator.rb
 - spec/models/worker.rb
-- spec/schema.rb
 - spec/spec_helper.rb
 - spec/unit/api_spec.rb
 - spec/unit/callbacks_spec.rb
 - spec/unit/complex_example_spec.rb
 - spec/unit/event_spec.rb
+- spec/unit/guard_spec.rb
 - spec/unit/initial_state_spec.rb
 - spec/unit/inspection_spec.rb
 - spec/unit/localizer_spec.rb
@@ -255,21 +188,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: State machine mixin for Ruby objects
 test_files:
+- spec/database.rb
 - spec/database.yml
 - spec/en.yml
 - spec/en_deprecated_style.yml
@@ -278,10 +212,10 @@ test_files:
 - spec/models/auth_machine.rb
 - spec/models/bar.rb
 - spec/models/callback_new_dsl.rb
-- spec/models/callback_old_dsl.rb
 - spec/models/conversation.rb
 - spec/models/father.rb
 - spec/models/foo.rb
+- spec/models/guardian.rb
 - spec/models/invalid_persistor.rb
 - spec/models/mongoid/no_scope_mongoid.rb
 - spec/models/mongoid/simple_mongoid.rb
@@ -297,12 +231,12 @@ test_files:
 - spec/models/transactor.rb
 - spec/models/validator.rb
 - spec/models/worker.rb
-- spec/schema.rb
 - spec/spec_helper.rb
 - spec/unit/api_spec.rb
 - spec/unit/callbacks_spec.rb
 - spec/unit/complex_example_spec.rb
 - spec/unit/event_spec.rb
+- spec/unit/guard_spec.rb
 - spec/unit/initial_state_spec.rb
 - spec/unit/inspection_spec.rb
 - spec/unit/localizer_spec.rb

data/lib/aasm/deprecated/aasm.rb

@@ -1,15 +0,0 @@
-module AASM
-
-  module ClassMethods
-    def human_event_name(*args)
-      warn "AASM.human_event_name is deprecated and will be removed in version 3.1.0; please use AASM.aasm_human_event_name instead!"
-      aasm_human_event_name(*args)
-    end
-  end
-
-  def human_state
-    warn "AASM#human_state is deprecated and will be removed in version 3.1.0; please use AASM#aasm_human_state instead!"
-    aasm_human_state
-  end
-
-end

data/spec/models/callback_old_dsl.rb

@@ -1,41 +0,0 @@
-class CallbackOldDsl
-  include AASM
-
-  aasm_initial_state :open
-  aasm_state :open,
-    :before_enter => :before_enter_open,
-    :after_enter  => :after_enter_open,
-    :before_exit  => :before_exit_open,
-    :exit         => :exit_open,
-    :after_exit   => :after_exit_open
-  aasm_state :closed,
-    :before_enter => :before_enter_closed,
-    :enter        => :enter_closed,
-    :after_enter  => :after_enter_closed,
-    :before_exit  => :before_exit_closed,
-    :after_exit   => :after_exit_closed
-
-  aasm_event :close, :before => :before, :after => :after do
-    transitions :to => :closed, :from => [:open]
-  end
-
-  aasm_event :open, :before => :before, :after => :after do
-    transitions :to => :open, :from => :closed
-  end
-
-  def before_enter_open; end
-  def before_exit_open; end
-  def after_enter_open; end
-  def after_exit_open; end
-
-  def before_enter_closed; end
-  def before_exit_closed; end
-  def after_enter_closed; end
-  def after_exit_closed; end
-
-  def before; end
-  def after; end
-
-  def enter_closed; end
-  def exit_open; end
-end

data/spec/schema.rb

@@ -1,35 +0,0 @@
-ActiveRecord::Schema.define(:version => 0) do
-
-  %w{gates readers writers transients simples simple_new_dsls no_scopes thieves localizer_test_models persisted_states provided_and_persisted_states}.each do |table_name|
-    create_table table_name, :force => true do |t|
-      t.string "aasm_state"
-    end
-  end
-
-  create_table "validators", :force => true do |t|
-    t.string "name"
-    t.string "status"
-  end
-
-  create_table "transactors", :force => true do |t|
-    t.string "name"
-    t.string "status"
-    t.integer "worker_id"
-  end
-
-  create_table "workers", :force => true do |t|
-    t.string "name"
-    t.string "status"
-  end
-
-  create_table "invalid_persistors", :force => true do |t|
-    t.string "name"
-    t.string "status"
-  end
-
-  create_table "fathers", :force => true do |t|
-    t.string "aasm_state"
-    t.string "type"
-  end
-
-end