aasm 4.11.0 → 4.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c0f9cf1b1303a1269e84ada192ce2d56b2ad29b
-  data.tar.gz: 8ad1ec953454bb5fbf113d9a47494fae24238744
+  metadata.gz: a57dd3feade6d1aea288f5999b4d93c890b11c60
+  data.tar.gz: 8e14ba9da4f262ca2f2ba0a40f633af6234e2075
 SHA512:
-  metadata.gz: 29373b642050f83f1d44a5241857b9e75b0aa1dd4b224b161f057acdde5595bf79e57554229b610ce3288e058816dbb096c8b344e6f0c056706273dcbbf55b80
-  data.tar.gz: 93dff92101055f58ef493c1e1574c716683315a452add2b43522ef6a4e7b25c6d38caf9e2791a2ed8162c9b541b465d275ec09e699c6f3ad794b537ba8fb3e74
+  metadata.gz: 08b85c55e73ba7b152e7a8344bf706315aa33016047849fee0e64dff8201f2691132d83d1e2c91b7e603b1e5f8e2a23bb8510573b539f142fa38b718c4aa0191
+  data.tar.gz: 2cdd0ef93171f881ef36bd2b1fe0d06d71dce2a73fffee570515c12f69fdc52fb18ea02e29a5b4591498de9526e3fb1bf6039aff8d4ed9af0c8a069f278150cc

data/.travis.yml

@@ -46,4 +46,4 @@ matrix:
 
 notifications:
   slack:
-    secure: MsPY8sUW5TVblcWc5NGkkWJlHxCMnhNa3IFPSVWthlk0fz+CLfOrLjQ+brQup/AJ7BRtyBKQ8udpqLj/R7CJKAiVVDAlUBcHqXk/WDusssGzJkDMrLVDefq++YCg5TdbcIaHt8WBVg6pD8H4kQJMJxmtcziQtiW1Qt0pwfuNJ+k=
+    secure: gpltVWntdKz0nSE6A5UvuX4qbN35uW51nsW+Ojgqm8Qsv8K240/NlZRYutFHr7GnJTe0rEEP2Oy3ZBnBtZKFn13RlTEAU/FCAxebr4H24rr29Ypwwp5xjiSE4MuoBEnroo4lw6ka3LsJnrY2PKRMiLJGsS0WsEPY4x8NUG/vyY8=

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 4.11.1
+
+ * fix: generator file name when using custom column name instead of
+  aasm_state (see [issue #398](https://github.com/aasm/aasm/pull/398) for details,
+  thanks to [@bastianwegge](https://github.com/bastianwegge))
+ * fix: Scopes when states are defined as a series of symbols (see [issue #397](https://github.com/aasm/aasm/pull/397) for details, thanks to [@evheny0](https://github.com/evheny0))
+ * fix: Multiple transition behavior when one of the transitions does not
+ have a "from" parameter (see [issue #392](https://github.com/aasm/aasm/issues/392) for details)
+ * fix: permissible states not respecting guard parameters (see [issue #388](https://github.com/aasm/aasm/issues/388)) with [pull-request #389](https://github.com/aasm/aasm/pull/389)
+
 ## 4.11.0
 
  * support `logger` configuration (see [issue #370](https://github.com/aasm/aasm/pull/370) for details, thanks to [@HoyaBoya](https://github.com/HoyaBoya))
@@ -329,4 +339,3 @@
 
  * supporting i18n
  * supporting regular expressions for hash values and strings
-

data/README.md

@@ -132,7 +132,7 @@ class Job
     ...
   end
 
-  def notify_somebody(user)
+  def notify_somebody
     ...
   end
 
@@ -418,6 +418,28 @@ SimpleMultipleExample.aasm(:work).states
 *Final note*: Support for multiple state machines per class is a pretty new feature
 (since version `4.3`), so please bear with us in case it doesn't work as expected.
 
+### Auto-generated Status Constants
+
+AASM automatically [generates constants](https://github.com/aasm/aasm/pull/60)
+for each status so you don't have to explicitly define them.
+
+```ruby
+class Foo
+  include AASM
+
+  aasm do
+    state :initialized
+    state :calculated
+    state :finalized
+  end
+end
+
+> Foo::STATE_INITIALIZED
+#=> :initialized
+> Foo::STATE_CALCULATED
+#=> :calculated
+```
+
 ### Extending AASM
 
 AASM allows you to easily extend `AASM::Base` for your own application purposes.
@@ -935,6 +957,9 @@ job.aasm.events(:reject => :sleep).map(&:name)
 # list states for select
 Job.aasm.states_for_select
 => [["Sleeping", "sleeping"], ["Running", "running"], ["Cleaning", "cleaning"]]
+
+# show permitted states with guard parameter
+job.aasm.states({:permitted => true}, guard_parameter).map(&:name)
 ```
 
 
@@ -1029,7 +1054,7 @@ gem 'aasm'
 
 ### Generators
 
-After installing Aasm you can run generator:
+After installing AASM you can run generator:
 
 ```sh
 % rails generate aasm NAME [COLUMN_NAME]
@@ -1055,6 +1080,7 @@ Feel free to
 * [Scott Barron](https://github.com/rubyist) (2006–2009, original author)
 * [Travis Tilley](https://github.com/ttilley) (2009–2011)
 * [Thorsten Böttger](http://github.com/alto) (since 2011)
+* [Anil Maurya](http://github.com/anilmaurya) (since 2016)
 
 
 ## Contributing ##

data/aasm.gemspec

@@ -5,8 +5,8 @@ require "aasm/version"
 Gem::Specification.new do |s|
   s.name        = "aasm"
   s.version     = AASM::VERSION
-  s.authors     = ["Scott Barron", "Travis Tilley", "Thorsten Boettger"]
-  s.email       = %q{scott@elitists.net, ttilley@gmail.com, aasm@mt7.de}
+  s.authors     = ["Thorsten Boettger", "Anil Maurya"]
+  s.email       = %q{aasm@mt7.de, anilmaurya8dec@gmail.com}
   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.}

data/gemfiles/rails_4.0_mongo_mapper.gemfile

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

data/gemfiles/rails_4.2_mongo_mapper.gemfile

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

data/lib/aasm/core/event.rb

@@ -112,12 +112,8 @@ module AASM::Core
 
     def _fire(obj, options={}, to_state=nil, *args)
       result = options[:test_only] ? false : nil
-      if @transitions.map(&:from).any?
-        transitions = @transitions.select { |t| t.from == obj.aasm(state_machine.name).current_state }
-        return result if transitions.size == 0
-      else
-        transitions = @transitions
-      end
+      transitions = @transitions.select { |t| t.from == obj.aasm(state_machine.name).current_state || t.from == nil}
+      return result if transitions.size == 0
 
       # If to_state is not nil it either contains a potential
       # to_state or an arg

data/lib/aasm/instance_base.rb

@@ -33,9 +33,9 @@ module AASM
       AASM::Localizer.new.human_state_name(@instance.class, state_object_for_name(current_state))
     end
 
-    def states(options={})
+    def states(options={}, *args)
       if options.has_key?(:permitted)
-        selected_events = events(:permitted => options[:permitted])
+        selected_events = events({:permitted => options[:permitted]}, *args)
         # An array of arrays. Each inner array represents the transitions that
         # transition from the current state for an event
         event_transitions = selected_events.map {|e| e.transitions_from_state(current_state) }
@@ -45,10 +45,10 @@ module AASM
           return nil if transitions.empty?
 
           # Return the :to state of the first transition that is allowed (or not) or nil
-          if options[:permitted] 
-            transition = transitions.find { |t| t.allowed?(@instance) }
+          if options[:permitted]
+            transition = transitions.find { |t| t.allowed?(@instance, *args) }
           else
-            transition = transitions.find { |t| !t.allowed?(@instance) }
+            transition = transitions.find { |t| !t.allowed?(@instance, *args) }
           end
           transition ? transition.to : nil
         end.flatten.compact.uniq
@@ -60,7 +60,7 @@ module AASM
       end
     end
 
-    def events(options={})
+    def events(options={}, *args)
       state = options[:state] || current_state
       events = @instance.class.aasm(@name).events.select {|e| e.transitions_from_state?(state) }
 
@@ -71,9 +71,9 @@ module AASM
         # filters the results of events_for_current_state so that only those that
         # are really currently possible (given transition guards) are shown.
         if options[:permitted]
-          events.select! { |e| @instance.send("may_#{e.name}?") }
+          events.select! { |e| @instance.send("may_#{e.name}?", *args) }
         else
-          events.select! { |e| !@instance.send("may_#{e.name}?") }
+          events.select! { |e| !@instance.send("may_#{e.name}?", *args) }
         end
       end
 

data/lib/aasm/persistence/base.rb

@@ -53,9 +53,9 @@ module AASM
 
   class Base
     # make sure to create a (named) scope for each state
-    def state_with_scope(name, *args)
-      state_without_scope(name, *args)
-      create_scope(name) if create_scope?(name)
+    def state_with_scope(*args)
+      names = state_without_scope(*args)
+      names.each { |name| create_scope(name) if create_scope?(name) }
     end
     alias_method :state_without_scope, :state
     alias_method :state, :state_with_scope

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "4.11.0"
+  VERSION = "4.11.1"
 end

data/lib/generators/active_record/aasm_generator.rb

@@ -12,7 +12,7 @@ module ActiveRecord
 
       def copy_aasm_migration
         if model_exists?
-          migration_template "migration_existing.rb", "db/migrate/add_aasm_state_to_#{table_name}.rb"
+          migration_template "migration_existing.rb", "db/migrate/add_#{column_name}_to_#{table_name}.rb"
         else
           migration_template "migration.rb", "db/migrate/aasm_create_#{table_name}.rb"
         end

data/spec/en.yml

@@ -7,3 +7,6 @@ en:
     attributes:
       localizer_test_model:
         aasm_state/opened: "It's open now!"
+    errors:
+      messages:
+        record_invalid: "Invalid record"

data/spec/generators/active_record_generator_spec.rb

@@ -36,4 +36,9 @@ describe ActiveRecord::Generators::AASMGenerator, type: :generator do
     assert_migration "db/migrate/add_aasm_state_to_jobs.rb"
   end
 
+  it "add custom aasm_column in existing model" do
+    run_generator %w(job state)
+    assert_migration "db/migrate/add_state_to_jobs.rb"
+  end
+
 end

data/spec/models/active_record/simple_new_dsl.rb

@@ -2,7 +2,7 @@ class SimpleNewDsl < ActiveRecord::Base
   include AASM
   aasm :column => :status
   aasm do
-    state :unknown_scope
+    state :unknown_scope, :another_unknown_scope
     state :new
   end
 end
@@ -11,7 +11,7 @@ class MultipleSimpleNewDsl < ActiveRecord::Base
   include AASM
   aasm :left, :column => :status
   aasm :left do
-    state :unknown_scope
+    state :unknown_scope, :another_unknown_scope
     state :new
   end
 end

data/spec/models/guard_with_params.rb

@@ -0,0 +1,24 @@
+class GuardWithParams
+  include AASM
+  aasm do
+    state :new, :reviewed, :finalized
+
+    event :mark_as_reviewed do
+      transitions :from => :new, :to => :reviewed, :guards => [:user_is_manager?]
+    end
+  end
+
+  def user_is_manager?(user)
+    ok = false
+    if user.has_role? :manager
+      ok = true
+    end
+    return ok
+  end
+end
+
+class GuardParamsClass
+  def has_role?(role)
+    true
+  end
+end

data/spec/models/guard_with_params_multiple.rb

@@ -0,0 +1,18 @@
+class GuardWithParamsMultiple
+  include AASM
+  aasm(:left) do
+    state :new, :reviewed, :finalized
+
+    event :mark_as_reviewed do
+      transitions :from => :new, :to => :reviewed, :guards => [:user_is_manager?]
+    end
+  end
+
+  def user_is_manager?(user)
+    ok = false
+    if user.has_role? :manager
+      ok = true
+    end
+    return ok
+  end
+end

data/spec/models/mongo_mapper/simple_mongo_mapper.rb

@@ -5,7 +5,7 @@ class SimpleMongoMapper
   key :status, String
 
   aasm column: :status do
-    state :unknown_scope
+    state :unknown_scope, :another_unknown_scope
     state :next
   end
 end
@@ -17,7 +17,7 @@ class SimpleMongoMapperMultiple
   key :status, String
 
   aasm :left, column: :status do
-    state :unknown_scope
+    state :unknown_scope, :another_unknown_scope
     state :next
   end
 end

data/spec/models/mongoid/simple_mongoid.rb

@@ -5,7 +5,7 @@ class SimpleMongoid
   field :status, :type => String
 
   aasm column: :status do
-    state :unknown_scope
+    state :unknown_scope, :another_unknown_scope
     state :new
   end
 end
@@ -17,7 +17,7 @@ class SimpleMongoidMultiple
   field :status, :type => String
 
   aasm :left, column: :status do
-    state :unknown_scope
+    state :unknown_scope, :another_unknown_scope
     state :new
   end
 end

data/spec/models/multi_transitioner.rb

@@ -11,14 +11,24 @@ class MultiTransitioner
     state :sleeping, :initial => true
     state :running
     state :dancing
+    state :dead
 
     event :start do
       transitions :from => :sleeping, :to => :running, guard: :runnable?
       transitions :from => :sleeping, :to => :dancing
     end
+
+    event :sleep do
+      transitions to: :sleeping, if: :alive?
+      transitions to: :dead, from: [:running, :dancing]
+    end
   end
 
   def runnable?
     @can_run
   end
+
+  def alive?
+    true
+  end
 end

data/spec/models/validator.rb

@@ -6,7 +6,12 @@ class Validator < ActiveRecord::Base
     :after_transaction_performed_on_run,
     :before_all_transactions_performed,
     :before_transaction_performed_on_fail,
-    :before_transaction_performed_on_run
+    :before_transaction_performed_on_run,
+    :invalid
+
+  validate do |model|
+    errors.add(:validator, "invalid") if invalid
+  end
 
   include AASM
 

data/spec/unit/guard_with_params_multiple_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe "guards with params" do
+  let(:guard) { GuardWithParamsMultiple.new }
+  let(:user) {GuardParamsClass.new}
+
+  it "list permitted states" do
+    expect(guard.aasm(:left).states({:permitted => true}, user).map(&:name)).to eql [:reviewed]
+  end
+end

data/spec/unit/guard_with_params_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe "guards with params" do
+  let(:guard) { GuardWithParams.new }
+  let(:user) {GuardParamsClass.new}
+
+  it "list permitted states" do
+    expect(guard.aasm.states({:permitted => true}, user).map(&:name)).to eql [:reviewed]
+  end
+end

data/spec/unit/inspection_spec.rb

@@ -74,6 +74,11 @@ describe 'inspection for common cases' do
       expect(states).to include(:running)
       expect(states).to_not include(:dancing)
     end
+
+    it "transitions to correct state if from state is missing from one transitions" do
+      multi.sleep
+      expect(multi.aasm.current_state).to eq(:sleeping)
+    end
   end
 
   it 'should list states in the order they have been defined' do

data/spec/unit/persistence/active_record_persistence_multiple_spec.rb

@@ -296,9 +296,12 @@ 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
+    it "should add a scope for each state" do
       expect(MultipleSimpleNewDsl).to respond_to(:unknown_scope)
+      expect(MultipleSimpleNewDsl).to respond_to(:another_unknown_scope)
+
       expect(MultipleSimpleNewDsl.unknown_scope.is_a?(ActiveRecord::Relation)).to be_truthy
+      expect(MultipleSimpleNewDsl.another_unknown_scope.is_a?(ActiveRecord::Relation)).to be_truthy
     end
   end
 

data/spec/unit/persistence/active_record_persistence_spec.rb

@@ -296,9 +296,12 @@ 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
+    it "should add a scope for each state" do
       expect(SimpleNewDsl).to respond_to(:unknown_scope)
+      expect(SimpleNewDsl).to respond_to(:another_unknown_scope)
+
       expect(SimpleNewDsl.unknown_scope.is_a?(ActiveRecord::Relation)).to be_truthy
+      expect(SimpleNewDsl.another_unknown_scope.is_a?(ActiveRecord::Relation)).to be_truthy
     end
   end
 
@@ -544,6 +547,14 @@ describe 'transitions with persistence' do
         expect(validator.name).to eq("name")
       end
 
+      it "should not fire :after_commit if validation failed when saving object" do
+        validator = Validator.create(:name => 'name')
+        validator.invalid = true
+        expect { validator.run! }.to raise_error(ActiveRecord::RecordInvalid, 'Invalid record')
+        expect(validator).to be_sleeping
+        expect(validator.name).to eq("name")
+      end
+
       it "should not fire if not saving" do
         validator = Validator.create(:name => 'name')
         expect(validator).to be_sleeping

data/spec/unit/persistence/mongo_mapper_persistence_multiple_spec.rb

@@ -28,9 +28,12 @@ describe 'mongo_mapper' do
     describe "named scopes with the old DSL" do
 
       context "Does not already respond_to? the scope name" do
-        it "should add a scope" do
+        it "should add a scope for each state" do
           expect(SimpleMongoMapperMultiple).to respond_to(:unknown_scope)
+          expect(SimpleMongoMapperMultiple).to respond_to(:another_unknown_scope)
+
           expect(SimpleMongoMapperMultiple.unknown_scope.class).to eq(MongoMapper::Plugins::Querying::DecoratedPluckyQuery)
+          expect(SimpleMongoMapperMultiple.another_unknown_scope.class).to eq(MongoMapper::Plugins::Querying::DecoratedPluckyQuery)
           #expect(SimpleMongoMapperMultiple.unknown_scope.is_a?(ActiveRecord::Relation)).to be_truthy
         end
       end

data/spec/unit/persistence/mongo_mapper_persistence_spec.rb

@@ -28,9 +28,12 @@ describe 'mongo_mapper' do
     describe "named scopes with the old DSL" do
 
       context "Does not already respond_to? the scope name" do
-        it "should add a scope" do
+        it "should add a scope for each state" do
           expect(SimpleMongoMapper).to respond_to(:unknown_scope)
+          expect(SimpleMongoMapper).to respond_to(:another_unknown_scope)
+
           expect(SimpleMongoMapper.unknown_scope.class).to eq(MongoMapper::Plugins::Querying::DecoratedPluckyQuery)
+          expect(SimpleMongoMapper.another_unknown_scope.class).to eq(MongoMapper::Plugins::Querying::DecoratedPluckyQuery)
           #expect(SimpleMongoMapper.unknown_scope.is_a?(ActiveRecord::Relation)).to be_truthy
         end
       end

data/spec/unit/persistence/mongoid_persistence_multiple_spec.rb

@@ -24,9 +24,12 @@ describe 'mongoid' do
     describe "named scopes with the old DSL" do
 
       context "Does not already respond_to? the scope name" do
-        it "should add a scope" do
+        it "should add a scope for each state" do
           expect(SimpleMongoidMultiple).to respond_to(:unknown_scope)
+          expect(SimpleMongoidMultiple).to respond_to(:another_unknown_scope)
+
           expect(SimpleMongoidMultiple.unknown_scope.class).to eq(Mongoid::Criteria)
+          expect(SimpleMongoidMultiple.another_unknown_scope.class).to eq(Mongoid::Criteria)
         end
       end
 

data/spec/unit/persistence/mongoid_persistence_spec.rb

@@ -24,9 +24,12 @@ describe 'mongoid' do
     describe "named scopes with the old DSL" do
 
       context "Does not already respond_to? the scope name" do
-        it "should add a scope" do
+        it "should add a scope for each state" do
           expect(SimpleMongoid).to respond_to(:unknown_scope)
+          expect(SimpleMongoid).to respond_to(:another_unknown_scope)
+
           expect(SimpleMongoid.unknown_scope.class).to eq(Mongoid::Criteria)
+          expect(SimpleMongoid.another_unknown_scope.class).to eq(Mongoid::Criteria)
         end
       end
 

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 4.11.0
+  version: 4.11.1
 platform: ruby
 authors:
-- Scott Barron
-- Travis Tilley
 - Thorsten Boettger
+- Anil Maurya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-19 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,7 +83,7 @@ dependencies:
         version: '0'
 description: AASM is a continuation of the acts-as-state-machine rails plugin, built
   for plain Ruby objects.
-email: scott@elitists.net, ttilley@gmail.com, aasm@mt7.de
+email: aasm@mt7.de, anilmaurya8dec@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -195,6 +194,8 @@ files:
 - spec/models/dynamoid/dynamoid_simple.rb
 - spec/models/foo.rb
 - spec/models/foo_callback_multiple.rb
+- spec/models/guard_with_params.rb
+- spec/models/guard_with_params_multiple.rb
 - spec/models/guardian.rb
 - spec/models/guardian_multiple.rb
 - spec/models/initial_state_proc.rb
@@ -249,6 +250,8 @@ files:
 - spec/unit/exception_spec.rb
 - spec/unit/guard_multiple_spec.rb
 - spec/unit/guard_spec.rb
+- spec/unit/guard_with_params_multiple_spec.rb
+- spec/unit/guard_with_params_spec.rb
 - spec/unit/initial_state_multiple_spec.rb
 - spec/unit/initial_state_spec.rb
 - spec/unit/inspection_multiple_spec.rb
@@ -300,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: State machine mixin for Ruby objects
@@ -353,6 +356,8 @@ test_files:
 - spec/models/dynamoid/dynamoid_simple.rb
 - spec/models/foo.rb
 - spec/models/foo_callback_multiple.rb
+- spec/models/guard_with_params.rb
+- spec/models/guard_with_params_multiple.rb
 - spec/models/guardian.rb
 - spec/models/guardian_multiple.rb
 - spec/models/initial_state_proc.rb
@@ -407,6 +412,8 @@ test_files:
 - spec/unit/exception_spec.rb
 - spec/unit/guard_multiple_spec.rb
 - spec/unit/guard_spec.rb
+- spec/unit/guard_with_params_multiple_spec.rb
+- spec/unit/guard_with_params_spec.rb
 - spec/unit/initial_state_multiple_spec.rb
 - spec/unit/initial_state_spec.rb
 - spec/unit/inspection_multiple_spec.rb