aasm 4.5.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92b6a0df28245debe06c0ecbd3bd95e91b0cf323
-  data.tar.gz: 99bfa6652b17a26388b073ee431a1878ce961a4e
+  metadata.gz: 5b8d8a7ce2210a49761c9f1c622393a1bc453452
+  data.tar.gz: 1239b8468c521eb11bdbfef04d58540a6d1e5b72
 SHA512:
-  metadata.gz: d6cf5a7eea74d1c20108d48370d0f6048722efefb6af0110c70de56dd13032bcaabf57749add95ae25dc086faab8cbb5dcf9ad08ad4cafbafdfb400481ce1fd4
-  data.tar.gz: 90a92ba66f2b4d67c898a9076f324e0c99ce768aa5160f6d70dc74bca48e8ba4cf95317bf5e203b66985e9dcd77a52fb814dc65cc45f498dfeab20fde31fecb8
+  metadata.gz: 7b8f2affa363cce45636f684c24e2f72d71cb0a5af4fce0303894a77eb9db7fb37f08442c4b4b1955d7aaae042225ec4b3e52b27ffafe5cbb0c765c15498cf65
+  data.tar.gz: d9769d7cfd98b28e98f8a79c9b0b823cabec8b721bf5bdfaaae3dac37ca2b6127c38b42d427ed2fd451a67987c2371e36f4b46df09e0b4042fb1abb2c44320cd

data/.gitignore

@@ -17,3 +17,4 @@ alto
 .rspec
 .bundle
 tags
+tmp

data/.travis.yml

@@ -11,12 +11,13 @@ rvm:
   - 2.2
   # - jruby-18mode # JRuby in 1.8 mode
   - jruby-1.7 # JRuby in 1.9 mode
+  - jruby-9.0.3.0
   - rbx-2.2.1
 
 services: mongodb
 
 gemfile:
-  - gemfiles/rails_3.2.gemfile
+  - gemfiles/rails_3.2_stable.gemfile
   - gemfiles/rails_4.0.gemfile
   - gemfiles/rails_4.0_mongo_mapper.gemfile
   - gemfiles/rails_4.1.gemfile

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 4.6.0
+
+ * fix: make sure the column is actually present for _ActiveRecord_ enums (see [issue #265](https://github.com/aasm/aasm/issues/265) and [issue #152](https://github.com/aasm/aasm/issues/152) for details, thanks to [@anilmaurya](https://github.com/anilmaurya))
+* add generators to configure active_record and mongoid after install (see [issue #261](https://github.com/aasm/aasm/issues/261) for details, thanks to [@anilmaurya](https://github.com/anilmaurya))
+
+## 4.5.2
+
+ * fix arity difference between Procs and lambdas (see [issue #293](https://github.com/aasm/aasm/issues/293) for details)
+
+## 4.5.1
+
+ * make sure to use override configuration options if state machine is defined more than once (see [issue #287](https://github.com/aasm/aasm/issues/287) for details)
+
 ## 4.5.0
 
  * add RSpec matchers `have_state`, `allow_event` and `allow_transition_to` (see [issue #147](https://github.com/aasm/aasm/issues/147) for details)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2015 Scott Barron
+Copyright (c) 2006-2016 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.md

@@ -615,7 +615,7 @@ callback or the state update fails, all changes to any database record are rolle
 Mongodb does not support transactions.
 
 If you want to make sure a depending action happens only after the transaction is committed,
-use the `after_commit` callback, like this:
+use the `after_commit` callback along with the auto-save (bang) methods, like this:
 
 ```ruby
 class Job < ActiveRecord::Base
@@ -634,6 +634,18 @@ class Job < ActiveRecord::Base
     ...
   end
 end
+
+job = Job.where(state: 'sleeping').first!
+job.run! # Saves the model and triggers the after_commit callback
+```
+
+Note that the following will not run the `after_commit` callbacks because
+the auto-save method is not used:
+
+```ruby
+job = Job.where(state: 'sleeping').first!
+job.run
+job.save! #notify_about_running_job is not run
 ```
 
 If you want to encapsulate state changes within an own transaction, the behavior
@@ -779,6 +791,17 @@ gem 'aasm'
 % sudo gem install pkg/aasm-x.y.z.gem
 ```
 
+### Generators
+
+After installing Aasm you can run generator:
+
+```sh
+% rails generate aasm NAME [COLUMN_NAME]
+```
+Replace NAME with the Model name, COLUMN_NAME is optional(default is 'aasm_state'). 
+This will create a model (if one does not exist) and configure it with aasm block.
+For Active record orm a migration file is added to add aasm state column to table.
+
 ## Latest changes ##
 
 Take a look at the [CHANGELOG](https://github.com/aasm/aasm/blob/master/CHANGELOG.md) for details about recent changes to the current version.
@@ -816,7 +839,7 @@ purpose.
 
 ## License ##
 
-Copyright (c) 2006-2015 Scott Barron
+Copyright (c) 2006-2016 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

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'sdoc'
   s.add_development_dependency 'rspec', ">= 3"
+  s.add_development_dependency 'generator_spec'
 
   # debugging
   # s.add_development_dependency 'debugger'

data/gemfiles/{rails_3.2.gemfile → rails_3.2_stable.gemfile}

@@ -5,10 +5,11 @@ 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 "rails", :github => "rails/rails",  :branch => "3-2-stable"
 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
+gem 'test-unit', '~> 3.0'
 
 gemspec :path => "../"

data/lib/aasm/aasm.rb

@@ -39,7 +39,20 @@ module AASM
       AASM::StateMachine[self][state_machine_name] ||= AASM::StateMachine.new(state_machine_name)
 
       @aasm ||= {}
-      @aasm[state_machine_name] ||= AASM::Base.new(self, state_machine_name, AASM::StateMachine[self][state_machine_name], options)
+      if @aasm[state_machine_name]
+        # make sure to use provided options
+        options.each do |key, value|
+          @aasm[state_machine_name].state_machine.config.send("#{key}=", value)
+        end
+      else
+        # create a new base
+        @aasm[state_machine_name] = AASM::Base.new(
+          self,
+          state_machine_name,
+          AASM::StateMachine[self][state_machine_name],
+          options
+        )
+      end
       @aasm[state_machine_name].instance_eval(&block) if block # new DSL
       @aasm[state_machine_name]
     end

data/lib/aasm/core/transition.rb

@@ -55,7 +55,7 @@ module AASM::Core
         arity = record.send(:method, code.to_sym).arity
         arity == 0 ? record.send(code) : record.send(code, *args)
       when Proc
-        code.arity == 0 ? record.instance_exec(&code) : record.instance_exec(*args, &code)
+        code.parameters.size == 0 ? record.instance_exec(&code) : record.instance_exec(*args, &code)
       when Array
         if options[:guard]
           # invoke guard callbacks

data/lib/aasm/persistence/active_record_persistence.rb

@@ -57,16 +57,12 @@ module AASM
 
           success = if aasm_skipping_validations(name)
             value = aasm_raw_attribute_value(state, name)
-            self.class.where(self.class.primary_key => self.id).update_all(self.class.aasm(name).attribute_name => value) == 1
+            aasm_update_column(name, value)
           else
             self.save
           end
-          unless success
-            write_attribute(self.class.aasm(name).attribute_name, old_value)
-            return false
-          end
 
-          true
+          success ? true : aasm_rollback(name, old_value)
         end
 
         # Writes <tt>state</tt> to the state column, but does not persist it to the database
@@ -86,6 +82,16 @@ module AASM
         end
 
       private
+
+        def aasm_update_column(name, value)
+          self.class.where(self.class.primary_key => self.id).update_all(self.class.aasm(name).attribute_name => value) == 1
+        end
+
+        def aasm_rollback(name, old_value)
+          write_attribute(self.class.aasm(name).attribute_name, old_value)
+          false
+        end
+
         def aasm_enum(name=:default)
           case AASM::StateMachine[self.class][name].config.enum
             when false then nil
@@ -96,7 +102,10 @@ module AASM
         end
 
         def aasm_column_looks_like_enum(name=:default)
-          self.class.columns_hash[self.class.aasm(name).attribute_name.to_s].type == :integer
+          column_name = self.class.aasm(name).attribute_name.to_s
+          column = self.class.columns_hash[column_name]
+          raise NoMethodError.new("undefined method '#{column_name}' for #{self.class}") if column.nil?
+          column.type == :integer
         end
 
         def aasm_guess_enum_method(name=:default)
@@ -120,7 +129,7 @@ module AASM
         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
+        # then the initial state gets populated before validation on create
         #
         #   foo = Foo.new
         #   foo.aasm_state # => nil
@@ -138,12 +147,17 @@ module AASM
           AASM::StateMachine[self.class].keys.each do |state_machine_name|
             # checking via respond_to? does not work in Rails <= 3
             # if respond_to?(self.class.aasm(state_machine_name).attribute_name) && send(self.class.aasm(state_machine_name).attribute_name).blank? # Rails 4
-            if attribute_names.include?(self.class.aasm(state_machine_name).attribute_name.to_s) && send(self.class.aasm(state_machine_name).attribute_name).blank?
+            if aasm_column_is_blank?(state_machine_name)
               aasm(state_machine_name).enter_initial_state
             end
           end
         end
 
+        def aasm_column_is_blank?(state_machine_name)
+          attribute_name = self.class.aasm(state_machine_name).attribute_name
+          attribute_names.include?(attribute_name.to_s) && send(attribute_name).blank?
+        end
+
         def aasm_fire_event(state_machine_name, name, options, *args, &block)
           success = options[:persist] ? self.class.transaction(:requires_new => requires_new?(state_machine_name)) { super } : super
 
@@ -162,12 +176,16 @@ module AASM
         def aasm_validate_states
           AASM::StateMachine[self.class].keys.each do |state_machine_name|
             unless aasm_skipping_validations(state_machine_name)
-              if aasm(state_machine_name).current_state && !aasm(state_machine_name).states.include?(aasm(state_machine_name).current_state)
+              if aasm_invalid_state?(state_machine_name)
                 self.errors.add(AASM::StateMachine[self.class][state_machine_name].config.column , "is invalid")
               end
             end
           end
         end
+
+        def aasm_invalid_state?(state_machine_name)
+          aasm(state_machine_name).current_state && !aasm(state_machine_name).states.include?(aasm(state_machine_name).current_state)
+        end
       end # InstanceMethods
 
     end

data/lib/aasm/persistence/base.rb

@@ -55,35 +55,62 @@ module AASM
     # make sure to create a (named) scope for each state
     def state_with_scope(name, *args)
       state_without_scope(name, *args)
-      if @state_machine.config.create_scopes && !@klass.respond_to?(name)
+      create_scope(name) if create_scope?(name)
+    end
+    alias_method :state_without_scope, :state
+    alias_method :state, :state_with_scope
 
-        if @klass.ancestors.map {|klass| klass.to_s}.include?("ActiveRecord::Base")
-          conditions = {"#{@klass.table_name}.#{@klass.aasm(@name).attribute_name}" => name.to_s}
-          if ActiveRecord::VERSION::MAJOR >= 3
-            @klass.class_eval do
-              scope name, lambda { where(conditions) }
-            end
-          else
-            @klass.class_eval do
-              named_scope name, :conditions => conditions
-            end
-          end
-        elsif @klass.ancestors.map {|klass| klass.to_s}.include?("Mongoid::Document")
-          klass = @klass
-          state_machine_name = @name
-          scope_options = lambda {
-            klass.send(:where, {klass.aasm(state_machine_name).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(@name).attribute_name.to_sym => name.to_s }
-          @klass.scope(name, lambda { @klass.where(conditions) })
-        end
+    private
+
+    def create_scope?(name)
+      @state_machine.config.create_scopes && !@klass.respond_to?(name)
+    end
 
+    def create_scope(name)
+      if ancestors_include?("ActiveRecord::Base")
+        create_for_active_record(name)
+      elsif ancestors_include?("Mongoid::Document")
+        create_for_mongoid(name)
+      elsif ancestors_include?("MongoMapper::Document")
+        create_for_mongomapper(name)
       end
     end
-    alias_method :state_without_scope, :state
-    alias_method :state, :state_with_scope
+
+    def ancestors_include?(class_name)
+      @klass.ancestors.map { |klass| klass.to_s }.include?(class_name)
+    end
+
+    def create_for_active_record(name)
+      conditions = {
+        "#{@klass.table_name}.#{@klass.aasm(@name).attribute_name}" => name.to_s
+      }
+      if ActiveRecord::VERSION::MAJOR >= 3
+        @klass.class_eval do
+          scope name, lambda { where(conditions) }
+        end
+      else
+        @klass.class_eval do
+          named_scope name, :conditions => conditions
+        end
+      end
+    end
+
+    def create_for_mongoid(name)
+      klass = @klass
+      state_machine_name = @name
+      scope_options = lambda {
+        klass.send(
+          :where,
+          { klass.aasm(state_machine_name).attribute_name.to_sym => name.to_s }
+        )
+      }
+      @klass.send(:scope, name, scope_options)
+    end
+
+    def create_for_mongomapper(name)
+      conditions = { @klass.aasm(@name).attribute_name.to_sym => name.to_s }
+      @klass.scope(name, lambda { @klass.where(conditions) })
+    end
   end # Base
 
 end # AASM

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "4.5.0"
+  VERSION = "4.6.0"
 end

data/lib/generators/aasm/aasm_generator.rb

@@ -0,0 +1,17 @@
+require 'rails/generators/named_base'
+
+module AASM
+  module Generators
+    class AASMGenerator < Rails::Generators::NamedBase
+
+      source_root File.expand_path("../templates", __FILE__)
+      argument :column_name, type: :string, default: 'aasm_state'
+
+      desc "Generates a model with the given NAME (if one does not exist) with aasm " <<
+      "block and migration to add aasm_state column."
+
+      hook_for :orm
+
+    end
+  end
+end

data/lib/generators/aasm/orm_helpers.rb

@@ -0,0 +1,35 @@
+module AASM
+  module Generators
+    module OrmHelpers
+
+      def model_contents
+        if column_name == 'aasm_state'
+<<RUBY
+  include AASM
+
+  aasm do
+  end
+RUBY
+        else
+<<RUBY
+  include AASM
+
+  aasm :column => '#{column_name}' do
+  end
+RUBY
+        end
+      end
+
+      private
+
+      def model_exists?
+        File.exists?(File.join(destination_root, model_path))
+      end
+
+      def model_path
+        @model_path ||= File.join("app", "models", "#{file_path}.rb")
+      end
+
+    end
+  end
+end

data/lib/generators/active_record/aasm_generator.rb

@@ -0,0 +1,38 @@
+require 'rails/generators/active_record'
+require 'generators/aasm/orm_helpers'
+
+module ActiveRecord
+  module Generators
+    class AASMGenerator < ActiveRecord::Generators::Base
+      include AASM::Generators::OrmHelpers
+
+      argument :column_name, type: :string, default: 'aasm_state'
+
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_aasm_migration
+        if model_exists?
+          migration_template "migration_existing.rb", "db/migrate/add_aasm_state_to_#{table_name}.rb"
+        else
+          migration_template "migration.rb", "db/migrate/aasm_create_#{table_name}.rb"
+        end
+      end 
+
+      def generate_model
+        invoke "active_record:model", [name], migration: false unless model_exists?
+      end 
+
+      def inject_aasm_content
+        content = model_contents
+
+        class_path = if namespaced?
+                       class_name.to_s.split("::")
+                     else
+                       [class_name]
+                     end
+        inject_into_class(model_path, class_path.last, content) if model_exists?
+      end
+
+    end
+  end
+end

data/lib/generators/active_record/templates/migration.rb

@@ -0,0 +1,8 @@
+class AASMCreate<%= table_name.camelize %> < ActiveRecord::Migration
+  def change
+    create_table(:<%= table_name %>) do |t|
+      t.string :<%= column_name %>
+      t.timestamps null: false 
+    end
+  end
+end

data/lib/generators/active_record/templates/migration_existing.rb

@@ -0,0 +1,9 @@
+class AddAASMTo<%= table_name.camelize %> < ActiveRecord::Migration
+  def self.up
+    add_column :<%= table_name %>, :<%= column_name %>, :string
+  end
+
+  def self.down
+    remove_column :<%= table_name %>, :<%= column_name %>
+  end
+end

data/lib/generators/mongoid/aasm_generator.rb

@@ -0,0 +1,28 @@
+require 'rails/generators/named_base'
+require 'generators/aasm/orm_helpers'
+
+module Mongoid
+  module Generators
+    class AASMGenerator < Rails::Generators::NamedBase
+      include AASM::Generators::OrmHelpers
+
+      argument :column_name, type: :string, default: 'aasm_state'
+
+      def generate_model
+        invoke "mongoid:model", [name] unless model_exists?
+      end 
+
+      def inject_aasm_content
+        inject_into_file model_path, model_contents, after: "include Mongoid::Document\n" if model_exists?
+      end 
+
+      def inject_field_types
+        inject_into_file model_path, migration_data, after: "include Mongoid::Document\n" if model_exists?
+      end 
+
+      def migration_data
+        "  field :#{column_name}"
+      end
+    end
+  end
+end

data/spec/database.rb

@@ -1,5 +1,5 @@
 ActiveRecord::Migration.suppress_messages do
-  %w{gates multiple_gates readers writers transients simples no_scopes multiple_no_scopes no_direct_assignments multiple_no_direct_assignments thieves multiple_thieves localizer_test_models persisted_states provided_and_persisted_states with_enums with_true_enums with_false_enums false_states multiple_with_enums multiple_with_true_enums multiple_with_false_enums multiple_false_states readme_jobs}.each do |table_name|
+  %w{gates multiple_gates readers writers transients simples no_scopes multiple_no_scopes no_direct_assignments multiple_no_direct_assignments thieves multiple_thieves localizer_test_models persisted_states provided_and_persisted_states with_enums with_enum_without_columns multiple_with_enum_without_columns with_true_enums with_false_enums false_states multiple_with_enums multiple_with_true_enums multiple_with_false_enums multiple_false_states readme_jobs}.each do |table_name|
     ActiveRecord::Migration.create_table table_name, :force => true do |t|
       t.string "aasm_state"
     end

data/spec/generators/active_record_generator_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'generator_spec'
+require 'generators/active_record/aasm_generator'
+
+describe ActiveRecord::Generators::AASMGenerator, type: :generator do
+  destination File.expand_path("../../../tmp", __FILE__)
+
+  before(:all) do
+    prepare_destination
+  end
+
+  it "creates model with aasm block for default column_name" do
+    run_generator %w(user)
+    assert_file "app/models/user.rb", /include AASM\n\n  aasm do\n  end\n/
+  end
+
+  it "creates model with aasm block for custom column_name" do
+    run_generator %w(user state)
+    assert_file "app/models/user.rb", /aasm :column => 'state' do\n  end\n/
+  end
+
+  it "creates model with aasm block for namespaced model" do
+    run_generator %w(Admin::User state)
+    assert_file "app/models/admin/user.rb", /aasm :column => 'state' do\n  end\n/
+  end
+
+  it "creates migration for model with aasm_column" do
+    run_generator %w(post)
+    assert_migration "db/migrate/aasm_create_posts.rb", /create_table(:posts) do |t|\n  t.string :aasm_state\n/
+  end
+
+  it "add aasm_column in existing model" do
+    run_generator %w(job)
+    assert_file "app/models/job.rb"
+    run_generator %w(job)
+    assert_migration "db/migrate/add_aasm_state_to_jobs.rb"
+  end
+
+end

data/spec/generators/mongoid_generator_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'generator_spec'
+require 'generators/mongoid/aasm_generator'
+
+begin
+  require "mongoid"
+
+  describe Mongoid::Generators::AASMGenerator, type: :generator do
+    destination File.expand_path("../../../tmp", __FILE__)
+
+    before(:all) do
+      prepare_destination
+    end
+
+    it "creates model with aasm block for default column_name" do
+      run_generator %w(user)
+      assert_file "app/models/user.rb", /include AASM\n\n  aasm do\n  end\n/
+    end
+
+    it "creates model with aasm block for custom column_name" do
+      run_generator %w(user state)
+      assert_file "app/models/user.rb", /aasm :column => 'state' do\n  end\n/
+    end
+
+    it "creates model with aasm block for namespaced model" do
+      run_generator %w(Admin::User state)
+      assert_file "app/models/admin/user.rb", /aasm :column => 'state' do\n  end\n/
+    end
+
+  end
+rescue LoadError
+  puts "Not running Mongoid specs because mongoid gem is not installed!!!"
+end

data/spec/models/active_record/with_enum_without_column.rb

@@ -0,0 +1,38 @@
+class WithEnumWithoutColumn < ActiveRecord::Base
+  include AASM
+
+  if ActiveRecord::VERSION::MAJOR >= 4 && ActiveRecord::VERSION::MINOR >= 1 # won't work with Rails <= 4.1
+    enum status: {
+      opened: 0,
+      closed: 1
+    }
+  end
+
+  aasm :column => :status do
+    state :closed, initial: true
+    state :opened
+
+    event :view do
+      transitions :to => :opened, :from => :closed
+    end
+  end
+end
+
+class MultipleWithEnumWithoutColumn < ActiveRecord::Base
+  include AASM
+  if ActiveRecord::VERSION::MAJOR >= 4 && ActiveRecord::VERSION::MINOR >= 1 # won't work with Rails <= 4.1
+    enum status: {
+      opened: 0,
+      closed: 1
+    }
+  end
+
+  aasm :left, :column => :status do
+    state :closed, initial: true
+    state :opened
+
+    event :view do
+      transitions :to => :opened, :from => :closed
+    end
+  end
+end

data/spec/models/guardian.rb

@@ -1,6 +1,9 @@
 class Guardian
   include AASM
 
+  def inner_guard(options={})
+  end
+
   aasm do
     state :alpha, :initial => true
     state :beta
@@ -12,6 +15,13 @@ class Guardian
       transitions :from => :alpha, :to => :beta, :guard => :fail
     end
 
+    event :use_proc_guard_with_params do
+      transitions :from => :alpha, :to => :beta, :guard => Proc.new { |options={}| inner_guard(options) }
+    end
+    event :use_lambda_guard_with_params do
+      transitions :from => :alpha, :to => :beta, :guard => lambda { |options={}| inner_guard(options) }
+    end
+
     event :use_guards_that_succeed do
       transitions :from => :alpha, :to => :beta, :guards => [:succeed, :another_succeed]
     end

data/spec/models/silencer.rb

@@ -1,6 +1,11 @@
 class Silencer
   include AASM
 
+  # yes, this line is here on purpose
+  # by this, we test if overriding configuration options works if
+  # the state machine is "re-opened"
+  aasm :whiny_transitions => true
+
   aasm :whiny_transitions => false do
     state :silent, :initial => true
     state :crying

data/spec/unit/guard_spec.rb

@@ -27,6 +27,18 @@ describe "per-transition guards" do
     expect { guardian.use_guards_where_the_second_fails! }.to raise_error(AASM::InvalidTransition)
     expect(guardian).to be_alpha
   end
+
+  describe "with params" do
+    it "using a Proc" do
+      expect(guardian).to receive(:inner_guard).with({:flag => true}).and_return(true)
+      guardian.use_proc_guard_with_params(:flag => true)
+    end
+
+    it "using a lambda" do
+      expect(guardian).to receive(:inner_guard).with({:flag => true}).and_return(true)
+      guardian.use_lambda_guard_with_params(:flag => true)
+    end
+  end
 end
 
 describe "event guards" do

data/spec/unit/persistence/active_record_persistence_multiple_spec.rb

@@ -113,6 +113,20 @@ describe "instance methods" do
         end
       end
     end
+
+    if ActiveRecord::VERSION::MAJOR >= 4 && ActiveRecord::VERSION::MINOR >= 1 # won't work with Rails <= 4.1
+      # Enum are introduced from Rails 4.1, therefore enum syntax will not work on Rails <= 4.1
+      context "when AASM enum setting is not enabled and aasm column not present" do
+
+        let(:multiple_with_enum_without_column) {MultipleWithEnumWithoutColumn.new}
+
+        it "should raise NoMethodError for transitions" do
+          expect{multiple_with_enum_without_column.send(:view, :left)}.to raise_error(NoMethodError, "undefined method 'status' for MultipleWithEnumWithoutColumn")
+        end
+      end
+
+    end
+
   end
 
   context "when AASM is configured to use enum" do
@@ -298,6 +312,19 @@ describe "named scopes with the new DSL" do
   it "does not create scopes if requested" do
     expect(MultipleNoScope).not_to respond_to(:pending)
   end
+
+  context "result of scope" do
+    let!(:dsl1) { MultipleSimpleNewDsl.create!(status: :new) }
+    let!(:dsl2) { MultipleSimpleNewDsl.create!(status: :unknown_scope) }
+
+    after do
+      MultipleSimpleNewDsl.destroy_all
+    end
+
+    it "created scope works as where(name: :scope_name)" do
+      expect(MultipleSimpleNewDsl.unknown_scope).to contain_exactly(dsl2)
+    end
+  end
 end # scopes
 
 describe "direct assignment" do

data/spec/unit/persistence/active_record_persistence_spec.rb

@@ -113,6 +113,20 @@ describe "instance methods" do
         end
       end
     end
+
+    if ActiveRecord::VERSION::MAJOR >= 4 && ActiveRecord::VERSION::MINOR >= 1 # won't work with Rails <= 4.1
+      # Enum are introduced from Rails 4.1, therefore enum syntax will not work on Rails <= 4.1
+      context "when AASM enum setting is not enabled and aasm column not present" do
+
+        let(:with_enum_without_column) {WithEnumWithoutColumn.new}
+
+        it "should raise NoMethodError for transitions" do
+          expect{with_enum_without_column.send(:view)}.to raise_error(NoMethodError, "undefined method 'status' for WithEnumWithoutColumn")
+        end
+      end
+
+    end
+
   end
 
   context "when AASM is configured to use enum" do
@@ -299,6 +313,18 @@ describe "named scopes with the new DSL" do
     expect(NoScope).not_to respond_to(:pending)
   end
 
+  context "result of scope" do
+    let!(:dsl1) { SimpleNewDsl.create!(status: :new) }
+    let!(:dsl2) { SimpleNewDsl.create!(status: :unknown_scope) }
+
+    after do
+      SimpleNewDsl.destroy_all
+    end
+
+    it "created scope works as where(name: :scope_name)" do
+      expect(SimpleNewDsl.unknown_scope).to contain_exactly(dsl2)
+    end
+  end
 end # scopes
 
 describe "direct assignment" do

data/spec/unit/transition_spec.rb

@@ -31,7 +31,7 @@ describe 'transitions' do
     expect(silencer).to be_smiling
   end
 
-  it 'should call the block when success' do
+  it 'should call the block on success' do
     silencer = Silencer.new
     success = false
     expect {
@@ -41,7 +41,7 @@ describe 'transitions' do
     }.to change { success }.to(true)
   end
 
-  it 'should not call the block when failure' do
+  it 'should not call the block on failure' do
     silencer = Silencer.new
     success = false
     expect {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Scott Barron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -54,6 +54,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: generator_spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +104,7 @@ files:
 - Rakefile
 - aasm.gemspec
 - callbacks.txt
-- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_3.2_stable.gemfile
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.0_mongo_mapper.gemfile
 - gemfiles/rails_4.1.gemfile
@@ -123,10 +137,18 @@ files:
 - lib/aasm/rspec/transition_from.rb
 - lib/aasm/state_machine.rb
 - lib/aasm/version.rb
+- lib/generators/aasm/aasm_generator.rb
+- lib/generators/aasm/orm_helpers.rb
+- lib/generators/active_record/aasm_generator.rb
+- lib/generators/active_record/templates/migration.rb
+- lib/generators/active_record/templates/migration_existing.rb
+- lib/generators/mongoid/aasm_generator.rb
 - spec/database.rb
 - spec/database.yml
 - spec/en.yml
 - spec/en_deprecated_style.yml
+- spec/generators/active_record_generator_spec.rb
+- spec/generators/mongoid_generator_spec.rb
 - spec/models/active_record/basic_active_record_two_state_machines_example.rb
 - spec/models/active_record/complex_active_record_example.rb
 - spec/models/active_record/derivate_new_dsl.rb
@@ -143,6 +165,7 @@ files:
 - spec/models/active_record/thief.rb
 - spec/models/active_record/transient.rb
 - spec/models/active_record/with_enum.rb
+- spec/models/active_record/with_enum_without_column.rb
 - spec/models/active_record/with_false_enum.rb
 - spec/models/active_record/with_true_enum.rb
 - spec/models/active_record/writer.rb
@@ -256,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: State machine mixin for Ruby objects
@@ -265,6 +288,8 @@ test_files:
 - spec/database.yml
 - spec/en.yml
 - spec/en_deprecated_style.yml
+- spec/generators/active_record_generator_spec.rb
+- spec/generators/mongoid_generator_spec.rb
 - spec/models/active_record/basic_active_record_two_state_machines_example.rb
 - spec/models/active_record/complex_active_record_example.rb
 - spec/models/active_record/derivate_new_dsl.rb
@@ -281,6 +306,7 @@ test_files:
 - spec/models/active_record/thief.rb
 - spec/models/active_record/transient.rb
 - spec/models/active_record/with_enum.rb
+- spec/models/active_record/with_enum_without_column.rb
 - spec/models/active_record/with_false_enum.rb
 - spec/models/active_record/with_true_enum.rb
 - spec/models/active_record/writer.rb