activesupport 2.3.4 → 2.3.5

data/CHANGELOG

@@ -1,3 +1,11 @@
+*2.3.5 (November 25, 2009)*
+
+* Minor Bug Fixes and deprecation warnings
+
+* Fixes for the Nokogiri backend for XmlMini
+
+* Ruby 1.9 Compatibility
+
 *2.3.4 (September 4, 2009)*
 
 * Introduce ActiveSupport::Multibyte.clean to clean invalid multibyte strings.

data/lib/active_support/cache.rb

@@ -101,6 +101,13 @@ module ActiveSupport
       alias silence? silence
       alias logger_off? logger_off
 
+      def mute
+        previous_silence, @silence = defined?(@silence) && @silence, true
+        yield
+      ensure
+        @silence = previous_silence
+      end
+
       # Fetches data from the cache, using the given key. If there is data in
       # the cache with the given key, then that data is returned.
       #

data/lib/active_support/cache/mem_cache_store.rb

@@ -38,6 +38,11 @@ module ActiveSupport
       #
       # If no addresses are specified, then MemCacheStore will connect to
       # localhost port 11211 (the default memcached port).
+      #
+      # Instead of addresses one can pass in a MemCache-like object. For example:
+      #
+      #   require 'memcached' # gem install memcached; uses C bindings to libmemcached
+      #   ActiveSupport::Cache::MemCacheStore.new(Memcached::Rails.new("localhost:11211"))
       def initialize(*addresses)
         if addresses.first.respond_to?(:get)
           @data = addresses.first

data/lib/active_support/cache/strategy/local_cache.rb

@@ -37,7 +37,7 @@ module ActiveSupport
             nil
           elsif value.nil?
             value = super
-            local_cache.write(key, value || NULL) if local_cache
+            local_cache.mute { local_cache.write(key, value || NULL) } if local_cache
             value.duplicable? ? value.dup : value
           else
             # forcing the value to be immutable
@@ -47,12 +47,12 @@ module ActiveSupport
 
         def write(key, value, options = nil)
           value = value.to_s if respond_to?(:raw?) && raw?(options)
-          local_cache.write(key, value || NULL) if local_cache
+          local_cache.mute { local_cache.write(key, value || NULL) } if local_cache
           super
         end
 
         def delete(key, options = nil)
-          local_cache.write(key, NULL) if local_cache
+          local_cache.mute { local_cache.write(key, NULL) } if local_cache
           super
         end
 
@@ -69,7 +69,7 @@ module ActiveSupport
 
         def increment(key, amount = 1)
           if value = super
-            local_cache.write(key, value.to_s) if local_cache
+            local_cache.mute { local_cache.write(key, value.to_s) } if local_cache
             value
           else
             nil
@@ -78,7 +78,7 @@ module ActiveSupport
 
         def decrement(key, amount = 1)
           if value = super
-            local_cache.write(key, value.to_s) if local_cache
+            local_cache.mute { local_cache.write(key, value.to_s) } if local_cache
             value
           else
             nil

data/lib/active_support/core_ext.rb

@@ -1,4 +1,8 @@
-Dir[File.dirname(__FILE__) + "/core_ext/*.rb"].sort.each do |path|
-  filename = File.basename(path, '.rb')
-  require "active_support/core_ext/#{filename}"
+filenames = Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.map do |path|
+  File.basename(path, '.rb')
 end
+
+# deprecated
+filenames -= %w(blank)
+
+filenames.each { |filename| require "active_support/core_ext/#{filename}" }

data/lib/active_support/core_ext/blank.rb

@@ -1,58 +1,2 @@
-class Object
-  # An object is blank if it's false, empty, or a whitespace string.
-  # For example, "", "   ", +nil+, [], and {} are blank.
-  #
-  # This simplifies
-  #
-  #   if !address.nil? && !address.empty?
-  #
-  # to
-  #
-  #   if !address.blank?
-  def blank?
-    respond_to?(:empty?) ? empty? : !self
-  end
-    
-  # An object is present if it's not blank.
-  def present?
-    !blank?
-  end
-end
-
-class NilClass #:nodoc:
-  def blank?
-    true
-  end
-end
-
-class FalseClass #:nodoc:
-  def blank?
-    true
-  end
-end
-
-class TrueClass #:nodoc:
-  def blank?
-    false
-  end
-end
-
-class Array #:nodoc:
-  alias_method :blank?, :empty?
-end
-
-class Hash #:nodoc:
-  alias_method :blank?, :empty?
-end
-
-class String #:nodoc:
-  def blank?
-    self !~ /\S/
-  end
-end
-
-class Numeric #:nodoc:
-  def blank?
-    false
-  end
-end
+require 'active_support/core_ext/object/blank'
+ActiveSupport::Deprecation.warn 'require "active_support/core_ext/blank" is deprecated and will be removed in Rails 3. Use require "active_support/core_ext/object/blank" instead.'

data/lib/active_support/core_ext/kernel/debugger.rb

@@ -7,6 +7,7 @@ module Kernel
     end
   end
 
+  undef :breakpoint if respond_to?(:breakpoint)
   def breakpoint
     message = "\n***** The 'breakpoint' command has been renamed 'debugger' -- please change *****\n"
     defined?(Rails) ? Rails.logger.info(message) : $stderr.puts(message)

data/lib/active_support/core_ext/name_error.rb

@@ -2,7 +2,9 @@
 class NameError #:nodoc:  
   # Add a method to obtain the missing name from a NameError.
   def missing_name
-    $1 if /((::)?([A-Z]\w*)(::[A-Z]\w*)*)$/ =~ message
+    if /undefined local variable or method/ !~ message
+      $1 if /((::)?([A-Z]\w*)(::[A-Z]\w*)*)$/ =~ message
+    end
   end
   
   # Was this exception raised because the given name was missing?

data/lib/active_support/core_ext/object.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/conversions'
 require 'active_support/core_ext/object/extending'
 require 'active_support/core_ext/object/instance_variables'

data/lib/active_support/core_ext/object/blank.rb

@@ -0,0 +1,58 @@
+class Object
+  # An object is blank if it's false, empty, or a whitespace string.
+  # For example, "", "   ", +nil+, [], and {} are blank.
+  #
+  # This simplifies
+  #
+  #   if !address.nil? && !address.empty?
+  #
+  # to
+  #
+  #   if !address.blank?
+  def blank?
+    respond_to?(:empty?) ? empty? : !self
+  end
+
+  # An object is present if it's not blank.
+  def present?
+    !blank?
+  end
+end
+
+class NilClass #:nodoc:
+  def blank?
+    true
+  end
+end
+
+class FalseClass #:nodoc:
+  def blank?
+    true
+  end
+end
+
+class TrueClass #:nodoc:
+  def blank?
+    false
+  end
+end
+
+class Array #:nodoc:
+  alias_method :blank?, :empty?
+end
+
+class Hash #:nodoc:
+  alias_method :blank?, :empty?
+end
+
+class String #:nodoc:
+  def blank?
+    self !~ /\S/
+  end
+end
+
+class Numeric #:nodoc:
+  def blank?
+    false
+  end
+end

data/lib/active_support/core_ext/string.rb

@@ -10,6 +10,7 @@ require 'active_support/core_ext/string/multibyte'
 require 'active_support/core_ext/string/xchar'
 require 'active_support/core_ext/string/filters'
 require 'active_support/core_ext/string/behavior'
+require 'active_support/core_ext/string/output_safety'
 
 class String #:nodoc:
   include ActiveSupport::CoreExtensions::String::Access
@@ -20,4 +21,5 @@ class String #:nodoc:
   include ActiveSupport::CoreExtensions::String::Iterators
   include ActiveSupport::CoreExtensions::String::Behavior
   include ActiveSupport::CoreExtensions::String::Multibyte
+  include ActiveSupport::CoreExtensions::String::OutputSafety
 end

data/lib/active_support/core_ext/string/output_safety.rb

@@ -0,0 +1,48 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module String #:nodoc:
+      module OutputSafety
+        def self.included(base)
+          base.class_eval do
+            alias_method :add_without_safety, :+
+            alias_method :+, :add_with_safety
+            alias_method_chain :concat, :safety
+            undef_method :<<
+            alias_method :<<, :concat_with_safety
+          end
+        end
+
+        def html_safe?
+          defined?(@_rails_html_safe) && @_rails_html_safe
+        end
+
+        def html_safe!
+          @_rails_html_safe = true
+          self
+        end
+
+        def add_with_safety(other)
+          result = add_without_safety(other)
+          if html_safe? && also_html_safe?(other)
+            result.html_safe!
+          else
+            result
+          end
+        end
+
+        def concat_with_safety(other_or_fixnum)
+          result = concat_without_safety(other_or_fixnum)
+          unless html_safe? && also_html_safe?(other_or_fixnum)
+            @_rails_html_safe = false
+          end
+          result
+        end
+
+        private
+          def also_html_safe?(other)
+            other.respond_to?(:html_safe?) && other.html_safe?
+          end
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/time/calculations.rb

@@ -201,7 +201,8 @@ module ActiveSupport #:nodoc:
 
         # Returns a new Time representing the start of the day (0:00)
         def beginning_of_day
-          (self - self.seconds_since_midnight).change(:usec => 0)
+          #(self - seconds_since_midnight).change(:usec => 0)
+          change(:hour => 0, :min => 0, :sec => 0, :usec => 0)
         end
         alias :midnight :beginning_of_day
         alias :at_midnight :beginning_of_day

data/lib/active_support/deprecation.rb

@@ -13,7 +13,7 @@ module ActiveSupport
                          $stderr.puts callstack.join("\n  ") if debug
                        },
       'development' => Proc.new { |message, callstack|
-                         logger = defined?(Rails) ? Rails.logger : Logger.new($stderr)
+                         logger = (defined?(Rails) && Rails.logger) ? Rails.logger : Logger.new($stderr)
                          logger.warn message
                          logger.debug callstack.join("\n  ") if debug
                        }

data/lib/active_support/json/backends/jsongem.rb

@@ -2,10 +2,9 @@ require 'json' unless defined?(JSON)
 
 module ActiveSupport
   module JSON
-    ParseError = ::JSON::ParserError unless const_defined?(:ParseError)
-
     module Backends
       module JSONGem
+        ParseError = ::JSON::ParserError
         extend self
 
         # Converts a JSON string into a Ruby object.
@@ -35,4 +34,4 @@ module ActiveSupport
       end
     end
   end
-end
+end

data/lib/active_support/json/backends/yaml.rb

@@ -2,13 +2,9 @@ require 'active_support/core_ext/string/starts_ends_with'
 
 module ActiveSupport
   module JSON
-    unless const_defined?(:ParseError)
-      class ParseError < StandardError
-      end
-    end
-
     module Backends
       module Yaml
+        ParseError = ::StandardError
         extend self
 
         # Converts a JSON string into a Ruby object.

data/lib/active_support/json/decoding.rb

@@ -6,6 +6,7 @@ module ActiveSupport
 
   module JSON
     class << self
+      attr_reader :parse_error
       delegate :decode, :to => :backend
 
       def backend
@@ -20,6 +21,7 @@ module ActiveSupport
           require "active_support/json/backends/#{name.to_s.downcase}.rb"
           @backend = ActiveSupport::JSON::Backends::const_get(name)
         end
+        @parse_error = @backend::ParseError
       end
 
       def with_backend(name)

data/lib/active_support/message_verifier.rb

@@ -24,8 +24,10 @@ module ActiveSupport
     end
     
     def verify(signed_message)
+      raise InvalidSignature if signed_message.blank?
+
       data, digest = signed_message.split("--")
-      if secure_compare(digest, generate_digest(data))
+      if data.present? && digest.present? && secure_compare(digest, generate_digest(data))
         Marshal.load(ActiveSupport::Base64.decode64(data))
       else
         raise InvalidSignature
@@ -38,16 +40,34 @@ module ActiveSupport
     end
     
     private
-      # constant-time comparison algorithm to prevent timing attacks
-      def secure_compare(a, b)
-        if a.length == b.length
-          result = 0
-          for i in 0..(a.length - 1)
-            result |= a[i] ^ b[i]
+      if "foo".respond_to?(:force_encoding)
+        # constant-time comparison algorithm to prevent timing attacks
+        def secure_compare(a, b)
+          a = a.dup.force_encoding(Encoding::BINARY)
+          b = b.dup.force_encoding(Encoding::BINARY)
+
+          if a.length == b.length
+            result = 0
+            for i in 0..(a.length - 1)
+              result |= a[i].ord ^ b[i].ord
+            end
+            result == 0
+          else
+            false
+          end
+        end
+      else
+        # For <= 1.8.6
+        def secure_compare(a, b)
+          if a.length == b.length
+            result = 0
+            for i in 0..(a.length - 1)
+              result |= a[i] ^ b[i]
+            end
+            result == 0
+          else
+            false
           end
-          result == 0
-        else
-          false
         end
       end
 

data/lib/active_support/multibyte/chars.rb

@@ -320,7 +320,7 @@ module ActiveSupport #:nodoc:
       # Example:
       #   'Café'.mb_chars.reverse.to_s #=> 'éfaC'
       def reverse
-        chars(self.class.u_unpack(@wrapped_string).reverse.pack('U*'))
+        chars(self.class.g_unpack(@wrapped_string).reverse.flatten.pack('U*'))
       end
 
       # Implements Unicode-aware slice with codepoints. Slicing on one point returns the codepoints for that

data/lib/active_support/multibyte/utils.rb

@@ -5,7 +5,7 @@ module ActiveSupport #:nodoc:
     if Kernel.const_defined?(:Encoding)
       # Returns a regular expression that matches valid characters in the current encoding
       def self.valid_character
-        VALID_CHARACTER[Encoding.default_internal.to_s]
+        VALID_CHARACTER[Encoding.default_external.to_s]
       end
     else
       def self.valid_character
@@ -27,7 +27,7 @@ module ActiveSupport #:nodoc:
       def self.verify(string)
         if expression = valid_character
           for c in string.split(//)
-            return false unless valid_character.match(c)
+            return false unless expression.match(c)
           end
         end
         true
@@ -50,7 +50,7 @@ module ActiveSupport #:nodoc:
       def self.clean(string)
         if expression = valid_character
           stripped = []; for c in string.split(//)
-            stripped << c if valid_character.match(c)
+            stripped << c if expression.match(c)
           end; stripped.join
         else
           string
@@ -58,4 +58,4 @@ module ActiveSupport #:nodoc:
       end
     end
   end
-end
+end

data/lib/active_support/ordered_hash.rb

@@ -120,6 +120,13 @@ module ActiveSupport
         dup.merge!(other_hash)
       end
 
+      # When replacing with another hash, the initial order of our keys must come from the other hash -ordered or not.
+      def replace(other)
+        super
+        @keys = other.keys
+        self
+      end
+
       def inspect
         "#<OrderedHash #{super}>"
       end

data/lib/active_support/vendor.rb

@@ -21,8 +21,8 @@ rescue Gem::LoadError
 end
 
 begin
-  gem 'i18n', '~> 0.1.3'
+  gem 'i18n', '>= 0.1.3'
 rescue Gem::LoadError
   $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.1.3/lib"
-  require 'i18n'
 end
+require 'i18n'

data/lib/active_support/version.rb

@@ -2,7 +2,7 @@ module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/active_support/whiny_nil.rb

@@ -43,7 +43,14 @@ class NilClass
 
   private
     def method_missing(method, *args, &block)
-      raise_nil_warning_for METHOD_CLASS_MAP[method], method, caller
+      # Ruby 1.9.2: disallow explicit coercion via method_missing.
+      if method == :to_ary || method == :to_str
+        super
+      elsif klass = METHOD_CLASS_MAP[method]
+        raise_nil_warning_for klass, method, caller
+      else
+        super
+      end
     end
 
     # Raises a NoMethodError when you attempt to call a method on +nil+.
@@ -55,4 +62,3 @@ class NilClass
       raise NoMethodError, message, with_caller || caller
     end
 end
-

data/lib/active_support/xml_mini/nokogiri.rb

@@ -12,7 +12,7 @@ module ActiveSupport
       if string.blank?
         {}
       else
-        doc = Nokogiri::XML(string)
+        doc = Nokogiri::XML(string) { |cfg| cfg.noblanks }
         raise doc.errors.first if doc.errors.length > 0
         doc.to_hash
       end
@@ -33,33 +33,25 @@ module ActiveSupport
         # hash::
         #   Hash to merge the converted element into.
         def to_hash(hash = {})
-          hash[name] ||= attributes_as_hash
+          attributes = attributes_as_hash
+          if hash[name]
+            hash[name] = [hash[name]].flatten
+            hash[name] << attributes
+          else
+            hash[name] ||= attributes
+          end
 
-          walker = lambda { |memo, parent, child, callback|
-            next if child.blank? && 'file' != parent['type']
+          children.each { |child|
+            next if child.blank? && 'file' != self['type']
 
-            if child.text?
-              (memo[CONTENT_ROOT] ||= '') << child.content
+            if child.text? || child.cdata?
+              (attributes[CONTENT_ROOT] ||= '') << child.content
               next
             end
 
-            name = child.name
-
-            child_hash = child.attributes_as_hash
-            if memo[name]
-              memo[name] = [memo[name]].flatten
-              memo[name] << child_hash
-            else
-              memo[name] = child_hash
-            end
-
-            # Recusively walk children
-            child.children.each { |c|
-              callback.call(child_hash, child, c, callback)
-            }
+            child.to_hash attributes
           }
 
-          children.each { |c| walker.call(hash[name], self, c, walker) }
           hash
         end
 

data/lib/activesupport.rb

@@ -1 +1,2 @@
 require 'active_support'
+ActiveSupport::Deprecation.warn 'require "activesupport" is deprecated and will be removed in Rails 3. Use require "active_support" instead.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activesupport
 version: !ruby/object:Gem::Version 
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-04 00:00:00 +12:00
+date: 2009-11-27 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -110,6 +110,7 @@ files:
 - lib/active_support/core_ext/numeric/conversions.rb
 - lib/active_support/core_ext/numeric/time.rb
 - lib/active_support/core_ext/numeric.rb
+- lib/active_support/core_ext/object/blank.rb
 - lib/active_support/core_ext/object/conversions.rb
 - lib/active_support/core_ext/object/extending.rb
 - lib/active_support/core_ext/object/instance_variables.rb
@@ -135,6 +136,7 @@ files:
 - lib/active_support/core_ext/string/inflections.rb
 - lib/active_support/core_ext/string/iterators.rb
 - lib/active_support/core_ext/string/multibyte.rb
+- lib/active_support/core_ext/string/output_safety.rb
 - lib/active_support/core_ext/string/starts_ends_with.rb
 - lib/active_support/core_ext/string/xchar.rb
 - lib/active_support/core_ext/string.rb
@@ -391,7 +393,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: activesupport
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Support and utility classes used by the Rails framework.