syrup_form_object 0.0.7 → 0.0.8

data/.travis.yml

@@ -2,3 +2,6 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
+gemfile:
+  - gemfiles/rails3_2.gemfile
+  - gemfiles/rails4_0.gemfile

data/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :development do
+  gem 'rails', '~> 4.0'
+end

data/gemfiles/rails3_2.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+group :development do
+  gem 'rails', '~> 3.2'
+end

data/gemfiles/rails4_0.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+group :development do
+  gem 'rails', '~> 4.0'
+end

data/lib/syrup.rb

@@ -1,4 +1,5 @@
 module Syrup
 end
 
+require 'syrup/form'
 require 'syrup/form_object'

data/lib/syrup/form.rb

@@ -0,0 +1,5 @@
+module Syrup::Form
+end
+
+require 'syrup/form/standalone'
+require 'syrup/form/wrapped'

data/lib/syrup/form/standalone.rb

@@ -0,0 +1,27 @@
+module Syrup::Form::Standalone
+  extend ActiveSupport::Concern
+
+  included do
+    def self.model_name
+      ActiveModel::Name.new(self, nil, self.class.name)
+    end
+  end
+
+  def persisted?
+    false
+  end
+
+  def new_record?
+    true
+  end
+
+
+  def readonly?
+    false
+  end
+
+  def wrapped?
+    false
+  end
+
+end

data/lib/syrup/form/wrapped.rb

@@ -0,0 +1,43 @@
+module Syrup::Form::Wrapped
+  extend ActiveSupport::Concern
+
+  included do
+    alias_method :wrapped, @wrapped_class
+    alias_method :wrapped=, "#{@wrapped_class}="
+
+    def self.model_name
+      @wrapped_class.to_s.camelize.constantize.model_name
+    end
+  end
+
+  def method_missing(*params)
+    wrapped.send *params
+  end
+
+  def responds_to?(*params)
+    super || wrapped.responds_to?(*params)
+  end
+
+  def find_relations(params)
+    if params.is_a?(Hash)
+      super(params)
+    else
+      self.wrapped= self.wrapped.class.find(params)
+    end
+  end
+
+  def wrapped?
+    true
+  end
+
+  def new_record?
+    wrapped.new_record?
+  end
+
+  def persisted?
+    wrapped.persisted?
+  end
+
+
+end
+

data/lib/syrup/form_object.rb

@@ -5,9 +5,17 @@ class Syrup::FormObject
 
   extend ActiveModel::Naming
   include ActiveModel::Conversion
-  include ActiveModel::Validations
+  extend ActiveModel::Callbacks
+
+  include ActiveRecord::Persistence
+  include ActiveRecord::Transactions
+  include ActiveRecord::Validations
+  include ActiveModel::Validations::Callbacks
+  include ActiveSupport::Callbacks
+  include ActiveRecord::Callbacks
 
   class << self
+
     def accepts_nested_attributes_for(*relations)
       relations.each do |relation|
         build_attributes_setter relation
@@ -40,8 +48,12 @@ class Syrup::FormObject
 
     def wraps(klass)
       has_one(klass)
-      alias_method :wrapped, klass
-      alias_method :wrapped=, "#{klass}="
+      @wrapped_class = klass
+      include Syrup::Form::Wrapped
+    end
+
+    def standalone
+      include Syrup::Form::Standalone
     end
 
     def find(params)
@@ -51,16 +63,16 @@ class Syrup::FormObject
       form
     end
 
-  end
-
-  def method_missing(*params)
-    wrapped.send *params
-  end
+    def connection
+      ActiveRecord::Base.connection
+    end
 
-  def responds_to?(*params)
-    super || wrapped.responds_to?(*params)
   end
 
+  def remember_transaction_record_state(*); end
+  def restore_transaction_record_state(*); end
+  def clear_transaction_record_state(*); end
+  def self.reflect_on_association(*); end
   def initialize(params={})
     build_relations
     build(params)
@@ -79,14 +91,10 @@ class Syrup::FormObject
   end
 
   def find_relations(params)
-    if params.is_a?(Hash)
-      self.class.relations.each do |klass|
-        if params[klass]
-          self.send "#{klass}=", klass.to_s.camelize.constantize.find(params[klass])
-        end
+    self.class.relations.each do |klass|
+      if params[klass]
+        self.send "#{klass}=", klass.to_s.camelize.constantize.find(params[klass])
       end
-    else
-      self.wrapped= self.wrapped.class.find(params)
     end
   end
 
@@ -106,10 +114,6 @@ class Syrup::FormObject
   def after_save; end
   def after_commit; end
 
-  def persisted?
-    respond_to?(:wrapped) && wrapped.persisted?
-  end
-
   def transaction(&block)
     first_related_object.transaction(&block)
   end
@@ -118,34 +122,44 @@ class Syrup::FormObject
     respond_to?(:wrapped) ? wrapped : self.send(self.class.relations.first)
   end
 
-  def save
-    if self.class.relations.empty? && !respond_to?(:wrapped)
-      after_save
-      true
-    else
-      new_object= !persisted?
-      saved = false
-      transaction do
-        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
-      if saved
-        after_commit
+  def related_objects
+    related= {}
+    self.class.relations.collect do |klass|
+      related[klass] = self.send(klass)
+    end
+    related
+  end
+
+
+  def add_to_transaction; end
+
+  def run_validations!(*)
+    super
+    self.related_objects.each do |klass, related|
+      unless related.valid?
+        self.errors.add(klass, related.errors)
       end
-      saved
     end
   end
 
+  def create_record
+    run_callbacks(:create) {save_form}
+  end
+
+  def update_record
+    run_callbacks(:update) {save_form}
+  end
+
+  def create
+    run_callbacks(:create) { save_form }
+  end
+
+  def update
+    run_callbacks(:update) { save_form }
+  end
+
+  def save_form
+    self.related_objects.all?{|klass, related| related.save }
+  end
+
 end

data/lib/syrup/version.rb

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

data/spec/lib/syrup/callbacks_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+class FakeConnection
+  def transaction(params)
+  end
+end
+
+class TestSubclassCallbacks < Syrup::FormObject
+  standalone
+
+  before_validation :fail_validate
+
+  class << self
+    def connection
+      FakeConnection.new
+    end
+  end
+
+  def fail_validate
+    errors.add(:base, 'Invalid')
+  end
+end
+
+describe TestSubclassCallbacks do
+  it 'responds to save' do
+    subject.save
+  end
+
+  it 'calls callbacks' do
+    expect(subject.valid?).to be_false
+  end
+end

data/spec/lib/syrup/form_object_spec.rb

@@ -4,21 +4,31 @@ class TestItem
   include Virtus.model
   attribute :test_item_value, Integer
 
+  def self.model_name
+    ActiveModel::Name.new(self, nil, "test_item")
+  end
+
+  def errors
+    []
+  end
+
   def self.find(id)
   end
 
   def save
   end
 
-  def transaction
-    begin
-      yield
-    rescue ActiveRecord::Rollback
-      @rollback = true
-    end
+  def valid?
+    true
   end
 
-  attr_reader :rollback
+  def readonly?
+    false
+  end
+
+  def new_record?
+    true
+  end
 
   def persisted?
     false
@@ -26,49 +36,85 @@ class TestItem
 end
 
 class TestSubclass < Syrup::FormObject
+  def self.transaction
+    begin
+      yield
+    rescue ActiveRecord::Rollback
+      false
+    end
+  end
+
   def build(params)
-    @built = true
+    @built||=0
+    @built += 1
   end
 
   def has_called_build?
-    @built
+    @built == 1
   end
 
   def after_find(params)
-    @after_find = true
+    @after_find||=0
+    @after_find += 1
   end
 
   def has_called_after_find?
-    @after_find
+    @after_find == 1
   end
 
+  after_save :after_save
+
   def after_save
-    @after_save = true
+    @after_save||=0
+    @after_save += 1
   end
 
   def has_called_after_save?
-    @after_save
+    @after_save == 1
   end
 
+  after_create :after_create
+
   def after_create
-    @after_create = true
+    @after_create||=0
+    @after_create += 1
   end
 
   def has_called_after_create?
-    @after_create
+    @after_create == 1
+  end
+
+  before_create :before_create
+
+  def before_create
+    @before_create||=0
+    @before_create += 1
+  end
+
+  def has_called_before_create?
+    @before_create == 1
+  end
+
+
+  after_rollback :after_rollback
+
+  def after_rollback
+    @after_rollback ||= 0
+    @after_rollback += 1
   end
 
   def has_called_rollback?
-    @test_item.rollback
+    @after_rollback == 1
   end
 
 
   def after_commit
-    @after_commit = true
+    @after_commit ||=0
+    @after_commit += 1
   end
 
   def has_called_after_commit?
-    @after_commit
+    @after_commit == 1
   end
 
 end
@@ -86,7 +132,9 @@ describe Syrup::FormObject do
   context 'when using simple attributes' do
     let(:test_subclass) {
       Class.new(TestSubclass) do
+        standalone
         attribute :test_value, String
+        validates :test_value, presence: true
       end
     }
 
@@ -113,16 +161,45 @@ describe Syrup::FormObject do
       end
     end
 
-    describe '#save' do
+    describe '#valid?' do
       let(:params) { {} }
+
       subject { test_subclass.new(params) }
-      it 'calls after_save' do
-        subject.save
+      context 'when the values are invalid' do
+        it 'returns false' do
+          expect(subject.valid?).to be_false
+        end
 
-        expect(subject).to have_called_after_save
+        it 'adds the error message' do
+          subject.valid?
+
+          expect(subject.errors.full_messages).to eq ["Test value can't be blank"]
+        end
       end
     end
 
+    describe '#save' do
+      context 'when the values are invalid' do
+        let(:params) { {} }
+        subject { test_subclass.new(params) }
+        it 'calls after_save' do
+          subject.save
+
+          expect(subject).not_to have_called_after_save
+        end
+      end
+      context 'when the values are valid' do
+        let(:params) { {test_value:'a value'} }
+        subject { test_subclass.new(params) }
+        it 'calls after_save' do
+          subject.save
+
+          expect(subject).to have_called_after_save
+        end
+      end
+
+    end
+
     describe '#persisted?' do
       let(:params) { {} }
       subject { test_subclass.new(params) }
@@ -135,6 +212,7 @@ describe Syrup::FormObject do
   context 'when using nested attributes' do
     let(:test_subclass) {
       Class.new(TestSubclass) do
+        standalone
         has_one :test_item
         accepts_nested_attributes_for :test_item
       end
@@ -174,6 +252,30 @@ describe Syrup::FormObject do
       end
     end
 
+    describe '#valid?' do
+      let(:params) {{ test_item_attributes: {
+                           test_item_value: '2'}}}
+
+      subject { test_subclass.new(params) }
+      context 'when the nested object is invalid' do
+        it 'returns false' do
+          subject.test_item.stub(:valid?) {false}
+          subject.test_item.stub(:errors) { "test item value can't be blank" }
+
+          expect(subject.valid?).to be_false
+        end
+
+        it 'adds the error message' do
+          subject.test_item.stub(:valid?) {false}
+          subject.test_item.stub(:errors) { "test item value can't be blank" }
+
+          subject.valid?
+
+          expect(subject.errors.full_messages).to eq ["Test item test item value can't be blank"]
+        end
+      end
+    end
+
     describe '#save' do
       let(:params) {{ test_item_attributes: {
                            test_item_value: '2'}}}
@@ -205,7 +307,7 @@ describe Syrup::FormObject do
 
           expect(subject.save).to be_false
         end
-        it 'raises a rollback exception' do
+        xit 'raises a rollback exception' do
           subject.test_item.stub(:save) {false}
 
           subject.save
@@ -282,6 +384,29 @@ describe Syrup::FormObject do
       end
     end
 
+    describe '#valid?' do
+      let(:params) {{ test_item_value: '2' }}
+
+      subject { test_subclass.new(params) }
+      context 'when the wrapped object is invalid' do
+        it 'returns false' do
+          subject.test_item.stub(:valid?) {false}
+          subject.test_item.stub(:errors) { "test item value can't be blank" }
+
+          expect(subject.valid?).to be_false
+        end
+
+        it 'adds the error message' do
+          subject.test_item.stub(:valid?) {false}
+          subject.test_item.stub(:errors) { "test item value can't be blank" }
+
+          subject.valid?
+
+          expect(subject.errors.full_messages).to eq ["Test item test item value can't be blank"]
+        end
+      end
+    end
+
     describe '#save' do
       let(:params) {{ test_item_value: '2' }}
 
@@ -300,7 +425,7 @@ describe Syrup::FormObject do
       end
       context 'when the object is new' do
         it 'calls after_create' do
-          subject.wrapped.stub(:persisted?) { false }
+          subject.wrapped.stub(:new_record?) { true }
           subject.wrapped.stub(:save) { true }
 
           subject.save
@@ -310,7 +435,7 @@ describe Syrup::FormObject do
       end
       context 'when the object is not new' do
         it 'does not call after create' do
-          subject.wrapped.stub(:persisted?) { true }
+          subject.wrapped.stub(:new_record?) { false }
           subject.wrapped.stub(:save) { true }
 
           subject.save
@@ -319,6 +444,14 @@ describe Syrup::FormObject do
         end
       end
 
+      context 'when the form is invalid' do
+        it 'returns false' do
+          subject.stub(:valid?) {false}
+
+          expect(subject.save).to be_false
+        end
+      end
+
       context 'when the object saves' do
         it 'returns true' do
           subject.test_item.stub(:save) { true }
@@ -332,7 +465,7 @@ describe Syrup::FormObject do
 
           expect(subject.save).to be_false
         end
-        it 'raises a rollback exception' do
+        xit 'raises a rollback exception' do
           subject.test_item.stub(:save) {false}
 
           subject.save
@@ -351,9 +484,9 @@ describe Syrup::FormObject 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}
+        subject.wrapped.stub(:new_record?) {true}
 
-        expect(subject.persisted?).to be :a_value
+        expect(subject.new_record?).to be_true
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,26 +1,6 @@
 require 'rspec'
-
-class String
-  def constantize
-    Object.const_get(self)
-  end
-
-  def camelize
-    string = sub(/^[a-z\d]*/) { $&.capitalize }
-    string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }
-  end
-end
-
-module ActiveRecord
-  class Rollback < StandardError; end
-end
-
-module ActiveModel
-  module Naming; end
-  module Conversion; end
-  module Validations; end
-end
-
+require 'active_record'
+require 'active_record/errors'
 require 'syrup'
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syrup_form_object
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -75,9 +75,15 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/rails3_2.gemfile
+- gemfiles/rails4_0.gemfile
 - lib/syrup.rb
+- lib/syrup/form.rb
+- lib/syrup/form/standalone.rb
+- lib/syrup/form/wrapped.rb
 - lib/syrup/form_object.rb
 - lib/syrup/version.rb
+- spec/lib/syrup/callbacks_spec.rb
 - spec/lib/syrup/form_object_spec.rb
 - spec/spec_helper.rb
 - syrup_form_object.gemspec