active_presenter 1.2.0 → 1.2.1

data/lib/active_presenter/base.rb

@@ -36,12 +36,35 @@ module ActivePresenter
       end
     end
     
-    def self.human_attribute_name(attribute_name)
+    def self.human_attribute_name(attribute_key_name, options = {})
       presentable_type = presented.keys.detect do |type|
-        attribute_name.to_s.starts_with?("#{type}_")
+        attribute_key_name.to_s.starts_with?("#{type}_") || attribute_key_name.to_s == type.to_s
       end
+      attribute_key_name_without_class = attribute_key_name.to_s.gsub("#{presentable_type}_", "")
       
-      attribute_name.to_s.gsub("#{presentable_type}_", "").humanize
+      if presented[presentable_type] and attribute_key_name_without_class != presentable_type.to_s
+        presented[presentable_type].human_attribute_name(attribute_key_name_without_class, options)
+      else
+        I18n.translate(presentable_type, options.merge(:default => presentable_type.to_s.humanize, :scope => [:activerecord, :models]))
+      end
+    end
+    
+    # Since ActivePresenter does not descend from ActiveRecord, we need to
+    # mimic some ActiveRecord behavior in order for the ActiveRecord::Errors
+    # object we're using to work properly.
+    #
+    # This problem was introduced with Rails 2.3.4.
+    # Fix courtesy http://gist.github.com/191263
+    def self.self_and_descendants_from_active_record # :nodoc:
+      [self]
+    end
+    
+    def self.human_name(options = {}) # :nodoc:
+      defaults = self_and_descendants_from_active_record.map do |klass|
+        :"#{klass.name.underscore}"
+      end 
+      defaults << self.name.humanize
+      I18n.translate(defaults.shift, {:scope => [:activerecord, :models], :count => 1, :default => defaults}.merge(options))
     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:
@@ -60,7 +83,8 @@ module ActivePresenter
       args ||= {}
       
       presented.each do |type, klass|
-        send("#{type}=", args[type].is_a?(klass) ? args.delete(type) : klass.new)
+        value = args.delete(type)
+        send("#{type}=", value.is_a?(klass) ? value : klass.new)
       end
       
       self.attributes = args
@@ -71,6 +95,8 @@ module ActivePresenter
     # the multiparameter attribute form (i.e. {user_birthday(1i) => "1980", user_birthday(2i) => "3"})
     #
     def attributes=(attrs)
+      return if attrs.nil?
+
       multi_parameter_attributes = {}
       
       attrs.each do |k,v|
@@ -90,7 +116,7 @@ module ActivePresenter
     
     # Makes sure that the presenter is accurate about responding to presentable's attributes, even though they are handled by method_missing.
     #
-    def respond_to?(method)
+    def respond_to?(method, include_private = false)
       presented_attribute?(method) || super
     end
     
@@ -222,7 +248,11 @@ module ActivePresenter
       
       def merge_errors(presented_inst, type)
         presented_inst.errors.each do |att,msg|
-          errors.add(attribute_prefix(type)+att, msg)
+          if att == 'base'
+            errors.add(type, msg)
+          else
+            errors.add(attribute_prefix(type)+att, msg)
+          end
         end
       end
       

data/lib/active_presenter/version.rb

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

data/test/base_test.rb

@@ -17,6 +17,10 @@ Expectations do
     SignupPresenter.new(:user => u.expected).user
   end
 
+  expect true do
+    SignupPresenter.new(:user => nil).user.new_record?
+  end
+
   expect User do
     SignupPresenter.new.user
   end
@@ -65,6 +69,44 @@ Expectations do
     s.errors.on(:user_login)
   end
 
+  expect "can't be blank" do
+    s = SignupPresenter.new
+    s.valid?
+    s.errors.on(:user_login)
+  end
+
+  expect ["User Password can't be blank"] do
+    s = SignupPresenter.new(:user_login => 'login')
+    s.valid?
+    s.errors.full_messages
+  end
+
+  expect 'c4N n07 83 8L4nK' do
+    old_locale = I18n.locale
+    I18n.locale = '1337'
+    
+    s = SignupPresenter.new(:user_login => nil)
+    s.valid?
+    message = s.errors.on(:user_login)
+    
+    I18n.locale = old_locale
+    
+    message
+  end
+
+  expect ['U53R pa22w0rD c4N n07 83 8L4nK'] do
+    old_locale = I18n.locale
+    I18n.locale = '1337'
+    
+    s = SignupPresenter.new(:user_login => 'login')
+    s.valid?
+    message = s.errors.full_messages
+    
+    I18n.locale = old_locale
+    
+    message
+  end
+
   expect ActiveRecord::Base.to.receive(:transaction) do
     s = SignupPresenter.new
     s.save
@@ -115,6 +157,7 @@ Expectations do
   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 SignupPresenter.new.to.be.respond_to?(:nil?, false) # making sure it's possible to pass 2 arguments
 
   expect User.create!(hash_for_user).not.to.be.login_changed? do |user|
     s = SignupPresenter.new(:user => user)
@@ -144,6 +187,11 @@ Expectations do
     })
     s.user_birthday
   end
+
+  expect nil do
+    s = SignupPresenter.new
+    s.attributes = nil
+  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
@@ -267,15 +315,15 @@ Expectations do
   end
 
   expect false do
-    SignupNoNilPresenter.new.save
+    SignupNoAccountPresenter.new.save
   end
 
   expect true do
-    SignupNoNilPresenter.new(:user => nil, :account => Account.new).save
+    SignupNoAccountPresenter.new(:user => User.new(hash_for_user), :account => nil).save
   end
 
   expect true do
-    SignupNoNilPresenter.new(:user => nil, :account => Account.new).save!
+    SignupNoAccountPresenter.new(:user => User.new(hash_for_user), :account => nil).save!
   end
 
   expect Address do

data/test/test_helper.rb

@@ -8,6 +8,21 @@ ActiveRecord::Base.establish_connection('sqlite3')
 ActiveRecord::Base.logger = Logger.new(STDERR)
 ActiveRecord::Base.logger.level = Logger::WARN
 
+I18n.backend.store_translations '1337',
+  :activerecord => {
+    :models => {
+      :user => 'U53R'
+    },
+    :attributes => {
+      :user => {:password => 'pa22w0rD'}
+    },
+    :errors => {
+      :messages => {
+        :blank => 'c4N n07 83 8L4nK'
+      }
+    }
+  }
+  
 ActiveRecord::Schema.define(:version => 0) do
   create_table :users do |t|
     t.boolean  :admin,    :default => false
@@ -31,9 +46,18 @@ ActiveRecord::Schema.define(:version => 0) do
 end
 
 class User < ActiveRecord::Base
-  validates_presence_of :login, :password
+  validates_presence_of :login
+  validate :presence_of_password
   attr_accessible :login, :password, :birthday
   attr_accessor   :password_confirmation
+
+  def presence_of_password
+    if password.blank?
+      attribute_name = I18n.t(:password, {:default => "Password", :scope => [:activerecord, :attributes, :user]})
+      error_message = I18n.t(:blank, {:default => "can't be blank", :scope => [:activerecord, :errors, :messages]})
+      errors.add_to_base("#{attribute_name} #{error_message}")
+    end
+  end
 end
 class Account < ActiveRecord::Base; end
 class Address < ActiveRecord::Base; end
@@ -59,11 +83,11 @@ class CantSavePresenter < ActivePresenter::Base
   def halt; false; end
 end
 
-class SignupNoNilPresenter < ActivePresenter::Base
+class SignupNoAccountPresenter < ActivePresenter::Base
   presents :account, :user
 
   def save?(key, instance)
-    !instance.nil?
+    key != :account
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_presenter
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - James Golick & Daniel Haran
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-17 00:00:00 -04:00
+date: 2009-12-17 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -25,17 +25,17 @@ files:
 - README
 - LICENSE
 - Rakefile
-- lib/active_presenter
 - lib/active_presenter/base.rb
 - lib/active_presenter/version.rb
 - lib/active_presenter.rb
-- lib/tasks
 - lib/tasks/doc.rake
 - lib/tasks/gem.rake
 - test/base_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://jamesgolick.com/active_presenter
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -56,9 +56,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: active_presenter
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: ActivePresenter is the presenter library you already know! (...if you know ActiveRecord)
 test_files: []