activemodel 3.0.4 → 3.0.5.rc1

data/lib/active_model/validations/inclusion.rb

@@ -8,9 +8,26 @@ module ActiveModel
                               ":in option of the configuration hash" unless options[:in].respond_to?(:include?)
       end
 
-      def validate_each(record, attribute, value)
-        unless options[:in].include?(value)
-          record.errors.add(attribute, :inclusion, options.except(:in).merge!(:value => value))
+      # On Ruby 1.9 Range#include? checks all possible values in the range for equality,
+      # so it may be slow for large ranges. The new Range#cover? uses the previous logic
+      # of comparing a value with the range endpoints.
+      if (1..2).respond_to?(:cover?)
+        def validate_each(record, attribute, value)
+          included = if options[:in].is_a?(Range)
+            options[:in].cover?(value)
+          else
+            options[:in].include?(value)
+          end
+
+          unless included
+            record.errors.add(attribute, :inclusion, options.except(:in).merge!(:value => value))
+          end
+        end
+      else
+        def validate_each(record, attribute, value)
+          unless options[:in].include?(value)
+            record.errors.add(attribute, :inclusion, options.except(:in).merge!(:value => value))
+          end
         end
       end
     end

data/lib/active_model/version.rb

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

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activemodel
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 15424095
+  prerelease: 6
   segments: 
   - 3
   - 0
-  - 4
-  version: 3.0.4
+  - 5
+  - rc
+  - 1
+  version: 3.0.5.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +13:00
+date: 2011-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +28,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 15424095
         segments: 
         - 3
         - 0
-        - 4
-        version: 3.0.4
+        - 5
+        - rc
+        - 1
+        version: 3.0.5.rc1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -134,16 +138,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: activemodel
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A toolkit for building modeling frameworks (part of Rails).