ActiveRecord and ActiveModel 3.1

Gemfile

@@ -29,6 +29,8 @@ platforms :ruby do
   # AR
   gem "sqlite3", "~> 1.3.3"
 
+  gem 'bcrypt-ruby', '~> 3.0.0'
+
   group :db do
     gem "pg", ">= 0.9.0"
     gem "mysql", ">= 2.8.1"

Gemfile.lock

@@ -24,12 +24,12 @@ PATH
     activemodel (3.0.20)
       activesupport (= 3.0.20)
       builder (~> 3.2.0)
-      i18n (~> 0.6.0)
+      i18n (~> 0.6)
     activerecord (3.0.20)
       activemodel (= 3.0.20)
       activesupport (= 3.0.20)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
     activeresource (3.0.20)
       activemodel (= 3.0.20)
       activesupport (= 3.0.20)
@@ -53,7 +53,8 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.6)
-    arel (2.0.10)
+    arel (2.2.3)
+    bcrypt-ruby (3.0.1)
     builder (3.2.2)
     coderay (1.1.0)
     erubis (2.7.0)
@@ -106,6 +107,7 @@ PLATFORMS
 DEPENDENCIES
   addressable
   arel
+  bcrypt-ruby (~> 3.0.0)
   faker
   horo (= 1.0.3)
   json

activemodel/CHANGELOG.md

@@ -0,0 +1,48 @@
+## Rails 3.1.8 (Aug 9, 2012)
+
+*   No changes.
+
+## Rails 3.1.7 (Jul 26, 2012)
+
+*   No changes.
+
+## Rails 3.1.6 (Jun 12, 2012)
+
+*   No changes.
+
+## Rails 3.1.5 (May 31, 2012) ##
+
+*   No changes.
+
+## Rails 3.1.1 (October 7, 2011) ##
+
+*   Remove hard dependency on bcrypt-ruby to avoid make ActiveModel dependent on a binary library.
+    You must add the gem explicitly to your Gemfile if you want use ActiveModel::SecurePassword:
+
+    gem 'bcrypt-ruby', '~> 3.0.0'
+
+    See GH #2687. *Guillermo Iguaran*
+
+## Rails 3.1.0 (August 30, 2011) ##
+
+*   Alternate I18n namespace lookup is no longer supported.
+    Instead of "activerecord.models.admins.post", do "activerecord.models.admins/post" instead *José Valim*
+
+*   attr_accessible and friends now accepts :as as option to specify a role *Josh Kalderimis*
+
+*   Add support for proc or lambda as an option for InclusionValidator,
+    ExclusionValidator, and FormatValidator *Prem Sichanugrist*
+
+    You can now supply Proc, lambda, or anything that respond to #call in those
+    validations, and it will be called with current record as an argument.
+    That given proc or lambda must returns an object which respond to #include? for
+    InclusionValidator and ExclusionValidator, and returns a regular expression
+    object for FormatValidator.
+
+*   Added ActiveModel::SecurePassword to encapsulate dead-simple password usage with BCrypt encryption and salting *DHH*
+
+*   ActiveModel::AttributeMethods allows attributes to be defined on demand *Alexander Uvarov*
+
+*   Add support for selectively enabling/disabling observers *Myron Marston*
+
+Please check [3-0-stable](https://github.com/rails/rails/blob/3-0-stable/activemodel/CHANGELOG) for previous changes.

activemodel/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2010 David Heinemeier Hansson
+Copyright (c) 2004-2011 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

activemodel/README.rdoc

@@ -8,7 +8,7 @@ the Rails framework.
 Prior to Rails 3.0, if a plugin or gem developer wanted to have an object
 interact with Action Pack helpers, it was required to either copy chunks of
 code from Rails, or monkey patch entire helpers to make them handle objects
-that did not exacly conform to the Active Record interface. This would result
+that did not exactly conform to the Active Record interface. This would result
 in code duplication and fragile applications that broke on upgrades.
 
 Active Model solves this. You can include functionality from the following
@@ -41,7 +41,7 @@ modules:
       define_model_callbacks :create
 
       def create
-        _run_create_callbacks do
+        run_callbacks :create do
           # Your create action methods here
         end
       end
@@ -84,7 +84,7 @@ modules:
       attr_reader   :errors
 
       def validate!
-        errors.add(:name, "can not be nil") if name == nil
+        errors.add(:name, "can not be nil") if name.nil?
       end
 
       def ErrorsPerson.human_attribute_name(attr, options = {})
@@ -94,10 +94,10 @@ modules:
     end
 
     person.errors.full_messages
-    # => ["Name Can not be nil"]
+    # => ["Name can not be nil"]
 
     person.errors.full_messages
-    # => ["Name Can not be nil"]
+    # => ["Name can not be nil"]
 
   {Learn more}[link:classes/ActiveModel/Errors.html]
 
@@ -182,3 +182,30 @@ modules:
    p.valid?                  # =>  true
 
   {Learn more}[link:classes/ActiveModel/Validator.html]
+
+
+== Download and installation
+
+The latest version of Active Model can be installed with Rubygems:
+
+  % [sudo] gem install activemodel
+
+Source code can be downloaded as part of the Rails project on GitHub
+
+* https://github.com/rails/rails/tree/master/activemodel
+
+
+== License
+
+Active Model is released under the MIT license.
+
+
+== Support
+
+API documentation is at
+
+* http://api.rubyonrails.org
+
+Bug reports and feature requests can be filed with the rest for the Ruby on Rails project here:
+
+* https://github.com/rails/rails/issues

activemodel/activemodel.gemspec

@@ -12,12 +12,11 @@ Gem::Specification.new do |s|
   s.author            = 'David Heinemeier Hansson'
   s.email             = 'david@loudthinking.com'
   s.homepage          = 'http://www.rubyonrails.org'
-  s.rubyforge_project = 'activemodel'
 
-  s.files        = Dir['CHANGELOG', 'MIT-LICENSE', 'README.rdoc', 'lib/**/*']
+  s.files        = Dir['CHANGELOG.md', 'MIT-LICENSE', 'README.rdoc', 'lib/**/*']
   s.require_path = 'lib'
 
   s.add_dependency('activesupport', version)
   s.add_dependency('builder',       '~> 3.2.0')
-  s.add_dependency('i18n',          '~> 0.6.0')
+  s.add_dependency('i18n',          '~> 0.6')
 end

activemodel/lib/active_model.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2010 David Heinemeier Hansson
+# Copyright (c) 2004-2011 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -33,7 +33,6 @@ module ActiveModel
   autoload :BlockValidator, 'active_model/validator'
   autoload :Callbacks
   autoload :Conversion
-  autoload :DeprecatedErrorMethods
   autoload :Dirty
   autoload :EachValidator, 'active_model/validator'
   autoload :Errors
@@ -43,6 +42,7 @@ module ActiveModel
   autoload :Naming
   autoload :Observer, 'active_model/observing'
   autoload :Observing
+  autoload :SecurePassword
   autoload :Serialization
   autoload :TestCase
   autoload :Translation