aasm 3.0.18 → 3.0.19

data/CHANGELOG.md

@@ -1,10 +1,13 @@
 # CHANGELOG
 
-## Unreleased
+## 3.0.19
+
+ * fixed deprecation warning with Rails 4 (Relation#update_all with conditions is deprecated)
+ * fixing issue #69 (ActiveRecord scopes are not chainable)
 
 ## 3.0.18
 
- * fixing issue #66
+ * fixing issue #66 (state methods not reflecting the current state)
 
 ## 3.0.17
 

data/README.md

@@ -80,7 +80,7 @@ class Job
     state :sleeping, :initial => true, :before_enter => :do_something
     state :running
 
-    event :run, :after => :notify_somebody do
+    event :run, :after => Proc.new { |user| notify_somebody(user) } do
       transitions :from => :sleeping, :to => :running, :on_transition => Proc.new {|obj, *args| obj.set_process(*args) }
     end
 
@@ -103,7 +103,7 @@ class Job
     ...
   end
 
-  def notify_somebody
+  def notify_somebody(user)
     ...
   end
 

data/aasm.gemspec

@@ -13,13 +13,14 @@ Gem::Specification.new do |s|
   s.date        = Time.now
   s.licenses    = ["MIT"]
 
-  s.add_development_dependency 'activerecord'
+  s.add_development_dependency 'activerecord', '3.2.12'
+  # s.add_development_dependency 'activerecord', '4.0.0.rc1'
+
   s.add_development_dependency 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
   s.add_development_dependency 'rake'
   s.add_development_dependency 'sdoc'
   s.add_development_dependency 'rspec', '~> 2.0'
   s.add_development_dependency 'rr'
-  s.add_development_dependency 'shoulda'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'minitest'
   # s.add_development_dependency 'debugger'

data/lib/aasm/persistence/active_record_persistence.rb

@@ -82,7 +82,7 @@ module AASM
           write_attribute(self.class.aasm_column, state.to_s)
 
           success = if AASM::StateMachine[self.class].config.skip_validation_on_save
-            self.class.update_all({ self.class.aasm_column => state.to_s }, self.class.primary_key => self.id) == 1
+            self.class.where(self.class.primary_key => self.id).update_all(self.class.aasm_column => state.to_s) == 1
           else
             self.save
           end

data/lib/aasm/persistence/base.rb

@@ -89,10 +89,21 @@ module AASM
       state_without_scope(name, *args)
       unless @clazz.respond_to?(name)
         if @clazz.ancestors.map {|klass| klass.to_s}.include?("ActiveRecord::Base")
-          scope_options_hash = {:conditions => { "#{@clazz.table_name}.#{@clazz.aasm_column}" => name.to_s}}
-          scope_method = ActiveRecord::VERSION::MAJOR >= 3 ? :scope : :named_scope
-          scope_options = ActiveRecord::VERSION::MAJOR >= 4 ? lambda {  where(scope_options_hash[:conditions])} : scope_options_hash
-          @clazz.send(scope_method, name, scope_options)
+
+          conditions = {"#{@clazz.table_name}.#{@clazz.aasm_column}" => name.to_s}
+          if ActiveRecord::VERSION::MAJOR >= 4
+            @clazz.class_eval do
+              scope name, lambda { where(conditions) }
+            end
+          elsif ActiveRecord::VERSION::MAJOR >= 3
+            @clazz.class_eval do
+              scope name, where(conditions)
+            end
+          else
+            @clazz.class_eval do
+              named_scope name, :conditions => conditions
+            end
+          end
         elsif @clazz.ancestors.map {|klass| klass.to_s}.include?("Mongoid::Document")
           scope_options = lambda { @clazz.send(:where, {@clazz.aasm_column.to_sym => name.to_s}) }
           @clazz.send(:scope, name, scope_options)

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "3.0.18"
+  VERSION = "3.0.19"
 end

data/spec/unit/persistence/active_record_persistence_spec.rb

@@ -81,7 +81,7 @@ describe "named scopes with the old DSL" do
   context "Does not already respond_to? the scope name" do
     it "should add a scope" do
       Simple.should respond_to(:unknown_scope)
-      Simple.unknown_scope.class.should == ActiveRecord::Relation
+      SimpleNewDsl.unknown_scope.is_a?(ActiveRecord::Relation).should be_true
     end
   end
 
@@ -99,7 +99,7 @@ describe "named scopes with the new DSL" do
   context "Does not already respond_to? the scope name" do
     it "should add a scope" do
       SimpleNewDsl.should respond_to(:unknown_scope)
-      SimpleNewDsl.unknown_scope.class.should == ActiveRecord::Relation
+      SimpleNewDsl.unknown_scope.is_a?(ActiveRecord::Relation).should be_true
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 3.0.18
+  version: 3.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -12,22 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70315275195540 !ruby/object:Gem::Requirement
+  requirement: &70095838288580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.12
   type: :development
   prerelease: false
-  version_requirements: *70315275195540
+  version_requirements: *70095838288580
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70315275193680 !ruby/object:Gem::Requirement
+  requirement: &70095838287920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315275193680
+  version_requirements: *70095838287920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70315275191760 !ruby/object:Gem::Requirement
+  requirement: &70095838287460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315275191760
+  version_requirements: *70095838287460
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70315275191120 !ruby/object:Gem::Requirement
+  requirement: &70095838287040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315275191120
+  version_requirements: *70095838287040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70315267341460 !ruby/object:Gem::Requirement
+  requirement: &70095838286540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,21 +68,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70315267341460
+  version_requirements: *70095838286540
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70315267340520 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70315267340520
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70315267339020 !ruby/object:Gem::Requirement
+  requirement: &70095838286120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315267339020
+  version_requirements: *70095838286120
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70315267338380 !ruby/object:Gem::Requirement
+  requirement: &70095838285660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315267338380
+  version_requirements: *70095838285660
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70315267336860 !ruby/object:Gem::Requirement
+  requirement: &70095838285240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315267336860
+  version_requirements: *70095838285240
 - !ruby/object:Gem::Dependency
   name: ruby-debug-completion
-  requirement: &70315267334180 !ruby/object:Gem::Requirement
+  requirement: &70095838284820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +112,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315267334180
+  version_requirements: *70095838284820
 - !ruby/object:Gem::Dependency
   name: coveralls
-  requirement: &70315267318500 !ruby/object:Gem::Requirement
+  requirement: &70095838284400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,7 +123,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315267318500
+  version_requirements: *70095838284400
 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