From 4535191c61b496b1a5e9dc57624581753fa71497 Mon Sep 17 00:00:00 2001
From: Ryan Oblak <rroblak@gmail.com>
Date: Tue, 27 Sep 2011 22:39:31 -0700
Subject: Modified String#pluralize to take an optional count parameter.

---
 .../lib/active_support/core_ext/string/inflections.rb   | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb
index c7ceeb9de4..fd91b3cacb 100644
--- a/activesupport/lib/active_support/core_ext/string/inflections.rb
+++ b/activesupport/lib/active_support/core_ext/string/inflections.rb
@@ -9,14 +9,25 @@ require 'active_support/inflector/transliterate'
 class String
   # Returns the plural form of the word in the string.
   #
+  # If the optional parameter +count+ is specified,
+  # the singular form will be returned if <tt>count == 1</tt>.
+  # For any other value of +count+ the plural will be returned.
+  #
+  # ==== Examples
   #   "post".pluralize             # => "posts"
   #   "octopus".pluralize          # => "octopi"
   #   "sheep".pluralize            # => "sheep"
   #   "words".pluralize            # => "words"
   #   "the blue mailman".pluralize # => "the blue mailmen"
   #   "CamelOctopus".pluralize     # => "CamelOctopi"
-  def pluralize
-    ActiveSupport::Inflector.pluralize(self)
+  #   "apple".pluralize(1)         # => "apple"
+  #   "apple".pluralize(2)         # => "apples"
+  def pluralize(count = nil)
+    if count == 1
+      self
+    else
+      ActiveSupport::Inflector.pluralize(self)
+    end
   end
 
   # The reverse of +pluralize+, returns the singular form of a word in a string.
@@ -42,7 +53,7 @@ class String
   def constantize
     ActiveSupport::Inflector.constantize(self)
   end
-  
+
   # +safe_constantize+ tries to find a declared constant with the name specified
   # in the string. It returns nil when the name is not in CamelCase
   # or is not initialized.  See ActiveSupport::Inflector.safe_constantize
-- 
cgit v1.2.3


From 82d41c969897cca28bb318f7caf301d520a2fbf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 6 Oct 2011 00:34:39 +0200
Subject: Revert "don't raise NoMethodError the tried method doesn't exists"

This reverts commit 29a5aeaae976bf8432d57ec996c7c81932a39de6.
---
 activesupport/lib/active_support/core_ext/object/try.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/object/try.rb b/activesupport/lib/active_support/core_ext/object/try.rb
index 4797c93e63..e77a9da0ec 100644
--- a/activesupport/lib/active_support/core_ext/object/try.rb
+++ b/activesupport/lib/active_support/core_ext/object/try.rb
@@ -28,8 +28,6 @@ class Object
   def try(*a, &b)
     if a.empty? && block_given?
       yield self
-    elsif !a.empty? && !respond_to?(a.first)
-      nil
     else
       __send__(*a, &b)
     end
-- 
cgit v1.2.3


From 598fc578fbd38907288e14053bfc6eb8d4da1e3b Mon Sep 17 00:00:00 2001
From: Jose and Yehuda <wycats@gmail.com>
Date: Tue, 27 Sep 2011 17:35:11 -0400
Subject: Don't unnecessarily use String eval.

---
 activesupport/lib/active_support/core_ext/object/to_json.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/object/to_json.rb b/activesupport/lib/active_support/core_ext/object/to_json.rb
index 14ef27340e..e7dc60a612 100644
--- a/activesupport/lib/active_support/core_ext/object/to_json.rb
+++ b/activesupport/lib/active_support/core_ext/object/to_json.rb
@@ -10,10 +10,10 @@ end
 # several cases (for instance, the JSON implementation for Hash does not work) with inheritance
 # and consequently classes as ActiveSupport::OrderedHash cannot be serialized to json.
 [Object, Array, FalseClass, Float, Hash, Integer, NilClass, String, TrueClass].each do |klass|
-  klass.class_eval <<-RUBY, __FILE__, __LINE__
+  klass.class_eval do
     # Dumps object in JSON (JavaScript Object Notation). See www.json.org for more info.
     def to_json(options = nil)
       ActiveSupport::JSON.encode(self, options)
     end
-  RUBY
+  end
 end
-- 
cgit v1.2.3


From afde6fdd5ef3e6b0693a7e330777e85ef4cffddb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 19 Oct 2011 12:59:33 -0500
Subject: Added X-Request-Id tracking and TaggedLogging to easily log that and
 other production concerns

---
 activesupport/lib/active_support/tagged_logging.rb | 68 ++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 activesupport/lib/active_support/tagged_logging.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
new file mode 100644
index 0000000000..0d8504bc1f
--- /dev/null
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -0,0 +1,68 @@
+module ActiveSupport
+  # Wraps any standard Logger class to provide tagging capabilities. Examples:
+  #
+  #   Logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
+  #   Logger.tagged("BCX") { Logger.info "Stuff" }                            # Logs "[BCX] Stuff"
+  #   Logger.tagged("BCX", "Jason") { Logger.info "Stuff" }                   # Logs "[BCX] [Jason] Stuff"
+  #   Logger.tagged("BCX") { Logger.tagged("Jason") { Logger.info "Stuff" } } # Logs "[BCX] [Jason] Stuff"
+  #
+  # This is used by the default Rails.logger as configured by Railties to make it easy to stamp log lines
+  # with subdomains, request ids, and anything else to aid debugging of multi-user production applications.
+  class TaggedLogging
+    def initialize(logger)
+      @logger = logger
+      @tags   = []
+    end
+
+    def tagged(*tags)
+      new_tags = Array.wrap(tags).flatten
+      @tags += new_tags
+      yield
+    ensure
+      new_tags.size.times { @tags.pop }
+    end
+
+
+    def add(severity, message = nil, progname = nil, &block)
+      @logger.add(severity, "#{tags}#{message}", progname, &block)
+    end
+
+
+    def fatal(progname = nil, &block)
+      add(@logger.class::FATAL, progname, &block)
+    end
+
+    def error(progname = nil, &block)
+      add(@logger.class::ERROR, progname, &block)
+    end
+
+    def warn(progname = nil, &block)
+      add(@logger.class::WARN, progname, &block)
+    end
+
+    def info(progname = nil, &block)
+      add(@logger.class::INFO, progname, &block)
+    end
+
+    def debug(progname = nil, &block)
+      add(@logger.class::DEBUG, progname, &block)
+    end
+
+    def unknown(progname = nil, &block)
+      add(@logger.class::UNKNOWN, progname, &block)
+    end
+
+
+    def method_missing(method, *args)
+      @logger.send(method, *args)
+    end
+    
+
+    private
+      def tags
+        if @tags.any?
+          @tags.collect { |tag| "[#{tag}]" }.join(" ") + " "
+        end
+      end
+  end
+end
-- 
cgit v1.2.3


From 18dbfcb36369ebb800a22325f689ff4cf27ef467 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 19 Oct 2011 14:53:34 -0500
Subject: Programatically define the log level methods and use the Logger
 constants instead (SyslogLogger didnt define them as I expected)

---
 activesupport/lib/active_support/tagged_logging.rb | 31 ++++++----------------
 1 file changed, 8 insertions(+), 23 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index 0d8504bc1f..0cabb528ef 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -1,3 +1,5 @@
+require 'logger'
+
 module ActiveSupport
   # Wraps any standard Logger class to provide tagging capabilities. Examples:
   #
@@ -27,29 +29,12 @@ module ActiveSupport
       @logger.add(severity, "#{tags}#{message}", progname, &block)
     end
 
-
-    def fatal(progname = nil, &block)
-      add(@logger.class::FATAL, progname, &block)
-    end
-
-    def error(progname = nil, &block)
-      add(@logger.class::ERROR, progname, &block)
-    end
-
-    def warn(progname = nil, &block)
-      add(@logger.class::WARN, progname, &block)
-    end
-
-    def info(progname = nil, &block)
-      add(@logger.class::INFO, progname, &block)
-    end
-
-    def debug(progname = nil, &block)
-      add(@logger.class::DEBUG, progname, &block)
-    end
-
-    def unknown(progname = nil, &block)
-      add(@logger.class::UNKNOWN, progname, &block)
+    %w( fatal error warn info debug unkown ).each do |severity|
+      eval <<-EOM, nil, __FILE__, __LINE__ + 1
+        def #{severity}(progname = nil, &block)
+          add(Logger::#{severity.upcase}, progname, &block)
+        end
+      EOM
     end
 
 
-- 
cgit v1.2.3


From 6c126015a676c376f1646713fbb739049a783238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 19 Oct 2011 22:26:56 +0200
Subject: Ensure TaggegLogging is thread safe.

---
 activesupport/lib/active_support/tagged_logging.rb | 35 ++++++++++++++--------
 1 file changed, 22 insertions(+), 13 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index 0cabb528ef..aff416a9eb 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -13,20 +13,20 @@ module ActiveSupport
   class TaggedLogging
     def initialize(logger)
       @logger = logger
-      @tags   = []
+      @tags   = Hash.new { |h,k| h[k] = [] }
     end
 
-    def tagged(*tags)
-      new_tags = Array.wrap(tags).flatten
-      @tags += new_tags
+    def tagged(*new_tags)
+      tags     = current_tags
+      new_tags = Array.wrap(new_tags).flatten
+      tags.concat new_tags
       yield
     ensure
-      new_tags.size.times { @tags.pop }
+      new_tags.size.times { tags.pop }
     end
 
-
     def add(severity, message = nil, progname = nil, &block)
-      @logger.add(severity, "#{tags}#{message}", progname, &block)
+      @logger.add(severity, "#{tags_text}#{message}", progname, &block)
     end
 
     %w( fatal error warn info debug unkown ).each do |severity|
@@ -37,17 +37,26 @@ module ActiveSupport
       EOM
     end
 
+    def flush(*args)
+      @tags.delete(Thread.current)
+      @logger.flush(*args) if @logger.respond_to?(:flush)
+    end
 
     def method_missing(method, *args)
       @logger.send(method, *args)
     end
-    
 
-    private
-      def tags
-        if @tags.any?
-          @tags.collect { |tag| "[#{tag}]" }.join(" ") + " "
-        end
+    protected
+
+    def tags_text
+      tags = current_tags
+      if tags.any?
+        tags.collect { |tag| "[#{tag}]" }.join(" ") + " "
       end
+    end
+
+    def current_tags
+      @tags[Thread.current]
+    end
   end
 end
-- 
cgit v1.2.3


From 274c3fad5087306a64ca91d044756221f5ff862c Mon Sep 17 00:00:00 2001
From: Martin Svalin <martin@lite.nu>
Date: Thu, 20 Oct 2011 16:31:10 +0200
Subject: Fixed misleading docs for String#to_formatted_s(:db)

---
 activesupport/lib/active_support/core_ext/array/conversions.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
index 3b22e8b4f9..f3d06ecb2f 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -39,10 +39,10 @@ class Array
   #
   #   Blog.all.to_formatted_s # => "First PostSecond PostThird Post"
   #
-  # Adding in the <tt>:db</tt> argument as the format yields a prettier
-  # output:
+  # Adding in the <tt>:db</tt> argument as the format yields a comma separated
+  # id list:
   #
-  #   Blog.all.to_formatted_s(:db) # => "First Post,Second Post,Third Post"
+  #   Blog.all.to_formatted_s(:db) # => "1,2,3"
   def to_formatted_s(format = :default)
     case format
       when :db
-- 
cgit v1.2.3


From c495cbcda94bec7a49a88631fc575cc04bde8e88 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Fri, 21 Oct 2011 15:12:00 +0530
Subject: Checking blank if tag might coming nil or blank

In log it should not show the empty array.
---
 activesupport/lib/active_support/tagged_logging.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index aff416a9eb..a59fc26d5d 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/blank'
 require 'logger'
 
 module ActiveSupport
@@ -18,7 +19,7 @@ module ActiveSupport
 
     def tagged(*new_tags)
       tags     = current_tags
-      new_tags = Array.wrap(new_tags).flatten
+      new_tags = Array.wrap(new_tags).flatten.reject(&:blank?)
       tags.concat new_tags
       yield
     ensure
-- 
cgit v1.2.3


From d565fda5f27abf0097adf7b3e232a52f7ae5c1e9 Mon Sep 17 00:00:00 2001
From: Brian Durand <brian@embellishedvisions.com>
Date: Fri, 21 Oct 2011 12:43:52 -0500
Subject: Fix threading issues with BufferedLogger.

---
 .../lib/active_support/buffered_logger.rb          | 44 ++++++++++++++++++----
 1 file changed, 36 insertions(+), 8 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
index 26412cd7f4..136e245859 100644
--- a/activesupport/lib/active_support/buffered_logger.rb
+++ b/activesupport/lib/active_support/buffered_logger.rb
@@ -25,22 +25,28 @@ module ActiveSupport
     # Silences the logger for the duration of the block.
     def silence(temporary_level = ERROR)
       if silencer
+        old_logger_level = @tmp_levels[Thread.current]
         begin
-          old_logger_level, self.level = level, temporary_level
+          @tmp_levels[Thread.current] = temporary_level
           yield self
         ensure
-          self.level = old_logger_level
+          if old_logger_level
+            @tmp_levels[Thread.current] = old_logger_level
+          else
+            @tmp_levels.delete(Thread.current)
+          end
         end
       else
         yield self
       end
     end
 
-    attr_accessor :level
+    attr_writer :level
     attr_reader :auto_flushing
 
     def initialize(log, level = DEBUG)
       @level         = level
+      @tmp_levels    = {}
       @buffer        = Hash.new { |h,k| h[k] = [] }
       @auto_flushing = 1
       @guard = Mutex.new
@@ -62,8 +68,12 @@ module ActiveSupport
       end
     end
 
+    def level
+      @tmp_levels[Thread.current] || @level
+    end
+
     def add(severity, message = nil, progname = nil, &block)
-      return if @level > severity
+      return if level > severity
       message = (message || (block && block.call) || progname).to_s
       # If a newline is necessary then create a new message ending with a newline.
       # Ensures that the original message is not mutated.
@@ -84,7 +94,7 @@ module ActiveSupport
         end                                                             # end
 
         def #{severity.downcase}?                                       # def debug?
-          #{severity} >= @level                                         #   DEBUG >= @level
+          #{severity} >= level                                         #   DEBUG >= @level
         end                                                             # end
       EOT
     end
@@ -105,13 +115,15 @@ module ActiveSupport
 
     def flush
       @guard.synchronize do
-        buffer.each do |content|
-          @log.write(content)
-        end
+        write_buffer(buffer)
 
         # Important to do this even if buffer was empty or else @buffer will
         # accumulate empty arrays for each request where nothing was logged.
         clear_buffer
+
+        # Clear buffers associated with dead threads or else spawned threads
+        # that don't call flush will result in a memory leak.
+        flush_dead_buffers
       end
     end
 
@@ -133,5 +145,21 @@ module ActiveSupport
       def clear_buffer
         @buffer.delete(Thread.current)
       end
+
+      # Find buffers created by threads that are no longer alive and flush them to the log
+      # in order to prevent memory leaks from spawned threads.
+      def flush_dead_buffers #:nodoc:
+        @buffer.keys.reject{|thread| thread.alive?}.each do |thread|
+          buffer = @buffer[thread]
+          write_buffer(buffer)
+          @buffer.delete(thread)
+        end
+      end
+
+      def write_buffer(buffer)
+        buffer.each do |content|
+          @log.write(content)
+        end
+      end
   end
 end
-- 
cgit v1.2.3


From ec93f363cab7270c1469b420a52a21e306a89c30 Mon Sep 17 00:00:00 2001
From: Brian Durand <brian@embellishedvisions.com>
Date: Fri, 21 Oct 2011 13:28:24 -0500
Subject: Fix ActiveSupport::Cache::FileStore.cleanup to actually work.

---
 .../lib/active_support/cache/file_store.rb          | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index b431041b76..bc5d94b5a7 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -26,11 +26,26 @@ module ActiveSupport
         FileUtils.rm_r(root_dirs.collect{|f| File.join(cache_path, f)})
       end
 
+      # Cleanup the cache by removing old entries. By default this will delete entries
+      # that haven't been accessed in one day. You can change this behavior by passing
+      # in a +not_accessed_in+ option. Any entry not accessed in that number of seconds
+      # in the past will be deleted. Alternatively, you can pass in +:expired_only+ with
+      # +true+ to only delete expired entries.
       def cleanup(options = nil)
         options = merged_options(options)
-        each_key(options) do |key|
-          entry = read_entry(key, options)
-          delete_entry(key, options) if entry && entry.expired?
+        expired_only = options[:expired_only]
+        timestamp = Time.now - (options[:not_accessed_in] || 1.day.to_i)
+        search_dir(cache_path) do |fname|
+          if expired_only
+            key = file_path_key(fname)
+            entry = read_entry(key, options)
+            delete_entry(key, options) if entry && entry.expired?
+          else
+            if File.atime(fname) <= timestamp
+              key = file_path_key(fname)
+              delete_entry(key, options)
+            end
+          end
         end
       end
 
-- 
cgit v1.2.3


From 771ca79f74db1e5a19703ad92472515dbebb70c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 25 Oct 2011 22:22:43 +0200
Subject: Revert "Merge pull request #3395 from bdurand/fix_file_store_cleanup"

Tests were failing on Travis-CI.

This reverts commit 79d01a8f16e20c556a086a2f07e3ccb4400f9819, reversing
changes made to b838570bd69ff13d677fb43e79f10d6f3168c696.
---
 .../lib/active_support/cache/file_store.rb          | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index bc5d94b5a7..b431041b76 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -26,26 +26,11 @@ module ActiveSupport
         FileUtils.rm_r(root_dirs.collect{|f| File.join(cache_path, f)})
       end
 
-      # Cleanup the cache by removing old entries. By default this will delete entries
-      # that haven't been accessed in one day. You can change this behavior by passing
-      # in a +not_accessed_in+ option. Any entry not accessed in that number of seconds
-      # in the past will be deleted. Alternatively, you can pass in +:expired_only+ with
-      # +true+ to only delete expired entries.
       def cleanup(options = nil)
         options = merged_options(options)
-        expired_only = options[:expired_only]
-        timestamp = Time.now - (options[:not_accessed_in] || 1.day.to_i)
-        search_dir(cache_path) do |fname|
-          if expired_only
-            key = file_path_key(fname)
-            entry = read_entry(key, options)
-            delete_entry(key, options) if entry && entry.expired?
-          else
-            if File.atime(fname) <= timestamp
-              key = file_path_key(fname)
-              delete_entry(key, options)
-            end
-          end
+        each_key(options) do |key|
+          entry = read_entry(key, options)
+          delete_entry(key, options) if entry && entry.expired?
         end
       end
 
-- 
cgit v1.2.3


From 0fc531392d1f606054a6d6e394304c72a846d4c8 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 29 Oct 2011 01:07:54 -0700
Subject: let demodulize do less work, and add tests

This is also faster on 1.9.
---
 activesupport/lib/active_support/inflector/methods.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index 934529d496..454637191e 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -166,7 +166,9 @@ module ActiveSupport
     #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize # => "Inflections"
     #   "Inflections".demodulize                                       # => "Inflections"
     def demodulize(class_name_in_module)
-      class_name_in_module.to_s.gsub(/^.*::/, '')
+      # If you remove the module part of an empty string, you get an empty string.
+      # That's why the regexp uses the * quantifier.
+      class_name_in_module.to_s[/[^:]*\z/]
     end
 
     # Creates a foreign key name from a class name.
-- 
cgit v1.2.3


From 596d625c9b7f3a95cb8460d495b328d322d5bee6 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Sun, 30 Oct 2011 01:32:02 +0900
Subject: removed reference to SynchronizedMemoryStore and
 CompressedMemCacheStore (the remaining code from 9cafc28874)

---
 activesupport/lib/active_support/cache.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 95d936b32f..8cb74b2a86 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -16,8 +16,6 @@ module ActiveSupport
     autoload :FileStore, 'active_support/cache/file_store'
     autoload :MemoryStore, 'active_support/cache/memory_store'
     autoload :MemCacheStore, 'active_support/cache/mem_cache_store'
-    autoload :SynchronizedMemoryStore, 'active_support/cache/synchronized_memory_store'
-    autoload :CompressedMemCacheStore, 'active_support/cache/compressed_mem_cache_store'
 
     # These options mean something to all cache implementations. Individual cache
     # implementations may support additional options.
-- 
cgit v1.2.3


From 7b65d12db5951682666a41fe864b53ad5ec510ac Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Sun, 30 Oct 2011 01:55:09 +0900
Subject: fix a document for race_condition_ttl.
 ActiveSupport::Cache::MemoryCache isn't exist

---
 activesupport/lib/active_support/cache.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 95d936b32f..b9cdd9c6b3 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -232,7 +232,7 @@ module ActiveSupport
       # <tt>:race_condition_ttl</tt> does not play any role.
       #
       #   # Set all values to expire after one minute.
-      #   cache = ActiveSupport::Cache::MemoryCache.new(:expires_in => 1.minute)
+      #   cache = ActiveSupport::Cache::MemoryStore.new(:expires_in => 1.minute)
       #
       #   cache.write("foo", "original value")
       #   val_1 = nil
-- 
cgit v1.2.3


From 3b546afd049221fd4aa407d6b99f1c4de312c704 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Sun, 30 Oct 2011 03:14:35 +0900
Subject: avoided to call  twice

---
 activesupport/lib/active_support/cache.rb | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 8cb74b2a86..df3602f860 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -559,7 +559,7 @@ module ActiveSupport
           @value = nil
         else
           @value = Marshal.dump(value)
-          if should_compress?(value, options)
+          if should_compress?(@value, options)
             @value = Zlib::Deflate.deflate(@value)
             @compressed = true
           end
@@ -613,13 +613,10 @@ module ActiveSupport
       end
 
       private
-        def should_compress?(value, options)
-          if options[:compress] && value
-            unless value.is_a?(Numeric)
-              compress_threshold = options[:compress_threshold] || DEFAULT_COMPRESS_LIMIT
-              serialized_value = value.is_a?(String) ? value : Marshal.dump(value)
-              return true if serialized_value.size >= compress_threshold
-            end
+        def should_compress?(serialized_value, options)
+          if options[:compress]
+            compress_threshold = options[:compress_threshold] || DEFAULT_COMPRESS_LIMIT
+            return true if serialized_value.size >= compress_threshold
           end
           false
         end
-- 
cgit v1.2.3


From 11f6795b238172c4a13176062bd38b83285799b7 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 29 Oct 2011 18:03:35 -0700
Subject: defines Module#qualified_const_(defined?|get|set) and
 String#deconstantize

This commit also implements a faster version of #demodulize I was unable
to isolate with git add --patch.

Not a big fan of the name #deconstantize. It complements #demodulize
getting rid of the rightmost constant, hence the name, but it is
unrelated to the well-known #constantize. So unsure. Could not come
with anything better, please feel free to rename.
---
 .../lib/active_support/core_ext/module.rb          |  3 +-
 .../core_ext/module/qualified_const.rb             | 64 ++++++++++++++++++++++
 .../active_support/core_ext/string/inflections.rb  | 15 +++++
 activesupport/lib/active_support/dependencies.rb   | 14 +++--
 .../lib/active_support/inflector/methods.rb        | 29 ++++++++--
 5 files changed, 112 insertions(+), 13 deletions(-)
 create mode 100644 activesupport/lib/active_support/core_ext/module/qualified_const.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/module.rb b/activesupport/lib/active_support/core_ext/module.rb
index 9fed346b7c..f399fce410 100644
--- a/activesupport/lib/active_support/core_ext/module.rb
+++ b/activesupport/lib/active_support/core_ext/module.rb
@@ -8,4 +8,5 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/synchronization'
 require 'active_support/core_ext/module/deprecation'
 require 'active_support/core_ext/module/remove_method'
-require 'active_support/core_ext/module/method_names'
\ No newline at end of file
+require 'active_support/core_ext/module/method_names'
+require 'active_support/core_ext/module/qualified_const'
\ No newline at end of file
diff --git a/activesupport/lib/active_support/core_ext/module/qualified_const.rb b/activesupport/lib/active_support/core_ext/module/qualified_const.rb
new file mode 100644
index 0000000000..d1a0ee2f83
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/module/qualified_const.rb
@@ -0,0 +1,64 @@
+require 'active_support/core_ext/string/inflections'
+
+#--
+# Allows code reuse in the methods below without polluting Module.
+#++
+module QualifiedConstUtils
+  def self.raise_if_absolute(path)
+    raise NameError, "wrong constant name #$&" if path =~ /\A::[^:]+/
+  end
+
+  def self.names(path)
+    path.split('::')
+  end
+end
+
+##
+# Extends the API for constants to be able to deal with qualified names. Arguments
+# are assumed to be relative to the receiver.
+#
+#--
+# Qualified names are required to be relative because we are extending existing
+# methods that expect constant names, ie, relative paths of length 1. For example,
+# Object.const_get("::String") raises NameError and so does qualified_const_get.
+#++
+class Module
+  if method(:const_defined?).arity == 1
+    def qualified_const_defined?(path)
+      QualifiedConstUtils.raise_if_absolute(path)
+
+      QualifiedConstUtils.names(path).inject(self) do |mod, name|
+        return unless mod.const_defined?(name)
+        mod.const_get(name)
+      end
+      return true
+    end
+  else
+    def qualified_const_defined?(path, search_parents=true)
+      QualifiedConstUtils.raise_if_absolute(path)
+
+      QualifiedConstUtils.names(path).inject(self) do |mod, name|
+        return unless mod.const_defined?(name, search_parents)
+        mod.const_get(name)
+      end
+      return true
+    end
+  end
+
+  def qualified_const_get(path)
+    QualifiedConstUtils.raise_if_absolute(path)
+
+    QualifiedConstUtils.names(path).inject(self) do |mod, name|
+      mod.const_get(name)
+    end
+  end
+
+  def qualified_const_set(path, value)
+    QualifiedConstUtils.raise_if_absolute(path)
+
+    const_name = path.demodulize
+    mod_name = path.deconstantize
+    mod = mod_name.empty? ? self : qualified_const_get(mod_name)
+    mod.const_set(const_name, value)
+  end
+end
diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb
index fd91b3cacb..9356940650 100644
--- a/activesupport/lib/active_support/core_ext/string/inflections.rb
+++ b/activesupport/lib/active_support/core_ext/string/inflections.rb
@@ -117,10 +117,25 @@ class String
   #
   #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize # => "Inflections"
   #   "Inflections".demodulize                                       # => "Inflections"
+  #
+  # See also +deconstatize+.
   def demodulize
     ActiveSupport::Inflector.demodulize(self)
   end
 
+  # Removes the rightmost segment from the constant expression in the string.
+  #
+  #   "Net::HTTP".deconstantize   # => "Net"
+  #   "::Net::HTTP".deconstantize # => "::Net"
+  #   "String".deconstantize      # => ""
+  #   "::String".deconstantize    # => ""
+  #   "".deconstantize            # => ""
+  #
+  # See also +demodulize+.
+  def deconstantize
+    ActiveSupport::Inflector.deconstantize(self)
+  end
+
   # Replaces special characters in a string so that it may be used as part of a 'pretty' URL.
   #
   # ==== Examples
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index c072a8e646..b3ac271778 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -5,6 +5,7 @@ require 'active_support/core_ext/module/aliasing'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/module/introspection'
 require 'active_support/core_ext/module/anonymous'
+require 'active_support/core_ext/module/qualified_const'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/load_error'
 require 'active_support/core_ext/name_error'
@@ -357,12 +358,13 @@ module ActiveSupport #:nodoc:
     end
 
     # Is the provided constant path defined?
-    def qualified_const_defined?(path)
-      names = path.sub(/^::/, '').to_s.split('::')
-
-      names.inject(Object) do |mod, name|
-        return false unless local_const_defined?(mod, name)
-        mod.const_get name
+    if Module.method(:const_defined?).arity == 1
+      def qualified_const_defined?(path)
+        Object.qualified_const_defined?(path.sub(/^::/, ''))
+      end
+    else
+      def qualified_const_defined?(path)
+        Object.qualified_const_defined?(path.sub(/^::/, ''), false)
       end
     end
 
diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index 454637191e..e76ee60dd7 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -160,15 +160,32 @@ module ActiveSupport
       underscored_word.gsub(/_/, '-')
     end
 
-    # Removes the module part from the expression in the string.
+    # Removes the module part from the expression in the string:
     #
-    # Examples:
     #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize # => "Inflections"
     #   "Inflections".demodulize                                       # => "Inflections"
-    def demodulize(class_name_in_module)
-      # If you remove the module part of an empty string, you get an empty string.
-      # That's why the regexp uses the * quantifier.
-      class_name_in_module.to_s[/[^:]*\z/]
+    #
+    # See also +deconstantize+.
+    def demodulize(path)
+      path = path.to_s
+      if i = path.rindex('::')
+        path[(i+2)..-1]
+      else
+        path
+      end
+    end
+
+    # Removes the rightmost segment from the constant expression in the string:
+    #
+    #   "Net::HTTP".deconstantize   # => "Net"
+    #   "::Net::HTTP".deconstantize # => "::Net"
+    #   "String".deconstantize      # => ""
+    #   "::String".deconstantize    # => ""
+    #   "".deconstantize            # => ""
+    #
+    # See also +demodulize+.
+    def deconstantize(path)
+      path.to_s[0...(path.rindex('::') || 0)] # implementation based on the one in facets' Module#spacename
     end
 
     # Creates a foreign key name from a class name.
-- 
cgit v1.2.3


From 9d1ba3755e9af6196240fc18472e2cc4fcbb4911 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 30 Oct 2011 02:08:59 -0700
Subject: fixes a typo (thanks to Alexey Vakhov)

---
 activesupport/lib/active_support/core_ext/string/inflections.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb
index 9356940650..1e57b586d9 100644
--- a/activesupport/lib/active_support/core_ext/string/inflections.rb
+++ b/activesupport/lib/active_support/core_ext/string/inflections.rb
@@ -118,7 +118,7 @@ class String
   #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize # => "Inflections"
   #   "Inflections".demodulize                                       # => "Inflections"
   #
-  # See also +deconstatize+.
+  # See also +deconstantize+.
   def demodulize
     ActiveSupport::Inflector.demodulize(self)
   end
-- 
cgit v1.2.3


From 38da6249f0449204e0806f3142c0342ad2565344 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Sun, 30 Oct 2011 19:18:23 +0900
Subject: fix a document for :compress_threshold. DEFAULT_COMPRESS_LIMIT is
 16K.

---
 activesupport/lib/active_support/cache.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 8b45efaf2a..6535cc1eb5 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -139,7 +139,7 @@ module ActiveSupport
     # large enough to warrant compression. To turn on compression either pass
     # <tt>:compress => true</tt> in the initializer or as an option to +fetch+
     # or +write+. To specify the threshold at which to compress values, set the
-    # <tt>:compress_threshold</tt> option. The default threshold is 32K.
+    # <tt>:compress_threshold</tt> option. The default threshold is 16K.
     class Store
 
       cattr_accessor :logger, :instance_writer => true
-- 
cgit v1.2.3


From 7670a5187d2000a577c9aa982158808550033dfd Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Sun, 30 Oct 2011 21:50:17 +0900
Subject: Refactor ActiveSupport::Cache::FileStore. used  method and deleted
 duplicate code.

---
 activesupport/lib/active_support/cache/file_store.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index b431041b76..85e7e21624 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -14,6 +14,7 @@ module ActiveSupport
 
       DIR_FORMATTER = "%03X"
       FILENAME_MAX_SIZE = 230 # max filename size on file system is 255, minus room for timestamp and random characters appended by Tempfile (used by atomic write)
+      EXCLUDED_DIRS = ['.', '..'].freeze
 
       def initialize(cache_path, options = nil)
         super(options)
@@ -22,7 +23,7 @@ module ActiveSupport
       end
 
       def clear(options = nil)
-        root_dirs = Dir.entries(cache_path).reject{|f| f.in?(['.', '..'])}
+        root_dirs = Dir.entries(cache_path).reject{|f| f.in?(EXCLUDED_DIRS)}
         FileUtils.rm_r(root_dirs.collect{|f| File.join(cache_path, f)})
       end
 
@@ -149,7 +150,7 @@ module ActiveSupport
         # Delete empty directories in the cache.
         def delete_empty_directories(dir)
           return if dir == cache_path
-          if Dir.entries(dir).reject{|f| f.in?(['.', '..'])}.empty?
+          if Dir.entries(dir).reject{|f| f.in?(EXCLUDED_DIRS)}.empty?
             File.delete(dir) rescue nil
             delete_empty_directories(File.dirname(dir))
           end
@@ -163,7 +164,7 @@ module ActiveSupport
         def search_dir(dir, &callback)
           return if !File.exist?(dir)
           Dir.foreach(dir) do |d|
-            next if d == "." || d == ".."
+            next if d.in?(EXCLUDED_DIRS)
             name = File.join(dir, d)
             if File.directory?(name)
               search_dir(name, &callback)
-- 
cgit v1.2.3


From b33232f1b2c3f92c7116adc4b4879a8afc07e70c Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 5 Nov 2011 10:29:28 -0700
Subject: expands the documentation of AS::Notifications

---
 activesupport/lib/active_support/notifications.rb | 60 +++++++++++++++++------
 1 file changed, 46 insertions(+), 14 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index b5a70d5933..89afe7b982 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -1,36 +1,68 @@
 module ActiveSupport
-  # Notifications provides an instrumentation API for Ruby. To instrument an
-  # action in Ruby you just need to do:
+  # = Notifications
   #
-  #   ActiveSupport::Notifications.instrument(:render, :extra => :information) do
+  # +ActiveSupport::Notifications+ provides an instrumentation API for Ruby.
+  #
+  # == Instrumenters
+  #
+  # To instrument an event you just need to do:
+  #
+  #   ActiveSupport::Notifications.instrument("render", :extra => :information) do
   #     render :text => "Foo"
   #   end
   #
+  # That executes the block first and notifies all subscribers once done.
+  #
+  # In the example above "render" is the name of the event, and the rest is called
+  # the _payload_. The payload is a mechanism that allows instrumenters to pass
+  # extra information to subscribers. Payloads consist of a hash whose contents
+  # are arbitrary and generally depend on the event.
+  #
+  # == Subscribers
+  #
   # You can consume those events and the information they provide by registering
-  # a log subscriber. For instance, let's store all instrumented events in an array:
+  # a subscriber. For instance, let's store all "render" events in an array:
   #
-  #   @events = []
+  #   events = []
   #
-  #   ActiveSupport::Notifications.subscribe do |*args|
-  #     @events << ActiveSupport::Notifications::Event.new(*args)
+  #   ActiveSupport::Notifications.subscribe("render") do |*args|
+  #     events << ActiveSupport::Notifications::Event.new(*args)
   #   end
   #
-  #   ActiveSupport::Notifications.instrument(:render, :extra => :information) do
+  # That code returns right away, you are just subscribing to "render" events.
+  # The block will be called asynchronously whenever someone instruments "render":
+  #
+  #   ActiveSupport::Notifications.instrument("render", :extra => :information) do
   #     render :text => "Foo"
   #   end
   #
-  #   event = @events.first
-  #   event.name      # => :render
+  #   event = events.first
+  #   event.name      # => "render"
   #   event.duration  # => 10 (in milliseconds)
   #   event.payload   # => { :extra => :information }
   #
-  # When subscribing to Notifications, you can pass a pattern, to only consume
-  # events that match the pattern:
+  # The block in the +subscribe+ call gets the name of the event, start
+  # timestamp, end timestamp, a string with a unique identifier for that event
+  # (something like "535801666f04d0298cd6"), and a hash with the payload, in
+  # that order.
+  #
+  # If an exception happens during that particular instrumentation the payload will
+  # have a key +:exception+ with an array of two elements as value: a string with
+  # the name of the exception class, and the exception message.
+  #
+  # As the previous example depicts, the class +ActiveSupport::Notifications::Event+
+  # is able to take the arguments as they come and provide an object-oriented
+  # interface to that data.
   #
-  #   ActiveSupport::Notifications.subscribe(/render/) do |event|
-  #     @render_events << event
+  # You can also subscribe to all events whose name matches a certain regexp:
+  #
+  #   ActiveSupport::Notifications.subscribe(/render/) do |*args|
+  #     ...
   #   end
   #
+  # and even pass no argument to +subscribe+, in which case you are subscribing
+  # to all events.
+  #
   # Notifications ships with a queue implementation that consumes and publish events
   # to log subscribers in a thread. You can use any queue implementation you want.
   #
-- 
cgit v1.2.3


From d287e90870a9832c9d7e9d222881d3a6102bd04d Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 5 Nov 2011 12:02:54 -0700
Subject: implements AS::Notifications.subscribed, which provides subscriptions
 to events while a block runs

---
 activesupport/lib/active_support/notifications.rb | 41 +++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index 89afe7b982..719f074948 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -63,6 +63,40 @@ module ActiveSupport
   # and even pass no argument to +subscribe+, in which case you are subscribing
   # to all events.
   #
+  # == Temporary Subscriptions
+  #
+  # Sometimes you do not want to subscribe to an event for the entire life of
+  # the application. There are two ways two unsubscribe.
+  #
+  # === Subscribe While a Block Runs
+  #
+  # You can subscribe to some event temporarily while some block runs. For
+  # example, in
+  #
+  #   callback = lambda {|*args| ... }
+  #   ActiveSupport::Notifications.subscribed(callback, "sql.active_record") do
+  #     ...
+  #   end
+  #
+  # the callback will be called for all "sql.active_record" events instrumented
+  # during the execution of the block. The callback is unsubscribed automatically
+  # after that.
+  #
+  # === Manual Unsubscription
+  #
+  # The +subscribe+ method returns a subscriber object:
+  #
+  #   subscriber = ActiveSupport::Notifications.subscribe("render") do |*args|
+  #     ...
+  #   end
+  #
+  # To prevent that block from being called anymore, just unsubscribe passing
+  # that reference:
+  #
+  #   ActiveSupport::Notifications.unsubscribe(subscriber)
+  #
+  # == Default Queue
+  #
   # Notifications ships with a queue implementation that consumes and publish events
   # to log subscribers in a thread. You can use any queue implementation you want.
   #
@@ -94,6 +128,13 @@ module ActiveSupport
         end
       end
 
+      def subscribed(callback, *args, &block)
+        subscriber = subscribe(*args, &callback)
+        yield
+      ensure
+        unsubscribe(subscriber)
+      end
+
       def unsubscribe(args)
         notifier.unsubscribe(args)
         @instrumenters.clear
-- 
cgit v1.2.3


From 56f16e25e97fc23df9289abb2e1feb499e09d033 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 5 Nov 2011 12:09:18 -0700
Subject: fixes typo

---
 activesupport/lib/active_support/notifications.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index 719f074948..f549d2fff3 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -66,7 +66,7 @@ module ActiveSupport
   # == Temporary Subscriptions
   #
   # Sometimes you do not want to subscribe to an event for the entire life of
-  # the application. There are two ways two unsubscribe.
+  # the application. There are two ways to unsubscribe.
   #
   # === Subscribe While a Block Runs
   #
-- 
cgit v1.2.3


From 52fa34faee76ca54b1b394ea3a25dfee42491c22 Mon Sep 17 00:00:00 2001
From: Henrik Hodne <dvyjones@dvyjones.com>
Date: Sun, 6 Nov 2011 11:13:51 +0100
Subject: Refactored pluralize and singularize into a common method.

See diff discussion on rails/#3536.
---
 .../lib/active_support/inflector/methods.rb        | 34 ++++++++++++----------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index e76ee60dd7..9eba02b6f0 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -21,14 +21,7 @@ module ActiveSupport
     #   "words".pluralize            # => "words"
     #   "CamelOctopus".pluralize     # => "CamelOctopi"
     def pluralize(word)
-      result = word.to_s.dup
-
-      if word.empty? || inflections.uncountables.include?(result.downcase)
-        result
-      else
-        inflections.plurals.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
-        result
-      end
+      apply_inflections(word, inflections.plurals)
     end
 
     # The reverse of +pluralize+, returns the singular form of a word in a string.
@@ -40,14 +33,7 @@ module ActiveSupport
     #   "word".singularize             # => "word"
     #   "CamelOctopi".singularize      # => "CamelOctopus"
     def singularize(word)
-      result = word.to_s.dup
-
-      if inflections.uncountables.any? { |inflection| result =~ /\b(#{inflection})\Z/i }
-        result
-      else
-        inflections.singulars.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
-        result
-      end
+      apply_inflections(word, inflections.singulars)
     end
 
     # By default, +camelize+ converts strings to UpperCamelCase. If the argument to +camelize+
@@ -311,5 +297,21 @@ module ActiveSupport
         part.empty? ? acc : "#{part}(::#{acc})?"
       end
     end
+
+    # Applies inflection rules for +singluralize+ and +pluralize+.
+    #
+    # Examples:
+    #  apply_inflections("post", inflections.plurals) # => "posts"
+    #  apply_inflections("posts", inflections.singulars) # => "post"
+    def apply_inflections(word, rules)
+      result = word.to_s.dup
+
+      if word.empty? || inflections.uncountables.any? { |inflection| result =~ /\b#{inflection}\Z/i }
+        result
+      else
+        rules.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
+        result
+      end
+    end
   end
 end
-- 
cgit v1.2.3


From 4db1bd37cb017e983e5381ae1bec5d969b6eb253 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sun, 6 Nov 2011 22:03:06 +0530
Subject: fix typo

---
 activesupport/lib/active_support/inflector/methods.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index 9eba02b6f0..282f46a836 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -298,7 +298,7 @@ module ActiveSupport
       end
     end
 
-    # Applies inflection rules for +singluralize+ and +pluralize+.
+    # Applies inflection rules for +singuralize+ and +pluralize+.
     #
     # Examples:
     #  apply_inflections("post", inflections.plurals) # => "posts"
-- 
cgit v1.2.3


From f5ca190bd33722e6a9b3539968ae9f8ae01fb471 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Tue, 8 Nov 2011 10:37:06 +0530
Subject: fix typo again (Thanks Phillip Oertel)

---
 activesupport/lib/active_support/inflector/methods.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index 282f46a836..144cdd3c8f 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -298,7 +298,7 @@ module ActiveSupport
       end
     end
 
-    # Applies inflection rules for +singuralize+ and +pluralize+.
+    # Applies inflection rules for +singularize+ and +pluralize+.
     #
     # Examples:
     #  apply_inflections("post", inflections.plurals) # => "posts"
-- 
cgit v1.2.3


From 71e84a3b514b6a2630dfd7f658f4e7597424d6e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 9 Nov 2011 19:48:56 -0200
Subject: Deprecated ActiveSupport::MessageEncryptor#encrypt and decrypt.

---
 .../lib/active_support/message_encryptor.rb        | 49 ++++++++++++++--------
 1 file changed, 32 insertions(+), 17 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb
index e14386a85d..5ab0cc83a7 100644
--- a/activesupport/lib/active_support/message_encryptor.rb
+++ b/activesupport/lib/active_support/message_encryptor.rb
@@ -18,13 +18,39 @@ module ActiveSupport
         ActiveSupport::Deprecation.warn "The second parameter should be an options hash. Use :cipher => 'algorithm' to specify the cipher algorithm."
         options = { :cipher => options }
       end
-      
+
       @secret = secret
       @cipher = options[:cipher] || 'aes-256-cbc'
       @serializer = options[:serializer] || Marshal
     end
 
     def encrypt(value)
+      ActiveSupport::Deprecation.warn "MessageEncryptor#encrypt is deprecated as it is not safe without a signature. " \
+        "Please use MessageEncryptor#encrypt_and_sign instead."
+      _encrypt(value)
+    end
+
+    def decrypt(value)
+      ActiveSupport::Deprecation.warn "MessageEncryptor#decrypt is deprecated as it is not safe without a signature. " \
+        "Please use MessageEncryptor#decrypt_and_verify instead."
+      _decrypt(value)
+    end
+
+    # Encrypt and sign a message. We need to sign the message in order to avoid padding attacks.
+    # Reference: http://www.limited-entropy.com/padding-oracle-attacks
+    def encrypt_and_sign(value)
+      verifier.generate(_encrypt(value))
+    end
+
+    # Decrypt and verify a message. We need to verify the message in order to avoid padding attacks.
+    # Reference: http://www.limited-entropy.com/padding-oracle-attacks
+    def decrypt_and_verify(value)
+      _decrypt(verifier.verify(value))
+    end
+
+    private
+
+    def _encrypt(value)
       cipher = new_cipher
       # Rely on OpenSSL for the initialization vector
       iv = cipher.random_iv
@@ -39,7 +65,7 @@ module ActiveSupport
       [encrypted_data, iv].map {|v| ActiveSupport::Base64.encode64s(v)}.join("--")
     end
 
-    def decrypt(encrypted_message)
+    def _decrypt(encrypted_message)
       cipher = new_cipher
       encrypted_data, iv = encrypted_message.split("--").map {|v| ActiveSupport::Base64.decode64(v)}
 
@@ -55,23 +81,12 @@ module ActiveSupport
       raise InvalidMessage
     end
 
-    def encrypt_and_sign(value)
-      verifier.generate(encrypt(value))
+    def new_cipher
+      OpenSSL::Cipher::Cipher.new(@cipher)
     end
 
-    def decrypt_and_verify(value)
-      decrypt(verifier.verify(value))
+    def verifier
+      MessageVerifier.new(@secret)
     end
-
-
-
-    private
-      def new_cipher
-        OpenSSL::Cipher::Cipher.new(@cipher)
-      end
-
-      def verifier
-        MessageVerifier.new(@secret)
-      end
   end
 end
-- 
cgit v1.2.3


From a625523e755421b0f96fe5b0a885462ef51582b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 9 Nov 2011 20:11:46 -0200
Subject: Don't marshal dump twice when using encryptor.

---
 activesupport/lib/active_support/message_encryptor.rb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb
index 5ab0cc83a7..9ef2b29580 100644
--- a/activesupport/lib/active_support/message_encryptor.rb
+++ b/activesupport/lib/active_support/message_encryptor.rb
@@ -10,6 +10,16 @@ module ActiveSupport
   # This can be used in situations similar to the <tt>MessageVerifier</tt>, but where you don't
   # want users to be able to determine the value of the payload.
   class MessageEncryptor
+    module NullSerializer #:nodoc:
+      def self.load(value)
+        value
+      end
+
+      def self.dump(value)
+        value
+      end
+    end
+
     class InvalidMessage < StandardError; end
     OpenSSLCipherError = OpenSSL::Cipher.const_defined?(:CipherError) ? OpenSSL::Cipher::CipherError : OpenSSL::CipherError
 
@@ -21,6 +31,7 @@ module ActiveSupport
 
       @secret = secret
       @cipher = options[:cipher] || 'aes-256-cbc'
+      @verifier = MessageVerifier.new(@secret, :serializer => NullSerializer)
       @serializer = options[:serializer] || Marshal
     end
 
@@ -86,7 +97,7 @@ module ActiveSupport
     end
 
     def verifier
-      MessageVerifier.new(@secret)
+      @verifier
     end
   end
 end
-- 
cgit v1.2.3


From bf6e29e00759547d5d0e0bab20434a12a449eb48 Mon Sep 17 00:00:00 2001
From: Bogdan Gusiev <agresso@gmail.com>
Date: Thu, 10 Nov 2011 10:25:27 +0200
Subject: AS::Callbacks#_define_runner refactored

Incapsulate the logic of keyed callback method definition and execution
in the separated method.
---
 activesupport/lib/active_support/callbacks.rb | 45 +++++++++++++--------------
 1 file changed, 22 insertions(+), 23 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 656cba625c..73caede7d6 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -371,42 +371,41 @@ module ActiveSupport
       # Generate the internal runner method called by +run_callbacks+.
       def __define_runner(symbol) #:nodoc:
         body = send("_#{symbol}_callbacks").compile
+        runner_method = "_run_#{symbol}_callbacks" 
 
         silence_warnings do
-          undef_method "_run_#{symbol}_callbacks" if method_defined?("_run_#{symbol}_callbacks")
+          undef_method runner_method if method_defined?(runner_method)
           class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            def _run_#{symbol}_callbacks(key = nil, &blk)
+            def #{runner_method}(key = nil, &blk)
               if key
-                name = "_run__\#{self.class.name.hash.abs}__#{symbol}__\#{key.hash.abs}__callbacks"
-
-                unless respond_to?(name)
-                  self.class.__create_keyed_callback(name, :#{symbol}, self, &blk)
-                end
-
-                send(name, &blk)
+                self.class.__run_keyed_callback(key, :#{symbol}, self, &blk)
               else
                 #{body}
               end
             end
-            private :_run_#{symbol}_callbacks
+            private :#{runner_method}
           RUBY_EVAL
         end
       end
 
-      # This is called the first time a callback is called with a particular
-      # key. It creates a new callback method for the key, calculating
-      # which callbacks can be omitted because of per_key conditions.
-      #
-      def __create_keyed_callback(name, kind, object, &blk) #:nodoc:
-        @_keyed_callbacks ||= {}
-        @_keyed_callbacks[name] ||= begin
-          str = send("_#{kind}_callbacks").compile(name, object)
-          class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            def #{name}() #{str} end
-            protected :#{name}
-          RUBY_EVAL
-          true
+      # This method calls the callback method for the given key.
+      # If this called first time it creates a new callback method for the key, 
+      # calculating which callbacks can be omitted because of per_key conditions.
+      #
+      def __run_keyed_callback(key, kind, object, &blk) #:nodoc:
+        name = "_run__#{self.class.name.hash.abs}__#{kind}__#{key.hash.abs}__callbacks"
+        unless respond_to?(name)
+          @_keyed_callbacks ||= {}
+          @_keyed_callbacks[name] ||= begin
+            str = send("_#{kind}_callbacks").compile(name, object)
+            class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+              def #{name}() #{str} end
+              protected :#{name}
+            RUBY_EVAL
+            true
+          end
         end
+        object.send(name, &blk)
       end
 
       # This is used internally to append, prepend and skip callbacks to the
-- 
cgit v1.2.3


From 80f96ebcf5218cafd2b29e58c7b0c55a07e2fe22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 10 Nov 2011 08:57:09 -0200
Subject: self.class.name -> self.name (we are already inside a class).

---
 activesupport/lib/active_support/callbacks.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 73caede7d6..31737d54cb 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -393,7 +393,7 @@ module ActiveSupport
       # calculating which callbacks can be omitted because of per_key conditions.
       #
       def __run_keyed_callback(key, kind, object, &blk) #:nodoc:
-        name = "_run__#{self.class.name.hash.abs}__#{kind}__#{key.hash.abs}__callbacks"
+        name = "_run__#{self.name.hash.abs}__#{kind}__#{key.hash.abs}__callbacks"
         unless respond_to?(name)
           @_keyed_callbacks ||= {}
           @_keyed_callbacks[name] ||= begin
-- 
cgit v1.2.3


From 08cc49b919cfa43a19f55b761dba56bc3673b6b7 Mon Sep 17 00:00:00 2001
From: Bogdan Gusiev <agresso@gmail.com>
Date: Thu, 10 Nov 2011 16:42:27 +0200
Subject: AS::Callbacks.__run_keyed_callback: remove unused cache

---
 activesupport/lib/active_support/callbacks.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 31737d54cb..962299bf7c 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -394,16 +394,12 @@ module ActiveSupport
       #
       def __run_keyed_callback(key, kind, object, &blk) #:nodoc:
         name = "_run__#{self.name.hash.abs}__#{kind}__#{key.hash.abs}__callbacks"
-        unless respond_to?(name)
-          @_keyed_callbacks ||= {}
-          @_keyed_callbacks[name] ||= begin
-            str = send("_#{kind}_callbacks").compile(name, object)
-            class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-              def #{name}() #{str} end
-              protected :#{name}
-            RUBY_EVAL
-            true
-          end
+        unless object.respond_to?(name)
+          str = send("_#{kind}_callbacks").compile(name, object)
+          class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+            def #{name}() #{str} end
+            protected :#{name}
+          RUBY_EVAL
         end
         object.send(name, &blk)
       end
-- 
cgit v1.2.3


From e34e4d43301618307f94123d3710f094297f91f3 Mon Sep 17 00:00:00 2001
From: Cheah Chu Yeow <chuyeow@gmail.com>
Date: Fri, 11 Nov 2011 17:04:50 +0800
Subject: Fix "in memory" where it should be "in-memory".

---
 activesupport/lib/active_support/cache/file_store.rb           | 2 +-
 activesupport/lib/active_support/cache/mem_cache_store.rb      | 2 +-
 activesupport/lib/active_support/cache/strategy/local_cache.rb | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index 85e7e21624..9460532af0 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -8,7 +8,7 @@ module ActiveSupport
     # A cache store implementation which stores everything on the filesystem.
     #
     # FileStore implements the Strategy::LocalCache strategy which implements
-    # an in memory cache inside of a block.
+    # an in-memory cache inside of a block.
     class FileStore < Store
       attr_reader :cache_path
 
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index e07294178b..5234cdb4ce 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -21,7 +21,7 @@ module ActiveSupport
     #   server goes down, then MemCacheStore will ignore it until it comes back up.
     #
     # MemCacheStore implements the Strategy::LocalCache strategy which implements
-    # an in memory cache inside of a block.
+    # an in-memory cache inside of a block.
     class MemCacheStore < Store
       module Response # :nodoc:
         STORED      = "STORED\r\n"
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index 0649a058aa..db5f228a70 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -4,9 +4,9 @@ require 'active_support/core_ext/string/inflections'
 module ActiveSupport
   module Cache
     module Strategy
-      # Caches that implement LocalCache will be backed by an in memory cache for the
+      # Caches that implement LocalCache will be backed by an in-memory cache for the
       # duration of a block. Repeated calls to the cache for the same key will hit the
-      # in memory cache for faster access.
+      # in-memory cache for faster access.
       module LocalCache
         # Simple memory backed cache. This cache is not thread safe and is intended only
         # for serving as a temporary memory cache for a single thread.
-- 
cgit v1.2.3


From df5c9fd9f42e9bebb02bb61acf70de3d17bc8152 Mon Sep 17 00:00:00 2001
From: Cheah Chu Yeow <chuyeow@gmail.com>
Date: Fri, 11 Nov 2011 17:07:02 +0800
Subject: Update Memcached website to its new one at http://memcached.org/.

---
 activesupport/lib/active_support/cache/mem_cache_store.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index 5234cdb4ce..530839b24d 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -11,7 +11,7 @@ require 'active_support/core_ext/string/encoding'
 module ActiveSupport
   module Cache
     # A cache store implementation which stores data in Memcached:
-    # http://www.danga.com/memcached/
+    # http://memcached.org/
     #
     # This is currently the most popular cache store for production websites.
     #
-- 
cgit v1.2.3


From 9fd0cd3a12f969ca0c5c7ce6163e9e451637506d Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Fri, 11 Nov 2011 17:12:42 +0530
Subject: Revert "Fix "in memory" where it should be "in-memory"."

This reverts commit e34e4d43301618307f94123d3710f094297f91f3.

Reason: code changes are not allowed in docrails.
---
 activesupport/lib/active_support/cache/file_store.rb           | 2 +-
 activesupport/lib/active_support/cache/mem_cache_store.rb      | 2 +-
 activesupport/lib/active_support/cache/strategy/local_cache.rb | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index 9460532af0..85e7e21624 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -8,7 +8,7 @@ module ActiveSupport
     # A cache store implementation which stores everything on the filesystem.
     #
     # FileStore implements the Strategy::LocalCache strategy which implements
-    # an in-memory cache inside of a block.
+    # an in memory cache inside of a block.
     class FileStore < Store
       attr_reader :cache_path
 
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index 530839b24d..ba37f3e871 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -21,7 +21,7 @@ module ActiveSupport
     #   server goes down, then MemCacheStore will ignore it until it comes back up.
     #
     # MemCacheStore implements the Strategy::LocalCache strategy which implements
-    # an in-memory cache inside of a block.
+    # an in memory cache inside of a block.
     class MemCacheStore < Store
       module Response # :nodoc:
         STORED      = "STORED\r\n"
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index db5f228a70..0649a058aa 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -4,9 +4,9 @@ require 'active_support/core_ext/string/inflections'
 module ActiveSupport
   module Cache
     module Strategy
-      # Caches that implement LocalCache will be backed by an in-memory cache for the
+      # Caches that implement LocalCache will be backed by an in memory cache for the
       # duration of a block. Repeated calls to the cache for the same key will hit the
-      # in-memory cache for faster access.
+      # in memory cache for faster access.
       module LocalCache
         # Simple memory backed cache. This cache is not thread safe and is intended only
         # for serving as a temporary memory cache for a single thread.
-- 
cgit v1.2.3


From 8483c7c0a612592316dcf6048cc45e8aee101e47 Mon Sep 17 00:00:00 2001
From: Bogdan Gusiev <agresso@gmail.com>
Date: Fri, 11 Nov 2011 14:27:40 +0200
Subject: AS::Callbacks::Callback#_compile_option refactored

---
 activesupport/lib/active_support/callbacks.rb | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 962299bf7c..ea37355fc1 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -153,7 +153,7 @@ module ActiveSupport
 
         @klass.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
           def _one_time_conditions_valid_#{@callback_id}?
-            true #{key_options[0]}
+            true if #{key_options}
           end
         RUBY_EVAL
       end
@@ -171,8 +171,8 @@ module ActiveSupport
           # if condition    # before_save :filter_name, :if => :condition
           #   filter_name
           # end
-          filter = <<-RUBY_EVAL
-            unless halted
+          <<-RUBY_EVAL
+            if !halted && #{@compiled_options}
               # This double assignment is to prevent warnings in 1.9.3.  I would
               # remove the `result` variable, but apparently some other
               # generated code is depending on this variable being set sometimes
@@ -181,8 +181,6 @@ module ActiveSupport
               halted = (#{chain.config[:terminator]})
             end
           RUBY_EVAL
-
-          [@compiled_options[0], filter, @compiled_options[1]].compact.join("\n")
         when :around
           # Compile around filters with conditions into proxy methods
           # that contain the conditions.
@@ -202,7 +200,7 @@ module ActiveSupport
           name = "_conditional_callback_#{@kind}_#{next_id}"
           @klass.class_eval <<-RUBY_EVAL,  __FILE__, __LINE__ + 1
              def #{name}(halted)
-              #{@compiled_options[0] || "if true"} && !halted
+              if #{@compiled_options} && !halted
                 #{@filter} do
                   yield self
                 end
@@ -222,10 +220,12 @@ module ActiveSupport
 
         case @kind
         when :after
-          # if condition    # after_save :filter_name, :if => :condition
-          #   filter_name
-          # end
-          [@compiled_options[0], @filter, @compiled_options[1]].compact.join("\n")
+          # after_save :filter_name, :if => :condition
+          <<-RUBY_EVAL
+          if #{@compiled_options}
+            #{@filter}
+          end
+          RUBY_EVAL
         when :around
           <<-RUBY_EVAL
             value
@@ -240,9 +240,7 @@ module ActiveSupport
       # symbols, string, procs, and objects), so compile a conditional
       # expression based on the options
       def _compile_options(options)
-        return [] if options[:if].empty? && options[:unless].empty?
-
-        conditions = []
+        conditions = ["true"]
 
         unless options[:if].empty?
           conditions << Array.wrap(_compile_filter(options[:if]))
@@ -252,7 +250,7 @@ module ActiveSupport
           conditions << Array.wrap(_compile_filter(options[:unless])).map {|f| "!#{f}"}
         end
 
-        ["if #{conditions.flatten.join(" && ")}", "end"]
+        conditions.flatten.join(" && ")
       end
 
       # Filters support:
-- 
cgit v1.2.3


From a02b40a3d28c4b262dd49a8a6166c0275dfd9964 Mon Sep 17 00:00:00 2001
From: Cheah Chu Yeow <chuyeow@gmail.com>
Date: Sun, 13 Nov 2011 13:18:55 +0800
Subject: Fix "in memory" where it should be "in-memory".

---
 activesupport/lib/active_support/cache/file_store.rb           | 2 +-
 activesupport/lib/active_support/cache/mem_cache_store.rb      | 2 +-
 activesupport/lib/active_support/cache/strategy/local_cache.rb | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index 85e7e21624..9460532af0 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -8,7 +8,7 @@ module ActiveSupport
     # A cache store implementation which stores everything on the filesystem.
     #
     # FileStore implements the Strategy::LocalCache strategy which implements
-    # an in memory cache inside of a block.
+    # an in-memory cache inside of a block.
     class FileStore < Store
       attr_reader :cache_path
 
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index ba37f3e871..530839b24d 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -21,7 +21,7 @@ module ActiveSupport
     #   server goes down, then MemCacheStore will ignore it until it comes back up.
     #
     # MemCacheStore implements the Strategy::LocalCache strategy which implements
-    # an in memory cache inside of a block.
+    # an in-memory cache inside of a block.
     class MemCacheStore < Store
       module Response # :nodoc:
         STORED      = "STORED\r\n"
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index 0649a058aa..db5f228a70 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -4,9 +4,9 @@ require 'active_support/core_ext/string/inflections'
 module ActiveSupport
   module Cache
     module Strategy
-      # Caches that implement LocalCache will be backed by an in memory cache for the
+      # Caches that implement LocalCache will be backed by an in-memory cache for the
       # duration of a block. Repeated calls to the cache for the same key will hit the
-      # in memory cache for faster access.
+      # in-memory cache for faster access.
       module LocalCache
         # Simple memory backed cache. This cache is not thread safe and is intended only
         # for serving as a temporary memory cache for a single thread.
-- 
cgit v1.2.3


From 8d83e339fc91bfba51bb30384efc1bca6a099a53 Mon Sep 17 00:00:00 2001
From: gregolsen <anotheroneman@yahoo.com>
Date: Thu, 17 Nov 2011 22:17:33 +0200
Subject: updating API docstring so that user can infer default value

---
 activesupport/lib/active_support/core_ext/date/calculations.rb | 4 ++--
 activesupport/lib/active_support/core_ext/time/calculations.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index 26a99658cc..c6d5f29690 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -192,13 +192,13 @@ class Date
   alias :sunday :end_of_week
   alias :at_end_of_week :end_of_week
 
-  # Returns a new Date/DateTime representing the start of the given day in the previous week (default is Monday).
+  # Returns a new Date/DateTime representing the start of the given day in the previous week (default is :monday).
   def prev_week(day = :monday)
     result = (self - 7).beginning_of_week + DAYS_INTO_WEEK[day]
     self.acts_like?(:time) ? result.change(:hour => 0) : result
   end
 
-  # Returns a new Date/DateTime representing the start of the given day in next week (default is Monday).
+  # Returns a new Date/DateTime representing the start of the given day in next week (default is :monday).
   def next_week(day = :monday)
     result = (self + 7).beginning_of_week + DAYS_INTO_WEEK[day]
     self.acts_like?(:time) ? result.change(:hour => 0) : result
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 372dd69212..43cd103481 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -176,12 +176,12 @@ class Time
   end
   alias :at_end_of_week :end_of_week
 
-  # Returns a new Time representing the start of the given day in the previous week (default is Monday).
+  # Returns a new Time representing the start of the given day in the previous week (default is :monday).
   def prev_week(day = :monday)
     ago(1.week).beginning_of_week.since(DAYS_INTO_WEEK[day].day).change(:hour => 0)
   end
 
-  # Returns a new Time representing the start of the given day in next week (default is Monday).
+  # Returns a new Time representing the start of the given day in next week (default is :monday).
   def next_week(day = :monday)
     since(1.week).beginning_of_week.since(DAYS_INTO_WEEK[day].day).change(:hour => 0)
   end
-- 
cgit v1.2.3


From e37597072587e24a1daf62191fa22e7dbbeaffea Mon Sep 17 00:00:00 2001
From: Philip Arndt <parndt@gmail.com>
Date: Fri, 18 Nov 2011 10:17:16 +1300
Subject: Fixed typo: expect -> expected

---
 activesupport/lib/active_support/dependencies.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index b3ac271778..db90de4682 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -428,7 +428,7 @@ module ActiveSupport #:nodoc:
     end
 
     # Attempt to autoload the provided module name by searching for a directory
-    # matching the expect path suffix. If found, the module is created and assigned
+    # matching the expected path suffix. If found, the module is created and assigned
     # to +into+'s constants with the name +const_name+. Provided that the directory
     # was loaded from a reloadable base path, it is added to the set of constants
     # that are to be unloaded.
-- 
cgit v1.2.3


From 60e3e218c2336a6359b36e17213f31cc35e65bbf Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 21 Nov 2011 22:11:31 +0100
Subject: a couple of spurious spaces I saw in passing

---
 activesupport/lib/active_support/cache.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 6535cc1eb5..ba3064a24e 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -149,7 +149,7 @@ module ActiveSupport
 
       # Create a new cache. The options will be passed to any write method calls except
       # for :namespace which can be used to set the global namespace for the cache.
-      def initialize (options = nil)
+      def initialize(options = nil)
         @options = options ? options.dup : {}
       end
 
@@ -538,7 +538,7 @@ module ActiveSupport
         # Create an entry with internal attributes set. This method is intended to be
         # used by implementations that store cache entries in a native format instead
         # of as serialized Ruby objects.
-        def create (raw_value, created_at, options = {})
+        def create(raw_value, created_at, options = {})
           entry = new(nil)
           entry.instance_variable_set(:@value, raw_value)
           entry.instance_variable_set(:@created_at, created_at.to_f)
-- 
cgit v1.2.3


From 91678a5b29bca29aae4a987615f2503067032802 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 21 Nov 2011 13:53:40 -0800
Subject: adds a comment to clarify an edge case

---
 activesupport/lib/active_support/cache.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index ba3064a24e..97583c9bd9 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -573,6 +573,9 @@ module ActiveSupport
 
       # Get the value stored in the cache.
       def value
+        # If the original value was exactly false @value is still true because
+        # it is marshalled and eventually compressed. Both operations yield
+        # strings.
         if @value
           Marshal.load(compressed? ? Zlib::Inflate.inflate(@value) : @value)
         end
-- 
cgit v1.2.3


From f3554777b2433d9de6b17c277fde071592d6a10d Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 21 Nov 2011 14:01:53 -0800
Subject: cache entry: options[:compressed] is a regular flag, no need for !!

---
 activesupport/lib/active_support/cache.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 97583c9bd9..2bf24558a6 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -542,7 +542,7 @@ module ActiveSupport
           entry = new(nil)
           entry.instance_variable_set(:@value, raw_value)
           entry.instance_variable_set(:@created_at, created_at.to_f)
-          entry.instance_variable_set(:@compressed, !!options[:compressed])
+          entry.instance_variable_set(:@compressed, options[:compressed])
           entry.instance_variable_set(:@expires_in, options[:expires_in])
           entry
         end
-- 
cgit v1.2.3


From a539a5e3f3be68f027d3dfe43f88dc9f0642c743 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 21 Nov 2011 14:11:19 -0800
Subject: tests predicates according to the boolean interpretation of their
 return value, not expecting specifically true or false

---
 activesupport/lib/active_support/cache.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 2bf24558a6..2acc54bbfc 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -365,7 +365,7 @@ module ActiveSupport
         end
       end
 
-      # Deletes an entry in the cache. Returns +true+ if an entry is deleted.
+      # Deletes an entry in the cache. Returns true if an entry is deleted.
       #
       # Options are passed to the underlying cache implementation.
       def delete(name, options = nil)
@@ -382,11 +382,7 @@ module ActiveSupport
         options = merged_options(options)
         instrument(:exist?, name) do |payload|
           entry = read_entry(namespaced_key(name, options), options)
-          if entry && !entry.expired?
-            true
-          else
-            false
-          end
+          entry && !entry.expired?
         end
       end
 
-- 
cgit v1.2.3


From f312e2142b59b39637ab3d668876c3babac22087 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 21 Nov 2011 14:14:11 -0800
Subject: Revert "tests predicates according to the boolean interpretation of
 their return value, not expecting specifically true or false"

Reason: there were some genuine tests for false when
reading values, going to revise those ones.

This reverts commit a539a5e3f3be68f027d3dfe43f88dc9f0642c743.
---
 activesupport/lib/active_support/cache.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 2acc54bbfc..2bf24558a6 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -365,7 +365,7 @@ module ActiveSupport
         end
       end
 
-      # Deletes an entry in the cache. Returns true if an entry is deleted.
+      # Deletes an entry in the cache. Returns +true+ if an entry is deleted.
       #
       # Options are passed to the underlying cache implementation.
       def delete(name, options = nil)
@@ -382,7 +382,11 @@ module ActiveSupport
         options = merged_options(options)
         instrument(:exist?, name) do |payload|
           entry = read_entry(namespaced_key(name, options), options)
-          entry && !entry.expired?
+          if entry && !entry.expired?
+            true
+          else
+            false
+          end
         end
       end
 
-- 
cgit v1.2.3


From 401393b6561adc1ce7101945163c9601257c057a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 21 Nov 2011 22:07:24 +0000
Subject: Deprecate InstanceMethods namespace handling in
 ActiveSupport::Concern.

This avoids the unnecessary "yo dawg, I heard you like include, so I put a module that includes your module when it is included" approach when building extensions.
---
 activesupport/lib/active_support/concern.rb | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/concern.rb b/activesupport/lib/active_support/concern.rb
index 81fb859334..af3da937c7 100644
--- a/activesupport/lib/active_support/concern.rb
+++ b/activesupport/lib/active_support/concern.rb
@@ -4,17 +4,12 @@ module ActiveSupport
   #   module M
   #     def self.included(base)
   #       base.extend ClassMethods
-  #       base.send(:include, InstanceMethods)
   #       scope :disabled, where(:disabled => true)
   #     end
   #
   #     module ClassMethods
   #       ...
   #     end
-  #
-  #     module InstanceMethods
-  #       ...
-  #     end
   #   end
   #
   # By using <tt>ActiveSupport::Concern</tt> the above module could instead be written as:
@@ -31,10 +26,6 @@ module ActiveSupport
   #     module ClassMethods
   #       ...
   #     end
-  #
-  #     module InstanceMethods
-  #       ...
-  #     end
   #   end
   #
   # Moreover, it gracefully handles module dependencies. Given a +Foo+ module and a +Bar+
@@ -118,7 +109,11 @@ module ActiveSupport
         @_dependencies.each { |dep| base.send(:include, dep) }
         super
         base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
-        base.send :include, const_get("InstanceMethods") if const_defined?("InstanceMethods")
+        if const_defined?("InstanceMethods")
+          base.send :include, const_get("InstanceMethods")
+          ActiveSupport::Deprecation.warn "The InstanceMethods module inside ActiveSupport::Concern will be " \
+            "no longer included automatically. Please define instance methods directly in #{base} instead.", caller
+        end
         base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
       end
     end
-- 
cgit v1.2.3


From 8cae31c800f281212c9c5b5ac0ea2be98c4aa611 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Tue, 22 Nov 2011 17:12:37 +0530
Subject: remove nodoc on OrderedHash

---
 activesupport/lib/active_support/ordered_hash.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb
index 0264133581..b0d4f2bd86 100644
--- a/activesupport/lib/active_support/ordered_hash.rb
+++ b/activesupport/lib/active_support/ordered_hash.rb
@@ -20,7 +20,7 @@ module ActiveSupport
   #   oh.keys # => [:a, :b], this order is guaranteed
   #
   # <tt>ActiveSupport::OrderedHash</tt> is namespaced to prevent conflicts with other implementations.
-  class OrderedHash < ::Hash #:nodoc:
+  class OrderedHash < ::Hash
     def to_yaml_type
       "!tag:yaml.org,2002:omap"
     end
-- 
cgit v1.2.3


From a4912078c7d345a347f023ef28c0986458bdebf5 Mon Sep 17 00:00:00 2001
From: Marc-Andre Lafortune <github@marc-andre.ca>
Date: Tue, 22 Nov 2011 15:37:16 -0500
Subject: Fix inconsistencies with Time{WithZone}#{hash,eql?}

---
 activesupport/lib/active_support/core_ext/time/calculations.rb | 10 ++++++++++
 activesupport/lib/active_support/time_with_zone.rb             |  7 +++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 372dd69212..7a55086452 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -312,4 +312,14 @@ class Time
   end
   alias_method :compare_without_coercion, :<=>
   alias_method :<=>, :compare_with_coercion
+
+  # Layers additional behavior on Time#eql? so that ActiveSupport::TimeWithZone instances
+  # can be eql? to an equivalent Time
+  def eql_with_coercion(other)
+    # if other is an ActiveSupport::TimeWithZone, coerce a Time instance from it so we can do eql? comparison
+    other = other.comparable_time if other.respond_to?(:comparable_time)
+    eql_without_coercion(other)
+  end
+  alias_method :eql_without_coercion, :eql?
+  alias_method :eql?, :eql_with_coercion
 end
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index 63279d0e6d..d3adf671a0 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -203,7 +203,11 @@ module ActiveSupport
     end
 
     def eql?(other)
-      utc == other
+      utc.eql?(other)
+    end
+
+    def hash
+      utc.hash
     end
 
     def +(other)
@@ -277,7 +281,6 @@ module ActiveSupport
     def to_i
       utc.to_i
     end
-    alias_method :hash, :to_i
     alias_method :tv_sec, :to_i
 
     # A TimeWithZone acts like a Time, so just return +self+.
-- 
cgit v1.2.3


From d8e6dc9cf12096908a7a53dec07a397ba23b1088 Mon Sep 17 00:00:00 2001
From: Olek Janiszewski <olek.janiszewski@gmail.com>
Date: Wed, 23 Nov 2011 18:06:15 +0100
Subject: Fix #3737 AS::expand_cache_key generates wrong key in certain
 situations

`cache_key` method is never called when the argument is a 1-element array
with something that responds to `cache_key`
---
 activesupport/lib/active_support/cache.rb | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 2bf24558a6..cfd1a6dbe3 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -81,16 +81,10 @@ module ActiveSupport
       end
 
       expanded_cache_key <<
-        if key.respond_to?(:cache_key)
-          key.cache_key
-        elsif key.is_a?(Array)
-          if key.size > 1
-            key.collect { |element| expand_cache_key(element) }.to_param
-          else
-            key.first.to_param
-          end
-        elsif key
-          key.to_param
+        case
+        when key.respond_to?(:cache_key) then key.cache_key
+        when key.is_a?(Array)            then key.map { |element| expand_cache_key(element) }.to_param
+        when key                         then key.to_param
         end.to_s
 
       expanded_cache_key
-- 
cgit v1.2.3


From a650dd05f82028e8d1310f1b68b7bc430ea47dcf Mon Sep 17 00:00:00 2001
From: Olek Janiszewski <olek.janiszewski@gmail.com>
Date: Wed, 23 Nov 2011 18:11:36 +0100
Subject: Fix #3737 AS::expand_cache_key generates wrong key in certain
 situations (part 2)

`nil` and `false` both expand to `""` (empty string), while `true` expands to
`"true"`; `false` should expand to `"false"`
---
 activesupport/lib/active_support/cache.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index cfd1a6dbe3..12eeff4f4b 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -84,7 +84,7 @@ module ActiveSupport
         case
         when key.respond_to?(:cache_key) then key.cache_key
         when key.is_a?(Array)            then key.map { |element| expand_cache_key(element) }.to_param
-        when key                         then key.to_param
+        else                                  key.to_param
         end.to_s
 
       expanded_cache_key
-- 
cgit v1.2.3


From 3ee0116c949dfc5760d60fe9c77168fb3868a4ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 23 Nov 2011 18:22:09 +0000
Subject: Optimize cache expansion by skipping rails cache id in nested keys.

---
 activesupport/lib/active_support/cache.rb | 114 ++++++++++++++++--------------
 1 file changed, 60 insertions(+), 54 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 12eeff4f4b..07f5fcdeb3 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -25,69 +25,75 @@ module ActiveSupport
       autoload :LocalCache, 'active_support/cache/strategy/local_cache'
     end
 
-    # Creates a new CacheStore object according to the given options.
-    #
-    # If no arguments are passed to this method, then a new
-    # ActiveSupport::Cache::MemoryStore object will be returned.
-    #
-    # If you pass a Symbol as the first argument, then a corresponding cache
-    # store class under the ActiveSupport::Cache namespace will be created.
-    # For example:
-    #
-    #   ActiveSupport::Cache.lookup_store(:memory_store)
-    #   # => returns a new ActiveSupport::Cache::MemoryStore object
-    #
-    #   ActiveSupport::Cache.lookup_store(:mem_cache_store)
-    #   # => returns a new ActiveSupport::Cache::MemCacheStore object
-    #
-    # Any additional arguments will be passed to the corresponding cache store
-    # class's constructor:
-    #
-    #   ActiveSupport::Cache.lookup_store(:file_store, "/tmp/cache")
-    #   # => same as: ActiveSupport::Cache::FileStore.new("/tmp/cache")
-    #
-    # If the first argument is not a Symbol, then it will simply be returned:
-    #
-    #   ActiveSupport::Cache.lookup_store(MyOwnCacheStore.new)
-    #   # => returns MyOwnCacheStore.new
-    def self.lookup_store(*store_option)
-      store, *parameters = *Array.wrap(store_option).flatten
-
-      case store
-      when Symbol
-        store_class_name = store.to_s.camelize
-        store_class =
-          begin
-            require "active_support/cache/#{store}"
-          rescue LoadError => e
-            raise "Could not find cache store adapter for #{store} (#{e})"
-          else
-            ActiveSupport::Cache.const_get(store_class_name)
-          end
-        store_class.new(*parameters)
-      when nil
-        ActiveSupport::Cache::MemoryStore.new
-      else
-        store
+    class << self
+      # Creates a new CacheStore object according to the given options.
+      #
+      # If no arguments are passed to this method, then a new
+      # ActiveSupport::Cache::MemoryStore object will be returned.
+      #
+      # If you pass a Symbol as the first argument, then a corresponding cache
+      # store class under the ActiveSupport::Cache namespace will be created.
+      # For example:
+      #
+      #   ActiveSupport::Cache.lookup_store(:memory_store)
+      #   # => returns a new ActiveSupport::Cache::MemoryStore object
+      #
+      #   ActiveSupport::Cache.lookup_store(:mem_cache_store)
+      #   # => returns a new ActiveSupport::Cache::MemCacheStore object
+      #
+      # Any additional arguments will be passed to the corresponding cache store
+      # class's constructor:
+      #
+      #   ActiveSupport::Cache.lookup_store(:file_store, "/tmp/cache")
+      #   # => same as: ActiveSupport::Cache::FileStore.new("/tmp/cache")
+      #
+      # If the first argument is not a Symbol, then it will simply be returned:
+      #
+      #   ActiveSupport::Cache.lookup_store(MyOwnCacheStore.new)
+      #   # => returns MyOwnCacheStore.new
+      def lookup_store(*store_option)
+        store, *parameters = *Array.wrap(store_option).flatten
+
+        case store
+        when Symbol
+          store_class_name = store.to_s.camelize
+          store_class =
+            begin
+              require "active_support/cache/#{store}"
+            rescue LoadError => e
+              raise "Could not find cache store adapter for #{store} (#{e})"
+            else
+              ActiveSupport::Cache.const_get(store_class_name)
+            end
+          store_class.new(*parameters)
+        when nil
+          ActiveSupport::Cache::MemoryStore.new
+        else
+          store
+        end
       end
-    end
 
-    def self.expand_cache_key(key, namespace = nil)
-      expanded_cache_key = namespace ? "#{namespace}/" : ""
+      def expand_cache_key(key, namespace = nil)
+        expanded_cache_key = namespace ? "#{namespace}/" : ""
+
+        prefix = ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]
+        if prefix
+          expanded_cache_key << "#{prefix}/"
+        end
 
-      prefix = ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]
-      if prefix
-        expanded_cache_key << "#{prefix}/"
+        expanded_cache_key << retrieve_cache_key(key)
+        expanded_cache_key
       end
 
-      expanded_cache_key <<
+      private
+
+      def retrieve_cache_key(key)
         case
         when key.respond_to?(:cache_key) then key.cache_key
-        when key.is_a?(Array)            then key.map { |element| expand_cache_key(element) }.to_param
+        when key.is_a?(Array)            then key.map { |element| retrieve_cache_key(element) }.to_param
         else                                  key.to_param
         end.to_s
-
-      expanded_cache_key
+      end
     end
 
     # An abstract cache store class. There are multiple cache store
-- 
cgit v1.2.3


From 0536ea8c7855222111fad6df71d0d09b77ea4317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 23 Nov 2011 21:43:03 +0000
Subject: Add safe_constantize to ActiveSupport::Dependencies.

---
 activesupport/lib/active_support/dependencies.rb | 33 ++++++++++++++----------
 1 file changed, 20 insertions(+), 13 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index db90de4682..2f1066016b 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -527,7 +527,7 @@ module ActiveSupport #:nodoc:
 
     class ClassCache
       def initialize
-        @store = Hash.new { |h, k| h[k] = Inflector.constantize(k) }
+        @store = Hash.new
       end
 
       def empty?
@@ -538,23 +538,23 @@ module ActiveSupport #:nodoc:
         @store.key?(key)
       end
 
-      def []=(key, value)
-        return unless key.respond_to?(:name)
-
-        raise(ArgumentError, 'anonymous classes cannot be cached') if key.name.blank?
-
-        @store[key.name] = value
+      def get(key)
+        key = key.name if key.respond_to?(:name)
+        @store[key] ||= Inflector.constantize(key)
       end
 
-      def [](key)
+      def safe_get(key)
         key = key.name if key.respond_to?(:name)
-
-        @store[key]
+        @store[key] || begin
+          klass = Inflector.safe_constantize(key)
+          @store[key] = klass
+        end
       end
-      alias :get :[]
 
-      def store(name)
-        self[name] = name
+      def store(klass)
+        return self unless klass.respond_to?(:name)
+        raise(ArgumentError, 'anonymous classes cannot be cached') if klass.name.empty?
+        @store[klass.name] = klass
         self
       end
 
@@ -571,10 +571,17 @@ module ActiveSupport #:nodoc:
     end
 
     # Get the reference for class named +name+.
+    # Raises an exception if referenced class does not exist.
     def constantize(name)
       Reference.get(name)
     end
 
+    # Get the reference for class named +name+ if one exists.
+    # Otherwise returns nil.
+    def safe_constantize(name)
+      Reference.safe_get(name)
+    end
+
     # Determine if the given constant has been automatically loaded.
     def autoloaded?(desc)
       # No name => anonymous module.
-- 
cgit v1.2.3


From 8896b4fdc8a543157cdf4dfc378607ebf6c10ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 23 Nov 2011 23:18:13 +0000
Subject: Implement ArraySerializer and move old serialization API to a new
 namespace.

The following constants were renamed:

  ActiveModel::Serialization     => ActiveModel::Serializable
  ActiveModel::Serializers::JSON => ActiveModel::Serializable::JSON
  ActiveModel::Serializers::Xml  => ActiveModel::Serializable::XML

The main motivation for such a change is that `ActiveModel::Serializers::JSON`
was not actually a serializer, but a module that when included allows the target to be serializable to JSON.

With such changes, we were able to clean up the namespace to add true serializers as the ArraySerializer.
---
 activesupport/lib/active_support/json/encoding.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index 469ae69258..b0fd3a3c0e 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -50,9 +50,9 @@ module ActiveSupport
         end
 
         # like encode, but only calls as_json, without encoding to string
-        def as_json(value)
+        def as_json(value, use_options = true)
           check_for_circular_references(value) do
-            value.as_json(options_for(value))
+            use_options ? value.as_json(options_for(value)) : value.as_json
           end
         end
 
@@ -212,7 +212,7 @@ class Array
   def as_json(options = nil) #:nodoc:
     # use encoder as a proxy to call as_json on all elements, to protect from circular references
     encoder = options && options[:encoder] || ActiveSupport::JSON::Encoding::Encoder.new(options)
-    map { |v| encoder.as_json(v) }
+    map { |v| encoder.as_json(v, options) }
   end
 
   def encode_json(encoder) #:nodoc:
@@ -239,7 +239,7 @@ class Hash
     # use encoder as a proxy to call as_json on all values in the subset, to protect from circular references
     encoder = options && options[:encoder] || ActiveSupport::JSON::Encoding::Encoder.new(options)
     result = self.is_a?(ActiveSupport::OrderedHash) ? ActiveSupport::OrderedHash : Hash
-    result[subset.map { |k, v| [k.to_s, encoder.as_json(v)] }]
+    result[subset.map { |k, v| [k.to_s, encoder.as_json(v, options)] }]
   end
 
   def encode_json(encoder)
-- 
cgit v1.2.3


From 7fcc8c0a1f38c77b12cb6ffe81fb2887e6c60b85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 23 Nov 2011 23:45:27 +0000
Subject: Rely solely on active_model_serializer and remove the fancy constant
 lookup.

---
 activesupport/lib/active_support/dependencies.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 2f1066016b..1372e71a61 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -542,6 +542,7 @@ module ActiveSupport #:nodoc:
         key = key.name if key.respond_to?(:name)
         @store[key] ||= Inflector.constantize(key)
       end
+      alias :[] :get
 
       def safe_get(key)
         key = key.name if key.respond_to?(:name)
-- 
cgit v1.2.3


From 3f1a4c3415113f2d365eb1a5531757699afec605 Mon Sep 17 00:00:00 2001
From: gregolsen <anotheroneman@yahoo.com>
Date: Sun, 6 Nov 2011 21:42:03 +0200
Subject: beginning_of_week extended in both Time and Date so that to return
 week start based on start day that is monday by default

---
 .../active_support/core_ext/date/calculations.rb   | 24 ++++++++++++++--------
 .../active_support/core_ext/time/calculations.rb   | 24 ++++++++++++++--------
 2 files changed, 32 insertions(+), 16 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index c6d5f29690..a322075c4e 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -174,19 +174,27 @@ class Date
     months_since(1)
   end unless method_defined?(:next_month)
 
-  # Returns a new Date/DateTime representing the "start" of this week (i.e, Monday; DateTime objects will have time set to 0:00).
-  def beginning_of_week
-    days_to_monday = self.wday!=0 ? self.wday-1 : 6
-    result = self - days_to_monday
+  # Returns number of days to start of this week, week starts on start_day (default is Monday)
+  def days_to_week_start(start_day = :monday)
+    start_day_number = DAYS_INTO_WEEK[start_day]
+    current_day_number = wday != 0 ? wday - 1 : 6
+    days_span = current_day_number - start_day_number
+    days_span >= 0 ? days_span : 7 + days_span
+  end
+
+  # Returns a new Date/DateTime representing the "start" of this week, week starts on start_day (i.e, Monday; DateTime objects will have time set to 0:00).
+  def beginning_of_week(start_day = :monday)
+    days_to_start = days_to_week_start(start_day)
+    result = self - days_to_start
     self.acts_like?(:time) ? result.midnight : result
   end
   alias :monday :beginning_of_week
   alias :at_beginning_of_week :beginning_of_week
 
-  # Returns a new Date/DateTime representing the end of this week (Sunday, DateTime objects will have time set to 23:59:59).
-  def end_of_week
-    days_to_sunday = self.wday!=0 ? 7-self.wday : 0
-    result = self + days_to_sunday.days
+  # Returns a new Date/DateTime representing the end of this week, week starts on start_day (Sunday, DateTime objects will have time set to 23:59:59).
+  def end_of_week(start_day = :monday)
+    days_to_end = 6 - days_to_week_start(start_day)
+    result = self + days_to_end.days
     self.acts_like?(:time) ? result.end_of_day : result
   end
   alias :sunday :end_of_week
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 1e15529569..154ba78646 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -161,18 +161,26 @@ class Time
     months_since(1)
   end
 
-  # Returns a new Time representing the "start" of this week (Monday, 0:00)
-  def beginning_of_week
-    days_to_monday = wday!=0 ? wday-1 : 6
-    (self - days_to_monday.days).midnight
+  # Returns number of days to start of this week, week starts on start_day (default is Monday)
+  def days_to_week_start(start_day = :monday)
+    start_day_number = DAYS_INTO_WEEK[start_day]
+    current_day_number = wday != 0 ? wday - 1 : 6
+    days_span = current_day_number - start_day_number
+    days_span >= 0 ? days_span : 7 + days_span
+  end
+
+  # Returns a new Time representing the "start" of this week, week starts on start_day (deafult is Monday, e.g. Monday, 0:00)
+  def beginning_of_week(start_day = :monday)
+    days_to_start = days_to_week_start(start_day)
+    (self - days_to_start.days).midnight
   end
   alias :monday :beginning_of_week
   alias :at_beginning_of_week :beginning_of_week
 
-  # Returns a new Time representing the end of this week, (end of Sunday)
-  def end_of_week
-    days_to_sunday = wday!=0 ? 7-wday : 0
-    (self + days_to_sunday.days).end_of_day
+  # Returns a new Time representing the end of this week, week starts on start_day (deafult is Monday, end of Sunday)
+  def end_of_week(start_day = :monday)
+    days_to_end =  6 - days_to_week_start(start_day)
+    (self + days_to_end.days).end_of_day
   end
   alias :at_end_of_week :end_of_week
 
-- 
cgit v1.2.3


From 7a33a005d732e80f5a6832b67df6dec5a6faaa1e Mon Sep 17 00:00:00 2001
From: gregolsen <anotheroneman@yahoo.com>
Date: Mon, 7 Nov 2011 13:26:56 +0200
Subject: API docstrings updated with default value info

---
 activesupport/lib/active_support/core_ext/date/calculations.rb | 6 +++---
 activesupport/lib/active_support/core_ext/time/calculations.rb | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index a322075c4e..ea9a1c2c0d 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -174,7 +174,7 @@ class Date
     months_since(1)
   end unless method_defined?(:next_month)
 
-  # Returns number of days to start of this week, week starts on start_day (default is Monday)
+  # Returns number of days to start of this week, week starts on start_day (default is :monday).
   def days_to_week_start(start_day = :monday)
     start_day_number = DAYS_INTO_WEEK[start_day]
     current_day_number = wday != 0 ? wday - 1 : 6
@@ -182,7 +182,7 @@ class Date
     days_span >= 0 ? days_span : 7 + days_span
   end
 
-  # Returns a new Date/DateTime representing the "start" of this week, week starts on start_day (i.e, Monday; DateTime objects will have time set to 0:00).
+  # Returns a new Date/DateTime representing the "start" of this week, week starts on start_day (default is :monday, i.e. Monday; DateTime objects will have time set to 0:00).
   def beginning_of_week(start_day = :monday)
     days_to_start = days_to_week_start(start_day)
     result = self - days_to_start
@@ -191,7 +191,7 @@ class Date
   alias :monday :beginning_of_week
   alias :at_beginning_of_week :beginning_of_week
 
-  # Returns a new Date/DateTime representing the end of this week, week starts on start_day (Sunday, DateTime objects will have time set to 23:59:59).
+  # Returns a new Date/DateTime representing the end of this week, week starts on start_day (default is :monday, i.e. Sunday, DateTime objects will have time set to 23:59:59).
   def end_of_week(start_day = :monday)
     days_to_end = 6 - days_to_week_start(start_day)
     result = self + days_to_end.days
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 154ba78646..2cc5c82265 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -161,7 +161,7 @@ class Time
     months_since(1)
   end
 
-  # Returns number of days to start of this week, week starts on start_day (default is Monday)
+  # Returns number of days to start of this week, week starts on start_day (default is :monday).
   def days_to_week_start(start_day = :monday)
     start_day_number = DAYS_INTO_WEEK[start_day]
     current_day_number = wday != 0 ? wday - 1 : 6
@@ -169,7 +169,7 @@ class Time
     days_span >= 0 ? days_span : 7 + days_span
   end
 
-  # Returns a new Time representing the "start" of this week, week starts on start_day (deafult is Monday, e.g. Monday, 0:00)
+  # Returns a new Time representing the "start" of this week, week starts on start_day (default is :monday, i.e. Monday, 0:00).
   def beginning_of_week(start_day = :monday)
     days_to_start = days_to_week_start(start_day)
     (self - days_to_start.days).midnight
@@ -177,7 +177,7 @@ class Time
   alias :monday :beginning_of_week
   alias :at_beginning_of_week :beginning_of_week
 
-  # Returns a new Time representing the end of this week, week starts on start_day (deafult is Monday, end of Sunday)
+  # Returns a new Time representing the end of this week, week starts on start_day (default is :monday, i.e. end of Sunday).
   def end_of_week(start_day = :monday)
     days_to_end =  6 - days_to_week_start(start_day)
     (self + days_to_end.days).end_of_day
-- 
cgit v1.2.3


From a5b362df567ed4a0167a83e9b8f00b9f614ac38b Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 25 Nov 2011 12:01:58 -0800
Subject: some tweaks to PR#3547. [Closes #3547]

---
 .../lib/active_support/core_ext/date/calculations.rb  | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index ea9a1c2c0d..0c4081aa8d 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -174,24 +174,28 @@ class Date
     months_since(1)
   end unless method_defined?(:next_month)
 
-  # Returns number of days to start of this week, week starts on start_day (default is :monday).
+  # Returns number of days to start of this week. Week is assumed to start on
+  # +start_day+, default is +:monday+.
   def days_to_week_start(start_day = :monday)
     start_day_number = DAYS_INTO_WEEK[start_day]
     current_day_number = wday != 0 ? wday - 1 : 6
-    days_span = current_day_number - start_day_number
-    days_span >= 0 ? days_span : 7 + days_span
+    (current_day_number - start_day_number) % 7
   end
 
-  # Returns a new Date/DateTime representing the "start" of this week, week starts on start_day (default is :monday, i.e. Monday; DateTime objects will have time set to 0:00).
+  # Returns a new +Date+/+DateTime+ representing the start of this week. Week is
+  # assumed to start on +start_day+, default is +:monday+. +DateTime+ objects
+  # have their time set to 0:00.
   def beginning_of_week(start_day = :monday)
     days_to_start = days_to_week_start(start_day)
     result = self - days_to_start
-    self.acts_like?(:time) ? result.midnight : result
+    acts_like?(:time) ? result.midnight : result
   end
   alias :monday :beginning_of_week
   alias :at_beginning_of_week :beginning_of_week
 
-  # Returns a new Date/DateTime representing the end of this week, week starts on start_day (default is :monday, i.e. Sunday, DateTime objects will have time set to 23:59:59).
+  # Returns a new +Date+/+DateTime+ representing the end of this week, week
+  # starts on +start_day+, default is +:monday+. +DateTime+ objects have their
+  # time set to 23:59:59).
   def end_of_week(start_day = :monday)
     days_to_end = 6 - days_to_week_start(start_day)
     result = self + days_to_end.days
@@ -200,7 +204,8 @@ class Date
   alias :sunday :end_of_week
   alias :at_end_of_week :end_of_week
 
-  # Returns a new Date/DateTime representing the start of the given day in the previous week (default is :monday).
+  # Returns a new +Date+/+DateTime+ representing the given +day+ in the previous
+  # week. Default is +:monday+. +DateTime+ objects have their time set to 0:00.
   def prev_week(day = :monday)
     result = (self - 7).beginning_of_week + DAYS_INTO_WEEK[day]
     self.acts_like?(:time) ? result.change(:hour => 0) : result
-- 
cgit v1.2.3


From 99ff8fdab54e1a3d9377d114d8f9e3e45e6824ac Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sat, 26 Nov 2011 22:04:20 +0530
Subject: minor doc changes

---
 activesupport/lib/active_support/core_ext/date/calculations.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index 0c4081aa8d..8e7682ae12 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -193,9 +193,9 @@ class Date
   alias :monday :beginning_of_week
   alias :at_beginning_of_week :beginning_of_week
 
-  # Returns a new +Date+/+DateTime+ representing the end of this week, week
-  # starts on +start_day+, default is +:monday+. +DateTime+ objects have their
-  # time set to 23:59:59).
+  # Returns a new +Date+/+DateTime+ representing the end of this week. Week is
+  # assumed to start on +start_day+, default is +:monday+. +DateTime+ objects
+  # have their time set to 23:59:59.
   def end_of_week(start_day = :monday)
     days_to_end = 6 - days_to_week_start(start_day)
     result = self + days_to_end.days
-- 
cgit v1.2.3


From a8f2860d0e7db86c61bb70935006100b04667ab1 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sat, 26 Nov 2011 22:26:52 +0530
Subject: Convert aliases monday and sunday to methods

A recent change to beginning_of_week and end_of_week added an argument
that can be used to specify the week's starting day as a symbol. Now
these methods were aliased as monday and sunday respectively which as a
consequence of the argument addition, made calls like obj.monday(:sunday)
possible. This commit makes them methods on their own.
---
 .../lib/active_support/core_ext/date/calculations.rb       | 14 ++++++++++++--
 .../lib/active_support/core_ext/time/calculations.rb       |  7 ++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index 8e7682ae12..f0f67765c6 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -190,9 +190,14 @@ class Date
     result = self - days_to_start
     acts_like?(:time) ? result.midnight : result
   end
-  alias :monday :beginning_of_week
   alias :at_beginning_of_week :beginning_of_week
 
+  # Returns a new +Date+/+DateTime+ representing the start of this week. Week is
+  # assumed to start on a Monday. +DateTime+ objects have their time set to 0:00.
+  def monday
+    beginning_of_week
+  end
+
   # Returns a new +Date+/+DateTime+ representing the end of this week. Week is
   # assumed to start on +start_day+, default is +:monday+. +DateTime+ objects
   # have their time set to 23:59:59.
@@ -201,9 +206,14 @@ class Date
     result = self + days_to_end.days
     self.acts_like?(:time) ? result.end_of_day : result
   end
-  alias :sunday :end_of_week
   alias :at_end_of_week :end_of_week
 
+  # Returns a new +Date+/+DateTime+ representing the end of this week. Week is
+  # assumed to start on a Monday. +DateTime+ objects have their time set to 23:59:59.
+  def sunday
+    end_of_week
+  end
+
   # Returns a new +Date+/+DateTime+ representing the given +day+ in the previous
   # week. Default is +:monday+. +DateTime+ objects have their time set to 0:00.
   def prev_week(day = :monday)
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 2cc5c82265..7075d6ab17 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -174,9 +174,14 @@ class Time
     days_to_start = days_to_week_start(start_day)
     (self - days_to_start.days).midnight
   end
-  alias :monday :beginning_of_week
   alias :at_beginning_of_week :beginning_of_week
 
+  # Returns a new +Date+/+DateTime+ representing the start of this week. Week is
+  # assumed to start on a Monday. +DateTime+ objects have their time set to 0:00.
+  def monday
+    beginning_of_week
+  end
+
   # Returns a new Time representing the end of this week, week starts on start_day (default is :monday, i.e. end of Sunday).
   def end_of_week(start_day = :monday)
     days_to_end =  6 - days_to_week_start(start_day)
-- 
cgit v1.2.3


From 80ac4dc6d0632937ccf61b38bc15fc2f6e27b18b Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sat, 26 Nov 2011 23:10:42 +0530
Subject: Adds Time#sunday method

---
 activesupport/lib/active_support/core_ext/time/calculations.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 7075d6ab17..f3235d11bb 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -189,6 +189,12 @@ class Time
   end
   alias :at_end_of_week :end_of_week
 
+  # Returns a new +Date+/+DateTime+ representing the end of this week. Week is
+  # assumed to start on a Monday. +DateTime+ objects have their time set to 23:59:59.
+  def sunday
+    end_of_week
+  end
+
   # Returns a new Time representing the start of the given day in the previous week (default is :monday).
   def prev_week(day = :monday)
     ago(1.week).beginning_of_week.since(DAYS_INTO_WEEK[day].day).change(:hour => 0)
-- 
cgit v1.2.3


From ebf69ab1636df74c76332c53bcd3d8494fb91b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadas=20Tamo=C5=A1auskas?= <tadastoo@yahoo.com>
Date: Sat, 26 Nov 2011 23:51:09 +0000
Subject: Object#in? also accepts multiple parameters

---
 .../active_support/core_ext/object/inclusion.rb    | 24 +++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/object/inclusion.rb b/activesupport/lib/active_support/core_ext/object/inclusion.rb
index b5671f66d0..f611cdd606 100644
--- a/activesupport/lib/active_support/core_ext/object/inclusion.rb
+++ b/activesupport/lib/active_support/core_ext/object/inclusion.rb
@@ -1,15 +1,25 @@
 class Object
-  # Returns true if this object is included in the argument. Argument must be
-  # any object which responds to +#include?+. Usage:
+  # Returns true if this object is included in the argument(s). Argument must be
+  # any object which responds to +#include?+ or optionally, multiple arguments can be passed in. Usage:
   #
   #   characters = ["Konata", "Kagami", "Tsukasa"]
   #   "Konata".in?(characters) # => true
+  #   
+  #   character = "Konata"
+  #   character.in?("Konata", "Kagami", "Tsukasa") # => true
   #
-  # This will throw an ArgumentError if the argument doesn't respond
+  # This will throw an ArgumentError if a single argument is passed in and it doesn't respond
   # to +#include?+.
-  def in?(another_object)
-    another_object.include?(self)
-  rescue NoMethodError
-    raise ArgumentError.new("The parameter passed to #in? must respond to #include?")
+  def in?(*args)
+    if args.length > 1
+      args.include? self
+    else
+      another_object = args.first
+      if another_object.respond_to? :include?
+        another_object.include? self
+      else
+        raise ArgumentError.new("The single parameter passed to #in? must respond to #include?")
+      end
+    end
   end
 end
-- 
cgit v1.2.3


From 20cbf8eddc3844126d20f1218f068889d17b0dcf Mon Sep 17 00:00:00 2001
From: "Rahul P. Chaudhari" <rahul100885@gmail.com>
Date: Mon, 28 Nov 2011 12:05:39 +0530
Subject: Used any? instead of length call

---
 activesupport/lib/active_support/xml_mini/jdom.rb     | 2 +-
 activesupport/lib/active_support/xml_mini/nokogiri.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/xml_mini/jdom.rb b/activesupport/lib/active_support/xml_mini/jdom.rb
index 6c222b83ba..93a8474c05 100644
--- a/activesupport/lib/active_support/xml_mini/jdom.rb
+++ b/activesupport/lib/active_support/xml_mini/jdom.rb
@@ -70,7 +70,7 @@ module ActiveSupport
       hash = get_attributes(element)
 
       child_nodes = element.child_nodes
-      if child_nodes.length > 0
+      if child_nodes.any?
         for i in 0...child_nodes.length
           child = child_nodes.item(i)
           merge_element!(hash, child) unless child.node_type == Node.TEXT_NODE
diff --git a/activesupport/lib/active_support/xml_mini/nokogiri.rb b/activesupport/lib/active_support/xml_mini/nokogiri.rb
index 04ec9e8ab8..fb539e9c88 100644
--- a/activesupport/lib/active_support/xml_mini/nokogiri.rb
+++ b/activesupport/lib/active_support/xml_mini/nokogiri.rb
@@ -26,7 +26,7 @@ module ActiveSupport
       else
         data.ungetc(char)
         doc = Nokogiri::XML(data)
-        raise doc.errors.first if doc.errors.length > 0
+        raise doc.errors.first if doc.errors.any?
         doc.to_hash
       end
     end
-- 
cgit v1.2.3


From 152bd3c510a735dfb493017ecb487e931e9791a8 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 28 Nov 2011 11:07:01 +0100
Subject: Revert "Used any? instead of length call"

Reason: This is slower, and any? is not equivalent in the
general case.

See discussion in https://github.com/rails/rails/pull/3779

This reverts commit 20cbf8eddc3844126d20f1218f068889d17b0dcf.
---
 activesupport/lib/active_support/xml_mini/jdom.rb     | 2 +-
 activesupport/lib/active_support/xml_mini/nokogiri.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/xml_mini/jdom.rb b/activesupport/lib/active_support/xml_mini/jdom.rb
index 93a8474c05..6c222b83ba 100644
--- a/activesupport/lib/active_support/xml_mini/jdom.rb
+++ b/activesupport/lib/active_support/xml_mini/jdom.rb
@@ -70,7 +70,7 @@ module ActiveSupport
       hash = get_attributes(element)
 
       child_nodes = element.child_nodes
-      if child_nodes.any?
+      if child_nodes.length > 0
         for i in 0...child_nodes.length
           child = child_nodes.item(i)
           merge_element!(hash, child) unless child.node_type == Node.TEXT_NODE
diff --git a/activesupport/lib/active_support/xml_mini/nokogiri.rb b/activesupport/lib/active_support/xml_mini/nokogiri.rb
index fb539e9c88..04ec9e8ab8 100644
--- a/activesupport/lib/active_support/xml_mini/nokogiri.rb
+++ b/activesupport/lib/active_support/xml_mini/nokogiri.rb
@@ -26,7 +26,7 @@ module ActiveSupport
       else
         data.ungetc(char)
         doc = Nokogiri::XML(data)
-        raise doc.errors.first if doc.errors.any?
+        raise doc.errors.first if doc.errors.length > 0
         doc.to_hash
       end
     end
-- 
cgit v1.2.3


From 2a76f33b511c745fd511e0049e63c426bb511b67 Mon Sep 17 00:00:00 2001
From: Claudio Poli <masterkain@gmail.com>
Date: Tue, 29 Nov 2011 00:26:58 +0100
Subject: Fix typo in AS::TaggedLogging

---
 activesupport/lib/active_support/tagged_logging.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index a59fc26d5d..63e8837a07 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -30,7 +30,7 @@ module ActiveSupport
       @logger.add(severity, "#{tags_text}#{message}", progname, &block)
     end
 
-    %w( fatal error warn info debug unkown ).each do |severity|
+    %w( fatal error warn info debug unknown ).each do |severity|
       eval <<-EOM, nil, __FILE__, __LINE__ + 1
         def #{severity}(progname = nil, &block)
           add(Logger::#{severity.upcase}, progname, &block)
-- 
cgit v1.2.3


From d9c288207731e61c40ce6276fd91f0b800d3fabb Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 29 Nov 2011 15:40:46 -0800
Subject: Module#synchronize is deprecated with no replacement.  Please use
 `monitor` from ruby's standard library.

---
 activesupport/lib/active_support/core_ext/module/synchronization.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/module/synchronization.rb b/activesupport/lib/active_support/core_ext/module/synchronization.rb
index ed16c2f71b..061621c0ef 100644
--- a/activesupport/lib/active_support/core_ext/module/synchronization.rb
+++ b/activesupport/lib/active_support/core_ext/module/synchronization.rb
@@ -1,6 +1,7 @@
 require 'thread'
 require 'active_support/core_ext/module/aliasing'
 require 'active_support/core_ext/array/extract_options'
+require 'active_support/core_ext/module/deprecation'
 
 class Module
   # Synchronize access around a method, delegating synchronization to a
@@ -40,4 +41,5 @@ class Module
       alias_method_chain method, :synchronization
     end
   end
+  deprecate :synchronize
 end
-- 
cgit v1.2.3


From 38ab982cfff98570b5f12933cff489364845789c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 30 Nov 2011 09:52:52 +0100
Subject: Log 'Filter chain halted as CALLBACKNAME rendered or redirected'
 every time a before callback halts.

---
 activesupport/lib/active_support/callbacks.rb | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index ea37355fc1..11069301f1 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -81,6 +81,14 @@ module ActiveSupport
       send("_run_#{kind}_callbacks", *args, &block)
     end
 
+    private
+
+    # A hook invoked everytime a before callback is halted.
+    # This can be overriden in AS::Callback implementors in order
+    # to provide better debugging/logging.
+    def halted_callback_hook(filter)
+    end
+
     class Callback #:nodoc:#
       @@_callback_sequence = 0
 
@@ -173,12 +181,14 @@ module ActiveSupport
           # end
           <<-RUBY_EVAL
             if !halted && #{@compiled_options}
-              # This double assignment is to prevent warnings in 1.9.3.  I would
-              # remove the `result` variable, but apparently some other
-              # generated code is depending on this variable being set sometimes
-              # and sometimes not.
+              # This double assignment is to prevent warnings in 1.9.3 as
+              # the `result` variable is not always used except if the
+              # terminator code refers to it.
               result = result = #{@filter}
               halted = (#{chain.config[:terminator]})
+              if halted
+                halted_callback_hook(#{@raw_filter.inspect.inspect})
+              end
             end
           RUBY_EVAL
         when :around
-- 
cgit v1.2.3


From 45dad592e47944704ab6951351b2fa29d4a2385f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 30 Nov 2011 09:08:21 -0800
Subject: avoid hundreds of thousands of calls to (Symbol|String)#to_s

---
 activesupport/lib/active_support/dependencies.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 1372e71a61..cdd2664418 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -95,7 +95,7 @@ module ActiveSupport #:nodoc:
           next unless mod.is_a?(Module)
 
           # Get a list of the constants that were added
-          new_constants = mod.local_constant_names - original_constants
+          new_constants = mod.local_constants - original_constants
 
           # self[namespace] returns an Array of the constants that are being evaluated
           # for that namespace. For instance, if parent.rb requires child.rb, the first
@@ -123,7 +123,7 @@ module ActiveSupport #:nodoc:
         namespaces.map do |namespace|
           module_name = Dependencies.to_constant_name(namespace)
           original_constants = Dependencies.qualified_const_defined?(module_name) ?
-            Inflector.constantize(module_name).local_constant_names : []
+            Inflector.constantize(module_name).local_constants : []
 
           watching << module_name
           self[module_name] << original_constants
-- 
cgit v1.2.3


From be99f0c7eb4734011b9ee435bb5ac4a0b916a065 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 30 Nov 2011 09:46:35 -0800
Subject: Revert "avoid hundreds of thousands of calls to (Symbol|String)#to_s"
 Test coverage isn't comprehensive enough to catch what this breaks. :( This
 reverts commit 45dad592e47944704ab6951351b2fa29d4a2385f.

---
 activesupport/lib/active_support/dependencies.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index cdd2664418..1372e71a61 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -95,7 +95,7 @@ module ActiveSupport #:nodoc:
           next unless mod.is_a?(Module)
 
           # Get a list of the constants that were added
-          new_constants = mod.local_constants - original_constants
+          new_constants = mod.local_constant_names - original_constants
 
           # self[namespace] returns an Array of the constants that are being evaluated
           # for that namespace. For instance, if parent.rb requires child.rb, the first
@@ -123,7 +123,7 @@ module ActiveSupport #:nodoc:
         namespaces.map do |namespace|
           module_name = Dependencies.to_constant_name(namespace)
           original_constants = Dependencies.qualified_const_defined?(module_name) ?
-            Inflector.constantize(module_name).local_constants : []
+            Inflector.constantize(module_name).local_constant_names : []
 
           watching << module_name
           self[module_name] << original_constants
-- 
cgit v1.2.3


From 5b2eb64ceb08cd005dc06b721935de5853971473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 30 Nov 2011 18:38:28 +0100
Subject: Revert "Implement ArraySerializer and move old serialization API to a
 new namespace."

This reverts commit 8896b4fdc8a543157cdf4dfc378607ebf6c10ab0.

Conflicts:

	activemodel/lib/active_model.rb
	activemodel/lib/active_model/serializable.rb
	activemodel/lib/active_model/serializer.rb
	activemodel/test/cases/serializer_test.rb
---
 activesupport/lib/active_support/json/encoding.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index b0fd3a3c0e..925fa2a2c7 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -281,4 +281,4 @@ class DateTime
       strftime('%Y/%m/%d %H:%M:%S %z')
     end
   end
-end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From 5b3d4f07857e2f86ea8df702ba7c42e144b54970 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 30 Nov 2011 10:14:01 -0800
Subject: switch WatchStack to use composition, tighten up API

---
 activesupport/lib/active_support/dependencies.rb | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 1372e71a61..100b48312a 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -71,14 +71,20 @@ module ActiveSupport #:nodoc:
     #
     # This is handled by walking back up the watch stack and adding the constants
     # found by child.rb to the list of original constants in parent.rb
-    class WatchStack < Hash
+    class WatchStack
+      include Enumerable
+
       # @watching is a stack of lists of constants being watched. For instance,
       # if parent.rb is autoloaded, the stack will look like [[Object]]. If parent.rb
       # then requires namespace/child.rb, the stack will look like [[Object], [Namespace]].
 
       def initialize
         @watching = []
-        super { |h,k| h[k] = [] }
+        @stack = Hash.new { |h,k| h[k] = [] }
+      end
+
+      def each(&block)
+        @stack.each(&block)
       end
 
       # return a list of new constants found since the last call to watch_namespaces
@@ -89,7 +95,7 @@ module ActiveSupport #:nodoc:
         @watching.last.each do |namespace|
           # Retrieve the constants that were present under the namespace when watch_namespaces
           # was originally called
-          original_constants = self[namespace].last
+          original_constants = @stack[namespace].last
 
           mod = Inflector.constantize(namespace) if Dependencies.qualified_const_defined?(namespace)
           next unless mod.is_a?(Module)
@@ -102,7 +108,7 @@ module ActiveSupport #:nodoc:
           # element of self[Object] will be an Array of the constants that were present
           # before parent.rb was required. The second element will be an Array of the
           # constants that were present before child.rb was required.
-          self[namespace].each do |namespace_constants|
+          @stack[namespace].each do |namespace_constants|
             namespace_constants.concat(new_constants)
           end
 
@@ -126,13 +132,14 @@ module ActiveSupport #:nodoc:
             Inflector.constantize(module_name).local_constant_names : []
 
           watching << module_name
-          self[module_name] << original_constants
+          @stack[module_name] << original_constants
         end
         @watching << watching
       end
 
+      private
       def pop_modules(modules)
-        modules.each { |mod| self[mod].pop }
+        modules.each { |mod| @stack[mod].pop }
       end
     end
 
-- 
cgit v1.2.3


From 4d20de8a50d889a09e6f5642984775fe796ca943 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Fri, 2 Dec 2011 13:00:03 +0100
Subject: Added Enumerable#pluck to wrap the common pattern of
 collect(&:method) *DHH*

---
 activesupport/lib/active_support/core_ext/enumerable.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/enumerable.rb b/activesupport/lib/active_support/core_ext/enumerable.rb
index 9343bb7106..d9856f2e84 100644
--- a/activesupport/lib/active_support/core_ext/enumerable.rb
+++ b/activesupport/lib/active_support/core_ext/enumerable.rb
@@ -63,6 +63,13 @@ module Enumerable
     end
   end
 
+  # Plucks the value of the passed method for each element and returns the result as an array. Example:
+  #
+  #   people.pluck(:name) # => [ "David Heinemeier Hansson", "Jamie Heinemeier Hansson" ]
+  def pluck(method)
+    collect { |element| element.send(method) }
+  end
+
   # Iterates over a collection, passing the current element *and* the
   # +memo+ to the block. Handy for building up hashes or
   # reducing collections down to one object. Examples:
-- 
cgit v1.2.3


From 0e17cf17ebeb70490d7c7cd25c6bf8f9401e44b3 Mon Sep 17 00:00:00 2001
From: Jon Jensen <jenseng@gmail.com>
Date: Fri, 2 Dec 2011 12:55:33 -0700
Subject: Restore performance of ERB::Util.html_escape
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert html_escape to do a single gsub again, but add the "n" flag (no
language, i.e. not multi-byte) to protect against XSS via invalid utf8

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 activesupport/lib/active_support/core_ext/string/output_safety.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index 5d7f74bb65..7b359a039b 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -20,7 +20,7 @@ class ERB
       if s.html_safe?
         s
       else
-        s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;").html_safe
+        s.gsub(/[&"><]/n) { |special| HTML_ESCAPE[special] }.html_safe
       end
     end
 
-- 
cgit v1.2.3


From b942ae836e1fd846e7d59413b6e97ac8192c3069 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 5 Dec 2011 18:36:08 -0800
Subject: return value is never tested, so stop calling `presence`

---
 activesupport/lib/active_support/dependencies.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 100b48312a..2fcbdb0d3b 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -227,7 +227,7 @@ module ActiveSupport #:nodoc:
 
       def load_dependency(file)
         if Dependencies.load?
-          Dependencies.new_constants_in(Object) { yield }.presence
+          Dependencies.new_constants_in(Object) { yield }
         else
           yield
         end
-- 
cgit v1.2.3


From a2f7c1dc67b4cfd31d2b7840063b620ac1320d90 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 5 Dec 2011 18:36:27 -0800
Subject: make method signatures match the superclass signature

---
 activesupport/lib/active_support/dependencies.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 2fcbdb0d3b..989c7205fa 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -236,13 +236,13 @@ module ActiveSupport #:nodoc:
         raise
       end
 
-      def load(file, *)
+      def load(file, wrap = false)
         result = false
         load_dependency(file) { result = super }
         result
       end
 
-      def require(file, *)
+      def require(file)
         result = false
         load_dependency(file) { result = super }
         result
-- 
cgit v1.2.3


From 885a599303585b796da7a0a1c3ccd0bc5c642134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 6 Dec 2011 12:32:34 +0100
Subject: Just track "require" if we have something in the watching stack.

A patch has been provided earlier and we have asked for feedback:

    https://gist.github.com/1437939

Except one case, all other cases showed improvements in boot time.
---
 activesupport/lib/active_support/dependencies.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 989c7205fa..43dd22654a 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -87,6 +87,10 @@ module ActiveSupport #:nodoc:
         @stack.each(&block)
       end
 
+      def watching?
+        !@watching.empty?
+      end
+
       # return a list of new constants found since the last call to watch_namespaces
       def new_constants
         constants = []
@@ -226,7 +230,7 @@ module ActiveSupport #:nodoc:
       end
 
       def load_dependency(file)
-        if Dependencies.load?
+        if Dependencies.load? && ActiveSupport::Dependencies.constant_watch_stack.watching?
           Dependencies.new_constants_in(Object) { yield }
         else
           yield
-- 
cgit v1.2.3


From 6f253fb440d4979632ab7763e8cf353f9519cc35 Mon Sep 17 00:00:00 2001
From: Mark Rushakoff <mark.rushakoff@gmail.com>
Date: Wed, 7 Dec 2011 23:14:02 -0800
Subject: Fix inflection regexes for mouse, mice

---
 activesupport/lib/active_support/inflections.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/inflections.rb b/activesupport/lib/active_support/inflections.rb
index daf2a1e1d9..527cce2594 100644
--- a/activesupport/lib/active_support/inflections.rb
+++ b/activesupport/lib/active_support/inflections.rb
@@ -16,8 +16,8 @@ module ActiveSupport
     inflect.plural(/([^aeiouy]|qu)y$/i, '\1ies')
     inflect.plural(/(x|ch|ss|sh)$/i, '\1es')
     inflect.plural(/(matr|vert|ind)(?:ix|ex)$/i, '\1ices')
-    inflect.plural(/([m|l])ouse$/i, '\1ice')
-    inflect.plural(/([m|l])ice$/i, '\1ice')
+    inflect.plural(/(m|l)ouse$/i, '\1ice')
+    inflect.plural(/(m|l)ice$/i, '\1ice')
     inflect.plural(/^(ox)$/i, '\1en')
     inflect.plural(/^(oxen)$/i, '\1')
     inflect.plural(/(quiz)$/i, '\1zes')
@@ -35,7 +35,7 @@ module ActiveSupport
     inflect.singular(/(s)eries$/i, '\1eries')
     inflect.singular(/(m)ovies$/i, '\1ovie')
     inflect.singular(/(x|ch|ss|sh)es$/i, '\1')
-    inflect.singular(/([m|l])ice$/i, '\1ouse')
+    inflect.singular(/(m|l)ice$/i, '\1ouse')
     inflect.singular(/(bus)es$/i, '\1')
     inflect.singular(/(o)es$/i, '\1')
     inflect.singular(/(shoe)s$/i, '\1')
-- 
cgit v1.2.3


From d1abf29e796a86cbac315da217f3fe7addb88106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 8 Dec 2011 20:21:48 +0100
Subject: Remove NilClass whiners feature.

Removing this feature causes boost in performance when using Ruby 1.9.

Ruby 1.9 started to do implicit conversions using `to_ary` and `to_str`
in some STDLIB methods (like Array#join). To do such implicit conversions,
Ruby 1.9 always dispatches the method and rescues the NoMethodError exception
in case one is raised.

Therefore, since the whiners feature defined NilClass#method_missing, such
implicit conversions for nil became much, much slower. In fact, just defining
NilClass#method_missing (even without the whiners feature) already causes a
massive slow down. Here is a snippet that shows such slow down:

    require "benchmark"
    Benchmark.realtime { 1_000.times { [nil,nil,nil].join } }

    class NilClass
      def method_missing(*args)
        raise NoMethodError
      end
    end

    Benchmark.realtime { 1_000.times { [nil,nil,nil].join } }
---
 activesupport/lib/active_support/whiny_nil.rb | 42 ++-------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/whiny_nil.rb b/activesupport/lib/active_support/whiny_nil.rb
index 577db5018e..a065233679 100644
--- a/activesupport/lib/active_support/whiny_nil.rb
+++ b/activesupport/lib/active_support/whiny_nil.rb
@@ -1,21 +1,6 @@
 # Extensions to +nil+ which allow for more helpful error messages for people who
 # are new to Rails.
 #
-# Ruby raises NoMethodError if you invoke a method on an object that does not
-# respond to it:
-#
-#   $ ruby -e nil.destroy
-#   -e:1: undefined method `destroy' for nil:NilClass (NoMethodError)
-#
-# With these extensions, if the method belongs to the public interface of the
-# classes in NilClass::WHINERS the error message suggests which could be the
-# actual intended class:
-#
-#   $ rails runner nil.destroy
-#   ...
-#   You might have expected an instance of ActiveRecord::Base.
-#   ...
-#
 # NilClass#id exists in Ruby 1.8 (though it is deprecated). Since +id+ is a fundamental
 # method of Active Record models NilClass#id is redefined as well to raise a RuntimeError
 # and warn the user. She probably wanted a model database identifier and the 4
@@ -25,36 +10,13 @@
 # By default it is on in development and test modes, and it is off in production
 # mode.
 class NilClass
-  METHOD_CLASS_MAP = Hash.new
-
   def self.add_whiner(klass)
-    methods = klass.public_instance_methods - public_instance_methods
-    class_name = klass.name
-    methods.each { |method| METHOD_CLASS_MAP[method.to_sym] = class_name }
+    ActiveSupport::Deprecation.warn "NilClass.add_whiner is deprecated and this functionality is " \
+      "removed from Rails versions as it affects Ruby 1.9 performance.", caller
   end
 
-  add_whiner ::Array
-
   # Raises a RuntimeError when you attempt to call +id+ on +nil+.
   def id
     raise RuntimeError, "Called id for nil, which would mistakenly be #{object_id} -- if you really wanted the id of nil, use object_id", caller
   end
-
-  private
-    def method_missing(method, *args)
-      if 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+.
-    def raise_nil_warning_for(class_name = nil, selector = nil, with_caller = nil)
-      message = "You have a nil object when you didn't expect it!"
-      message << "\nYou might have expected an instance of #{class_name}." if class_name
-      message << "\nThe error occurred while evaluating nil.#{selector}" if selector
-
-      raise NoMethodError, message, with_caller || caller
-    end
 end
-- 
cgit v1.2.3


From 94dcbe8115810b4545ca8011e6c1e5386cb1c842 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Fri, 9 Dec 2011 01:15:54 +0530
Subject: fix nodocs

---
 activesupport/lib/active_support/core_ext/string/multibyte.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/string/multibyte.rb b/activesupport/lib/active_support/core_ext/string/multibyte.rb
index aae1cfccf2..400db2ce39 100644
--- a/activesupport/lib/active_support/core_ext/string/multibyte.rb
+++ b/activesupport/lib/active_support/core_ext/string/multibyte.rb
@@ -44,7 +44,7 @@ class String
       end
     end
 
-    def is_utf8? #:nodoc
+    def is_utf8?
       case encoding
       when Encoding::UTF_8
         valid_encoding?
-- 
cgit v1.2.3


From 04ef93dae6d9cec616973c1110a33894ad4ba6ed Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 9 Dec 2011 16:03:18 -0800
Subject: *   ActiveSupport::BufferedLogger#silence is deprecated.  If you want
 to squelch     logs for a certain block, change the log level for that block.

*   ActiveSupport::BufferedLogger#open_log is deprecated.  This method should
    not have been public in the first place.

*   ActiveSupport::BufferedLogger's behavior of automatically creating the
    directory for your log file is deprecated.  Please make sure to create the
    directory for your log file before instantiating.

*   ActiveSupport::BufferedLogger#auto_flushing is deprecated.  Either set the
    sync level on the underlying file handle like this:

        f = File.open('foo.log', 'w')
        f.sync = true
        ActiveSupport::BufferedLogger.new f

    Or tune your filesystem.  The FS cache is now what controls flushing.

*   ActiveSupport::BufferedLogger#flush is deprecated.  Set sync on your
    filehandle, or tune your filesystem.
---
 .../lib/active_support/buffered_logger.rb          | 112 ++++++---------------
 activesupport/lib/active_support/tagged_logging.rb |   3 +-
 2 files changed, 34 insertions(+), 81 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
index 136e245859..fc01225966 100644
--- a/activesupport/lib/active_support/buffered_logger.rb
+++ b/activesupport/lib/active_support/buffered_logger.rb
@@ -1,5 +1,8 @@
 require 'thread'
+require 'logger'
 require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/deprecation'
+require 'fileutils'
 
 module ActiveSupport
   # Inspired by the buffered logger idea by Ezra
@@ -25,40 +28,35 @@ module ActiveSupport
     # Silences the logger for the duration of the block.
     def silence(temporary_level = ERROR)
       if silencer
-        old_logger_level = @tmp_levels[Thread.current]
         begin
-          @tmp_levels[Thread.current] = temporary_level
-          yield self
+          logger = self.class.new @log_dest, temporary_level
+          yield logger
         ensure
-          if old_logger_level
-            @tmp_levels[Thread.current] = old_logger_level
-          else
-            @tmp_levels.delete(Thread.current)
-          end
+          logger.close
         end
       else
         yield self
       end
     end
+    deprecate :silence
 
-    attr_writer :level
     attr_reader :auto_flushing
+    deprecate :auto_flushing
 
     def initialize(log, level = DEBUG)
       @level         = level
-      @tmp_levels    = {}
-      @buffer        = Hash.new { |h,k| h[k] = [] }
-      @auto_flushing = 1
-      @guard = Mutex.new
-
-      if log.respond_to?(:write)
-        @log = log
-      elsif File.exist?(log)
-        @log = open_log(log, (File::WRONLY | File::APPEND))
-      else
-        FileUtils.mkdir_p(File.dirname(log))
-        @log = open_log(log, (File::WRONLY | File::APPEND | File::CREAT))
+      @log_dest      = log
+
+      unless log.respond_to?(:write)
+        unless File.exist?(File.dirname(log))
+          ActiveSupport::Deprecation.warn(<<-eowarn)
+Automatic directory creation for '#{log}' is deprecated.  Please make sure the directory for your log file exists before creating the logger.
+          eowarn
+          FileUtils.mkdir_p(File.dirname(log))
+        end
       end
+
+      @log = open_logfile log
     end
 
     def open_log(log, mode)
@@ -67,20 +65,18 @@ module ActiveSupport
         open_log.sync = true
       end
     end
+    deprecate :open_log
 
     def level
-      @tmp_levels[Thread.current] || @level
+      @log.level
+    end
+
+    def level=(l)
+      @log.level = l
     end
 
     def add(severity, message = nil, progname = nil, &block)
-      return if level > severity
-      message = (message || (block && block.call) || progname).to_s
-      # If a newline is necessary then create a new message ending with a newline.
-      # Ensures that the original message is not mutated.
-      message = "#{message}\n" unless message[-1] == ?\n
-      buffer << message
-      auto_flush
-      message
+      @log.add(severity, message, progname, &block)
     end
 
     # Dynamically add methods such as:
@@ -104,62 +100,20 @@ module ActiveSupport
     # never auto-flush. If you turn auto-flushing off, be sure to regularly
     # flush the log yourself -- it will eat up memory until you do.
     def auto_flushing=(period)
-      @auto_flushing =
-        case period
-        when true;                1
-        when false, nil, 0;       MAX_BUFFER_SIZE
-        when Integer;             period
-        else raise ArgumentError, "Unrecognized auto_flushing period: #{period.inspect}"
-        end
     end
+    deprecate :auto_flushing=
 
     def flush
-      @guard.synchronize do
-        write_buffer(buffer)
-
-        # Important to do this even if buffer was empty or else @buffer will
-        # accumulate empty arrays for each request where nothing was logged.
-        clear_buffer
-
-        # Clear buffers associated with dead threads or else spawned threads
-        # that don't call flush will result in a memory leak.
-        flush_dead_buffers
-      end
     end
+    deprecate :flush
 
     def close
-      flush
-      @log.close if @log.respond_to?(:close)
-      @log = nil
+      @log.close
     end
 
-    protected
-      def auto_flush
-        flush if buffer.size >= @auto_flushing
-      end
-
-      def buffer
-        @buffer[Thread.current]
-      end
-
-      def clear_buffer
-        @buffer.delete(Thread.current)
-      end
-
-      # Find buffers created by threads that are no longer alive and flush them to the log
-      # in order to prevent memory leaks from spawned threads.
-      def flush_dead_buffers #:nodoc:
-        @buffer.keys.reject{|thread| thread.alive?}.each do |thread|
-          buffer = @buffer[thread]
-          write_buffer(buffer)
-          @buffer.delete(thread)
-        end
-      end
-
-      def write_buffer(buffer)
-        buffer.each do |content|
-          @log.write(content)
-        end
-      end
+    private
+    def open_logfile(log)
+      Logger.new log
+    end
   end
 end
diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index 63e8837a07..c3c61e178e 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -38,9 +38,8 @@ module ActiveSupport
       EOM
     end
 
-    def flush(*args)
+    def flush
       @tags.delete(Thread.current)
-      @logger.flush(*args) if @logger.respond_to?(:flush)
     end
 
     def method_missing(method, *args)
-- 
cgit v1.2.3


From cd7fbcbba82c08aeaac791e4d8ff3f789e628b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 10 Dec 2011 11:17:00 +0100
Subject: Fix AS test suite.

---
 activesupport/lib/active_support/tagged_logging.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index c3c61e178e..0f3ac0c132 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -40,6 +40,7 @@ module ActiveSupport
 
     def flush
       @tags.delete(Thread.current)
+      @logger.flush if @logger.respond_to?(:flush)
     end
 
     def method_missing(method, *args)
-- 
cgit v1.2.3


From 4beaa9b839c3ab0574a18174018adae109212c0e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sat, 10 Dec 2011 16:31:59 -0800
Subject: Try to keep people from calling the deprecated flush method.

---
 activesupport/lib/active_support/buffered_logger.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
index fc01225966..71308eed67 100644
--- a/activesupport/lib/active_support/buffered_logger.rb
+++ b/activesupport/lib/active_support/buffered_logger.rb
@@ -107,6 +107,11 @@ Automatic directory creation for '#{log}' is deprecated.  Please make sure the d
     end
     deprecate :flush
 
+    def respond_to?(method, include_private = false)
+      return false if method.to_s == "flush"
+      super
+    end
+
     def close
       @log.close
     end
-- 
cgit v1.2.3


From 3d6eafe32ed498784dba2b9782bbf7df47ebeb6b Mon Sep 17 00:00:00 2001
From: Miles Georgi <azimux@gmail.com>
Date: Sun, 11 Dec 2011 12:59:59 -0800
Subject: Overrode Hash#nested_under_indifferent_access in
 HashWithIndifferentAccess to return self.

---
 activesupport/lib/active_support/hash_with_indifferent_access.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb
index 636f019cd5..674e4acfd6 100644
--- a/activesupport/lib/active_support/hash_with_indifferent_access.rb
+++ b/activesupport/lib/active_support/hash_with_indifferent_access.rb
@@ -16,6 +16,10 @@ module ActiveSupport
       dup
     end
 
+    def nested_under_indifferent_access
+      self
+    end
+
     def initialize(constructor = {})
       if constructor.is_a?(Hash)
         super()
-- 
cgit v1.2.3


From 63cd9432265a32d222353b535d60333c2a6a5125 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 11 Dec 2011 15:30:05 -0700
Subject: Use 1.9 native XML escaping to speed up html_escape and shush regexp
 warnings

        length      user     system      total        real
before  6      0.010000   0.000000   0.010000 (  0.012378)
after   6      0.010000   0.000000   0.010000 (  0.012866)
before  60     0.040000   0.000000   0.040000 (  0.046273)
after   60     0.040000   0.000000   0.040000 (  0.036421)
before  600    0.390000   0.000000   0.390000 (  0.390670)
after   600    0.210000   0.000000   0.210000 (  0.209094)
before  6000   3.750000   0.000000   3.750000 (  3.751008)
after   6000   1.860000   0.000000   1.860000 (  1.857901)
---
 .../core_ext/string/output_safety.rb               | 51 +++++++++++++++-------
 1 file changed, 36 insertions(+), 15 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index 7b359a039b..c58ea16b44 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -6,21 +6,42 @@ class ERB
     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(/[&"><]/n) { |special| HTML_ESCAPE[special] }.html_safe
+    # Detect whether 1.9 can transcode with XML escaping.
+    if '"&gt;&lt;&amp;&quot;"' == ('><&"'.encode('utf-8', :xml => :attr) rescue false)
+      # 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.encode(s.encoding, :xml => :attr)[1...-1].html_safe
+        end
+      end
+    else
+      # 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(/[&"><]/n) { |special| HTML_ESCAPE[special] }.html_safe
+        end
       end
     end
 
-- 
cgit v1.2.3


From 9147613ce09710e70790ac45d3b20c3ef6c1fa46 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 11 Dec 2011 15:56:21 -0700
Subject: Remove duplicate html_escape docs

---
 .../lib/active_support/core_ext/string/output_safety.rb       | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index c58ea16b44..c6d861d124 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -26,16 +26,7 @@ class ERB
         end
       end
     else
-      # 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)
+      def html_escape(s) #:nodoc:
         s = s.to_s
         if s.html_safe?
           s
-- 
cgit v1.2.3


From 57e0c038d627fe0c5d85883a0a29c17257f9c4e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 12 Dec 2011 14:53:25 +0100
Subject: Allow FileUpdateChecker to work with globs.

---
 activesupport/lib/active_support/file_update_checker.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/file_update_checker.rb b/activesupport/lib/active_support/file_update_checker.rb
index f76ddff038..9d617b39d4 100644
--- a/activesupport/lib/active_support/file_update_checker.rb
+++ b/activesupport/lib/active_support/file_update_checker.rb
@@ -22,7 +22,9 @@ module ActiveSupport
     end
 
     def updated_at
-      paths.map { |path| File.mtime(path) }.max
+      # TODO: Use Enumerable check once we get rid of 1.8.7
+      all = paths.is_a?(Array) ? paths : Dir[paths]
+      all.map { |path| File.mtime(path) }.max
     end
 
     def execute_if_updated
-- 
cgit v1.2.3


From 9a51053c1d0fe4db66f82c93454b8fd8e6d7e192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 12 Dec 2011 18:19:28 +0100
Subject: Update checker returns a boolean if callback was executed or not.

---
 activesupport/lib/active_support/file_update_checker.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/file_update_checker.rb b/activesupport/lib/active_support/file_update_checker.rb
index 9d617b39d4..da96d3e64d 100644
--- a/activesupport/lib/active_support/file_update_checker.rb
+++ b/activesupport/lib/active_support/file_update_checker.rb
@@ -32,6 +32,9 @@ module ActiveSupport
       if @last_update_at != current_update_at
         @last_update_at = current_update_at
         @block.call
+        true
+      else
+        false
       end
     end
   end
-- 
cgit v1.2.3


From 04d5eae4e835ead8ef785de4eb442893426f4b29 Mon Sep 17 00:00:00 2001
From: Brian Durand <brian@embellishedvisions.com>
Date: Mon, 12 Dec 2011 13:40:29 -0600
Subject: Add ActiveSupport::Cache::NullStore to expose caching interface
 without actually caching for development and test environments.

---
 activesupport/lib/active_support/cache.rb          |  1 +
 .../lib/active_support/cache/null_store.rb         | 44 ++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 activesupport/lib/active_support/cache/null_store.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 07f5fcdeb3..9711ed6f73 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -16,6 +16,7 @@ module ActiveSupport
     autoload :FileStore, 'active_support/cache/file_store'
     autoload :MemoryStore, 'active_support/cache/memory_store'
     autoload :MemCacheStore, 'active_support/cache/mem_cache_store'
+    autoload :NullStore, 'active_support/cache/null_store'
 
     # These options mean something to all cache implementations. Individual cache
     # implementations may support additional options.
diff --git a/activesupport/lib/active_support/cache/null_store.rb b/activesupport/lib/active_support/cache/null_store.rb
new file mode 100644
index 0000000000..4427eaafcd
--- /dev/null
+++ b/activesupport/lib/active_support/cache/null_store.rb
@@ -0,0 +1,44 @@
+module ActiveSupport
+  module Cache
+    # A cache store implementation which doesn't actually store anything. Useful in
+    # development and test environments where you don't want caching turned on but
+    # need to go through the caching interface.
+    #
+    # This cache does implement the local cache strategy, so values will actually
+    # be cached inside blocks that utilize this strategy. See
+    # ActiveSupport::Cache::Strategy::LocalCache for more details.
+    class NullStore < Store
+      def initialize(options = nil)
+        super(options)
+        extend Strategy::LocalCache
+      end
+
+      def clear(options = nil)
+      end
+
+      def cleanup(options = nil)
+      end
+
+      def increment(name, amount = 1, options = nil)
+      end
+
+      def decrement(name, amount = 1, options = nil)
+      end
+
+      def delete_matched(matcher, options = nil)
+      end
+
+      protected
+        def read_entry(key, options) # :nodoc:
+        end
+
+        def write_entry(key, entry, options) # :nodoc:
+          true
+        end
+
+        def delete_entry(key, options) # :nodoc:
+          false
+        end
+    end
+  end
+end
-- 
cgit v1.2.3


From 62cda03fa824ce1e1fc92aaee0367c29ade6a504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 12 Dec 2011 20:26:04 +0100
Subject: Provide a dir => extension API to file update checker.

---
 .../lib/active_support/file_update_checker.rb      | 43 +++++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/file_update_checker.rb b/activesupport/lib/active_support/file_update_checker.rb
index da96d3e64d..77bc5388d6 100644
--- a/activesupport/lib/active_support/file_update_checker.rb
+++ b/activesupport/lib/active_support/file_update_checker.rb
@@ -1,3 +1,6 @@
+require "active_support/core_ext/array/wrap"
+require "active_support/core_ext/array/extract_options"
+
 module ActiveSupport
   # This class is responsible to track files and invoke the given block
   # whenever one of these files are changed. For example, this class
@@ -15,15 +18,34 @@ module ActiveSupport
   class FileUpdateChecker
     attr_reader :paths, :last_update_at
 
+    # It accepts two parameters on initialization. The first is
+    # the *paths* and the second is *calculate*, a boolean.
+    #
+    # paths must be an array of file paths but can contain a hash as
+    # last argument. The hash must have directories as keys and the
+    # value is an array of extensions to be watched under that directory.
+    #
+    # If *calculate* is true, the latest updated at will calculated
+    # on initialization, therefore, the first call to execute_if_updated
+    # will only evaluate the block if something really changed.
+    #
+    # This method must also receive a block that will be the block called
+    # once a file changes.
+    #
+    # This particular implementation checks for added files and updated files,
+    # but not removed files. Directories lookup are compiled to a glob for
+    # performance.
     def initialize(paths, calculate=false, &block)
       @paths = paths
+      @glob  = compile_glob(@paths.extract_options!)
       @block = block
       @last_update_at = calculate ? updated_at : nil
     end
 
     def updated_at
-      # TODO: Use Enumerable check once we get rid of 1.8.7
-      all = paths.is_a?(Array) ? paths : Dir[paths]
+      all = []
+      all.concat @paths
+      all.concat Dir[@glob] if @glob
       all.map { |path| File.mtime(path) }.max
     end
 
@@ -37,5 +59,22 @@ module ActiveSupport
         false
       end
     end
+
+    private
+
+    def compile_glob(hash)
+      return if hash.empty?
+      globs = []
+      hash.each do |key, value|
+        globs << "#{key}/**/*#{compile_ext(value)}"
+      end
+      "{#{globs.join(",")}}"
+    end
+
+    def compile_ext(array)
+      array = Array.wrap(array)
+      return if array.empty?
+      ".{#{array.join(",")}}"
+    end
   end
 end
-- 
cgit v1.2.3


From fa1d9a884c0d5b70c97442e3360ac98ca5fa4340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 12 Dec 2011 22:51:33 +0100
Subject: Speed up development by only reloading classes if dependencies files
 changed.

This can be turned off by setting `config.reload_classes_only_on_change` to false.

Extensions like Active Record should add their respective files like db/schema.rb and db/structure.sql to `config.watchable_files` if they want their changes to affect classes reloading.

Thanks to https://github.com/paneq/active_reload and Pastorino for the inspiration. <3
---
 .../lib/active_support/file_update_checker.rb      | 43 +++++++++++++++++-----
 activesupport/lib/active_support/i18n_railtie.rb   |  3 +-
 2 files changed, 35 insertions(+), 11 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/file_update_checker.rb b/activesupport/lib/active_support/file_update_checker.rb
index 77bc5388d6..4137bbf6a0 100644
--- a/activesupport/lib/active_support/file_update_checker.rb
+++ b/activesupport/lib/active_support/file_update_checker.rb
@@ -39,30 +39,53 @@ module ActiveSupport
       @paths = paths
       @glob  = compile_glob(@paths.extract_options!)
       @block = block
+      @updated_at = nil
       @last_update_at = calculate ? updated_at : nil
     end
 
-    def updated_at
-      all = []
-      all.concat @paths
-      all.concat Dir[@glob] if @glob
-      all.map { |path| File.mtime(path) }.max
+    # Check if any of the entries were updated. If so, the updated_at
+    # value is cached until flush! is called.
+    def updated?
+      current_updated_at = updated_at
+      if @last_update_at != current_updated_at
+        @updated_at = updated_at
+        true
+      else
+        false
+      end
     end
 
+    # Flush the cache so updated? is calculated again
+    def flush!
+      @updated_at = nil
+    end
+
+    # Execute the block given if updated. This call
+    # always flush the cache.
     def execute_if_updated
-      current_update_at = self.updated_at
-      if @last_update_at != current_update_at
-        @last_update_at = current_update_at
+      if updated?
+        @last_update_at = updated_at
         @block.call
         true
       else
         false
       end
+    ensure
+      flush!
     end
 
     private
 
-    def compile_glob(hash)
+    def updated_at #:nodoc:
+      @updated_at || begin
+        all = []
+        all.concat @paths
+        all.concat Dir[@glob] if @glob
+        all.map { |path| File.mtime(path) }.max
+      end
+    end
+
+    def compile_glob(hash) #:nodoc:
       return if hash.empty?
       globs = []
       hash.each do |key, value|
@@ -71,7 +94,7 @@ module ActiveSupport
       "{#{globs.join(",")}}"
     end
 
-    def compile_ext(array)
+    def compile_ext(array) #:nodoc:
       array = Array.wrap(array)
       return if array.empty?
       ".{#{array.join(",")}}"
diff --git a/activesupport/lib/active_support/i18n_railtie.rb b/activesupport/lib/active_support/i18n_railtie.rb
index 4c59fe9ac9..a989ff8f57 100644
--- a/activesupport/lib/active_support/i18n_railtie.rb
+++ b/activesupport/lib/active_support/i18n_railtie.rb
@@ -17,7 +17,8 @@ module I18n
     # point, no path was added to the reloader, I18n.reload! is not triggered
     # on to_prepare callbacks. This will only happen on the config.after_initialize
     # callback below.
-    initializer "i18n.callbacks" do
+    initializer "i18n.callbacks" do |app|
+      app.reloaders << I18n::Railtie.reloader
       ActionDispatch::Reloader.to_prepare do
         I18n::Railtie.reloader.execute_if_updated
       end
-- 
cgit v1.2.3


From 1f5b9bbdb377c1b0e29650a103bf53526ceefdd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 13 Dec 2011 10:07:02 +0100
Subject: Clean up FileUpdateChecker API.

---
 .../lib/active_support/file_update_checker.rb      | 25 +++++++++++-----------
 activesupport/lib/active_support/i18n_railtie.rb   |  8 +++++--
 2 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/file_update_checker.rb b/activesupport/lib/active_support/file_update_checker.rb
index 4137bbf6a0..3028fbdd00 100644
--- a/activesupport/lib/active_support/file_update_checker.rb
+++ b/activesupport/lib/active_support/file_update_checker.rb
@@ -16,8 +16,6 @@ module ActiveSupport
   #   end
   #
   class FileUpdateChecker
-    attr_reader :paths, :last_update_at
-
     # It accepts two parameters on initialization. The first is
     # the *paths* and the second is *calculate*, a boolean.
     #
@@ -29,12 +27,13 @@ module ActiveSupport
     # on initialization, therefore, the first call to execute_if_updated
     # will only evaluate the block if something really changed.
     #
-    # This method must also receive a block that will be the block called
-    # once a file changes.
+    # This method must also receive a block that will be called once a file changes.
     #
     # This particular implementation checks for added files and updated files,
     # but not removed files. Directories lookup are compiled to a glob for
-    # performance.
+    # performance. Therefore, while someone can add new files to paths after
+    # initialization, adding new directories is not allowed. Notice that,
+    # depending on the implementation, not even new files may be added.
     def initialize(paths, calculate=false, &block)
       @paths = paths
       @glob  = compile_glob(@paths.extract_options!)
@@ -44,7 +43,7 @@ module ActiveSupport
     end
 
     # Check if any of the entries were updated. If so, the updated_at
-    # value is cached until flush! is called.
+    # value is cached until the block is executed via +execute+ or +execute_if_updated+
     def updated?
       current_updated_at = updated_at
       if @last_update_at != current_updated_at
@@ -55,8 +54,11 @@ module ActiveSupport
       end
     end
 
-    # Flush the cache so updated? is calculated again
-    def flush!
+    # Executes the given block expiring any internal cache.
+    def execute
+      @last_update_at = updated_at
+      @block.call
+    ensure
       @updated_at = nil
     end
 
@@ -64,14 +66,11 @@ module ActiveSupport
     # always flush the cache.
     def execute_if_updated
       if updated?
-        @last_update_at = updated_at
-        @block.call
+        execute
         true
       else
         false
       end
-    ensure
-      flush!
     end
 
     private
@@ -86,7 +85,9 @@ module ActiveSupport
     end
 
     def compile_glob(hash) #:nodoc:
+      hash.freeze # Freeze so changes aren't accidently pushed
       return if hash.empty?
+
       globs = []
       hash.each do |key, value|
         globs << "#{key}/**/*#{compile_ext(value)}"
diff --git a/activesupport/lib/active_support/i18n_railtie.rb b/activesupport/lib/active_support/i18n_railtie.rb
index a989ff8f57..ae3a39562c 100644
--- a/activesupport/lib/active_support/i18n_railtie.rb
+++ b/activesupport/lib/active_support/i18n_railtie.rb
@@ -10,7 +10,11 @@ module I18n
     config.i18n.fallbacks = ActiveSupport::OrderedOptions.new
 
     def self.reloader
-      @reloader ||= ActiveSupport::FileUpdateChecker.new([]){ I18n.reload! }
+      @reloader ||= ActiveSupport::FileUpdateChecker.new(reloader_paths){ I18n.reload! }
+    end
+
+    def self.reloader_paths
+      @reloader_paths ||= []
     end
 
     # Add <tt>I18n::Railtie.reloader</tt> to ActionDispatch callbacks. Since, at this
@@ -59,7 +63,7 @@ module I18n
 
       init_fallbacks(fallbacks) if fallbacks && validate_fallbacks(fallbacks)
 
-      reloader.paths.concat I18n.load_path
+      reloader_paths.concat I18n.load_path
       reloader.execute_if_updated
 
       @i18n_inited = true
-- 
cgit v1.2.3


From d060d6d1317b9043cafe0aa9f8e36a70b72b5d33 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Tue, 13 Dec 2011 12:36:32 +0300
Subject: missing require in buffered logger

---
 activesupport/lib/active_support/buffered_logger.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
index 71308eed67..775f9928e6 100644
--- a/activesupport/lib/active_support/buffered_logger.rb
+++ b/activesupport/lib/active_support/buffered_logger.rb
@@ -1,5 +1,6 @@
 require 'thread'
 require 'logger'
+require 'active_support/core_ext/logger'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/deprecation'
 require 'fileutils'
-- 
cgit v1.2.3


From 80256abb39332dd49996b909d6f0413a15291a90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 13 Dec 2011 11:23:21 +0100
Subject: FileUpdateChecker should be able to handle deleted files.

---
 .../lib/active_support/file_update_checker.rb      | 73 +++++++++++++---------
 activesupport/lib/active_support/i18n_railtie.rb   |  2 +-
 2 files changed, 46 insertions(+), 29 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/file_update_checker.rb b/activesupport/lib/active_support/file_update_checker.rb
index 3028fbdd00..a4ad2da137 100644
--- a/activesupport/lib/active_support/file_update_checker.rb
+++ b/activesupport/lib/active_support/file_update_checker.rb
@@ -2,10 +2,27 @@ require "active_support/core_ext/array/wrap"
 require "active_support/core_ext/array/extract_options"
 
 module ActiveSupport
-  # This class is responsible to track files and invoke the given block
-  # whenever one of these files are changed. For example, this class
-  # is used by Rails to reload the I18n framework whenever they are
-  # changed upon a new request.
+  # \FileUpdateChecker specifies the API used by Rails to watch files
+  # and control reloading. The API depends on four methods:
+  #
+  # * +initialize+ which expects two parameters and one block as
+  #   described below;
+  #
+  # * +updated?+ which returns a boolean if there were updates in
+  #   the filesystem or not;
+  #
+  # * +execute+ which executes the given block on initialization
+  #   and updates the counter to the latest timestamp;
+  #
+  # * +execute_if_updated+ which just executes the block if it was updated;
+  #
+  # After initialization, a call to +execute_if_updated+ must execute
+  # the block only if there was really a change in the filesystem.
+  #
+  # == Examples
+  #
+  # This class is used by Rails to reload the I18n framework whenever
+  # they are changed upon a new request.
   #
   #   i18n_reloader = ActiveSupport::FileUpdateChecker.new(paths) do
   #     I18n.reload!
@@ -16,37 +33,38 @@ module ActiveSupport
   #   end
   #
   class FileUpdateChecker
-    # It accepts two parameters on initialization. The first is
-    # the *paths* and the second is *calculate*, a boolean.
-    #
-    # paths must be an array of file paths but can contain a hash as
-    # last argument. The hash must have directories as keys and the
-    # value is an array of extensions to be watched under that directory.
+    # It accepts two parameters on initialization. The first is an array
+    # of files and the second is an optional hash of directories. The hash must
+    # have directories as keys and the value is an array of extensions to be
+    # watched under that directory.
     #
-    # If *calculate* is true, the latest updated at will calculated
-    # on initialization, therefore, the first call to execute_if_updated
-    # will only evaluate the block if something really changed.
+    # This method must also receive a block that will be called once a path changes.
     #
-    # This method must also receive a block that will be called once a file changes.
+    # == Implementation details
     #
-    # This particular implementation checks for added files and updated files,
+    # This particular implementation checks for added and updated files,
     # but not removed files. Directories lookup are compiled to a glob for
-    # performance. Therefore, while someone can add new files to paths after
-    # initialization, adding new directories is not allowed. Notice that,
-    # depending on the implementation, not even new files may be added.
-    def initialize(paths, calculate=false, &block)
-      @paths = paths
-      @glob  = compile_glob(@paths.extract_options!)
+    # performance. Therefore, while someone can add new files to the +files+
+    # array after initialization (and parts of Rails do depend on this feature),
+    # adding new directories after initialization is not allowed.
+    #
+    # Notice that other objects that implements FileUpdateChecker API may
+    # not even allow new files to be added after initialization. If this
+    # is the case, we recommend freezing the +files+ after initialization to
+    # avoid changes that won't make effect.
+    def initialize(files, dirs={}, &block)
+      @files = files
+      @glob  = compile_glob(dirs)
       @block = block
       @updated_at = nil
-      @last_update_at = calculate ? updated_at : nil
+      @last_update_at = updated_at
     end
 
     # Check if any of the entries were updated. If so, the updated_at
     # value is cached until the block is executed via +execute+ or +execute_if_updated+
     def updated?
       current_updated_at = updated_at
-      if @last_update_at != current_updated_at
+      if @last_update_at < current_updated_at
         @updated_at = updated_at
         true
       else
@@ -54,7 +72,7 @@ module ActiveSupport
       end
     end
 
-    # Executes the given block expiring any internal cache.
+    # Executes the given block and updates the counter to latest timestamp.
     def execute
       @last_update_at = updated_at
       @block.call
@@ -62,8 +80,7 @@ module ActiveSupport
       @updated_at = nil
     end
 
-    # Execute the block given if updated. This call
-    # always flush the cache.
+    # Execute the block given if updated.
     def execute_if_updated
       if updated?
         execute
@@ -78,9 +95,9 @@ module ActiveSupport
     def updated_at #:nodoc:
       @updated_at || begin
         all = []
-        all.concat @paths
+        all.concat @files.select { |f| File.exists?(f) }
         all.concat Dir[@glob] if @glob
-        all.map { |path| File.mtime(path) }.max
+        all.map { |path| File.mtime(path) }.max || Time.at(0)
       end
     end
 
diff --git a/activesupport/lib/active_support/i18n_railtie.rb b/activesupport/lib/active_support/i18n_railtie.rb
index ae3a39562c..bbeb8d82c6 100644
--- a/activesupport/lib/active_support/i18n_railtie.rb
+++ b/activesupport/lib/active_support/i18n_railtie.rb
@@ -64,7 +64,7 @@ module I18n
       init_fallbacks(fallbacks) if fallbacks && validate_fallbacks(fallbacks)
 
       reloader_paths.concat I18n.load_path
-      reloader.execute_if_updated
+      reloader.execute
 
       @i18n_inited = true
     end
-- 
cgit v1.2.3


From abe915f23777efe10f17d611bf5718ca855a0704 Mon Sep 17 00:00:00 2001
From: Olek Janiszewski <olek.janiszewski@gmail.com>
Date: Fri, 16 Dec 2011 17:58:22 +0100
Subject: Fix expanding cache key for single element arrays

In short:
expand_cache_key(element) should not equal expand_cache_key([element])

This way a fragment cache key for an index page with only a single
element in the collection is different than a fragment cache for a
typical show page for that element.
---
 activesupport/lib/active_support/cache.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 07f5fcdeb3..6452bed506 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -90,7 +90,7 @@ module ActiveSupport
       def retrieve_cache_key(key)
         case
         when key.respond_to?(:cache_key) then key.cache_key
-        when key.is_a?(Array)            then key.map { |element| retrieve_cache_key(element) }.to_param
+        when key.is_a?(Array)            then ['Array', *key.map { |element| retrieve_cache_key(element) }].to_param
         else                                  key.to_param
         end.to_s
       end
-- 
cgit v1.2.3


From 2aedb202c1c06011b5cb1715a6c76bf0104b287f Mon Sep 17 00:00:00 2001
From: Semyon Perepelitsa <sema@sema.in>
Date: Tue, 20 Dec 2011 01:35:43 +0800
Subject: Fix syntax error in rdocs. Ruby assumes curly braces in foo {} as a
 block, for hash we need to put parentheses or omit braces

---
 activesupport/lib/active_support/testing/assertions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/testing/assertions.rb b/activesupport/lib/active_support/testing/assertions.rb
index f3629ada5b..4e1a58a801 100644
--- a/activesupport/lib/active_support/testing/assertions.rb
+++ b/activesupport/lib/active_support/testing/assertions.rb
@@ -87,7 +87,7 @@ module ActiveSupport
 
       # Test if an expression is not blank. Passes if object.present? is true.
       #
-      #   assert_present {:data => 'x' } # => true
+      #   assert_present({:data => 'x' }) # => true
       def assert_present(object, message=nil)
         message ||= "#{object.inspect} is blank"
         assert object.present?, message
-- 
cgit v1.2.3


From 9d6e52b55ec67d0573a0bb1900b13f38e18f7eba Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 19 Dec 2011 18:34:57 -0600
Subject: Party like its R-C-UNO!

---
 activesupport/lib/active_support/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index bd8e7f907a..f1387c9f39 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -3,7 +3,7 @@ module ActiveSupport
     MAJOR = 3
     MINOR = 2
     TINY  = 0
-    PRE   = "beta"
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
-- 
cgit v1.2.3


From 572c3d517899524c2a7c4c84ad9646660168d4cd Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 19 Dec 2011 18:41:37 -0800
Subject: * BufferedLogger is deprecated.  Use ActiveSupport::Logger, or the
 logger   from Ruby stdlib.

---
 .../lib/active_support/buffered_logger.rb          | 121 +--------------------
 activesupport/lib/active_support/core_ext.rb       |   1 +
 .../lib/active_support/core_ext/logger.rb          |   3 +
 .../active_support/log_subscriber/test_helper.rb   |   4 +-
 activesupport/lib/active_support/logger.rb         |  18 +++
 5 files changed, 27 insertions(+), 120 deletions(-)
 create mode 100644 activesupport/lib/active_support/logger.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
index 775f9928e6..36e29644c6 100644
--- a/activesupport/lib/active_support/buffered_logger.rb
+++ b/activesupport/lib/active_support/buffered_logger.rb
@@ -1,125 +1,10 @@
 require 'thread'
-require 'logger'
-require 'active_support/core_ext/logger'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/deprecation'
+require 'active_support/logger'
 require 'fileutils'
 
 module ActiveSupport
-  # Inspired by the buffered logger idea by Ezra
-  class BufferedLogger
-    module Severity
-      DEBUG   = 0
-      INFO    = 1
-      WARN    = 2
-      ERROR   = 3
-      FATAL   = 4
-      UNKNOWN = 5
-    end
-    include Severity
-
-    MAX_BUFFER_SIZE = 1000
-
-    ##
-    # :singleton-method:
-    # Set to false to disable the silencer
-    cattr_accessor :silencer
-    self.silencer = true
-
-    # Silences the logger for the duration of the block.
-    def silence(temporary_level = ERROR)
-      if silencer
-        begin
-          logger = self.class.new @log_dest, temporary_level
-          yield logger
-        ensure
-          logger.close
-        end
-      else
-        yield self
-      end
-    end
-    deprecate :silence
-
-    attr_reader :auto_flushing
-    deprecate :auto_flushing
-
-    def initialize(log, level = DEBUG)
-      @level         = level
-      @log_dest      = log
-
-      unless log.respond_to?(:write)
-        unless File.exist?(File.dirname(log))
-          ActiveSupport::Deprecation.warn(<<-eowarn)
-Automatic directory creation for '#{log}' is deprecated.  Please make sure the directory for your log file exists before creating the logger.
-          eowarn
-          FileUtils.mkdir_p(File.dirname(log))
-        end
-      end
-
-      @log = open_logfile log
-    end
-
-    def open_log(log, mode)
-      open(log, mode).tap do |open_log|
-        open_log.set_encoding(Encoding::BINARY) if open_log.respond_to?(:set_encoding)
-        open_log.sync = true
-      end
-    end
-    deprecate :open_log
-
-    def level
-      @log.level
-    end
-
-    def level=(l)
-      @log.level = l
-    end
-
-    def add(severity, message = nil, progname = nil, &block)
-      @log.add(severity, message, progname, &block)
-    end
-
-    # Dynamically add methods such as:
-    # def info
-    # def warn
-    # def debug
-    Severity.constants.each do |severity|
-      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
-
-        def #{severity.downcase}?                                       # def debug?
-          #{severity} >= level                                         #   DEBUG >= @level
-        end                                                             # end
-      EOT
-    end
-
-    # Set the auto-flush period. Set to true to flush after every log message,
-    # to an integer to flush every N messages, or to false, nil, or zero to
-    # never auto-flush. If you turn auto-flushing off, be sure to regularly
-    # flush the log yourself -- it will eat up memory until you do.
-    def auto_flushing=(period)
-    end
-    deprecate :auto_flushing=
-
-    def flush
-    end
-    deprecate :flush
-
-    def respond_to?(method, include_private = false)
-      return false if method.to_s == "flush"
-      super
-    end
-
-    def close
-      @log.close
-    end
-
-    private
-    def open_logfile(log)
-      Logger.new log
-    end
-  end
+  BufferedLogger = ActiveSupport::Deprecation::DeprecatedConstantProxy.new(
+    'BufferedLogger', '::ActiveSupport::Logger')
 end
diff --git a/activesupport/lib/active_support/core_ext.rb b/activesupport/lib/active_support/core_ext.rb
index 46a8609dd7..b48bdf08e8 100644
--- a/activesupport/lib/active_support/core_ext.rb
+++ b/activesupport/lib/active_support/core_ext.rb
@@ -1,3 +1,4 @@
 Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.each do |path|
+  next if File.basename(path, '.rb') == 'logger'
   require "active_support/core_ext/#{File.basename(path, '.rb')}"
 end
diff --git a/activesupport/lib/active_support/core_ext/logger.rb b/activesupport/lib/active_support/core_ext/logger.rb
index e63a0a9ed9..a51818d2b2 100644
--- a/activesupport/lib/active_support/core_ext/logger.rb
+++ b/activesupport/lib/active_support/core_ext/logger.rb
@@ -1,4 +1,7 @@
 require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/deprecation'
+
+ActiveSupport::Deprecation.warn 'this file is deprecated and will be removed'
 
 # Adds the 'around_level' method to Logger.
 class Logger #:nodoc:
diff --git a/activesupport/lib/active_support/log_subscriber/test_helper.rb b/activesupport/lib/active_support/log_subscriber/test_helper.rb
index dcfcf0b63c..7b7fc81e6c 100644
--- a/activesupport/lib/active_support/log_subscriber/test_helper.rb
+++ b/activesupport/lib/active_support/log_subscriber/test_helper.rb
@@ -50,7 +50,7 @@ module ActiveSupport
       end
 
       class MockLogger
-        include ActiveSupport::BufferedLogger::Severity
+        include ActiveSupport::Logger::Severity
 
         attr_reader :flush_count
         attr_accessor :level
@@ -73,7 +73,7 @@ module ActiveSupport
           @flush_count += 1
         end
 
-        ActiveSupport::BufferedLogger::Severity.constants.each do |severity|
+        ActiveSupport::Logger::Severity.constants.each do |severity|
           class_eval <<-EOT, __FILE__, __LINE__ + 1
             def #{severity.downcase}?
               #{severity} >= @level
diff --git a/activesupport/lib/active_support/logger.rb b/activesupport/lib/active_support/logger.rb
new file mode 100644
index 0000000000..66e8fcadb4
--- /dev/null
+++ b/activesupport/lib/active_support/logger.rb
@@ -0,0 +1,18 @@
+require 'logger'
+
+module ActiveSupport
+  class Logger < ::Logger
+    def initialize(*args)
+      super
+      @formatter = SimpleFormatter.new
+    end
+
+    # Simple formatter which only displays the message.
+    class SimpleFormatter < ::Logger::Formatter
+      # This method is invoked when a log event occurs
+      def call(severity, timestamp, progname, msg)
+        "#{String === msg ? msg : msg.inspect}\n"
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From 6a6fc4e1db2469bd309c074f607abb60764ba20d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 20 Dec 2011 15:18:42 +0100
Subject: Remove deprecations from Active Support.

---
 activesupport/lib/active_support/concern.rb        |   5 -
 activesupport/lib/active_support/memoizable.rb     | 116 ---------------------
 .../lib/active_support/message_encryptor.rb        |  17 ---
 .../lib/active_support/message_verifier.rb         |   5 -
 4 files changed, 143 deletions(-)
 delete mode 100644 activesupport/lib/active_support/memoizable.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/concern.rb b/activesupport/lib/active_support/concern.rb
index af3da937c7..c94a8d99f4 100644
--- a/activesupport/lib/active_support/concern.rb
+++ b/activesupport/lib/active_support/concern.rb
@@ -109,11 +109,6 @@ module ActiveSupport
         @_dependencies.each { |dep| base.send(:include, dep) }
         super
         base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
-        if const_defined?("InstanceMethods")
-          base.send :include, const_get("InstanceMethods")
-          ActiveSupport::Deprecation.warn "The InstanceMethods module inside ActiveSupport::Concern will be " \
-            "no longer included automatically. Please define instance methods directly in #{base} instead.", caller
-        end
         base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
       end
     end
diff --git a/activesupport/lib/active_support/memoizable.rb b/activesupport/lib/active_support/memoizable.rb
deleted file mode 100644
index 4c67676ad5..0000000000
--- a/activesupport/lib/active_support/memoizable.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-require 'active_support/core_ext/kernel/singleton_class'
-require 'active_support/core_ext/module/aliasing'
-require 'active_support/deprecation'
-
-module ActiveSupport
-  module Memoizable
-    def self.extended(base)
-      ActiveSupport::Deprecation.warn "ActiveSupport::Memoizable is deprecated and will be removed in future releases," \
-        "simply use Ruby memoization pattern instead.", caller
-      super
-    end
-
-    def self.memoized_ivar_for(symbol)
-      "@_memoized_#{symbol.to_s.sub(/\?\Z/, '_query').sub(/!\Z/, '_bang')}".to_sym
-    end
-
-    module InstanceMethods
-      def self.included(base)
-        base.class_eval do
-          unless base.method_defined?(:freeze_without_memoizable)
-            alias_method_chain :freeze, :memoizable
-          end
-        end
-      end
-
-      def freeze_with_memoizable
-        memoize_all unless frozen?
-        freeze_without_memoizable
-      end
-
-      def memoize_all
-        prime_cache ".*"
-      end
-
-      def unmemoize_all
-        flush_cache ".*"
-      end
-
-      def prime_cache(*syms)
-        syms.each do |sym|
-          methods.each do |m|
-            if m.to_s =~ /^_unmemoized_(#{sym})/
-              if method(m).arity == 0
-                __send__($1)
-              else
-                ivar = ActiveSupport::Memoizable.memoized_ivar_for($1)
-                instance_variable_set(ivar, {})
-              end
-            end
-          end
-        end
-      end
-
-      def flush_cache(*syms)
-        syms.each do |sym|
-          (methods + private_methods + protected_methods).each do |m|
-            if m.to_s =~ /^_unmemoized_(#{sym.to_s.gsub(/\?\Z/, '\?')})/
-              ivar = ActiveSupport::Memoizable.memoized_ivar_for($1)
-              instance_variable_get(ivar).clear if instance_variable_defined?(ivar)
-            end
-          end
-        end
-      end
-    end
-
-    def memoize(*symbols)
-      symbols.each do |symbol|
-        original_method = :"_unmemoized_#{symbol}"
-        memoized_ivar = ActiveSupport::Memoizable.memoized_ivar_for(symbol)
-
-        class_eval <<-EOS, __FILE__, __LINE__ + 1
-          include InstanceMethods                                                  # include InstanceMethods
-                                                                                   #
-          if method_defined?(:#{original_method})                                  # if method_defined?(:_unmemoized_mime_type)
-            raise "Already memoized #{symbol}"                                     #   raise "Already memoized mime_type"
-          end                                                                      # end
-          alias #{original_method} #{symbol}                                       # alias _unmemoized_mime_type mime_type
-                                                                                   #
-          if instance_method(:#{symbol}).arity == 0                                # if instance_method(:mime_type).arity == 0
-            def #{symbol}(reload = false)                                          #   def mime_type(reload = false)
-              if reload || !defined?(#{memoized_ivar}) || #{memoized_ivar}.empty?  #     if reload || !defined?(@_memoized_mime_type) || @_memoized_mime_type.empty?
-                #{memoized_ivar} = [#{original_method}]                            #       @_memoized_mime_type = [_unmemoized_mime_type]
-              end                                                                  #     end
-              #{memoized_ivar}[0]                                                  #     @_memoized_mime_type[0]
-            end                                                                    #   end
-          else                                                                     # else
-            def #{symbol}(*args)                                                   #   def mime_type(*args)
-              #{memoized_ivar} ||= {} unless frozen?                               #     @_memoized_mime_type ||= {} unless frozen?
-              args_length = method(:#{original_method}).arity                      #     args_length = method(:_unmemoized_mime_type).arity
-              if args.length == args_length + 1 &&                                 #     if args.length == args_length + 1 &&
-                (args.last == true || args.last == :reload)                        #       (args.last == true || args.last == :reload)
-                reload = args.pop                                                  #       reload = args.pop
-              end                                                                  #     end
-                                                                                   #
-              if defined?(#{memoized_ivar}) && #{memoized_ivar}                    #     if defined?(@_memoized_mime_type) && @_memoized_mime_type
-                if !reload && #{memoized_ivar}.has_key?(args)                      #       if !reload && @_memoized_mime_type.has_key?(args)
-                  #{memoized_ivar}[args]                                           #         @_memoized_mime_type[args]
-                elsif #{memoized_ivar}                                             #       elsif @_memoized_mime_type
-                  #{memoized_ivar}[args] = #{original_method}(*args)               #         @_memoized_mime_type[args] = _unmemoized_mime_type(*args)
-                end                                                                #       end
-              else                                                                 #     else
-                #{original_method}(*args)                                          #       _unmemoized_mime_type(*args)
-              end                                                                  #     end
-            end                                                                    #   end
-          end                                                                      # end
-                                                                                   #
-          if private_method_defined?(#{original_method.inspect})                   # if private_method_defined?(:_unmemoized_mime_type)
-            private #{symbol.inspect}                                              #   private :mime_type
-          elsif protected_method_defined?(#{original_method.inspect})              # elsif protected_method_defined?(:_unmemoized_mime_type)
-            protected #{symbol.inspect}                                            #   protected :mime_type
-          end                                                                      # end
-        EOS
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb
index 9ef2b29580..7d8a7fb687 100644
--- a/activesupport/lib/active_support/message_encryptor.rb
+++ b/activesupport/lib/active_support/message_encryptor.rb
@@ -24,29 +24,12 @@ module ActiveSupport
     OpenSSLCipherError = OpenSSL::Cipher.const_defined?(:CipherError) ? OpenSSL::Cipher::CipherError : OpenSSL::CipherError
 
     def initialize(secret, options = {})
-      unless options.is_a?(Hash)
-        ActiveSupport::Deprecation.warn "The second parameter should be an options hash. Use :cipher => 'algorithm' to specify the cipher algorithm."
-        options = { :cipher => options }
-      end
-
       @secret = secret
       @cipher = options[:cipher] || 'aes-256-cbc'
       @verifier = MessageVerifier.new(@secret, :serializer => NullSerializer)
       @serializer = options[:serializer] || Marshal
     end
 
-    def encrypt(value)
-      ActiveSupport::Deprecation.warn "MessageEncryptor#encrypt is deprecated as it is not safe without a signature. " \
-        "Please use MessageEncryptor#encrypt_and_sign instead."
-      _encrypt(value)
-    end
-
-    def decrypt(value)
-      ActiveSupport::Deprecation.warn "MessageEncryptor#decrypt is deprecated as it is not safe without a signature. " \
-        "Please use MessageEncryptor#decrypt_and_verify instead."
-      _decrypt(value)
-    end
-
     # Encrypt and sign a message. We need to sign the message in order to avoid padding attacks.
     # Reference: http://www.limited-entropy.com/padding-oracle-attacks
     def encrypt_and_sign(value)
diff --git a/activesupport/lib/active_support/message_verifier.rb b/activesupport/lib/active_support/message_verifier.rb
index 9d7c81142a..30ac44f6fa 100644
--- a/activesupport/lib/active_support/message_verifier.rb
+++ b/activesupport/lib/active_support/message_verifier.rb
@@ -27,11 +27,6 @@ module ActiveSupport
     class InvalidSignature < StandardError; end
 
     def initialize(secret, options = {})
-      unless options.is_a?(Hash)
-        ActiveSupport::Deprecation.warn "The second parameter should be an options hash. Use :digest => 'algorithm' to specify the digest algorithm."
-        options = { :digest => options }
-      end
-
       @secret = secret
       @digest = options[:digest] || 'SHA1'
       @serializer = options[:serializer] || Marshal
-- 
cgit v1.2.3


From 632fa15fa4ceec6dbb00bf26da249d3039749f50 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 20 Dec 2011 09:30:37 -0600
Subject: rails/master is now 4.0.0.beta and will only support Ruby 1.9.3+

---
 activesupport/lib/active_support/version.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index f1387c9f39..8a8f8f946d 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -1,9 +1,9 @@
 module ActiveSupport
   module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 2
+    MAJOR = 4
+    MINOR = 0
     TINY  = 0
-    PRE   = "rc1"
+    PRE   = "beta"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
-- 
cgit v1.2.3


From b7cfd0946662abf6cae64459dca4da37fc841c0b Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Tue, 20 Dec 2011 22:01:32 +0300
Subject: remove support for ruby 1.8 in AS String extensions

---
 .../lib/active_support/core_ext/object/blank.rb    | 10 +-------
 .../active_support/core_ext/string/conversions.rb  | 29 ----------------------
 2 files changed, 1 insertion(+), 38 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/object/blank.rb b/activesupport/lib/active_support/core_ext/object/blank.rb
index fe27f45295..7271671908 100644
--- a/activesupport/lib/active_support/core_ext/object/blank.rb
+++ b/activesupport/lib/active_support/core_ext/object/blank.rb
@@ -89,9 +89,6 @@ class Hash
 end
 
 class String
-  # 0x3000: fullwidth whitespace
-  NON_WHITESPACE_REGEXP = %r![^\s#{[0x3000].pack("U")}]!
-
   # A string is blank if it's empty or contains whitespaces only:
   #
   #   "".blank?                 # => true
@@ -100,12 +97,7 @@ class String
   #   " something here ".blank? # => false
   #
   def blank?
-    # 1.8 does not takes [:space:] properly
-    if encoding_aware?
-      self !~ /[^[:space:]]/
-    else
-      self !~ NON_WHITESPACE_REGEXP
-    end
+    self !~ /[^[:space:]]/
   end
 end
 
diff --git a/activesupport/lib/active_support/core_ext/string/conversions.rb b/activesupport/lib/active_support/core_ext/string/conversions.rb
index 0f8933b658..73eedf5982 100644
--- a/activesupport/lib/active_support/core_ext/string/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/string/conversions.rb
@@ -1,37 +1,8 @@
-# encoding: utf-8
 require 'date'
 require 'active_support/core_ext/time/publicize_conversion_methods'
 require 'active_support/core_ext/time/calculations'
 
 class String
-  # Returns the codepoint of the first character of the string, assuming a
-  # single-byte character encoding:
-  #
-  #   "a".ord # => 97
-  #   "à".ord # => 224, in ISO-8859-1
-  #
-  # This method is defined in Ruby 1.8 for Ruby 1.9 forward compatibility on
-  # these character encodings.
-  #
-  # <tt>ActiveSupport::Multibyte::Chars#ord</tt> is forward compatible with
-  # Ruby 1.9 on UTF8 strings:
-  #
-  #   "a".mb_chars.ord # => 97
-  #   "à".mb_chars.ord # => 224, in UTF8
-  #
-  # Note that the 224 is different in both examples. In ISO-8859-1 "à" is
-  # represented as a single byte, 224. In UTF8 it is represented with two
-  # bytes, namely 195 and 160, but its Unicode codepoint is 224. If we
-  # call +ord+ on the UTF8 string "à" the return value will be 195. That is
-  # not an error, because UTF8 is unsupported, the call itself would be
-  # bogus.
-  def ord
-    self[0]
-  end unless method_defined?(:ord)
-
-  # +getbyte+ backport from Ruby 1.9
-  alias_method :getbyte, :[] unless method_defined?(:getbyte)
-
   # Form can be either :utc (default) or :local.
   def to_time(form = :utc)
     return nil if self.blank?
-- 
cgit v1.2.3


From 55943873cdfc44aa55090d34602c2e1529d87590 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Wed, 21 Dec 2011 11:48:46 +0300
Subject: remove dead code as ruby 1.9.3 has Base64 module

---
 activesupport/lib/active_support/base64.rb | 32 ++----------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/base64.rb b/activesupport/lib/active_support/base64.rb
index 35014cb3d5..b43d2ce9a3 100644
--- a/activesupport/lib/active_support/base64.rb
+++ b/activesupport/lib/active_support/base64.rb
@@ -1,35 +1,7 @@
-begin
-  require 'base64'
-rescue LoadError
-end
+require 'base64'
 
 module ActiveSupport
-  if defined? ::Base64
-    Base64 = ::Base64
-  else
-    # Base64 provides utility methods for encoding and de-coding binary data
-    # using a base 64 representation. A base 64 representation of binary data
-    # consists entirely of printable US-ASCII characters. The Base64 module
-    # is included in Ruby 1.8, but has been removed in Ruby 1.9.
-    module Base64
-      # Encodes a string to its base 64 representation. Each 60 characters of
-      # output is separated by a newline character.
-      #
-      #  ActiveSupport::Base64.encode64("Original unencoded string")
-      #  # => "T3JpZ2luYWwgdW5lbmNvZGVkIHN0cmluZw==\n"
-      def self.encode64(data)
-        [data].pack("m")
-      end
-
-      # Decodes a base 64 encoded string to its original representation.
-      #
-      #  ActiveSupport::Base64.decode64("T3JpZ2luYWwgdW5lbmNvZGVkIHN0cmluZw==")
-      #  # => "Original unencoded string"
-      def self.decode64(data)
-        data.unpack("m").first
-      end
-    end
-  end
+  Base64 = ::Base64
 
   # Encodes the value as base64 without the newline breaks. This makes the base64 encoding readily usable as URL parameters
   # or memcache keys without further processing.
-- 
cgit v1.2.3


From ba7ef5365e1ce508f70b6e8eb4511d463a3524c3 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Wed, 21 Dec 2011 08:34:25 -0500
Subject: We don't need a special html_escape for 1.8 anymore

---
 .../core_ext/string/output_safety.rb               | 42 ++++++++--------------
 1 file changed, 15 insertions(+), 27 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index c6d861d124..6cb2ea68b3 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -6,33 +6,21 @@ class ERB
     HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
     JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003E', '<' => '\u003C' }
 
-    # Detect whether 1.9 can transcode with XML escaping.
-    if '"&gt;&lt;&amp;&quot;"' == ('><&"'.encode('utf-8', :xml => :attr) rescue false)
-      # 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.encode(s.encoding, :xml => :attr)[1...-1].html_safe
-        end
-      end
-    else
-      def html_escape(s) #:nodoc:
-        s = s.to_s
-        if s.html_safe?
-          s
-        else
-          s.gsub(/[&"><]/n) { |special| HTML_ESCAPE[special] }.html_safe
-        end
+    # 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.encode(s.encoding, :xml => :attr)[1...-1].html_safe
       end
     end
 
-- 
cgit v1.2.3


From c52ce1dae2ca8b72732f92c84541a4b6bbc9da77 Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Wed, 21 Dec 2011 17:31:40 +0300
Subject: remove Array#sample from core_ext

---
 activesupport/lib/active_support/core_ext/array.rb |  1 -
 .../active_support/core_ext/array/random_access.rb | 30 ----------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 activesupport/lib/active_support/core_ext/array/random_access.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/array.rb b/activesupport/lib/active_support/core_ext/array.rb
index 268c9bed4c..79ba79192a 100644
--- a/activesupport/lib/active_support/core_ext/array.rb
+++ b/activesupport/lib/active_support/core_ext/array.rb
@@ -4,5 +4,4 @@ require 'active_support/core_ext/array/uniq_by'
 require 'active_support/core_ext/array/conversions'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/array/grouping'
-require 'active_support/core_ext/array/random_access'
 require 'active_support/core_ext/array/prepend_and_append'
diff --git a/activesupport/lib/active_support/core_ext/array/random_access.rb b/activesupport/lib/active_support/core_ext/array/random_access.rb
deleted file mode 100644
index bb1807a68a..0000000000
--- a/activesupport/lib/active_support/core_ext/array/random_access.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-class Array
-  # Backport of Array#sample based on Marc-Andre Lafortune's https://github.com/marcandre/backports/
-  # Returns a random element or +n+ random elements from the array.
-  # If the array is empty and +n+ is nil, returns <tt>nil</tt>.
-  # If +n+ is passed and its value is less than 0, it raises an +ArgumentError+ exception.
-  # If the value of +n+ is equal or greater than 0 it returns <tt>[]</tt>.
-  #
-  #   [1,2,3,4,5,6].sample     # => 4
-  #   [1,2,3,4,5,6].sample(3)  # => [2, 4, 5]
-  #   [1,2,3,4,5,6].sample(-3) # => ArgumentError: negative array size
-  #              [].sample     # => nil
-  #              [].sample(3)  # => []
-  def sample(n=nil)
-    return self[Kernel.rand(size)] if n.nil?
-    n = n.to_int
-  rescue Exception => e
-    raise TypeError, "Coercion error: #{n.inspect}.to_int => Integer failed:\n(#{e.message})"
-  else
-    raise TypeError, "Coercion error: obj.to_int did NOT return an Integer (was #{n.class})" unless n.kind_of? Integer
-    raise ArgumentError, "negative array size" if n < 0
-    n = size if n > size
-    result = Array.new(self)
-    n.times do |i|
-      r = i + Kernel.rand(size - i)
-      result[i], result[r] = result[r], result[i]
-    end
-    result[n..size] = []
-    result
-  end unless method_defined? :sample
-end
-- 
cgit v1.2.3


From a57c6441a829a08d3ca341eecf4f1b4a5e43b909 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Wed, 21 Dec 2011 18:53:38 +0300
Subject: remove Kernel#singleton_class from core_ext as it is present in ruby
 1.9

---
 .../lib/active_support/core_ext/kernel/singleton_class.rb          | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/kernel/singleton_class.rb b/activesupport/lib/active_support/core_ext/kernel/singleton_class.rb
index 33612155fb..9bbf1bbd73 100644
--- a/activesupport/lib/active_support/core_ext/kernel/singleton_class.rb
+++ b/activesupport/lib/active_support/core_ext/kernel/singleton_class.rb
@@ -1,11 +1,4 @@
 module Kernel
-  # Returns the object's singleton class.
-  def singleton_class
-    class << self
-      self
-    end
-  end unless respond_to?(:singleton_class) # exists in 1.9.2
-
   # class_eval on an object acts like singleton_class.class_eval.
   def class_eval(*args, &block)
     singleton_class.class_eval(*args, &block)
-- 
cgit v1.2.3


From f1b4cacbae71585be3f5dcb4c1bdd7c78ef3d590 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Wed, 21 Dec 2011 19:07:00 +0300
Subject: remove Enumerable#each_with_object from core_ext as it is present in
 ruby 1.9

---
 .../lib/active_support/core_ext/enumerable.rb       | 21 ---------------------
 activesupport/lib/active_support/ruby/shim.rb       |  4 ++--
 2 files changed, 2 insertions(+), 23 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/enumerable.rb b/activesupport/lib/active_support/core_ext/enumerable.rb
index ccd0e9692d..3f13468e4d 100644
--- a/activesupport/lib/active_support/core_ext/enumerable.rb
+++ b/activesupport/lib/active_support/core_ext/enumerable.rb
@@ -33,27 +33,6 @@ module Enumerable
     collect { |element| element.send(method) }
   end
 
-  # Iterates over a collection, passing the current element *and* the
-  # +memo+ to the block. Handy for building up hashes or
-  # reducing collections down to one object. Examples:
-  #
-  #   %w(foo bar).each_with_object({}) { |str, hsh| hsh[str] = str.upcase }
-  #   # => {'foo' => 'FOO', 'bar' => 'BAR'}
-  #
-  # *Note* that you can't use immutable objects like numbers, true or false as
-  # the memo. You would think the following returns 120, but since the memo is
-  # never changed, it does not.
-  #
-  #   (1..5).each_with_object(1) { |value, memo| memo *= value } # => 1
-  #
-  def each_with_object(memo)
-    return to_enum :each_with_object, memo unless block_given?
-    each do |element|
-      yield element, memo
-    end
-    memo
-  end unless [].respond_to?(:each_with_object)
-
   # Convert an enumerable to a hash. Examples:
   #
   #   people.index_by(&:login)
diff --git a/activesupport/lib/active_support/ruby/shim.rb b/activesupport/lib/active_support/ruby/shim.rb
index 608b3fe4b9..fc37ab84a3 100644
--- a/activesupport/lib/active_support/ruby/shim.rb
+++ b/activesupport/lib/active_support/ruby/shim.rb
@@ -3,7 +3,7 @@
 #
 # Date        next_year, next_month
 # DateTime    to_date, to_datetime, xmlschema
-# Enumerable  group_by, each_with_object, none?
+# Enumerable  group_by, none?
 # Process     Process.daemon
 # REXML       security fix
 # String      ord
@@ -19,4 +19,4 @@ require 'active_support/core_ext/string/encoding'
 require 'active_support/core_ext/rexml'
 require 'active_support/core_ext/time/conversions'
 require 'active_support/core_ext/file/path'
-require 'active_support/core_ext/module/method_names'
\ No newline at end of file
+require 'active_support/core_ext/module/method_names'
-- 
cgit v1.2.3


From 7bfaa979e4e48dea68023e1aa67eabd160c3a7d3 Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Thu, 22 Dec 2011 08:43:42 +0300
Subject: remove Proces.daemon from core_ext

---
 .../lib/active_support/core_ext/process.rb         |  1 -
 .../lib/active_support/core_ext/process/daemon.rb  | 23 ----------------------
 activesupport/lib/active_support/ruby/shim.rb      |  2 --
 3 files changed, 26 deletions(-)
 delete mode 100644 activesupport/lib/active_support/core_ext/process.rb
 delete mode 100644 activesupport/lib/active_support/core_ext/process/daemon.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/process.rb b/activesupport/lib/active_support/core_ext/process.rb
deleted file mode 100644
index 0b0bc6dc69..0000000000
--- a/activesupport/lib/active_support/core_ext/process.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'active_support/core_ext/process/daemon'
diff --git a/activesupport/lib/active_support/core_ext/process/daemon.rb b/activesupport/lib/active_support/core_ext/process/daemon.rb
deleted file mode 100644
index f5202ddee4..0000000000
--- a/activesupport/lib/active_support/core_ext/process/daemon.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-module Process
-  def self.daemon(nochdir = nil, noclose = nil)
-    exit if fork                     # Parent exits, child continues.
-    Process.setsid                   # Become session leader.
-    exit if fork                     # Zap session leader. See [1].
-
-    unless nochdir
-      Dir.chdir "/"                  # Release old working directory.
-    end
-
-    File.umask 0000                  # Ensure sensible umask. Adjust as needed.
-
-    unless noclose
-      STDIN.reopen "/dev/null"       # Free file descriptors and
-      STDOUT.reopen "/dev/null", "a" # point them somewhere sensible.
-      STDERR.reopen '/dev/null', 'a'
-    end
-
-    trap("TERM") { exit }
-
-    return 0
-  end unless respond_to?(:daemon)
-end
diff --git a/activesupport/lib/active_support/ruby/shim.rb b/activesupport/lib/active_support/ruby/shim.rb
index fc37ab84a3..fd59677d83 100644
--- a/activesupport/lib/active_support/ruby/shim.rb
+++ b/activesupport/lib/active_support/ruby/shim.rb
@@ -4,7 +4,6 @@
 # Date        next_year, next_month
 # DateTime    to_date, to_datetime, xmlschema
 # Enumerable  group_by, none?
-# Process     Process.daemon
 # REXML       security fix
 # String      ord
 # Time        to_date, to_time, to_datetime
@@ -12,7 +11,6 @@ require 'active_support'
 require 'active_support/core_ext/date/calculations'
 require 'active_support/core_ext/date_time/conversions'
 require 'active_support/core_ext/enumerable'
-require 'active_support/core_ext/process/daemon'
 require 'active_support/core_ext/string/conversions'
 require 'active_support/core_ext/string/interpolation'
 require 'active_support/core_ext/string/encoding'
-- 
cgit v1.2.3


From 4f6af26a886630c97865a2e5023a9560692e6aa4 Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Tue, 20 Dec 2011 22:18:23 +0300
Subject: remove AS whiny nil extension and deprecate config.whiny_nils

---
 activesupport/lib/active_support/railtie.rb   |  6 ------
 activesupport/lib/active_support/whiny_nil.rb | 22 ----------------------
 2 files changed, 28 deletions(-)
 delete mode 100644 activesupport/lib/active_support/whiny_nil.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb
index 1638512af0..f696716cc8 100644
--- a/activesupport/lib/active_support/railtie.rb
+++ b/activesupport/lib/active_support/railtie.rb
@@ -5,12 +5,6 @@ module ActiveSupport
   class Railtie < Rails::Railtie
     config.active_support = ActiveSupport::OrderedOptions.new
 
-    # Loads support for "whiny nil" (noisy warnings when methods are invoked
-    # on +nil+ values) if Configuration#whiny_nils is true.
-    initializer "active_support.initialize_whiny_nils" do |app|
-      require 'active_support/whiny_nil' if app.config.whiny_nils
-    end
-
     initializer "active_support.deprecation_behavior" do |app|
       if deprecation = app.config.active_support.deprecation
         ActiveSupport::Deprecation.behavior = deprecation
diff --git a/activesupport/lib/active_support/whiny_nil.rb b/activesupport/lib/active_support/whiny_nil.rb
deleted file mode 100644
index a065233679..0000000000
--- a/activesupport/lib/active_support/whiny_nil.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# Extensions to +nil+ which allow for more helpful error messages for people who
-# are new to Rails.
-#
-# NilClass#id exists in Ruby 1.8 (though it is deprecated). Since +id+ is a fundamental
-# method of Active Record models NilClass#id is redefined as well to raise a RuntimeError
-# and warn the user. She probably wanted a model database identifier and the 4
-# returned by the original method could result in obscure bugs.
-#
-# The flag <tt>config.whiny_nils</tt> determines whether this feature is enabled.
-# By default it is on in development and test modes, and it is off in production
-# mode.
-class NilClass
-  def self.add_whiner(klass)
-    ActiveSupport::Deprecation.warn "NilClass.add_whiner is deprecated and this functionality is " \
-      "removed from Rails versions as it affects Ruby 1.9 performance.", caller
-  end
-
-  # Raises a RuntimeError when you attempt to call +id+ on +nil+.
-  def id
-    raise RuntimeError, "Called id for nil, which would mistakenly be #{object_id} -- if you really wanted the id of nil, use object_id", caller
-  end
-end
-- 
cgit v1.2.3


From 9d97173c5a3f023e50f85503c120fbad9d0b26d2 Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Thu, 22 Dec 2011 18:53:04 +0300
Subject: no more need to make Time#to_date and Time#to_datetime public

they are public in actual 1.9 ruby version (tested at least in 1.9.2-p180)
---
 .../lib/active_support/core_ext/string/conversions.rb          |  1 -
 activesupport/lib/active_support/core_ext/time/conversions.rb  |  1 -
 .../core_ext/time/publicize_conversion_methods.rb              | 10 ----------
 activesupport/lib/active_support/time.rb                       |  1 -
 4 files changed, 13 deletions(-)
 delete mode 100644 activesupport/lib/active_support/core_ext/time/publicize_conversion_methods.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/string/conversions.rb b/activesupport/lib/active_support/core_ext/string/conversions.rb
index 73eedf5982..541f969faa 100644
--- a/activesupport/lib/active_support/core_ext/string/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/string/conversions.rb
@@ -1,5 +1,4 @@
 require 'date'
-require 'active_support/core_ext/time/publicize_conversion_methods'
 require 'active_support/core_ext/time/calculations'
 
 class String
diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb
index 49ac18d245..5a17fc1afa 100644
--- a/activesupport/lib/active_support/core_ext/time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/time/conversions.rb
@@ -1,5 +1,4 @@
 require 'active_support/inflector/methods'
-require 'active_support/core_ext/time/publicize_conversion_methods'
 require 'active_support/values/time_zone'
 
 class Time
diff --git a/activesupport/lib/active_support/core_ext/time/publicize_conversion_methods.rb b/activesupport/lib/active_support/core_ext/time/publicize_conversion_methods.rb
deleted file mode 100644
index e1878d3c20..0000000000
--- a/activesupport/lib/active_support/core_ext/time/publicize_conversion_methods.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'date'
-
-class Time
-  # Ruby 1.8-cvs and early 1.9 series define private Time#to_date
-  %w(to_date to_datetime).each do |method|
-    if private_instance_methods.include?(method) || private_instance_methods.include?(method.to_sym)
-      public method
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/time.rb b/activesupport/lib/active_support/time.rb
index 4ef289a414..9634b52ecf 100644
--- a/activesupport/lib/active_support/time.rb
+++ b/activesupport/lib/active_support/time.rb
@@ -13,7 +13,6 @@ end
 require 'date'
 require 'time'
 
-require 'active_support/core_ext/time/publicize_conversion_methods'
 require 'active_support/core_ext/time/marshal'
 require 'active_support/core_ext/time/acts_like'
 require 'active_support/core_ext/time/calculations'
-- 
cgit v1.2.3


From c4df2d0b6e0c1f4e0df4a66bfae91a684f3d9f71 Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Thu, 22 Dec 2011 19:30:10 +0300
Subject: deprecate Array#uniq_by and Array#uniq_by! in favor of Array#uniq and
 Array#uniq! from ruby 1.9

---
 activesupport/lib/active_support/core_ext/array/uniq_by.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/array/uniq_by.rb b/activesupport/lib/active_support/core_ext/array/uniq_by.rb
index 9c5f97b0e9..edc164dabd 100644
--- a/activesupport/lib/active_support/core_ext/array/uniq_by.rb
+++ b/activesupport/lib/active_support/core_ext/array/uniq_by.rb
@@ -3,14 +3,16 @@ class Array
   #
   #   [1, 2, 3, 4].uniq_by { |i| i.odd? } # => [1, 2]
   #
-  def uniq_by
-    hash, array = {}, []
-    each { |i| hash[yield(i)] ||= (array << i) }
-    array
+  def uniq_by(&block)
+    ActiveSupport::Deprecation.warn "uniq_by " \
+      "is deprecated. Use Array#uniq instead", caller
+    uniq(&block)
   end
 
   # Same as uniq_by, but modifies self.
-  def uniq_by!
-    replace(uniq_by{ |i| yield(i) })
+  def uniq_by!(&block)
+    ActiveSupport::Deprecation.warn "uniq_by! " \
+      "is deprecated. Use Array#uniq! instead", caller
+    uniq!(&block)
   end
 end
-- 
cgit v1.2.3


From 367741ef22d1538b8550cf6e4b2276a0946066c0 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 22 Dec 2011 12:21:18 -0700
Subject: Revert "Added Enumerable#pluck to wrap the common pattern of
 collect(&:method) *DHH*"

This reverts commit 4d20de8a50d889a09e6f5642984775fe796ca943.

Conflicts:

	activesupport/CHANGELOG.md
	activesupport/lib/active_support/core_ext/enumerable.rb
	activesupport/test/core_ext/enumerable_test.rb
---
 .../lib/active_support/core_ext/enumerable.rb      | 25 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/enumerable.rb b/activesupport/lib/active_support/core_ext/enumerable.rb
index 3f13468e4d..c2e7cc80a1 100644
--- a/activesupport/lib/active_support/core_ext/enumerable.rb
+++ b/activesupport/lib/active_support/core_ext/enumerable.rb
@@ -26,12 +26,27 @@ module Enumerable
     end
   end
 
-  # Plucks the value of the passed method for each element and returns the result as an array. Example:
+  # Iterates over a collection, passing the current element *and* the
+  # +memo+ to the block. Handy for building up hashes or
+  # reducing collections down to one object. Examples:
   #
-  #   people.pluck(:name) # => [ "David Heinemeier Hansson", "Jamie Heinemeier Hansson" ]
-  def pluck(method)
-    collect { |element| element.send(method) }
-  end
+  #   %w(foo bar).each_with_object({}) { |str, hsh| hsh[str] = str.upcase }
+  #   # => {'foo' => 'FOO', 'bar' => 'BAR'}
+  #
+  # *Note* that you can't use immutable objects like numbers, true or false as
+  # the memo. You would think the following returns 120, but since the memo is
+  # never changed, it does not.
+  #
+  #   (1..5).each_with_object(1) { |value, memo| memo *= value } # => 1
+  #
+  def each_with_object(memo)
+    return to_enum :each_with_object, memo unless block_given?
+    each do |element|
+      yield element, memo
+    end
+    memo
+  end unless [].respond_to?(:each_with_object)
+>>>>>>> parent of 4d20de8... Added Enumerable#pluck to wrap the common pattern of collect(&:method) *DHH*
 
   # Convert an enumerable to a hash. Examples:
   #
-- 
cgit v1.2.3


From 1a18198af042031979549b8a5679950f9354caed Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Fri, 23 Dec 2011 01:08:53 +0530
Subject: remove conflict marker

---
 activesupport/lib/active_support/core_ext/enumerable.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/enumerable.rb b/activesupport/lib/active_support/core_ext/enumerable.rb
index c2e7cc80a1..004014948e 100644
--- a/activesupport/lib/active_support/core_ext/enumerable.rb
+++ b/activesupport/lib/active_support/core_ext/enumerable.rb
@@ -46,7 +46,6 @@ module Enumerable
     end
     memo
   end unless [].respond_to?(:each_with_object)
->>>>>>> parent of 4d20de8... Added Enumerable#pluck to wrap the common pattern of collect(&:method) *DHH*
 
   # Convert an enumerable to a hash. Examples:
   #
-- 
cgit v1.2.3


From 173eacadf1a827c8731e1ff55f396dc59aacc5e3 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Tue, 20 Dec 2011 08:08:27 -0800
Subject: adds deprecation warnings to the RDoc of Array#uniq_by(!)

---
 activesupport/lib/active_support/core_ext/array/uniq_by.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/array/uniq_by.rb b/activesupport/lib/active_support/core_ext/array/uniq_by.rb
index edc164dabd..ac3dedc0e3 100644
--- a/activesupport/lib/active_support/core_ext/array/uniq_by.rb
+++ b/activesupport/lib/active_support/core_ext/array/uniq_by.rb
@@ -1,5 +1,7 @@
 class Array
-  # Returns an unique array based on the criteria given as a +Proc+.
+  # *DEPRECATED*: Use +Array#uniq+ instead.
+  #
+  # Returns a unique array based on the criteria in the block.
   #
   #   [1, 2, 3, 4].uniq_by { |i| i.odd? } # => [1, 2]
   #
@@ -9,7 +11,9 @@ class Array
     uniq(&block)
   end
 
-  # Same as uniq_by, but modifies self.
+  # *DEPRECATED*: Use +Array#uniq!+ instead.
+  #
+  # Same as +uniq_by+, but modifies +self+.
   def uniq_by!(&block)
     ActiveSupport::Deprecation.warn "uniq_by! " \
       "is deprecated. Use Array#uniq! instead", caller
-- 
cgit v1.2.3


From 7ab47751068c6480e7e44fc9265a7e690dd4af3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 20 Dec 2011 18:22:21 +0100
Subject: Initial pass at removing dead 1.8.x code from Active Support.

There are a bunch of other implicit branches that adds
1.8.x specific code that still needs to be removed. Pull
requests for those cases are welcome.
---
 .../active_support/core_ext/date/calculations.rb   |  18 ---
 .../active_support/core_ext/date/conversions.rb    |  23 ---
 .../core_ext/date_time/calculations.rb             |   2 -
 .../core_ext/date_time/conversions.rb              |   2 +-
 .../lib/active_support/core_ext/enumerable.rb      |  37 -----
 .../lib/active_support/core_ext/exception.rb       |   2 +-
 .../core_ext/module/introspection.rb               |  23 +--
 .../core_ext/object/instance_variables.rb          |   8 +-
 activesupport/lib/active_support/core_ext/range.rb |   1 -
 .../lib/active_support/core_ext/range/cover.rb     |   3 -
 .../lib/active_support/core_ext/string/encoding.rb |  10 +-
 .../active_support/core_ext/string/multibyte.rb    | 110 ++++++--------
 activesupport/lib/active_support/core_ext/uri.rb   |  28 ++--
 .../lib/active_support/multibyte/chars.rb          | 161 +-------------------
 activesupport/lib/active_support/ordered_hash.rb   | 167 ---------------------
 .../lib/active_support/testing/performance/ruby.rb |   2 -
 .../active_support/testing/performance/ruby/mri.rb |  57 -------
 17 files changed, 73 insertions(+), 581 deletions(-)
 delete mode 100644 activesupport/lib/active_support/core_ext/range/cover.rb
 delete mode 100644 activesupport/lib/active_support/testing/performance/ruby/mri.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index f0f67765c6..2212e0b3ca 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -7,24 +7,6 @@ require 'active_support/core_ext/time/zones'
 class Date
   DAYS_INTO_WEEK = { :monday => 0, :tuesday => 1, :wednesday => 2, :thursday => 3, :friday => 4, :saturday => 5, :sunday => 6 }
 
-  if RUBY_VERSION < '1.9'
-    undef :>>
-
-    # Backported from 1.9. The one in 1.8 leads to incorrect next_month and
-    # friends for dates where the calendar reform is involved. It additionally
-    # prevents an infinite loop fixed in r27013.
-    def >>(n)
-      y, m = (year * 12 + (mon - 1) + n).divmod(12)
-      m,   = (m + 1)                    .divmod(1)
-      d = mday
-      until jd2 = self.class.valid_civil?(y, m, d, start)
-        d -= 1
-        raise ArgumentError, 'invalid date' unless d > 0
-      end
-      self + (jd2 - jd)
-    end
-  end
-
   class << self
     # Returns a new Date representing the date 1 day ago (i.e. yesterday's date).
     def yesterday
diff --git a/activesupport/lib/active_support/core_ext/date/conversions.rb b/activesupport/lib/active_support/core_ext/date/conversions.rb
index 338104fd05..3262c254f7 100644
--- a/activesupport/lib/active_support/core_ext/date/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date/conversions.rb
@@ -63,12 +63,6 @@ class Date
   alias_method :default_inspect, :inspect
   alias_method :inspect, :readable_inspect
 
-  # A method to keep Time, Date and DateTime instances interchangeable on conversions.
-  # In this case, it simply returns +self+.
-  def to_date
-    self
-  end if RUBY_VERSION < '1.9'
-
   # Converts a Date instance to a Time, where the time is set to the beginning of the day.
   # The timezone can be either :local or :utc (default :local).
   #
@@ -83,23 +77,6 @@ class Date
     ::Time.send("#{form}_time", year, month, day)
   end
 
-  # Converts a Date instance to a DateTime, where the time is set to the beginning of the day
-  # and UTC offset is set to 0.
-  #
-  # ==== Examples
-  #   date = Date.new(2007, 11, 10)  # => Sat, 10 Nov 2007
-  #
-  #   date.to_datetime               # => Sat, 10 Nov 2007 00:00:00 0000
-  def to_datetime
-    ::DateTime.civil(year, month, day, 0, 0, 0, 0)
-  end if RUBY_VERSION < '1.9'
-
-  def iso8601
-    strftime('%F')
-  end if RUBY_VERSION < '1.9'
-
-  alias_method :rfc3339, :iso8601 if RUBY_VERSION < '1.9'
-
   def xmlschema
     to_time_in_current_zone.xmlschema
   end
diff --git a/activesupport/lib/active_support/core_ext/date_time/calculations.rb b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
index 48cf1a435d..1a3cf66a1b 100644
--- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
@@ -1,5 +1,3 @@
-require 'rational' unless RUBY_VERSION >= '1.9.2'
-
 class DateTime
   class << self
     # DateTimes aren't aware of DST rules, so use a consistent non-DST offset when creating a DateTime with an offset in the local zone
diff --git a/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
index ca899c714c..851012e3bf 100644
--- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -66,7 +66,7 @@ class DateTime
   # Attempts to convert self to a Ruby Time object; returns self if out of range of Ruby Time class.
   # If self has an offset other than 0, self will just be returned unaltered, since there's no clean way to map it to a Time.
   def to_time
-    self.offset == 0 ? ::Time.utc_time(year, month, day, hour, min, sec, sec_fraction * (RUBY_VERSION < '1.9' ? 86400000000 : 1000000)) : self
+    self.offset == 0 ? ::Time.utc_time(year, month, day, hour, min, sec, sec_fraction * 1000000) : self
   end
 
   # To be able to keep Times, Dates and DateTimes interchangeable on conversions.
diff --git a/activesupport/lib/active_support/core_ext/enumerable.rb b/activesupport/lib/active_support/core_ext/enumerable.rb
index d9856f2e84..ccd0e9692d 100644
--- a/activesupport/lib/active_support/core_ext/enumerable.rb
+++ b/activesupport/lib/active_support/core_ext/enumerable.rb
@@ -1,41 +1,4 @@
-require 'active_support/ordered_hash'
-
 module Enumerable
-  # Ruby 1.8.7 introduces group_by, but the result isn't ordered. Override it.
-  remove_method(:group_by) if [].respond_to?(:group_by) && RUBY_VERSION < '1.9'
-
-  # Collect an enumerable into sets, grouped by the result of a block. Useful,
-  # for example, for grouping records by date.
-  #
-  # Example:
-  #
-  #   latest_transcripts.group_by(&:day).each do |day, transcripts|
-  #     p "#{day} -> #{transcripts.map(&:class).join(', ')}"
-  #   end
-  #   "2006-03-01 -> Transcript"
-  #   "2006-02-28 -> Transcript"
-  #   "2006-02-27 -> Transcript, Transcript"
-  #   "2006-02-26 -> Transcript, Transcript"
-  #   "2006-02-25 -> Transcript"
-  #   "2006-02-24 -> Transcript, Transcript"
-  #   "2006-02-23 -> Transcript"
-  def group_by
-    return to_enum :group_by unless block_given?
-    assoc = ActiveSupport::OrderedHash.new
-
-    each do |element|
-      key = yield(element)
-
-      if assoc.has_key?(key)
-        assoc[key] << element
-      else
-        assoc[key] = [element]
-      end
-    end
-
-    assoc
-  end unless [].respond_to?(:group_by)
-
   # Calculates a sum from the elements. Examples:
   #
   #  payments.sum { |p| p.price * p.tax_rate }
diff --git a/activesupport/lib/active_support/core_ext/exception.rb b/activesupport/lib/active_support/core_ext/exception.rb
index ef801e713d..ba7757ea07 100644
--- a/activesupport/lib/active_support/core_ext/exception.rb
+++ b/activesupport/lib/active_support/core_ext/exception.rb
@@ -1,3 +1,3 @@
 module ActiveSupport
-  FrozenObjectError = RUBY_VERSION < '1.9' ? TypeError : RuntimeError
+  FrozenObjectError = RuntimeError
 end
diff --git a/activesupport/lib/active_support/core_ext/module/introspection.rb b/activesupport/lib/active_support/core_ext/module/introspection.rb
index c08ad251dd..1893a9cfa6 100644
--- a/activesupport/lib/active_support/core_ext/module/introspection.rb
+++ b/activesupport/lib/active_support/core_ext/module/introspection.rb
@@ -57,27 +57,8 @@ class Module
     parents
   end
 
-  if RUBY_VERSION < '1.9'
-    # Returns the constants that have been defined locally by this object and
-    # not in an ancestor. This method is exact if running under Ruby 1.9. In
-    # previous versions it may miss some constants if their definition in some
-    # ancestor is identical to their definition in the receiver.
-    def local_constants
-      inherited = {}
-
-      ancestors.each do |anc|
-        next if anc == self
-        anc.constants.each { |const| inherited[const] = anc.const_get(const) }
-      end
-
-      constants.select do |const|
-        !inherited.key?(const) || inherited[const].object_id != const_get(const).object_id
-      end
-    end
-  else
-    def local_constants #:nodoc:
-      constants(false)
-    end
+  def local_constants #:nodoc:
+    constants(false)
   end
 
   # Returns the names of the constants defined locally rather than the
diff --git a/activesupport/lib/active_support/core_ext/object/instance_variables.rb b/activesupport/lib/active_support/core_ext/object/instance_variables.rb
index eda9694614..66caf9bec8 100644
--- a/activesupport/lib/active_support/core_ext/object/instance_variables.rb
+++ b/activesupport/lib/active_support/core_ext/object/instance_variables.rb
@@ -23,11 +23,7 @@ class Object
   #   end
   #
   #   C.new(0, 1).instance_variable_names # => ["@y", "@x"]
-  if RUBY_VERSION >= '1.9'
-    def instance_variable_names
-      instance_variables.map { |var| var.to_s }
-    end
-  else
-    alias_method :instance_variable_names, :instance_variables
+  def instance_variable_names
+    instance_variables.map { |var| var.to_s }
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/range.rb b/activesupport/lib/active_support/core_ext/range.rb
index 2428a02242..c0736f3a44 100644
--- a/activesupport/lib/active_support/core_ext/range.rb
+++ b/activesupport/lib/active_support/core_ext/range.rb
@@ -2,4 +2,3 @@ require 'active_support/core_ext/range/blockless_step'
 require 'active_support/core_ext/range/conversions'
 require 'active_support/core_ext/range/include_range'
 require 'active_support/core_ext/range/overlaps'
-require 'active_support/core_ext/range/cover'
diff --git a/activesupport/lib/active_support/core_ext/range/cover.rb b/activesupport/lib/active_support/core_ext/range/cover.rb
deleted file mode 100644
index 3a182cddd2..0000000000
--- a/activesupport/lib/active_support/core_ext/range/cover.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Range
-  alias_method(:cover?, :include?) unless instance_methods.include?(:cover?)
-end
diff --git a/activesupport/lib/active_support/core_ext/string/encoding.rb b/activesupport/lib/active_support/core_ext/string/encoding.rb
index d4781bfe0c..236f72e933 100644
--- a/activesupport/lib/active_support/core_ext/string/encoding.rb
+++ b/activesupport/lib/active_support/core_ext/string/encoding.rb
@@ -1,11 +1,5 @@
 class String
-  if defined?(Encoding) && "".respond_to?(:encode)
-    def encoding_aware?
-      true
-    end
-  else
-    def encoding_aware?
-      false
-    end
+  def encoding_aware?
+    true
   end
 end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/core_ext/string/multibyte.rb b/activesupport/lib/active_support/core_ext/string/multibyte.rb
index 400db2ce39..4e7824ad74 100644
--- a/activesupport/lib/active_support/core_ext/string/multibyte.rb
+++ b/activesupport/lib/active_support/core_ext/string/multibyte.rb
@@ -2,71 +2,55 @@
 require 'active_support/multibyte'
 
 class String
-  if RUBY_VERSION >= "1.9"
-    # == Multibyte proxy
-    #
-    # +mb_chars+ is a multibyte safe proxy for string methods.
-    #
-    # In Ruby 1.8 and older it creates and returns an instance of the ActiveSupport::Multibyte::Chars class which
-    # encapsulates the original string. A Unicode safe version of all the String methods are defined on this proxy
-    # class. If the proxy class doesn't respond to a certain method, it's forwarded to the encapsulated string.
-    #
-    #   name = 'Claus Müller'
-    #   name.reverse # => "rell??M sualC"
-    #   name.length  # => 13
-    #
-    #   name.mb_chars.reverse.to_s # => "rellüM sualC"
-    #   name.mb_chars.length       # => 12
-    #
-    # In Ruby 1.9 and newer +mb_chars+ returns +self+ because String is (mostly) encoding aware. This means that
-    # it becomes easy to run one version of your code on multiple Ruby versions.
-    #
-    # == Method chaining
-    #
-    # All the methods on the Chars proxy which normally return a string will return a Chars object. This allows
-    # method chaining on the result of any of these methods.
-    #
-    #   name.mb_chars.reverse.length # => 12
-    #
-    # == Interoperability and configuration
-    #
-    # The Chars object tries to be as interchangeable with String objects as possible: sorting and comparing between
-    # String and Char work like expected. The bang! methods change the internal string representation in the Chars
-    # object. Interoperability problems can be resolved easily with a +to_s+ call.
-    #
-    # For more information about the methods defined on the Chars proxy see ActiveSupport::Multibyte::Chars. For
-    # information about how to change the default Multibyte behavior see ActiveSupport::Multibyte.
-    def mb_chars
-      if ActiveSupport::Multibyte.proxy_class.consumes?(self)
-        ActiveSupport::Multibyte.proxy_class.new(self)
-      else
-        self
-      end
-    end
-
-    def is_utf8?
-      case encoding
-      when Encoding::UTF_8
-        valid_encoding?
-      when Encoding::ASCII_8BIT, Encoding::US_ASCII
-        dup.force_encoding(Encoding::UTF_8).valid_encoding?
-      else
-        false
-      end
-    end
-  else
-    def mb_chars
-      if ActiveSupport::Multibyte.proxy_class.wants?(self)
-        ActiveSupport::Multibyte.proxy_class.new(self)
-      else
-        self
-      end
+  # == Multibyte proxy
+  #
+  # +mb_chars+ is a multibyte safe proxy for string methods.
+  #
+  # In Ruby 1.8 and older it creates and returns an instance of the ActiveSupport::Multibyte::Chars class which
+  # encapsulates the original string. A Unicode safe version of all the String methods are defined on this proxy
+  # class. If the proxy class doesn't respond to a certain method, it's forwarded to the encapsulated string.
+  #
+  #   name = 'Claus Müller'
+  #   name.reverse # => "rell??M sualC"
+  #   name.length  # => 13
+  #
+  #   name.mb_chars.reverse.to_s # => "rellüM sualC"
+  #   name.mb_chars.length       # => 12
+  #
+  # In Ruby 1.9 and newer +mb_chars+ returns +self+ because String is (mostly) encoding aware. This means that
+  # it becomes easy to run one version of your code on multiple Ruby versions.
+  #
+  # == Method chaining
+  #
+  # All the methods on the Chars proxy which normally return a string will return a Chars object. This allows
+  # method chaining on the result of any of these methods.
+  #
+  #   name.mb_chars.reverse.length # => 12
+  #
+  # == Interoperability and configuration
+  #
+  # The Chars object tries to be as interchangeable with String objects as possible: sorting and comparing between
+  # String and Char work like expected. The bang! methods change the internal string representation in the Chars
+  # object. Interoperability problems can be resolved easily with a +to_s+ call.
+  #
+  # For more information about the methods defined on the Chars proxy see ActiveSupport::Multibyte::Chars. For
+  # information about how to change the default Multibyte behavior see ActiveSupport::Multibyte.
+  def mb_chars
+    if ActiveSupport::Multibyte.proxy_class.consumes?(self)
+      ActiveSupport::Multibyte.proxy_class.new(self)
+    else
+      self
     end
+  end
 
-    # Returns true if the string has UTF-8 semantics (a String used for purely byte resources is unlikely to have
-    # them), returns false otherwise.
-    def is_utf8?
-      ActiveSupport::Multibyte::Chars.consumes?(self)
+  def is_utf8?
+    case encoding
+    when Encoding::UTF_8
+      valid_encoding?
+    when Encoding::ASCII_8BIT, Encoding::US_ASCII
+      dup.force_encoding(Encoding::UTF_8).valid_encoding?
+    else
+      false
     end
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/uri.rb b/activesupport/lib/active_support/core_ext/uri.rb
index ee991e3439..0b219ce44a 100644
--- a/activesupport/lib/active_support/core_ext/uri.rb
+++ b/activesupport/lib/active_support/core_ext/uri.rb
@@ -1,22 +1,18 @@
 # encoding: utf-8
 
-if RUBY_VERSION >= '1.9'
-  require 'uri'
+require 'uri'
+str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese.
+parser = URI::Parser.new
 
-  str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese.
-
-  parser = URI::Parser.new
-
-  unless str == parser.unescape(parser.escape(str))
-    URI::Parser.class_eval do
-      remove_method :unescape
-      def unescape(str, escaped = /%[a-fA-F\d]{2}/)
-        # TODO: Are we actually sure that ASCII == UTF-8?
-        # YK: My initial experiments say yes, but let's be sure please
-        enc = str.encoding
-        enc = Encoding::UTF_8 if enc == Encoding::US_ASCII
-        str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(enc)
-      end
+unless str == parser.unescape(parser.escape(str))
+  URI::Parser.class_eval do
+    remove_method :unescape
+    def unescape(str, escaped = /%[a-fA-F\d]{2}/)
+      # TODO: Are we actually sure that ASCII == UTF-8?
+      # YK: My initial experiments say yes, but let's be sure please
+      enc = str.encoding
+      enc = Encoding::UTF_8 if enc == Encoding::US_ASCII
+      str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(enc)
     end
   end
 end
diff --git a/activesupport/lib/active_support/multibyte/chars.rb b/activesupport/lib/active_support/multibyte/chars.rb
index b78d92f599..ba35b515f2 100644
--- a/activesupport/lib/active_support/multibyte/chars.rb
+++ b/activesupport/lib/active_support/multibyte/chars.rb
@@ -38,16 +38,10 @@ module ActiveSupport #:nodoc:
       alias to_s wrapped_string
       alias to_str wrapped_string
 
-      if RUBY_VERSION >= "1.9"
-        # Creates a new Chars instance by wrapping _string_.
-        def initialize(string)
-          @wrapped_string = string
-          @wrapped_string.force_encoding(Encoding::UTF_8) unless @wrapped_string.frozen?
-        end
-      else
-        def initialize(string) #:nodoc:
-          @wrapped_string = string
-        end
+      # Creates a new Chars instance by wrapping _string_.
+      def initialize(string)
+        @wrapped_string = string
+        @wrapped_string.force_encoding(Encoding::UTF_8) unless @wrapped_string.frozen?
       end
 
       # Forward all undefined methods to the wrapped string.
@@ -94,151 +88,8 @@ module ActiveSupport #:nodoc:
         @wrapped_string <=> other.to_s
       end
 
-      if RUBY_VERSION < "1.9"
-        # Returns +true+ if the Chars class can and should act as a proxy for the string _string_. Returns
-        # +false+ otherwise.
-        def self.wants?(string)
-          $KCODE == 'UTF8' && consumes?(string)
-        end
-
-        # Returns a new Chars object containing the _other_ object concatenated to the string.
-        #
-        # Example:
-        #   ('Café'.mb_chars + ' périferôl').to_s # => "Café périferôl"
-        def +(other)
-          chars(@wrapped_string + other)
-        end
-
-        # Like <tt>String#=~</tt> only it returns the character offset (in codepoints) instead of the byte offset.
-        #
-        # Example:
-        #   'Café périferôl'.mb_chars =~ /ô/ # => 12
-        def =~(other)
-          translate_offset(@wrapped_string =~ other)
-        end
-
-        # Inserts the passed string at specified codepoint offsets.
-        #
-        # Example:
-        #   'Café'.mb_chars.insert(4, ' périferôl').to_s # => "Café périferôl"
-        def insert(offset, fragment)
-          unpacked = Unicode.u_unpack(@wrapped_string)
-          unless offset > unpacked.length
-            @wrapped_string.replace(
-              Unicode.u_unpack(@wrapped_string).insert(offset, *Unicode.u_unpack(fragment)).pack('U*')
-            )
-          else
-            raise IndexError, "index #{offset} out of string"
-          end
-          self
-        end
-
-        # Returns +true+ if contained string contains _other_. Returns +false+ otherwise.
-        #
-        # Example:
-        #   'Café'.mb_chars.include?('é') # => true
-        def include?(other)
-          # We have to redefine this method because Enumerable defines it.
-          @wrapped_string.include?(other)
-        end
-
-        # Returns the position _needle_ in the string, counting in codepoints. Returns +nil+ if _needle_ isn't found.
-        #
-        # Example:
-        #   'Café périferôl'.mb_chars.index('ô')   # => 12
-        #   'Café périferôl'.mb_chars.index(/\w/u) # => 0
-        def index(needle, offset=0)
-          wrapped_offset = first(offset).wrapped_string.length
-          index = @wrapped_string.index(needle, wrapped_offset)
-          index ? (Unicode.u_unpack(@wrapped_string.slice(0...index)).size) : nil
-        end
-
-        # Returns the position _needle_ in the string, counting in
-        # codepoints, searching backward from _offset_ or the end of the
-        # string. Returns +nil+ if _needle_ isn't found.
-        #
-        # Example:
-        #   'Café périferôl'.mb_chars.rindex('é')   # => 6
-        #   'Café périferôl'.mb_chars.rindex(/\w/u) # => 13
-        def rindex(needle, offset=nil)
-          offset ||= length
-          wrapped_offset = first(offset).wrapped_string.length
-          index = @wrapped_string.rindex(needle, wrapped_offset)
-          index ? (Unicode.u_unpack(@wrapped_string.slice(0...index)).size) : nil
-        end
-
-        # Returns the number of codepoints in the string
-        def size
-          Unicode.u_unpack(@wrapped_string).size
-        end
-        alias_method :length, :size
-
-        # Strips entire range of Unicode whitespace from the right of the string.
-        def rstrip
-          chars(@wrapped_string.gsub(Unicode::TRAILERS_PAT, ''))
-        end
-
-        # Strips entire range of Unicode whitespace from the left of the string.
-        def lstrip
-          chars(@wrapped_string.gsub(Unicode::LEADERS_PAT, ''))
-        end
-
-        # Strips entire range of Unicode whitespace from the right and left of the string.
-        def strip
-          rstrip.lstrip
-        end
-
-        # Returns the codepoint of the first character in the string.
-        #
-        # Example:
-        #   'こんにちは'.mb_chars.ord # => 12371
-        def ord
-          Unicode.u_unpack(@wrapped_string)[0]
-        end
-
-        # Works just like <tt>String#rjust</tt>, only integer specifies characters instead of bytes.
-        #
-        # Example:
-        #
-        #   "¾ cup".mb_chars.rjust(8).to_s
-        #   # => "   ¾ cup"
-        #
-        #   "¾ cup".mb_chars.rjust(8, " ").to_s # Use non-breaking whitespace
-        #   # => "   ¾ cup"
-        def rjust(integer, padstr=' ')
-          justify(integer, :right, padstr)
-        end
-
-        # Works just like <tt>String#ljust</tt>, only integer specifies characters instead of bytes.
-        #
-        # Example:
-        #
-        #   "¾ cup".mb_chars.rjust(8).to_s
-        #   # => "¾ cup   "
-        #
-        #   "¾ cup".mb_chars.rjust(8, " ").to_s # Use non-breaking whitespace
-        #   # => "¾ cup   "
-        def ljust(integer, padstr=' ')
-          justify(integer, :left, padstr)
-        end
-
-        # Works just like <tt>String#center</tt>, only integer specifies characters instead of bytes.
-        #
-        # Example:
-        #
-        #   "¾ cup".mb_chars.center(8).to_s
-        #   # => " ¾ cup  "
-        #
-        #   "¾ cup".mb_chars.center(8, " ").to_s # Use non-breaking whitespace
-        #   # => " ¾ cup  "
-        def center(integer, padstr=' ')
-          justify(integer, :center, padstr)
-        end
-
-      else
-        def =~(other)
-          @wrapped_string =~ other
-        end
+      def =~(other)
+        @wrapped_string =~ other
       end
 
       # Works just like <tt>String#split</tt>, with the exception that the items in the resulting list are Chars
diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb
index b0d4f2bd86..d4f309fbd7 100644
--- a/activesupport/lib/active_support/ordered_hash.rb
+++ b/activesupport/lib/active_support/ordered_hash.rb
@@ -51,172 +51,5 @@ module ActiveSupport
     def extractable_options?
       true
     end
-
-    # Hash is ordered in Ruby 1.9!
-    if RUBY_VERSION < '1.9'
-
-      # In MRI the Hash class is core and written in C. In particular, methods are
-      # programmed with explicit C function calls and polymorphism is not honored.
-      #
-      # For example, []= is crucial in this implementation to maintain the @keys
-      # array but hash.c invokes rb_hash_aset() originally. This prevents method
-      # reuse through inheritance and forces us to reimplement stuff.
-      #
-      # For instance, we cannot use the inherited #merge! because albeit the algorithm
-      # itself would work, our []= is not being called at all by the C code.
-
-      def initialize(*args, &block)
-        super
-        @keys = []
-      end
-
-      def self.[](*args)
-        ordered_hash = new
-
-        if (args.length == 1 && args.first.is_a?(Array))
-          args.first.each do |key_value_pair|
-            next unless (key_value_pair.is_a?(Array))
-            ordered_hash[key_value_pair[0]] = key_value_pair[1]
-          end
-
-          return ordered_hash
-        end
-
-        unless (args.size % 2 == 0)
-          raise ArgumentError.new("odd number of arguments for Hash")
-        end
-
-        args.each_with_index do |val, ind|
-          next if (ind % 2 != 0)
-          ordered_hash[val] = args[ind + 1]
-        end
-
-        ordered_hash
-      end
-
-      def initialize_copy(other)
-        super
-        # make a deep copy of keys
-        @keys = other.keys
-      end
-
-      def []=(key, value)
-        @keys << key unless has_key?(key)
-        super
-      end
-
-      def delete(key)
-        if has_key? key
-          index = @keys.index(key)
-          @keys.delete_at index
-        end
-        super
-      end
-
-      def delete_if
-        super
-        sync_keys!
-        self
-      end
-
-      def reject!
-        super
-        sync_keys!
-        self
-      end
-
-      def reject(&block)
-        dup.reject!(&block)
-      end
-
-      def keys
-        @keys.dup
-      end
-
-      def values
-        @keys.collect { |key| self[key] }
-      end
-
-      def to_hash
-        self
-      end
-
-      def to_a
-        @keys.map { |key| [ key, self[key] ] }
-      end
-
-      def each_key
-        return to_enum(:each_key) unless block_given?
-        @keys.each { |key| yield key }
-        self
-      end
-
-      def each_value
-        return to_enum(:each_value) unless block_given?
-        @keys.each { |key| yield self[key]}
-        self
-      end
-
-      def each
-        return to_enum(:each) unless block_given?
-        @keys.each {|key| yield [key, self[key]]}
-        self
-      end
-
-      def each_pair
-        return to_enum(:each_pair) unless block_given?
-        @keys.each {|key| yield key, self[key]}
-        self
-      end
-
-      alias_method :select, :find_all
-
-      def clear
-        super
-        @keys.clear
-        self
-      end
-
-      def shift
-        k = @keys.first
-        v = delete(k)
-        [k, v]
-      end
-
-      def merge!(other_hash)
-        if block_given?
-          other_hash.each { |k, v| self[k] = key?(k) ? yield(k, self[k], v) : v }
-        else
-          other_hash.each { |k, v| self[k] = v }
-        end
-        self
-      end
-
-      alias_method :update, :merge!
-
-      def merge(other_hash, &block)
-        dup.merge!(other_hash, &block)
-      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 invert
-        OrderedHash[self.to_a.map!{|key_value_pair| key_value_pair.reverse}]
-      end
-
-      def inspect
-        "#<OrderedHash #{super}>"
-      end
-
-      private
-        def sync_keys!
-          @keys.delete_if {|k| !has_key?(k)}
-        end
-    end
   end
 end
diff --git a/activesupport/lib/active_support/testing/performance/ruby.rb b/activesupport/lib/active_support/testing/performance/ruby.rb
index 7d6d047ef6..26731c6bd7 100644
--- a/activesupport/lib/active_support/testing/performance/ruby.rb
+++ b/activesupport/lib/active_support/testing/performance/ruby.rb
@@ -144,8 +144,6 @@ end
 
 if RUBY_VERSION.between?('1.9.2', '2.0')
   require 'active_support/testing/performance/ruby/yarv'
-elsif RUBY_VERSION.between?('1.8.6', '1.9')
-  require 'active_support/testing/performance/ruby/mri'
 else
   $stderr.puts 'Update your ruby interpreter to be able to run benchmarks.'
   exit
diff --git a/activesupport/lib/active_support/testing/performance/ruby/mri.rb b/activesupport/lib/active_support/testing/performance/ruby/mri.rb
deleted file mode 100644
index 142279dd6e..0000000000
--- a/activesupport/lib/active_support/testing/performance/ruby/mri.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-module ActiveSupport
-  module Testing
-    module Performance
-      module Metrics
-        class Base
-          protected
-            # Ruby 1.8 + ruby-prof wrapper (enable/disable stats for Benchmarker)
-            if GC.respond_to?(:enable_stats)
-              def with_gc_stats
-                GC.enable_stats
-                GC.start
-                yield
-              ensure
-                GC.disable_stats
-              end
-            end
-        end
-
-        class Memory < DigitalInformationUnit
-          # Ruby 1.8 + ruby-prof wrapper
-          if RubyProf.respond_to?(:measure_memory)
-            def measure
-              RubyProf.measure_memory
-            end
-          end
-        end
-
-        class Objects < Amount
-          # Ruby 1.8 + ruby-prof wrapper
-          if RubyProf.respond_to?(:measure_allocations)
-            def measure
-              RubyProf.measure_allocations
-            end
-          end
-        end
-
-        class GcRuns < Amount
-          # Ruby 1.8 + ruby-prof wrapper
-          if RubyProf.respond_to?(:measure_gc_runs)
-            def measure
-              RubyProf.measure_gc_runs
-            end
-          end
-        end
-
-        class GcTime < Time
-          # Ruby 1.8 + ruby-prof wrapper
-          if RubyProf.respond_to?(:measure_gc_time)
-            def measure
-              RubyProf.measure_gc_time / 1000.0 / 1000.0
-            end
-          end
-        end
-      end
-    end
-  end
-end
-- 
cgit v1.2.3


From fb1c06a694b343aa0d5753cb1174ddda3ecfb817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 20 Dec 2011 18:31:13 +0100
Subject: Remove more dead code from AS.

---
 .../core_ext/module/qualified_const.rb             | 24 ++++++----------------
 activesupport/lib/active_support/dependencies.rb   | 22 ++++----------------
 2 files changed, 10 insertions(+), 36 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/module/qualified_const.rb b/activesupport/lib/active_support/core_ext/module/qualified_const.rb
index d1a0ee2f83..8adf050b6b 100644
--- a/activesupport/lib/active_support/core_ext/module/qualified_const.rb
+++ b/activesupport/lib/active_support/core_ext/module/qualified_const.rb
@@ -23,26 +23,14 @@ end
 # Object.const_get("::String") raises NameError and so does qualified_const_get.
 #++
 class Module
-  if method(:const_defined?).arity == 1
-    def qualified_const_defined?(path)
-      QualifiedConstUtils.raise_if_absolute(path)
-
-      QualifiedConstUtils.names(path).inject(self) do |mod, name|
-        return unless mod.const_defined?(name)
-        mod.const_get(name)
-      end
-      return true
-    end
-  else
-    def qualified_const_defined?(path, search_parents=true)
-      QualifiedConstUtils.raise_if_absolute(path)
+  def qualified_const_defined?(path, search_parents=true)
+    QualifiedConstUtils.raise_if_absolute(path)
 
-      QualifiedConstUtils.names(path).inject(self) do |mod, name|
-        return unless mod.const_defined?(name, search_parents)
-        mod.const_get(name)
-      end
-      return true
+    QualifiedConstUtils.names(path).inject(self) do |mod, name|
+      return unless mod.const_defined?(name, search_parents)
+      mod.const_get(name)
     end
+    return true
   end
 
   def qualified_const_get(path)
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 43dd22654a..e121e452a3 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -369,26 +369,12 @@ module ActiveSupport #:nodoc:
     end
 
     # Is the provided constant path defined?
-    if Module.method(:const_defined?).arity == 1
-      def qualified_const_defined?(path)
-        Object.qualified_const_defined?(path.sub(/^::/, ''))
-      end
-    else
-      def qualified_const_defined?(path)
-        Object.qualified_const_defined?(path.sub(/^::/, ''), false)
-      end
+    def qualified_const_defined?(path)
+      Object.qualified_const_defined?(path.sub(/^::/, ''), false)
     end
 
-    if Module.method(:const_defined?).arity == 1
-      # Does this module define this constant?
-      # Wrapper to accommodate changing Module#const_defined? in Ruby 1.9
-      def local_const_defined?(mod, const)
-        mod.const_defined?(const)
-      end
-    else
-      def local_const_defined?(mod, const) #:nodoc:
-        mod.const_defined?(const, false)
-      end
+    def local_const_defined?(mod, const) #:nodoc:
+      mod.const_defined?(const, false)
     end
 
     # Given +path+, a filesystem path to a ruby file, return an array of constant
-- 
cgit v1.2.3


From e7d827ec504a1bdd93e7e424926c9bc36e795a72 Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Tue, 20 Dec 2011 21:14:57 +0300
Subject: requiring enumerator is not nessessary in ruby 1.9

---
 activesupport/lib/active_support/core_ext/array/grouping.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/array/grouping.rb b/activesupport/lib/active_support/core_ext/array/grouping.rb
index 4cd9bfadac..2b3f639cb1 100644
--- a/activesupport/lib/active_support/core_ext/array/grouping.rb
+++ b/activesupport/lib/active_support/core_ext/array/grouping.rb
@@ -1,5 +1,3 @@
-require 'enumerator'
-
 class Array
   # Splits or iterates over the array in groups of size +number+,
   # padding any remaining slots with +fill_with+ unless it is +false+.
-- 
cgit v1.2.3


From ee69ef62a8edf6adfa4aba33e5d4f61ad55b6a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U=C4=A3is=20Ozols?= <ugis.ozolss@gmail.com>
Date: Wed, 21 Dec 2011 09:25:29 +0200
Subject: Remove some of the ActiveSupport core extensions related to 1.8.

---
 .../lib/active_support/core_ext/date/freeze.rb     | 33 ----------------------
 activesupport/lib/active_support/core_ext/float.rb |  1 -
 .../lib/active_support/core_ext/float/rounding.rb  | 19 -------------
 activesupport/lib/active_support/core_ext/io.rb    | 15 ----------
 activesupport/lib/active_support/time.rb           |  1 -
 5 files changed, 69 deletions(-)
 delete mode 100644 activesupport/lib/active_support/core_ext/date/freeze.rb
 delete mode 100644 activesupport/lib/active_support/core_ext/float.rb
 delete mode 100644 activesupport/lib/active_support/core_ext/float/rounding.rb
 delete mode 100644 activesupport/lib/active_support/core_ext/io.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/date/freeze.rb b/activesupport/lib/active_support/core_ext/date/freeze.rb
deleted file mode 100644
index a731f8345e..0000000000
--- a/activesupport/lib/active_support/core_ext/date/freeze.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# Date memoizes some instance methods using metaprogramming to wrap
-# the methods with one that caches the result in an instance variable.
-#
-# If a Date is frozen but the memoized method hasn't been called, the
-# first call will result in a frozen object error since the memo
-# instance variable is uninitialized.
-#
-# Work around by eagerly memoizing before the first freeze.
-#
-# Ruby 1.9 uses a preinitialized instance variable so it's unaffected.
-# This hack is as close as we can get to feature detection:
-if RUBY_VERSION < '1.9'
-  require 'date'
-  begin
-    ::Date.today.freeze.jd
-  rescue => frozen_object_error
-    if frozen_object_error.message =~ /frozen/
-      class Date #:nodoc:
-        def freeze
-          unless frozen?
-            self.class.private_instance_methods(false).each do |m|
-              if m.to_s =~ /\A__\d+__\Z/
-                instance_variable_set(:"@#{m}", [send(m)])
-              end
-            end
-          end
-
-          super
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/core_ext/float.rb b/activesupport/lib/active_support/core_ext/float.rb
deleted file mode 100644
index 7570471b95..0000000000
--- a/activesupport/lib/active_support/core_ext/float.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'active_support/core_ext/float/rounding'
diff --git a/activesupport/lib/active_support/core_ext/float/rounding.rb b/activesupport/lib/active_support/core_ext/float/rounding.rb
deleted file mode 100644
index 0d4fb87665..0000000000
--- a/activesupport/lib/active_support/core_ext/float/rounding.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class Float
-  alias precisionless_round round
-  private :precisionless_round
-
-  # Rounds the float with the specified precision.
-  #
-  #   x = 1.337
-  #   x.round    # => 1
-  #   x.round(1) # => 1.3
-  #   x.round(2) # => 1.34
-  def round(precision = nil)
-    if precision
-      magnitude = 10.0 ** precision
-      (self * magnitude).round / magnitude
-    else
-      precisionless_round
-    end
-  end
-end if RUBY_VERSION < '1.9'
diff --git a/activesupport/lib/active_support/core_ext/io.rb b/activesupport/lib/active_support/core_ext/io.rb
deleted file mode 100644
index 75f1055191..0000000000
--- a/activesupport/lib/active_support/core_ext/io.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-if RUBY_VERSION < '1.9.2'
-
-# :stopdoc:
-class IO
-  def self.binread(name, length = nil, offset = nil)
-    return File.read name unless length || offset
-    File.open(name, 'rb') { |f|
-      f.seek offset if offset
-      f.read length
-    }
-  end
-end
-# :startdoc:
-
-end
diff --git a/activesupport/lib/active_support/time.rb b/activesupport/lib/active_support/time.rb
index 86f057d676..4ef289a414 100644
--- a/activesupport/lib/active_support/time.rb
+++ b/activesupport/lib/active_support/time.rb
@@ -21,7 +21,6 @@ require 'active_support/core_ext/time/conversions'
 require 'active_support/core_ext/time/zones'
 
 require 'active_support/core_ext/date/acts_like'
-require 'active_support/core_ext/date/freeze'
 require 'active_support/core_ext/date/calculations'
 require 'active_support/core_ext/date/conversions'
 require 'active_support/core_ext/date/zones'
-- 
cgit v1.2.3


From 1922283177e92823e760720889a60e5a9576648f Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Fri, 23 Dec 2011 10:20:24 +0300
Subject: remove Enumerable#each_with_object again

it come back occasionally in 367741ef
---
 .../lib/active_support/core_ext/enumerable.rb       | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/enumerable.rb b/activesupport/lib/active_support/core_ext/enumerable.rb
index 004014948e..77a5087981 100644
--- a/activesupport/lib/active_support/core_ext/enumerable.rb
+++ b/activesupport/lib/active_support/core_ext/enumerable.rb
@@ -26,27 +26,6 @@ module Enumerable
     end
   end
 
-  # Iterates over a collection, passing the current element *and* the
-  # +memo+ to the block. Handy for building up hashes or
-  # reducing collections down to one object. Examples:
-  #
-  #   %w(foo bar).each_with_object({}) { |str, hsh| hsh[str] = str.upcase }
-  #   # => {'foo' => 'FOO', 'bar' => 'BAR'}
-  #
-  # *Note* that you can't use immutable objects like numbers, true or false as
-  # the memo. You would think the following returns 120, but since the memo is
-  # never changed, it does not.
-  #
-  #   (1..5).each_with_object(1) { |value, memo| memo *= value } # => 1
-  #
-  def each_with_object(memo)
-    return to_enum :each_with_object, memo unless block_given?
-    each do |element|
-      yield element, memo
-    end
-    memo
-  end unless [].respond_to?(:each_with_object)
-
   # Convert an enumerable to a hash. Examples:
   #
   #   people.index_by(&:login)
-- 
cgit v1.2.3


From cd2c31a1c448cef135b14017a32ebf7e00d81059 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sat, 24 Dec 2011 15:25:22 +0530
Subject: A few doc changes

---
 activesupport/lib/active_support/tagged_logging.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index 0f3ac0c132..8eae43188d 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -32,9 +32,9 @@ module ActiveSupport
 
     %w( fatal error warn info debug unknown ).each do |severity|
       eval <<-EOM, nil, __FILE__, __LINE__ + 1
-        def #{severity}(progname = nil, &block)
-          add(Logger::#{severity.upcase}, progname, &block)
-        end
+        def #{severity}(progname = nil, &block)              # def warn(progname = nil, &block)
+          add(Logger::#{severity.upcase}, progname, &block)  #   add(Logger::WARN, progname, &block)
+        end                                                  # end
       EOM
     end
 
-- 
cgit v1.2.3


From 5ca86ac8f924b333a5a01a47cc07cbcf39c16e80 Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Sat, 24 Dec 2011 15:57:54 +0300
Subject: deprecate String#encoding_aware? and remove its usage

---
 activesupport/lib/active_support/cache/mem_cache_store.rb    | 2 +-
 activesupport/lib/active_support/core_ext/string/encoding.rb | 5 ++++-
 activesupport/lib/active_support/gzip.rb                     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index 530839b24d..e38a8387b4 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -165,7 +165,7 @@ module ActiveSupport
         # characters properly.
         def escape_key(key)
           key = key.to_s.dup
-          key = key.force_encoding("BINARY") if key.encoding_aware?
+          key = key.force_encoding("BINARY")
           key = key.gsub(ESCAPE_KEY_CHARS){ |match| "%#{match.getbyte(0).to_s(16).upcase}" }
           key = "#{key[0, 213]}:md5:#{Digest::MD5.hexdigest(key)}" if key.size > 250
           key
diff --git a/activesupport/lib/active_support/core_ext/string/encoding.rb b/activesupport/lib/active_support/core_ext/string/encoding.rb
index 236f72e933..dc635ed6a5 100644
--- a/activesupport/lib/active_support/core_ext/string/encoding.rb
+++ b/activesupport/lib/active_support/core_ext/string/encoding.rb
@@ -1,5 +1,8 @@
+require 'active_support/deprecation'
+
 class String
   def encoding_aware?
+    ActiveSupport::Deprecation.warn 'String#encoding_aware? is deprecated', caller
     true
   end
-end
\ No newline at end of file
+end
diff --git a/activesupport/lib/active_support/gzip.rb b/activesupport/lib/active_support/gzip.rb
index 9651f02c73..f7036315d6 100644
--- a/activesupport/lib/active_support/gzip.rb
+++ b/activesupport/lib/active_support/gzip.rb
@@ -8,7 +8,7 @@ module ActiveSupport
     class Stream < StringIO
       def initialize(*)
         super
-        set_encoding "BINARY" if "".encoding_aware?
+        set_encoding "BINARY"
       end
       def close; rewind; end
     end
-- 
cgit v1.2.3


From 40566dc19bf71123231bd23b94c6b9b9cbc70f1b Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Sat, 24 Dec 2011 21:42:43 +0300
Subject: remove deprecated Module#synchronize from ActiveSupport

---
 .../lib/active_support/core_ext/module.rb          |  3 +-
 .../core_ext/module/synchronization.rb             | 45 ----------------------
 2 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 activesupport/lib/active_support/core_ext/module/synchronization.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/module.rb b/activesupport/lib/active_support/core_ext/module.rb
index f399fce410..e672e9dca0 100644
--- a/activesupport/lib/active_support/core_ext/module.rb
+++ b/activesupport/lib/active_support/core_ext/module.rb
@@ -5,8 +5,7 @@ require 'active_support/core_ext/module/reachable'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/module/attr_internal'
 require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/module/synchronization'
 require 'active_support/core_ext/module/deprecation'
 require 'active_support/core_ext/module/remove_method'
 require 'active_support/core_ext/module/method_names'
-require 'active_support/core_ext/module/qualified_const'
\ No newline at end of file
+require 'active_support/core_ext/module/qualified_const'
diff --git a/activesupport/lib/active_support/core_ext/module/synchronization.rb b/activesupport/lib/active_support/core_ext/module/synchronization.rb
deleted file mode 100644
index 061621c0ef..0000000000
--- a/activesupport/lib/active_support/core_ext/module/synchronization.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'thread'
-require 'active_support/core_ext/module/aliasing'
-require 'active_support/core_ext/array/extract_options'
-require 'active_support/core_ext/module/deprecation'
-
-class Module
-  # Synchronize access around a method, delegating synchronization to a
-  # particular mutex. A mutex (either a Mutex, or any object that responds to
-  # #synchronize and yields to a block) must be provided as a final :with option.
-  # The :with option should be a symbol or string, and can represent a method,
-  # constant, or instance or class variable.
-  # Example:
-  #   class SharedCache
-  #     @@lock = Mutex.new
-  #     def expire
-  #       ...
-  #     end
-  #     synchronize :expire, :with => :@@lock
-  #   end
-  def synchronize(*methods)
-    options = methods.extract_options!
-    unless options.is_a?(Hash) && with = options[:with]
-      raise ArgumentError, "Synchronization needs a mutex. Supply an options hash with a :with key as the last argument (e.g. synchronize :hello, :with => :@mutex)."
-    end
-
-    methods.each do |method|
-      aliased_method, punctuation = method.to_s.sub(/([?!=])$/, ''), $1
-
-      if method_defined?("#{aliased_method}_without_synchronization#{punctuation}")
-        raise ArgumentError, "#{method} is already synchronized. Double synchronization is not currently supported."
-      end
-
-      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)
-          end                                                                       #   end
-        end                                                                         # end
-      EOS
-
-      alias_method_chain method, :synchronization
-    end
-  end
-  deprecate :synchronize
-end
-- 
cgit v1.2.3


From daef51ee0ae65a3646ec440107cd6686d8fb9e8c Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Sun, 25 Dec 2011 00:09:22 +0300
Subject: remove Time._dump and Time._load patching for ruby 1.8

---
 .../lib/active_support/core_ext/time/marshal.rb    | 27 ----------------------
 1 file changed, 27 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/time/marshal.rb b/activesupport/lib/active_support/core_ext/time/marshal.rb
index 457d3f5b62..1bf622d6a6 100644
--- a/activesupport/lib/active_support/core_ext/time/marshal.rb
+++ b/activesupport/lib/active_support/core_ext/time/marshal.rb
@@ -1,30 +1,3 @@
-# Pre-1.9 versions of Ruby have a bug with marshaling Time instances, where utc instances are
-# unmarshalled in the local zone, instead of utc. We're layering behavior on the _dump and _load
-# methods so that utc instances can be flagged on dump, and coerced back to utc on load.
-if !Marshal.load(Marshal.dump(Time.now.utc)).utc?
-  class Time
-    class << self
-      alias_method :_load_without_utc_flag, :_load
-      def _load(marshaled_time)
-        time = _load_without_utc_flag(marshaled_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 :_dump_without_utc_flag, :_dump
-    def _dump(*args)
-      obj = dup
-      obj.instance_variable_set('@marshal_with_utc_coercion', utc?)
-      obj._dump_without_utc_flag(*args)
-    end
-  end
-end
-
 # Ruby 1.9.2 adds utc_offset and zone to Time, but marshaling only
 # preserves utc_offset. Preserve zone also, even though it may not
 # work in some edge cases.
-- 
cgit v1.2.3


From 1e9e88fcd335c7d5a99159d592c3e1b605510a16 Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Sun, 25 Dec 2011 14:34:58 +0300
Subject: remove checks for encodings availability

---
 .../lib/active_support/core_ext/string/access.rb   | 112 +++++----------------
 activesupport/lib/active_support/json/encoding.rb  |   8 +-
 .../lib/active_support/multibyte/chars.rb          |   4 +-
 .../lib/active_support/multibyte/utils.rb          |  55 ++--------
 4 files changed, 39 insertions(+), 140 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/string/access.rb b/activesupport/lib/active_support/core_ext/string/access.rb
index c0d5cdf2d5..9b5266c58c 100644
--- a/activesupport/lib/active_support/core_ext/string/access.rb
+++ b/activesupport/lib/active_support/core_ext/string/access.rb
@@ -1,99 +1,35 @@
 require "active_support/multibyte"
 
 class String
-  unless '1.9'.respond_to?(:force_encoding)
-    # Returns the character at the +position+ treating the string as an array (where 0 is the first character).
-    #
-    # Examples:
-    #   "hello".at(0)  # => "h"
-    #   "hello".at(4)  # => "o"
-    #   "hello".at(10) # => ERROR if < 1.9, nil in 1.9
-    def at(position)
-      mb_chars[position, 1].to_s
-    end
-
-    # Returns the remaining of the string from the +position+ treating the string as an array (where 0 is the first character).
-    #
-    # Examples:
-    #   "hello".from(0)  # => "hello"
-    #   "hello".from(2)  # => "llo"
-    #   "hello".from(10) # => "" if < 1.9, nil in 1.9
-    def from(position)
-      mb_chars[position..-1].to_s
-    end
-
-    # Returns the beginning of the string up to the +position+ treating the string as an array (where 0 is the first character).
-    #
-    # Examples:
-    #   "hello".to(0)  # => "h"
-    #   "hello".to(2)  # => "hel"
-    #   "hello".to(10) # => "hello"
-    def to(position)
-      mb_chars[0..position].to_s
-    end
-
-    # Returns the first character of the string or the first +limit+ characters.
-    #
-    # Examples:
-    #   "hello".first     # => "h"
-    #   "hello".first(2)  # => "he"
-    #   "hello".first(10) # => "hello"
-    def first(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        mb_chars[0...limit].to_s
-      end
-    end
-
-    # Returns the last character of the string or the last +limit+ characters.
-    #
-    # Examples:
-    #   "hello".last     # => "o"
-    #   "hello".last(2)  # => "lo"
-    #   "hello".last(10) # => "hello"
-    def last(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        mb_chars[(-limit)..-1].to_s
-      end
-    end
-  else
-    def at(position)
-      self[position]
-    end
+  def at(position)
+    self[position]
+  end
 
-    def from(position)
-      self[position..-1]
-    end
+  def from(position)
+    self[position..-1]
+  end
 
-    def to(position)
-      self[0..position]
-    end
+  def to(position)
+    self[0..position]
+  end
 
-    def first(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        to(limit - 1)
-      end
+  def first(limit = 1)
+    if limit == 0
+      ''
+    elsif limit >= size
+      self
+    else
+      to(limit - 1)
     end
+  end
 
-    def last(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        from(-limit)
-      end
+  def last(limit = 1)
+    if limit == 0
+      ''
+    elsif limit >= size
+      self
+    else
+      from(-limit)
     end
   end
 end
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index 925fa2a2c7..d7181035d3 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -119,9 +119,7 @@ module ActiveSupport
         end
 
         def escape(string)
-          if string.respond_to?(:force_encoding)
-            string = string.encode(::Encoding::UTF_8, :undef => :replace).force_encoding(::Encoding::BINARY)
-          end
+          string = string.encode(::Encoding::UTF_8, :undef => :replace).force_encoding(::Encoding::BINARY)
           json = string.
             gsub(escape_regex) { |s| ESCAPED_CHARS[s] }.
             gsub(/([\xC0-\xDF][\x80-\xBF]|
@@ -130,7 +128,7 @@ module ActiveSupport
             s.unpack("U*").pack("n*").unpack("H*")[0].gsub(/.{4}/n, '\\\\u\&')
           }
           json = %("#{json}")
-          json.force_encoding(::Encoding::UTF_8) if json.respond_to?(:force_encoding)
+          json.force_encoding(::Encoding::UTF_8)
           json
         end
       end
@@ -281,4 +279,4 @@ class DateTime
       strftime('%Y/%m/%d %H:%M:%S %z')
     end
   end
-end
\ No newline at end of file
+end
diff --git a/activesupport/lib/active_support/multibyte/chars.rb b/activesupport/lib/active_support/multibyte/chars.rb
index ba35b515f2..dcc176e93f 100644
--- a/activesupport/lib/active_support/multibyte/chars.rb
+++ b/activesupport/lib/active_support/multibyte/chars.rb
@@ -282,9 +282,7 @@ module ActiveSupport #:nodoc:
           return nil if byte_offset.nil?
           return 0   if @wrapped_string == ''
 
-          if @wrapped_string.respond_to?(:force_encoding)
-            @wrapped_string = @wrapped_string.dup.force_encoding(Encoding::ASCII_8BIT)
-          end
+          @wrapped_string = @wrapped_string.dup.force_encoding(Encoding::ASCII_8BIT)
 
           begin
             @wrapped_string[0...byte_offset].unpack('U*').length
diff --git a/activesupport/lib/active_support/multibyte/utils.rb b/activesupport/lib/active_support/multibyte/utils.rb
index 94b393cee2..bd6d4bad41 100644
--- a/activesupport/lib/active_support/multibyte/utils.rb
+++ b/activesupport/lib/active_support/multibyte/utils.rb
@@ -2,36 +2,14 @@
 
 module ActiveSupport #:nodoc:
   module Multibyte #: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_external.to_s]
-      end
-    else
-      def self.valid_character
-        case $KCODE
-        when 'UTF8'
-          VALID_CHARACTER['UTF-8']
-        when 'SJIS'
-          VALID_CHARACTER['Shift_JIS']
-        end
-      end
+    # Returns a regular expression that matches valid characters in the current encoding
+    def self.valid_character
+      VALID_CHARACTER[Encoding.default_external.to_s]
     end
 
-    if 'string'.respond_to?(:valid_encoding?)
-      # Verifies the encoding of a string
-      def self.verify(string)
-        string.valid_encoding?
-      end
-    else
-      def self.verify(string)
-        if expression = valid_character
-          # Splits the string on character boundaries, which are determined based on $KCODE.
-          string.split(//).all? { |c| expression =~ c }
-        else
-          true
-        end
-      end
+    # Verifies the encoding of a string
+    def self.verify(string)
+      string.valid_encoding?
     end
 
     # Verifies the encoding of the string and raises an exception when it's not valid
@@ -39,22 +17,11 @@ module ActiveSupport #:nodoc:
       raise EncodingError.new("Found characters with invalid encoding") unless verify(string)
     end
 
-    if 'string'.respond_to?(:force_encoding)
-      # Removes all invalid characters from the string.
-      #
-      # Note: this method is a no-op in Ruby 1.9
-      def self.clean(string)
-        string
-      end
-    else
-      def self.clean(string)
-        if expression = valid_character
-          # Splits the string on character boundaries, which are determined based on $KCODE.
-          string.split(//).grep(expression).join
-        else
-          string
-        end
-      end
+    # Removes all invalid characters from the string.
+    #
+    # Note: this method is a no-op in Ruby 1.9
+    def self.clean(string)
+      string
     end
   end
 end
-- 
cgit v1.2.3


From 66a587cf5590d37483d8aba64da5022df08ecf07 Mon Sep 17 00:00:00 2001
From: Bogdan Gusiev <agresso@gmail.com>
Date: Sun, 25 Dec 2011 16:44:19 +0200
Subject: AS::Callbacks: improve __define_runner perfomance

---
 activesupport/lib/active_support/callbacks.rb | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 11069301f1..ba9fb4ecce 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -378,18 +378,15 @@ module ActiveSupport
     module ClassMethods
       # Generate the internal runner method called by +run_callbacks+.
       def __define_runner(symbol) #:nodoc:
-        body = send("_#{symbol}_callbacks").compile
-        runner_method = "_run_#{symbol}_callbacks" 
+        name = __callback_runner_name(nil, symbol)
+        undef_method(name) if method_defined?(name)
 
         silence_warnings do
+          runner_method = "_run_#{symbol}_callbacks" 
           undef_method runner_method if method_defined?(runner_method)
           class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
             def #{runner_method}(key = nil, &blk)
-              if key
-                self.class.__run_keyed_callback(key, :#{symbol}, self, &blk)
-              else
-                #{body}
-              end
+              self.class.__run_callback(key, :#{symbol}, self, &blk)
             end
             private :#{runner_method}
           RUBY_EVAL
@@ -400,10 +397,10 @@ module ActiveSupport
       # If this called first time it creates a new callback method for the key, 
       # calculating which callbacks can be omitted because of per_key conditions.
       #
-      def __run_keyed_callback(key, kind, object, &blk) #:nodoc:
-        name = "_run__#{self.name.hash.abs}__#{kind}__#{key.hash.abs}__callbacks"
+      def __run_callback(key, kind, object, &blk) #:nodoc:
+        name = __callback_runner_name(key, kind)
         unless object.respond_to?(name)
-          str = send("_#{kind}_callbacks").compile(name, object)
+          str = send("_#{kind}_callbacks").compile(key, object)
           class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
             def #{name}() #{str} end
             protected :#{name}
@@ -412,6 +409,10 @@ module ActiveSupport
         object.send(name, &blk)
       end
 
+      def __callback_runner_name(key, kind)
+        "_run__#{self.name.hash.abs}__#{kind}__#{key.hash.abs}__callbacks"
+      end
+
       # This is used internally to append, prepend and skip callbacks to the
       # CallbackChain.
       #
-- 
cgit v1.2.3


From 434c691df6d101c840f6be3b44388c208c8f69bf Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Sun, 25 Dec 2011 18:22:54 +0300
Subject: remove useless 1.8 ruby code from Range#step, because Range#step
 without block always returns enumerator

---
 .../core_ext/range/blockless_step.rb               | 26 +++++-----------------
 1 file changed, 5 insertions(+), 21 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/range/blockless_step.rb b/activesupport/lib/active_support/core_ext/range/blockless_step.rb
index db42ef5c47..f687287f0d 100644
--- a/activesupport/lib/active_support/core_ext/range/blockless_step.rb
+++ b/activesupport/lib/active_support/core_ext/range/blockless_step.rb
@@ -1,27 +1,11 @@
 require 'active_support/core_ext/module/aliasing'
 
 class Range
-  begin
-    (1..2).step
-  # Range#step doesn't return an Enumerator
-  rescue LocalJumpError
-    # Return an array when step is called without a block.
-    def step_with_blockless(*args, &block)
-      if block_given?
-        step_without_blockless(*args, &block)
-      else
-        array = []
-        step_without_blockless(*args) { |step| array << step }
-        array
-      end
-    end
-  else
-    def step_with_blockless(*args, &block) #:nodoc:
-      if block_given?
-        step_without_blockless(*args, &block)
-      else
-        step_without_blockless(*args).to_a
-      end
+  def step_with_blockless(*args, &block) #:nodoc:
+    if block_given?
+      step_without_blockless(*args, &block)
+    else
+      step_without_blockless(*args).to_a
     end
   end
 
-- 
cgit v1.2.3


From 8f0d7c897319f4faaffba7ffb22d4581d45811a3 Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Sun, 25 Dec 2011 19:03:24 +0300
Subject: remove date methods that are present in 1.9 ruby

---
 .../lib/active_support/core_ext/date/calculations.rb | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index 2212e0b3ca..af78226c21 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -136,26 +136,6 @@ class Date
     advance(:years => years)
   end
 
-  # Shorthand for years_ago(1)
-  def prev_year
-    years_ago(1)
-  end unless method_defined?(:prev_year)
-
-  # Shorthand for years_since(1)
-  def next_year
-    years_since(1)
-  end unless method_defined?(:next_year)
-
-  # Shorthand for months_ago(1)
-  def prev_month
-    months_ago(1)
-  end unless method_defined?(:prev_month)
-
-  # Shorthand for months_since(1)
-  def next_month
-    months_since(1)
-  end unless method_defined?(:next_month)
-
   # Returns number of days to start of this week. Week is assumed to start on
   # +start_day+, default is +:monday+.
   def days_to_week_start(start_day = :monday)
-- 
cgit v1.2.3


From 9e0f5ac7fc9a015bd8bd98ed32fa1e1653762196 Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Sun, 25 Dec 2011 20:36:01 +0300
Subject: Module#name returns nil for anonymous class in ruby 1.9

---
 activesupport/lib/active_support/core_ext/module/anonymous.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/module/anonymous.rb b/activesupport/lib/active_support/core_ext/module/anonymous.rb
index 3982c9c586..0a9e791030 100644
--- a/activesupport/lib/active_support/core_ext/module/anonymous.rb
+++ b/activesupport/lib/active_support/core_ext/module/anonymous.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/object/blank'
-
 class Module
   # A module may or may not have a name.
   #
@@ -7,7 +5,7 @@ class Module
   #   M.name # => "M"
   #
   #   m = Module.new
-  #   m.name # => ""
+  #   m.name # => nil
   #
   # A module gets a name when it is first assigned to a constant. Either
   # via the +module+ or +class+ keyword or by an explicit assignment:
@@ -17,8 +15,6 @@ class Module
   #   m.name         # => "M"
   #
   def anonymous?
-    # Uses blank? because the name of an anonymous class is an empty
-    # string in 1.8, and nil in 1.9.
-    name.blank?
+    name.nil?
   end
 end
-- 
cgit v1.2.3


From 33fb719667d0e2799efc206b8fdb9359896ddb09 Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Sun, 25 Dec 2011 20:52:05 +0300
Subject: ruby 1.9 returns method names as symbols

---
 .../lib/active_support/core_ext/module/method_names.rb  | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/module/method_names.rb b/activesupport/lib/active_support/core_ext/module/method_names.rb
index 2eb40a83ab..72d7091eb1 100644
--- a/activesupport/lib/active_support/core_ext/module/method_names.rb
+++ b/activesupport/lib/active_support/core_ext/module/method_names.rb
@@ -1,14 +1,9 @@
 class Module
-  if instance_methods[0].is_a?(Symbol)
-    def instance_method_names(*args)
-      instance_methods(*args).map(&:to_s)
-    end
+  def instance_method_names(*args)
+    instance_methods(*args).map { |name| name.to_s }
+  end
 
-    def method_names(*args)
-      methods(*args).map(&:to_s)
-    end
-  else
-    alias_method :instance_method_names, :instance_methods
-    alias_method :method_names, :methods
+  def method_names(*args)
+    methods(*args).map { |name| name.to_s }
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From 3f967dc5f910c5ffeae2f397a6b0f499c1eb7540 Mon Sep 17 00:00:00 2001
From: Vishnu Atrai <me@vishnuatrai.com>
Date: Mon, 26 Dec 2011 00:34:48 +0530
Subject: ::BasicObject always defined in ruby 19

---
 activesupport/lib/active_support/basic_object.rb | 25 +++++++++---------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/basic_object.rb b/activesupport/lib/active_support/basic_object.rb
index 3b5277c205..c3c7ab0112 100644
--- a/activesupport/lib/active_support/basic_object.rb
+++ b/activesupport/lib/active_support/basic_object.rb
@@ -1,21 +1,14 @@
 module ActiveSupport
-  if defined? ::BasicObject
-    # A class with no predefined methods that behaves similarly to Builder's
-    # BlankSlate. Used for proxy classes.
-    class BasicObject < ::BasicObject
-      undef_method :==
-      undef_method :equal?
+  # A class with no predefined methods that behaves similarly to Builder's
+  # BlankSlate. Used for proxy classes.
+  class BasicObject < ::BasicObject
+    undef_method :==
+    undef_method :equal?
 
-      # Let ActiveSupport::BasicObject at least raise exceptions.
-      def raise(*args)
-        ::Object.send(:raise, *args)
-      end
-    end
-  else
-    class BasicObject #:nodoc:
-      instance_methods.each do |m|
-        undef_method(m) if m.to_s !~ /(?:^__|^nil\?$|^send$|^object_id$)/
-      end
+    # Let ActiveSupport::BasicObject at least raise exceptions.
+    def raise(*args)
+      ::Object.send(:raise, *args)
     end
   end
+
 end
-- 
cgit v1.2.3


From 40bda760675f7cd05d44c66c6daf1f95161a15de Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 25 Dec 2011 11:02:42 -0800
Subject: removes the compatibility method Module#instance_method_names

---
 activesupport/lib/active_support/core_ext/module/method_names.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/module/method_names.rb b/activesupport/lib/active_support/core_ext/module/method_names.rb
index 72d7091eb1..1de3089ac6 100644
--- a/activesupport/lib/active_support/core_ext/module/method_names.rb
+++ b/activesupport/lib/active_support/core_ext/module/method_names.rb
@@ -1,8 +1,4 @@
 class Module
-  def instance_method_names(*args)
-    instance_methods(*args).map { |name| name.to_s }
-  end
-
   def method_names(*args)
     methods(*args).map { |name| name.to_s }
   end
-- 
cgit v1.2.3


From 748725e9ce081f6517c68d8f74d254e2079d0d79 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 25 Dec 2011 11:11:23 -0800
Subject: removes the compatibility method Module#method_names

---
 activesupport/lib/active_support/core_ext/module.rb              | 1 -
 activesupport/lib/active_support/core_ext/module/method_names.rb | 5 -----
 activesupport/lib/active_support/ruby/shim.rb                    | 1 -
 3 files changed, 7 deletions(-)
 delete mode 100644 activesupport/lib/active_support/core_ext/module/method_names.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/module.rb b/activesupport/lib/active_support/core_ext/module.rb
index e672e9dca0..f2d4887df6 100644
--- a/activesupport/lib/active_support/core_ext/module.rb
+++ b/activesupport/lib/active_support/core_ext/module.rb
@@ -7,5 +7,4 @@ require 'active_support/core_ext/module/attr_internal'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/deprecation'
 require 'active_support/core_ext/module/remove_method'
-require 'active_support/core_ext/module/method_names'
 require 'active_support/core_ext/module/qualified_const'
diff --git a/activesupport/lib/active_support/core_ext/module/method_names.rb b/activesupport/lib/active_support/core_ext/module/method_names.rb
deleted file mode 100644
index 1de3089ac6..0000000000
--- a/activesupport/lib/active_support/core_ext/module/method_names.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class Module
-  def method_names(*args)
-    methods(*args).map { |name| name.to_s }
-  end
-end
diff --git a/activesupport/lib/active_support/ruby/shim.rb b/activesupport/lib/active_support/ruby/shim.rb
index fd59677d83..6e1e375e06 100644
--- a/activesupport/lib/active_support/ruby/shim.rb
+++ b/activesupport/lib/active_support/ruby/shim.rb
@@ -17,4 +17,3 @@ require 'active_support/core_ext/string/encoding'
 require 'active_support/core_ext/rexml'
 require 'active_support/core_ext/time/conversions'
 require 'active_support/core_ext/file/path'
-require 'active_support/core_ext/module/method_names'
-- 
cgit v1.2.3


From a7ba8e1fb325a20dc5115eeef278ce946d0450c7 Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Wed, 21 Dec 2011 22:28:40 +0300
Subject: remove File#to_path alias

---
 activesupport/lib/active_support/core_ext/file.rb      | 1 -
 activesupport/lib/active_support/core_ext/file/path.rb | 5 -----
 activesupport/lib/active_support/ruby/shim.rb          | 1 -
 3 files changed, 7 deletions(-)
 delete mode 100644 activesupport/lib/active_support/core_ext/file/path.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/file.rb b/activesupport/lib/active_support/core_ext/file.rb
index a763447566..dc24afbe7f 100644
--- a/activesupport/lib/active_support/core_ext/file.rb
+++ b/activesupport/lib/active_support/core_ext/file.rb
@@ -1,2 +1 @@
 require 'active_support/core_ext/file/atomic'
-require 'active_support/core_ext/file/path'
diff --git a/activesupport/lib/active_support/core_ext/file/path.rb b/activesupport/lib/active_support/core_ext/file/path.rb
deleted file mode 100644
index b5feab80ae..0000000000
--- a/activesupport/lib/active_support/core_ext/file/path.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class File
-  unless File.allocate.respond_to?(:to_path)
-    alias to_path path
-  end
-end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/ruby/shim.rb b/activesupport/lib/active_support/ruby/shim.rb
index 6e1e375e06..9652eb4028 100644
--- a/activesupport/lib/active_support/ruby/shim.rb
+++ b/activesupport/lib/active_support/ruby/shim.rb
@@ -16,4 +16,3 @@ require 'active_support/core_ext/string/interpolation'
 require 'active_support/core_ext/string/encoding'
 require 'active_support/core_ext/rexml'
 require 'active_support/core_ext/time/conversions'
-require 'active_support/core_ext/file/path'
-- 
cgit v1.2.3


From 7e75dc5d8645b3a63dc4b3df2e624686145500b6 Mon Sep 17 00:00:00 2001
From: Bogdan Gusiev <agresso@gmail.com>
Date: Sun, 25 Dec 2011 22:23:16 +0200
Subject: AS::Callbacks: improved __define_runner performance

---
 activesupport/lib/active_support/callbacks.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index ba9fb4ecce..2ebafa28dd 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -381,9 +381,8 @@ module ActiveSupport
         name = __callback_runner_name(nil, symbol)
         undef_method(name) if method_defined?(name)
 
-        silence_warnings do
-          runner_method = "_run_#{symbol}_callbacks" 
-          undef_method runner_method if method_defined?(runner_method)
+        runner_method = "_run_#{symbol}_callbacks" 
+        unless private_method_defined?(runner_method)
           class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
             def #{runner_method}(key = nil, &blk)
               self.class.__run_callback(key, :#{symbol}, self, &blk)
-- 
cgit v1.2.3


From 2ba1f460008536c4d7a9fa1fba623a53e1b8aed1 Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Mon, 26 Dec 2011 19:26:37 +0300
Subject: remove rexml security fix for rubies 1.8

---
 activesupport/lib/active_support/core_ext/rexml.rb | 46 ----------------------
 activesupport/lib/active_support/ruby/shim.rb      |  2 -
 2 files changed, 48 deletions(-)
 delete mode 100644 activesupport/lib/active_support/core_ext/rexml.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/rexml.rb b/activesupport/lib/active_support/core_ext/rexml.rb
deleted file mode 100644
index 0419ebc84b..0000000000
--- a/activesupport/lib/active_support/core_ext/rexml.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require 'active_support/core_ext/kernel/reporting'
-
-# Fixes the rexml vulnerability disclosed at:
-# http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
-# This fix is identical to rexml-expansion-fix version 1.0.1.
-#
-# We still need to distribute this fix because albeit the REXML
-# in recent 1.8.7s is patched, it wasn't in early patchlevels.
-require 'rexml/rexml'
-
-# Earlier versions of rexml defined REXML::Version, newer ones REXML::VERSION
-unless (defined?(REXML::VERSION) ? REXML::VERSION : REXML::Version) > "3.1.7.2"
-  silence_warnings { require 'rexml/document' }
-
-  # REXML in 1.8.7 has the patch but early patchlevels didn't update Version from 3.1.7.2.
-  unless REXML::Document.respond_to?(:entity_expansion_limit=)
-    silence_warnings { require 'rexml/entity' }
-
-    module REXML #:nodoc:
-      class Entity < Child #:nodoc:
-        undef_method :unnormalized
-        def unnormalized
-          document.record_entity_expansion! if document
-          v = value()
-          return nil if v.nil?
-          @unnormalized = Text::unnormalize(v, parent)
-          @unnormalized
-        end
-      end
-      class Document < Element #:nodoc:
-        @@entity_expansion_limit = 10_000
-        def self.entity_expansion_limit= val
-          @@entity_expansion_limit = val
-        end
-
-        def record_entity_expansion!
-          @number_of_expansions ||= 0
-          @number_of_expansions += 1
-          if @number_of_expansions > @@entity_expansion_limit
-            raise "Number of entity expansions exceeded, processing aborted."
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/ruby/shim.rb b/activesupport/lib/active_support/ruby/shim.rb
index 9652eb4028..41fd866481 100644
--- a/activesupport/lib/active_support/ruby/shim.rb
+++ b/activesupport/lib/active_support/ruby/shim.rb
@@ -4,7 +4,6 @@
 # Date        next_year, next_month
 # DateTime    to_date, to_datetime, xmlschema
 # Enumerable  group_by, none?
-# REXML       security fix
 # String      ord
 # Time        to_date, to_time, to_datetime
 require 'active_support'
@@ -14,5 +13,4 @@ require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/string/conversions'
 require 'active_support/core_ext/string/interpolation'
 require 'active_support/core_ext/string/encoding'
-require 'active_support/core_ext/rexml'
 require 'active_support/core_ext/time/conversions'
-- 
cgit v1.2.3


From 306c44d28477db31739bf512b75078d620507428 Mon Sep 17 00:00:00 2001
From: Vishnu Atrai <me@vishnuatrai.com>
Date: Mon, 26 Dec 2011 23:32:56 +0530
Subject: remove ForClassicTestUnit support for ruby 1.8

---
 .../lib/active_support/testing/performance.rb      | 49 +---------------
 .../active_support/testing/setup_and_teardown.rb   | 65 +---------------------
 2 files changed, 2 insertions(+), 112 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index dd23f8d82d..6236908711 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -13,12 +13,7 @@ module ActiveSupport
       included do
         superclass_delegating_accessor :profile_options
         self.profile_options = {}
-
-        if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
-          include ForMiniTest
-        else
-          include ForClassicTestUnit
-        end
+        include ForMiniTest
       end
 
       # each implementation should define metrics and freeze the defaults
@@ -77,48 +72,6 @@ module ActiveSupport
         end
       end
 
-      module ForClassicTestUnit
-        def run(result)
-          return if method_name =~ /^default_test$/
-
-          yield(self.class::STARTED, name)
-          @_result = result
-
-          run_warmup
-          if full_profile_options && metrics = full_profile_options[:metrics]
-            metrics.each do |metric_name|
-              if klass = Metrics[metric_name.to_sym]
-                run_profile(klass.new)
-                result.add_run
-              else
-                puts '%20s: unsupported' % metric_name
-              end
-            end
-          end
-
-          yield(self.class::FINISHED, name)
-        end
-
-        def run_test(metric, mode)
-          run_callbacks :setup
-          setup
-          metric.send(mode) { __send__ @method_name }
-        rescue ::Test::Unit::AssertionFailedError => e
-        add_failure(e.message, e.backtrace)
-        rescue StandardError, ScriptError => e
-          add_error(e)
-        ensure
-          begin
-            teardown
-            run_callbacks :teardown, :enumerator => :reverse_each
-          rescue ::Test::Unit::AssertionFailedError => e
-            add_failure(e.message, e.backtrace)
-          rescue StandardError, ScriptError => e
-            add_error(e)
-          end
-        end
-      end
-
       protected
         # overridden by each implementation
         def run_gc; end
diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb
index 22e41fa905..40b781485e 100644
--- a/activesupport/lib/active_support/testing/setup_and_teardown.rb
+++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -10,11 +10,7 @@ module ActiveSupport
         include ActiveSupport::Callbacks
         define_callbacks :setup, :teardown
 
-        if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
-          include ForMiniTest
-        else
-          include ForClassicTestUnit
-        end
+        include ForMiniTest
       end
 
       module ClassMethods
@@ -47,65 +43,6 @@ module ActiveSupport
         end
       end
 
-      module ForClassicTestUnit
-        # For compatibility with Ruby < 1.8.6
-        PASSTHROUGH_EXCEPTIONS = Test::Unit::TestCase::PASSTHROUGH_EXCEPTIONS rescue [NoMemoryError, SignalException, Interrupt, SystemExit]
-
-        # This redefinition is unfortunate but test/unit shows us no alternative.
-        # Doubly unfortunate: hax to support Mocha's hax.
-        def run(result)
-          return if @method_name.to_s == "default_test"
-
-          mocha_counter = retrieve_mocha_counter(result)
-          yield(Test::Unit::TestCase::STARTED, name)
-          @_result = result
-
-          begin
-            begin
-              run_callbacks :setup do
-                setup
-                __send__(@method_name)
-                mocha_verify(mocha_counter) if mocha_counter
-              end
-            rescue Mocha::ExpectationError => e
-              add_failure(e.message, e.backtrace)
-            rescue Test::Unit::AssertionFailedError => e
-              add_failure(e.message, e.backtrace)
-            rescue Exception => e
-              raise if PASSTHROUGH_EXCEPTIONS.include?(e.class)
-              add_error(e)
-            ensure
-              begin
-                teardown
-                run_callbacks :teardown
-              rescue Test::Unit::AssertionFailedError => e
-                add_failure(e.message, e.backtrace)
-              rescue Exception => e
-                raise if PASSTHROUGH_EXCEPTIONS.include?(e.class)
-                add_error(e)
-              end
-            end
-          ensure
-            mocha_teardown if mocha_counter
-          end
-
-          result.add_run
-          yield(Test::Unit::TestCase::FINISHED, name)
-        end
-
-        protected
-
-        def retrieve_mocha_counter(result) #:nodoc:
-          if respond_to?(:mocha_verify) # using mocha
-            if defined?(Mocha::TestCaseAdapter::AssertionCounter)
-              Mocha::TestCaseAdapter::AssertionCounter.new(result)
-            else
-              Mocha::Integration::TestUnit::AssertionCounter.new(result)
-            end
-          end
-        end
-      end
-
     end
   end
 end
-- 
cgit v1.2.3


From 2443b651011efc4c2597cf6e1d0e5aad50809b40 Mon Sep 17 00:00:00 2001
From: Vishnu Atrai <me@vishnuatrai.com>
Date: Tue, 27 Dec 2011 00:00:22 +0530
Subject: GC::Profiler available in ruby19

---
 .../lib/active_support/testing/performance/ruby/yarv.rb   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/testing/performance/ruby/yarv.rb b/activesupport/lib/active_support/testing/performance/ruby/yarv.rb
index 7873262331..a86b15781a 100644
--- a/activesupport/lib/active_support/testing/performance/ruby/yarv.rb
+++ b/activesupport/lib/active_support/testing/performance/ruby/yarv.rb
@@ -4,15 +4,12 @@ module ActiveSupport
       module Metrics
         class Base
           protected
-            # Ruby 1.9 with GC::Profiler
-            if defined?(GC::Profiler)
-              def with_gc_stats
-                GC::Profiler.enable
-                GC.start
-                yield
-              ensure
-                GC::Profiler.disable
-              end
+            def with_gc_stats
+              GC::Profiler.enable
+              GC.start
+              yield
+            ensure
+              GC::Profiler.disable
             end
         end
 
-- 
cgit v1.2.3


From 3f642c9d1834a4ef586461648acc7c849bebad70 Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Mon, 26 Dec 2011 23:07:27 +0300
Subject: refactor Range#include? for range value

---
 activesupport/lib/active_support/core_ext/range/include_range.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/range/include_range.rb b/activesupport/lib/active_support/core_ext/range/include_range.rb
index 0246627467..c9986d4724 100644
--- a/activesupport/lib/active_support/core_ext/range/include_range.rb
+++ b/activesupport/lib/active_support/core_ext/range/include_range.rb
@@ -9,9 +9,7 @@ class Range
   #  (5..9).include?(11) # => false
   def include_with_range?(value)
     if value.is_a?(::Range)
-      operator = exclude_end? ? :< : :<=
-      end_value = value.exclude_end? ? last.succ : last
-      include_without_range?(value.first) && (value.last <=> end_value).send(operator, 0)
+      min <= value.min && max >= value.max
     else
       include_without_range?(value)
     end
-- 
cgit v1.2.3


From af404acf9fbcfb4ec4e6c49b0bfdd59561eb6ce6 Mon Sep 17 00:00:00 2001
From: Vishnu Atrai <me@vishnuatrai.com>
Date: Tue, 27 Dec 2011 00:07:30 +0530
Subject: remove conditions for GC::Profiler in ruby19

---
 .../lib/active_support/testing/performance/ruby/yarv.rb    | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/testing/performance/ruby/yarv.rb b/activesupport/lib/active_support/testing/performance/ruby/yarv.rb
index a86b15781a..c34d31bf10 100644
--- a/activesupport/lib/active_support/testing/performance/ruby/yarv.rb
+++ b/activesupport/lib/active_support/testing/performance/ruby/yarv.rb
@@ -32,20 +32,14 @@ module ActiveSupport
         end
 
         class GcRuns < Amount
-          # Ruby 1.9
-          if GC.respond_to?(:count)
-            def measure
-              GC.count
-            end
+          def measure
+            GC.count
           end
         end
 
         class GcTime < Time
-          # Ruby 1.9 with GC::Profiler
-          if defined?(GC::Profiler) && GC::Profiler.respond_to?(:total_time)
-            def measure
-              GC::Profiler.total_time
-            end
+          def measure
+            GC::Profiler.total_time
           end
         end
       end
-- 
cgit v1.2.3


From 971d257cddd271e1faec8ae1762915c4c27b2908 Mon Sep 17 00:00:00 2001
From: Miguel Camba <miguel.camba@gmail.com>
Date: Tue, 27 Dec 2011 07:52:41 +0100
Subject: Removed RUBY_ENGINE checks for ruby18

---
 activesupport/lib/active_support/testing/performance.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index 6236908711..209bfac19f 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -161,8 +161,7 @@ module ActiveSupport
               end
             end
 
-            ruby = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
-            ruby += "-#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"
+            ruby = "#{RUBY_ENGINE}-#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"
 
             @env = [app, rails, ruby, RUBY_PLATFORM] * ','
           end
@@ -259,7 +258,6 @@ module ActiveSupport
   end
 end
 
-RUBY_ENGINE = 'ruby' unless defined?(RUBY_ENGINE) # mri 1.8
 case RUBY_ENGINE
   when 'ruby'   then require 'active_support/testing/performance/ruby'
   when 'rbx'    then require 'active_support/testing/performance/rubinius'
-- 
cgit v1.2.3


From a19d0f5a66f17c356c5255c5d5930a73a25f627a Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Tue, 27 Dec 2011 22:46:44 +0300
Subject: deprecate Base64.encode64s from AS. Use Base64.strict_encode64
 instead

---
 activesupport/lib/active_support/base64.rb            | 6 +++++-
 activesupport/lib/active_support/message_encryptor.rb | 2 +-
 activesupport/lib/active_support/message_verifier.rb  | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/base64.rb b/activesupport/lib/active_support/base64.rb
index b43d2ce9a3..41a1a3469d 100644
--- a/activesupport/lib/active_support/base64.rb
+++ b/activesupport/lib/active_support/base64.rb
@@ -3,12 +3,16 @@ require 'base64'
 module ActiveSupport
   Base64 = ::Base64
 
+  # *DEPRECATED*: Use +Base64.strict_encode64+ instead.
+  #
   # Encodes the value as base64 without the newline breaks. This makes the base64 encoding readily usable as URL parameters
   # or memcache keys without further processing.
   #
   #  ActiveSupport::Base64.encode64s("Original unencoded string")
   #  # => "T3JpZ2luYWwgdW5lbmNvZGVkIHN0cmluZw=="
   def Base64.encode64s(value)
-    encode64(value).gsub(/\n/, '')
+    ActiveSupport::Deprecation.warn "encode64s " \
+      "is deprecated. Use Base64.strict_encode64 instead", caller
+    strict_encode64(value)
   end
 end
diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb
index 7d8a7fb687..476ba0b3d1 100644
--- a/activesupport/lib/active_support/message_encryptor.rb
+++ b/activesupport/lib/active_support/message_encryptor.rb
@@ -56,7 +56,7 @@ module ActiveSupport
       encrypted_data = cipher.update(@serializer.dump(value))
       encrypted_data << cipher.final
 
-      [encrypted_data, iv].map {|v| ActiveSupport::Base64.encode64s(v)}.join("--")
+      [encrypted_data, iv].map {|v| ActiveSupport::Base64.strict_encode64(v)}.join("--")
     end
 
     def _decrypt(encrypted_message)
diff --git a/activesupport/lib/active_support/message_verifier.rb b/activesupport/lib/active_support/message_verifier.rb
index 30ac44f6fa..7cb5b1e82d 100644
--- a/activesupport/lib/active_support/message_verifier.rb
+++ b/activesupport/lib/active_support/message_verifier.rb
@@ -18,7 +18,7 @@ module ActiveSupport
   #     self.current_user = User.find(id)
   #   end
   #
-  # By default it uses Marshal to serialize the message. If you want to use another 
+  # By default it uses Marshal to serialize the message. If you want to use another
   # serialization method, you can set the serializer attribute to something that responds
   # to dump and load, e.g.:
   #
@@ -44,7 +44,7 @@ module ActiveSupport
     end
 
     def generate(value)
-      data = ActiveSupport::Base64.encode64s(@serializer.dump(value))
+      data = ActiveSupport::Base64.strict_encode64(@serializer.dump(value))
       "#{data}--#{generate_digest(data)}"
     end
 
-- 
cgit v1.2.3


From 99433e4ce57afbbeebe706ee2cec1a0362e03b0f Mon Sep 17 00:00:00 2001
From: Bogdan Gusiev <agresso@gmail.com>
Date: Wed, 28 Dec 2011 18:03:18 +0200
Subject: Refactor AS::Callbacks

Extracted `__reset_runner` from `__define_runner`
And call it in proper places
---
 activesupport/lib/active_support/callbacks.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 2ebafa28dd..0495741c15 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -378,9 +378,6 @@ module ActiveSupport
     module ClassMethods
       # Generate the internal runner method called by +run_callbacks+.
       def __define_runner(symbol) #:nodoc:
-        name = __callback_runner_name(nil, symbol)
-        undef_method(name) if method_defined?(name)
-
         runner_method = "_run_#{symbol}_callbacks" 
         unless private_method_defined?(runner_method)
           class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
@@ -408,6 +405,11 @@ module ActiveSupport
         object.send(name, &blk)
       end
 
+      def __reset_runner(symbol)
+        name = __callback_runner_name(nil, symbol)
+        undef_method(name) if method_defined?(name)
+      end
+
       def __callback_runner_name(key, kind)
         "_run__#{self.name.hash.abs}__#{kind}__#{key.hash.abs}__callbacks"
       end
@@ -423,7 +425,7 @@ module ActiveSupport
         ([self] + ActiveSupport::DescendantsTracker.descendants(self)).reverse.each do |target|
           chain = target.send("_#{name}_callbacks")
           yield target, chain.dup, type, filters, options
-          target.__define_runner(name)
+          target.__reset_runner(name)
         end
       end
 
@@ -537,12 +539,12 @@ module ActiveSupport
           chain = target.send("_#{symbol}_callbacks").dup
           callbacks.each { |c| chain.delete(c) }
           target.send("_#{symbol}_callbacks=", chain)
-          target.__define_runner(symbol)
+          target.__reset_runner(symbol)
         end
 
         self.send("_#{symbol}_callbacks=", callbacks.dup.clear)
 
-        __define_runner(symbol)
+        __reset_runner(symbol)
       end
 
       # Define sets of events in the object lifecycle that support callbacks.
-- 
cgit v1.2.3


From cdf7a6013dcea316d8a4c3336afe7037cc1a813e Mon Sep 17 00:00:00 2001
From: James Miller <bensie@gmail.com>
Date: Wed, 28 Dec 2011 09:19:46 -0800
Subject: Further simplify singleton_class checking in class_attribute

---
 .../lib/active_support/core_ext/class/attribute.rb        | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/class/attribute.rb b/activesupport/lib/active_support/core_ext/class/attribute.rb
index 45bec264ff..a04445d34d 100644
--- a/activesupport/lib/active_support/core_ext/class/attribute.rb
+++ b/activesupport/lib/active_support/core_ext/class/attribute.rb
@@ -81,21 +81,13 @@ class Class
             define_method(:#{name}) { val }
           end
 
-          if singleton_class?
-            class_eval do
-              remove_possible_method(:#{name})
-              def #{name}
-                defined?(@#{name}) ? @#{name} : singleton_class.#{name}
-              end
-            end
-          end
           val
         end
 
         if instance_reader
           remove_possible_method :#{name}
           def #{name}
-            defined?(@#{name}) ? @#{name} : self.class.#{name}
+            defined?(@#{name}) ? @#{name} : singleton_class.#{name}
           end
 
           def #{name}?
@@ -107,9 +99,4 @@ class Class
       attr_writer name if instance_writer
     end
   end
-
-  private
-  def singleton_class?
-    !name || '' == name
-  end
 end
-- 
cgit v1.2.3


From 9bae926ff254ae202308af949109e110aec7c3b9 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Wed, 28 Dec 2011 18:27:25 +0000
Subject: Revert "Merge pull request #4220 from bensie/singleton-class-master"

This reverts commit 90df0d4f687596943bda108ab0b98dd99cacd46b, reversing
changes made to 5e6fc81d63837559a393c173eade281ddeb687dd.

Reason: build breakage
---
 .../lib/active_support/core_ext/class/attribute.rb        | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/class/attribute.rb b/activesupport/lib/active_support/core_ext/class/attribute.rb
index a04445d34d..45bec264ff 100644
--- a/activesupport/lib/active_support/core_ext/class/attribute.rb
+++ b/activesupport/lib/active_support/core_ext/class/attribute.rb
@@ -81,13 +81,21 @@ class Class
             define_method(:#{name}) { val }
           end
 
+          if singleton_class?
+            class_eval do
+              remove_possible_method(:#{name})
+              def #{name}
+                defined?(@#{name}) ? @#{name} : singleton_class.#{name}
+              end
+            end
+          end
           val
         end
 
         if instance_reader
           remove_possible_method :#{name}
           def #{name}
-            defined?(@#{name}) ? @#{name} : singleton_class.#{name}
+            defined?(@#{name}) ? @#{name} : self.class.#{name}
           end
 
           def #{name}?
@@ -99,4 +107,9 @@ class Class
       attr_writer name if instance_writer
     end
   end
+
+  private
+  def singleton_class?
+    !name || '' == name
+  end
 end
-- 
cgit v1.2.3


From 952e9d9005b775827b17227e040499d0324bb928 Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Thu, 29 Dec 2011 10:50:15 +0300
Subject: refactor Range#include? to handle ranges with floats

---
 activesupport/lib/active_support/core_ext/range/include_range.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/range/include_range.rb b/activesupport/lib/active_support/core_ext/range/include_range.rb
index c9986d4724..38a90490e6 100644
--- a/activesupport/lib/active_support/core_ext/range/include_range.rb
+++ b/activesupport/lib/active_support/core_ext/range/include_range.rb
@@ -9,7 +9,8 @@ class Range
   #  (5..9).include?(11) # => false
   def include_with_range?(value)
     if value.is_a?(::Range)
-      min <= value.min && max >= value.max
+      operator = exclude_end? && !value.exclude_end? ? :< : :<=
+      include_without_range?(value.first) && value.last.send(operator, last)
     else
       include_without_range?(value)
     end
-- 
cgit v1.2.3


From 6e5ab54b608d3c681263c5574ed4b0167a26b641 Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Thu, 29 Dec 2011 16:01:10 +0300
Subject: remove ruby 1.8 checking in constantize method

---
 .../lib/active_support/inflector/methods.rb        | 63 +++++++++-------------
 1 file changed, 24 insertions(+), 39 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index 144cdd3c8f..7f325aee94 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -186,47 +186,32 @@ module ActiveSupport
       underscore(demodulize(class_name)) + (separate_class_name_and_id_with_underscore ? "_id" : "id")
     end
 
-    # Ruby 1.9 introduces an inherit argument for Module#const_get and
-    # #const_defined? and changes their default behavior.
-    if Module.method(:const_get).arity == 1
-      # Tries to find a constant with the name specified in the argument string:
-      #
-      #   "Module".constantize     # => Module
-      #   "Test::Unit".constantize # => Test::Unit
-      #
-      # The name is assumed to be the one of a top-level constant, no matter whether
-      # it starts with "::" or not. No lexical context is taken into account:
-      #
-      #   C = 'outside'
-      #   module M
-      #     C = 'inside'
-      #     C               # => 'inside'
-      #     "C".constantize # => 'outside', same as ::C
-      #   end
-      #
-      # NameError is raised when the name is not in CamelCase or the constant is
-      # unknown.
-      def constantize(camel_cased_word)
-        names = camel_cased_word.split('::')
-        names.shift if names.empty? || names.first.empty?
-
-        constant = Object
-        names.each do |name|
-          constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
-        end
-        constant
-      end
-    else
-      def constantize(camel_cased_word) #:nodoc:
-        names = camel_cased_word.split('::')
-        names.shift if names.empty? || names.first.empty?
+    # Tries to find a constant with the name specified in the argument string:
+    #
+    #   "Module".constantize     # => Module
+    #   "Test::Unit".constantize # => Test::Unit
+    #
+    # The name is assumed to be the one of a top-level constant, no matter whether
+    # it starts with "::" or not. No lexical context is taken into account:
+    #
+    #   C = 'outside'
+    #   module M
+    #     C = 'inside'
+    #     C               # => 'inside'
+    #     "C".constantize # => 'outside', same as ::C
+    #   end
+    #
+    # NameError is raised when the name is not in CamelCase or the constant is
+    # unknown.
+    def constantize(camel_cased_word) #:nodoc:
+      names = camel_cased_word.split('::')
+      names.shift if names.empty? || names.first.empty?
 
-        constant = Object
-        names.each do |name|
-          constant = constant.const_defined?(name, false) ? constant.const_get(name) : constant.const_missing(name)
-        end
-        constant
+      constant = Object
+      names.each do |name|
+        constant = constant.const_defined?(name, false) ? constant.const_get(name) : constant.const_missing(name)
       end
+      constant
     end
 
     # Tries to find a constant with the name specified in the argument string:
-- 
cgit v1.2.3


From 2a78886a1d4c57cd4a07a380cf3ccc213ea97116 Mon Sep 17 00:00:00 2001
From: Bogdan Gusiev <agresso@gmail.com>
Date: Fri, 30 Dec 2011 10:53:46 +0200
Subject: AS::Callbacks: remove __define_runner

---
 activesupport/lib/active_support/callbacks.rb | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 0495741c15..df3aeb6b8a 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -77,8 +77,8 @@ module ActiveSupport
     #     save
     #   end
     #
-    def run_callbacks(kind, *args, &block)
-      send("_run_#{kind}_callbacks", *args, &block)
+    def run_callbacks(kind, key = nil, &block)
+      self.class.__run_callbacks(key, kind, self, &block)
     end
 
     private
@@ -376,24 +376,12 @@ module ActiveSupport
     end
 
     module ClassMethods
-      # Generate the internal runner method called by +run_callbacks+.
-      def __define_runner(symbol) #:nodoc:
-        runner_method = "_run_#{symbol}_callbacks" 
-        unless private_method_defined?(runner_method)
-          class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            def #{runner_method}(key = nil, &blk)
-              self.class.__run_callback(key, :#{symbol}, self, &blk)
-            end
-            private :#{runner_method}
-          RUBY_EVAL
-        end
-      end
 
       # This method calls the callback method for the given key.
       # If this called first time it creates a new callback method for the key, 
       # calculating which callbacks can be omitted because of per_key conditions.
       #
-      def __run_callback(key, kind, object, &blk) #:nodoc:
+      def __run_callbacks(key, kind, object, &blk) #:nodoc:
         name = __callback_runner_name(key, kind)
         unless object.respond_to?(name)
           str = send("_#{kind}_callbacks").compile(key, object)
@@ -618,7 +606,6 @@ module ActiveSupport
         callbacks.each do |callback|
           class_attribute "_#{callback}_callbacks"
           send("_#{callback}_callbacks=", CallbackChain.new(callback, config))
-          __define_runner(callback)
         end
       end
     end
-- 
cgit v1.2.3


From 9fa59ca2083c6a8d06af1fbca6059821516102fd Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 30 Dec 2011 02:18:07 -0800
Subject: adds a comments that clarifies why Range#include? chooses the
 comparison operator

---
 activesupport/lib/active_support/core_ext/range/include_range.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/range/include_range.rb b/activesupport/lib/active_support/core_ext/range/include_range.rb
index 38a90490e6..684b7cbc4a 100644
--- a/activesupport/lib/active_support/core_ext/range/include_range.rb
+++ b/activesupport/lib/active_support/core_ext/range/include_range.rb
@@ -9,6 +9,7 @@ class Range
   #  (5..9).include?(11) # => false
   def include_with_range?(value)
     if value.is_a?(::Range)
+      # 1...10 includes 1..9 but it does not include 1..10.
       operator = exclude_end? && !value.exclude_end? ? :< : :<=
       include_without_range?(value.first) && value.last.send(operator, last)
     else
-- 
cgit v1.2.3


From e734f001d33d0db5fb21ede1824314be17858cd2 Mon Sep 17 00:00:00 2001
From: Vishnu Atrai <me@vishnuatrai.com>
Date: Fri, 30 Dec 2011 23:45:57 +0530
Subject: ruby 1.8 ActiveSupport BasicObject no longer available

---
 activesupport/lib/active_support/duration.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/duration.rb b/activesupport/lib/active_support/duration.rb
index 89b0923882..00c67a470d 100644
--- a/activesupport/lib/active_support/duration.rb
+++ b/activesupport/lib/active_support/duration.rb
@@ -10,7 +10,6 @@ module ActiveSupport
   #   1.month.ago       # equivalent to Time.now.advance(:months => -1)
   class Duration < BasicObject
     attr_accessor :value, :parts
-    delegate :duplicable?, :to => :value # required when using ActiveSupport's BasicObject on 1.8
 
     def initialize(value, parts) #:nodoc:
       @value, @parts = value, parts
-- 
cgit v1.2.3


From 7249f94e6c432dae011efa6fd0f11a0fcf377a52 Mon Sep 17 00:00:00 2001
From: Vishnu Atrai <me@vishnuatrai.com>
Date: Sat, 31 Dec 2011 00:15:21 +0530
Subject: remove condition since to_time always available in ruby19 DateTime

---
 activesupport/lib/active_support/core_ext/date_time/conversions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
index 851012e3bf..d7b3ad7d8d 100644
--- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -6,7 +6,7 @@ require 'active_support/values/time_zone'
 class DateTime
   # Ruby 1.9 has DateTime#to_time which internally relies on Time. We define our own #to_time which allows
   # DateTimes outside the range of what can be created with Time.
-  remove_method :to_time if instance_methods.include?(:to_time)
+  remove_method :to_time
 
   # Convert to a formatted string. See Time::DATE_FORMATS for predefined formats.
   #
-- 
cgit v1.2.3