aasm 4.0.6 → 4.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d4a2455383d1017cdc688cf4f01c8d9d4ce9a03
-  data.tar.gz: a100390b837f02f283afebc66dc8495df2b950e9
+  metadata.gz: 4b5ff962a4061c7b5c90ef8615cc68a91201001c
+  data.tar.gz: 5f05fb22ab55b5e2101ed50ecd270182ffa16d7d
 SHA512:
-  metadata.gz: 4d9cbefb8cfc6644923134aa679d8cbc5c672da11f428f969974777edcda43b947b2a88df6743006e384f2b5a4ecb9bc36b8c937332e144bd8af7abe5a7215d0
-  data.tar.gz: bc56510d4cf59437d92e1b2853e87b478709dbd2dc98841aa7e3b1a2c8405011a5cbef75f882b8e4c0ee755a7b16014359ac843e9fe43f05e396674de09413de
+  metadata.gz: 9cd75c3602fc6d7f0a432f8a776434f8db864998533f59227de2a617bc1f346bbaa7ef28884b3ecf242e215506d9c1f77f3fbd88c223f8b0631c2d2ea439dfc4
+  data.tar.gz: 61d2d2b38f233d7241b21a122e748cc6ded58f15475bca1a557febb4523cb288d050f0f5208d1bc3820411dbe6b7959105dfe123c5e441beb49d2379003e452d

data/.travis.yml

@@ -4,7 +4,7 @@ cache: bundler
 
 rvm:
   # - 1.8.7
-  - 1.9.2
+  # - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1
@@ -24,14 +24,6 @@ matrix:
     - rvm: rbx-2.2.1
     - rvm: jruby-19mode
   exclude:
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails_4.1.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails_4.1.gemfile
     - rvm: 1.9.3
       gemfile: gemfiles/rails_4.1.gemfile
     - rvm: jruby-19mode

data/CHANGELOG.md

@@ -5,6 +5,10 @@
  * `aasm_column` has been removed. Use `aasm.attribute_name` instead
  * `aasm_human_event_name` has been removed. Use `aasm.human_event_name` instead
 
+## 4.0.7
+
+ * bugfix: take private methods into account when checking for callbacks (see [issue #197](https://github.com/aasm/aasm/issues/197) for details)
+
 ## 4.0.6
 
  * bugfix: `false` is treated as uninitialised state (same as `nil`) (see [issue #195](https://github.com/aasm/aasm/issues/195) for details)

data/aasm.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |s|
   # s.add_development_dependency 'mime-types', '~> 1.25' # needed by coveralls (>= 2.0 needs Ruby >=1.9.2)
   # s.add_development_dependency 'coveralls'
 
+  s.platform              = Gem::Platform::RUBY
+  # s.required_ruby_version = '>= 1.9.3'
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/aasm/core/event.rb

@@ -124,8 +124,8 @@ module AASM::Core
     def invoke_callbacks(code, record, args)
       case code
         when Symbol, String
-          unless record.respond_to?(code)
-            raise NoMethodError.new("NoMethodError: undefined method `#{code}' for #{self.inspect}:#{self.class}")
+          unless record.respond_to?(code, true)
+            raise NoMethodError.new("NoMethodError: undefined method `#{code}' for #{record.inspect}:#{record.class}")
           end
           arity = record.send(:method, code.to_sym).arity
           record.send(code, *(arity < 0 ? args : args[0...arity]))

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "4.0.6"
+  VERSION = "4.0.7"
 end

data/spec/models/callbacks/private_method.rb

@@ -0,0 +1,44 @@
+module Callbacks
+  class PrivateMethod
+    include AASM
+
+    def initialize(options={})
+      @fail_event_guard = options[:fail_event_guard]
+      @fail_transition_guard = options[:fail_transition_guard]
+      @log = options[:log]
+      reset_data
+    end
+
+    def reset_data
+      @data = []
+    end
+
+    def data
+      @data.join(' ')
+    end
+
+    aasm do
+      state :open, :initial => true
+      state :closed
+
+      event :close, :after => :after_event do
+        transitions :to => :closed, :from => [:open]
+      end
+
+      event :open, :after => :after_event do
+        transitions :to => :open, :from => :closed
+      end
+    end
+
+    def log(text)
+      @data << text
+      puts text if @log
+    end
+
+    def aasm_write_state(*args); log('aasm_write_state'); true; end
+
+    private
+
+    def after_event; log('after_event'); end
+  end
+end

data/spec/unit/callbacks_spec.rb

@@ -52,6 +52,18 @@ describe 'callbacks for the new DSL' do
     }.to raise_error(AASM::InvalidTransition)
   end
 
+  it "it handles private callback methods as well" do
+    show_debug_log = false
+
+    callback = Callbacks::PrivateMethod.new(:log => show_debug_log)
+    callback.aasm.current_state
+
+    # puts "------- close!"
+    expect {
+      callback.close!
+    }.to_not raise_error
+  end
+
   context "if the transition guard fails" do
     it "does not run any state callback if guard is defined inline" do
       show_debug_log = false
@@ -279,4 +291,5 @@ describe 'event callbacks' do
       @foo.close!
     end
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.0.7
 platform: ruby
 authors:
 - Scott Barron
@@ -122,6 +122,7 @@ files:
 - spec/models/callbacks/basic.rb
 - spec/models/callbacks/guard_within_block.rb
 - spec/models/callbacks/multiple_transitions_transition_guard.rb
+- spec/models/callbacks/private_method.rb
 - spec/models/callbacks/with_args.rb
 - spec/models/callbacks/with_state_args.rb
 - spec/models/conversation.rb
@@ -200,6 +201,7 @@ test_files:
 - spec/models/callbacks/basic.rb
 - spec/models/callbacks/guard_within_block.rb
 - spec/models/callbacks/multiple_transitions_transition_guard.rb
+- spec/models/callbacks/private_method.rb
 - spec/models/callbacks/with_args.rb
 - spec/models/callbacks/with_state_args.rb
 - spec/models/conversation.rb