@@ -17,14 +17,17 @@ module ActivePresenter # # def self.presents(*types) - attr_accessor *types + types_and_classes = types.extract_options! + types.each { |t| types_and_classes[t] = t.to_s.tableize.classify.constantize } + + attr_accessor *types_and_classes.keys - types.each do |t| + types_and_classes.keys.each do |t| define_method("#{t}_errors") do send(t).errors end - presented[t] = t.to_s.tableize.classify.constantize + presented[t] = types_and_classes[t] end end @@ -222,7 +225,7 @@ module ActivePresenter presentable = presentable_for(name) return false unless presentable flat_attribute = {flatten_attribute_name(name, presentable) => ''} #remove_att... normally takes a hash, so we use a '' - presentable.to_s.tableize.classify.constantize.new.send(:remove_attributes_protected_from_mass_assignment, flat_attribute).empty? + presented[presentable].new.send(:remove_attributes_protected_from_mass_assignment, flat_attribute).empty? end def run_callbacks_with_halt(callback) lib/active_presenter/base.rb @@ -277,4 +277,14 @@ Expectations do expect true do SignupNoNilPresenter.new(:user => nil, :account => Account.new).save! end + + expect Address do + PresenterWithTwoAddresses.new.secondary_address + end + + expect "123 awesome st" do + p = PresenterWithTwoAddresses.new(:secondary_address_street => "123 awesome st") + p.save + p.secondary_address_street + end end test/base_test.rb @@ -39,6 +39,10 @@ class Account < ActiveRecord::Base; end class Address < ActiveRecord::Base; end class AccountInfo < ActiveRecord::Base; end +class PresenterWithTwoAddresses < ActivePresenter::Base + presents :address, :secondary_address => Address +end + class SignupPresenter < ActivePresenter::Base presents :account, :user end test/test_helper.rb f253eb51a037fff4854fb687f4aabe38d4366909 James Golick james@giraffesoft.ca http://github.com/steveluscher/active_presenter/commit/7576ebf25057bdab630831be8dcb170fa21bdc63 7576ebf25057bdab630831be8dcb170fa21bdc63 2009-05-17T14:39:04-07:00 2009-05-17T14:39:04-07:00 make it possible to override default types 5c4c53850e4fdf1ed26d52920f37a4ca42743734 James Golick james@giraffesoft.ca