activesupport 2.3.5 → 2.3.6.pre

data/CHANGELOG

@@ -1,17 +1,40 @@
+*2.3.6 (pending)*
+
+* Use Object#singleton_class instead of #metaclass. Prefer Ruby's choice.  [Jeremy Kemper]
+
+* JSON backend for YAJL. Preferred if available.  #2666 [Brian Lopez]
+
+* Introduce String#html_safe for rails_xss plugin and forward-compatibility with Rails 3.  [Michael Koziarski, Santiago Pastorino, José Ignacio Costa]
+
+* Time#- with a DateTime argument behaves the same as with a Time argument, i.e. returns the difference between self and arg as a Float #3476 [Geoff Buesing]
+
+* YAML serialization for OrderedHash.  #3608 [Gregor Schmidt]
+
+* Update bundled TZInfo to v0.3.16 [Geoff Buesing]
+
+* Georgetown TimeZone is now mapped to "America/Guyana" instead of "America/Argentina/San_Juan" #1821 [Geoff Buesing, Reuben Sivan]
+
+* Add Enumerable#exclude? to bring parity to Enumerable#include? and avoid if !x.include?/else calls [DHH]
+
+
 *2.3.5 (November 25, 2009)*
 
 * Minor Bug Fixes and deprecation warnings
 
+* Update Edinburgh TimeZone to use "Europe/London" instead of "Europe/Dublin" #3310 [Phil Ross]
+
 * 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.
 
 * Bug fixes
 
+
 *2.3.3 (July 12, 2009)*
 
 * JSON: +Object#to_json+ calls +as_json+ to coerce itself into something natively encodable like +Hash+, +Integer+, or +String+. Override +as_json+ instead of +to_json+ so you're JSON-library-agnostic.  [Jeremy Kemper]

data/lib/active_support.rb

@@ -44,6 +44,7 @@ module ActiveSupport
   autoload :OrderedHash, 'active_support/ordered_hash'
   autoload :OrderedOptions, 'active_support/ordered_options'
   autoload :Rescuable, 'active_support/rescuable'
+  autoload :SafeBuffer, 'active_support/core_ext/string/output_safety'
   autoload :SecureRandom, 'active_support/secure_random'
   autoload :StringInquirer, 'active_support/string_inquirer'
   autoload :TimeWithZone, 'active_support/time_with_zone'

data/lib/active_support/core_ext/date_time/conversions.rb

@@ -84,11 +84,22 @@ module ActiveSupport #:nodoc:
         def xmlschema
           strftime("%Y-%m-%dT%H:%M:%S%Z")
         end if RUBY_VERSION < '1.9'
-        
+
         # Converts self to a floating-point number of seconds since the Unix epoch 
         def to_f
-          days_since_unix_epoch = self - ::DateTime.civil(1970)
-          (days_since_unix_epoch * 86_400).to_f
+          seconds_since_unix_epoch.to_f
+        end
+
+        # Converts self to an integer number of seconds since the Unix epoch
+        def to_i
+          seconds_since_unix_epoch.to_i
+        end
+
+        private
+
+        def seconds_since_unix_epoch
+          seconds_per_day = 86_400
+          (self - ::DateTime.civil(1970)) * seconds_per_day
         end
       end
     end

data/lib/active_support/core_ext/enumerable.rb

@@ -111,4 +111,10 @@ module Enumerable
   def none?(&block)
     !any?(&block)
   end unless [].respond_to?(:none?)
+
+  
+  # The negative of the Enumerable#include?. Returns true if the collection does not include the object.
+  def exclude?(object)
+    !include?(object)
+  end
 end

data/lib/active_support/core_ext/file/atomic.rb

@@ -17,6 +17,7 @@ module ActiveSupport #:nodoc:
         #   end
         def atomic_write(file_name, temp_dir = Dir.tmpdir)
           require 'tempfile' unless defined?(Tempfile)
+          require 'fileutils' unless defined?(FileUtils)
 
           temp_file = Tempfile.new(basename(file_name), temp_dir)
           yield temp_file
@@ -34,7 +35,7 @@ module ActiveSupport #:nodoc:
           end
 
           # Overwrite original file with temp file
-          rename(temp_file.path, file_name)
+          FileUtils.mv(temp_file.path, file_name)
 
           # Set correct permissions on new file
           chown(old_stat.uid, old_stat.gid, file_name)

data/lib/active_support/core_ext/numeric/conversions.rb

@@ -8,10 +8,10 @@ module ActiveSupport #:nodoc:
         #   -21_600.to_utc_offset_s   # => "-06:00"
         def to_utc_offset_s(colon=true)
           seconds = self
-          sign = (seconds < 0 ? -1 : 1)
+          sign = (seconds < 0 ? '-' : '+')
           hours = seconds.abs / 3600
           minutes = (seconds.abs % 3600) / 60
-          "%+03d%s%02d" % [ hours * sign, colon ? ":" : "", minutes ]
+          "%s%02d%s%02d" % [ sign, hours, colon ? ":" : "", minutes ]
         end
       end
     end

data/lib/active_support/core_ext/object.rb

@@ -3,4 +3,5 @@ require 'active_support/core_ext/object/conversions'
 require 'active_support/core_ext/object/extending'
 require 'active_support/core_ext/object/instance_variables'
 require 'active_support/core_ext/object/metaclass'
+require 'active_support/core_ext/object/singleton_class'
 require 'active_support/core_ext/object/misc'

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

@@ -1,13 +1,14 @@
+require 'active_support/deprecation'
+
 class Object
-  # Get object's meta (ghost, eigenclass, singleton) class
+  # Get object's meta (ghost, eigenclass, singleton) class.
+  #
+  # Deprecated in favor of Object#singleton_class.
   def metaclass
     class << self
       self
     end
   end
 
-  # If class_eval is called on an object, add those methods to its metaclass
-  def class_eval(*args, &block)
-    metaclass.class_eval(*args, &block)
-  end
+  deprecate :metaclass => :singleton_class
 end

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

@@ -0,0 +1,13 @@
+class Object
+  # Returns the object's singleton class.
+  def singleton_class
+    class << self
+      self
+    end
+  end unless respond_to?(:singleton_class)
+
+  # class_eval on an object acts like singleton_class_eval.
+  def class_eval(*args, &block)
+    singleton_class.class_eval(*args, &block)
+  end
+end

data/lib/active_support/core_ext/string.rb

@@ -21,5 +21,4 @@ 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

@@ -1,48 +1,152 @@
+require 'erb'
+
+class ERB
+  undef :set_eoutvar
+  def set_eoutvar(compiler, eoutvar = '_erbout')
+    compiler.put_cmd = "#{eoutvar}.safe_concat"
+    compiler.insert_cmd = "#{eoutvar}.safe_concat"
+
+    cmd = []
+    cmd.push "#{eoutvar} = ActiveSupport::SafeBuffer.new"
+
+    compiler.pre_cmd = cmd
+
+    cmd = []
+    cmd.push(eoutvar)
+
+    compiler.post_cmd = cmd
+  end
+
+  module Util
+    HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
+    JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003E', '<' => '\u003C' }
+
+    # A utility method for escaping HTML tag characters.
+    # This method is also aliased as <tt>h</tt>.
+    #
+    # In your ERb templates, use this method to escape any unsafe content. For example:
+    #   <%=h @person.name %>
+    #
+    # ==== Example:
+    #   puts html_escape("is a > 0 & a < 10?")
+    #   # => is a &gt; 0 &amp; a &lt; 10?
+    def html_escape(s)
+      s = s.to_s
+      if s.html_safe?
+        s
+      else
+        s.gsub(/[&"><]/) { |special| HTML_ESCAPE[special] }.html_safe
+      end
+    end
+
+    undef :h
+    alias h html_escape
+
+    module_function :html_escape
+    module_function :h
+
+    # A utility method for escaping HTML entities in JSON strings.
+    # This method is also aliased as <tt>j</tt>.
+    #
+    # In your ERb templates, use this method to escape any HTML entities:
+    #   <%=j @person.to_json %>
+    #
+    # ==== Example:
+    #   puts json_escape("is a > 0 & a < 10?")
+    #   # => is a \u003E 0 \u0026 a \u003C 10?
+    def json_escape(s)
+      s.to_s.gsub(/[&"><]/) { |special| JSON_ESCAPE[special] }
+    end
+
+    alias j json_escape
+    module_function :j
+    module_function :json_escape
+  end
+end
+
+class Object
+  def html_safe?
+    false
+  end
+end
+
+class Fixnum
+  def html_safe?
+    true
+  end
+end
+
 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
+  class SafeBuffer < String
+    alias safe_concat concat
+
+    def concat(value)
+      if value.html_safe?
+        super(value)
+      else
+        super(ERB::Util.h(value))
       end
     end
+    alias << concat
+
+    def +(other)
+      dup.concat(other)
+    end
+
+    def html_safe?
+      true
+    end
+
+    def html_safe
+      self
+    end
+
+    def to_s
+      self
+    end
+  end
+end
+
+class String
+  alias_method :add_without_safety, :+
+
+  def html_safe
+    ActiveSupport::SafeBuffer.new(self)
   end
-end
+
+  def html_safe?
+    defined?(@_rails_html_safe) && @_rails_html_safe
+  end
+
+  def html_safe!
+    ActiveSupport::Deprecation.warn("Use html_safe with your strings instead of html_safe! See http://yehudakatz.com/2010/02/01/safebuffers-and-rails-3-0/ for the full story.", caller)
+    @_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
+  alias_method :+, :add_with_safety
+
+  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
+  alias_method_chain :concat, :safety
+  undef_method :<<
+  alias_method :<<, :concat_with_safety
+
+  private
+   def also_html_safe?(other)
+     other.respond_to?(:html_safe?) && other.html_safe?
+   end
+end

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

@@ -283,7 +283,7 @@ module ActiveSupport #:nodoc:
         # are coerced into values that Time#- will recognize
         def minus_with_coercion(other)
           other = other.comparable_time if other.respond_to?(:comparable_time)
-          minus_without_coercion(other)
+          other.is_a?(::DateTime) ? to_f - other.to_f : minus_without_coercion(other)
         end
 
         # Layers additional behavior on Time#<=> so that DateTime and ActiveSupport::TimeWithZone instances

data/lib/active_support/inflector.rb

@@ -260,7 +260,7 @@ module ActiveSupport
       # replace accented chars with ther ascii equivalents
       parameterized_string = transliterate(string)
       # Turn unwanted chars into the seperator
-      parameterized_string.gsub!(/[^a-z0-9\-_\+]+/i, sep)
+      parameterized_string.gsub!(/[^a-z0-9\-_]+/i, sep)
       unless sep.blank?
         re_sep = Regexp.escape(sep)
         # No more than one of the separator in a row.

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

@@ -0,0 +1,40 @@
+require 'yajl-ruby' unless defined?(Yajl)
+
+module ActiveSupport
+  module JSON
+    module Backends
+      module Yajl
+        ParseError = ::Yajl::ParseError
+        extend self
+
+        # Parses a JSON string or IO and convert it into an object
+        def decode(json)
+          data = ::Yajl::Parser.new.parse(json)
+          if ActiveSupport.parse_json_times
+            convert_dates_from(data)
+          else
+            data
+          end
+        end
+
+      private
+        def convert_dates_from(data)
+          case data
+          when nil
+            nil
+          when DATE_REGEX
+            DateTime.parse(data)
+          when Array
+            data.map! { |d| convert_dates_from(d) }
+          when Hash
+            data.each do |key, value|
+              data[key] = convert_dates_from(value)
+            end
+          else
+            data
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_support/json/decoding.rb

@@ -5,12 +5,15 @@ module ActiveSupport
   mattr_accessor :parse_json_times
 
   module JSON
+    # Listed in order of preference.
+    DECODERS = %w(Yajl JSONGem Yaml)
+
     class << self
       attr_reader :parse_error
       delegate :decode, :to => :backend
 
       def backend
-        self.backend = "Yaml" unless defined?(@backend)
+        set_default_backend unless defined?(@backend)
         @backend
       end
 
@@ -30,6 +33,18 @@ module ActiveSupport
       ensure
         self.backend = old_backend
       end
+
+      def set_default_backend
+        DECODERS.find do |name|
+          begin
+            self.backend = name
+            true
+          rescue LoadError
+            # Try next decoder.
+            false
+          end
+        end
+      end
     end
   end
 end