active_presenter 1.2.1 → 1.3.0

data/lib/active_presenter.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'activerecord'
+require 'active_record'
 Dir.glob(File.dirname(__FILE__)+'/active_presenter/**/*.rb').each { |l| require l }
 
 module ActivePresenter

data/lib/active_presenter/base.rb

@@ -6,6 +6,7 @@ module ActivePresenter
     define_callbacks :before_validation, :before_save, :after_save
     
     class_inheritable_accessor :presented
+    class_inheritable_accessor :attr_protected, :attr_accessible
     self.presented = {}
     
     # Indicates which models are to be presented by this presenter.
@@ -67,6 +68,30 @@ module ActivePresenter
       I18n.translate(defaults.shift, {:scope => [:activerecord, :models], :count => 1, :default => defaults}.merge(options))
     end
     
+    # Note that +attr_protected+ is still applied to the received hash. Thus,
+    # with this technique you can at most _extend_ the list of protected
+    # attributes for a particular mass-assignment call.
+    def self.attr_protected(*attributes)
+      write_inheritable_attribute(:attr_protected, Set.new(attributes.map {|a| a.to_s}) + (protected_attributes || []))
+    end
+    
+    # Returns an array of all the attributes that have been protected from mass-assignment.
+    def self.protected_attributes # :nodoc:
+      read_inheritable_attribute(:attr_protected)
+    end
+    
+    # Note that +attr_accessible+ is still applied to the received hash. Thus,
+    # with this technique you can at most _narrow_ the list of accessible
+    # attributes for a particular mass-assignment call.
+    def self.attr_accessible(*attributes)
+      write_inheritable_attribute(:attr_accessible, Set.new(attributes.map(&:to_s)) + (accessible_attributes || []))
+    end
+    
+    # Returns an array of all the attributes that have been made accessible to mass-assignment.
+    def self.accessible_attributes # :nodoc:
+      read_inheritable_attribute(:attr_accessible)
+    end
+    
     # 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')
@@ -96,8 +121,10 @@ module ActivePresenter
     #
     def attributes=(attrs)
       return if attrs.nil?
-
+      
+      attrs = attrs.stringify_keys
       multi_parameter_attributes = {}
+      attrs = remove_attributes_protected_from_mass_assignment(attrs)
       
       attrs.each do |k,v|
         if (base_attribute = k.to_s.split("(").first) != k.to_s
@@ -148,6 +175,11 @@ module ActivePresenter
       end
     end
     
+    # Do any of the attributes have unsaved changes?
+    def changed?
+      presented_instances.map(&:changed?).any?
+    end
+    
     # Save all of the presentables, wrapped in a transaction.
     # 
     # Returns true or false based on success.
@@ -212,7 +244,7 @@ module ActivePresenter
     def id # :nodoc:
       nil
     end
-
+    
     def new_record?
       true
     end
@@ -266,5 +298,18 @@ module ActivePresenter
       def run_callbacks_with_halt(callback)
         run_callbacks(callback) { |result, object| result == false }
       end
+      
+      def remove_attributes_protected_from_mass_assignment(attributes)
+        if self.class.accessible_attributes.nil? && self.class.protected_attributes.nil?
+          attributes
+        elsif self.class.protected_attributes.nil?
+          attributes.reject { |key, value| !self.class.accessible_attributes.include?(key.gsub(/\(.+/, ""))}
+        elsif self.class.accessible_attributes.nil?
+          attributes.reject { |key, value| self.class.protected_attributes.include?(key.gsub(/\(.+/,""))}
+        else
+          raise "Declare either attr_protected or attr_accessible for #{self.class}, but not both."
+        end
+      end
+      
   end
 end

data/lib/active_presenter/version.rb

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

data/test/base_test.rb

@@ -305,7 +305,7 @@ Expectations do
     end.steps
   end
 
-  expect ActiveRecord::Errors.any_instance.to.receive(:clear) do
+  expect ActiveRecord::Errors.any_instance.to.receive(:clear).twice do
     CallbackCantValidatePresenter.new.valid?
   end
 
@@ -335,4 +335,28 @@ Expectations do
     p.save
     p.secondary_address_street
   end
+  
+  # attr_protected
+  expect "" do
+    p = SignupPresenter.new(:account_secret => 'swordfish')
+    p.account.secret
+  end
+  
+  expect "comment" do
+    p = HistoricalPresenter.new(:history_comment => 'comment', :user => User.new(hash_for_user))
+    p.save
+    p.history_comment
+  end
+  
+  expect false do
+    SignupPresenter.new.changed?
+  end
+  
+  expect true do
+    p = SignupPresenter.new(:user => User.new(hash_for_user))
+    p.save
+    p.user_login = 'something_else'
+    p.changed?
+  end
+  
 end

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__)+'/../lib/active_presenter'
+require File.dirname(__FILE__)+'/../lib/active_presenter' unless defined?(ActivePresenter)
 require 'expectations'
 require 'logger'
 
@@ -34,6 +34,7 @@ ActiveRecord::Schema.define(:version => 0) do
   create_table :accounts do |t|
     t.string :subdomain, :default => ''
     t.string :title,     :default => ''
+    t.string :secret,    :default => ''
   end
   
   create_table :addresses do |t|
@@ -43,6 +44,14 @@ ActiveRecord::Schema.define(:version => 0) do
   create_table :account_infos do |t|
     t.string :info
   end
+  
+  create_table :histories do |t|
+    t.integer  :user_id
+    t.string   :comment,   :default => ''
+    t.string   :action,    :default => ''
+    t.datetime :created_at
+  end
+  
 end
 
 class User < ActiveRecord::Base
@@ -60,6 +69,7 @@ class User < ActiveRecord::Base
   end
 end
 class Account < ActiveRecord::Base; end
+class History < ActiveRecord::Base; end
 class Address < ActiveRecord::Base; end
 class AccountInfo < ActiveRecord::Base; end
 
@@ -69,12 +79,18 @@ end
 
 class SignupPresenter < ActivePresenter::Base
   presents :account, :user
+  attr_protected :account_secret
 end
 
 class EndingWithSPresenter < ActivePresenter::Base
   presents :address
 end
 
+class HistoricalPresenter < ActivePresenter::Base
+  presents :user, :history  
+  attr_accessible :history_comment
+end
+
 class CantSavePresenter < ActivePresenter::Base
   presents :address
   

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_presenter
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  hash: 27
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - James Golick & Daniel Haran
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 -08:00
+date: 2010-10-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -42,21 +48,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 61
+      segments: 
+      - 1
+      - 8
+      - 5
       version: 1.8.5
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: active_presenter
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ActivePresenter is the presenter library you already know! (...if you know ActiveRecord)