aasm 4.0.3 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d198d23fad17dc052b4135e5ef02470edd8e146
-  data.tar.gz: 85019079c1b7cfb236cf529b833561ba35030d51
+  metadata.gz: a07996d6cd3f0270a6ec9d010a904cebd462b6a7
+  data.tar.gz: 57e8efc5d284371e23c50d41771beb3172787bdd
 SHA512:
-  metadata.gz: c1a3a8f5df97b012148fa50b79150d218f0dad130a4014e68502a2982b98ab3a6b79148832dac285321901366ab5ec976af11a5f431966ac528d60d5c62dcc5c
-  data.tar.gz: 9e09e2ec97235c8761fd34a4c884cb6d9579e9960acf02815f472e0068586b8c4d2ff50b6d08d71f6571f31d81aa9cf345b94784d7cde1a066b1ddf0f44c466b
+  metadata.gz: 0e1f53507bcbcf9deecce7193a5fed9f37ae5fbc91b6325f127820ead35113e19bea7dba6f87af9482affac31462b05e1b6c89a87ef61a47ad93d95c07f19179
+  data.tar.gz: 9da9eea4b58047190c441dc42c120fed864c318828340cc61505601f70179736d9cc70a0f60166bae13c6fc6aa3f3c8c4569047915a0af72ab152f30ce5422fd

data/.travis.yml

@@ -1,13 +1,16 @@
+sudo: false
 language: ruby
+cache: bundler
 
 rvm:
   # - 1.8.7
-  - 1.9.2
+  # - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1
+  - 2.2
   # - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
+  - jruby-1.7 # JRuby in 1.9 mode
   - rbx-2.2.1
 
 services: mongodb
@@ -15,21 +18,17 @@ services: mongodb
 gemfile:
   - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.0.gemfile
+  - gemfiles/rails_4.0_bson1.gemfile
   - gemfiles/rails_4.1.gemfile
+  - gemfiles/rails_4.1_bson1.gemfile
+  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_4.2_bson1.gemfile
 
 matrix:
   allow_failures:
     - rvm: rbx-2.2.1
-    - rvm: jruby-19mode
+    - rvm: jruby-1.7
   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

@@ -1,10 +1,37 @@
 # CHANGELOG
 
-## 4.1.0 (not yet released)
+## 4.2.0 (not yet released)
 
+## 4.1.0
+
+ * bugfix: initialize the aasm state column after initialization of the _Mongoid_ instance (see [issue #206](https://github.com/aasm/aasm/issues/206), thanks to [@Shwetakale ](https://github.com/Shwetakale ))
+ * added support for mongomapper ORM (see [issue #203](https://github.com/aasm/aasm/issues/203), thanks to [@reidmorrison ](https://github.com/reidmorrison ))
  * `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_name? 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)
+
+## 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)
+ * bugfix: an event's `:error` callback now retrieves all arguments passed to the event (see [issue #196](https://github.com/aasm/aasm/issues/196) for details)
+
+## 4.0.5
+
+ * bugfix: initialize the aasm state column after initialization of the _ActiveRecord_ instance only if the attribute has been loaded (see [issue #193](https://github.com/aasm/aasm/issues/193) for details)
+
+## 4.0.4
+
+ * corrected callback order in README
+ * bugfix: initialize the aasm state column after initialization of the _ActiveRecord_ instance (see [issue #191](https://github.com/aasm/aasm/issues/191) for details)
+ * bugfix: avoid Rails autoloading conflicts (see [issue #137](https://github.com/aasm/aasm/issues/137) and [issue #139](https://github.com/aasm/aasm/issues/139) for details)
+
 ## 4.0.3
 
  * bugfix: fire guards only once per transition, part 2 (see [issue #187](https://github.com/aasm/aasm/issues/187) for details)

data/Gemfile

@@ -1,12 +1,16 @@
 source "https://rubygems.org"
 
 gem "sqlite3",                          :platforms => :ruby
-gem "coveralls",                        :platforms => :ruby
+gem "coveralls"
 gem 'rubysl',                           :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 gem "rails", "~>4.1"
-gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
+gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
 gem 'sequel'
+# Since mongoid V4 requires incompatible bson V2, cannot have mongoid (V4 or greater)
+# and mongo_mapper ( or mongo ) in the same application
+#gem 'mongo_mapper', '~> 0.13'
+#gem 'bson_ext',                          :platforms => :ruby
 
 gemspec

data/README.md

@@ -1,16 +1,16 @@
 # AASM - Ruby state machines
 
-<a href="http://badge.fury.io/rb/aasm"><img src="https://badge.fury.io/rb/aasm@2x.png" alt="Gem Version" height="18"></a>
+[![Gem Version](https://badge.fury.io/rb/aasm.svg)](http://badge.fury.io/rb/aasm)
 [![Build Status](https://travis-ci.org/aasm/aasm.svg?branch=master)](https://travis-ci.org/aasm/aasm)
-[![Code Climate](https://codeclimate.com/github/aasm/aasm.png)](https://codeclimate.com/github/aasm/aasm)
-[![Coverage Status](https://coveralls.io/repos/aasm/aasm/badge.png?branch=master)](https://coveralls.io/r/aasm/aasm)
+[![Code Climate](https://codeclimate.com/github/aasm/aasm/badges/gpa.svg)](https://codeclimate.com/github/aasm/aasm)
+[![Coverage Status](https://img.shields.io/coveralls/aasm/aasm.svg)](https://coveralls.io/r/aasm/aasm?branch=master)
 
 This package contains AASM, a library for adding finite state machines to Ruby classes.
 
 AASM started as the *acts_as_state_machine* plugin but has evolved into a more generic library
 that no longer targets only ActiveRecord models. It currently provides adapters for
-[ActiveRecord](http://api.rubyonrails.org/classes/ActiveRecord/Base.html) and
-[Mongoid](http://mongoid.org/), but it can be used for any Ruby class, no matter what
+[ActiveRecord](http://api.rubyonrails.org/classes/ActiveRecord/Base.html),
+[Mongoid](http://mongoid.org/), and [Mongomapper](http://mongomapper.com/) but it can be used for any Ruby class, no matter what
 parent class it has (if any).
 
 ## Upgrade from version 3 to 4
@@ -145,11 +145,11 @@ begin
   transition      guards
   old_state       before_exit
   old_state       exit
+  transition      after
   new_state       before_enter
   new_state       enter
-    ...update state...
-    transition    after
-    event         success             # if persist successful
+  ...update state...
+  event         success             # if persist successful
   old_state       after_exit
   new_state       after_enter
   event           after
@@ -172,7 +172,7 @@ Note that when passing arguments to a state transition, the first argument must
 In case of an error during the event processing the error is rescued and passed to `:error`
 callback, which can handle it or re-raise it for further propagation.
 
-During the `:on_transition` callback (and reliably only then) you can access the
+During the transition's `:after` callback (and reliably only then) you can access the
 originating state (the from-state) and the target state (the to state), like this:
 
 ```ruby
@@ -347,7 +347,9 @@ job.run!  # saved
 
 Saving includes running all validations on the `Job` class. If you want make sure
 the state gets saved without running validations (and thereby maybe persisting an
-invalid object state), simply tell AASM to skip the validations:
+invalid object state), simply tell AASM to skip the validations. Be aware, that
+when skipping validations, only the state column will be updated in the database
+(just like ActiveRecord `change_column` is working).
 
 ```ruby
 class Job < ActiveRecord::Base
@@ -433,7 +435,7 @@ to ```false```.
 
 ### Sequel
 
-AASM also supports [Sequel](http://sequel.jeremyevans.net/) besides _ActiveRecord_ and _Mongoid_.
+AASM also supports [Sequel](http://sequel.jeremyevans.net/) besides _ActiveRecord_, _Mongoid_, and _MongoMapper_.
 
 ```ruby
 class Job < Sequel::Model
@@ -464,6 +466,23 @@ class Job
 end
 ```
 
+### MongoMapper
+
+AASM also supports persistence to Mongodb if you're using MongoMapper. Make sure
+to include MongoMapper::Document before you include AASM.
+
+```ruby
+class Job
+  include MongoMapper::Document
+  include AASM
+
+  key :aasm_state,                   Symbol
+  aasm do
+    ...
+  end
+end
+```
+
 ### Automatic Scopes
 
 AASM will automatically create scope methods for each state in the model.
@@ -669,7 +688,7 @@ purpose.
 
 ## License ##
 
-Copyright (c) 2006-2014 Scott Barron
+Copyright (c) 2006-2015 Scott Barron
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README_FROM_VERSION_3_TO_4.md

@@ -139,7 +139,7 @@ to
 ```ruby
 job = Job.new
 
-job.aasm.events(:permitted => true)
+job.aasm.events(:permitted => true).map(&:name)
 # => [:run]
 ```
 

data/aasm.gemspec

@@ -9,24 +9,23 @@ 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.add_development_dependency 'activerecord', '3.2.15'
-  # s.add_development_dependency 'activerecord', '4.0.1'
+  s.platform              = Gem::Platform::RUBY
+  s.required_ruby_version = '>= 1.9.3'
 
-  # 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.14'
-  s.add_development_dependency 'rr'
-  # s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'rspec'
+
+  # debugging
   # s.add_development_dependency 'debugger'
-  # s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry'
 
-  s.add_development_dependency 'mime-types', '~> 1.25' # needed by coveralls (>= 2.0 needs Ruby >=1.9.2)
+  # test coverage
+  # s.add_development_dependency 'mime-types', '~> 1.25' # needed by coveralls (>= 2.0 needs Ruby >=1.9.2)
   # s.add_development_dependency 'coveralls'
 
   s.files         = `git ls-files`.split("\n")

data/gemfiles/rails_3.2.gemfile

@@ -7,7 +7,9 @@ gem 'rubinius-developer_tools',         :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 gem "rails", "3.2.21"
-gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
+gem 'mongoid', '~>3.1' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
 gem 'sequel'
+gem 'mongo_mapper', '~>0.13'
+gem 'bson_ext',                          :platforms => :ruby
 
 gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -6,11 +6,8 @@ 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.12"
-
-# mongoid is not yet compatible with Rails >= 4
-# gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
-
+gem "rails", "4.0.13"
+gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
 gem 'sequel'
 
 gemspec :path => "../"

data/gemfiles/rails_4.0_bson1.gemfile

@@ -0,0 +1,14 @@
+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.0.13"
+gem 'sequel'
+gem 'mongo_mapper', '~>0.13'
+gem 'bson_ext',                          :platforms => :ruby
+
+gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -6,11 +6,8 @@ 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.8"
-
-# mongoid is not yet compatible with Rails >= 4
-# gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
-
+gem "rails", "4.1.9"
+gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
 gem 'sequel'
 
 gemspec :path => "../"

data/gemfiles/rails_4.1_bson1.gemfile

@@ -0,0 +1,14 @@
+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.1.9"
+gem 'sequel'
+gem 'mongo_mapper', '~> 0.13'
+gem 'bson_ext',                          :platforms => :ruby
+
+gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,13 @@
+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"
+gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
+gem 'sequel'
+
+gemspec :path => "../"

data/gemfiles/rails_4.2_bson1.gemfile

@@ -0,0 +1,14 @@
+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"
+gem 'sequel'
+gem 'mongo_mapper'
+gem 'bson_ext',                          :platforms => :ruby
+
+gemspec :path => "../"

data/lib/aasm/aasm.rb

@@ -40,24 +40,6 @@ module AASM
     @aasm ||= AASM::InstanceBase.new(self)
   end
 
-  # may be overwritten by persistence mixins
-  def aasm_read_state
-    # all the following lines behave like @current_state ||= aasm.enter_initial_state
-    current = aasm.instance_variable_get("@current_state")
-    return current if current
-    aasm.instance_variable_set("@current_state", aasm.enter_initial_state)
-  end
-
-  # may be overwritten by persistence mixins
-  def aasm_write_state(new_state)
-    true
-  end
-
-  # may be overwritten by persistence mixins
-  def aasm_write_state_without_persistence(new_state)
-    true
-  end
-
 private
 
   # Takes args and a from state and removes the first
@@ -99,7 +81,7 @@ private
         aasm_failed(event_name, old_state)
       end
     rescue StandardError => e
-      event.fire_callbacks(:error, self, e) || raise(e)
+      event.fire_callbacks(:error, self, e, *process_args(event, aasm.current_state, *args)) || raise(e)
     end
   end
 

data/lib/aasm/base.rb

@@ -56,32 +56,32 @@ 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
 
     # define an event
     def event(name, options={}, &block)
-      @state_machine.events[name] = AASM::Event.new(name, options, &block)
+      @state_machine.events[name] = AASM::Core::Event.new(name, options, &block)
 
       # 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/{event.rb → core/event.rb}

@@ -1,4 +1,4 @@
-module AASM
+module AASM::Core
   class Event
     include DslHelper
 
@@ -61,11 +61,11 @@ module AASM
       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)), &block)
+          @transitions << AASM::Core::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), &block)
+          @transitions << AASM::Core::Transition.new(attach_event_guards(definitions), &block)
         end
       end
       @transitions
@@ -124,14 +124,22 @@ module AASM
     def invoke_callbacks(code, record, args)
       case code
         when Symbol, String
-          record.send(code, *args)
+          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]))
           true
+
         when Proc
-          record.instance_exec(*args, &code)
+          arity = code.arity
+          record.instance_exec(*(arity < 0 ? args : args[0...arity]), &code)
           true
+
         when Array
           code.each {|a| invoke_callbacks(a, record, args)}
           true
+
         else
           false
       end

data/lib/aasm/{state.rb → core/state.rb}

@@ -1,4 +1,4 @@
-module AASM
+module AASM::Core
   class State
     attr_reader :name, :options
 

data/lib/aasm/{transition.rb → core/transition.rb}

@@ -1,4 +1,4 @@
-module AASM
+module AASM::Core
   class Transition
     include DslHelper
 
@@ -50,11 +50,9 @@ module AASM
 
       case code
       when Symbol, String
-        # QUESTION : record.send(code, *args) ?
         arity = record.send(:method, code.to_sym).arity
         arity == 0 ? record.send(code) : record.send(code, *args)
       when Proc
-        # QUESTION : record.instance_exec(*args, &code) ?
         code.arity == 0 ? record.instance_exec(&code) : record.instance_exec(*args, &code)
       when Array
         if options[:guard]

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

@@ -1,3 +1,5 @@
+require_relative 'base'
+
 module AASM
   module Persistence
     module ActiveRecordPersistence
@@ -8,7 +10,7 @@ module AASM
       #
       # Adds
       #
-      #   before_validation :aasm_ensure_initial_state, :on => :create
+      #   after_initialize :aasm_ensure_initial_state
       #
       # As a result, it doesn't matter when you define your methods - the following 2 are equivalent
       #
@@ -31,15 +33,10 @@ module AASM
         base.extend AASM::Persistence::ActiveRecordPersistence::ClassMethods
         base.send(:include, AASM::Persistence::ActiveRecordPersistence::InstanceMethods)
 
-        if ActiveRecord::VERSION::MAJOR >= 3
-          base.before_validation(:aasm_ensure_initial_state, :on => :create)
-        else
-          base.before_validation_on_create(:aasm_ensure_initial_state)
+        base.after_initialize do
+          aasm_ensure_initial_state
         end
 
-        # ensure initial aasm state even when validations are skipped
-        base.before_create(:aasm_ensure_initial_state)
-
         # ensure state is in the list of states
         base.validate :aasm_validate_states
       end
@@ -145,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
 
@@ -167,7 +164,11 @@ module AASM
         #   foo.aasm_state # => nil
         #
         def aasm_ensure_initial_state
-          aasm.enter_initial_state if send(self.class.aasm.attribute_name).blank?
+          # checking via respond_to? does not work in Rails <= 3
+          # if respond_to?(self.class.aasm.attribute_name) && send(self.class.aasm.attribute_name).blank? # Rails 4
+          if attribute_names.include?(self.class.aasm.attribute_name.to_s) && send(self.class.aasm.attribute_name).blank?
+            aasm.enter_initial_state
+          end
         end
 
         def aasm_fire_event(name, options, *args, &block)
@@ -195,5 +196,5 @@ module AASM
       end # InstanceMethods
 
     end
-  end
-end
+  end # Persistence
+end # AASM

data/lib/aasm/persistence/base.rb

@@ -37,7 +37,7 @@ module AASM
         if new_record?
           state.blank? ? aasm.determine_state_name(self.class.aasm.initial_state) : state.to_sym
         else
-          state.nil? ? nil : state.to_sym
+          state.blank? ? nil : state.to_sym
         end
       end
 
@@ -71,6 +71,9 @@ module AASM
         elsif @klass.ancestors.map {|klass| klass.to_s}.include?("Mongoid::Document")
           scope_options = lambda { @klass.send(:where, {@klass.aasm.attribute_name.to_sym => name.to_s}) }
           @klass.send(:scope, name, scope_options)
+        elsif @klass.ancestors.map {|klass| klass.to_s}.include?("MongoMapper::Document")
+          conditions = { @klass.aasm.attribute_name.to_sym => name.to_s }
+          @klass.scope(name, lambda { @klass.where(conditions) })
         end
       end
     end