aasm 4.0.8 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9602429239af9631275cb2f9c1b3c175177aea51
-  data.tar.gz: 1dc343974f7348d43882b5f15908440012dcd6e5
+  metadata.gz: e85a2c10a3cf49a548193c9634548eb38eb1578b
+  data.tar.gz: 9b87e33663caa939dbf4eeefad57ea6ebde01fac
 SHA512:
-  metadata.gz: c0c7e3300ea262db0385d2f4f403a227968ecc42cd99c0cc13eba81b2f356881b9a42b24a33191b286e1573233ca5ff8a9abdacffd51874d763494e66caabb08
-  data.tar.gz: f3ec766f78f6dd8bd9a781220764e35e28dbe0cd8217763a960675202e4001e3a647bb22db7be930a2079d0d832933bc4fc68da5aaa722a130369a2e12579942
+  metadata.gz: 1e2b255e2cae2cfae4a13c14ef8bd89f20c132ae5acf8260e68319f40646008304f05870e5cfbb2e4402b7cedc588552b777407c613b30f7e8b1787b9eac8faf
+  data.tar.gz: 41843dcb1cfa5c1147abea4420951ae3217349abd7a7918a1ef0014671218a520957c61d2d7f70ae5634514df5722466e83deb64549b463a5d3d51a323049da3

data/.travis.yml

@@ -10,7 +10,7 @@ rvm:
   - 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
@@ -18,13 +18,16 @@ 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.9.3
       gemfile: gemfiles/rails_4.1.gemfile

data/CHANGELOG.md

@@ -1,13 +1,24 @@
 # CHANGELOG
 
-## 4.1.0 (not yet released)
+## 4.2.0 (not yet released)
 
+## 4.1.1
+
+ * support block notation for `:after_commit` event callbacks (see [issue #224](https://github.com/aasm/aasm/issues/224) for details)
+ * event arguments are now passed to state callbacks as well (not only to event callbacks) (see [issue #219](https://github.com/aasm/aasm/issues/219), thanks to [@tobithiel](https://github.com/tobithiel))
+ * `AASM::InvalidTransition` now references the current object (with the state machine) and the _AASM_ event name (see [issue #217](https://github.com/aasm/aasm/issues/217), thanks to [@awsmsrc](https://github.com/awsmsrc))
+ * bugfix: do not update unloaded state for [Sequel](http://sequel.jeremyevans.net/) (see [issue #218](https://github.com/aasm/aasm/issues/218), thanks to [@godfat](https://github.com/godfat))
+
+## 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>? should return true or false only (see [issue #200](https://github.com/aasm/aasm/issues/200) for details)
+ * 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
 

data/Gemfile

@@ -1,12 +1,15 @@
 source "https://rubygems.org"
 
 gem "sqlite3",                          :platforms => :ruby
-gem "coveralls",                        :platforms => :ruby
 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

@@ -2,15 +2,15 @@
 
 [![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)
+[![Dependency Status](https://gemnasium.com/aasm/aasm.svg)](https://gemnasium.com/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
@@ -435,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
@@ -466,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.
@@ -671,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/aasm.gemspec

@@ -24,10 +24,6 @@ Gem::Specification.new do |s|
   # s.add_development_dependency 'debugger'
   s.add_development_dependency 'pry'
 
-  # 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")
   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_3.2.gemfile

@@ -1,13 +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", "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

@@ -1,16 +1,12 @@
 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.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

@@ -1,16 +1,12 @@
 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.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

@@ -1,16 +1,12 @@
 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 '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

@@ -69,8 +69,10 @@ private
       )
 
       if may_fire_to = event.may_fire?(self, *args)
-        old_state.fire_callbacks(:before_exit, self)
-        old_state.fire_callbacks(:exit, self) # TODO: remove for AASM 4?
+        old_state.fire_callbacks(:before_exit, self,
+          *process_args(event, aasm.current_state, *args))
+        old_state.fire_callbacks(:exit, self,
+          *process_args(event, aasm.current_state, *args)) # TODO: remove for AASM 4?
 
         if new_state_name = event.fire(self, {:may_fire => may_fire_to}, *args)
           aasm_fired(event, old_state, new_state_name, options, *args, &block)
@@ -90,9 +92,11 @@ private
 
     new_state = aasm.state_object_for_name(new_state_name)
 
-    new_state.fire_callbacks(:before_enter, self)
+    new_state.fire_callbacks(:before_enter, self,
+      *process_args(event, aasm.current_state, *args))
 
-    new_state.fire_callbacks(:enter, self) # TODO: remove for AASM 4?
+    new_state.fire_callbacks(:enter, self,
+      *process_args(event, aasm.current_state, *args)) # TODO: remove for AASM 4?
 
     persist_successful = true
     if persist
@@ -107,8 +111,10 @@ private
     end
 
     if persist_successful
-      old_state.fire_callbacks(:after_exit, self)
-      new_state.fire_callbacks(:after_enter, self)
+      old_state.fire_callbacks(:after_exit, self,
+        *process_args(event, aasm.current_state, *args))
+      new_state.fire_callbacks(:after_enter, self,
+        *process_args(event, aasm.current_state, *args))
       event.fire_callbacks(
         :after,
         self,
@@ -129,7 +135,7 @@ private
     end
 
     if AASM::StateMachine[self.class].config.whiny_transitions
-      raise AASM::InvalidTransition, "Event '#{event_name}' cannot transition from '#{aasm.current_state}'"
+      raise AASM::InvalidTransition.new(self, event_name) 
     else
       false
     end

data/lib/aasm/core/event.rb

@@ -12,7 +12,7 @@ module AASM::Core
 
       # from aasm4
       @options = options # QUESTION: .dup ?
-      add_options_from_dsl(@options, [:after, :before, :error, :success], &block) if block
+      add_options_from_dsl(@options, [:after, :before, :error, :success, :after_commit], &block) if block
     end
 
     # a neutered version of fire - it doesn't actually fire the event, it just

data/lib/aasm/core/state.rb

@@ -28,12 +28,12 @@ module AASM::Core
       name.to_s
     end
 
-    def fire_callbacks(action, record)
+    def fire_callbacks(action, record, *args)
       action = @options[action]
       catch :halt_aasm_chain do
         action.is_a?(Array) ?
-                action.each {|a| _fire_callbacks(a, record)} :
-                _fire_callbacks(action, record)
+                action.each {|a| _fire_callbacks(a, record, args)} :
+                _fire_callbacks(action, record, args)
       end
     end
 
@@ -66,12 +66,14 @@ module AASM::Core
       self
     end
 
-    def _fire_callbacks(action, record)
+    def _fire_callbacks(action, record, args)
       case action
         when Symbol, String
-          record.send(action)
+          arity = record.send(:method, action.to_sym).arity
+          record.send(action, *(arity < 0 ? args : args[0...arity]))
         when Proc
-          action.call(record)
+          arity = action.arity
+          action.call(record, *(arity < 0 ? args : args[0...arity]))
       end
     end
 

data/lib/aasm/errors.rb

@@ -1,5 +1,16 @@
 module AASM
-  class InvalidTransition < RuntimeError; end
+
+  class InvalidTransition < RuntimeError
+    attr_reader :object, :event_name
+    def initialize(object, event_name)
+      @object, @event_name = object, event_name
+    end
+
+    def message
+      "Event '#{event_name}' cannot transition from '#{object.aasm.current_state}'"
+    end
+  end
+
   class UndefinedState < RuntimeError; end
   class NoDirectAssignmentError < RuntimeError; end
 end

data/lib/aasm/persistence/active_record_persistence.rb

@@ -10,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
       #
@@ -166,7 +166,7 @@ module AASM
         def aasm_ensure_initial_state
           # 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 attributes.key?(self.class.aasm.attribute_name.to_s) && send(self.class.aasm.attribute_name).blank?
+          if attribute_names.include?(self.class.aasm.attribute_name.to_s) && send(self.class.aasm.attribute_name).blank?
             aasm.enter_initial_state
           end
         end
@@ -187,7 +187,7 @@ module AASM
         end
 
         def aasm_validate_states
-          unless AASM::StateMachine[self.class].config.skip_validation_on_save
+          unless aasm_skipping_validations
             if aasm.current_state && !aasm.states.include?(aasm.current_state)
               self.errors.add(AASM::StateMachine[self.class].config.column , "is invalid")
             end

data/lib/aasm/persistence/base.rb

@@ -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

data/lib/aasm/persistence/mongo_mapper_persistence.rb

@@ -0,0 +1,174 @@
+require_relative 'base'
+
+module AASM
+  module Persistence
+    module MongoMapperPersistence
+      # This method:
+      #
+      # * extends the model with ClassMethods
+      # * includes InstanceMethods
+      #
+      # Adds
+      #
+      #   before_validation :aasm_ensure_initial_state, :on => :create
+      #
+      # As a result, it doesn't matter when you define your methods - the following 2 are equivalent
+      #
+      #   class Foo
+      #     include MongoMapper::Document
+      #     def aasm_write_state(state)
+      #       "bar"
+      #     end
+      #     include AASM
+      #   end
+      #
+      #   class Foo < ActiveRecord::Base
+      #     include MongoMapper::Document
+      #     include AASM
+      #     def aasm_write_state(state)
+      #       "bar"
+      #     end
+      #   end
+      #
+      def self.included(base)
+        base.send(:include, AASM::Persistence::Base)
+        base.extend AASM::Persistence::MongoMapperPersistence::ClassMethods
+        base.send(:include, AASM::Persistence::MongoMapperPersistence::InstanceMethods)
+
+        base.before_create :aasm_ensure_initial_state
+
+        # ensure state is in the list of states
+        base.validate :aasm_validate_states
+      end
+
+      module ClassMethods
+
+        def find_in_state(number, state, *args)
+          with_state_scope(state).find!(number, *args)
+        end
+
+        def count_in_state(state, *args)
+          with_state_scope(state).count(*args)
+        end
+
+        def calculate_in_state(state, *args)
+          with_state_scope(state).calculate(*args)
+        end
+
+        protected
+        def with_state_scope(state)
+          where(aasm.attribute_name.to_sym => state.to_s)
+        end
+      end
+
+      module InstanceMethods
+
+        # Writes <tt>state</tt> to the state column and persists it to the database
+        #
+        #   foo = Foo.find(1)
+        #   foo.aasm.current_state # => :opened
+        #   foo.close!
+        #   foo.aasm.current_state # => :closed
+        #   Foo.find(1).aasm.current_state # => :closed
+        #
+        # NOTE: intended to be called from an event
+        def aasm_write_state(state)
+          old_value = read_attribute(self.class.aasm.attribute_name)
+          aasm_write_attribute state
+
+          success = if aasm_skipping_validations
+            value = aasm_raw_attribute_value state
+            self.class.where(self.class.primary_key => self.id).update_all(self.class.aasm.attribute_name => value) == 1
+          else
+            self.save
+          end
+          unless success
+            write_attribute(self.class.aasm.attribute_name, old_value)
+            return false
+          end
+
+          true
+        end
+
+        # Writes <tt>state</tt> to the state column, but does not persist it to the database
+        #
+        #   foo = Foo.find(1)
+        #   foo.aasm.current_state # => :opened
+        #   foo.close
+        #   foo.aasm.current_state # => :closed
+        #   Foo.find(1).aasm.current_state # => :opened
+        #   foo.save
+        #   foo.aasm.current_state # => :closed
+        #   Foo.find(1).aasm.current_state # => :closed
+        #
+        # NOTE: intended to be called from an event
+        def aasm_write_state_without_persistence(state)
+          aasm_write_attribute state
+        end
+
+        private
+        def aasm_enum
+          case AASM::StateMachine[self.class].config.enum
+          when false then nil
+          when true then aasm_guess_enum_method
+          when nil then aasm_guess_enum_method if aasm_column_looks_like_enum
+          else AASM::StateMachine[self.class].config.enum
+          end
+        end
+
+        def aasm_column_looks_like_enum
+          self.class.keys[self.class.aasm.attribute_name.to_s].type == Integer
+        end
+
+        def aasm_guess_enum_method
+          self.class.aasm.attribute_name.to_s.pluralize.to_sym
+        end
+
+        def aasm_skipping_validations
+          AASM::StateMachine[self.class].config.skip_validation_on_save
+        end
+
+        def aasm_write_attribute(state)
+          write_attribute self.class.aasm.attribute_name, aasm_raw_attribute_value(state)
+        end
+
+        def aasm_raw_attribute_value(state)
+          if aasm_enum
+            self.class.send(aasm_enum)[state]
+          else
+            state.to_s
+          end
+        end
+
+        # Ensures that if the aasm_state column is nil and the record is new
+        # that the initial state gets populated before validation on create
+        #
+        #   foo = Foo.new
+        #   foo.aasm_state # => nil
+        #   foo.valid?
+        #   foo.aasm_state # => "open" (where :open is the initial state)
+        #
+        #
+        #   foo = Foo.find(:first)
+        #   foo.aasm_state # => 1
+        #   foo.aasm_state = nil
+        #   foo.valid?
+        #   foo.aasm_state # => nil
+        #
+        def aasm_ensure_initial_state
+          return send("#{self.class.aasm.attribute_name}=", aasm.enter_initial_state.to_s) if send(self.class.aasm.attribute_name).blank?
+        end
+
+        def aasm_validate_states
+          send("#{self.class.aasm.attribute_name}=", aasm.enter_initial_state.to_s) if send(self.class.aasm.attribute_name).blank?
+          unless AASM::StateMachine[self.class].config.skip_validation_on_save
+            if aasm.current_state && !aasm.states.include?(aasm.current_state)
+              self.errors.add(AASM::StateMachine[self.class].config.column , "is invalid")
+            end
+          end
+        end
+      end # InstanceMethods
+
+    end
+  end # Persistence
+end # AASM

data/lib/aasm/persistence/mongoid_persistence.rb

@@ -35,11 +35,7 @@ module AASM
         base.extend AASM::Persistence::MongoidPersistence::ClassMethods
         base.send(:include, AASM::Persistence::MongoidPersistence::InstanceMethods)
 
-        # Mongoid's Validatable gem dependency goes not have a before_validation_on_xxx hook yet.
-        # base.before_validation_on_create :aasm_ensure_initial_state
-        base.before_validation :aasm_ensure_initial_state
-        # ensure initial aasm state even when validations are skipped
-        base.before_create :aasm_ensure_initial_state
+        base.after_initialize :aasm_ensure_initial_state
       end
 
       module ClassMethods

data/lib/aasm/persistence/sequel_persistence.rb

@@ -72,6 +72,7 @@ module AASM
         #
         def aasm_ensure_initial_state
           aasm.enter_initial_state if
+            (new? || values.key?(self.class.aasm.attribute_name)) &&
             send(self.class.aasm.attribute_name).to_s.strip.empty?
         end
 

data/lib/aasm/persistence.rb

@@ -10,6 +10,8 @@ module AASM
           include_persistence base, :active_record
         elsif hierarchy.include?("Mongoid::Document")
           include_persistence base, :mongoid
+        elsif hierarchy.include?("MongoMapper::Document")
+          include_persistence base, :mongo_mapper
         elsif hierarchy.include?("Sequel::Model")
           include_persistence base, :sequel
         else

data/lib/aasm/version.rb

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

data/spec/models/callbacks/with_args.rb

@@ -44,15 +44,15 @@ module Callbacks
 
     def aasm_write_state(*args); log('aasm_write_state'); true; end
 
-    def before_enter_open; log('before_enter_open'); end
-    def before_exit_open; log('before_exit_open'); end
-    def after_enter_open; log('after_enter_open'); end
-    def after_exit_open; log('after_exit_open'); end
-
-    def before_enter_closed; log('before_enter_closed'); end
-    def before_exit_closed; log('before_enter_closed'); end
-    def after_enter_closed; log('after_enter_closed'); end
-    def after_exit_closed; log('after_exit_closed'); end
+    def before_enter_open(*args); log("before_enter_open(#{args.map(&:inspect).join(',')})"); end
+    def before_exit_open(*args); log("before_exit_open(#{args.map(&:inspect).join(',')})"); end
+    def after_enter_open(*args); log("after_enter_open(#{args.map(&:inspect).join(',')})"); end
+    def after_exit_open(*args); log("after_exit_open(#{args.map(&:inspect).join(',')})"); end
+
+    def before_enter_closed(*args); log("before_enter_closed(#{args.map(&:inspect).join(',')})"); end
+    def before_exit_closed(*args); log("before_enter_closed(#{args.map(&:inspect).join(',')})"); end
+    def after_enter_closed(*args); log("after_enter_closed(#{args.map(&:inspect).join(',')})"); end
+    def after_exit_closed(*args); log("after_exit_closed(#{args.map(&:inspect).join(',')})"); end
 
     def before(arg1, *args); log("before(#{arg1.inspect},#{args.map(&:inspect).join(',')})"); end
     def transition_proc(arg1, arg2); log("transition_proc(#{arg1.inspect},#{arg2.inspect})"); end

data/spec/models/mongo_mapper/no_scope_mongo_mapper.rb

@@ -0,0 +1,10 @@
+class NoScopeMongoMapper
+  include MongoMapper::Document
+  include AASM
+
+  key :status, String
+
+  aasm :create_scopes => false, :column => :status do
+    state :ignored_scope
+  end
+end

data/spec/models/mongo_mapper/simple_mongo_mapper.rb

@@ -0,0 +1,11 @@
+class SimpleMongoMapper
+  include MongoMapper::Document
+  include AASM
+
+  key :status, String
+
+  aasm column: :status do
+    state :unknown_scope
+    state :next
+  end
+end

data/spec/models/mongo_mapper/simple_new_dsl_mongo_mapper.rb

@@ -0,0 +1,12 @@
+class SimpleNewDslMongoMapper
+  include MongoMapper::Document
+  include AASM
+
+  key :status, String
+
+  aasm :column => :status
+  aasm do
+    state :unknown_scope
+    state :next
+  end
+end

data/spec/models/mongoid/simple_new_dsl_mongoid.rb

@@ -6,7 +6,7 @@ class SimpleNewDslMongoid
 
   aasm :column => :status
   aasm do
-    state :unknown_scope
+    state :unknown_scope, :initial => true
     state :new
   end
 end

data/spec/models/validator.rb

@@ -12,6 +12,9 @@ class Validator < ActiveRecord::Base
       transitions :to => :running, :from => :sleeping
     end
     event :sleep do
+      after_commit do
+        change_name_on_sleep
+      end
       transitions :to => :sleeping, :from => :running
     end
     event :fail do
@@ -26,6 +29,11 @@ class Validator < ActiveRecord::Base
     save!
   end
 
+  def change_name_on_sleep
+    self.name = "sleeper"
+    save!
+  end
+
   def fail
     raise StandardError.new('failed on purpose')
   end

data/spec/spec_helper.rb

@@ -4,13 +4,12 @@ require 'aasm'
 
 require 'rspec'
 
-require 'coveralls'
-Coveralls.wear!
-
 # require 'ruby-debug'; Debugger.settings[:autoeval] = true; debugger; rubys_debugger = 'annoying'
 # require 'ruby-debug/completion'
 # require 'pry'
 
+SEQUEL_DB = defined?(JRUBY_VERSION) ? 'jdbc:sqlite::memory:' : 'sqlite:/'
+
 def load_schema
   config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
   ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")

data/spec/unit/callbacks_spec.rb

@@ -145,7 +145,7 @@ describe 'callbacks for the new DSL' do
 
     cb.reset_data
     cb.close!(:arg1, :arg2)
-    expect(cb.data).to eql 'before(:arg1,:arg2) before_exit_open transition_proc(:arg1,:arg2) before_enter_closed aasm_write_state after_exit_open after_enter_closed after(:arg1,:arg2)'
+    expect(cb.data).to eql 'before(:arg1,:arg2) before_exit_open(:arg1,:arg2) transition_proc(:arg1,:arg2) before_enter_closed(:arg1,:arg2) aasm_write_state after_exit_open(:arg1,:arg2) after_enter_closed(:arg1,:arg2) after(:arg1,:arg2)'
   end
 
   it "should call the callbacks given the to-state as argument" do

data/spec/unit/persistence/active_record_persistence_spec.rb

@@ -431,9 +431,14 @@ describe 'transitions with persistence' do
       it "should fire :after_commit if transaction was successful" do
         validator = Validator.create(:name => 'name')
         expect(validator).to be_sleeping
+
         validator.run!
         expect(validator).to be_running
-        expect(validator.name).not_to eq("name")
+        expect(validator.name).to eq("name changed")
+
+        validator.sleep!
+        expect(validator).to be_sleeping
+        expect(validator.name).to eq("sleeper")
       end
 
       it "should not fire :after_commit if transaction failed" do

data/spec/unit/persistence/mongo_mapper_persistance_spec.rb

@@ -0,0 +1,135 @@
+describe 'mongo_mapper' do
+  begin
+    require 'mongo_mapper'
+    require 'logger'
+    require 'spec_helper'
+
+    before(:all) do
+      Dir[File.dirname(__FILE__) + "/../../models/mongo_mapper/*.rb"].sort.each { |f| require File.expand_path(f) }
+
+      config = {
+        'test' => {
+          'database' => "mongo_mapper_#{Process.pid}"
+        }
+      }
+
+      MongoMapper.setup(config, 'test') #, :logger => Logger.new(STDERR))
+    end
+
+    after do
+      # Clear Out all non-system Mongo collections between tests
+      MongoMapper.database.collections.each do |collection|
+        collection.drop unless collection.capped? || (collection.name =~ /\Asystem/)
+      end
+    end
+
+    describe "named scopes with the old DSL" do
+
+      context "Does not already respond_to? the scope name" do
+        it "should add a scope" do
+          expect(SimpleMongoMapper).to respond_to(:unknown_scope)
+          expect(SimpleMongoMapper.unknown_scope.class).to eq(MongoMapper::Plugins::Querying::DecoratedPluckyQuery)
+          #expect(SimpleMongoMapper.unknown_scope.is_a?(ActiveRecord::Relation)).to be_truthy
+        end
+      end
+
+      context "Already respond_to? the scope name" do
+        it "should not add a scope" do
+          expect(SimpleMongoMapper).to respond_to(:next)
+          expect(SimpleMongoMapper.new.class).to eq(SimpleMongoMapper)
+        end
+      end
+
+    end
+
+    describe "named scopes with the new DSL" do
+
+      context "Does not already respond_to? the scope name" do
+        it "should add a scope" do
+          expect(SimpleNewDslMongoMapper).to respond_to(:unknown_scope)
+          expect(SimpleNewDslMongoMapper.unknown_scope.class).to eq(MongoMapper::Plugins::Querying::DecoratedPluckyQuery)
+        end
+      end
+
+      context "Already respond_to? the scope name" do
+        it "should not add a scope" do
+          expect(SimpleNewDslMongoMapper).to respond_to(:next)
+          expect(SimpleNewDslMongoMapper.new.class).to eq(SimpleNewDslMongoMapper)
+        end
+      end
+
+      it "does not create scopes if requested" do
+        expect(NoScopeMongoMapper).not_to respond_to(:ignored_scope)
+      end
+
+    end
+
+    describe "#find_in_state" do
+
+      let!(:model)    { SimpleNewDslMongoMapper.create!(:status => :unknown_scope) }
+      let!(:model_id) { model._id }
+
+      it "should respond to method" do
+        expect(SimpleNewDslMongoMapper).to respond_to(:find_in_state)
+      end
+
+      it "should find the model when given the correct scope and model id" do
+        expect(SimpleNewDslMongoMapper.find_in_state(model_id, 'unknown_scope').class).to eq(SimpleNewDslMongoMapper)
+        expect(SimpleNewDslMongoMapper.find_in_state(model_id, 'unknown_scope')).to eq(model)
+      end
+
+      it "should raise DocumentNotFound error when given incorrect scope" do
+        expect {SimpleNewDslMongoMapper.find_in_state(model_id, 'next')}.to raise_error MongoMapper::DocumentNotFound
+      end
+
+      it "should raise DocumentNotFound error when given incorrect model id" do
+        expect {SimpleNewDslMongoMapper.find_in_state('bad_id', 'unknown_scope')}.to raise_error MongoMapper::DocumentNotFound
+      end
+
+    end
+
+    describe "#count_in_state" do
+
+      before do
+        3.times { SimpleNewDslMongoMapper.create!(:status => :unknown_scope) }
+      end
+
+      it "should respond to method" do
+        expect(SimpleNewDslMongoMapper).to respond_to(:count_in_state)
+      end
+
+      it "should return n for a scope with n records persisted" do
+        expect(SimpleNewDslMongoMapper.count_in_state('unknown_scope').class).to eq(Fixnum)
+        expect(SimpleNewDslMongoMapper.count_in_state('unknown_scope')).to eq(3)
+      end
+
+      it "should return zero for a scope without records persisted" do
+        expect(SimpleNewDslMongoMapper.count_in_state('next').class).to eq(Fixnum)
+        expect(SimpleNewDslMongoMapper.count_in_state('next')).to eq(0)
+      end
+
+    end
+
+    describe "instance methods" do
+
+      let(:simple) {SimpleNewDslMongoMapper.new}
+
+      it "should call aasm_ensure_initial_state on validation before create" do
+        expect(SimpleNewDslMongoMapper.aasm.initial_state).to eq(:unknown_scope)
+        expect(SimpleNewDslMongoMapper.aasm.attribute_name).to eq(:status)
+        expect(simple.status).to eq(nil)
+        simple.valid?
+        expect(simple.status).to eq('unknown_scope')
+      end
+
+      it "should call aasm_ensure_initial_state before create, even if skipping validations" do
+        expect(simple.status).to eq(nil)
+        simple.save(:validate => false)
+        expect(simple.status).to eq('unknown_scope')
+      end
+    end
+
+  rescue LoadError
+    puts "Not running MongoMapper specs because mongo_mapper gem is not installed!!!"
+  end
+end

data/spec/unit/persistence/mongoid_persistance_spec.rb

@@ -1,6 +1,4 @@
-describe 'mongoid', :if => Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3') do
-# describe 'mongoid' do
-
+describe 'mongoid' do
   begin
     require 'mongoid'
     require 'logger'
@@ -135,15 +133,11 @@ describe 'mongoid', :if => Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version
     describe "instance methods" do
       let(:simple) {SimpleNewDslMongoid.new}
 
-      it "should call aasm_ensure_initial_state on validation before create" do
-        expect(simple).to receive(:aasm_ensure_initial_state).and_return(true)
-        simple.valid?
+      it "should initialize the aasm state on instantiation" do
+        expect(SimpleNewDslMongoid.new.status).to eql 'unknown_scope'
+        expect(SimpleNewDslMongoid.new.aasm.current_state).to eql :unknown_scope
       end
 
-      it "should call aasm_ensure_initial_state before create, even if skipping validations" do
-        expect(simple).to receive(:aasm_ensure_initial_state).and_return(true)
-        simple.save(:validate => false)
-      end
     end
 
   rescue LoadError

data/spec/unit/persistence/sequel_persistence_spec.rb

@@ -6,7 +6,8 @@ describe 'sequel' do
     require 'spec_helper'
 
     before(:all) do
-      db = Sequel.sqlite
+      db = Sequel.connect(SEQUEL_DB)
+
       # if you want to see the statements while running the spec enable the following line
       # db.loggers << Logger.new($stderr)
       db.create_table(:models) do
@@ -43,6 +44,11 @@ describe 'sequel' do
         expect(model.aasm.current_state).to eq(:alpha)
       end
 
+      it "should save the initial state" do
+        model.save
+        expect(model.status).to eq("alpha")
+      end
+
       it "should return the aasm column when new and the aasm field is not nil" do
         model.status = "beta"
         expect(model.aasm.current_state).to eq(:beta)
@@ -60,6 +66,14 @@ describe 'sequel' do
         expect(model.aasm.current_state).to be_nil
       end
 
+      it "should not change the state if state is not loaded" do
+        model.release
+        model.save
+        model.class.select(:id).first.save
+        model.reload
+        expect(model.aasm.current_state).to eq(:beta)
+      end
+
       it "should call aasm_ensure_initial_state on validation before create" do
         expect(model).to receive(:aasm_ensure_initial_state).and_return(true)
         model.valid?

data/spec/unit/transition_spec.rb

@@ -4,7 +4,12 @@ describe 'transitions' do
 
   it 'should raise an exception when whiny' do
     process = ProcessWithNewDsl.new
-    expect { process.stop! }.to raise_error(AASM::InvalidTransition)
+    expect { process.stop! }.to raise_error do |err|
+      expect(err.class).to eql(AASM::InvalidTransition)
+      expect(err.message).to eql("Event 'stop' cannot transition from 'sleeping'")
+      expect(err.object).to eql(process)
+      expect(err.event_name).to eql(:stop)
+    end
     expect(process).to be_sleeping
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 4.0.8
+  version: 4.1.1
 platform: ruby
 authors:
 - Scott Barron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,8 +91,11 @@ files:
 - callbacks.txt
 - 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
 - lib/aasm.rb
 - lib/aasm/aasm.rb
 - lib/aasm/base.rb
@@ -107,6 +110,7 @@ files:
 - lib/aasm/persistence.rb
 - lib/aasm/persistence/active_record_persistence.rb
 - lib/aasm/persistence/base.rb
+- lib/aasm/persistence/mongo_mapper_persistence.rb
 - lib/aasm/persistence/mongoid_persistence.rb
 - lib/aasm/persistence/plain_persistence.rb
 - lib/aasm/persistence/sequel_persistence.rb
@@ -132,6 +136,9 @@ files:
 - spec/models/foo.rb
 - spec/models/guardian.rb
 - spec/models/invalid_persistor.rb
+- spec/models/mongo_mapper/no_scope_mongo_mapper.rb
+- spec/models/mongo_mapper/simple_mongo_mapper.rb
+- spec/models/mongo_mapper/simple_new_dsl_mongo_mapper.rb
 - spec/models/mongoid/no_scope_mongoid.rb
 - spec/models/mongoid/simple_mongoid.rb
 - spec/models/mongoid/simple_new_dsl_mongoid.rb
@@ -159,6 +166,7 @@ files:
 - spec/unit/memory_leak_spec.rb
 - spec/unit/new_dsl_spec.rb
 - spec/unit/persistence/active_record_persistence_spec.rb
+- spec/unit/persistence/mongo_mapper_persistance_spec.rb
 - spec/unit/persistence/mongoid_persistance_spec.rb
 - spec/unit/persistence/sequel_persistence_spec.rb
 - spec/unit/reloading_spec.rb
@@ -211,6 +219,9 @@ test_files:
 - spec/models/foo.rb
 - spec/models/guardian.rb
 - spec/models/invalid_persistor.rb
+- spec/models/mongo_mapper/no_scope_mongo_mapper.rb
+- spec/models/mongo_mapper/simple_mongo_mapper.rb
+- spec/models/mongo_mapper/simple_new_dsl_mongo_mapper.rb
 - spec/models/mongoid/no_scope_mongoid.rb
 - spec/models/mongoid/simple_mongoid.rb
 - spec/models/mongoid/simple_new_dsl_mongoid.rb
@@ -238,6 +249,7 @@ test_files:
 - spec/unit/memory_leak_spec.rb
 - spec/unit/new_dsl_spec.rb
 - spec/unit/persistence/active_record_persistence_spec.rb
+- spec/unit/persistence/mongo_mapper_persistance_spec.rb
 - spec/unit/persistence/mongoid_persistance_spec.rb
 - spec/unit/persistence/sequel_persistence_spec.rb
 - spec/unit/reloading_spec.rb