trans_forms 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 816031429c4c367af9bfee0e344f49bd11432fef
-  data.tar.gz: 326b77fa9d791c60808b71a57c2386b60b0a6041
+  metadata.gz: a6480ab685b89f6d61fcd74be97c3d231ba01785
+  data.tar.gz: 3ffb76ca12799e46cf585c2249539b06e31f1b7d
 SHA512:
-  metadata.gz: e94173975503abd86f039254b66bbcc4c5e1868b8a67226fd72db4b053184115862d7656679cce2e9f9732445e69a516ddd88f5686fa0937226fb82b03703e4f
-  data.tar.gz: 7b2aee4f0f4f06bbb0f1e064592164135fed78d46b5f91447175718e6733e59908ad02350b31b03aaec843f1e1edb54012f9dfa2a121b223768477eb251e9518
+  metadata.gz: 9d0bf53811ba08874c7404e5b9ab36feb777db31caf3164b8ad679c51165c4ac3bf42e222bfd81cf3ab75fac903d2f0ffecef0144e5be712c3c4cb70e3e0843a
+  data.tar.gz: baa5afca6873b7fe52be6889ee79a7e7caad30c54495d84844cfc4170efab7a56ef118d6e46ff716a50a80ef350bbe5fa00ff36edf812518b6d8c7a1449e969d

data/lib/trans_forms/form_base.rb

@@ -46,9 +46,9 @@ module TransForms
       # Triggers callback
       after_save_on_error_callback e
       self._last_error = e
-      if e.respond_to?(:record)
+      if e.respond_to?(:record) && errors != e.record.errors
         e.record.errors.each do |attribute, message|
-          errors.add(attribute, message)
+          errors.add(attribute, message) unless Array(errors[attribute]).include? message
         end
       end
       false

data/lib/trans_forms/version.rb

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

data/spec/support/trans_forms/main_model_forms.rb

@@ -23,6 +23,11 @@ end
 
 class UserProxyModel < TransForms::FormBase
   set_main_model :user, proxy: true
+
+  transaction do
+    # Will raise error if User model is not valid
+    user.save!
+  end
 end
 
 class UserProxyAllModel < TransForms::FormBase

data/spec/support/trans_forms/user_creator_1.rb

@@ -4,6 +4,8 @@ class UserCreator1 < TransForms::FormBase
   attribute :name,      String
   attribute :age,       Numeric
 
+  attr_accessor :extra_attribute
+
   validates :name, presence: true
 
   transaction do

data/spec/trans_forms/form_base_spec.rb

@@ -4,13 +4,37 @@ module TransForms
   describe FormBase do
 
     describe '#initialize' do
-      it 'assigns attributes defined by +attribute+' do
-        attr = { name: 'John Doe', age: 30, foo: 'bar' }
-        form = UserCreator1.new(attr)
+      subject { UserCreator1.new(attr) }
+
+      context 'when assigning attributes defined by +attribute+' do
+        let(:attr) { { name: 'John Doe', age: 30 } }
+
+        it { is_expected.to be_a UserCreator1 }
+
+        it 'assigns attributes and responds to method calls' do
+          expect(subject.name).to eq attr[:name]
+          expect(subject.age).to eq attr[:age]
+        end
+      end
+
+      context 'when assigning attributes defined by +attr_accessor+' do
+        let(:attr) { { extra_attribute: 'value' } }
+
+        it { is_expected.to be_a UserCreator1 }
 
-        expect(form.name).to    eq(attr[:name])
-        expect(form.age).to     eq(attr[:age])
-        expect { form.foo }.to  raise_error(NoMethodError)
+        it 'assigns and responds to method calls' do
+          expect(subject.extra_attribute).to eq attr[:extra_attribute]
+        end
+      end
+
+      context 'when assigning attributes that are not defined in any way' do
+        let(:attr) { { foo: 'bar' } }
+
+        it { is_expected.to be_a UserCreator1 }
+
+        it 'does not assign or respond to method call' do
+          expect { subject.foo }.to  raise_error(NoMethodError)
+        end
       end
     end
 
@@ -26,54 +50,88 @@ module TransForms
     end
 
     describe '#save' do
+      subject { form.save }
+
       context 'when no errors occur inside +transaction+ block' do
         let(:form) { NoErrorInTransactionForm.new }
-        it { expect( form.save ).to be true }
+
+        it { is_expected.to be true }
       end
 
       context 'when errors do occur inside the +transaction+ block' do
         let(:form) { ErrorInTransactionForm.new }
-        it { expect( form.save ).to be false }
+
+        it { is_expected.to be false }
       end
     end
 
     describe '#save!' do
+      subject { form.save! }
+
       context 'when no errors occur inside +transaction+ block' do
         let(:form) { NoErrorInTransactionForm.new }
-        it { expect( form.save! ).to be true }
+
+        it { is_expected.to be true }
       end
 
       context 'when active errors do occur inside the +transaction+ block' do
         let(:form) { ErrorInTransactionForm.new }
-        it { expect { form.save! }.to raise_error(ActiveRecord::ActiveRecordError) }
+
+        it { expect{ subject }.to raise_error(ActiveRecord::ActiveRecordError) }
       end
     end
 
     describe 'transaction' do
-      it 'saves multiple records to db when nothing raises errors' do
-        attr = { name1: 'John', name2: 'Peter' }
-        count = User.count
+      subject { form.save }
+
+      context 'when trying to create multiple records inside a transaction without errors' do
+        let(:form) { MultipleRecordsCreator.new(attr) }
+        let(:attr) { { name1: 'John', name2: 'Peter' } }
 
-        expect(MultipleRecordsCreator.new(attr).save).to be true
-        expect(User.count).to eq(count+2)
+        it { expect(subject).to be true }
+
+        it 'saves multiple records' do
+          expect{ subject }.to change{ User.count }.by 2
+        end
       end
 
-      it 'rollbacks both saves even if the first is successful and the last one raises an error' do
-        # First User is saved successfully, but last one will raise an
-        # error because of User class uniqueness validation on +name+
-        attr = { name1: 'John', name2: 'John' }
-        count = User.count
+      context 'when trying to create multiple records but second record fails to create because of validation error' do
+        let(:form) { MultipleRecordsCreator.new(attr) }
+        let(:attr) { { name1: 'John', name2: 'John' } }
+
+        it { expect(subject).to be false }
 
-        expect(MultipleRecordsCreator.new(attr).save).to be false
-        expect(User.count).to eq(count)
+        it 'rollbacks both saves' do
+          expect{ subject }.not_to change{ User.count }
+        end
       end
 
-      it 'does not cause rollback when save is not raising error (no !), even though it was not saved' do
-        attr = { name1: 'John', name2: 'John' }
-        count = User.count
+      context 'when trying to create multiple records and second record fails to create because of validations, but failed save did not raise error' do
+        let(:form) { MultipleRecordsCreatorNoBang.new(attr) }
+        let(:attr) { { name1: 'John', name2: 'John' } }
+
+        it { expect(subject).to be true }
+
+        it 'does not cause rollback and successfully saved the first record' do
+          expect{ subject }.to change{ User.count }.by 1
+        end
+      end
+
+      context 'when +set_main_model+ is used and main instance is raising an error inside the transaction' do
+        let(:user) { User.new }
+        let(:form) { UserProxyModel.new({ model: user, name: '' }) }
+
+        it { expect(subject).to be false }
+
+        it 'does not create a new User' do
+          expect{ subject }.not_to change{ User.count }
+        end
+
+        it 'does not create a new User' do
+          form.save
 
-        expect(MultipleRecordsCreatorNoBang.new(attr).save).to be true
-        expect(User.count).to eq(count+1) # Only one record saved
+          expect(form.errors).to eq user.errors
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trans_forms
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Daniel Viklund
@@ -14,44 +14,56 @@ dependencies:
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 description: Gem to create Form records that handles multiple changes wrapped in a
   transaction
 email:
@@ -104,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.3.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="