trans_forms 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6480ab685b89f6d61fcd74be97c3d231ba01785
-  data.tar.gz: 3ffb76ca12799e46cf585c2249539b06e31f1b7d
+  metadata.gz: 1c5551ba7ce1dd381cff17fa241415a3ea065ff0
+  data.tar.gz: 48e1a777331d51938f1d94c4a762edfb005ab9a0
 SHA512:
-  metadata.gz: 9d0bf53811ba08874c7404e5b9ab36feb777db31caf3164b8ad679c51165c4ac3bf42e222bfd81cf3ab75fac903d2f0ffecef0144e5be712c3c4cb70e3e0843a
-  data.tar.gz: baa5afca6873b7fe52be6889ee79a7e7caad30c54495d84844cfc4170efab7a56ef118d6e46ff716a50a80ef350bbe5fa00ff36edf812518b6d8c7a1449e969d
+  metadata.gz: 88612a51733c736445d9ea61ab58e92446c7fd23f5a4e4d886a6d54fd919e8c84f30a7a0cdf3dd3e8f5b9f8d382ef3cf923ea027ef9c70211d1f3aa02bcc7267
+  data.tar.gz: 66164e88117619b24f94fe90de7b8fd3f93d8c63a8e4c1fa4b00778148de9894487c003206832539d6fbda278883391c61b16bf97e3c06128818ba0af873c7b5

data/lib/trans_forms/form_base.rb

@@ -42,15 +42,26 @@ module TransForms
         instance_eval &_transaction
         true
       end
-    rescue ActiveRecord::ActiveRecordError => e
-      # Triggers callback
-      after_save_on_error_callback e
-      self._last_error = e
-      if e.respond_to?(:record) && errors != e.record.errors
-        e.record.errors.each do |attribute, message|
-          errors.add(attribute, message) unless Array(errors[attribute]).include? message
+
+    rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved, ActiveRecord::RecordNotDestroyed => e
+      handle_transaction_error e do
+        if e.record.present? && errors != e.record.errors
+          e.record.errors.each do |attribute, message|
+            errors.add(attribute, message) unless Array(errors[attribute]).include? message
+          end
         end
       end
+
+    rescue ActiveRecord::ActiveRecordError => e
+      handle_transaction_error e
+    end
+
+    def handle_transaction_error(e)
+      self._last_error = e
+
+      yield if block_given?
+
+      after_save_on_error_callback e
       false
     end
 

data/lib/trans_forms/version.rb

@@ -1,3 +1,3 @@
 module TransForms
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/support/trans_forms/simple_forms.rb

@@ -11,3 +11,22 @@ class ErrorInTransactionForm < TransForms::FormBase
     raise ActiveRecord::ActiveRecordError
   end
 end
+
+class RecordNotFoundInTransactionForm < TransForms::FormBase
+  transaction do
+    User.find 9999999
+  end
+end
+
+class RecordNotSavedInTransactionForm < TransForms::FormBase
+  transaction do
+    user = User.new
+    raise ActiveRecord::RecordNotSaved, ['Could not save the record', user]
+  end
+end
+
+class RecordInvalidInTransactionForm < TransForms::FormBase
+  transaction do
+    User.new.save!
+  end
+end

data/spec/trans_forms/form_base_spec.rb

@@ -39,13 +39,20 @@ module TransForms
     end
 
     describe 'validations' do
-      it 'is considered valid when validations pass' do
-        attr = { name: 'John Doe', age: 30 }
-        form = UserCreator1.new(attr)
-        expect(form).to     be_valid
+      subject { form.valid? }
 
-        form.name = ''
-        expect(form).not_to be_valid
+      context 'when validations pass' do
+        let(:form) { UserCreator1.new(attr) }
+        let(:attr) { { name: 'John Doe', age: 30 } }
+
+        it { is_expected.to be true }
+      end
+
+      context 'when validations fail' do
+        let(:form) { UserCreator1.new(attr) }
+        let(:attr) { { name: '', age: 30 } }
+
+        it { is_expected.to be false }
       end
     end
 
@@ -74,11 +81,29 @@ module TransForms
         it { is_expected.to be true }
       end
 
-      context 'when active errors do occur inside the +transaction+ block' do
+      context 'when active record errors do occur inside the +transaction+ block' do
         let(:form) { ErrorInTransactionForm.new }
 
         it { expect{ subject }.to raise_error(ActiveRecord::ActiveRecordError) }
       end
+
+      context 'when RecordNotFound error occur inside the +transaction+ block' do
+        let(:form) { RecordNotFoundInTransactionForm.new }
+
+        it { expect{ subject }.to raise_error(ActiveRecord::RecordNotFound) }
+      end
+
+      context 'when RecordNotSaved error occur inside the +transaction+ block' do
+        let(:form) { RecordNotSavedInTransactionForm.new }
+
+        it { expect{ subject }.to raise_error(ActiveRecord::RecordNotSaved) }
+      end
+
+      context 'when RecordInvalid error occur inside the +transaction+ block' do
+        let(:form) { RecordInvalidInTransactionForm.new }
+
+        it { expect{ subject }.to raise_error(ActiveRecord::RecordInvalid) }
+      end
     end
 
     describe 'transaction' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trans_forms
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Daniel Viklund