activemodel 3.1.0 → 3.1.1.rc1

data/CHANGELOG

@@ -1,4 +1,13 @@
-*Rails 3.1.0 (unreleased)*
+*Rails 3.1.1 (unreleased)*
+
+* 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]

data/lib/active_model/secure_password.rb

@@ -1,5 +1,3 @@
-require 'bcrypt'
-
 module ActiveModel
   module SecurePassword
     extend ActiveSupport::Concern
@@ -12,6 +10,10 @@ module ActiveModel
       # a "password_confirmation" attribute) are automatically added.
       # You can add more validations by hand if need be.
       #
+      # You need to add bcrypt-ruby (~> 3.0.0) to Gemfile to use has_secure_password:
+      #
+      #   gem 'bcrypt-ruby', '~> 3.0.0'
+      #
       # Example using Active Record (which automatically includes ActiveModel::SecurePassword):
       #
       #   # Schema: User(name:string, password_digest:string)
@@ -30,6 +32,11 @@ module ActiveModel
       #   User.find_by_name("david").try(:authenticate, "notright")      # => nil
       #   User.find_by_name("david").try(:authenticate, "mUc3m00RsqyRe") # => user
       def has_secure_password
+        # Load bcrypt-ruby only when has_secured_password is used to avoid make ActiveModel
+        # (and by extension the entire framework) dependent on a binary library.
+        gem 'bcrypt-ruby', '~> 3.0.0'
+        require 'bcrypt'
+
         attr_reader :password
 
         validates_confirmation_of :password

data/lib/active_model/version.rb

@@ -2,8 +2,8 @@ module ActiveModel
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 0
-    PRE   = nil
+    TINY  = 1
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: activemodel
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  hash: 977940594
+  prerelease: true
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  - rc1
+  version: 3.1.1.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 Z
+date: 2011-09-14 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -25,12 +27,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 977940594
         segments: 
         - 3
         - 1
-        - 0
-        version: 3.1.0
+        - 1
+        - rc1
+        version: 3.1.1.rc1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -64,22 +67,6 @@ dependencies:
         version: "0.6"
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :runtime
-  version_requirements: *id004
 description: A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.
 email: david@loudthinking.com
 executables: []
@@ -127,6 +114,7 @@ files:
 - lib/active_model/validator.rb
 - lib/active_model/version.rb
 - lib/active_model.rb
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -149,16 +137,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A toolkit for building modeling frameworks (part of Rails).