active_interaction 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8da6c6009b0e73aeec0afbc524e94c27dde01260
-  data.tar.gz: c34f2110a50219b87ba1e22cda387f0f429db7d2
+  metadata.gz: 6ba88eafd8b605090eafd610e1b9b4e41638e5b8
+  data.tar.gz: 44de977111bd36c6348864c0024ff886d71022c5
 SHA512:
-  metadata.gz: 274c345305f246fc6ae9078846d317cbb7e19b4781d18e73f20ade3336ca77f34008e7e8ca65985a5b3573a0742d8c79a25e9c1ffcc707d947ee5316e965fcec
-  data.tar.gz: ff0bf22dfb87c3774a3a9397943dfa02959355b7773dd87d1d188ac7ac1df47a6014888fcba67ef1286200f6df93f98e96c008c3acf0234d0c87f83780e0464e
+  metadata.gz: 1befd803a782dfe60b5c058f49b3e670e2f4b8d4d5434b15e81acdb7564ab803812dcce8172c615fe0bc04f7a8be7576615f02b9183d8d3a9c8776f77f2c6a92
+  data.tar.gz: ced6bb16015b351c6d4555feb91d84f82ed4e62f3cb9ca650c9ac7c3be9d2f7edcf29f94a84aef6e24fe58572b41de52565bf4c436d3db534e48758cfc39f286

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # [Master][]
 
+# [1.2.3][] (2014-05-12)
+
+- Fix a bug that raised `ActiveRecord::Rollback` when composing even when not
+  in a transaction.
+
 # [1.2.2][] (2014-05-07)
 
 - Fix a bug that raised `NameError`s when there were invalid nested hash
@@ -205,7 +210,8 @@
 
 - Initial release.
 
-  [master]: https://github.com/orgsync/active_interaction/compare/v1.2.2...master
+  [master]: https://github.com/orgsync/active_interaction/compare/v1.2.3...master
+  [1.2.3]: https://github.com/orgsync/active_interaction/compare/v1.2.2...v1.2.3
   [1.2.2]: https://github.com/orgsync/active_interaction/compare/v1.2.1...v1.2.2
   [1.2.1]: https://github.com/orgsync/active_interaction/compare/v1.2.0...v1.2.1
   [1.2.0]: https://github.com/orgsync/active_interaction/compare/v1.1.7...v1.2.0

data/lib/active_interaction.rb

@@ -50,5 +50,5 @@ I18n.default_locale = :en
 #
 # @since 1.0.0
 #
-# @version 1.2.2
+# @version 1.2.3
 module ActiveInteraction end

data/lib/active_interaction/concerns/runnable.rb

@@ -88,7 +88,7 @@ module ActiveInteraction
         rescue Interrupt => interrupt
           merge_errors_onto_base(interrupt.outcome.errors)
 
-          raise ActiveRecord::Rollback
+          raise ActiveRecord::Rollback if self.class.transaction?
         end
       end
     end

data/lib/active_interaction/version.rb

@@ -5,5 +5,5 @@ module ActiveInteraction
   # The version number.
   #
   # @return [Gem::Version]
-  VERSION = Gem::Version.new('1.2.2')
+  VERSION = Gem::Version.new('1.2.3')
 end

data/spec/active_interaction/concerns/runnable_spec.rb

@@ -179,12 +179,11 @@ describe ActiveInteraction::Runnable do
 
     context 'with an execute where composition fails' do
       before do
-        CompositionFailure = Class.new(ActiveInteraction::Base) do
+        interaction = Class.new(TestInteraction) do
           validate { errors.add(:base) }
-          def execute; end
         end
 
-        klass.send(:define_method, :execute) { compose(CompositionFailure) }
+        klass.send(:define_method, :execute) { compose(interaction) }
       end
 
       it 'rolls back the transaction' do
@@ -195,6 +194,19 @@ describe ActiveInteraction::Runnable do
         expect(instance).to have_received(:raise)
           .with(ActiveRecord::Rollback)
       end
+
+      context 'without a transaction' do
+        before { klass.transaction(false) }
+
+        it 'does not roll back' do
+          instance = klass.new
+
+          allow(instance).to receive(:raise)
+          instance.send(:run)
+          expect(instance).to_not have_received(:raise)
+            .with(ActiveRecord::Rollback)
+        end
+      end
     end
 
     context 'with invalid post-execution state' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel