syrup_form_object 0.0.6 → 0.0.7

data/lib/syrup/form_object.rb

@@ -64,7 +64,12 @@ class Syrup::FormObject
   def initialize(params={})
     build_relations
     build(params)
-    assign_parameters(params)
+    self.attributes=params
+  end
+
+  def update_attributes(params)
+    self.attributes=params
+    self.save
   end
 
   def build_relations
@@ -85,7 +90,7 @@ class Syrup::FormObject
     end
   end
 
-  def assign_parameters(params)
+  def attributes=(params)
     @params = params
     params.each do |key, value|
       self.send "#{key}=", value
@@ -94,6 +99,9 @@ class Syrup::FormObject
 
   def build(params); end
   def after_find(params); end
+
+  def before_save; end
+  def before_create; end
   def after_create; end
   def after_save; end
   def after_commit; end
@@ -111,20 +119,32 @@ class Syrup::FormObject
   end
 
   def save
-    if self.class.relations.empty?
+    if self.class.relations.empty? && !respond_to?(:wrapped)
       after_save
+      true
     else
       new_object= !persisted?
+      saved = false
       transaction do
-        self.class.relations.each do |klass|
+        before_save
+        if new_object
+          before_create
+        end
+        saved = self.class.relations.all? do |klass|
           self.send(klass).save
         end
+        if !saved
+          raise ActiveRecord::Rollback
+        end
         if new_object
           after_create
         end
         after_save
       end
-      after_commit
+      if saved
+        after_commit
+      end
+      saved
     end
   end
 

data/lib/syrup/version.rb

@@ -1,3 +1,3 @@
 module Syrup
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/lib/syrup/form_object_spec.rb

@@ -11,9 +11,15 @@ class TestItem
   end
 
   def transaction
-    yield
+    begin
+      yield
+    rescue ActiveRecord::Rollback
+      @rollback = true
+    end
   end
 
+  attr_reader :rollback
+
   def persisted?
     false
   end
@@ -52,6 +58,11 @@ class TestSubclass < Syrup::FormObject
     @after_create
   end
 
+  def has_called_rollback?
+    @test_item.rollback
+  end
+
+
   def after_commit
     @after_commit = true
   end
@@ -173,10 +184,35 @@ describe Syrup::FormObject do
         subject.save
       end
       it 'calls after_save' do
+        subject.test_item.stub(:save) { true }
+
         subject.save
 
         expect(subject).to have_called_after_save
       end
+
+
+      context 'when the object saves' do
+        it 'returns true' do
+          subject.test_item.stub(:save) { true }
+          expect(subject.save).to be_true
+        end
+      end
+
+      context 'when the object does not save' do
+        it 'returns false' do
+          subject.test_item.stub(:save) {false}
+
+          expect(subject.save).to be_false
+        end
+        it 'raises a rollback exception' do
+          subject.test_item.stub(:save) {false}
+
+          subject.save
+
+          expect(subject).to have_called_rollback
+        end
+      end
     end
 
     describe '#persisted?' do
@@ -256,6 +292,8 @@ describe Syrup::FormObject do
         subject.save
       end
       it 'calls after_save' do
+        subject.test_item.stub(:save) { true }
+
         subject.save
 
         expect(subject).to have_called_after_save
@@ -263,6 +301,7 @@ describe Syrup::FormObject do
       context 'when the object is new' do
         it 'calls after_create' do
           subject.wrapped.stub(:persisted?) { false }
+          subject.wrapped.stub(:save) { true }
 
           subject.save
 
@@ -270,14 +309,42 @@ describe Syrup::FormObject do
         end
       end
       context 'when the object is not new' do
-        it 'calls after_update' do
+        it 'does not call after create' do
           subject.wrapped.stub(:persisted?) { true }
+          subject.wrapped.stub(:save) { true }
 
           subject.save
 
           expect(subject).not_to have_called_after_create
         end
       end
+
+      context 'when the object saves' do
+        it 'returns true' do
+          subject.test_item.stub(:save) { true }
+          expect(subject.save).to be_true
+        end
+      end
+
+      context 'when the object does not save' do
+        it 'returns false' do
+          subject.test_item.stub(:save) {false}
+
+          expect(subject.save).to be_false
+        end
+        it 'raises a rollback exception' do
+          subject.test_item.stub(:save) {false}
+
+          subject.save
+
+          expect(subject).to have_called_rollback
+        end
+      end
+    end
+
+    describe '#update_attributes' do
+      it 'updates the attributes in the objects'
+      it 'behaves like save'
     end
 
     describe '#persisted?' do

data/spec/spec_helper.rb

@@ -11,6 +11,10 @@ class String
   end
 end
 
+module ActiveRecord
+  class Rollback < StandardError; end
+end
+
 module ActiveModel
   module Naming; end
   module Conversion; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syrup_form_object
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus