Merge branch 'master' of git://github.com/rails/rails

14 files changed, 218 insertions, 41 deletions

diff --git a/activemodel/Gemfile b/activemodel/Gemfile
deleted file mode 100644
index 289d696792..0000000000
--- a/activemodel/Gemfile
+++ /dev/null
@@ -1,11 +0,0 @@
-rails_root = Pathname.new(File.dirname(__FILE__)).join("..")
-
-Gem.sources.each { |uri| source uri }
-
-gem "activesupport", "3.0.pre", :vendored_at => rails_root.join("activesupport")
-
-only :test do
-  gem "sqlite3-ruby"
-end
-
-disable_system_gems
diff --git a/activemodel/Rakefile b/activemodel/Rakefile
index fd69a557aa..8897987518 100755
--- a/activemodel/Rakefile
+++ b/activemodel/Rakefile
@@ -11,7 +11,7 @@ require 'rake/testtask'
 
 task :default => :test
 
-Rake::TestTask.new do |t| 
+Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = Dir.glob("test/cases/**/*_test.rb").sort
   t.verbose = true
@@ -47,6 +47,4 @@ spec = eval(File.read('activemodel.gemspec'))
 
 Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
-  p.need_tar = true
-  p.need_zip = true
 end
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index 67f529262d..505e16c195 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -39,8 +39,10 @@ module ActiveModel
   autoload :Serialization, 'active_model/serialization'
   autoload :StateMachine, 'active_model/state_machine'
   autoload :TestCase, 'active_model/test_case'
+  autoload :Translation, 'active_model/translation'
   autoload :Validations, 'active_model/validations'
   autoload :ValidationsRepairHelper, 'active_model/validations_repair_helper'
+  autoload :Validator, 'active_model/validator'
   autoload :VERSION, 'active_model/version'
 
   module Serializers
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb
index 7a48960f89..e8bb62953d 100644
--- a/activemodel/lib/active_model/errors.rb
+++ b/activemodel/lib/active_model/errors.rb
@@ -93,7 +93,7 @@ module ActiveModel
     #   company = Company.create(:address => '123 First St.')
     #   company.errors.full_messages # =>
     #     ["Name is too short (minimum is 5 characters)", "Name can't be blank", "Address can't be blank"]
-    def full_messages(options = {})
+    def full_messages
       full_messages = []
 
       each do |attribute, messages|
@@ -103,8 +103,10 @@ module ActiveModel
         if attribute == :base
           messages.each {|m| full_messages << m }
         else
-          attr_name = attribute.to_s.humanize
-          prefix = attr_name + I18n.t('activemodel.errors.format.separator', :default => ' ')
+          attr_name = @base.class.human_attribute_name(attribute)
+          options = { :default => ' ', :scope => @base.class.i18n_scope }
+          prefix = attr_name + I18n.t(:"errors.format.separator", options)
+
           messages.each do |m|
             full_messages <<  "#{prefix}#{m}"
           end
@@ -135,10 +137,7 @@ module ActiveModel
     def generate_message(attribute, message = :invalid, options = {})
       message, options[:default] = options[:default], message if options[:default].is_a?(Symbol)
 
-      klass_ancestors = [@base.class]
-      klass_ancestors += @base.class.ancestors.reject {|x| x.is_a?(Module)}
-
-      defaults = klass_ancestors.map do |klass|
+      defaults = @base.class.lookup_ancestors.map do |klass|
         [ :"models.#{klass.name.underscore}.attributes.#{attribute}.#{message}",
           :"models.#{klass.name.underscore}.#{message}" ]
       end
@@ -150,10 +149,10 @@ module ActiveModel
       value = @base.send(:read_attribute_for_validation, attribute)
 
       options = { :default => defaults,
-        :model => @base.class.name.humanize,
-        :attribute => attribute.to_s.humanize,
+        :model => @base.class.model_name.human,
+        :attribute => @base.class.human_attribute_name(attribute),
         :value => value,
-        :scope => [:activemodel, :errors]
+        :scope => [@base.class.i18n_scope, :errors]
       }.merge(options)
 
       I18n.translate(key, options)
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb
index b8c2a367b4..675d62b9a6 100644
--- a/activemodel/lib/active_model/naming.rb
+++ b/activemodel/lib/active_model/naming.rb
@@ -5,12 +5,13 @@ module ActiveModel
     attr_reader :singular, :plural, :element, :collection, :partial_path, :human
     alias_method :cache_key, :collection
 
-    def initialize(name)
-      super
+    def initialize(klass, name)
+      super(name)
+      @klass = klass
       @singular = ActiveSupport::Inflector.underscore(self).tr('/', '_').freeze
       @plural = ActiveSupport::Inflector.pluralize(@singular).freeze
       @element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).freeze
-      @human = @element.gsub(/_/, " ")
+      @human = ActiveSupport::Inflector.humanize(@element).freeze
       @collection = ActiveSupport::Inflector.tableize(self).freeze
       @partial_path = "#{@collection}/#{@element}".freeze
     end
@@ -20,7 +21,7 @@ module ActiveModel
     # Returns an ActiveModel::Name object for module. It can be
     # used to retrieve all kinds of naming-related information.
     def model_name
-      @_model_name ||= ActiveModel::Name.new(name)
+      @_model_name ||= ActiveModel::Name.new(self, name)
     end
   end
 end
diff --git a/activemodel/lib/active_model/translation.rb b/activemodel/lib/active_model/translation.rb
new file mode 100644
index 0000000000..2ad8ca9dea
--- /dev/null
+++ b/activemodel/lib/active_model/translation.rb
@@ -0,0 +1,62 @@
+module ActiveModel
+  module Translation
+    include ActiveModel::Naming
+
+    # Returns the i18n_scope for the class. Overwrite if you want custom lookup.
+    def i18n_scope
+      :activemodel
+    end
+
+    # When localizing a string, goes through the lookup returned by this method.
+    # Used in ActiveModel::Name#human, ActiveModel::Errors#full_messages and
+    # ActiveModel::Translation#human_attribute_name.
+    def lookup_ancestors
+      self.ancestors.select { |x| x.respond_to?(:model_name) }
+    end
+
+    # Transforms attributes names into a more human format, such as "First name" instead of "first_name".
+    #
+    # Example:
+    #
+    #   Person.human_attribute_name("first_name") # => "First name"
+    #
+    # Specify +options+ with additional translating options.
+    def human_attribute_name(attribute, options = {})
+      defaults = lookup_ancestors.map do |klass|
+        :"#{klass.model_name.underscore}.#{attribute}"
+      end
+
+      defaults << options.delete(:default) if options[:default]
+      defaults << attribute.to_s.humanize
+
+      options.reverse_merge! :scope => [self.i18n_scope, :attributes], :count => 1, :default => defaults
+      I18n.translate(defaults.shift, options)
+    end
+
+    # Model.human_name is deprecated. Use Model.model_name.human instead.
+    def human_name(*args)
+      ActiveSupport::Deprecation.warn("human_name has been deprecated, please use model_name.human instead", caller[0,1])
+      model_name.human(*args)
+    end
+  end
+
+  class Name < String
+    # Transform the model name into a more humane format, using I18n. By default,
+    # it will underscore then humanize the class name (BlogPost.human_name #=> "Blog post").
+    # Specify +options+ with additional translating options.
+    def human(options={})
+      return @human unless @klass.respond_to?(:lookup_ancestors) &&
+                           @klass.respond_to?(:i18n_scope)
+
+      defaults = @klass.lookup_ancestors.map do |klass|
+        klass.model_name.underscore.to_sym
+      end
+
+      defaults << options.delete(:default) if options[:default]
+      defaults << @human
+
+      options.reverse_merge! :scope => [@klass.i18n_scope, :models], :count => 1, :default => defaults
+      I18n.translate(defaults.shift, options)
+    end
+  end
+end
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index 0f178a07c8..064ec98f3a 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -7,6 +7,7 @@ module ActiveModel
     include ActiveSupport::Callbacks
 
     included do
+      extend ActiveModel::Translation
       define_callbacks :validate, :scope => :name
     end
 
diff --git a/activemodel/lib/active_model/validator.rb b/activemodel/lib/active_model/validator.rb
new file mode 100644
index 0000000000..09de72b757
--- /dev/null
+++ b/activemodel/lib/active_model/validator.rb
@@ -0,0 +1,68 @@
+module ActiveModel #:nodoc:
+
+  # A simple base class that can be used along with ActiveModel::Base.validates_with
+  #
+  #   class Person < ActiveModel::Base
+  #     validates_with MyValidator
+  #   end
+  #
+  #   class MyValidator < ActiveModel::Validator
+  #     def validate
+  #       if some_complex_logic
+  #         record.errors[:base] = "This record is invalid"
+  #       end
+  #     end
+  #
+  #     private
+  #       def some_complex_logic
+  #         # ...
+  #       end
+  #   end
+  #
+  # Any class that inherits from ActiveModel::Validator will have access to <tt>record</tt>,
+  # which is an instance of the record being validated, and must implement a method called <tt>validate</tt>.
+  #
+  #   class Person < ActiveModel::Base
+  #     validates_with MyValidator
+  #   end
+  #
+  #   class MyValidator < ActiveModel::Validator
+  #     def validate
+  #       record # => The person instance being validated
+  #       options # => Any non-standard options passed to validates_with
+  #     end
+  #   end
+  #
+  # To cause a validation error, you must add to the <tt>record<tt>'s errors directly
+  # from within the validators message
+  #
+  #   class MyValidator < ActiveModel::Validator
+  #     def validate
+  #       record.errors[:base] << "This is some custom error message"
+  #       record.errors[:first_name] << "This is some complex validation"
+  #       # etc...
+  #     end
+  #   end
+  #
+  # To add behavior to the initialize method, use the following signature:
+  #
+  #   class MyValidator < ActiveModel::Validator
+  #     def initialize(record, options)
+  #       super
+  #       @my_custom_field = options[:field_name] || :first_name
+  #     end
+  #   end
+  #
+  class Validator
+    attr_reader :record, :options
+
+    def initialize(record, options)
+      @record = record
+      @options = options
+    end
+
+    def validate
+      raise "You must override this method"
+    end
+  end
+end
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index e54c85938b..49783c2735 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -1,13 +1,12 @@
-bundled = "#{File.dirname(__FILE__)}/../vendor/gems/environment"
-if File.exist?("#{bundled}.rb")
-  require bundled
-else
-  $:.unshift(File.dirname(__FILE__) + '/../../lib')
-  $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
+root = File.expand_path('../../../..', __FILE__)
+begin
+  require "#{root}/vendor/gems/environment"
+rescue LoadError
+  $:.unshift("#{root}/activesupport/lib")
+  $:.unshift("#{root}/activemodel/lib")
 end
 
 require 'config'
-
 require 'active_model'
 
 # Show backtraces for deprecated behavior for quicker cleanup.
diff --git a/activemodel/test/cases/naming_test.rb b/activemodel/test/cases/naming_test.rb
index 4d97af3d13..fe1ea36450 100644
--- a/activemodel/test/cases/naming_test.rb
+++ b/activemodel/test/cases/naming_test.rb
@@ -2,7 +2,7 @@ require 'cases/helper'
 
 class NamingTest < ActiveModel::TestCase
   def setup
-    @model_name = ActiveModel::Name.new('Post::TrackBack')
+    @model_name = ActiveModel::Name.new(self, 'Post::TrackBack')
   end
 
   def test_singular
diff --git a/activemodel/test/cases/translation_test.rb b/activemodel/test/cases/translation_test.rb
new file mode 100644
index 0000000000..d171784963
--- /dev/null
+++ b/activemodel/test/cases/translation_test.rb
@@ -0,0 +1,51 @@
+require 'cases/helper'
+
+class SuperUser
+  extend ActiveModel::Translation
+end
+
+class User < SuperUser
+end
+
+class ActiveModelI18nTests < ActiveModel::TestCase
+
+  def setup
+    I18n.backend = I18n::Backend::Simple.new
+  end
+  
+  def test_translated_model_attributes
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:super_user => {:name => 'super_user name attribute'} } }
+    assert_equal 'super_user name attribute', SuperUser.human_attribute_name('name')
+  end
+  
+  def test_translated_model_attributes_with_symbols
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:super_user => {:name => 'super_user name attribute'} } }
+    assert_equal 'super_user name attribute', SuperUser.human_attribute_name(:name)
+  end
+
+  def test_translated_model_attributes_with_ancestor
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:user => {:name => 'user name attribute'} } }
+    assert_equal 'user name attribute', User.human_attribute_name('name')
+  end
+
+  def test_translated_model_attributes_with_ancestors_fallback
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:super_user => {:name => 'super_user name attribute'} } }
+    assert_equal 'super_user name attribute', User.human_attribute_name('name')
+  end
+
+  def test_translated_model_names
+    I18n.backend.store_translations 'en', :activemodel => {:models => {:super_user => 'super_user model'} }
+    assert_equal 'super_user model', SuperUser.model_name.human
+  end
+
+  def test_translated_model_names_with_sti
+    I18n.backend.store_translations 'en', :activemodel => {:models => {:user => 'user model'} }
+    assert_equal 'user model', User.model_name.human
+  end
+
+  def test_translated_model_names_with_ancestors_fallback
+    I18n.backend.store_translations 'en', :activemodel => {:models => {:super_user => 'super_user model'} }
+    assert_equal 'super_user model', User.model_name.human
+  end
+end
+
diff --git a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
index 443a81c6ac..54b2405c92 100644
--- a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
@@ -63,7 +63,6 @@ class I18nGenerateMessageValidationTest < ActiveModel::TestCase
     assert_equal 'custom message title', @person.errors.generate_message(:title, :exclusion, :default => 'custom message {{value}}', :value => 'title')
   end
 
-  # validates_associated: generate_message(attr_name, :invalid, :default => configuration[:message], :value => value)
   # validates_format_of:  generate_message(attr_name, :invalid, :default => configuration[:message], :value => value)
   def test_generate_message_invalid_with_default_message
     assert_equal 'is invalid', @person.errors.generate_message(:title, :invalid, :default => nil, :value => 'title')
diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index fc4f1926b0..68b1b27f75 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -56,6 +56,12 @@ class I18nValidationTest < ActiveModel::TestCase
     @person.errors.add_on_blank :title, 'custom'
   end
 
+  def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
+    @person.errors.add('name', 'empty')
+    I18n.expects(:translate).with(:"person.name", :default => ['Name'], :scope => [:activemodel, :attributes], :count => 1).returns('Name')
+    @person.errors.full_messages
+  end
+
   # ActiveRecord::Validations
   # validates_confirmation_of w/ mocha
   def test_validates_confirmation_of_generates_message
@@ -494,6 +500,8 @@ class I18nValidationTest < ActiveModel::TestCase
     assert_equal ['global message'], @person.errors[:title]
   end
 
+  # test with validates_with
+
   def test_validations_with_message_symbol_must_translate
     I18n.backend.store_translations 'en', :activemodel => {:errors => {:messages => {:custom_error => "I am a custom error"}}}
     Person.validates_presence_of :title, :message => :custom_error
diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index c290b49a28..fae87a6188 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -13,24 +13,24 @@ class ValidatesWithTest < ActiveRecord::TestCase
   ERROR_MESSAGE = "Validation error from validator"
   OTHER_ERROR_MESSAGE = "Validation error from other validator"
 
-  class ValidatorThatAddsErrors < ActiveRecord::Validator
+  class ValidatorThatAddsErrors < ActiveModel::Validator
     def validate()
       record.errors[:base] << ERROR_MESSAGE
     end
   end
 
-  class OtherValidatorThatAddsErrors < ActiveRecord::Validator
+  class OtherValidatorThatAddsErrors < ActiveModel::Validator
     def validate()
       record.errors[:base] << OTHER_ERROR_MESSAGE
     end
   end
 
-  class ValidatorThatDoesNotAddErrors < ActiveRecord::Validator
+  class ValidatorThatDoesNotAddErrors < ActiveModel::Validator
     def validate()
     end
   end
 
-  class ValidatorThatValidatesOptions < ActiveRecord::Validator
+  class ValidatorThatValidatesOptions < ActiveModel::Validator
     def validate()
       if options[:field] == :first_name
         record.errors[:base] << ERROR_MESSAGE