activemodel 4.0.0.beta1 → 4.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a123b304fffb488ab66aab52d5fc0d41b0c0b511
-  data.tar.gz: 1890c14c3ab9251044e70e38f993d4c55707cb52
+  metadata.gz: 250ef70b10d4ec2e30333cfffc80da63aed87895
+  data.tar.gz: 69c232cc5ed875faedbb29a0f0d6c1a01bcf5d19
 SHA512:
-  metadata.gz: 882ad1f17ccb90c6a79d86a42d3f91685a1ece5e7ec63ed83be888a20d086ea38928aba2af650e13b79c1955d5f62d78c4b865311be1a8ae065197ee2a858aaa
-  data.tar.gz: 5452a0c0afabc7f3c3f536e670cb61244dd8d9236bfac6dd049da917dbe6bed0d110b4c6ed3bd0a374c7e09b42988cd937ae57cef83ff03e42a33aeea2cbb276
+  metadata.gz: 0be6ba150a3151982443cf95e5c2a04da6af1b807282767e5ca44a4367830b070cbaa631dffaf3d65494a9e8cafe72f6ba19dcdb71d504c01009902a09865964
+  data.tar.gz: 836ccca90ace183c3e7944cbefb229a369db445f34fe68289d9af0444e29058f6834b9495b5554d95180c8777517977009eb94ad5de1d4880bdbc0125616bbaa

data/CHANGELOG.md

@@ -1,3 +1,73 @@
+## Rails 4.0.0 (unreleased) ##
+
+*   Add `ActiveModel::Errors#full_messages_for`, to return all the error messages
+    for a given attribute.
+
+    Example:
+
+        class Person
+          include ActiveModel::Validations
+
+          attr_reader :name, :email
+          validates_presence_of :name, :email
+        end
+
+        person = Person.new
+        person.valid?                           # => false
+        person.errors.full_messages_for(:name)  # => ["Name can't be blank"]
+
+    *Volodymyr Shatsky*
+
+*   Added a method so that validations can be easily cleared on a model.
+    For example:
+
+        class Person
+          include ActiveModel::Validations
+
+          validates_uniqueness_of :first_name
+          validate :cannot_be_robot
+
+          def cannot_be_robot
+            errors.add(:base, 'A person cannot be a robot') if person_is_robot
+          end
+        end
+
+    Now, if someone runs `Person.clear_validators!`, then the following occurs:
+
+        Person.validators                  # => []
+        Person._validate_callbacks.empty?  # => true
+
+    *John Wang*
+
+*   `has_secure_password` does not fail the confirmation validation
+    when assigning empty String to `password` and `password_confirmation`.
+    Fixes #9535.
+
+    Example:
+
+        # Given User has_secure_password.
+        @user.password = ""
+        @user.password_confirmation = ""
+        @user.valid?(:update) # used to be false
+
+    *Yves Senn*
+
+*   `validates_confirmation_of` does not override writer methods for
+    the confirmation attribute if no reader is defined.
+
+    Example:
+
+        class Blog
+          def title=(new_title)
+            @title = new_title.downcase
+          end
+
+          # previously this would override the setter above.
+          validates_confirmation_of :title
+        end
+
+    *Yves Senn*
+
 ## Rails 4.0.0.beta1 (February 25, 2013) ##
 
 *   Add `ActiveModel::Validations::AbsenceValidator`, a validator to check the
@@ -40,7 +110,7 @@
 
     *Yves Senn*
 
-*   Use BCrypt's `MIN_COST` in the test environment for speedier tests when using `has_secure_pasword`.
+*   Use BCrypt's `MIN_COST` in the test environment for speedier tests when using `has_secure_password`.
 
     *Brian Cardarella + Jeremy Kemper + Trevor Turk*
 
@@ -81,7 +151,7 @@
 
 *   Changed `ActiveModel::Serializers::Xml::Serializer#add_associations` to by default
     propagate `:skip_types, :dasherize, :camelize` keys to included associations.
-    It can be overriden on each association by explicitly specifying the option on one
+    It can be overridden on each association by explicitly specifying the option on one
     or more associations
 
     *Anthony Alberto*

data/README.rdoc

@@ -2,7 +2,7 @@
 
 Active Model provides a known set of interfaces for usage in model classes.
 They allow for Action Pack helpers to interact with non-Active Record models,
-for example. Active Model also helps building custom ORMs for use outside of
+for example. Active Model also helps with building custom ORMs for use outside of
 the Rails framework.
 
 Prior to Rails 3.0, if a plugin or gem developer wanted to have an object
@@ -24,8 +24,8 @@ to integrate with Action Pack out of the box: <tt>ActiveModel::Model</tt>.
     end
 
     person = Person.new(name: 'bob', age: '18')
-    person.name # => 'bob'
-    person.age # => '18'
+    person.name   # => 'bob'
+    person.age    # => '18'
     person.valid? # => true
 
 It includes model name introspections, conversions, translations and
@@ -82,12 +82,12 @@ behavior out of the box:
     end
 
     person = Person.new
-    person.name # => nil
-    person.changed? # => false
+    person.name             # => nil
+    person.changed?         # => false
     person.name = 'bob'
-    person.changed? # => true
-    person.changed # => ['name']
-    person.changes # => { 'name' => [nil, 'bob'] }
+    person.changed?         # => true
+    person.changed          # => ['name']
+    person.changes          # => { 'name' => [nil, 'bob'] }
     person.name = 'robert'
     person.save
     person.previous_changes # => {'name' => ['bob, 'robert']}

data/lib/active_model/attribute_methods.rb

@@ -12,19 +12,21 @@ module ActiveModel
   #   # => ActiveModel::MissingAttributeError: missing attribute: user_id
   class MissingAttributeError < NoMethodError
   end
+
   # == Active \Model Attribute Methods
   #
   # <tt>ActiveModel::AttributeMethods</tt> provides a way to add prefixes and
-  # suffixes to your methods as well as handling the creation of Active Record
-  # like class methods such as +table_name+.
+  # suffixes to your methods as well as handling the creation of
+  # <tt>ActiveRecord::Base</tt>-like class methods such as +table_name+.
   #
-  # The requirements to implement ActiveModel::AttributeMethods are to:
+  # The requirements to implement <tt>ActiveModel::AttributeMethods</tt> are to:
   #
-  # * <tt>include ActiveModel::AttributeMethods</tt> in your object.
-  # * Call each Attribute Method module method you want to add, such as
-  #   +attribute_method_suffix+ or +attribute_method_prefix+.
+  # * <tt>include ActiveModel::AttributeMethods</tt> in your class.
+  # * Call each of its method you want to add, such as +attribute_method_suffix+
+  #   or +attribute_method_prefix+.
   # * Call +define_attribute_methods+ after the other methods are called.
   # * Define the various generic +_attribute+ methods that you have declared.
+  # * Define an +attributes+ method, see below.
   #
   # A minimal implementation could be:
   #
@@ -38,6 +40,10 @@ module ActiveModel
   #
   #     attr_accessor :name
   #
+  #     def attributes
+  #       {'name' => @name}
+  #     end
+  #
   #     private
   #
   #     def attribute_contrived?(attr)
@@ -53,10 +59,10 @@ module ActiveModel
   #     end
   #   end
   #
-  # Note that whenever you include ActiveModel::AttributeMethods in your class,
-  # it requires you to implement an +attributes+ method which returns a hash
-  # with each attribute name in your model as hash key and the attribute value as
-  # hash value.
+  # Note that whenever you include <tt>ActiveModel::AttributeMethods</tt> in
+  # your class, it requires you to implement an +attributes+ method which
+  # returns a hash with each attribute name in your model as hash key and the
+  # attribute value as hash value.
   #
   # Hash keys must be strings.
   module AttributeMethods
@@ -179,7 +185,6 @@ module ActiveModel
         undefine_attribute_methods
       end
 
-
       # Allows you to make aliases for attributes.
       #
       #   class Person
@@ -413,17 +418,16 @@ module ActiveModel
         end
     end
 
-    # Allows access to the object attributes, which are held in the
-    # <tt>@attributes</tt> hash, as though they were first-class methods. So a
-    # Person class with a name attribute can use Person#name and Person#name=
-    # and never directly use the attributes hash -- except for multiple assigns
-    # with ActiveRecord#attributes=. A Milestone class can also ask
-    # Milestone#completed? to test that the completed attribute is not +nil+
-    # or 0.
+    # Allows access to the object attributes, which are held in the hash
+    # returned by <tt>attributes</tt>, as though they were first-class
+    # methods. So a +Person+ class with a +name+ attribute can for example use
+    # <tt>Person#name</tt> and <tt>Person#name=</tt> and never directly use
+    # the attributes hash -- except for multiple assigns with
+    # <tt>ActiveRecord::Base#attributes=</tt>.
     #
-    # It's also possible to instantiate related objects, so a Client class
-    # belonging to the clients table with a +master_id+ foreign key can
-    # instantiate master through Client#master.
+    # It's also possible to instantiate related objects, so a <tt>Client</tt>
+    # class belonging to the +clients+ table with a +master_id+ foreign key
+    # can instantiate master through <tt>Client#master</tt>.
     def method_missing(method, *args, &block)
       if respond_to_without_attributes?(method, true)
         super
@@ -433,17 +437,17 @@ module ActiveModel
       end
     end
 
-    # attribute_missing is like method_missing, but for attributes. When method_missing is
-    # called we check to see if there is a matching attribute method. If so, we call
-    # attribute_missing to dispatch the attribute. This method can be overloaded to
-    # customize the behavior.
+    # +attribute_missing+ is like +method_missing+, but for attributes. When
+    # +method_missing+ is called we check to see if there is a matching
+    # attribute method. If so, we tell +attribute_missing+ to dispatch the
+    # attribute. This method can be overloaded to customize the behavior.
     def attribute_missing(match, *args, &block)
       __send__(match.target, match.attr_name, *args, &block)
     end
 
-    # A Person object with a name attribute can ask <tt>person.respond_to?(:name)</tt>,
-    # <tt>person.respond_to?(:name=)</tt>, and <tt>person.respond_to?(:name?)</tt>
-    # which will all return +true+.
+    # A +Person+ instance with a +name+ attribute can ask
+    # <tt>person.respond_to?(:name)</tt>, <tt>person.respond_to?(:name=)</tt>,
+    # and <tt>person.respond_to?(:name?)</tt> which will all return +true+.
     alias :respond_to_without_attributes? :respond_to?
     def respond_to?(method, include_private_methods = false)
       if super

data/lib/active_model/conversion.rb

@@ -1,5 +1,5 @@
 module ActiveModel
-  # == Active \Model Conversions
+  # == Active \Model Conversion
   #
   # Handles default conversions: to_model, to_key, to_param, and to_partial_path.
   #

data/lib/active_model/dirty.rb

@@ -46,7 +46,7 @@ module ActiveModel
   #
   # A newly instantiated object is unchanged:
   #
-  #   person = Person.find_by_name('Uncle Bob')
+  #   person = Person.find_by(name: 'Uncle Bob')
   #   person.changed?       # => false
   #
   # Change the name:

data/lib/active_model/errors.rb

@@ -12,7 +12,6 @@ module ActiveModel
   # A minimal implementation could be:
   #
   #   class Person
-  #
   #     # Required dependency for ActiveModel::Errors
   #     extend ActiveModel::Naming
   #
@@ -40,7 +39,6 @@ module ActiveModel
   #     def Person.lookup_ancestors
   #       [self]
   #     end
-  #
   #   end
   #
   # The last three methods are required in your object for Errors to be
@@ -352,6 +350,20 @@ module ActiveModel
       map { |attribute, message| full_message(attribute, message) }
     end
 
+    # Returns all the full error messages for a given attribute in an array.
+    #
+    #   class Person
+    #     validates_presence_of :name, :email
+    #     validates_length_of :name, in: 5..30
+    #   end
+    #
+    #   person = Person.create()
+    #   person.errors.full_messages_for(:name)
+    #   # => ["Name is too short (minimum is 5 characters)", "Name can't be blank"]
+    def full_messages_for(attribute)
+      (get(attribute) || []).map { |message| full_message(attribute, message) }
+    end
+
     # Returns a full message for a given attribute.
     #
     #   person.errors.full_message(:name, 'is invalid') # => "Name is invalid"

data/lib/active_model/secure_password.rb

@@ -30,24 +30,31 @@ module ActiveModel
       #   end
       #
       #   user = User.new(name: 'david', password: '', password_confirmation: 'nomatch')
-      #   user.save                                                      # => false, password required
+      #   user.save                                                       # => false, password required
       #   user.password = 'mUc3m00RsqyRe'
-      #   user.save                                                      # => false, confirmation doesn't match
+      #   user.save                                                       # => false, confirmation doesn't match
       #   user.password_confirmation = 'mUc3m00RsqyRe'
-      #   user.save                                                      # => true
-      #   user.authenticate('notright')                                  # => false
-      #   user.authenticate('mUc3m00RsqyRe')                             # => user
-      #   User.find_by_name('david').try(:authenticate, 'notright')      # => false
-      #   User.find_by_name('david').try(:authenticate, 'mUc3m00RsqyRe') # => user
+      #   user.save                                                       # => true
+      #   user.authenticate('notright')                                   # => false
+      #   user.authenticate('mUc3m00RsqyRe')                              # => user
+      #   User.find_by(name: 'david').try(:authenticate, 'notright')      # => false
+      #   User.find_by(name: 'david').try(:authenticate, 'mUc3m00RsqyRe') # => user
       def has_secure_password(options = {})
         # Load bcrypt-ruby only when has_secure_password is used.
         # This is to avoid ActiveModel (and by extension the entire framework)
         # being dependent on a binary library.
-        gem 'bcrypt-ruby', '~> 3.0.0'
-        require 'bcrypt'
+        begin
+          gem 'bcrypt-ruby', '~> 3.0.0'
+          require 'bcrypt'
+        rescue LoadError
+          $stderr.puts "You don't have bcrypt-ruby installed in your application. Please add it to your Gemfile and run bundle install"
+          raise
+        end
 
         attr_reader :password
 
+        include InstanceMethodsOnActivation
+
         if options.fetch(:validations, true)
           validates_confirmation_of :password
           validates_presence_of     :password, :on => :create
@@ -55,8 +62,6 @@ module ActiveModel
           before_create { raise "Password digest missing on new record" if password_digest.blank? }
         end
 
-        include InstanceMethodsOnActivation
-
         if respond_to?(:attributes_protected_by_default)
           def self.attributes_protected_by_default #:nodoc:
             super + ['password_digest']
@@ -99,6 +104,12 @@ module ActiveModel
           self.password_digest = BCrypt::Password.create(unencrypted_password, cost: cost)
         end
       end
+
+      def password_confirmation=(unencrypted_password)
+        unless unencrypted_password.blank?
+          @password_confirmation = unencrypted_password
+        end
+      end
     end
   end
 end

data/lib/active_model/validations.rb

@@ -169,6 +169,49 @@ module ActiveModel
         _validators.values.flatten.uniq
       end
 
+      # Clears all of the validators and validations.
+      #
+      # Note that this will clear anything that is being used to validate
+      # the model for both the +validates_with+ and +validate+ methods.
+      # It clears the validators that are created with an invocation of
+      # +validates_with+ and the callbacks that are set by an invocation
+      # of +validate+.
+      #
+      #   class Person
+      #     include ActiveModel::Validations
+      #
+      #     validates_with MyValidator
+      #     validates_with OtherValidator, on: :create
+      #     validates_with StrictValidator, strict: true
+      #     validate :cannot_be_robot
+      #
+      #     def cannot_be_robot
+      #       errors.add(:base, 'A person cannot be a robot') if person_is_robot
+      #     end
+      #   end
+      #
+      #   Person.validators
+      #   # => [
+      #   #      #<MyValidator:0x007fbff403e808 @options={}>,
+      #   #      #<OtherValidator:0x007fbff403d930 @options={on: :create}>,
+      #   #      #<StrictValidator:0x007fbff3204a30 @options={strict:true}>
+      #   #    ]
+      #
+      # If one runs Person.clear_validators! and then checks to see what
+      # validators this class has, you would obtain:
+      #
+      #   Person.validators # => []
+      #
+      # Also, the callback set by +validate :cannot_be_robot+ will be erased
+      # so that:
+      #
+      #   Person._validate_callbacks.empty?  # => true
+      #
+      def clear_validators!
+        reset_callbacks(:validate)
+        _validators.clear
+      end
+
       # List all validators that are being used to validate a specific attribute.
       #
       #   class Person
@@ -333,7 +376,4 @@ module ActiveModel
   end
 end
 
-Dir[File.dirname(__FILE__) + "/validations/*.rb"].sort.each do |path|
-  filename = File.basename(path)
-  require "active_model/validations/#{filename}"
-end
+Dir[File.dirname(__FILE__) + "/validations/*.rb"].each { |file| require file }

data/lib/active_model/validations/confirmation.rb

@@ -10,9 +10,13 @@ module ActiveModel
       end
 
       def setup(klass)
-        klass.send(:attr_accessor, *attributes.map do |attribute|
+        klass.send(:attr_reader, *attributes.map do |attribute|
           :"#{attribute}_confirmation" unless klass.method_defined?(:"#{attribute}_confirmation")
         end.compact)
+
+        klass.send(:attr_writer, *attributes.map do |attribute|
+          :"#{attribute}_confirmation" unless klass.method_defined?(:"#{attribute}_confirmation=")
+        end.compact)
       end
     end
 

data/lib/active_model/version.rb

@@ -1,10 +1,11 @@
 module ActiveModel
-  module VERSION #:nodoc:
-    MAJOR = 4
-    MINOR = 0
-    TINY  = 0
-    PRE   = "beta1"
+  # Returns the version of the currently loaded ActiveModel as a Gem::Version
+  def self.version
+    Gem::Version.new "4.0.0.rc1"
+  end
 
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
+  module VERSION #:nodoc:
+    MAJOR, MINOR, TINY, PRE = ActiveModel.version.segments
+    STRING = ActiveModel.version.to_s
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement