aasm 4.5.0 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92b6a0df28245debe06c0ecbd3bd95e91b0cf323
-  data.tar.gz: 99bfa6652b17a26388b073ee431a1878ce961a4e
+  metadata.gz: a0308a8cef74abb6ac913b1dd31bc8673951a837
+  data.tar.gz: aef81a4c7f1f4045cd9e5202e65e7fd3562a1db2
 SHA512:
-  metadata.gz: d6cf5a7eea74d1c20108d48370d0f6048722efefb6af0110c70de56dd13032bcaabf57749add95ae25dc086faab8cbb5dcf9ad08ad4cafbafdfb400481ce1fd4
-  data.tar.gz: 90a92ba66f2b4d67c898a9076f324e0c99ce768aa5160f6d70dc74bca48e8ba4cf95317bf5e203b66985e9dcd77a52fb814dc65cc45f498dfeab20fde31fecb8
+  metadata.gz: f9d0dcf0e16ccf7ecf050163cdee8f6f8e993f17890a73508e64f48e519970810d3df30fef5bec877bb5cd6dd311570c6cf6ccd77b779c4f0220ceee660a8ebf
+  data.tar.gz: 852dd93351612a60d03472b8ff4a043ffe488d89e620fedc498c5d9895c6260b83aaf182d5b50a9bdd4929a09ba68f704a152aa4cd3134d904e3c4b1e5f061b6

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 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/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

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/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "4.5.0"
+  VERSION = "4.5.1"
 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/persistence/active_record_persistence_multiple_spec.rb

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

@@ -299,6 +299,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.5.1
 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: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -256,7 +256,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