active_presenter 0.0.3 → 0.0.5

data/README

@@ -25,9 +25,9 @@ Or get the source from github:
 Creating a presenter is as simple as subclassing ActivePresenter::Base. Use the presents method to indicate which models the presenter should present.
 
   class SignupPresenter < ActivePresenter::Base
-    presents User, Account
+    presents :user, :account
   end
-
+ 
 === Instantiation
 
 Then, you can instantiate the presenter using either, or both of two forms. 
@@ -66,6 +66,12 @@ Both of these methods are compatible with error_messages_for. It just depends wh
 
 You can save your presenter the same way you'd save an ActiveRecord object. Both #save, and #save! behave the same way they do on a normal AR model.
 
+=== Callbacks
+
+Callbacks work exactly like ActiveRecord callbacks. before_save, and after_save are available.
+
+Note that if any of your after_save callbacks return false, the rest of them will not be run. This is consistent with AR behavior.
+
 == Credits
 
 ActivePresenter was created, and is maintained by {Daniel Haran}[http://danielharan.com] and {James Golick}[http://jamesgolick.com] on the train ride to {RubyFringe}[http://rubyfringe.com] from Montreal.

data/lib/active_presenter/base.rb

@@ -2,6 +2,9 @@ module ActivePresenter
   # Base class for presenters. See README for usage.
   #
   class Base
+    include ActiveSupport::Callbacks
+    define_callbacks :before_save, :after_save
+    
     class_inheritable_accessor :presented
     self.presented = {}
     
@@ -9,7 +12,7 @@ module ActivePresenter
     # i.e.
     #
     #   class SignupPresenter < ActivePresenter::Base
-    #     presents User, Account
+    #     presents :user, :account
     #   end
     #
     #
@@ -21,7 +24,7 @@ module ActivePresenter
           send(t).errors
         end
         
-        presented[t] = t.to_s.classify.constantize
+        presented[t] = t.to_s.tableize.classify.constantize
       end
     end
     
@@ -101,12 +104,14 @@ module ActivePresenter
       saved = false
       
       ActiveRecord::Base.transaction do
-        if valid?
+        if valid? && run_callbacks_with_halt(:before_save)
           saved = presented_instances.map { |i| i.save(false) }.all?
           raise ActiveRecord::Rollback unless saved # TODO: Does this happen implicitly?
         end
       end
       
+      run_callbacks_with_halt(:after_save) if saved
+      
       saved
     end
     
@@ -115,10 +120,14 @@ module ActivePresenter
     # Returns true on success, will raise otherwise.
     # 
     def save!
+      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! }
       end
+      
+      run_callbacks_with_halt(:after_save)
     end
     
     # Update attributes, and save the presentables
@@ -141,7 +150,7 @@ module ActivePresenter
       end
       
       def presentable_for(method_name)
-        presented.keys.detect do |type|
+        presented.keys.sort_by { |k| k.to_s.size }.reverse.detect do |type|
           method_name.to_s.starts_with?(attribute_prefix(type))
         end
       end
@@ -167,8 +176,13 @@ module ActivePresenter
       
       def attribute_protected?(name)
         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.classify.constantize.new.send(:remove_attributes_protected_from_mass_assignment, flat_attribute).empty?
+        presentable.to_s.tableize.classify.constantize.new.send(:remove_attributes_protected_from_mass_assignment, flat_attribute).empty?
+      end
+      
+      def run_callbacks_with_halt(callback)
+        run_callbacks(callback) { |result, object| result == false }
       end
   end
 end

data/lib/active_presenter/version.rb

@@ -2,7 +2,7 @@ module ActivePresenter
   module VERSION
     MAJOR    = 0
     MINOR    = 0
-    TINY     = 3
+    TINY     = 5
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
   end

data/test/base_test.rb

@@ -4,76 +4,76 @@ Expectations do
   expect :user => User, :account => Account do
     SignupPresenter.presented
   end
-  
+
   expect User.create!(hash_for_user) do |u|
     SignupPresenter.new(:user => u.expected).user
   end
-  
+
   expect User do
     SignupPresenter.new.user
   end
-  
+
   expect User.any_instance.to.receive(:login=).with('james') do
     SignupPresenter.new(:user_login => 'james')
   end
-  
+
   # admin= should be protected from mass assignment
   expect SignupPresenter.new.to.be.attribute_protected?(:user_admin)
   expect SignupPresenter.new(:user_admin => true).user.not.to.be.admin?
-  
+
   expect 'mymockvalue' do
     User.any_instance.stubs(:login).returns('mymockvalue')
     SignupPresenter.new.user_login
   end
-  
+
   expect User.any_instance.to.receive(:login=).with('mymockvalue') do
     SignupPresenter.new.user_login = 'mymockvalue'
   end
-  
+
   expect SignupPresenter.new.not.to.be.valid?
   expect SignupPresenter.new(:user => User.new(hash_for_user)).to.be.valid?
-  
+
   expect ActiveRecord::Errors do
     s = SignupPresenter.new
     s.valid?
     s.errors
   end
-  
+
   expect ActiveRecord::Errors do
     s = SignupPresenter.new
     s.valid?
     s.user_errors
   end
-  
+
   expect ActiveRecord::Errors do
     s = SignupPresenter.new
     s.valid?
     s.account_errors
   end
-  
+
   expect String do
     s = SignupPresenter.new
     s.valid?
     s.errors.on(:user_login)
   end
-  
+
   expect ActiveRecord::Base.to.receive(:transaction) do
     s = SignupPresenter.new
     s.save
   end
-  
+
   expect User.any_instance.to.receive(:save) do
     s = SignupPresenter.new :user => User.new(hash_for_user)
     s.save
   end
-  
+
   expect Account.any_instance.to.receive(:save) do
     s = SignupPresenter.new :user => User.new(hash_for_user)
     s.save
   end
-  
+
   expect SignupPresenter.new.not.to.be.save
-  
+
   expect ActiveRecord::Rollback do
     ActiveRecord::Base.stubs(:transaction).yields
     User.any_instance.stubs(:save).returns(false)
@@ -81,72 +81,100 @@ Expectations do
     s = SignupPresenter.new :user => User.new(hash_for_user)
     s.save
   end
-  
+
   expect ActiveRecord::Base.to.receive(:transaction) do
     s = SignupPresenter.new
     s.save!
   end
-  
+
   expect User.any_instance.to.receive(:save!) do
     s = SignupPresenter.new
     s.save!
   end
-  
+
   expect Account.any_instance.to.receive(:save!) do
     User.any_instance.stubs(:save!)
     s = SignupPresenter.new
     s.save!
   end
-  
+
   expect ActiveRecord::RecordInvalid do
     SignupPresenter.new.save!
   end
-  
+
   expect SignupPresenter.new(:user => User.new(hash_for_user)).to.be.save!
-  
+
   expect SignupPresenter.new.to.be.respond_to?(:user_login)
   expect SignupPresenter.new.to.be.respond_to?(:user_password_confirmation)
   expect SignupPresenter.new.to.be.respond_to?(:valid?) # just making sure i didn't break everything :)
-  
+
   expect User.create!(hash_for_user).not.to.be.login_changed? do |user|
     s = SignupPresenter.new(:user => user)
     s.update_attributes :user_login => 'Something Totally Different'
   end
-  
+
   expect SignupPresenter.new(:user => User.create!(hash_for_user)).to.receive(:save) do |s|
     s.update_attributes :user_login => 'Something'
   end
-  
+
   expect 'Something Different' do
     s = SignupPresenter.new
     s.update_attributes :user_login => 'Something Different'
     s.user_login
   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'
     s.account_title
   end
-  
+
   expect String do
     s = SignupPresenter.new
     s.save
     s.errors.on(:user_login)
   end
-  
+
   expect String do
     s = SignupPresenter.new
     s.save! rescue
     s.errors.on(:user_login)
   end
-  
+
   expect 'Login' do
     SignupPresenter.human_attribute_name(:user_login)
   end
-  
+
   # it was raising with nil
   expect SignupPresenter do
     SignupPresenter.new(nil)
   end
+  
+  expect EndingWithSPresenter.new.address.not.to.be.nil?
+
+  # this should act as ActiveRecord models do
+  expect NoMethodError do
+    SignupPresenter.new({:i_dont_exist=>"blah"})
+  end
+  
+  expect CantSavePresenter.new.not.to.be.save # it won't save because the filter chain will halt
+  
+  expect ActiveRecord::RecordNotSaved do
+    CantSavePresenter.new.save!
+  end
+  
+  expect 'Some Street' do
+    p = AfterSavePresenter.new
+    p.save
+    p.address.street
+  end
+  
+  expect 'Some Street' do
+    p = AfterSavePresenter.new
+    p.save!
+    p.address.street
+  end
+  
+  expect SamePrefixPresenter.new.to.be.respond_to?(:account_title)
+  expect SamePrefixPresenter.new.to.be.respond_to?(:account_info_info)
 end

data/test/test_helper.rb

@@ -19,6 +19,14 @@ ActiveRecord::Schema.define(:version => 0) do
     t.string :subdomain, :default => ''
     t.string :title,     :default => ''
   end
+  
+  create_table :addresses do |t|
+    t.string :street
+  end
+
+  create_table :account_infos do |t|
+    t.string :info
+  end
 end
 
 class User < ActiveRecord::Base
@@ -27,11 +35,39 @@ class User < ActiveRecord::Base
   attr_accessor   :password_confirmation
 end
 class Account < ActiveRecord::Base; end
+class Address < ActiveRecord::Base; end
+class AccountInfo < ActiveRecord::Base; end
 
 class SignupPresenter < ActivePresenter::Base
   presents :account, :user
 end
 
+class EndingWithSPresenter < ActivePresenter::Base
+  presents :address
+end
+
+class CantSavePresenter < ActivePresenter::Base
+  presents :address
+  
+  before_save :halt
+  
+  def halt; false; end
+end
+
+class AfterSavePresenter < ActivePresenter::Base
+  presents :address
+  
+  after_save :set_street
+  
+  def set_street
+    address.street = 'Some Street'
+  end
+end
+
+class SamePrefixPresenter < ActivePresenter::Base
+  presents :account, :account_info
+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.3
+  version: 0.0.5
 platform: ruby
 authors: 
 - James Golick & Daniel Haran
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-06 00:00:00 -04:00
+date: 2008-11-21 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: active_presenter
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: ActivePresenter is the presenter library you already know! (...if you know ActiveRecord)