activemodel 3.1.0.rc1 → 3.1.0.rc2

data/lib/active_model/errors.rb

@@ -248,7 +248,7 @@ module ActiveModel
     #
     #   company = Company.create(:address => '123 First St.')
     #   company.errors.full_messages # =>
-    #     ["Name is too short (minimum is 5 characters)", "Name can't be blank", "Address can't be blank"]
+    #     ["Name is too short (minimum is 5 characters)", "Name can't be blank", "Email can't be blank"]
     def full_messages
       map { |attribute, message|
         if attribute == :base

data/lib/active_model/secure_password.rb

@@ -30,7 +30,7 @@ module ActiveModel
       #   User.find_by_name("david").try(:authenticate, "notright")      # => nil
       #   User.find_by_name("david").try(:authenticate, "mUc3m00RsqyRe") # => user
       def has_secure_password
-        attr_reader   :password
+        attr_reader :password
 
         validates_confirmation_of :password
         validates_presence_of     :password_digest

data/lib/active_model/serializers/json.rb

@@ -22,13 +22,13 @@ module ActiveModel
       # of +as_json+. If true (the default) +as_json+ will emit a single root
       # node named after the object's type. For example:
       #
-      #   konata = User.find(1)
-      #   konata.as_json
+      #   user = User.find(1)
+      #   user.as_json
       #   # => { "user": {"id": 1, "name": "Konata Izumi", "age": 16,
       #                   "created_at": "2006/08/01", "awesome": true} }
       #
       #   ActiveRecord::Base.include_root_in_json = false
-      #   konata.as_json
+      #   user.as_json
       #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
       #         "created_at": "2006/08/01", "awesome": true}
       #
@@ -38,30 +38,30 @@ module ActiveModel
       # Without any +options+, the returned JSON string will include all the model's
       # attributes. For example:
       #
-      #   konata = User.find(1)
-      #   konata.as_json
+      #   user = User.find(1)
+      #   user.as_json
       #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
       #         "created_at": "2006/08/01", "awesome": true}
       #
       # The <tt>:only</tt> and <tt>:except</tt> options can be used to limit the attributes
       # included, and work similar to the +attributes+ method. For example:
       #
-      #   konata.as_json(:only => [ :id, :name ])
+      #   user.as_json(:only => [ :id, :name ])
       #   # => {"id": 1, "name": "Konata Izumi"}
       #
-      #   konata.as_json(:except => [ :id, :created_at, :age ])
+      #   user.as_json(:except => [ :id, :created_at, :age ])
       #   # => {"name": "Konata Izumi", "awesome": true}
       #
       # To include the result of some method calls on the model use <tt>:methods</tt>:
       #
-      #   konata.as_json(:methods => :permalink)
+      #   user.as_json(:methods => :permalink)
       #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
       #         "created_at": "2006/08/01", "awesome": true,
       #         "permalink": "1-konata-izumi"}
       #
       # To include associations use <tt>:include</tt>:
       #
-      #   konata.as_json(:include => :posts)
+      #   user.as_json(:include => :posts)
       #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
       #         "created_at": "2006/08/01", "awesome": true,
       #         "posts": [{"id": 1, "author_id": 1, "title": "Welcome to the weblog"},
@@ -69,7 +69,7 @@ module ActiveModel
       #
       # Second level and higher order associations work as well:
       #
-      #   konata.as_json(:include => { :posts => {
+      #   user.as_json(:include => { :posts => {
       #                                  :include => { :comments => {
       #                                                :only => :body } },
       #                                  :only => :title } })

data/lib/active_model/serializers/xml.rb

@@ -139,8 +139,8 @@ module ActiveModel
       # Without any +options+, the returned XML string will include all the model's
       # attributes. For example:
       #
-      #   konata = User.find(1)
-      #   konata.to_xml
+      #   user = User.find(1)
+      #   user.to_xml
       #
       #   <?xml version="1.0" encoding="UTF-8"?>
       #   <user>

data/lib/active_model/validations/length.rb

@@ -62,14 +62,14 @@ module ActiveModel
       # Validates that the specified attribute matches the length restrictions supplied. Only one option can be used at a time:
       #
       #   class Person < ActiveRecord::Base
-      #     validates_length_of :first_name, :maximum=>30
-      #     validates_length_of :last_name, :maximum=>30, :message=>"less than 30 if you don't mind"
+      #     validates_length_of :first_name, :maximum => 30
+      #     validates_length_of :last_name, :maximum => 30, :message => "less than 30 if you don't mind"
       #     validates_length_of :fax, :in => 7..32, :allow_nil => true
       #     validates_length_of :phone, :in => 7..32, :allow_blank => true
       #     validates_length_of :user_name, :within => 6..20, :too_long => "pick a shorter name", :too_short => "pick a longer name"
       #     validates_length_of :zip_code, :minimum => 5, :too_short => "please enter at least 5 characters"
       #     validates_length_of :smurf_leader, :is => 4, :message => "papa is spelled with 4 characters... don't play me."
-      #     validates_length_of :essay, :minimum => 100, :too_short => "Your essay must be at least 100 words."), :tokenizer => lambda {|str| str.scan(/\w+/) }
+      #     validates_length_of :essay, :minimum => 100, :too_short => "Your essay must be at least 100 words.", :tokenizer => lambda { |str| str.scan(/\w+/) }
       #   end
       #
       # Configuration options:

data/lib/active_model/version.rb

@@ -3,7 +3,7 @@ module ActiveModel
     MAJOR = 3
     MINOR = 1
     TINY  = 0
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activemodel
 version: !ruby/object:Gem::Version 
+  hash: 15424097
   prerelease: 6
-  version: 3.1.0.rc1
+  segments: 
+  - 3
+  - 1
+  - 0
+  - rc
+  - 2
+  version: 3.1.0.rc2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -10,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-21 00:00:00 -05:00
-default_executable: 
+date: 2011-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -21,7 +27,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.1.0.rc1
+        hash: 15424097
+        segments: 
+        - 3
+        - 1
+        - 0
+        - rc
+        - 2
+        version: 3.1.0.rc2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -32,6 +45,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id002
@@ -43,7 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.0beta1
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        version: "0.6"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -54,6 +76,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 1
+        - 4
         version: 2.1.4
   type: :runtime
   version_requirements: *id004
@@ -104,7 +131,6 @@ files:
 - lib/active_model/validator.rb
 - lib/active_model/version.rb
 - lib/active_model.rb
-has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -118,17 +144,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: A toolkit for building modeling frameworks (part of Rails).