active_presenter 0.0.6 → 1.1.2

data/lib/active_presenter/base.rb

@@ -3,7 +3,7 @@ module ActivePresenter
   #
   class Base
     include ActiveSupport::Callbacks
-    define_callbacks :before_save, :after_save
+    define_callbacks :before_validation, :before_save, :after_save
     
     class_inheritable_accessor :presented
     self.presented = {}
@@ -36,8 +36,6 @@ module ActivePresenter
       attribute_name.to_s.gsub("#{presentable_type}_", "").humanize
     end
     
-    attr_accessor :errors
-    
     # Accepts arguments in two forms. For example, if you had a SignupPresenter that presented User, and Account, you could specify arguments in the following two forms:
     #
     #   1. SignupPresenter.new(:user_login => 'james', :user_password => 'swordfish', :user_password_confirmation => 'swordfish', :account_subdomain => 'giraffesoft')
@@ -60,10 +58,26 @@ module ActivePresenter
       self.attributes = args
     end
 
-    # Set the attributes of the presentable instances using the type_attribute form (i.e. user_login => 'james')
+    # Set the attributes of the presentable instances using
+    # the type_attribute form (i.e. user_login => 'james'), or
+    # the multiparameter attribute form (i.e. {user_birthday(1i) => "1980", user_birthday(2i) => "3"})
     #
     def attributes=(attrs)
-      attrs.each { |k,v| send("#{k}=", v) unless attribute_protected?(k)}
+      multi_parameter_attributes = {}
+      
+      attrs.each do |k,v|
+        if (base_attribute = k.to_s.split("(").first) != k.to_s
+          presentable = presentable_for(base_attribute)
+          multi_parameter_attributes[presentable] ||= {}
+          multi_parameter_attributes[presentable].merge!(flatten_attribute_name(k,presentable).to_sym => v)
+        else
+          send("#{k}=", v) unless attribute_protected?(k)
+        end
+      end
+      
+      multi_parameter_attributes.each do |presentable,multi_attrs|
+        send(presentable).send(:attributes=, multi_attrs)
+      end
     end
     
     # Makes sure that the presenter is accurate about responding to presentable's attributes, even though they are handled by method_missing.
@@ -87,13 +101,17 @@ module ActivePresenter
     # Returns boolean based on the validity of the presentables by calling valid? on each of them.
     #
     def valid?
-      presented.keys.each do |type|
-        presented_inst = send(type)
-        
-        merge_errors(presented_inst, type) unless presented_inst.valid?
+      errors.clear
+      if run_callbacks_with_halt(:before_validation)
+        presented.keys.each do |type|
+          presented_inst = send(type)
+
+          next unless save?(type, presented_inst)
+          merge_errors(presented_inst, type) unless presented_inst.valid?
+        end
+
+        errors.empty?
       end
-      
-      errors.empty?
     end
     
     # Save all of the presentables, wrapped in a transaction.
@@ -105,29 +123,31 @@ module ActivePresenter
       
       ActiveRecord::Base.transaction do
         if valid? && run_callbacks_with_halt(:before_save)
-          saved = presented_instances.map { |i| i.save(false) }.all?
+          saved = presented.keys.select {|key| save?(key, send(key))}.all? {|key| send(key).save}
           raise ActiveRecord::Rollback unless saved # TODO: Does this happen implicitly?
         end
+
+        run_callbacks_with_halt(:after_save) if saved
       end
       
-      run_callbacks_with_halt(:after_save) if saved
-      
       saved
     end
     
-    # Save all of the presentables, by calling each of their save! methods, wrapped in a transaction.
+    # Save all of the presentables wrapped in a transaction.
     #
     # Returns true on success, will raise otherwise.
     # 
     def save!
+      raise ActiveRecord::RecordInvalid.new(self) unless valid?
       raise ActiveRecord::RecordNotSaved unless run_callbacks_with_halt(:before_save)
       
       ActiveRecord::Base.transaction do
-        valid? # collect errors before potential exception raise
-        presented_instances.each { |i| i.save! }
+        presented.keys.select {|key| save?(key, send(key))}.each {|key| send(key).save!}
+
+        run_callbacks_with_halt(:after_save)
       end
-      
-      run_callbacks_with_halt(:after_save)
+
+      true
     end
     
     # Update attributes, and save the presentables
@@ -139,6 +159,21 @@ module ActivePresenter
       save
     end
     
+    # Should this presented instance be saved?  By default, this returns true
+    # Called from #save and #save!
+    #
+    # For
+    #  class SignupPresenter < ActivePresenter::Base
+    #    presents :account, :user
+    #  end
+    #
+    # #save? will be called twice:
+    #  save?(:account, #<Account:0x1234dead>)
+    #  save?(:user, #<User:0xdeadbeef>)
+    def save?(presented_key, presented_instance)
+      true
+    end
+
     # We define #id and #new_record? to play nice with form_for(@presenter) in Rails
     def id # :nodoc:
       nil
@@ -147,7 +182,7 @@ module ActivePresenter
     def new_record?
       true
     end
-    
+
     protected
       def presented_instances
         presented.keys.map { |key| send(key) }

data/lib/active_presenter/version.rb

@@ -1,8 +1,8 @@
 module ActivePresenter
   module VERSION
-    MAJOR    = 0
-    MINOR    = 0
-    TINY     = 6
+    MAJOR    = 1
+    MINOR    = 1
+    TINY     = 2
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
   end

data/test/base_test.rb

@@ -91,18 +91,18 @@ Expectations do
   end
 
   expect ActiveRecord::Base.to.receive(:transaction) do
-    s = SignupPresenter.new
+    s = SignupPresenter.new(:user_login => "da", :user_password => "seekrit")
     s.save!
   end
 
   expect User.any_instance.to.receive(:save!) do
-    s = SignupPresenter.new
+    s = SignupPresenter.new(:user_login => "da", :user_password => "seekrit")
     s.save!
   end
 
   expect Account.any_instance.to.receive(:save!) do
     User.any_instance.stubs(:save!)
-    s = SignupPresenter.new
+    s = SignupPresenter.new(:user_login => "da", :user_password => "seekrit")
     s.save!
   end
 
@@ -130,7 +130,21 @@ Expectations do
     s.update_attributes :user_login => 'Something Different'
     s.user_login
   end
-
+  
+  # Multiparameter assignment
+  expect Time.parse('March 27 1980 9:30:59 am') do
+    s = SignupPresenter.new
+    s.update_attributes({
+      :"user_birthday(1i)" => '1980',
+      :"user_birthday(2i)" => '3',
+      :"user_birthday(3i)" => '27',
+      :"user_birthday(4i)" => '9',
+      :"user_birthday(5i)" => '30',
+      :"user_birthday(6i)" => '59'
+    })
+    s.user_birthday
+  end
+  
   # this is a regression test to make sure that _title is working. we had a weird conflict with using String#delete
   expect 'something' do
     s = SignupPresenter.new :account_title => 'something'
@@ -164,6 +178,17 @@ Expectations do
   expect NoMethodError do
     SignupPresenter.new({:i_dont_exist=>"blah"})
   end
+
+  # ActiveRecord::Base uses nil id to signify an unsaved model
+  expect nil do
+    SignupPresenter.new.id
+  end
+
+  expect nil do
+    returning(SignupPresenter.new(:user => User.new(hash_for_user))) do |presenter|
+      presenter.save!
+    end.id
+  end
   
   expect CantSavePresenter.new.not.to.be.save # it won't save because the filter chain will halt
   
@@ -185,4 +210,71 @@ Expectations do
   
   expect SamePrefixPresenter.new.to.be.respond_to?(:account_title)
   expect SamePrefixPresenter.new.to.be.respond_to?(:account_info_info)
+
+  expect [:before_validation, :before_save, :after_save] do
+    returning(CallbackOrderingPresenter.new) do |presenter|
+      presenter.save!
+    end.steps
+  end
+
+  expect [:before_validation, :before_save] do
+    returning(CallbackCantSavePresenter.new) do |presenter|
+      presenter.save
+    end.steps
+  end
+
+  expect [:before_validation, :before_save] do
+    returning(CallbackCantSavePresenter.new) do |presenter|
+      begin
+        presenter.save!
+      rescue ActiveRecord::RecordNotSaved
+        # NOP
+      end
+    end.steps
+  end
+
+  expect ActiveRecord::RecordNotSaved do
+    CallbackCantSavePresenter.new.save!
+  end
+
+  expect ActiveRecord::RecordInvalid do
+    CallbackCantValidatePresenter.new.save!
+  end
+
+  expect [:before_validation] do
+    returning(CallbackCantValidatePresenter.new) do |presenter|
+      begin
+        presenter.save!
+      rescue ActiveRecord::RecordInvalid
+        # NOP
+      end
+    end.steps
+  end
+
+  expect [:before_validation] do
+    returning(CallbackCantValidatePresenter.new) do |presenter|
+      presenter.save
+    end.steps
+  end
+
+  expect ActiveRecord::Errors.any_instance.to.receive(:clear) do
+    CallbackCantValidatePresenter.new.valid?
+  end
+
+  # this should act as ActiveRecord models do
+  expect NoMethodError do
+    SignupPresenter.new({:i_dont_exist=>"blah"})
+  end
+
+  expect false do
+    SignupNoNilPresenter.new.save
+  end
+
+  expect true do
+    SignupNoNilPresenter.new(:user => nil, :account => Account.new).save
+  end
+
+  expect true do
+    SignupNoNilPresenter.new(:user => nil, :account => Account.new).save!
+  end
 end

data/test/test_helper.rb

@@ -10,9 +10,10 @@ ActiveRecord::Base.logger.level = Logger::WARN
 
 ActiveRecord::Schema.define(:version => 0) do
   create_table :users do |t|
-    t.boolean :admin,    :default => false
-    t.string  :login,    :default => ''
-    t.string  :password, :default => ''
+    t.boolean  :admin,    :default => false
+    t.string   :login,    :default => ''
+    t.string   :password, :default => ''
+    t.datetime :birthday
   end
   
   create_table :accounts do |t|
@@ -31,7 +32,7 @@ end
 
 class User < ActiveRecord::Base
   validates_presence_of :login, :password
-  attr_accessible :login, :password
+  attr_accessible :login, :password, :birthday
   attr_accessor   :password_confirmation
 end
 class Account < ActiveRecord::Base; end
@@ -54,6 +55,14 @@ class CantSavePresenter < ActivePresenter::Base
   def halt; false; end
 end
 
+class SignupNoNilPresenter < ActivePresenter::Base
+  presents :account, :user
+
+  def save?(key, instance)
+    !instance.nil?
+  end
+end
+
 class AfterSavePresenter < ActivePresenter::Base
   presents :address
   
@@ -68,6 +77,97 @@ class SamePrefixPresenter < ActivePresenter::Base
   presents :account, :account_info
 end
 
+class CallbackOrderingPresenter < ActivePresenter::Base
+  presents :account
+  
+  before_validation :do_before_validation
+  before_save :do_before_save
+  after_save :do_after_save
+  
+  attr_reader :steps
+  
+  def initialize(params={})
+    super
+    @steps = []
+  end
+  
+  def do_before_validation
+    @steps << :before_validation
+  end
+  
+  def do_before_save
+    @steps << :before_save
+  end
+  
+  def do_after_save
+    @steps << :after_save
+  end
+end
+
+class CallbackCantSavePresenter < ActivePresenter::Base
+  presents :account
+  
+  before_validation :do_before_validation
+  before_save :do_before_save
+  before_save :halt
+  after_save :do_after_save
+  
+  attr_reader :steps
+  
+  def initialize(params={})
+    super
+    @steps = []
+  end
+  
+  def do_before_validation
+    @steps << :before_validation
+  end
+  
+  def do_before_save
+    @steps << :before_save
+  end
+  
+  def do_after_save
+    @steps << :after_save
+  end
+
+  def halt
+    false
+  end
+end
+
+class CallbackCantValidatePresenter < ActivePresenter::Base
+  presents :account
+  
+  before_validation :do_before_validation
+  before_validation :halt
+  before_save :do_before_save
+  after_save :do_after_save
+  
+  attr_reader :steps
+  
+  def initialize(params={})
+    super
+    @steps = []
+  end
+  
+  def do_before_validation
+    @steps << :before_validation
+  end
+  
+  def do_before_save
+    @steps << :before_save
+  end
+  
+  def do_after_save
+    @steps << :after_save
+  end
+
+  def halt
+    false
+  end
+end
+
 def hash_for_user(opts = {})
   {:login => 'jane', :password => 'seekrit' }.merge(opts)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_presenter
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 1.1.2
 platform: ruby
 authors: 
 - James Golick & Daniel Haran
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-22 00:00:00 -05:00
+date: 2009-03-13 00:00:00 -04:00
 default_executable: 
 dependencies: []