aasm 4.0.7 → 4.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b5ff962a4061c7b5c90ef8615cc68a91201001c
-  data.tar.gz: 5f05fb22ab55b5e2101ed50ecd270182ffa16d7d
+  metadata.gz: 9602429239af9631275cb2f9c1b3c175177aea51
+  data.tar.gz: 1dc343974f7348d43882b5f15908440012dcd6e5
 SHA512:
-  metadata.gz: 9cd75c3602fc6d7f0a432f8a776434f8db864998533f59227de2a617bc1f346bbaa7ef28884b3ecf242e215506d9c1f77f3fbd88c223f8b0631c2d2ea439dfc4
-  data.tar.gz: 61d2d2b38f233d7241b21a122e748cc6ded58f15475bca1a557febb4523cb288d050f0f5208d1bc3820411dbe6b7959105dfe123c5e441beb49d2379003e452d
+  metadata.gz: c0c7e3300ea262db0385d2f4f403a227968ecc42cd99c0cc13eba81b2f356881b9a42b24a33191b286e1573233ca5ff8a9abdacffd51874d763494e66caabb08
+  data.tar.gz: f3ec766f78f6dd8bd9a781220764e35e28dbe0cd8217763a960675202e4001e3a647bb22db7be930a2079d0d832933bc4fc68da5aaa722a130369a2e12579942

data/.travis.yml

@@ -8,6 +8,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
+  - 2.2
   # - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-2.2.1
@@ -18,6 +19,7 @@ gemfile:
   - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.0.gemfile
   - gemfiles/rails_4.1.gemfile
+  - gemfiles/rails_4.2.gemfile
 
 matrix:
   allow_failures:

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.8
+
+ * bugfix: may_<event>? should return true or false only (see [issue #200](https://github.com/aasm/aasm/issues/200) for details)
+
 ## 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)

data/aasm.gemspec

@@ -9,10 +9,13 @@ Gem::Specification.new do |s|
   s.email       = %q{scott@elitists.net, ttilley@gmail.com, aasm@mt7.de}
   s.homepage    = %q{https://github.com/aasm/aasm}
   s.summary     = %q{State machine mixin for Ruby objects}
-  s.description = %q{AASM is a continuation of the acts as state machine rails plugin, built for plain Ruby objects.}
+  s.description = %q{AASM is a continuation of the acts-as-state-machine rails plugin, built for plain Ruby objects.}
   s.date        = Time.now
   s.licenses    = ["MIT"]
 
+  s.platform              = Gem::Platform::RUBY
+  s.required_ruby_version = '>= 1.9.3'
+
   s.add_development_dependency 'rake'
   s.add_development_dependency 'sdoc'
   s.add_development_dependency 'rspec'
@@ -25,8 +28,6 @@ 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/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,16 @@
+source "https://rubygems.org"
+
+gem "sqlite3",                          :platforms => :ruby
+gem "coveralls"
+gem 'rubysl',                           :platforms => :rbx
+gem 'rubinius-developer_tools',         :platforms => :rbx
+gem "jruby-openssl",                    :platforms => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "rails", "4.2.0"
+
+# mongoid is not yet compatible with Rails >= 4
+# gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
+
+gem 'sequel'
+
+gemspec :path => "../"

data/lib/aasm/base.rb

@@ -56,12 +56,12 @@ module AASM
     def state(name, options={})
       @state_machine.add_state(name, @klass, options)
 
-      @klass.send(:define_method, "#{name.to_s}?") do
+      @klass.send(:define_method, "#{name}?") do
         aasm.current_state == name
       end
 
-      unless @klass.const_defined?("STATE_#{name.to_s.upcase}")
-        @klass.const_set("STATE_#{name.to_s.upcase}", name)
+      unless @klass.const_defined?("STATE_#{name.upcase}")
+        @klass.const_set("STATE_#{name.upcase}", name)
       end
     end
 
@@ -72,16 +72,16 @@ module AASM
       # an addition over standard aasm so that, before firing an event, you can ask
       # may_event? and get back a boolean that tells you whether the guard method
       # on the transition will let this happen.
-      @klass.send(:define_method, "may_#{name.to_s}?") do |*args|
+      @klass.send(:define_method, "may_#{name}?") do |*args|
         aasm.may_fire_event?(name, *args)
       end
 
-      @klass.send(:define_method, "#{name.to_s}!") do |*args, &block|
-        aasm.current_event = "#{name.to_s}!".to_sym
+      @klass.send(:define_method, "#{name}!") do |*args, &block|
+        aasm.current_event = "#{name}!".to_sym
         aasm_fire_event(name, {:persist => true}, *args, &block)
       end
 
-      @klass.send(:define_method, "#{name.to_s}") do |*args, &block|
+      @klass.send(:define_method, "#{name}") do |*args, &block|
         aasm.current_event = name.to_sym
         aasm_fire_event(name, {:persist => false}, *args, &block)
       end

data/lib/aasm/instance_base.rb

@@ -76,7 +76,7 @@ module AASM
 
     def may_fire_event?(name, *args)
       if event = @instance.class.aasm.state_machine.events[name]
-        event.may_fire?(@instance, *args)
+        !!event.may_fire?(@instance, *args)
       else
         false # unknown event
       end

data/lib/aasm/persistence/active_record_persistence.rb

@@ -142,9 +142,9 @@ module AASM
 
         def aasm_raw_attribute_value(state)
           if aasm_enum
-            value = self.class.send(aasm_enum)[state]
+            self.class.send(aasm_enum)[state]
           else
-            value = state.to_s
+            state.to_s
           end
         end
 

data/lib/aasm/version.rb

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

data/spec/unit/complex_example_spec.rb

@@ -19,24 +19,24 @@ describe 'when being unsuspended' do
   it 'should be able to be unsuspended' do
     auth.activate!
     auth.suspend!
-    expect(auth.may_unsuspend?).to be_truthy
+    expect(auth.may_unsuspend?).to be true
   end
 
   it 'should not be able to be unsuspended into active' do
     auth.suspend!
-    expect(auth.may_unsuspend?(:active)).not_to be_truthy
+    expect(auth.may_unsuspend?(:active)).not_to be true
   end
 
   it 'should be able to be unsuspended into active if polite' do
     auth.suspend!
-    expect(auth.may_wait?(:waiting, :please)).to be_truthy
+    expect(auth.may_wait?(:waiting, :please)).to be true
     auth.wait!(nil, :please)
   end
 
   it 'should not be able to be unsuspended into active if not polite' do
     auth.suspend!
-    expect(auth.may_wait?(:waiting)).not_to be_truthy
-    expect(auth.may_wait?(:waiting, :rude)).not_to be_truthy
+    expect(auth.may_wait?(:waiting)).not_to be true
+    expect(auth.may_wait?(:waiting, :rude)).not_to be true
     expect {auth.wait!(nil, :rude)}.to raise_error(AASM::InvalidTransition)
     expect {auth.wait!}.to raise_error(AASM::InvalidTransition)
   end
@@ -46,7 +46,7 @@ describe 'when being unsuspended' do
     auth.suspend!
     auth.unsuspend!
 
-    expect(auth.may_unpassify?).not_to be_truthy
+    expect(auth.may_unpassify?).not_to be true
     expect {auth.unpassify!}.to raise_error(AASM::InvalidTransition)
   end
 
@@ -74,11 +74,11 @@ describe 'when being unsuspended' do
   end
 
   it "should be able to fire known events" do
-    expect(auth.aasm.may_fire_event?(:activate)).to be_truthy
+    expect(auth.aasm.may_fire_event?(:activate)).to be true
   end
 
   it "should not be able to fire unknown events" do
-    expect(auth.aasm.may_fire_event?(:unknown)).to be_falsey
+    expect(auth.aasm.may_fire_event?(:unknown)).to be false
   end
 
 end

data/spec/unit/persistence/active_record_persistence_spec.rb

@@ -257,6 +257,7 @@ describe "instance methods" do
 
 end
 
+if ActiveRecord::VERSION::MAJOR < 4 && ActiveRecord::VERSION::MINOR < 2 # won't work with Rails >= 4.2
 describe "direct state column access" do
   it "accepts false states" do
     f = FalseState.create!
@@ -266,6 +267,7 @@ describe "direct state column access" do
     }.to_not raise_error
   end
 end
+end
 
 describe 'subclasses' do
   it "should have the same states as its parent class" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 4.0.7
+  version: 4.0.8
 platform: ruby
 authors:
 - Scott Barron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -68,7 +68,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: AASM is a continuation of the acts as state machine rails plugin, built
+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
 executables: []
@@ -92,6 +92,7 @@ files:
 - gemfiles/rails_3.2.gemfile
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
 - lib/aasm.rb
 - lib/aasm/aasm.rb
 - lib/aasm/base.rb
@@ -177,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="