Merge commit 'rails/master'

Conflicts:
	activerecord/lib/active_record/calculations.rb
	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

2 files changed, 72 insertions, 4 deletions

diff --git a/activemodel/lib/active_model/validations/length.rb b/activemodel/lib/active_model/validations/length.rb
index 3e76796355..e91841bd1c 100644
--- a/activemodel/lib/active_model/validations/length.rb
+++ b/activemodel/lib/active_model/validations/length.rb
@@ -66,10 +66,14 @@ module ActiveModel
 
           validates_each(attrs, options) do |record, attr, value|
             value = options[:tokenizer].call(value) if value.kind_of?(String)
-            if value.nil? or value.size < option_value.begin
-              record.errors.add(attr, :too_short, :default => custom_message || options[:too_short], :count => option_value.begin)
-            elsif value.size > option_value.end
-              record.errors.add(attr, :too_long, :default => custom_message || options[:too_long], :count => option_value.end)
+
+            min, max = option_value.begin, option_value.end
+            max = max - 1 if option_value.exclude_end?
+
+            if value.nil? || value.size < min
+              record.errors.add(attr, :too_short, :default => custom_message || options[:too_short], :count => min)
+            elsif value.size > max
+              record.errors.add(attr, :too_long, :default => custom_message || options[:too_long], :count => max)
             end
           end
         when :is, :minimum, :maximum
diff --git a/activemodel/lib/active_model/validations/with.rb b/activemodel/lib/active_model/validations/with.rb
new file mode 100644
index 0000000000..851cdfebf0
--- /dev/null
+++ b/activemodel/lib/active_model/validations/with.rb
@@ -0,0 +1,64 @@
+module ActiveModel
+  module Validations
+    module ClassMethods
+
+      # Passes the record off to the class or classes specified and allows them to add errors based on more complex conditions.
+      #
+      #   class Person < ActiveRecord::Base
+      #     validates_with MyValidator
+      #   end
+      #
+      #   class MyValidator < ActiveRecord::Validator
+      #     def validate
+      #       if some_complex_logic
+      #         record.errors[:base] << "This record is invalid"
+      #       end
+      #     end
+      #
+      #     private
+      #       def some_complex_logic
+      #         # ...
+      #       end
+      #   end
+      #
+      # You may also pass it multiple classes, like so:
+      #
+      #   class Person < ActiveRecord::Base
+      #     validates_with MyValidator, MyOtherValidator, :on => :create
+      #   end
+      #
+      # Configuration options:
+      # * <tt>on</tt> - Specifies when this validation is active (<tt>:create</tt> or <tt>:update</tt>
+      # * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
+      #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>).
+      #   The method, proc or string should return or evaluate to a true or false value.
+      # * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
+      #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>).
+      #   The method, proc or string should return or evaluate to a true or false value.
+      #
+      # If you pass any additional configuration options, they will be passed to the class and available as <tt>options</tt>:
+      #
+      #   class Person < ActiveRecord::Base
+      #     validates_with MyValidator, :my_custom_key => "my custom value"
+      #   end
+      #
+      #   class MyValidator < ActiveRecord::Validator
+      #     def validate
+      #       options[:my_custom_key] # => "my custom value"
+      #     end
+      #   end
+      #
+      def validates_with(*args)
+        configuration = args.extract_options!
+
+        send(validation_method(configuration[:on]), configuration) do |record|
+          args.each do |klass|
+            klass.new(record, configuration.except(:on, :if, :unless)).validate
+          end
+        end
+      end
+    end
+  end
+end
+
+