forminate 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f117e333af88c5257424675b2ba3b235a3a7e514
-  data.tar.gz: 6a5483b6310fdc7b46341d53f3dcd1f8382474df
+  metadata.gz: 788144e945686f0d22aca012824b9e9ec934ddc6
+  data.tar.gz: 2c48c40dfe89785a48a8ad957cfa871e1d7939bd
 SHA512:
-  metadata.gz: 99a8d7568801c1732bbe22381569925e84da62555b8aa9edb1f2d3fa4fbb9bcd248c054db78414a868997d54dbff71cc2d5a9aa296585a9b63f7d238627bfeaa
-  data.tar.gz: 4eda18ed97e5a63be2fa985eafd15b403faf0640eefd5c2705dbc20c1a5c4d999f9e55ea1bf9d9de38182b650634c308e4c4369bb3f5dc5b6e319bb056d200ce
+  metadata.gz: e6366cdaa910762361b1fd368db1f6a17dbea84c36bc36e661bb86b96152d587f7237d3c77dc522096f17709524e8e435e37a7ec6cb6849880f77c199e9ebac7
+  data.tar.gz: eda25d9eb9d7f963b2f1b5ede5a01d904086e0625ee0ec061186313c2365d1b81e509238b6c47933d6152aa29a2e46d8765a4f67d914a63cc402d42ac3eae754

data/forminate.gemspec

@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'client_side_validations', '~> 3.2'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake', '~> 10.1'
   spec.add_development_dependency 'rspec', '~> 2.11'
   spec.add_development_dependency 'activerecord', '~> 3.2'
   if defined?(JRUBY_VERSION)
-    spec.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
+    spec.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.3'
   else
-    spec.add_development_dependency 'sqlite3'
+    spec.add_development_dependency 'sqlite3', '~> 1.3'
   end
 end

data/lib/forminate.rb

@@ -79,16 +79,19 @@ module Forminate
     Hash[association_names.map { |name| [name, send(name)] }]
   end
 
-  def save
+  def save!
     return false unless valid?
-
     before_save
-    if defined? ActiveRecord
-      ActiveRecord::Base.transaction { persist_associations }
+    persist_associations
+    self
+  end
+
+  def save
+    if use_transaction?
+      ActiveRecord::Base.transaction { save! }
     else
-      persist_associations
+      save!
     end
-    self
   end
 
   def before_save
@@ -153,4 +156,8 @@ module Forminate
     assoc = send(assoc_name)
     return assoc, assoc_method_name
   end
+
+  def use_transaction?
+    defined?(ActiveRecord)
+  end
 end

data/lib/forminate/version.rb

@@ -1,3 +1,3 @@
 module Forminate
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/forminate/association_definition_spec.rb

@@ -14,7 +14,7 @@ describe Forminate::AssociationDefinition do
   describe '#validation_condition' do
     context 'options hash does not contain :validate key' do
       it 'returns true' do
-        expect(subject.validation_condition).to be_true
+        expect(subject.validation_condition).to be true
       end
     end
 

data/spec/forminate_spec.rb

@@ -32,7 +32,7 @@ describe Forminate do
 
   describe '.attributes_for' do
     it 'adds a reader method for each attribute of the associated model' do
-      expect(model.respond_to?(:dummy_user_first_name)).to be_true
+      expect(model.respond_to?(:dummy_user_first_name)).to be true
     end
 
     it 'adds reader and writer methods for each attribute of the associated model' do
@@ -52,9 +52,9 @@ describe Forminate do
       context 'true or false' do
         it 'validates associated object based value given' do
           model.calculate_total
-          expect(model.valid?).to be_false
+          expect(model.valid?).to be false
           model.dummy_user_email = 'bob@example.com'
-          expect(model.valid?).to be_true
+          expect(model.valid?).to be true
         end
       end
 
@@ -62,11 +62,11 @@ describe Forminate do
         it 'validates associated objects based on result of method call' do
           model.calculate_total
           model.dummy_user_email = 'bob@example.com'
-          expect(model.valid?).to be_true
+          expect(model.valid?).to be true
           model.dummy_book_price = 12.95
-          expect(model.valid?).to be_false
+          expect(model.valid?).to be false
           model.dummy_credit_card_number = 4242424242424242
-          expect(model.valid?).to be_true
+          expect(model.valid?).to be true
         end
       end
 
@@ -175,21 +175,55 @@ describe Forminate do
     end
   end
 
-  describe '#save' do
+  shared_examples 'a save method' do
     context 'object is valid' do
-      it 'saves associations and returns self' do
+      before do
         model.dummy_user_email = 'bob@example.com'
         model.calculate_total
+      end
+
+      it 'persists associations and returns self' do
         DummyUser.any_instance.should_receive(:save)
-        expect(model.save).to eq(model)
+        expect(method).to eq(model)
       end
     end
 
-    context 'object is not valid' do
-      it 'does not save associations and returns false' do
+    context 'object is invalid' do
+      it 'does not persist associations and returns false' do
         DummyUser.any_instance.should_not_receive(:save)
-        expect(model.save).to be_false
+        expect(method).to be false
+      end
+    end
+  end
+
+  describe '#save!' do
+    let(:method) { model.save! }
+    it_behaves_like 'a save method'
+  end
+
+  describe '#save' do
+    let(:method) { model.save }
+
+    context 'with ActiveRecord defined' do
+      before { model.stub(:use_transaction?).and_return(true) }
+
+      it 'wraps persistence in a transaction' do
+        ActiveRecord::Base.should_receive(:transaction).once
+        model.save
       end
+
+      it_behaves_like 'a save method'
+    end
+
+    context 'without ActiveRecord defined' do
+      before { model.stub(:use_transaction?).and_return(false) }
+
+      it 'does not wrap persistence in a transaction' do
+        ActiveRecord::Base.should_not_receive(:transaction)
+        model.save
+      end
+
+      it_behaves_like 'a save method'
     end
   end
 
@@ -225,13 +259,13 @@ describe Forminate do
   describe '#respond_to_missing?' do
     context 'associated object responds to method' do
       it 'returns true' do
-        expect(model.respond_to?(:dummy_user_temporary_note)).to be_true
+        expect(model.respond_to?(:dummy_user_temporary_note)).to be true
       end
     end
 
     context 'associated object does not respond to method' do
       it 'returns false' do
-        expect(model.respond_to?(:dummy_user_bogus_method)).to be_false
+        expect(model.respond_to?(:dummy_user_bogus_method)).to be false
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forminate
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mo Lawson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -76,16 +76,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -118,16 +118,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 description: Form objects for Rails applications
 email:
 - mo@molawson.com
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Create form objects from multiple Active Record and/or ActiveAttr models.