activesupport 2.3.6.pre → 2.3.6

data/CHANGELOG

@@ -1,4 +1,12 @@
-*2.3.6 (pending)*
+*2.3.6 (May 23, 2010)*
+
+* 1.9 compat: deprecated last_(month|year) in favor of prev_(month|year). [fxn]
+
+* Deprecated Array#rand in favor of Array#random_element. [Santiago Pastorino, Rizwan Reza]
+
+* Added Object#presence that returns the object if it's #present? otherwise returns nil [DHH/Colin Kelley]
+
+* New assertions assert_blank and assert_present.  #4299 [Juanjo Bazan]
 
 * Use Object#singleton_class instead of #metaclass. Prefer Ruby's choice.  [Jeremy Kemper]
 
@@ -10,10 +18,6 @@
 
 * 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]
 
 

data/lib/active_support/buffered_logger.rb

@@ -67,7 +67,7 @@ module ActiveSupport
     end
 
     for severity in Severity.constants
-      class_eval <<-EOT, __FILE__, __LINE__
+      class_eval <<-EOT, __FILE__, __LINE__ + 1
         def #{severity.downcase}(message = nil, progname = nil, &block)  # def debug(message = nil, progname = nil, &block)
           add(#{severity}, message, progname, &block)                    #   add(DEBUG, message, progname, &block)
         end                                                              # end

data/lib/active_support/cache/memory_store.rb

@@ -19,6 +19,12 @@ module ActiveSupport
         @data = {}
       end
 
+      def read_multi(*names)
+        results = {}
+        names.each { |n| results[n] = read(n) }
+        results
+      end
+
       def read(name, options = nil)
         super
         @data[name]
@@ -39,7 +45,7 @@ module ActiveSupport
         @data.delete_if { |k,v| k =~ matcher }
       end
 
-      def exist?(name,options = nil)
+      def exist?(name, options = nil)
         super
         @data.has_key?(name)
       end

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

@@ -15,7 +15,7 @@ module ActiveSupport
         def middleware
           @middleware ||= begin
             klass = Class.new
-            klass.class_eval(<<-EOS, __FILE__, __LINE__)
+            klass.class_eval(<<-EOS, __FILE__, __LINE__ + 1)
               def initialize(app)
                 @app = app
               end

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

@@ -164,7 +164,7 @@ module ActiveSupport #:nodoc:
           require 'builder' unless defined?(Builder)
 
           options = options.dup
-          options[:root]     ||= all? { |e| e.is_a?(first.class) && first.class.to_s != "Hash" } ? first.class.to_s.underscore.pluralize : "records"
+          options[:root]     ||= all? { |e| e.is_a?(first.class) && first.class.to_s != "Hash" } ? first.class.to_s.underscore.pluralize.tr('/', '-') : "records"
           options[:children] ||= options[:root].singularize
           options[:indent]   ||= 2
           options[:builder]  ||= Builder::XmlMarkup.new(:indent => options[:indent])

data/lib/active_support/core_ext/array/random_access.rb

@@ -2,8 +2,18 @@ module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module Array #:nodoc:
       module RandomAccess
+        # This method is deprecated because it masks Kernel#rand within the Array class itself, 
+        # which may be used by a 3rd party library extending Array in turn. See
+        #
+        #   https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/4555
+        #
+        def rand # :nodoc:
+          ActiveSupport::Deprecation.warn 'Array#rand is deprecated and will be removed in Rails 3. Use "random_element" instead', caller
+          random_element
+        end
+
         # Returns a random element from the array.
-        def rand
+        def random_element
           self[Kernel.rand(length)]
         end
       end

data/lib/active_support/core_ext/class/attribute_accessors.rb

@@ -8,42 +8,49 @@
 #  Person.hair_colors = [:brown, :black, :blonde, :red]
 class Class
   def cattr_reader(*syms)
-    syms.flatten.each do |sym|
+    options = syms.extract_options!
+    syms.each do |sym|
       next if sym.is_a?(Hash)
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}  # unless defined? @@hair_colors
-          @@#{sym} = nil          #   @@hair_colors = nil
-        end                       # end
-                                  #
-        def self.#{sym}           # def self.hair_colors
-          @@#{sym}                #   @@hair_colors
-        end                       # end
-                                  #
-        def #{sym}                # def hair_colors
-          @@#{sym}                #   @@hair_colors
-        end                       # end
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}
+          @@#{sym}
+        end
       EOS
+
+      unless options[:instance_reader] == false
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{sym}
+            @@#{sym}
+          end
+        EOS
+      end
     end
   end
 
   def cattr_writer(*syms)
     options = syms.extract_options!
-    syms.flatten.each do |sym|
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}                       # unless defined? @@hair_colors
-          @@#{sym} = nil                               #   @@hair_colors = nil
-        end                                            # end
-                                                       #
-        def self.#{sym}=(obj)                          # def self.hair_colors=(obj)
-          @@#{sym} = obj                               #   @@hair_colors = obj
-        end                                            # end
-                                                       #
-        #{"                                            #
-        def #{sym}=(obj)                               # def hair_colors=(obj)
-          @@#{sym} = obj                               #   @@hair_colors = obj
-        end                                            # end
-        " unless options[:instance_writer] == false }  # # instance writer above is generated unless options[:instance_writer] == false
+    syms.each do |sym|
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}=(obj)
+          @@#{sym} = obj
+        end
       EOS
+
+      unless options[:instance_writer] == false
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{sym}=(obj)
+            @@#{sym} = obj
+          end
+        EOS
+      end
     end
   end
 

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

@@ -135,20 +135,30 @@ module ActiveSupport #:nodoc:
           advance(:years => years)
         end
 
+        def last_year # :nodoc:
+          ActiveSupport::Deprecation.warn("Date#last_year is deprecated and has been removed in Rails 3, please use Date#prev_year instead", caller)
+          prev_year
+        end
+
         # Short-hand for years_ago(1)
-        def last_year
+        def prev_year
           years_ago(1)
-        end
+        end unless method_defined?(:prev_year)
 
         # Short-hand for years_since(1)
         def next_year
           years_since(1)
         end
 
+        def last_month # :nodoc:
+          ActiveSupport::Deprecation.warn("Date#last_month is deprecated and has been removed in Rails 3, please use Date#prev_month instead", caller)
+          prev_month
+        end
+
         # Short-hand for months_ago(1)
-        def last_month
+        def prev_month
           months_ago(1)
-        end
+        end unless method_defined?(:prev_month)
 
         # Short-hand for months_since(1)
         def next_month

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

@@ -35,7 +35,7 @@ module Kernel
   #   puts 'But this will'
   def silence_stream(stream)
     old_stream = stream.dup
-    stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
+    stream.reopen(RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'NUL:' : '/dev/null')
     stream.sync = true
     yield
   ensure

data/lib/active_support/core_ext/module/aliasing.rb

@@ -63,7 +63,7 @@ module ActiveSupport
       #   e.subject = "Megastars"
       #   e.title    # => "Megastars"
       def alias_attribute(new_name, old_name)
-        module_eval <<-STR, __FILE__, __LINE__+1
+        module_eval <<-STR, __FILE__, __LINE__ + 1
           def #{new_name}; self.#{old_name}; end          # def subject; self.title; end
           def #{new_name}?; self.#{old_name}?; end        # def subject?; self.title?; end
           def #{new_name}=(v); self.#{old_name} = v; end  # def subject=(v); self.title = v; end

data/lib/active_support/core_ext/module/attr_accessor_with_default.rb

@@ -21,7 +21,7 @@ class Module
   def attr_accessor_with_default(sym, default = nil, &block)
     raise 'Default value or block required' unless !default.nil? || block
     define_method(sym, block_given? ? block : Proc.new { default })
-    module_eval(<<-EVAL, __FILE__, __LINE__)
+    module_eval(<<-EVAL, __FILE__, __LINE__ + 1)
       def #{sym}=(value)                        # def age=(value)
         class << self; attr_reader :#{sym} end  #   class << self; attr_reader :age end
         @#{sym} = value                         #   @age = value

data/lib/active_support/core_ext/module/attribute_accessors.rb

@@ -14,42 +14,49 @@ require "active_support/core_ext/array"
 #  AppConfiguration.google_api_key = "overriding the api key!"
 class Module
   def mattr_reader(*syms)
+    options = syms.extract_options!
     syms.each do |sym|
       next if sym.is_a?(Hash)
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}  # unless defined? @@pagination_options
-          @@#{sym} = nil          #   @@pagination_options = nil
-        end                       # end
-                                  #
-        def self.#{sym}           # def self.pagination_options
-          @@#{sym}                #   @@pagination_options
-        end                       # end
-                                  #
-        def #{sym}                # def pagination_options
-          @@#{sym}                #   @@pagination_options
-        end                       # end
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}
+          @@#{sym}
+        end
       EOS
+
+      unless options[:instance_reader] == false
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{sym}
+            @@#{sym}
+          end
+        EOS
+      end
     end
   end
   
   def mattr_writer(*syms)
     options = syms.extract_options!
     syms.each do |sym|
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}                       # unless defined? @@pagination_options
-          @@#{sym} = nil                               #   @@pagination_options = nil
-        end                                            # end
-                                                       #
-        def self.#{sym}=(obj)                          # def self.pagination_options=(obj)
-          @@#{sym} = obj                               #   @@pagination_options = obj
-        end                                            # end
-                                                       #
-        #{"                                            #
-        def #{sym}=(obj)                               # def pagination_options=(obj)
-          @@#{sym} = obj                               #   @@pagination_options = obj
-        end                                            # end
-        " unless options[:instance_writer] == false }  # # instance writer above is generated unless options[:instance_writer] == false
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}=(obj)
+          @@#{sym} = obj
+        end
       EOS
+
+      unless options[:instance_writer] == false
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{sym}=(obj)
+            @@#{sym} = obj
+          end
+        EOS
+      end
     end
   end
   

data/lib/active_support/core_ext/module/synchronization.rb

@@ -25,7 +25,7 @@ class Module
         raise ArgumentError, "#{method} is already synchronized. Double synchronization is not currently supported."
       end
 
-      module_eval(<<-EOS, __FILE__, __LINE__)
+      module_eval(<<-EOS, __FILE__, __LINE__ + 1)
         def #{aliased_method}_with_synchronization#{punctuation}(*args, &block)     # def expire_with_synchronization(*args, &block)
           #{with}.synchronize do                                                    #   @@lock.synchronize do
             #{aliased_method}_without_synchronization#{punctuation}(*args, &block)  #     expire_without_synchronization(*args, &block)

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

@@ -2,11 +2,11 @@ class Object
   # An object is blank if it's false, empty, or a whitespace string.
   # For example, "", "   ", +nil+, [], and {} are blank.
   #
-  # This simplifies
+  # This simplifies:
   #
   #   if !address.nil? && !address.empty?
   #
-  # to
+  # ...to:
   #
   #   if !address.blank?
   def blank?
@@ -17,6 +17,24 @@ class Object
   def present?
     !blank?
   end
+  
+  # Returns object if it's #present? otherwise returns nil.
+  # object.presence is equivalent to object.present? ? object : nil.
+  #
+  # This is handy for any representation of objects where blank is the same
+  # as not present at all.  For example, this simplifies a common check for
+  # HTTP POST/query parameters:
+  #
+  #   state   = params[:state]   if params[:state].present?
+  #   country = params[:country] if params[:country].present?
+  #   region  = state || country || 'US'
+  #
+  # ...becomes:
+  #
+  #   region = params[:state].presence || params[:country].presence || 'US'
+  def presence
+    self if present?
+  end
 end
 
 class NilClass #:nodoc:

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

@@ -104,18 +104,26 @@ module ActiveSupport #:nodoc:
     def to_s
       self
     end
+
+    def to_yaml(*args)
+      to_str.to_yaml(*args)
+    end
   end
 end
 
 class String
   alias_method :add_without_safety, :+
 
+  def as_str
+    self
+  end
+
   def html_safe
     ActiveSupport::SafeBuffer.new(self)
   end
 
   def html_safe?
-    defined?(@_rails_html_safe) && @_rails_html_safe
+    defined?(@_rails_html_safe)
   end
 
   def html_safe!
@@ -137,7 +145,7 @@ class String
   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
+      remove_instance_variable(:@_rails_html_safe) if defined?(@_rails_html_safe)
     end
     result
   end

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

@@ -20,14 +20,12 @@ module ActiveSupport #:nodoc:
 
         # Does the string start with the specified +prefix+?
         def starts_with?(prefix)
-          prefix = prefix.to_s
-          self[0, prefix.length] == prefix
+          prefix.respond_to?(:to_str) && self[0, prefix.length] == prefix
         end
 
         # Does the string end with the specified +suffix+?
         def ends_with?(suffix)
-          suffix = suffix.to_s
-          self[-suffix.length, suffix.length] == suffix      
+          suffix.respond_to?(:to_str) && self[-suffix.length, suffix.length] == suffix
         end
       end
     end

data/lib/active_support/core_ext/time.rb

@@ -15,14 +15,18 @@ class Time
       alias_method :_original_load, :_load
       def _load(marshaled_time)
         time = _original_load(marshaled_time)
-        utc = time.instance_variable_get('@marshal_with_utc_coercion')
-        utc ? time.utc : time
+        time.instance_eval do
+          if defined?(@marshal_with_utc_coercion)
+            val = remove_instance_variable("@marshal_with_utc_coercion")
+          end
+          val ? utc : self
+        end
       end
     end
-    
+
     alias_method :_original_dump, :_dump
     def _dump(*args)
-      obj = self.frozen? ? self.dup : self
+      obj = dup
       obj.instance_variable_set('@marshal_with_utc_coercion', utc?)
       obj._original_dump(*args)
     end