activerecord 1.14.4 → 1.15.0

data/lib/active_record/validations.rb

@@ -87,6 +87,7 @@ module ActiveRecord
     end
 
     alias :add_on_boundry_breaking :add_on_boundary_breaking
+    deprecate :add_on_boundary_breaking => :validates_length_of, :add_on_boundry_breaking => :validates_length_of
 
     # Returns true if the specified +attribute+ has errors associated with it.
     def invalid?(attribute)
@@ -97,13 +98,9 @@ module ActiveRecord
     # * Returns the error message, if one error is associated with the specified +attribute+.
     # * Returns an array of error messages, if more than one error is associated with the specified +attribute+.
     def on(attribute)
-      if @errors[attribute.to_s].nil?
-        nil
-      elsif @errors[attribute.to_s].length == 1
-        @errors[attribute.to_s].first
-      else
-        @errors[attribute.to_s]
-      end
+      errors = @errors[attribute.to_s]
+      return nil if errors.nil?
+      errors.size == 1 ? errors.first : errors
     end
 
     alias :[] :on
@@ -139,13 +136,12 @@ module ActiveRecord
           end
         end
       end
-
-      return full_messages
+      full_messages
     end
 
     # Returns true if no errors have been added.
     def empty?
-      return @errors.empty?
+      @errors.empty?
     end
     
     # Removes all the errors that have been added.
@@ -156,13 +152,23 @@ module ActiveRecord
     # Returns the total number of errors added. Two errors added to the same attribute will be counted as such
     # with this as well.
     def size
-      error_count = 0
-      @errors.each_value { |attribute| error_count += attribute.length }
-      error_count
+      @errors.values.inject(0) { |error_count, attribute| error_count + attribute.size }
     end
     
     alias_method :count, :size
     alias_method :length, :size
+
+    # Return an XML representation of this error object.
+    def to_xml(options={})
+      options[:root] ||= "errors"
+      options[:indent] ||= 2
+      options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
+
+      options[:builder].instruct! unless options.delete(:skip_instruct)
+      options[:builder].errors do |e|
+        full_messages.each { |msg| e.error(msg) }
+      end
+    end
   end
 
 
@@ -209,18 +215,12 @@ module ActiveRecord
   module Validations
     VALIDATIONS = %w( validate validate_on_create validate_on_update )
 
-    def self.append_features(base) # :nodoc:
-      super
+    def self.included(base) # :nodoc:
       base.extend ClassMethods
       base.class_eval do
-        alias_method :save_without_validation, :save
-        alias_method :save, :save_with_validation
-
-        alias_method :save_without_validation!, :save!
-        alias_method :save!, :save_with_validation!
-
-        alias_method :update_attribute_without_validation_skipping, :update_attribute
-        alias_method :update_attribute, :update_attribute_with_validation_skipping
+        alias_method_chain :save, :validation
+        alias_method_chain :save!, :validation
+        alias_method_chain :update_attribute, :validation_skipping
       end
     end
 
@@ -290,7 +290,7 @@ module ActiveRecord
       # method, proc or string should return or evaluate to a true or false value.
       def validates_each(*attrs)
         options = attrs.last.is_a?(Hash) ? attrs.pop.symbolize_keys : {}
-        attrs = attrs.flatten
+        attrs   = attrs.flatten
 
         # Declare the validation.
         send(validation_method(options[:on] || :save)) do |record|
@@ -375,6 +375,10 @@ module ActiveRecord
       #
       # The first_name attribute must be in the object and it cannot be blank.
       #      
+      # If you want to validate the presence of a boolean field (where the real values are true and false),
+      # you will want to use validates_inclusion_of :field_name, :in => [true, false]
+      # This is due to the way Object#blank? handles boolean values. false.blank? # => true
+      #
       # Configuration options:
       # * <tt>message</tt> - A custom error message (default is: "can't be blank")
       # * <tt>on</tt> - Specifies when this validation is active (default is :save, other options :create, :update)
@@ -515,17 +519,24 @@ module ActiveRecord
       # Configuration options:
       # * <tt>message</tt> - Specifies a custom error message (default is: "has already been taken")
       # * <tt>scope</tt> - One or more columns by which to limit the scope of the uniquness constraint.
+      # * <tt>case_sensitive</tt> - Looks for an exact match.  Ignored by non-text columns (true by default).
+      # * <tt>allow_nil</tt> - If set to true, skips this validation if the attribute is null (default is: false)
       # * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
       # occur (e.g. :if => :allow_validation, or :if => Proc.new { |user| user.signup_step > 2 }).  The
       # method, proc or string should return or evaluate to a true or false value.
        
       def validates_uniqueness_of(*attr_names)
-        configuration = { :message => ActiveRecord::Errors.default_error_messages[:taken] }
+        configuration = { :message => ActiveRecord::Errors.default_error_messages[:taken], :case_sensitive => true }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
 
         validates_each(attr_names,configuration) do |record, attr_name, value|
-          condition_sql = "#{record.class.table_name}.#{attr_name} #{attribute_condition(value)}"
-          condition_params = [value]
+          if value.nil? || (configuration[:case_sensitive] || !columns_hash[attr_name.to_s].text?)
+            condition_sql = "#{record.class.table_name}.#{attr_name} #{attribute_condition(value)}"
+            condition_params = [value]
+          else
+            condition_sql = "UPPER(#{record.class.table_name}.#{attr_name}) #{attribute_condition(value)}"
+            condition_params = [value.upcase]
+          end
           if scope = configuration[:scope]
             Array(scope).map do |scope_item|
               scope_value = record.send(scope_item)
@@ -543,13 +554,17 @@ module ActiveRecord
         end
       end
 
+      
+
       # Validates whether the value of the specified attribute is of the correct form by matching it against the regular expression
       # provided.
       #
       #   class Person < ActiveRecord::Base
-      #     validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :on => :create
+      #     validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :on => :create
       #   end
       #
+      # Note: use \A and \Z to match the start and end of the string, ^ and $ match the start/end of a line.
+      #
       # A regular expression must be provided or else an exception will be raised.
       #
       # Configuration options:
@@ -663,7 +678,7 @@ module ActiveRecord
 
       # Validates whether the value of the specified attribute is numeric by trying to convert it to
       # a float with Kernel.Float (if <tt>integer</tt> is false) or applying it to the regular expression
-      # <tt>/^[\+\-]?\d+$/</tt> (if <tt>integer</tt> is set to true).
+      # <tt>/\A[\+\-]?\d+\Z/</tt> (if <tt>integer</tt> is set to true).
       #
       #   class Person < ActiveRecord::Base
       #     validates_numericality_of :value, :on => :create
@@ -684,7 +699,7 @@ module ActiveRecord
 
         if configuration[:only_integer]
           validates_each(attr_names,configuration) do |record, attr_name,value|
-            record.errors.add(attr_name, configuration[:message]) unless record.send("#{attr_name}_before_type_cast").to_s =~ /^[+-]?\d+$/
+            record.errors.add(attr_name, configuration[:message]) unless record.send("#{attr_name}_before_type_cast").to_s =~ /\A[+-]?\d+\Z/
           end
         else
           validates_each(attr_names,configuration) do |record, attr_name,value|
@@ -705,6 +720,7 @@ module ActiveRecord
         if attributes.is_a?(Array)
           attributes.collect { |attr| create!(attr) }
         else
+          attributes ||= {}
           attributes.reverse_merge!(scope(:create)) if scoped?(:create)
 
           object = new(attributes)

data/lib/active_record/vendor/mysql.rb

@@ -6,7 +6,7 @@
 
 class Mysql
 
-  VERSION = "4.0-ruby-0.2.5"
+  VERSION = "4.0-ruby-0.2.6-plus-changes"
 
   require "socket"
   require "digest/sha1"
@@ -18,6 +18,9 @@ class Mysql
   MYSQL_PORT = 3306
   PROTOCOL_VERSION = 10
 
+  SCRAMBLE_LENGTH = 20
+  SCRAMBLE_LENGTH_323 = 8
+
   # Command
   COM_SLEEP		= 0
   COM_QUIT		= 1
@@ -147,12 +150,23 @@ class Mysql
       @db = db.dup
     end
     write data
-    read
+    pkt = read
+    handle_auth_fallback(pkt, passwd)
     ObjectSpace.define_finalizer(self, Mysql.finalizer(@net))
     self
   end
   alias :connect :real_connect
 
+  def handle_auth_fallback(pkt, passwd)
+    # A packet like this means that we need to send an old-format password
+    if pkt.size == 1 and pkt[0] == 254 and
+       @server_capabilities & CLIENT_SECURE_CONNECTION != 0 then
+      data = scramble(passwd, @scramble_buff, @protocol_version == 9)
+      write data + "\0"
+      read
+    end
+  end
+
   def escape_string(str)
     Mysql::escape_string str
   end
@@ -208,7 +222,8 @@ class Mysql
     else
       data = user+"\0"+scramble41(passwd, @scramble_buff)+db
     end
-    command COM_CHANGE_USER, data
+    pkt = command COM_CHANGE_USER, data
+    handle_auth_fallback(pkt, passwd)
     @user = user
     @passwd = passwd
     @db = db
@@ -534,10 +549,10 @@ class Mysql
     return "" if password == nil or password == ""
     raise "old version password is not implemented" if old_ver
     hash_pass = hash_password password
-    hash_message = hash_password message
+    hash_message = hash_password message.slice(0,SCRAMBLE_LENGTH_323)
     rnd = Random::new hash_pass[0] ^ hash_message[0], hash_pass[1] ^ hash_message[1]
     to = []
-    1.upto(message.length) do
+    1.upto(SCRAMBLE_LENGTH_323) do
       to << ((rnd.rnd*31)+64).floor
     end
     extra = (rnd.rnd*31).floor

data/lib/active_record/version.rb

@@ -1,8 +1,8 @@
 module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 14
-    TINY  = 4
+    MINOR = 15
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/active_record/wrappings.rb

@@ -9,8 +9,7 @@ module ActiveRecord
       end
     end
 
-    def self.append_features(base)
-      super
+    def self.included(base)
       base.extend(ClassMethods)
     end
 

data/lib/active_record/xml_serialization.rb

@@ -0,0 +1,308 @@
+module ActiveRecord #:nodoc:
+  module XmlSerialization
+    # Builds an XML document to represent the model.   Some configuration is
+    # availble through +options+, however more complicated cases should use 
+    # override ActiveRecord's to_xml.
+    #
+    # By default the generated XML document will include the processing 
+    # instruction and all object's attributes.  For example:
+    #    
+    #   <?xml version="1.0" encoding="UTF-8"?>
+    #   <topic>
+    #     <title>The First Topic</title>
+    #     <author-name>David</author-name>
+    #     <id type="integer">1</id>
+    #     <approved type="boolean">false</approved>
+    #     <replies-count type="integer">0</replies-count>
+    #     <bonus-time type="datetime">2000-01-01T08:28:00+12:00</bonus-time>
+    #     <written-on type="datetime">2003-07-16T09:28:00+1200</written-on>
+    #     <content>Have a nice day</content>
+    #     <author-email-address>david@loudthinking.com</author-email-address>
+    #     <parent-id></parent-id>
+    #     <last-read type="date">2004-04-15</last-read>
+    #   </topic>
+    #
+    # This behavior can be controlled with :only, :except,
+    # :skip_instruct, :skip_types and :dasherize.  The :only and
+    # :except options are the same as for the #attributes method.
+    # The default is to dasherize all column names, to disable this,
+    # set :dasherize to false.  To not have the column type included
+    # in the XML output, set :skip_types to false.
+    #
+    # For instance:
+    #
+    #   topic.to_xml(:skip_instruct => true, :except => [ :id, :bonus_time, :written_on, :replies_count ])
+    #
+    #   <topic>
+    #     <title>The First Topic</title>
+    #     <author-name>David</author-name>
+    #     <approved type="boolean">false</approved>
+    #     <content>Have a nice day</content>
+    #     <author-email-address>david@loudthinking.com</author-email-address>
+    #     <parent-id></parent-id>
+    #     <last-read type="date">2004-04-15</last-read>
+    #   </topic>
+    # 
+    # To include first level associations use :include
+    #
+    #   firm.to_xml :include => [ :account, :clients ]
+    #
+    #   <?xml version="1.0" encoding="UTF-8"?>
+    #   <firm>
+    #     <id type="integer">1</id>
+    #     <rating type="integer">1</rating>
+    #     <name>37signals</name>
+    #     <clients>
+    #       <client>
+    #         <rating type="integer">1</rating>
+    #         <name>Summit</name>
+    #       </client>
+    #       <client>
+    #         <rating type="integer">1</rating>
+    #         <name>Microsoft</name>
+    #       </client>
+    #     </clients>
+    #     <account>
+    #       <id type="integer">1</id>
+    #       <credit-limit type="integer">50</credit-limit>
+    #     </account>
+    #   </firm>
+    #
+    # To include any methods on the object(s) being called use :methods
+    #
+    #   firm.to_xml :methods => [ :calculated_earnings, :real_earnings ]
+    #
+    #   <firm>
+    #     # ... normal attributes as shown above ...
+    #     <calculated-earnings>100000000000000000</calculated-earnings>
+    #     <real-earnings>5</real-earnings>
+    #   </firm>
+    #
+    # To call any Proc's on the object(s) use :procs.  The Proc's
+    # are passed a modified version of the options hash that was
+    # given to #to_xml.
+    #
+    #   proc = Proc.new { |options| options[:builder].tag!('abc', 'def') }
+    #   firm.to_xml :procs => [ proc ]
+    #
+    #   <firm>
+    #     # ... normal attributes as shown above ...
+    #     <abc>def</abc>
+    #   </firm>
+    #
+    # You may override the to_xml method in your ActiveRecord::Base
+    # subclasses if you need to.  The general form of doing this is
+    #
+    #   class IHaveMyOwnXML < ActiveRecord::Base
+    #     def to_xml(options = {})
+    #       options[:indent] ||= 2
+    #       xml = options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
+    #       xml.instruct! unless options[:skip_instruct]
+    #       xml.level_one do
+    #         xml.tag!(:second_level, 'content')
+    #       end
+    #     end
+    #   end
+    def to_xml(options = {})
+      XmlSerializer.new(self, options).to_s
+    end
+  end
+
+  class XmlSerializer #:nodoc:
+    attr_reader :options
+    
+    def initialize(record, options = {})
+      @record, @options = record, options.dup
+    end
+    
+    def builder
+      @builder ||= begin
+        options[:indent] ||= 2
+        builder = options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
+
+        unless options[:skip_instruct]
+          builder.instruct!
+          options[:skip_instruct] = true
+        end
+        
+        builder
+      end
+    end
+
+    def root
+      root = (options[:root] || @record.class.to_s.underscore).to_s
+      dasherize? ? root.dasherize : root
+    end
+    
+    def dasherize?
+      !options.has_key?(:dasherize) || options[:dasherize]
+    end
+
+
+    # To replicate the behavior in ActiveRecord#attributes,
+    # :except takes precedence over :only.  If :only is not set
+    # for a N level model but is set for the N+1 level models,
+    # then because :except is set to a default value, the second
+    # level model can have both :except and :only set.  So if
+    # :only is set, always delete :except.
+    def serializable_attributes
+      attribute_names = @record.attribute_names
+
+      if options[:only]
+        options.delete(:except)
+        attribute_names = attribute_names & Array(options[:only]).collect { |n| n.to_s }
+      else
+        options[:except] = Array(options[:except]) | Array(@record.class.inheritance_column)
+        attribute_names = attribute_names - options[:except].collect { |n| n.to_s }
+      end
+      
+      attribute_names.collect { |name| Attribute.new(name, @record) }
+    end
+
+    def serializable_method_attributes
+      Array(options[:methods]).collect { |name| MethodAttribute.new(name.to_s, @record) }
+    end
+
+
+    def add_attributes
+      (serializable_attributes + serializable_method_attributes).each do |attribute|
+        add_tag(attribute)
+      end
+    end
+
+    def add_includes
+      if include_associations = options.delete(:include)
+        root_only_or_except = { :except => options[:except],
+                                :only => options[:only] }
+
+        include_has_options = include_associations.is_a?(Hash)
+
+        for association in include_has_options ? include_associations.keys : Array(include_associations)
+          association_options = include_has_options ? include_associations[association] : root_only_or_except
+
+          opts = options.merge(association_options)
+
+          case @record.class.reflect_on_association(association).macro
+          when :has_many, :has_and_belongs_to_many
+            records = @record.send(association).to_a
+            unless records.empty?
+              tag = records.first.class.to_s.underscore.pluralize
+              tag = tag.dasherize if dasherize?
+
+              builder.tag!(tag) do
+                records.each { |r| r.to_xml(opts.merge(:root => association.to_s.singularize)) }
+              end
+            end
+          when :has_one, :belongs_to
+            if record = @record.send(association)
+              record.to_xml(opts.merge(:root => association))
+            end
+          end
+        end
+
+        options[:include] = include_associations
+      end
+    end
+
+    def add_procs
+      if procs = options.delete(:procs)
+        [ *procs ].each do |proc|
+          proc.call(options)
+        end
+      end
+    end
+
+
+    def add_tag(attribute)
+      builder.tag!(
+        dasherize? ? attribute.name.dasherize : attribute.name, 
+        attribute.value.to_s, 
+        attribute.decorations(!options[:skip_types])
+      )
+    end
+
+    def serialize
+      args = [root]
+      if options[:namespace]
+        args << {:xmlns=>options[:namespace]}
+      end
+        
+      builder.tag!(*args) do
+        add_attributes
+        add_includes
+        add_procs
+      end
+    end        
+    
+    alias_method :to_s, :serialize
+
+    class Attribute #:nodoc:
+      attr_reader :name, :value, :type
+    
+      def initialize(name, record)
+        @name, @record = name, record
+      
+        @type  = compute_type
+        @value = compute_value
+      end
+
+      # There is a significant speed improvement if the value
+      # does not need to be escaped, as #tag! escapes all values
+      # to ensure that valid XML is generated.  For known binary
+      # values, it is at least an order of magnitude faster to
+      # Base64 encode binary values and directly put them in the
+      # output XML than to pass the original value or the Base64
+      # encoded value to the #tag! method. It definitely makes
+      # no sense to Base64 encode the value and then give it to
+      # #tag!, since that just adds additional overhead.
+      def needs_encoding?
+        ![ :binary, :date, :datetime, :boolean, :float, :integer ].include?(type)
+      end
+    
+      def decorations(include_types = true)
+        decorations = {}
+
+        if type == :binary
+          decorations[:encoding] = 'base64'
+        end
+      
+        if include_types && type != :string
+          decorations[:type] = type
+        end
+      
+        decorations
+      end
+    
+      protected
+        def compute_type
+          type = @record.class.columns_hash[name].type
+
+          case type
+            when :text
+              :string
+            when :time
+              :datetime
+            else
+              type
+          end
+        end
+    
+        def compute_value
+          value = @record.send(name)
+        
+          if formatter = Hash::XML_FORMATTING[type.to_s]
+            value ? formatter.call(value) : nil
+          else
+            value
+          end
+        end
+    end
+
+    class MethodAttribute < Attribute #:nodoc:
+      protected
+        def compute_type
+          Hash::XML_TYPE_NAMES[@record.send(name).class.name] || :string
+        end
+    end
+  end
+end