aasm 5.0.7 → 5.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aa5a74637dafaa4c06da6c03e96342997692ad3f
-  data.tar.gz: e46be5420174440acc2dea63d9e66958d7dc6efc
+SHA256:
+  metadata.gz: c02be243049ac08482ee6dd9de9b388d7f965019012f680507b75aee43e1819c
+  data.tar.gz: e41809b4fd44cd1d5358e4da499c6b2691caf6a2b6f0b1cf24816458af711522
 SHA512:
-  metadata.gz: 359caf35d39d769ec0cc3d805cface2f89946692e62b1dd984fc42830be53305c3abfb300163d6e2f46317673fbd3a1c9e8ea366328feebdedab5806b85f1fd0
-  data.tar.gz: a1621683151f4ff00e1e83f4d7f3926bc1d5d4e0d945e2a38ed4f6355267c0165e2aabbeca553cdf17a8c9e4237130a0a63cc9715b0b0e8bb5801c71bd2bb053
+  metadata.gz: c5e49eeff60a68201dccfd988525030946a5f4e2ff080a8818ec729f7bb88291b6f333ccf8666a241dfb72b38a2f30333afbc4d284c3c6103eaab49446630b8e
+  data.tar.gz: d2d16d9368d1c8dfd8f50baaea1f07b525798a017fc612c27705161606ae27e1cdd1ea15b979d6d916cfd8abaa81479ff20c72577f8dbbd140dcb78572683845

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## 5.0.8
+
+* Revert Fix for :after_commit within nested transaction because it adds after_commit_action dependency which is dependent on many gems.
+
 ## 5.0.7
 
 * Fix :after_commit within nested transaction [#666](https://github.com/aasm/aasm/pull/666), thanks to [stokarenko](https://github.com/stokarenko)

data/aasm.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.3'
 
   s.add_dependency 'concurrent-ruby', '~> 1.0'
-  s.add_dependency 'after_commit_action', '~> 1.0'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'sdoc'

data/lib/aasm/persistence/active_record_persistence.rb

@@ -1,4 +1,3 @@
-require 'after_commit_action'
 require 'aasm/persistence/orm'
 module AASM
   module Persistence
@@ -29,7 +28,6 @@ module AASM
       #   end
       #
       def self.included(base)
-        base.send(:include, ::AfterCommitAction) unless base.include?(::AfterCommitAction)
         base.send(:include, AASM::Persistence::Base)
         base.send(:include, AASM::Persistence::ORM)
         base.send(:include, AASM::Persistence::ActiveRecordPersistence::InstanceMethods)
@@ -90,12 +88,6 @@ module AASM
           end
         end
 
-        def aasm_execute_after_commit
-          execute_after_commit do
-            yield
-          end
-        end
-
         def aasm_enum(name=:default)
           case AASM::StateMachineStore.fetch(self.class, true).machine(name).config.enum
           when false then nil

data/lib/aasm/persistence/orm.rb

@@ -81,10 +81,6 @@ module AASM
         true
       end
 
-      def aasm_execute_after_commit
-        yield
-      end
-
       def aasm_write_state_attribute(state, name=:default)
         aasm_write_attribute(self.class.aasm(name).attribute_name, aasm_raw_attribute_value(state, name))
       end
@@ -120,32 +116,32 @@ module AASM
 
       # Returns true if event was fired successfully and transaction completed.
       def aasm_fire_event(state_machine_name, name, options, *args, &block)
-        return super unless aasm_supports_transactions? && options[:persist]
-
-        event = self.class.aasm(state_machine_name).state_machine.events[name]
-        event.fire_callbacks(:before_transaction, self, *args)
-        event.fire_global_callbacks(:before_all_transactions, self, *args)
-
-        begin
-          success = if options[:persist] && use_transactions?(state_machine_name)
-            aasm_transaction(requires_new?(state_machine_name), requires_lock?(state_machine_name)) do
+        if aasm_supports_transactions? && options[:persist]
+          event = self.class.aasm(state_machine_name).state_machine.events[name]
+          event.fire_callbacks(:before_transaction, self, *args)
+          event.fire_global_callbacks(:before_all_transactions, self, *args)
+
+          begin
+            success = if options[:persist] && use_transactions?(state_machine_name)
+              aasm_transaction(requires_new?(state_machine_name), requires_lock?(state_machine_name)) do
+                super
+              end
+            else
               super
             end
-          else
-            super
-          end
 
-          if success
-            aasm_execute_after_commit do
+            if success
               event.fire_callbacks(:after_commit, self, *args)
               event.fire_global_callbacks(:after_all_commits, self, *args)
             end
-          end
 
-          success
-        ensure
-          event.fire_callbacks(:after_transaction, self, *args)
-          event.fire_global_callbacks(:after_all_transactions, self, *args)
+            success
+          ensure
+            event.fire_callbacks(:after_transaction, self, *args)
+            event.fire_global_callbacks(:after_all_transactions, self, *args)
+          end
+        else
+          super
         end
       end
 

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "5.0.7"
+  VERSION = "5.0.8"
 end

data/spec/unit/persistence/active_record_persistence_spec.rb

@@ -613,38 +613,6 @@ if defined?(ActiveRecord)
           expect(validator).to be_running
           expect(validator.name).to eq("name")
         end
-
-        context "nested transaction" do
-          it "should fire :after_commit if root transaction was successful" do
-            validator = Validator.create(:name => 'name')
-            expect(validator).to be_sleeping
-
-            validator.transaction do
-              validator.run!
-              expect(validator.name).to eq("name")
-              expect(validator).to be_running
-            end
-
-            expect(validator.name).to eq("name changed")
-            expect(validator.reload).to be_running
-          end
-        end
-
-        it "should not fire :after_commit if root transaction failed" do
-          validator = Validator.create(:name => 'name')
-          expect(validator).to be_sleeping
-
-          validator.transaction do
-            validator.run!
-            expect(validator.name).to eq("name")
-            expect(validator).to be_running
-
-            raise ActiveRecord::Rollback, "failed on purpose"
-          end
-
-          expect(validator.name).to eq("name")
-          expect(validator.reload).to be_sleeping
-        end
       end
 
       describe 'before and after transaction callbacks' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 5.0.7
+  version: 5.0.8
 platform: ruby
 authors:
 - Thorsten Boettger
@@ -25,20 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: after_commit_action
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -437,8 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: State machine mixin for Ruby objects