Brought error handling up to speed with respect to I18n. Fixed a bug …

…introduced by Rails 2.3.4 at the same time.

lib/active_presenter/base.rb

@@ -36,12 +36,35 @@ def self.presents(*types)
       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:

test/base_test.rb

@@ -69,12 +69,44 @@
     s.errors.on(:user_login)
   end
 
-  expect ['User Password can not be blank'] do
+  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

test/test_helper.rb

@@ -8,6 +8,21 @@
 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
@@ -37,7 +52,11 @@ class User < ActiveRecord::Base
   attr_accessor   :password_confirmation
 
   def presence_of_password
-    errors.add_to_base('Password can not be blank') if password.blank?
+    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