syrup_form_object 0.0.8 → 0.0.9

data/gemfiles/rails3_2.gemfile

@@ -4,4 +4,5 @@ gemspec path: '../'
 
 group :development do
   gem 'rails', '~> 3.2'
+  gem 'activerecord-nulldb-adapter',  git: 'git://github.com/nulldb/nulldb.git'
 end

data/gemfiles/rails4_0.gemfile

@@ -4,4 +4,5 @@ gemspec path: '../'
 
 group :development do
   gem 'rails', '~> 4.0'
+  gem 'activerecord-nulldb-adapter',  git: 'git://github.com/nulldb/nulldb.git'
 end

data/lib/syrup/callbacks.rb

@@ -0,0 +1,15 @@
+module Syrup::Callbacks
+  extend ActiveSupport::Concern
+
+  included do
+    include ActiveModel::Validations::Callbacks
+    include ActiveSupport::Callbacks
+    include ActiveRecord::Callbacks
+
+    include InstanceMethods
+  end
+
+  module InstanceMethods
+  end
+
+end

data/lib/syrup/form/wrapped.rb

@@ -2,20 +2,30 @@ module Syrup::Form::Wrapped
   extend ActiveSupport::Concern
 
   included do
-    alias_method :wrapped, @wrapped_class
-    alias_method :wrapped=, "#{@wrapped_class}="
+    alias_method :wrapped, @wrapped_class_name
+    alias_method :wrapped=, "#{@wrapped_class_name}="
+    @wrapped_class = @wrapped_class_name.to_s.camelize.constantize
+
+    def self.method_missing(*params)
+      @wrapped_class.send *params
+    end
+
+    def self.respond_to?(*params)
+      super || @wrapped_class.respond_to?(*params)
+    end
 
     def self.model_name
-      @wrapped_class.to_s.camelize.constantize.model_name
+      @wrapped_class.model_name
     end
+
   end
 
   def method_missing(*params)
     wrapped.send *params
   end
 
-  def responds_to?(*params)
-    super || wrapped.responds_to?(*params)
+  def respond_to?(*params)
+    super || wrapped.respond_to?(*params)
   end
 
   def find_relations(params)
@@ -38,6 +48,4 @@ module Syrup::Form::Wrapped
     wrapped.persisted?
   end
 
-
 end
-

data/lib/syrup/form_methods.rb

@@ -0,0 +1,12 @@
+require 'virtus'
+
+module Syrup::FormMethods
+  extend ActiveSupport::Concern
+
+  included do
+    include Virtus.model
+    extend ActiveModel::Naming
+    include ActiveModel::Conversion
+    include ActiveRecord::AttributeAssignment
+  end
+end

data/lib/syrup/form_object.rb

@@ -1,54 +1,15 @@
-require 'virtus'
-
 class Syrup::FormObject
-  include Virtus.model
-
-  extend ActiveModel::Naming
-  include ActiveModel::Conversion
+  include Syrup::FormMethods
   extend ActiveModel::Callbacks
-
-  include ActiveRecord::Persistence
-  include ActiveRecord::Transactions
-  include ActiveRecord::Validations
-  include ActiveModel::Validations::Callbacks
-  include ActiveSupport::Callbacks
-  include ActiveRecord::Callbacks
+  include Syrup::Relations
+  include Syrup::Persistence
+  include Syrup::Callbacks
 
   class << self
 
-    def accepts_nested_attributes_for(*relations)
-      relations.each do |relation|
-        build_attributes_setter relation
-      end
-    end
-
-    # build_attributes_setter 'address'
-    #
-    # def address_attributes=(attributes)
-    #   address.attributes=attributes
-    # end
-
-    def build_attributes_setter(relation)
-      module_eval <<-EOH
-        def #{relation}_attributes=(attributes)
-          #{relation}.attributes=attributes
-        end
-      EOH
-    end
-
-    def relations
-      @relations ||= []
-    end
-
-    def has_one(klass)
-      relations << klass
-      attr_accessor klass
-    end
-
-
     def wraps(klass)
       has_one(klass)
-      @wrapped_class = klass
+      @wrapped_class_name = klass
       include Syrup::Form::Wrapped
     end
 
@@ -62,77 +23,38 @@ class Syrup::FormObject
       form.after_find(params)
       form
     end
-
-    def connection
-      ActiveRecord::Base.connection
-    end
-
   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 add_to_transaction; end
+  def self.attributes_protected_by_default
+    []
+  end
+
   def initialize(params={})
     build_relations
     build(params)
-    self.attributes=params
+    self.assign_attributes(params)
   end
 
   def update_attributes(params)
-    self.attributes=params
+    self.assign_attributes(params)
     self.save
   end
 
-  def build_relations
-    self.class.relations.each do |klass|
-      self.send "#{klass}=", klass.to_s.camelize.constantize.new
-    end
-  end
-
-  def find_relations(params)
-    self.class.relations.each do |klass|
-      if params[klass]
-        self.send "#{klass}=", klass.to_s.camelize.constantize.find(params[klass])
-      end
-    end
-  end
-
-  def attributes=(params)
-    @params = params
-    params.each do |key, value|
-      self.send "#{key}=", value
-    end
-  end
+  # def attributes=(params)
+  #   @params = params
+  #   params.each do |key, value|
+  #     self.send "#{key}=", value
+  #   end
+  # end
 
   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
-
-  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 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|
@@ -158,8 +80,5 @@ class Syrup::FormObject
     run_callbacks(:update) { save_form }
   end
 
-  def save_form
-    self.related_objects.all?{|klass, related| related.save }
-  end
 
 end

data/lib/syrup/persistence.rb

@@ -0,0 +1,25 @@
+module Syrup::Persistence
+  extend ActiveSupport::Concern
+
+  included do
+    include ActiveRecord::Persistence
+    include ActiveRecord::Transactions
+    include ActiveRecord::Validations
+
+    extend ClassMethods
+    include InstanceMethods
+  end
+
+  module ClassMethods
+    def connection
+      ActiveRecord::Base.connection
+    end
+  end
+
+  module InstanceMethods
+    def save_form
+      self.related_objects.all?{|klass, related| related.save }
+    end
+  end
+
+end

data/lib/syrup/relations.rb

@@ -0,0 +1,70 @@
+module Syrup::Relations
+  extend ActiveSupport::Concern
+
+  included do
+    extend ClassMethods
+
+    include InstanceMethods
+  end
+
+  module ClassMethods
+    def accepts_nested_attributes_for(*relations)
+      relations.each do |relation|
+        build_attributes_setter relation
+      end
+    end
+
+    # build_attributes_setter 'address'
+    #
+    # def address_attributes=(attributes)
+    #   address.attributes=attributes
+    # end
+
+    def build_attributes_setter(relation)
+      module_eval <<-EOH
+        def #{relation}_attributes=(attributes)
+          #{relation}.attributes=attributes
+        end
+      EOH
+    end
+
+    def relations
+      @relations ||= []
+    end
+
+    def has_one(klass)
+      relations << klass
+      attr_accessor klass
+    end
+  end
+
+  module InstanceMethods
+    def build_relations
+      self.class.relations.each do |klass|
+        self.send "#{klass}=", klass.to_s.camelize.constantize.new
+      end
+    end
+
+    def find_relations(params)
+      self.class.relations.each do |klass|
+        if params[klass]
+          self.send "#{klass}=", klass.to_s.camelize.constantize.find(params[klass])
+        end
+      end
+    end
+
+    def first_related_object
+      respond_to?(:wrapped) ? wrapped : self.send(self.class.relations.first)
+    end
+
+
+    def related_objects
+      related= {}
+      self.class.relations.collect do |klass|
+        related[klass] = self.send(klass)
+      end
+      related
+    end
+  end
+
+end

data/lib/syrup/version.rb

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

data/lib/syrup.rb

@@ -2,4 +2,8 @@ module Syrup
 end
 
 require 'syrup/form'
+require 'syrup/form_methods'
+require 'syrup/persistence'
+require 'syrup/callbacks'
+require 'syrup/relations'
 require 'syrup/form_object'

data/spec/db/schema.rb

@@ -0,0 +1,5 @@
+ActiveRecord::Schema.define(:version => 20131108103012) do
+  create_table "test_items", :force => true do |t|
+    t.integer   "test_item_value"
+  end
+end

data/spec/lib/syrup/form_object_spec.rb

@@ -1,38 +1,6 @@
 require 'spec_helper'
 
-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 valid?
-    true
-  end
-
-  def readonly?
-    false
-  end
-
-  def new_record?
-    true
-  end
-
-  def persisted?
-    false
-  end
+class TestItem < ActiveRecord::Base
 end
 
 class TestSubclass < Syrup::FormObject
@@ -248,6 +216,8 @@ describe Syrup::FormObject do
         expect(subject.test_item).to be_a(TestItem)
       end
       it 'calls the after_find method' do
+        TestItem.stub(:find).once { TestItem.new }
+
         expect(subject).to have_called_after_find
       end
     end
@@ -380,6 +350,8 @@ describe Syrup::FormObject do
         expect(subject.wrapped).to be test_item
       end
       it 'calls the after_find method' do
+        TestItem.stub(:find).once { TestItem.new }
+
         expect(subject).to have_called_after_find
       end
     end

data/spec/spec_helper.rb

@@ -1,7 +1,16 @@
 require 'rspec'
+require 'rails'
 require 'active_record'
 require 'active_record/errors'
 require 'syrup'
+require 'nulldb_rspec'
+
+include NullDB::RSpec::NullifiedDatabase
+
+NullDB.configure do |config|
+  config.project_root = File.expand_path("..", __FILE__)
+end
+
 
 RSpec.configure do |config|
 end

data/test.sh

@@ -0,0 +1 @@
+BUNDLE_GEMFILE=gemfiles/rails3_2.gemfile bundle exec rspec && BUNDLE_GEMFILE=gemfiles/rails4_0.gemfile bundle exec rspec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syrup_form_object
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -71,22 +71,27 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
-- Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - gemfiles/rails3_2.gemfile
 - gemfiles/rails4_0.gemfile
 - lib/syrup.rb
+- lib/syrup/callbacks.rb
 - lib/syrup/form.rb
 - lib/syrup/form/standalone.rb
 - lib/syrup/form/wrapped.rb
+- lib/syrup/form_methods.rb
 - lib/syrup/form_object.rb
+- lib/syrup/persistence.rb
+- lib/syrup/relations.rb
 - lib/syrup/version.rb
+- spec/db/schema.rb
 - spec/lib/syrup/callbacks_spec.rb
 - spec/lib/syrup/form_object_spec.rb
 - spec/spec_helper.rb
 - syrup_form_object.gemspec
+- test.sh
 homepage: https://github.com/alexsiri7/syrup_form_object
 licenses:
 - MIT

data/Gemfile

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