syrup_form_object 0.0.5 → 0.0.6

data/lib/syrup/form_object.rb

@@ -37,14 +37,11 @@ class Syrup::FormObject
       attr_accessor klass
     end
 
-    attr_accessor :wrapped_class
 
     def wraps(klass)
-      wrapped_class = klass
       has_one(klass)
       alias_method :wrapped, klass
       alias_method :wrapped=, "#{klass}="
-
     end
 
     def find(params)
@@ -97,9 +94,38 @@ class Syrup::FormObject
 
   def build(params); end
   def after_find(params); end
+  def after_create; end
+  def after_save; end
+  def after_commit; end
 
   def persisted?
-    false
+    respond_to?(:wrapped) && wrapped.persisted?
+  end
+
+  def transaction(&block)
+    first_related_object.transaction(&block)
+  end
+
+  def first_related_object
+    respond_to?(:wrapped) ? wrapped : self.send(self.class.relations.first)
+  end
+
+  def save
+    if self.class.relations.empty?
+      after_save
+    else
+      new_object= !persisted?
+      transaction do
+        self.class.relations.each do |klass|
+          self.send(klass).save
+        end
+        if new_object
+          after_create
+        end
+        after_save
+      end
+      after_commit
+    end
   end
 
 end

data/lib/syrup/version.rb

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

data/spec/lib/syrup/form_object_spec.rb

@@ -6,6 +6,17 @@ class TestItem
 
   def self.find(id)
   end
+
+  def save
+  end
+
+  def transaction
+    yield
+  end
+
+  def persisted?
+    false
+  end
 end
 
 class TestSubclass < Syrup::FormObject
@@ -24,6 +35,31 @@ class TestSubclass < Syrup::FormObject
   def has_called_after_find?
     @after_find
   end
+
+  def after_save
+    @after_save = true
+  end
+
+  def has_called_after_save?
+    @after_save
+  end
+
+  def after_create
+    @after_create = true
+  end
+
+  def has_called_after_create?
+    @after_create
+  end
+
+  def after_commit
+    @after_commit = true
+  end
+
+  def has_called_after_commit?
+    @after_commit
+  end
+
 end
 
 shared_examples 'successful create' do
@@ -42,6 +78,7 @@ describe Syrup::FormObject do
         attribute :test_value, String
       end
     }
+
     describe '#new' do
       subject { test_subclass.new(params) }
       let(:params) { {} }
@@ -56,7 +93,7 @@ describe Syrup::FormObject do
         end
       end
     end
-    pending '#save'
+
     describe '::find' do
       subject { test_subclass.find(params) }
       let(:params) { {} }
@@ -65,6 +102,24 @@ describe Syrup::FormObject do
       end
     end
 
+    describe '#save' do
+      let(:params) { {} }
+      subject { test_subclass.new(params) }
+      it 'calls after_save' do
+        subject.save
+
+        expect(subject).to have_called_after_save
+      end
+    end
+
+    describe '#persisted?' do
+      let(:params) { {} }
+      subject { test_subclass.new(params) }
+      it 'returns false' do
+        expect(subject.persisted?).to be_false
+      end
+    end
+
   end
   context 'when using nested attributes' do
     let(:test_subclass) {
@@ -94,7 +149,6 @@ describe Syrup::FormObject do
       end
     end
 
-    pending '#save'
     describe '::find' do
       subject { test_subclass.find(params) }
       let(:params) { {test_item: 2} }
@@ -109,6 +163,30 @@ describe Syrup::FormObject do
       end
     end
 
+    describe '#save' do
+      let(:params) {{ test_item_attributes: {
+                           test_item_value: '2'}}}
+      subject { test_subclass.new(params) }
+      it 'saves the test_item' do
+        subject.test_item.should_receive(:save)
+
+        subject.save
+      end
+      it 'calls after_save' do
+        subject.save
+
+        expect(subject).to have_called_after_save
+      end
+    end
+
+    describe '#persisted?' do
+      let(:params) {{ test_item_attributes: {
+                           test_item_value: '2'}}}
+      subject { test_subclass.new(params) }
+      it 'returns false' do
+        expect(subject.persisted?).to be_false
+      end
+    end
   end
 
   context 'when using a wrapped object' do
@@ -153,19 +231,64 @@ describe Syrup::FormObject do
       end
     end
 
-    pending '#save'
     describe '::find' do
       subject { test_subclass.find(params) }
       let(:params) { 2 }
+      let(:test_item) { TestItem.new }
 
       it 'loads the test_item from the id sent' do
+        TestItem.should_receive(:find).with(params) { test_item }
+
+        expect(subject.wrapped).to be test_item
       end
       it 'calls the after_find method' do
         expect(subject).to have_called_after_find
       end
     end
 
-  end
+    describe '#save' do
+      let(:params) {{ test_item_value: '2' }}
+
+      subject { test_subclass.new(params) }
+      it 'saves the test_item' do
+        subject.test_item.should_receive(:save)
+
+        subject.save
+      end
+      it 'calls after_save' do
+        subject.save
 
+        expect(subject).to have_called_after_save
+      end
+      context 'when the object is new' do
+        it 'calls after_create' do
+          subject.wrapped.stub(:persisted?) { false }
+
+          subject.save
+
+          expect(subject).to have_called_after_create
+        end
+      end
+      context 'when the object is not new' do
+        it 'calls after_update' do
+          subject.wrapped.stub(:persisted?) { true }
+
+          subject.save
+
+          expect(subject).not_to have_called_after_create
+        end
+      end
+    end
+
+    describe '#persisted?' do
+      let(:params) {{ test_item_value: '2' }}
+      subject { test_subclass.find(params) }
+      it 'forwards the message to the wrapped object' do
+        subject.wrapped.stub(:persisted?) {:a_value}
+
+        expect(subject.persisted?).to be :a_value
+      end
+    end
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syrup_form_object
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: