activemodel 4.1.0.rc1 → 4.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c2e46709d7f8d23a7f279b60e968ed229340e15
-  data.tar.gz: bdd281762b3380a85ba7bea143e1864aed5cc25f
+  metadata.gz: 30bfb82be27ab63acf80a28f3c612c9eb4de181b
+  data.tar.gz: d8f7d7e5b501c1d9b74c971713a0f8a6592008f2
 SHA512:
-  metadata.gz: ea32bb3ee8545b82dd63b1975ff79ad1ceaa7546b24170f1782c72539f800ac137dfc99445f617bb9ab8022faa5b6a3c23df2b021935ba0ededd963da113b861
-  data.tar.gz: 31bcdc6c6a1dfdcd06ce6ca967160dfbb388916f66c44e317304074e1d211139a163c76e24eb016239220c9f05517d7333837c6471db8f352f8fd8ab25046fc5
+  metadata.gz: c841c99e1ea218b9620deec666fd045e12e3d1f962155b98ae148866cead28ad2575bc7d5726e1f94311b7b6b571afccc9b113817bb0639dc1fccb3b9ab37234
+  data.tar.gz: 584b8d84f79653b0b7284e29cfe801d5b54a9d0130040c7ce21cd985167e5623aa388a64939e58fee05be2cee434922e9e3c2971366d0f7e770f1a1dceaee081

data/README.rdoc

@@ -227,7 +227,7 @@ The latest version of Active Model can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/master/activemodel
+* https://github.com/rails/rails/tree/4-1-stable/activemodel
 
 
 == License

data/lib/active_model/gem_version.rb

@@ -0,0 +1,15 @@
+module ActiveModel
+  # Returns the version of the currently loaded ActiveModel as a <tt>Gem::Version</tt>
+  def self.gem_version
+    Gem::Version.new VERSION::STRING
+  end
+
+  module VERSION
+    MAJOR = 4
+    MINOR = 1
+    TINY  = 0
+    PRE   = "rc2"
+
+    STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+  end
+end

data/lib/active_model/secure_password.rb

@@ -20,9 +20,9 @@ module ActiveModel
       # value to the password_confirmation attribute and the validation
       # will not be triggered.
       #
-      # You need to add bcrypt-ruby (~> 3.1.2) to Gemfile to use #has_secure_password:
+      # You need to add bcrypt (~> 3.1.7) to Gemfile to use #has_secure_password:
       #
-      #   gem 'bcrypt-ruby', '~> 3.1.2'
+      #   gem 'bcrypt', '~> 3.1.7'
       #
       # Example using Active Record (which automatically includes ActiveModel::SecurePassword):
       #
@@ -42,13 +42,13 @@ module ActiveModel
       #   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.
+        # Load bcrypt gem only when has_secure_password is used.
         # This is to avoid ActiveModel (and by extension the entire framework)
         # being dependent on a binary library.
         begin
           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"
+          $stderr.puts "You don't have bcrypt installed in your application. Please add it to your Gemfile and run bundle install"
           raise
         end
 

data/lib/active_model/validations/with.rb

@@ -139,6 +139,8 @@ module ActiveModel
     # class version of this method for more information.
     def validates_with(*args, &block)
       options = args.extract_options!
+      options[:class] = self.class
+
       args.each do |klass|
         validator = klass.new(options, &block)
         validator.validate(self)

data/lib/active_model/version.rb

@@ -1,11 +1,8 @@
+require_relative 'gem_version'
+
 module ActiveModel
-  # Returns the version of the currently loaded ActiveModel as a Gem::Version
+  # Returns the version of the currently loaded ActiveModel as a <tt>Gem::Version</tt>
   def self.version
-    Gem::Version.new "4.1.0.rc1"
-  end
-
-  module VERSION #:nodoc:
-    MAJOR, MINOR, TINY, PRE = ActiveModel.version.segments
-    STRING = ActiveModel.version.to_s
+    gem_version
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc1
+  version: 4.1.0.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc1
+        version: 4.1.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc1
+        version: 4.1.0.rc2
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -56,6 +56,7 @@ files:
 - lib/active_model/dirty.rb
 - lib/active_model/errors.rb
 - lib/active_model/forbidden_attributes_protection.rb
+- lib/active_model/gem_version.rb
 - lib/active_model/lint.rb
 - lib/active_model/locale/en.yml
 - lib/active_model/model.rb