aasm 4.0.3 → 4.0.4

data/spec/unit/state_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe AASM::State do
+describe AASM::Core::State do
   before(:each) do
     @name    = :astate
     @options = { :crazy_custom_key => 'key' }
   end
 
   def new_state(options={})
-    AASM::State.new(@name, Conversation, @options.merge(options))
+    AASM::Core::State.new(@name, Conversation, @options.merge(options))
   end
 
   it 'should set the name' do

data/spec/unit/transition_spec.rb

@@ -51,10 +51,10 @@ end
 describe 'blocks' do
 end
 
-describe AASM::Transition do
+describe AASM::Core::Transition do
   it 'should set from, to, and opts attr readers' do
     opts = {:from => 'foo', :to => 'bar', :guard => 'g'}
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
 
     expect(st.from).to eq(opts[:from])
     expect(st.to).to eq(opts[:to])
@@ -63,7 +63,7 @@ describe AASM::Transition do
 
   it 'should set on_transition with deprecation warning' do
     opts = {:from => 'foo', :to => 'bar'}
-    st = AASM::Transition.allocate
+    st = AASM::Core::Transition.allocate
     st.should_receive(:warn).with('[DEPRECATION] :on_transition is deprecated, use :after instead')
 
     st.send :initialize, opts do
@@ -76,7 +76,7 @@ describe AASM::Transition do
 
   it 'should set after and guard from dsl' do
     opts = {:from => 'foo', :to => 'bar', :guard => 'g'}
-    st = AASM::Transition.new(opts) do
+    st = AASM::Core::Transition.new(opts) do
       guard :gg
       after :after_callback
     end
@@ -87,7 +87,7 @@ describe AASM::Transition do
 
   it 'should pass equality check if from and to are the same' do
     opts = {:from => 'foo', :to => 'bar', :guard => 'g'}
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
 
     obj = double('object')
     allow(obj).to receive(:from).and_return(opts[:from])
@@ -98,7 +98,7 @@ describe AASM::Transition do
 
   it 'should fail equality check if from are not the same' do
     opts = {:from => 'foo', :to => 'bar', :guard => 'g'}
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
 
     obj = double('object')
     allow(obj).to receive(:from).and_return('blah')
@@ -109,7 +109,7 @@ describe AASM::Transition do
 
   it 'should fail equality check if to are not the same' do
     opts = {:from => 'foo', :to => 'bar', :guard => 'g'}
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
 
     obj = double('object')
     allow(obj).to receive(:from).and_return(opts[:from])
@@ -119,17 +119,17 @@ describe AASM::Transition do
   end
 end
 
-describe AASM::Transition, '- when performing guard checks' do
+describe AASM::Core::Transition, '- when performing guard checks' do
   it 'should return true of there is no guard' do
     opts = {:from => 'foo', :to => 'bar'}
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
 
     expect(st.allowed?(nil)).to be_true
   end
 
   it 'should call the method on the object if guard is a symbol' do
     opts = {:from => 'foo', :to => 'bar', :guard => :test}
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
 
     obj = double('object')
     expect(obj).to receive(:test)
@@ -139,7 +139,7 @@ describe AASM::Transition, '- when performing guard checks' do
 
   it 'should call the method on the object if unless is a symbol' do
     opts = {:from => 'foo', :to => 'bar', :unless => :test}
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
 
     obj = double('object')
     expect(obj).to receive(:test)
@@ -149,7 +149,7 @@ describe AASM::Transition, '- when performing guard checks' do
 
   it 'should call the method on the object if guard is a string' do
     opts = {:from => 'foo', :to => 'bar', :guard => 'test'}
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
 
     obj = double('object')
     expect(obj).to receive(:test)
@@ -159,7 +159,7 @@ describe AASM::Transition, '- when performing guard checks' do
 
   it 'should call the method on the object if unless is a string' do
     opts = {:from => 'foo', :to => 'bar', :unless => 'test'}
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
 
     obj = double('object')
     expect(obj).to receive(:test)
@@ -169,7 +169,7 @@ describe AASM::Transition, '- when performing guard checks' do
 
   it 'should call the proc passing the object if the guard is a proc' do
     opts = {:from => 'foo', :to => 'bar', :guard => Proc.new { test }}
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
 
     obj = double('object')
     expect(obj).to receive(:test)
@@ -178,10 +178,10 @@ describe AASM::Transition, '- when performing guard checks' do
   end
 end
 
-describe AASM::Transition, '- when executing the transition with a Proc' do
+describe AASM::Core::Transition, '- when executing the transition with a Proc' do
   it 'should call a Proc on the object with args' do
     opts = {:from => 'foo', :to => 'bar', :after => Proc.new {|a| test(a) }}
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
     args = {:arg1 => '1', :arg2 => '2'}
     obj = double('object', :aasm => 'aasm')
 
@@ -197,7 +197,7 @@ describe AASM::Transition, '- when executing the transition with a Proc' do
     prc = Proc.new { prc_object = self }
 
     opts = {:from => 'foo', :to => 'bar', :after => prc }
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
     args = {:arg1 => '1', :arg2 => '2'}
     obj = double('object', :aasm => 'aasm')
 
@@ -206,10 +206,10 @@ describe AASM::Transition, '- when executing the transition with a Proc' do
   end
 end
 
-describe AASM::Transition, '- when executing the transition with an :after method call' do
+describe AASM::Core::Transition, '- when executing the transition with an :after method call' do
   it 'should accept a String for the method name' do
     opts = {:from => 'foo', :to => 'bar', :after => 'test'}
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
     args = {:arg1 => '1', :arg2 => '2'}
     obj = double('object', :aasm => 'aasm')
 
@@ -220,7 +220,7 @@ describe AASM::Transition, '- when executing the transition with an :after metho
 
   it 'should accept a Symbol for the method name' do
     opts = {:from => 'foo', :to => 'bar', :after => :test}
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
     args = {:arg1 => '1', :arg2 => '2'}
     obj = double('object', :aasm => 'aasm')
 
@@ -231,7 +231,7 @@ describe AASM::Transition, '- when executing the transition with an :after metho
 
   it 'should pass args if the target method accepts them' do
     opts = {:from => 'foo', :to => 'bar', :after => :test}
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
     args = {:arg1 => '1', :arg2 => '2'}
     obj = double('object', :aasm => 'aasm')
 
@@ -246,7 +246,7 @@ describe AASM::Transition, '- when executing the transition with an :after metho
 
   it 'should NOT pass args if the target method does NOT accept them' do
     opts = {:from => 'foo', :to => 'bar', :after => :test}
-    st = AASM::Transition.new(opts)
+    st = AASM::Core::Transition.new(opts)
     args = {:arg1 => '1', :arg2 => '2'}
     obj = double('object', :aasm => 'aasm')
 
@@ -261,7 +261,7 @@ describe AASM::Transition, '- when executing the transition with an :after metho
 
   it 'should allow accessing the from_state and the to_state' do
     opts = {:from => 'foo', :to => 'bar', :after => :test}
-    transition = AASM::Transition.new(opts)
+    transition = AASM::Core::Transition.new(opts)
     args = {:arg1 => '1', :arg2 => '2'}
     obj = double('object', :aasm => AASM::InstanceBase.new('object'))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Scott Barron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,59 +43,23 @@ dependencies:
 - !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: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '2.14'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.99'
   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:
-    - - "~>"
+        version: '2.14'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '2.99'
 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
@@ -124,19 +88,20 @@ files:
 - lib/aasm/aasm.rb
 - lib/aasm/base.rb
 - lib/aasm/configuration.rb
+- lib/aasm/core/event.rb
+- lib/aasm/core/state.rb
+- lib/aasm/core/transition.rb
 - lib/aasm/dsl_helper.rb
 - lib/aasm/errors.rb
-- lib/aasm/event.rb
 - lib/aasm/instance_base.rb
 - lib/aasm/localizer.rb
 - lib/aasm/persistence.rb
 - lib/aasm/persistence/active_record_persistence.rb
 - lib/aasm/persistence/base.rb
 - lib/aasm/persistence/mongoid_persistence.rb
+- lib/aasm/persistence/plain_persistence.rb
 - lib/aasm/persistence/sequel_persistence.rb
-- lib/aasm/state.rb
 - lib/aasm/state_machine.rb
-- lib/aasm/transition.rb
 - lib/aasm/version.rb
 - spec/database.rb
 - spec/database.yml
@@ -146,13 +111,15 @@ files:
 - spec/models/argument.rb
 - spec/models/auth_machine.rb
 - spec/models/bar.rb
-- spec/models/callback_new_dsl.rb
+- spec/models/callbacks/basic.rb
+- spec/models/callbacks/guard_within_block.rb
 - spec/models/callbacks/multiple_transitions_transition_guard.rb
+- spec/models/callbacks/with_args.rb
+- spec/models/callbacks/with_state_args.rb
 - spec/models/conversation.rb
 - spec/models/double_definer.rb
 - spec/models/father.rb
 - spec/models/foo.rb
-- spec/models/guard_within_block.rb
 - spec/models/guardian.rb
 - spec/models/invalid_persistor.rb
 - spec/models/mongoid/no_scope_mongoid.rb
@@ -222,13 +189,15 @@ test_files:
 - spec/models/argument.rb
 - spec/models/auth_machine.rb
 - spec/models/bar.rb
-- spec/models/callback_new_dsl.rb
+- spec/models/callbacks/basic.rb
+- spec/models/callbacks/guard_within_block.rb
 - spec/models/callbacks/multiple_transitions_transition_guard.rb
+- spec/models/callbacks/with_args.rb
+- spec/models/callbacks/with_state_args.rb
 - spec/models/conversation.rb
 - spec/models/double_definer.rb
 - spec/models/father.rb
 - spec/models/foo.rb
-- spec/models/guard_within_block.rb
 - spec/models/guardian.rb
 - spec/models/invalid_persistor.rb
 - spec/models/mongoid/no_scope_mongoid.rb

data/spec/models/callback_new_dsl.rb

@@ -1,129 +0,0 @@
-class CallbackNewDsl
-  include AASM
-
-  def initialize(options={})
-    @fail_event_guard = options[:fail_event_guard]
-    @fail_transition_guard = options[:fail_transition_guard]
-    @log = options[:log]
-  end
-
-  aasm do
-    state :open, :initial => true,
-      :before_enter => :before_enter_open,
-      :enter        => :enter_open,
-      :after_enter  => :after_enter_open,
-      :before_exit  => :before_exit_open,
-      :exit         => :exit_open,
-      :after_exit   => :after_exit_open
-
-    state :closed,
-      :before_enter => :before_enter_closed,
-      :enter        => :enter_closed,
-      :after_enter  => :after_enter_closed,
-      :before_exit  => :before_exit_closed,
-      :exit         => :exit_closed,
-      :after_exit   => :after_exit_closed
-
-    event :close, :before => :before, :after => :after, :guard => :event_guard do
-      transitions :to => :closed, :from => [:open], :guard => :transition_guard, :after => :transitioning
-    end
-
-    event :open, :before => :before, :after => :after do
-      transitions :to => :open, :from => :closed
-    end
-  end
-
-  def log(text)
-    puts text if @log
-  end
-
-  def before_enter_open; log('before_enter_open'); end
-  def enter_open; log('enter_open'); end
-  def before_exit_open; log('before_exit_open'); end
-  def after_enter_open; log('after_enter_open'); end
-  def exit_open; log('exit_open'); end
-  def after_exit_open; log('after_exit_open'); end
-
-  def before_enter_closed; log('before_enter_closed'); end
-  def enter_closed; log('enter_closed'); end
-  def before_exit_closed; log('before_exit_closed'); end
-  def exit_closed; log('exit_closed'); end
-  def after_enter_closed; log('after_enter_closed'); end
-  def after_exit_closed; log('after_exit_closed'); end
-
-  def event_guard; log('event_guard'); !@fail_event_guard; end
-  def transition_guard; log('transition_guard'); !@fail_transition_guard; end
-  def transitioning; log('transitioning'); end
-
-  def before; log('before'); end
-  def after; log('after'); end
-end
-
-class CallbackNewDslArgs
-  include AASM
-
-  aasm do
-    state :open, :initial => true,
-      :before_enter => :before_enter_open,
-      :after_enter  => :after_enter_open,
-      :before_exit  => :before_exit_open,
-      :after_exit   => :after_exit_open
-
-    state :closed,
-      :before_enter => :before_enter_closed,
-      :after_enter  => :after_enter_closed,
-      :before_exit  => :before_exit_closed,
-      :after_exit   => :after_exit_closed
-
-    event :close, :before => :before, :after => :after do
-      transitions :to => :closed, :from => [:open], :after => :transition_proc
-    end
-
-    event :open, :before => :before, :after => :after do
-      transitions :to => :open, :from => :closed
-    end
-  end
-
-  def log(text)
-    # puts text
-  end
-
-  def before_enter_open; log('before_enter_open'); end
-  def before_exit_open; log('before_exit_open'); end
-  def after_enter_open; log('after_enter_open'); end
-  def after_exit_open; log('after_exit_open'); end
-
-  def before_enter_closed; log('before_enter_closed'); end
-  def before_exit_closed; log('before_enter_closed'); end
-  def after_enter_closed; log('after_enter_closed'); end
-  def after_exit_closed; log('after_exit_closed'); end
-
-  def before(*args); log('before'); end
-  def transition_proc(arg1, arg2); log('transition_proc'); end
-  def after(*args); log('after'); end
-end
-
-class CallbackWithStateArg
-
-  include AASM
-
-  aasm do
-    state :open, :inital => true
-    state :closed
-    state :out_to_lunch
-
-    event :close, :before => :before_method, :after => :after_method do
-      transitions :to => :closed, :from => [:open], :after => :transition_method
-      transitions :to => :out_to_lunch, :from => [:open], :after => :transition_method2
-    end
-  end
-
-  def before_method(arg); end
-
-  def after_method(arg); end
-
-  def transition_method(arg); end
-
-  def transition_method2(arg); end
-
-end