activemodel 4.0.3 → 4.0.4.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bd3bc22950a065eac891deacf585d47164b4bac
-  data.tar.gz: 51e09147c68f35b7f41df882351b43d09946129b
+  metadata.gz: a816ecc3d18076ab63730be05196adc8ff854e92
+  data.tar.gz: 8a0a6ef882727c2de169de462d85fdc7ae7c180f
 SHA512:
-  metadata.gz: 21fa30fcbc214bf4de549a6a6395bf7754bc0bc9e737f24de0a5f4b16520e1b68f7703907a3b2b09e1e13e7c3bd4d15b3f0d53e2236baadef1f16ddd7306e04c
-  data.tar.gz: 9057563326bbb4c1a0c3c17a18a97dcea845a154a56c1484f6c24ea15a0fb1f19c0744b4dab4112686ce0c8081f1ac3c2a28965853049568e8a9678952154653
+  metadata.gz: 7263d900a354401b223783b6be71c98a17c02a8b104be7f3ca8fa38afaffbe70af921341f472f7f402f3c6269c3b97e52aee9343a37bde0e07cfb35e2ce08b45
+  data.tar.gz: ab20a034845611352398a2334851c444ee1d90f71138b076caf74fc39f6d5a5cc6b0ca0baca957c2fbf7bbb2454972a83d5291ee95ad42959bbdf0f273a2f455

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## Rails 4.0.4 ##
+
+*   `#to_param` returns `nil` if `#to_key` returns `nil`. Fixes #11399.
+
+    *Yves Senn*
+
+
+## Rails 4.0.3 (February 18, 2014) ##
+
+*No changes*
+
+
+## Rails 4.0.2 (December 02, 2013) ##
+
+*No changes*
+
+
 ## Rails 4.0.1 (November 01, 2013) ##
 
 *   Fix `has_secure_password` to honor bcrypt-ruby's cost attribute.

data/lib/active_model.rb

@@ -60,9 +60,9 @@ module ActiveModel
     end
   end
 
-  def eager_load!
+  def self.eager_load!
     super
-    ActiveModel::Serializer.eager_load!
+    ActiveModel::Serializers.eager_load!
   end
 end
 

data/lib/active_model/conversion.rb

@@ -62,7 +62,7 @@ module ActiveModel
     #   person = Person.create
     #   person.to_param # => "1"
     def to_param
-      persisted? ? to_key.join('-') : nil
+      (persisted? && key = to_key) ? key.join('-') : nil
     end
 
     # Returns a +string+ identifying the path associated with the object.

data/lib/active_model/naming.rb

@@ -262,10 +262,10 @@ module ActiveModel
     # namespaced models regarding whether it's inside isolated engine.
     #
     #   # For isolated engine:
-    #   ActiveModel::Naming.singular_route_key(Blog::Post) #=> post
+    #   ActiveModel::Naming.singular_route_key(Blog::Post) #=> "post"
     #
     #   # For shared engine:
-    #   ActiveModel::Naming.singular_route_key(Blog::Post) #=> blog_post
+    #   ActiveModel::Naming.singular_route_key(Blog::Post) #=> "blog_post"
     def self.singular_route_key(record_or_class)
       model_name_from_record_or_class(record_or_class).singular_route_key
     end
@@ -274,10 +274,10 @@ module ActiveModel
     # namespaced models regarding whether it's inside isolated engine.
     #
     #   # For isolated engine:
-    #   ActiveModel::Naming.route_key(Blog::Post) #=> posts
+    #   ActiveModel::Naming.route_key(Blog::Post) #=> "posts"
     #
     #   # For shared engine:
-    #   ActiveModel::Naming.route_key(Blog::Post) #=> blog_posts
+    #   ActiveModel::Naming.route_key(Blog::Post) #=> "blog_posts"
     #
     # The route key also considers if the noun is uncountable and, in
     # such cases, automatically appends _index.
@@ -289,10 +289,10 @@ module ActiveModel
     # namespaced models regarding whether it's inside isolated engine.
     #
     #   # For isolated engine:
-    #   ActiveModel::Naming.param_key(Blog::Post) #=> post
+    #   ActiveModel::Naming.param_key(Blog::Post) #=> "post"
     #
     #   # For shared engine:
-    #   ActiveModel::Naming.param_key(Blog::Post) #=> blog_post
+    #   ActiveModel::Naming.param_key(Blog::Post) #=> "blog_post"
     def self.param_key(record_or_class)
       model_name_from_record_or_class(record_or_class).param_key
     end

data/lib/active_model/secure_password.rb

@@ -18,9 +18,9 @@ module ActiveModel
       # value to the password_confirmation attribute and the 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):
       #
@@ -40,14 +40,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
-          gem 'bcrypt-ruby', '~> 3.1.2'
           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/inclusion.rb

@@ -29,7 +29,8 @@ module ActiveModel
       # * <tt>:in</tt> - An enumerable object of available items. This can be
       #   supplied as a proc, lambda or symbol which returns an enumerable. If the
       #   enumerable is a numerical range the test is performed with <tt>Range#cover?</tt>,
-      #   otherwise with <tt>include?</tt>.
+      #   otherwise with <tt>include?</tt>. When using a proc or lambda the instance
+      #   under validation is passed as an argument.
       # * <tt>:within</tt> - A synonym(or alias) for <tt>:in</tt>
       # * <tt>:message</tt> - Specifies a custom error message (default is: "is
       #   not included in the list").

data/lib/active_model/validations/validates.rb

@@ -13,7 +13,7 @@ module ActiveModel
       #   validates :terms, acceptance: true
       #   validates :password, confirmation: true
       #   validates :username, exclusion: { in: %w(admin superuser) }
-      #   validates :email, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, on: :create }
+      #   validates :email, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, on: :create }
       #   validates :age, inclusion: { in: 0..9 }
       #   validates :first_name, length: { maximum: 30 }
       #   validates :age, numericality: true

data/lib/active_model/validator.rb

@@ -61,7 +61,7 @@ module ActiveModel
   #   end
   #
   # Note that the validator is initialized only once for the whole application
-  # lifecycle, and not on each validation run.
+  # life cycle, and not on each validation run.
   #
   # The easiest way to add custom validators for validating individual attributes
   # is with the convenient <tt>ActiveModel::EachValidator</tt>.

data/lib/active_model/version.rb

@@ -1,7 +1,7 @@
 module ActiveModel
   # Returns the version of the currently loaded ActiveModel as a Gem::Version
   def self.version
-    Gem::Version.new "4.0.3"
+    Gem::Version.new "4.0.4.rc1"
   end
 
   module VERSION #:nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-03-11 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.3
+        version: 4.0.4.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.0.4.rc1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -99,12 +99,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).