aasm 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1018c5f3c99b9124aa39e379ad07d1edc8e1a41a
-  data.tar.gz: c0f9d694a94587e857dddb747cf5eebbcec6a8e0
+  metadata.gz: 0591e36b1ec9ec8d001ad39aa0acb2a2ca1b6b1e
+  data.tar.gz: a2ea3e316659e38c6f3ac4c97ebfd9028191188a
 SHA512:
-  metadata.gz: 559fbc728a655f88f10b979ea74985c72b2705a663fd3c0b42b04cb2cc92d07c4ab65e791bc44972cb5d192030e30184e2376f6b1301ec3c28d0d612cf443f19
-  data.tar.gz: e13c9a34e666e1a03f3f7474347ca5c4da39a55649a1b34dcc2d38f97d02b84e98e439dc74324a0487a385ae6e5e9eb29570129832800042b25561f9595033b8
+  metadata.gz: aa6226703caef5b98f8a113542fb881d05a061ef0a2cd7c634ad6660620c60974fe4dd16afecd2c1be9e7dc79323ab4bfae7ae735271b04fcef23d1182ec1ad7
+  data.tar.gz: 3d6182336e70ca8b07638545441f5cf75a93f1981f87d04ca3c7fad08cef0c3b14d7c4950f55efabbf9e1411c37be2cf4e9ba0a806b9ff45f219dccb4c357a21

data/CHANGELOG.md

@@ -4,6 +4,10 @@
 
  * `aasm_human_event_name` is deprecated, use `aasm.human_event_name` instead
 
+## 4.0.2
+
+ * bugfix: really support block-guards (defined within a transition block) (see [issue #186](https://github.com/aasm/aasm/issues/186) for details)
+
 ## 4.0.1
 
  * fire guards only once per transition (see [issue #184](https://github.com/aasm/aasm/issues/184) for details)

data/README.md

@@ -270,11 +270,11 @@ If you prefer a more Ruby-like guard syntax, you can use `if` and `unless` as we
 
 ```ruby
     event :clean do
-      transitions :from => :running, :to => :cleaning, :unless => :cleaning_needed?
+      transitions :from => :running, :to => :cleaning, :if => :cleaning_needed?
     end
 
     event :sleep do
-      transitions :from => :running, :to => :sleeping, :if => :cleaning_needed?
+      transitions :from => :running, :to => :sleeping, :unless => :cleaning_needed?
     end
   end
 ```

data/gemfiles/rails_3.2.gemfile

@@ -6,7 +6,7 @@ gem 'rubysl',                           :platforms => :rbx
 gem 'rubinius-developer_tools',         :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-gem "rails", "3.2.18"
+gem "rails", "3.2.21"
 gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
 gem 'sequel'
 

data/gemfiles/rails_4.0.gemfile

@@ -6,7 +6,7 @@ gem 'rubysl',                           :platforms => :rbx
 gem 'rubinius-developer_tools',         :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-gem "rails", "4.0.5"
+gem "rails", "4.0.12"
 
 # mongoid is not yet compatible with Rails >= 4
 # gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')

data/gemfiles/rails_4.1.gemfile

@@ -6,7 +6,7 @@ gem 'rubysl',                           :platforms => :rbx
 gem 'rubinius-developer_tools',         :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-gem "rails", "4.1.1"
+gem "rails", "4.1.8"
 
 # mongoid is not yet compatible with Rails >= 4
 # gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')

data/lib/aasm/event.rb

@@ -57,15 +57,15 @@ module AASM
     end
 
     ## DSL interface
-    def transitions(definitions=nil)
+    def transitions(definitions=nil, &block)
       if definitions # define new transitions
         # Create a separate transition for each from-state to the given state
         Array(definitions[:from]).each do |s|
-          @transitions << AASM::Transition.new(attach_event_guards(definitions.merge(:from => s.to_sym)))
+          @transitions << AASM::Transition.new(attach_event_guards(definitions.merge(:from => s.to_sym)), &block)
         end
         # Create a transition if :to is specified without :from (transitions from ANY state)
         if @transitions.empty? && definitions[:to]
-          @transitions << AASM::Transition.new(attach_event_guards(definitions))
+          @transitions << AASM::Transition.new(attach_event_guards(definitions), &block)
         end
       end
       @transitions

data/lib/aasm/transition.rb

@@ -10,7 +10,7 @@ module AASM
 
       @from = opts[:from]
       @to = opts[:to]
-      @guards = Array(opts[:guard] || opts[:guards] || opts[:if])
+      @guards = Array(opts[:guards]) + Array(opts[:guard]) + Array(opts[:if])
       @unless = Array(opts[:unless]) #TODO: This could use a better name
 
       if opts[:on_transition]

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "4.0.1"
+  VERSION = "4.0.2"
 end

data/spec/models/guard_within_block.rb

@@ -0,0 +1,64 @@
+class GuardWithinBlock
+  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], :after => :transitioning do
+        guard do
+          transition_guard
+        end
+      end
+    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

data/spec/unit/callbacks_spec.rb

@@ -47,26 +47,50 @@ describe 'callbacks for the new DSL' do
     }.to raise_error(AASM::InvalidTransition)
   end
 
-  it "does not run any state callback if the transition guard fails" do
-    callback = CallbackNewDsl.new
-    callback.aasm.current_state
-
-    expect(callback).to receive(:before).once.ordered
-    expect(callback).to receive(:event_guard).once.ordered.and_return(true)
-    expect(callback).to receive(:transition_guard).once.ordered.and_return(false)
-    expect(callback).to_not receive(:before_exit_open)
-    expect(callback).to_not receive(:exit_open)
-    expect(callback).to_not receive(:transitioning)
-    expect(callback).to_not receive(:before_enter_closed)
-    expect(callback).to_not receive(:enter_closed)
-    expect(callback).to_not receive(:aasm_write_state)
-    expect(callback).to_not receive(:after_exit_open)
-    expect(callback).to_not receive(:after_enter_closed)
-    expect(callback).to_not receive(:after)
+  context "if the transition guard fails" do
+    it "does not run any state callback if guard is defined inline" do
+      callback = CallbackNewDsl.new
+      callback.aasm.current_state
+
+      expect(callback).to receive(:before).once.ordered
+      expect(callback).to receive(:event_guard).once.ordered.and_return(true)
+      expect(callback).to receive(:transition_guard).once.ordered.and_return(false)
+      expect(callback).to_not receive(:before_exit_open)
+      expect(callback).to_not receive(:exit_open)
+      expect(callback).to_not receive(:transitioning)
+      expect(callback).to_not receive(:before_enter_closed)
+      expect(callback).to_not receive(:enter_closed)
+      expect(callback).to_not receive(:aasm_write_state)
+      expect(callback).to_not receive(:after_exit_open)
+      expect(callback).to_not receive(:after_enter_closed)
+      expect(callback).to_not receive(:after)
+
+      expect {
+        callback.close!
+      }.to raise_error(AASM::InvalidTransition)
+    end
 
-    expect {
-      callback.close!
-    }.to raise_error(AASM::InvalidTransition)
+    it "does not run any state callback if guard is defined with block" do
+      callback = GuardWithinBlock.new #(:log => true, :fail_transition_guard => true)
+      callback.aasm.current_state
+
+      expect(callback).to receive(:before).once.ordered
+      expect(callback).to receive(:event_guard).once.ordered.and_return(true)
+      expect(callback).to receive(:transition_guard).once.ordered.and_return(false)
+      expect(callback).to_not receive(:before_exit_open)
+      expect(callback).to_not receive(:exit_open)
+      expect(callback).to_not receive(:transitioning)
+      expect(callback).to_not receive(:before_enter_closed)
+      expect(callback).to_not receive(:enter_closed)
+      expect(callback).to_not receive(:aasm_write_state)
+      expect(callback).to_not receive(:after_exit_open)
+      expect(callback).to_not receive(:after_enter_closed)
+      expect(callback).to_not receive(:after)
+
+      expect {
+        callback.close!
+      }.to raise_error(AASM::InvalidTransition)
+    end
   end
 
   it "should properly pass arguments" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Scott Barron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -151,6 +151,7 @@ files:
 - 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
@@ -225,6 +226,7 @@ test_files:
 - 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