From 4403dfac6ce876c7ffb7a450b2249864c7a17cb7 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 14 Nov 2009 02:00:04 -0800
Subject: Check whether another lib has implemented ruby 1.9 string interp
 syntax

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/string/interpolation.rb b/activesupport/lib/active_support/core_ext/string/interpolation.rb
index 41a061c1a4..2048d35091 100644
--- a/activesupport/lib/active_support/core_ext/string/interpolation.rb
+++ b/activesupport/lib/active_support/core_ext/string/interpolation.rb
@@ -5,7 +5,7 @@
   You may redistribute it and/or modify it under the same license terms as Ruby.
 =end
 
-if RUBY_VERSION < '1.9'
+if RUBY_VERSION < '1.9' && !"".respond_to?(:interpolate_without_ruby_19_syntax)
 
   # KeyError is raised by String#% when the string contains a named placeholder
   # that is not contained in the given arguments hash. Ruby 1.9 includes and
-- 
cgit v1.2.3


From 6d91e7dca163ef55dde319452b21b767e8a0df33 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 21 Nov 2009 19:11:50 -0800
Subject: macruby: no format_datetime or msg2str

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/logger.rb b/activesupport/lib/active_support/core_ext/logger.rb
index 22749229a3..e4df8fe338 100644
--- a/activesupport/lib/active_support/core_ext/logger.rb
+++ b/activesupport/lib/active_support/core_ext/logger.rb
@@ -137,10 +137,10 @@ class Logger
       attr_writer :formatter
       public :formatter=
 
-      alias old_format_datetime format_datetime
+      alias old_format_datetime format_datetime if method_defined?(:format_datetime)
       def format_datetime(datetime) datetime end
 
-      alias old_msg2str msg2str
+      alias old_msg2str msg2str if method_defined?(:msg2str)
       def msg2str(msg) msg end
     end
 end
-- 
cgit v1.2.3


From 8104f65c3225453d13307c3c2733c2a8f99e491a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 19 Nov 2009 14:50:27 -0200
Subject: Create SyncListener. Since they do not rely on Thread, they can be
 used on Google App Engine.

Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
---
 activesupport/lib/active_support/notifications.rb | 92 ++++++++++++++---------
 1 file changed, 58 insertions(+), 34 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index 7a9f76b26a..e2540cd598 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -41,7 +41,7 @@ module ActiveSupport
   # to subscribers in a thread. You can use any queue implementation you want.
   #
   module Notifications
-    mattr_accessor :queue
+    mattr_accessor :queue, :listener
 
     class << self
       delegate :instrument, :transaction_id, :transaction, :to => :instrumenter
@@ -54,8 +54,13 @@ module ActiveSupport
         @publisher ||= Publisher.new(queue)
       end
 
-      def subscribe(pattern=nil, &block)
-        Subscriber.new(queue).bind(pattern).subscribe(&block)
+      def subscriber
+        @subscriber ||= Subscriber.new(queue)
+      end
+
+      def subscribe(pattern=nil, options={}, &block)
+        with = options[:with] || listener
+        subscriber.bind(with, pattern).subscribe(&block)
       end
     end
 
@@ -104,13 +109,14 @@ module ActiveSupport
         @queue = queue
       end
 
-      def bind(pattern)
-        @pattern = pattern
+      def bind(listener, pattern)
+        @listener = listener
+        @pattern  = pattern
         self
       end
 
       def subscribe
-        @queue.subscribe(@pattern) do |*args|
+        @queue.subscribe(@listener, @pattern) do |*args|
           yield(*args)
         end
       end
@@ -138,6 +144,48 @@ module ActiveSupport
       end
     end
 
+    class AsyncListener
+      def initialize(pattern, &block)
+        @pattern = pattern
+        @subscriber = block
+        @queue = Queue.new
+        Thread.new { consume }
+      end
+
+      def publish(name, *args)
+        if !@pattern || @pattern === name.to_s
+          @queue << args.unshift(name)
+        end
+      end
+
+      def consume
+        while args = @queue.shift
+          @subscriber.call(*args)
+        end
+      end
+
+      def drained?
+        @queue.size.zero?
+      end
+    end
+
+    class SyncListener
+      def initialize(pattern, &block)
+        @pattern = pattern
+        @subscriber = block
+      end
+
+      def publish(name, *args)
+        if !@pattern || @pattern === name.to_s
+          @subscriber.call(*args.unshift(name))
+        end
+      end
+
+      def drained?
+        true
+      end
+    end
+
     # This is a default queue implementation that ships with Notifications. It
     # consumes events in a thread and publish them to all registered subscribers.
     #
@@ -150,40 +198,16 @@ module ActiveSupport
         @listeners.each { |l| l.publish(*args) }
       end
 
-      def subscribe(pattern=nil, &block)
-        @listeners << Listener.new(pattern, &block)
+      def subscribe(listener, pattern=nil, &block)
+        @listeners << listener.new(pattern, &block)
       end
 
       def drained?
         @listeners.all? &:drained?
       end
-
-      class Listener
-        def initialize(pattern, &block)
-          @pattern = pattern
-          @subscriber = block
-          @queue = Queue.new
-          Thread.new { consume }
-        end
-
-        def publish(name, *args)
-          if !@pattern || @pattern === name.to_s
-            @queue << args.unshift(name)
-          end
-        end
-
-        def consume
-          while args = @queue.shift
-            @subscriber.call(*args)
-          end
-        end
-
-        def drained?
-          @queue.size.zero?
-        end
-      end
     end
   end
 
-  Notifications.queue = Notifications::LittleFanout.new
+  Notifications.queue    = Notifications::LittleFanout.new
+  Notifications.listener = Notifications::AsyncListener
 end
-- 
cgit v1.2.3


From 934bb012ba3f1da5cd181ae5c2d84f697a3c58a1 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@Yehuda-Katz.local>
Date: Mon, 23 Nov 2009 15:42:25 -0800
Subject: Fixes remote errors in isolation tests

---
 activesupport/lib/active_support/testing/isolation.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index c75b59c284..81f7e3c9df 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -1,10 +1,25 @@
 module ActiveSupport
   module Testing
+    class RemoteError < StandardError
+
+      attr_reader :message, :backtrace
+
+      def initialize(exception)
+        @message = "caught #{exception.class.name}: #{exception.message}"
+        @backtrace = exception.backtrace
+      end
+    end
+
     class ProxyTestResult
       def initialize
         @calls = []
       end
 
+      def add_error(e)
+        e = Test::Unit::Error.new(e.test_name, RemoteError.new(e.exception))
+        @calls << [:add_error, e]
+      end
+
       def __replay__(result)
         @calls.each do |name, args|
           result.send(name, *args)
-- 
cgit v1.2.3


From 71a6b0465be2ebbc9268423bafb1e764ce044b9d Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 24 Nov 2009 17:15:35 -0800
Subject: Revert "macruby: no format_datetime or msg2str"

Obviated by fix in macruby trunk.

This reverts commit 6d91e7dca163ef55dde319452b21b767e8a0df33.
---
 activesupport/lib/active_support/core_ext/logger.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/logger.rb b/activesupport/lib/active_support/core_ext/logger.rb
index e4df8fe338..22749229a3 100644
--- a/activesupport/lib/active_support/core_ext/logger.rb
+++ b/activesupport/lib/active_support/core_ext/logger.rb
@@ -137,10 +137,10 @@ class Logger
       attr_writer :formatter
       public :formatter=
 
-      alias old_format_datetime format_datetime if method_defined?(:format_datetime)
+      alias old_format_datetime format_datetime
       def format_datetime(datetime) datetime end
 
-      alias old_msg2str msg2str if method_defined?(:msg2str)
+      alias old_msg2str msg2str
       def msg2str(msg) msg end
     end
 end
-- 
cgit v1.2.3


From 6f7fc5824f2033c0f674b002dbee7f1c3f3384ac Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 24 Nov 2009 19:26:13 -0800
Subject: Revert "Create SyncListener. Since they do not rely on Thread, they
 can be used on Google App Engine."

Take a step back on this API direction.

This reverts commit 8104f65c3225453d13307c3c2733c2a8f99e491a.
---
 activesupport/lib/active_support/notifications.rb | 92 +++++++++--------------
 1 file changed, 34 insertions(+), 58 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index e2540cd598..7a9f76b26a 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -41,7 +41,7 @@ module ActiveSupport
   # to subscribers in a thread. You can use any queue implementation you want.
   #
   module Notifications
-    mattr_accessor :queue, :listener
+    mattr_accessor :queue
 
     class << self
       delegate :instrument, :transaction_id, :transaction, :to => :instrumenter
@@ -54,13 +54,8 @@ module ActiveSupport
         @publisher ||= Publisher.new(queue)
       end
 
-      def subscriber
-        @subscriber ||= Subscriber.new(queue)
-      end
-
-      def subscribe(pattern=nil, options={}, &block)
-        with = options[:with] || listener
-        subscriber.bind(with, pattern).subscribe(&block)
+      def subscribe(pattern=nil, &block)
+        Subscriber.new(queue).bind(pattern).subscribe(&block)
       end
     end
 
@@ -109,14 +104,13 @@ module ActiveSupport
         @queue = queue
       end
 
-      def bind(listener, pattern)
-        @listener = listener
-        @pattern  = pattern
+      def bind(pattern)
+        @pattern = pattern
         self
       end
 
       def subscribe
-        @queue.subscribe(@listener, @pattern) do |*args|
+        @queue.subscribe(@pattern) do |*args|
           yield(*args)
         end
       end
@@ -144,48 +138,6 @@ module ActiveSupport
       end
     end
 
-    class AsyncListener
-      def initialize(pattern, &block)
-        @pattern = pattern
-        @subscriber = block
-        @queue = Queue.new
-        Thread.new { consume }
-      end
-
-      def publish(name, *args)
-        if !@pattern || @pattern === name.to_s
-          @queue << args.unshift(name)
-        end
-      end
-
-      def consume
-        while args = @queue.shift
-          @subscriber.call(*args)
-        end
-      end
-
-      def drained?
-        @queue.size.zero?
-      end
-    end
-
-    class SyncListener
-      def initialize(pattern, &block)
-        @pattern = pattern
-        @subscriber = block
-      end
-
-      def publish(name, *args)
-        if !@pattern || @pattern === name.to_s
-          @subscriber.call(*args.unshift(name))
-        end
-      end
-
-      def drained?
-        true
-      end
-    end
-
     # This is a default queue implementation that ships with Notifications. It
     # consumes events in a thread and publish them to all registered subscribers.
     #
@@ -198,16 +150,40 @@ module ActiveSupport
         @listeners.each { |l| l.publish(*args) }
       end
 
-      def subscribe(listener, pattern=nil, &block)
-        @listeners << listener.new(pattern, &block)
+      def subscribe(pattern=nil, &block)
+        @listeners << Listener.new(pattern, &block)
       end
 
       def drained?
         @listeners.all? &:drained?
       end
+
+      class Listener
+        def initialize(pattern, &block)
+          @pattern = pattern
+          @subscriber = block
+          @queue = Queue.new
+          Thread.new { consume }
+        end
+
+        def publish(name, *args)
+          if !@pattern || @pattern === name.to_s
+            @queue << args.unshift(name)
+          end
+        end
+
+        def consume
+          while args = @queue.shift
+            @subscriber.call(*args)
+          end
+        end
+
+        def drained?
+          @queue.size.zero?
+        end
+      end
     end
   end
 
-  Notifications.queue    = Notifications::LittleFanout.new
-  Notifications.listener = Notifications::AsyncListener
+  Notifications.queue = Notifications::LittleFanout.new
 end
-- 
cgit v1.2.3


From ddf681ce1d3e71aef913dd7f94c60b7622523f8b Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 24 Nov 2009 19:35:01 -0800
Subject: Expose a simple Queue#wait to block until all notifications are
 drained

---
 activesupport/lib/active_support/notifications.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index 7a9f76b26a..09b1aa1713 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -154,10 +154,15 @@ module ActiveSupport
         @listeners << Listener.new(pattern, &block)
       end
 
-      def drained?
-        @listeners.all? &:drained?
+      def wait
+        sleep 0.05 until drained?
       end
 
+      private
+        def drained?
+          @listeners.all? &:drained?
+        end
+
       class Listener
         def initialize(pattern, &block)
           @pattern = pattern
-- 
cgit v1.2.3


From 02893d17053123cbf02b65c2fe549421c11a2604 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 24 Nov 2009 19:37:10 -0800
Subject: Remark that Listener is an implementation detail

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index 09b1aa1713..316d80e064 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -163,7 +163,8 @@ module ActiveSupport
           @listeners.all? &:drained?
         end
 
-      class Listener
+      # Used for internal implementation only.
+      class Listener #:nodoc:
         def initialize(pattern, &block)
           @pattern = pattern
           @subscriber = block
-- 
cgit v1.2.3


From 4f2a04cc085b9117e8af8079a95a063f671d7a3d Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 28 Nov 2009 12:49:07 -0800
Subject: Notifications: extract central Notifier, cordon off the internal
 Fanout implementation, and segregate instrumentation concerns

---
 activesupport/lib/active_support/notifications.rb  | 148 +++------------------
 .../lib/active_support/notifications/fanout.rb     |  84 ++++++++++++
 .../active_support/notifications/instrumenter.rb   |  47 +++++++
 3 files changed, 147 insertions(+), 132 deletions(-)
 create mode 100644 activesupport/lib/active_support/notifications/fanout.rb
 create mode 100644 activesupport/lib/active_support/notifications/instrumenter.rb

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index 316d80e064..d9bfcbfcab 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -1,7 +1,4 @@
-require 'thread'
 require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/module/attribute_accessors'
-require 'active_support/secure_random'
 
 module ActiveSupport
   # Notifications provides an instrumentation API for Ruby. To instrument an
@@ -41,155 +38,42 @@ module ActiveSupport
   # to subscribers in a thread. You can use any queue implementation you want.
   #
   module Notifications
-    mattr_accessor :queue
+    autoload :Instrumenter, 'active_support/notifications/instrumenter'
+    autoload :Event, 'active_support/notifications/instrumenter'
+    autoload :Fanout, 'active_support/notifications/fanout'
 
     class << self
-      delegate :instrument, :transaction_id, :transaction, :to => :instrumenter
+      attr_writer :notifier
+      delegate :publish, :subscribe, :instrument, :to => :notifier
 
-      def instrumenter
-        Thread.current[:notifications_instrumeter] ||= Instrumenter.new(publisher)
-      end
-
-      def publisher
-        @publisher ||= Publisher.new(queue)
-      end
-
-      def subscribe(pattern=nil, &block)
-        Subscriber.new(queue).bind(pattern).subscribe(&block)
+      def notifier
+        @notifier ||= Notifier.new
       end
     end
 
-    class Instrumenter
-      def initialize(publisher)
-        @publisher = publisher
-        @id        = random_id
-      end
-
-      def transaction
-        @id, old_id = random_id, @id
-        yield
-      ensure
-        @id = old_id
-      end
-
-      def transaction_id
-        @id
-      end
-
-      def instrument(name, payload={})
-        time   = Time.now
-        result = yield if block_given?
-      ensure
-        @publisher.publish(name, time, Time.now, result, @id, payload)
-      end
-
-    private
-      def random_id
-        SecureRandom.hex(10)
-      end
-    end
-
-    class Publisher
-      def initialize(queue)
+    class Notifier
+      def initialize(queue = Fanout.new)
         @queue = queue
       end
 
       def publish(*args)
         @queue.publish(*args)
       end
-    end
-
-    class Subscriber
-      def initialize(queue)
-        @queue = queue
-      end
 
-      def bind(pattern)
-        @pattern = pattern
-        self
-      end
-
-      def subscribe
-        @queue.subscribe(@pattern) do |*args|
-          yield(*args)
-        end
-      end
-    end
-
-    class Event
-      attr_reader :name, :time, :end, :transaction_id, :result, :payload
-
-      def initialize(name, start, ending, result, transaction_id, payload)
-        @name           = name
-        @payload        = payload.dup
-        @time           = start
-        @transaction_id = transaction_id
-        @end            = ending
-        @result         = result
-      end
-
-      def duration
-        @duration ||= 1000.0 * (@end - @time)
-      end
-
-      def parent_of?(event)
-        start = (self.time - event.time) * 1000
-        start <= 0 && (start + duration >= event.duration)
-      end
-    end
-
-    # This is a default queue implementation that ships with Notifications. It
-    # consumes events in a thread and publish them to all registered subscribers.
-    #
-    class LittleFanout
-      def initialize
-        @listeners = []
-      end
-
-      def publish(*args)
-        @listeners.each { |l| l.publish(*args) }
-      end
-
-      def subscribe(pattern=nil, &block)
-        @listeners << Listener.new(pattern, &block)
+      def subscribe(pattern = nil, &block)
+        @queue.bind(pattern).subscribe(&block)
       end
 
       def wait
-        sleep 0.05 until drained?
+        @queue.wait
       end
 
-      private
-        def drained?
-          @listeners.all? &:drained?
-        end
-
-      # Used for internal implementation only.
-      class Listener #:nodoc:
-        def initialize(pattern, &block)
-          @pattern = pattern
-          @subscriber = block
-          @queue = Queue.new
-          Thread.new { consume }
-        end
-
-        def publish(name, *args)
-          if !@pattern || @pattern === name.to_s
-            @queue << args.unshift(name)
-          end
-        end
-
-        def consume
-          while args = @queue.shift
-            @subscriber.call(*args)
-          end
-        end
+      delegate :instrument, :to => :current_instrumenter
 
-        def drained?
-          @queue.size.zero?
+      private
+        def current_instrumenter
+          Thread.current[:"instrumentation_#{object_id}"] ||= Notifications::Instrumenter.new(self)
         end
-      end
     end
   end
-
-  Notifications.queue = Notifications::LittleFanout.new
 end
diff --git a/activesupport/lib/active_support/notifications/fanout.rb b/activesupport/lib/active_support/notifications/fanout.rb
new file mode 100644
index 0000000000..412d977b25
--- /dev/null
+++ b/activesupport/lib/active_support/notifications/fanout.rb
@@ -0,0 +1,84 @@
+require 'thread'
+
+module ActiveSupport
+  module Notifications
+    # This is a default queue implementation that ships with Notifications. It
+    # consumes events in a thread and publish them to all registered subscribers.
+    #
+    class Fanout
+      def initialize
+        @subscribers = []
+      end
+
+      def bind(pattern)
+        Binding.new(self, pattern)
+      end
+
+      def subscribe(pattern = nil, &block)
+        @subscribers << Subscriber.new(pattern, &block)
+      end
+
+      def publish(*args)
+        @subscribers.each { |s| s.publish(*args) }
+      end
+
+      def wait
+        sleep(0.05) until @subscribers.all?(&:drained?)
+      end
+
+      # Used for internal implementation only.
+      class Binding #:nodoc:
+        def initialize(queue, pattern)
+          @queue, @pattern = queue, pattern
+        end
+
+        def subscribe(&block)
+          @queue.subscribe(@pattern, &block)
+        end
+      end
+
+      # Used for internal implementation only.
+      class Subscriber #:nodoc:
+        def initialize(pattern, &block)
+          @pattern =
+            case pattern
+            when Regexp, NilClass
+              pattern
+            else
+              /^#{Regexp.escape(pattern.to_s)}/
+            end
+          @block = block
+          @events = Queue.new
+          start_consumer
+        end
+
+        def publish(name, *args)
+          push(name, args) if matches?(name)
+        end
+
+        def consume
+          while args = @events.shift
+            @block.call(*args)
+          end
+        end
+
+        def drained?
+          @events.size.zero?
+        end
+
+        private
+          def start_consumer
+            Thread.new { consume }
+          end
+
+          def matches?(name)
+            !@pattern || @pattern =~ name.to_s
+          end
+
+          def push(name, args)
+            @events << args.unshift(name)
+          end
+      end
+    end
+  end
+end
diff --git a/activesupport/lib/active_support/notifications/instrumenter.rb b/activesupport/lib/active_support/notifications/instrumenter.rb
new file mode 100644
index 0000000000..fb95422af2
--- /dev/null
+++ b/activesupport/lib/active_support/notifications/instrumenter.rb
@@ -0,0 +1,47 @@
+require 'active_support/secure_random'
+require 'active_support/core_ext/module/delegation'
+
+module ActiveSupport
+  module Notifications
+    class Instrumenter
+      def initialize(notifier)
+        @id = unique_id
+        @notifier = notifier
+      end
+
+      def instrument(name, payload={})
+        time   = Time.now
+        result = yield if block_given?
+      ensure
+        @notifier.publish(name, time, Time.now, result, @id, payload)
+      end
+
+      private
+        def unique_id
+          SecureRandom.hex(10)
+        end
+    end
+
+    class Event
+      attr_reader :name, :time, :end, :transaction_id, :result, :payload
+
+      def initialize(name, start, ending, result, transaction_id, payload)
+        @name           = name
+        @payload        = payload.dup
+        @time           = start
+        @transaction_id = transaction_id
+        @end            = ending
+        @result         = result
+      end
+
+      def duration
+        @duration ||= 1000.0 * (@end - @time)
+      end
+
+      def parent_of?(event)
+        start = (self.time - event.time) * 1000
+        start <= 0 && (start + duration >= event.duration)
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From 327545c3ae904d1a9c67de3e280c182ed6418023 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 29 Nov 2009 02:30:35 -0800
Subject: Notifications: synchronous fanout queue pushes events to subscribers
 rather than having them concurrently pull

---
 .../lib/active_support/notifications/fanout.rb     | 61 ++++++++++++++--------
 1 file changed, 39 insertions(+), 22 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/notifications/fanout.rb b/activesupport/lib/active_support/notifications/fanout.rb
index 412d977b25..bb07e4765c 100644
--- a/activesupport/lib/active_support/notifications/fanout.rb
+++ b/activesupport/lib/active_support/notifications/fanout.rb
@@ -6,7 +6,8 @@ module ActiveSupport
     # consumes events in a thread and publish them to all registered subscribers.
     #
     class Fanout
-      def initialize
+      def initialize(sync = false)
+        @subscriber_klass = sync ? Subscriber : AsyncSubscriber
         @subscribers = []
       end
 
@@ -15,7 +16,7 @@ module ActiveSupport
       end
 
       def subscribe(pattern = nil, &block)
-        @subscribers << Subscriber.new(pattern, &block)
+        @subscribers << @subscriber_klass.new(pattern, &block)
       end
 
       def publish(*args)
@@ -29,7 +30,14 @@ module ActiveSupport
       # Used for internal implementation only.
       class Binding #:nodoc:
         def initialize(queue, pattern)
-          @queue, @pattern = queue, pattern
+          @queue = queue
+          @pattern =
+            case pattern
+            when Regexp, NilClass
+              pattern
+            else
+              /^#{Regexp.escape(pattern.to_s)}/
+            end
         end
 
         def subscribe(&block)
@@ -37,33 +45,40 @@ module ActiveSupport
         end
       end
 
-      # Used for internal implementation only.
       class Subscriber #:nodoc:
         def initialize(pattern, &block)
-          @pattern =
-            case pattern
-            when Regexp, NilClass
-              pattern
-            else
-              /^#{Regexp.escape(pattern.to_s)}/
-            end
+          @pattern = pattern
           @block = block
-          @events = Queue.new
-          start_consumer
         end
 
-        def publish(name, *args)
-          push(name, args) if matches?(name)
+        def publish(*args)
+          push(*args) if matches?(args.first)
         end
 
-        def consume
-          while args = @events.shift
+        def drained?
+          true
+        end
+
+        private
+          def matches?(name)
+            !@pattern || @pattern =~ name.to_s
+          end
+
+          def push(*args)
             @block.call(*args)
           end
+      end
+
+      # Used for internal implementation only.
+      class AsyncSubscriber < Subscriber #:nodoc:
+        def initialize(pattern, &block)
+          super
+          @events = Queue.new
+          start_consumer
         end
 
         def drained?
-          @events.size.zero?
+          @events.empty?
         end
 
         private
@@ -71,12 +86,14 @@ module ActiveSupport
             Thread.new { consume }
           end
 
-          def matches?(name)
-            !@pattern || @pattern =~ name.to_s
+          def consume
+            while args = @events.shift
+              @block.call(*args)
+            end
           end
 
-          def push(name, args)
-            @events << args.unshift(name)
+          def push(*args)
+            @events << args
           end
       end
     end
-- 
cgit v1.2.3


From e12380e7877abb3dafeb7875fb74c272e5cbeee0 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 1 Dec 2009 23:25:24 -0600
Subject: Remove concat before overriding it

---
 .../lib/active_support/core_ext/string/output_safety.rb     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'activesupport/lib')

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 2cca4763f4..a2a88eb7df 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -7,11 +7,11 @@ class String
     @_rails_html_safe = true
     self
   end
-  
+
   def html_safe
     dup.html_safe!
   end
-  
+
   alias original_plus +
   def +(other)
     result = original_plus(other)
@@ -21,7 +21,7 @@ class String
       result
     end
   end
-  
+
   alias original_concat <<
   def <<(other)
     result = original_concat(other)
@@ -30,14 +30,15 @@ class String
     end
     result
   end
-  
+
+  remove_method :concat
   def concat(other)
     self << other
   end
-  
+
   private
     def also_html_safe?(other)
       other.respond_to?(:html_safe?) && other.html_safe?
     end
-  
+
 end
\ No newline at end of file
-- 
cgit v1.2.3


From 1ee9b40b18a0bed5bb10a0785f7e2730bac983f6 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Wed, 2 Dec 2009 15:07:01 -0600
Subject: Failing tests for to_param/to_query not escaping "[]"

---
 activesupport/lib/active_support/core_ext/object/to_param.rb | 2 +-
 activesupport/lib/active_support/core_ext/object/to_query.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/object/to_param.rb b/activesupport/lib/active_support/core_ext/object/to_param.rb
index a5e2260791..7ca763cbad 100644
--- a/activesupport/lib/active_support/core_ext/object/to_param.rb
+++ b/activesupport/lib/active_support/core_ext/object/to_param.rb
@@ -38,7 +38,7 @@ class Hash
   # ==== Examples
   #   { :name => 'David', :nationality => 'Danish' }.to_query # => "name=David&nationality=Danish"
   #
-  #   { :name => 'David', :nationality => 'Danish' }.to_query('user') # => "user%5Bname%5D=David&user%5Bnationality%5D=Danish"
+  #   { :name => 'David', :nationality => 'Danish' }.to_query('user') # => "user[name]=David&user[nationality]=Danish"
   def to_param(namespace = nil)
     collect do |key, value|
       value.to_query(namespace ? "#{namespace}[#{key}]" : key)
diff --git a/activesupport/lib/active_support/core_ext/object/to_query.rb b/activesupport/lib/active_support/core_ext/object/to_query.rb
index 3f1540f685..1c6a02c9ad 100644
--- a/activesupport/lib/active_support/core_ext/object/to_query.rb
+++ b/activesupport/lib/active_support/core_ext/object/to_query.rb
@@ -15,7 +15,7 @@ class Array
   # Converts an array into a string suitable for use as a URL query string,
   # using the given +key+ as the param name.
   #
-  #   ['Rails', 'coding'].to_query('hobbies') # => "hobbies%5B%5D=Rails&hobbies%5B%5D=coding"
+  #   ['Rails', 'coding'].to_query('hobbies') # => "hobbies[]=Rails&hobbies[]=coding"
   def to_query(key)
     prefix = "#{key}[]"
     collect { |value| value.to_query(prefix) }.join '&'
-- 
cgit v1.2.3


From 856d2fd874d72dd9f83204affff4edfef3308361 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Wed, 2 Dec 2009 15:17:08 -0600
Subject: Quick fix for not escaping []s (not ideal)

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/object/to_query.rb b/activesupport/lib/active_support/core_ext/object/to_query.rb
index 1c6a02c9ad..c9981895b4 100644
--- a/activesupport/lib/active_support/core_ext/object/to_query.rb
+++ b/activesupport/lib/active_support/core_ext/object/to_query.rb
@@ -7,7 +7,7 @@ class Object
   # Note: This method is defined as a default implementation for all Objects for Hash#to_query to work.
   def to_query(key)
     require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
-    "#{CGI.escape(key.to_s)}=#{CGI.escape(to_param.to_s)}"
+    "#{CGI.escape(key.to_s).gsub(/%(5B|5D)/n) { [$1].pack('H*') }}=#{CGI.escape(to_param.to_s)}"
   end
 end
 
-- 
cgit v1.2.3


From c1304098cca8a9247a9ad1461a1a343354650843 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Wed, 2 Dec 2009 20:01:01 -0800
Subject: Reorganize autoloads:

  * A new module (ActiveSupport::Autoload) is provide that extends
    autoloading with new behavior.
  * All autoloads in modules that have extended ActiveSupport::Autoload
    will be eagerly required in threadsafe environments
  * Autoloads can optionally leave off the path if the path is the same
    as full_constant_name.underscore
  * It is possible to specify that a group of autoloads live under an
    additional path. For instance, all of ActionDispatch's middlewares
    are ActionDispatch::MiddlewareName, but they live under
    "action_dispatch/middlewares/middleware_name"
  * It is possible to specify that a group of autoloads are all found
    at the same path. For instance, a number of exceptions might all
    be declared there.
  * One consequence of this is that testing-related constants are not
    autoloaded. To get the testing helpers for a given component,
    require "component_name/test_case". For instance, "action_controller/test_case".
  * test_help.rb, which is automatically required by a Rails application's
    test helper, requires the test_case.rb for all active components, so
    this change will not be disruptive in existing or new applications.
---
 activesupport/lib/active_support/autoload.rb       |  55 +-
 .../lib/active_support/dependencies/autoload.rb    |  37 ++
 .../lib/active_support/testing/performance.rb      | 678 +++++++++++----------
 3 files changed, 407 insertions(+), 363 deletions(-)
 create mode 100644 activesupport/lib/active_support/dependencies/autoload.rb

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/autoload.rb b/activesupport/lib/active_support/autoload.rb
index 63f7338a68..e57cf24b25 100644
--- a/activesupport/lib/active_support/autoload.rb
+++ b/activesupport/lib/active_support/autoload.rb
@@ -1,28 +1,31 @@
+require "active_support/dependencies/autoload"
+
 module ActiveSupport
-  autoload :BacktraceCleaner, 'active_support/backtrace_cleaner'
-  autoload :Base64, 'active_support/base64'
-  autoload :BasicObject, 'active_support/basic_object'
-  autoload :Benchmarkable, 'active_support/benchmarkable'
-  autoload :BufferedLogger, 'active_support/buffered_logger'
-  autoload :Cache, 'active_support/cache'
-  autoload :Callbacks, 'active_support/callbacks'
-  autoload :Concern, 'active_support/concern'
-  autoload :Configurable, 'active_support/configurable'
-  autoload :DependencyModule, 'active_support/dependency_module'
-  autoload :DeprecatedCallbacks, 'active_support/deprecated_callbacks'
-  autoload :Deprecation, 'active_support/deprecation'
-  autoload :Gzip, 'active_support/gzip'
-  autoload :Inflector, 'active_support/inflector'
-  autoload :Memoizable, 'active_support/memoizable'
-  autoload :MessageEncryptor, 'active_support/message_encryptor'
-  autoload :MessageVerifier, 'active_support/message_verifier'
-  autoload :Multibyte, 'active_support/multibyte'
-  autoload :OptionMerger, 'active_support/option_merger'
-  autoload :OrderedHash, 'active_support/ordered_hash'
-  autoload :OrderedOptions, 'active_support/ordered_options'
-  autoload :Notifications, 'active_support/notifications'
-  autoload :Rescuable, 'active_support/rescuable'
-  autoload :SecureRandom, 'active_support/secure_random'
-  autoload :StringInquirer, 'active_support/string_inquirer'
-  autoload :XmlMini, 'active_support/xml_mini'
+  extend ActiveSupport::Autoload
+
+  autoload :BacktraceCleaner
+  autoload :Base64
+  autoload :BasicObject
+  autoload :Benchmarkable
+  autoload :BufferedLogger
+  autoload :Cache
+  autoload :Callbacks
+  autoload :Concern
+  autoload :Configurable
+  autoload :DeprecatedCallbacks
+  autoload :Deprecation
+  autoload :Gzip
+  autoload :Inflector
+  autoload :Memoizable
+  autoload :MessageEncryptor
+  autoload :MessageVerifier
+  autoload :Multibyte
+  autoload :OptionMerger
+  autoload :OrderedHash
+  autoload :OrderedOptions
+  autoload :Notifications
+  autoload :Rescuable
+  autoload :SecureRandom
+  autoload :StringInquirer
+  autoload :XmlMini
 end
diff --git a/activesupport/lib/active_support/dependencies/autoload.rb b/activesupport/lib/active_support/dependencies/autoload.rb
new file mode 100644
index 0000000000..973875f895
--- /dev/null
+++ b/activesupport/lib/active_support/dependencies/autoload.rb
@@ -0,0 +1,37 @@
+require "active_support/inflector/methods"
+
+module ActiveSupport
+  module Autoload
+
+    @@autoloads = {}
+    @@under_path = nil
+    @@at_path = nil
+
+    def autoload(const_name, path = @@at_path)
+      full = [self.name, @@under_path, const_name.to_s, path].compact.join("::")
+      location = path || Inflector.underscore(full)
+
+      @@autoloads[const_name] = location
+      super const_name, location
+    end
+
+    def autoload_under(path)
+      @@under_path, old_path = path, @@under_path
+      yield
+    ensure
+      @@under_path = old_path
+    end
+
+    def autoload_at(path)
+      @@at_path, old_path = path, @@at_path
+      yield
+    ensure
+      @@at_path = old_path
+    end
+
+    def self.eager_autoload!
+      @@autoloads.values.each {|file| require file }
+    end
+
+  end
+end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index ab34f975f6..66e32fa5d7 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -1,450 +1,454 @@
-require 'ruby-prof'
-
-require 'fileutils'
-require 'rails/version'
-
-module ActiveSupport
-  module Testing
-    module Performance
-      DEFAULTS =
-        if benchmark = ARGV.include?('--benchmark')  # HAX for rake test
-          { :benchmark => true,
-            :runs => 4,
-            :metrics => [:wall_time, :memory, :objects, :gc_runs, :gc_time],
-            :output => 'tmp/performance' }
-        else
-          { :benchmark => false,
-            :runs => 1,
-            :min_percent => 0.01,
-            :metrics => [:process_time, :memory, :objects],
-            :formats => [:flat, :graph_html, :call_tree],
-            :output => 'tmp/performance' }
-        end.freeze
-
-      def self.included(base)
-        base.superclass_delegating_accessor :profile_options
-        base.profile_options = DEFAULTS
-      end
+begin
+  require 'ruby-prof'
+
+  require 'fileutils'
+  require 'rails/version'
+  require 'active_support/core_ext/class/delegating_attributes'
+
+  module ActiveSupport
+    module Testing
+      module Performance
+        DEFAULTS =
+          if benchmark = ARGV.include?('--benchmark')  # HAX for rake test
+            { :benchmark => true,
+              :runs => 4,
+              :metrics => [:wall_time, :memory, :objects, :gc_runs, :gc_time],
+              :output => 'tmp/performance' }
+          else
+            { :benchmark => false,
+              :runs => 1,
+              :min_percent => 0.01,
+              :metrics => [:process_time, :memory, :objects],
+              :formats => [:flat, :graph_html, :call_tree],
+              :output => 'tmp/performance' }
+          end.freeze
+
+        def self.included(base)
+          base.superclass_delegating_accessor :profile_options
+          base.profile_options = DEFAULTS
+        end
 
-      def full_test_name
-        "#{self.class.name}##{method_name}"
-      end
+        def full_test_name
+          "#{self.class.name}##{method_name}"
+        end
 
-      def run(result)
-        return if method_name =~ /^default_test$/
+        def run(result)
+          return if method_name =~ /^default_test$/
 
-        yield(self.class::STARTED, name)
-        @_result = result
+          yield(self.class::STARTED, name)
+          @_result = result
 
-        run_warmup
-        if profile_options && metrics = profile_options[:metrics]
-          metrics.each do |metric_name|
-            if klass = Metrics[metric_name.to_sym]
-              run_profile(klass.new)
-              result.add_run
+          run_warmup
+          if profile_options && metrics = profile_options[:metrics]
+            metrics.each do |metric_name|
+              if klass = Metrics[metric_name.to_sym]
+                run_profile(klass.new)
+                result.add_run
+              end
             end
           end
-        end
 
-        yield(self.class::FINISHED, name)
-      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
-        add_error($!)
-      ensure
-        begin
-          teardown
-          run_callbacks :teardown, :enumerator => :reverse_each
+        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
           add_error($!)
+        ensure
+          begin
+            teardown
+            run_callbacks :teardown, :enumerator => :reverse_each
+          rescue ::Test::Unit::AssertionFailedError => e
+            add_failure(e.message, e.backtrace)
+          rescue StandardError, ScriptError
+            add_error($!)
+          end
         end
-      end
 
-      protected
-        def run_warmup
-          GC.start
+        protected
+          def run_warmup
+            GC.start
 
-          time = Metrics::Time.new
-          run_test(time, :benchmark)
-          puts "%s (%s warmup)" % [full_test_name, time.format(time.total)]
+            time = Metrics::Time.new
+            run_test(time, :benchmark)
+            puts "%s (%s warmup)" % [full_test_name, time.format(time.total)]
 
-          GC.start
-        end
-
-        def run_profile(metric)
-          klass = profile_options[:benchmark] ? Benchmarker : Profiler
-          performer = klass.new(self, metric)
+            GC.start
+          end
 
-          performer.run
-          puts performer.report
-          performer.record
-        end
+          def run_profile(metric)
+            klass = profile_options[:benchmark] ? Benchmarker : Profiler
+            performer = klass.new(self, metric)
 
-      class Performer
-        delegate :run_test, :profile_options, :full_test_name, :to => :@harness
+            performer.run
+            puts performer.report
+            performer.record
+          end
 
-        def initialize(harness, metric)
-          @harness, @metric = harness, metric
-        end
+        class Performer
+          delegate :run_test, :profile_options, :full_test_name, :to => :@harness
 
-        def report
-          rate = @total / profile_options[:runs]
-          '%20s: %s' % [@metric.name, @metric.format(rate)]
-        end
+          def initialize(harness, metric)
+            @harness, @metric = harness, metric
+          end
 
-        protected
-          def output_filename
-            "#{profile_options[:output]}/#{full_test_name}_#{@metric.name}"
+          def report
+            rate = @total / profile_options[:runs]
+            '%20s: %s' % [@metric.name, @metric.format(rate)]
           end
-      end
 
-      class Benchmarker < Performer
-        def run
-          profile_options[:runs].to_i.times { run_test(@metric, :benchmark) }
-          @total = @metric.total
+          protected
+            def output_filename
+              "#{profile_options[:output]}/#{full_test_name}_#{@metric.name}"
+            end
         end
 
-        def record
-          avg = @metric.total / profile_options[:runs].to_i
-          now = Time.now.utc.xmlschema
-          with_output_file do |file|
-            file.puts "#{avg},#{now},#{environment}"
+        class Benchmarker < Performer
+          def run
+            profile_options[:runs].to_i.times { run_test(@metric, :benchmark) }
+            @total = @metric.total
           end
-        end
 
-        def environment
-          unless defined? @env
-            app = "#{$1}.#{$2}" if File.directory?('.git') && `git branch -v` =~ /^\* (\S+)\s+(\S+)/
-
-            rails = Rails::VERSION::STRING
-            if File.directory?('vendor/rails/.git')
-              Dir.chdir('vendor/rails') do
-                rails += ".#{$1}.#{$2}" if `git branch -v` =~ /^\* (\S+)\s+(\S+)/
-              end
+          def record
+            avg = @metric.total / profile_options[:runs].to_i
+            now = Time.now.utc.xmlschema
+            with_output_file do |file|
+              file.puts "#{avg},#{now},#{environment}"
             end
-
-            ruby = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
-            ruby += "-#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"
-
-            @env = [app, rails, ruby, RUBY_PLATFORM] * ','
           end
 
-          @env
-        end
+          def environment
+            unless defined? @env
+              app = "#{$1}.#{$2}" if File.directory?('.git') && `git branch -v` =~ /^\* (\S+)\s+(\S+)/
 
-        protected
-          HEADER = 'measurement,created_at,app,rails,ruby,platform'
+              rails = Rails::VERSION::STRING
+              if File.directory?('vendor/rails/.git')
+                Dir.chdir('vendor/rails') do
+                  rails += ".#{$1}.#{$2}" if `git branch -v` =~ /^\* (\S+)\s+(\S+)/
+                end
+              end
 
-          def with_output_file
-            fname = output_filename
+              ruby = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
+              ruby += "-#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"
 
-            if new = !File.exist?(fname)
-              FileUtils.mkdir_p(File.dirname(fname))
+              @env = [app, rails, ruby, RUBY_PLATFORM] * ','
             end
 
-            File.open(fname, 'ab') do |file|
-              file.puts(HEADER) if new
-              yield file
-            end
+            @env
           end
 
-          def output_filename
-            "#{super}.csv"
-          end
-      end
+          protected
+            HEADER = 'measurement,created_at,app,rails,ruby,platform'
 
-      class Profiler < Performer
-        def initialize(*args)
-          super
-          @supported = @metric.measure_mode rescue false
-        end
+            def with_output_file
+              fname = output_filename
+
+              if new = !File.exist?(fname)
+                FileUtils.mkdir_p(File.dirname(fname))
+              end
 
-        def run
-          return unless @supported
+              File.open(fname, 'ab') do |file|
+                file.puts(HEADER) if new
+                yield file
+              end
+            end
 
-          RubyProf.measure_mode = @metric.measure_mode
-          RubyProf.start
-          RubyProf.pause
-          profile_options[:runs].to_i.times { run_test(@metric, :profile) }
-          @data = RubyProf.stop
-          @total = @data.threads.values.sum(0) { |method_infos| method_infos.sort.last.total_time }
+            def output_filename
+              "#{super}.csv"
+            end
         end
 
-        def report
-          if @supported
+        class Profiler < Performer
+          def initialize(*args)
             super
-          else
-            '%20s: unsupported' % @metric.name
+            @supported = @metric.measure_mode rescue false
           end
-        end
 
-        def record
-          return unless @supported
+          def run
+            return unless @supported
 
-          klasses = profile_options[:formats].map { |f| RubyProf.const_get("#{f.to_s.camelize}Printer") }.compact
+            RubyProf.measure_mode = @metric.measure_mode
+            RubyProf.start
+            RubyProf.pause
+            profile_options[:runs].to_i.times { run_test(@metric, :profile) }
+            @data = RubyProf.stop
+            @total = @data.threads.values.sum(0) { |method_infos| method_infos.sort.last.total_time }
+          end
 
-          klasses.each do |klass|
-            fname = output_filename(klass)
-            FileUtils.mkdir_p(File.dirname(fname))
-            File.open(fname, 'wb') do |file|
-              klass.new(@data).print(file, profile_options.slice(:min_percent))
+          def report
+            if @supported
+              super
+            else
+              '%20s: unsupported' % @metric.name
             end
           end
-        end
 
-        protected
-          def output_filename(printer_class)
-            suffix =
-              case printer_class.name.demodulize
-                when 'FlatPrinter'; 'flat.txt'
-                when 'GraphPrinter'; 'graph.txt'
-                when 'GraphHtmlPrinter'; 'graph.html'
-                when 'CallTreePrinter'; 'tree.txt'
-                else printer_class.name.sub(/Printer$/, '').underscore
-              end
+          def record
+            return unless @supported
+
+            klasses = profile_options[:formats].map { |f| RubyProf.const_get("#{f.to_s.camelize}Printer") }.compact
 
-            "#{super()}_#{suffix}"
+            klasses.each do |klass|
+              fname = output_filename(klass)
+              FileUtils.mkdir_p(File.dirname(fname))
+              File.open(fname, 'wb') do |file|
+                klass.new(@data).print(file, profile_options.slice(:min_percent))
+              end
+            end
           end
-      end
 
-      module Metrics
-        def self.[](name)
-          const_get(name.to_s.camelize)
-        rescue NameError
-          nil
+          protected
+            def output_filename(printer_class)
+              suffix =
+                case printer_class.name.demodulize
+                  when 'FlatPrinter'; 'flat.txt'
+                  when 'GraphPrinter'; 'graph.txt'
+                  when 'GraphHtmlPrinter'; 'graph.html'
+                  when 'CallTreePrinter'; 'tree.txt'
+                  else printer_class.name.sub(/Printer$/, '').underscore
+                end
+
+              "#{super()}_#{suffix}"
+            end
         end
 
-        class Base
-          attr_reader :total
-
-          def initialize
-            @total = 0
+        module Metrics
+          def self.[](name)
+            const_get(name.to_s.camelize)
+          rescue NameError
+            nil
           end
 
-          def name
-            @name ||= self.class.name.demodulize.underscore
-          end
+          class Base
+            attr_reader :total
 
-          def measure_mode
-            self.class::Mode
-          end
+            def initialize
+              @total = 0
+            end
 
-          def measure
-            0
-          end
+            def name
+              @name ||= self.class.name.demodulize.underscore
+            end
 
-          def benchmark
-            with_gc_stats do
-              before = measure
-              yield
-              @total += (measure - before)
+            def measure_mode
+              self.class::Mode
             end
-          end
 
-          def profile
-            RubyProf.resume
-            yield
-          ensure
-            RubyProf.pause
-          end
+            def measure
+              0
+            end
 
-          protected
-            if GC.respond_to?(:enable_stats)
-              def with_gc_stats
-                GC.enable_stats
-                yield
-              ensure
-                GC.disable_stats
-              end
-            elsif defined?(GC::Profiler)
-              def with_gc_stats
-                GC.start
-                GC.disable
-                GC::Profiler.enable
-                yield
-              ensure
-                GC::Profiler.disable
-                GC.enable
-              end
-            else
-              def with_gc_stats
+            def benchmark
+              with_gc_stats do
+                before = measure
                 yield
+                @total += (measure - before)
               end
             end
-        end
 
-        class Time < Base
-          def measure
-            ::Time.now.to_f
-          end
-
-          def format(measurement)
-            if measurement < 2
-              '%d ms' % (measurement * 1000)
-            else
-              '%.2f sec' % measurement
+            def profile
+              RubyProf.resume
+              yield
+            ensure
+              RubyProf.pause
             end
-          end
-        end
-
-        class ProcessTime < Time
-          Mode = RubyProf::PROCESS_TIME
-
-          def measure
-            RubyProf.measure_process_time
-          end
-        end
-
-        class WallTime < Time
-          Mode = RubyProf::WALL_TIME
 
-          def measure
-            RubyProf.measure_wall_time
+            protected
+              if GC.respond_to?(:enable_stats)
+                def with_gc_stats
+                  GC.enable_stats
+                  yield
+                ensure
+                  GC.disable_stats
+                end
+              elsif defined?(GC::Profiler)
+                def with_gc_stats
+                  GC.start
+                  GC.disable
+                  GC::Profiler.enable
+                  yield
+                ensure
+                  GC::Profiler.disable
+                  GC.enable
+                end
+              else
+                def with_gc_stats
+                  yield
+                end
+              end
           end
-        end
 
-        class CpuTime < Time
-          Mode = RubyProf::CPU_TIME if RubyProf.const_defined?(:CPU_TIME)
-
-          def initialize(*args)
-            # FIXME: yeah my CPU is 2.33 GHz
-            RubyProf.cpu_frequency = 2.33e9
-            super
-          end
+          class Time < Base
+            def measure
+              ::Time.now.to_f
+            end
 
-          def measure
-            RubyProf.measure_cpu_time
+            def format(measurement)
+              if measurement < 2
+                '%d ms' % (measurement * 1000)
+              else
+                '%.2f sec' % measurement
+              end
+            end
           end
-        end
 
-        class Memory < Base
-          Mode = RubyProf::MEMORY if RubyProf.const_defined?(:MEMORY)
+          class ProcessTime < Time
+            Mode = RubyProf::PROCESS_TIME
 
-          # ruby-prof wrapper
-          if RubyProf.respond_to?(:measure_memory)
             def measure
-              RubyProf.measure_memory / 1024.0
+              RubyProf.measure_process_time
             end
+          end
 
-          # Ruby 1.8 + railsbench patch
-          elsif GC.respond_to?(:allocated_size)
-            def measure
-              GC.allocated_size / 1024.0
-            end
+          class WallTime < Time
+            Mode = RubyProf::WALL_TIME
 
-          # Ruby 1.8 + lloyd patch
-          elsif GC.respond_to?(:heap_info)
             def measure
-              GC.heap_info['heap_current_memory'] / 1024.0
+              RubyProf.measure_wall_time
             end
+          end
 
-          # Ruby 1.9 with total_malloc_allocated_size patch
-          elsif GC.respond_to?(:malloc_total_allocated_size)
-            def measure
-              GC.total_malloc_allocated_size / 1024.0
-            end
+          class CpuTime < Time
+            Mode = RubyProf::CPU_TIME if RubyProf.const_defined?(:CPU_TIME)
 
-          # Ruby 1.9 unpatched
-          elsif GC.respond_to?(:malloc_allocated_size)
-            def measure
-              GC.malloc_allocated_size / 1024.0
+            def initialize(*args)
+              # FIXME: yeah my CPU is 2.33 GHz
+              RubyProf.cpu_frequency = 2.33e9
+              super
             end
 
-          # Ruby 1.9 + GC profiler patch
-          elsif defined?(GC::Profiler)
             def measure
-              GC.enable
-              GC.start
-              kb = GC::Profiler.data.last[:HEAP_USE_SIZE] / 1024.0
-              GC.disable
-              kb
+              RubyProf.measure_cpu_time
             end
           end
 
-          def format(measurement)
-            '%.2f KB' % measurement
-          end
-        end
+          class Memory < Base
+            Mode = RubyProf::MEMORY if RubyProf.const_defined?(:MEMORY)
 
-        class Objects < Base
-          Mode = RubyProf::ALLOCATIONS if RubyProf.const_defined?(:ALLOCATIONS)
+            # ruby-prof wrapper
+            if RubyProf.respond_to?(:measure_memory)
+              def measure
+                RubyProf.measure_memory / 1024.0
+              end
 
-          if RubyProf.respond_to?(:measure_allocations)
-            def measure
-              RubyProf.measure_allocations
-            end
+            # Ruby 1.8 + railsbench patch
+            elsif GC.respond_to?(:allocated_size)
+              def measure
+                GC.allocated_size / 1024.0
+              end
 
-          # Ruby 1.8 + railsbench patch
-          elsif ObjectSpace.respond_to?(:allocated_objects)
-            def measure
-              ObjectSpace.allocated_objects
+            # Ruby 1.8 + lloyd patch
+            elsif GC.respond_to?(:heap_info)
+              def measure
+                GC.heap_info['heap_current_memory'] / 1024.0
+              end
+
+            # Ruby 1.9 with total_malloc_allocated_size patch
+            elsif GC.respond_to?(:malloc_total_allocated_size)
+              def measure
+                GC.total_malloc_allocated_size / 1024.0
+              end
+
+            # Ruby 1.9 unpatched
+            elsif GC.respond_to?(:malloc_allocated_size)
+              def measure
+                GC.malloc_allocated_size / 1024.0
+              end
+
+            # Ruby 1.9 + GC profiler patch
+            elsif defined?(GC::Profiler)
+              def measure
+                GC.enable
+                GC.start
+                kb = GC::Profiler.data.last[:HEAP_USE_SIZE] / 1024.0
+                GC.disable
+                kb
+              end
             end
 
-          # Ruby 1.9 + GC profiler patch
-          elsif defined?(GC::Profiler)
-            def measure
-              GC.enable
-              GC.start
-              last = GC::Profiler.data.last
-              count = last[:HEAP_LIVE_OBJECTS] + last[:HEAP_FREE_OBJECTS]
-              GC.disable
-              count
+            def format(measurement)
+              '%.2f KB' % measurement
             end
           end
 
-          def format(measurement)
-            measurement.to_i.to_s
-          end
-        end
+          class Objects < Base
+            Mode = RubyProf::ALLOCATIONS if RubyProf.const_defined?(:ALLOCATIONS)
 
-        class GcRuns < Base
-          Mode = RubyProf::GC_RUNS if RubyProf.const_defined?(:GC_RUNS)
+            if RubyProf.respond_to?(:measure_allocations)
+              def measure
+                RubyProf.measure_allocations
+              end
 
-          if RubyProf.respond_to?(:measure_gc_runs)
-            def measure
-              RubyProf.measure_gc_runs
-            end
-          elsif GC.respond_to?(:collections)
-            def measure
-              GC.collections
-            end
-          elsif GC.respond_to?(:heap_info)
-            def measure
-              GC.heap_info['num_gc_passes']
+            # Ruby 1.8 + railsbench patch
+            elsif ObjectSpace.respond_to?(:allocated_objects)
+              def measure
+                ObjectSpace.allocated_objects
+              end
+
+            # Ruby 1.9 + GC profiler patch
+            elsif defined?(GC::Profiler)
+              def measure
+                GC.enable
+                GC.start
+                last = GC::Profiler.data.last
+                count = last[:HEAP_LIVE_OBJECTS] + last[:HEAP_FREE_OBJECTS]
+                GC.disable
+                count
+              end
             end
-          end
 
-          def format(measurement)
-            measurement.to_i.to_s
+            def format(measurement)
+              measurement.to_i.to_s
+            end
           end
-        end
 
-        class GcTime < Base
-          Mode = RubyProf::GC_TIME if RubyProf.const_defined?(:GC_TIME)
+          class GcRuns < Base
+            Mode = RubyProf::GC_RUNS if RubyProf.const_defined?(:GC_RUNS)
 
-          if RubyProf.respond_to?(:measure_gc_time)
-            def measure
-              RubyProf.measure_gc_time
+            if RubyProf.respond_to?(:measure_gc_runs)
+              def measure
+                RubyProf.measure_gc_runs
+              end
+            elsif GC.respond_to?(:collections)
+              def measure
+                GC.collections
+              end
+            elsif GC.respond_to?(:heap_info)
+              def measure
+                GC.heap_info['num_gc_passes']
+              end
             end
-          elsif GC.respond_to?(:time)
-            def measure
-              GC.time
+
+            def format(measurement)
+              measurement.to_i.to_s
             end
           end
 
-          def format(measurement)
-            '%d ms' % (measurement / 1000)
+          class GcTime < Base
+            Mode = RubyProf::GC_TIME if RubyProf.const_defined?(:GC_TIME)
+
+            if RubyProf.respond_to?(:measure_gc_time)
+              def measure
+                RubyProf.measure_gc_time
+              end
+            elsif GC.respond_to?(:time)
+              def measure
+                GC.time
+              end
+            end
+
+            def format(measurement)
+              '%d ms' % (measurement / 1000)
+            end
           end
         end
       end
     end
   end
-end
+rescue LoadError
+end
\ No newline at end of file
-- 
cgit v1.2.3


From 96e0638ce2a287eb5c43266fb4eb3e656e9968cf Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@Yehuda-Katz.local>
Date: Thu, 3 Dec 2009 09:06:01 -0800
Subject: Should fix a few Sam Ruby fails.

---
 activesupport/lib/active_support.rb          | 33 +++++++++++++++++++++++++++-
 activesupport/lib/active_support/autoload.rb | 31 --------------------------
 2 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 activesupport/lib/active_support/autoload.rb

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 0478ae4ebc..9e21b3faf3 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -34,7 +34,38 @@ module ActiveSupport
   end
 end
 
-require 'active_support/autoload'
+require "active_support/dependencies/autoload"
+
+module ActiveSupport
+  extend ActiveSupport::Autoload
+
+  autoload :BacktraceCleaner
+  autoload :Base64
+  autoload :BasicObject
+  autoload :Benchmarkable
+  autoload :BufferedLogger
+  autoload :Cache
+  autoload :Callbacks
+  autoload :Concern
+  autoload :Configurable
+  autoload :DeprecatedCallbacks
+  autoload :Deprecation
+  autoload :Gzip
+  autoload :Inflector
+  autoload :Memoizable
+  autoload :MessageEncryptor
+  autoload :MessageVerifier
+  autoload :Multibyte
+  autoload :OptionMerger
+  autoload :OrderedHash
+  autoload :OrderedOptions
+  autoload :Notifications
+  autoload :Rescuable
+  autoload :SecureRandom
+  autoload :StringInquirer
+  autoload :XmlMini
+end
+
 require 'active_support/vendor'
 
 require 'i18n'
diff --git a/activesupport/lib/active_support/autoload.rb b/activesupport/lib/active_support/autoload.rb
deleted file mode 100644
index e57cf24b25..0000000000
--- a/activesupport/lib/active_support/autoload.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require "active_support/dependencies/autoload"
-
-module ActiveSupport
-  extend ActiveSupport::Autoload
-
-  autoload :BacktraceCleaner
-  autoload :Base64
-  autoload :BasicObject
-  autoload :Benchmarkable
-  autoload :BufferedLogger
-  autoload :Cache
-  autoload :Callbacks
-  autoload :Concern
-  autoload :Configurable
-  autoload :DeprecatedCallbacks
-  autoload :Deprecation
-  autoload :Gzip
-  autoload :Inflector
-  autoload :Memoizable
-  autoload :MessageEncryptor
-  autoload :MessageVerifier
-  autoload :Multibyte
-  autoload :OptionMerger
-  autoload :OrderedHash
-  autoload :OrderedOptions
-  autoload :Notifications
-  autoload :Rescuable
-  autoload :SecureRandom
-  autoload :StringInquirer
-  autoload :XmlMini
-end
-- 
cgit v1.2.3


From 071af66e9ede4057bf1d3e3d248b3949d74bc9c5 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 6 Dec 2009 18:03:18 -0800
Subject: Ruby 1.9.2: explicitly raise NoMethodError for explicit coercion
 attempts. Calling super gives us NameErrors.

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/whiny_nil.rb b/activesupport/lib/active_support/whiny_nil.rb
index c4aaba7ab3..c3ed659d6b 100644
--- a/activesupport/lib/active_support/whiny_nil.rb
+++ b/activesupport/lib/active_support/whiny_nil.rb
@@ -45,7 +45,7 @@ class NilClass
     def method_missing(method, *args, &block)
       # Ruby 1.9.2: disallow explicit coercion via method_missing.
       if method == :to_ary || method == :to_str
-        super
+        raise NoMethodError, "undefined method `#{method}' for nil:NilClass"
       elsif klass = METHOD_CLASS_MAP[method]
         raise_nil_warning_for klass, method, caller
       else
-- 
cgit v1.2.3


From 018dafe574d370165547516ffef43394e11ab4da Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 12 Dec 2009 18:41:26 -0600
Subject: Allow autoloads to opt out of eager loading

---
 .../lib/active_support/dependencies/autoload.rb      | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/dependencies/autoload.rb b/activesupport/lib/active_support/dependencies/autoload.rb
index 973875f895..96ab04c61a 100644
--- a/activesupport/lib/active_support/dependencies/autoload.rb
+++ b/activesupport/lib/active_support/dependencies/autoload.rb
@@ -2,16 +2,18 @@ require "active_support/inflector/methods"
 
 module ActiveSupport
   module Autoload
-
     @@autoloads = {}
     @@under_path = nil
     @@at_path = nil
+    @@autoload_defer = false
 
     def autoload(const_name, path = @@at_path)
       full = [self.name, @@under_path, const_name.to_s, path].compact.join("::")
       location = path || Inflector.underscore(full)
 
-      @@autoloads[const_name] = location
+      unless @@autoload_defer
+        @@autoloads[const_name] = location
+      end
       super const_name, location
     end
 
@@ -29,9 +31,19 @@ module ActiveSupport
       @@at_path = old_path
     end
 
+    def deferrable
+      old_defer, @@autoload_defer = @@autoload_defer, true
+      yield
+    ensure
+      @@autoload_defer = old_defer
+    end
+
     def self.eager_autoload!
-      @@autoloads.values.each {|file| require file }
+      @@autoloads.values.each { |file| require file }
     end
 
+    def autoloads
+      @@autoloads
+    end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From 0f7f90d25bece35194b2d0035de8874e869d299e Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@Yehuda-Katz.local>
Date: Sun, 13 Dec 2009 06:29:50 -0500
Subject: Extract descendents a bit so it can take advantage of Rubinius'
 __subclasses__.

---
 .../lib/active_support/core_ext/class/removal.rb   |  6 +-
 .../active_support/core_ext/object/extending.rb    | 73 ++++++++++++----------
 2 files changed, 45 insertions(+), 34 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/class/removal.rb b/activesupport/lib/active_support/core_ext/class/removal.rb
index 2dea3c24d5..652be4ed78 100644
--- a/activesupport/lib/active_support/core_ext/class/removal.rb
+++ b/activesupport/lib/active_support/core_ext/class/removal.rb
@@ -2,7 +2,11 @@ require 'active_support/core_ext/object/extending'
 require 'active_support/core_ext/module/introspection'
 
 class Class #:nodoc:
-  
+
+  def reachable?
+    eval("defined?(::#{self}) && ::#{self}.equal?(self)")
+  end
+
   # Unassociates the class with its subclasses and removes the subclasses
   # themselves.
   #
diff --git a/activesupport/lib/active_support/core_ext/object/extending.rb b/activesupport/lib/active_support/core_ext/object/extending.rb
index 0cc74c8298..de8121f274 100644
--- a/activesupport/lib/active_support/core_ext/object/extending.rb
+++ b/activesupport/lib/active_support/core_ext/object/extending.rb
@@ -1,46 +1,53 @@
-class Object
-  def remove_subclasses_of(*superclasses) #:nodoc:
-    Class.remove_class(*subclasses_of(*superclasses))
-  end
-
-  begin
-    ObjectSpace.each_object(Class.new) {}
-
-    # Exclude this class unless it's a subclass of our supers and is defined.
-    # We check defined? in case we find a removed class that has yet to be
-    # garbage collected. This also fails for anonymous classes -- please
-    # submit a patch if you have a workaround.
-    def subclasses_of(*superclasses) #:nodoc:
+class Class
+  # Rubinius
+  if defined?(Class.__subclasses__)
+    def descendents
       subclasses = []
-
-      superclasses.each do |sup|
-        ObjectSpace.each_object(class << sup; self; end) do |k|
-          if k != sup && (k.name.blank? || eval("defined?(::#{k}) && ::#{k}.object_id == k.object_id"))
-            subclasses << k
-          end
-        end
-      end
-
+      __subclasses__.each {|k| subclasses << k; subclasses.concat k.descendents }
       subclasses
     end
-  rescue RuntimeError
-    # JRuby and any implementations which cannot handle the objectspace traversal
-    # above fall back to this implementation
-    def subclasses_of(*superclasses) #:nodoc:
-      subclasses = []
+  else
+    # MRI
+    begin
+      ObjectSpace.each_object(Class.new) {}
 
-      superclasses.each do |sup|
+      def descendents
+        subclasses = []
+        ObjectSpace.each_object(class << self; self; end) do |k|
+          subclasses << k unless k == self
+        end
+        subclasses
+      end
+    # JRuby
+    rescue StandardError
+      def descendents
+        subclasses = []
         ObjectSpace.each_object(Class) do |k|
-          if superclasses.any? { |superclass| k < superclass } &&
-            (k.name.blank? || eval("defined?(::#{k}) && ::#{k}.object_id == k.object_id"))
-            subclasses << k
-          end
+          subclasses << k if k < self
         end
         subclasses.uniq!
+        subclasses
       end
-      subclasses
     end
   end
+end
+
+class Object
+  def remove_subclasses_of(*superclasses) #:nodoc:
+    Class.remove_class(*subclasses_of(*superclasses))
+  end
+
+  # Exclude this class unless it's a subclass of our supers and is defined.
+  # We check defined? in case we find a removed class that has yet to be
+  # garbage collected. This also fails for anonymous classes -- please
+  # submit a patch if you have a workaround.
+  def subclasses_of(*superclasses) #:nodoc:
+    subclasses = []
+    superclasses.each do |klass|
+      subclasses.concat klass.descendents.select {|k| k.name.blank? || k.reachable?}
+    end
+    subclasses
+  end
 
   def extended_by #:nodoc:
     ancestors = class << self; ancestors end
-- 
cgit v1.2.3


From 7b61541ea53c309847753d5553baa2eed9cc6282 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 14 Dec 2009 18:00:14 -0800
Subject: Add Enumerable#exclude? to bring parity to Enumerable#include? and
 avoid if !x.include?/else calls [DHH]

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/enumerable.rb b/activesupport/lib/active_support/core_ext/enumerable.rb
index b11c916f61..d0821a7c68 100644
--- a/activesupport/lib/active_support/core_ext/enumerable.rb
+++ b/activesupport/lib/active_support/core_ext/enumerable.rb
@@ -101,6 +101,11 @@ module Enumerable
     size = block_given? ? select(&block).size : self.size
     size > 1
   end
+  
+  # The negative of the Enumerable#include?. Returns true if the collection does not include the object.
+  def exclude?(object)
+    !include?(object)
+  end
 end
 
 class Range #:nodoc:
-- 
cgit v1.2.3


From 2ae8300489aaaaaa65f50f3557090b265a2dcc6a Mon Sep 17 00:00:00 2001
From: Serguei Filimonov <serguei.filimonov@gmail.com>
Date: Fri, 11 Dec 2009 13:08:00 -0800
Subject: Added #to_i to DateTime in ActiveSupport so #to_yaml works correctly
 on ActiveRecord models with DateTime attributes.

---
 .../lib/active_support/core_ext/date_time/conversions.rb  | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib')

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 5f01bc4fd6..47a31839a6 100644
--- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -78,7 +78,18 @@ class DateTime
   
   # Converts self to a floating-point number of seconds since the Unix epoch 
   def to_f
-    days_since_unix_epoch = self - ::DateTime.civil(1970)
-    (days_since_unix_epoch * 86_400).to_f
+    seconds_since_unix_epoch.to_f
+  end
+
+  # Converts self to an integer number of seconds since the Unix epoch
+  def to_i
+    seconds_since_unix_epoch.to_i
+  end
+
+  private
+
+  def seconds_since_unix_epoch
+    seconds_per_day = 86_400
+    (self - ::DateTime.civil(1970)) * seconds_per_day
   end
 end
-- 
cgit v1.2.3


From e48b4c2dd01877ace901e1c186d04605b53b40d0 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@Yehuda-Katz.local>
Date: Sun, 20 Dec 2009 14:07:19 -0800
Subject: :to => redirect() can take a String using 1.9-style interpolation or
 proc that takes the path parameters as a Hash

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/ruby/shim.rb b/activesupport/lib/active_support/ruby/shim.rb
index f811239077..1e49ccdade 100644
--- a/activesupport/lib/active_support/ruby/shim.rb
+++ b/activesupport/lib/active_support/ruby/shim.rb
@@ -14,5 +14,6 @@ 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/rexml'
 require 'active_support/core_ext/time/conversions'
-- 
cgit v1.2.3


From 33a6bd390affdeb0b403f513be92a5b1547f6e4e Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@Yehuda-Katz.local>
Date: Sun, 20 Dec 2009 17:03:38 -0800
Subject: Fixes Dependency bug in ActiveSupport

---
 activesupport/lib/active_support/core_ext/date/calculations.rb | 1 +
 activesupport/lib/active_support/core_ext/date/conversions.rb  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index 3dd61334d0..2b76b93153 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -1,3 +1,4 @@
+require 'date'
 require 'active_support/duration'
 require 'active_support/core_ext/time/zones'
 
diff --git a/activesupport/lib/active_support/core_ext/date/conversions.rb b/activesupport/lib/active_support/core_ext/date/conversions.rb
index f6c870035b..90ab1eb281 100644
--- a/activesupport/lib/active_support/core_ext/date/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date/conversions.rb
@@ -1,3 +1,4 @@
+require 'date'
 require 'active_support/inflector'
 
 class Date
-- 
cgit v1.2.3


From b4ecb5555100cc67011637d261e5de30f5b7fcba Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@yehuda-katz.home>
Date: Sun, 20 Dec 2009 17:33:31 -0800
Subject: Missing acts_like dependency

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 4f4492f0fd..703b89ffd0 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -1,4 +1,5 @@
 require 'active_support/duration'
+require 'active_support/core_ext/date/acts_like'
 require 'active_support/core_ext/date/calculations'
 
 class Time
-- 
cgit v1.2.3


From ace20bd25e3818b7f29c222643dd445c48b36425 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 22 Dec 2009 17:27:37 -0600
Subject: Flip deferrable autoload convention

---
 activesupport/lib/active_support.rb                | 53 ++++++++++++----------
 .../lib/active_support/dependencies/autoload.rb    | 10 ++--
 2 files changed, 33 insertions(+), 30 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 9e21b3faf3..f2baa5a56a 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -39,31 +39,34 @@ require "active_support/dependencies/autoload"
 module ActiveSupport
   extend ActiveSupport::Autoload
 
-  autoload :BacktraceCleaner
-  autoload :Base64
-  autoload :BasicObject
-  autoload :Benchmarkable
-  autoload :BufferedLogger
-  autoload :Cache
-  autoload :Callbacks
-  autoload :Concern
-  autoload :Configurable
-  autoload :DeprecatedCallbacks
-  autoload :Deprecation
-  autoload :Gzip
-  autoload :Inflector
-  autoload :Memoizable
-  autoload :MessageEncryptor
-  autoload :MessageVerifier
-  autoload :Multibyte
-  autoload :OptionMerger
-  autoload :OrderedHash
-  autoload :OrderedOptions
-  autoload :Notifications
-  autoload :Rescuable
-  autoload :SecureRandom
-  autoload :StringInquirer
-  autoload :XmlMini
+  # TODO: Narrow this list down
+  eager_autoload do
+    autoload :BacktraceCleaner
+    autoload :Base64
+    autoload :BasicObject
+    autoload :Benchmarkable
+    autoload :BufferedLogger
+    autoload :Cache
+    autoload :Callbacks
+    autoload :Concern
+    autoload :Configurable
+    autoload :DeprecatedCallbacks
+    autoload :Deprecation
+    autoload :Gzip
+    autoload :Inflector
+    autoload :Memoizable
+    autoload :MessageEncryptor
+    autoload :MessageVerifier
+    autoload :Multibyte
+    autoload :OptionMerger
+    autoload :OrderedHash
+    autoload :OrderedOptions
+    autoload :Notifications
+    autoload :Rescuable
+    autoload :SecureRandom
+    autoload :StringInquirer
+    autoload :XmlMini
+  end
 end
 
 require 'active_support/vendor'
diff --git a/activesupport/lib/active_support/dependencies/autoload.rb b/activesupport/lib/active_support/dependencies/autoload.rb
index 96ab04c61a..44edb89ad5 100644
--- a/activesupport/lib/active_support/dependencies/autoload.rb
+++ b/activesupport/lib/active_support/dependencies/autoload.rb
@@ -5,13 +5,13 @@ module ActiveSupport
     @@autoloads = {}
     @@under_path = nil
     @@at_path = nil
-    @@autoload_defer = false
+    @@eager_autoload = false
 
     def autoload(const_name, path = @@at_path)
       full = [self.name, @@under_path, const_name.to_s, path].compact.join("::")
       location = path || Inflector.underscore(full)
 
-      unless @@autoload_defer
+      if @@eager_autoload
         @@autoloads[const_name] = location
       end
       super const_name, location
@@ -31,11 +31,11 @@ module ActiveSupport
       @@at_path = old_path
     end
 
-    def deferrable
-      old_defer, @@autoload_defer = @@autoload_defer, true
+    def eager_autoload
+      old_eager, @@eager_autoload = @@eager_autoload, true
       yield
     ensure
-      @@autoload_defer = old_defer
+      @@eager_autoload = old_eager
     end
 
     def self.eager_autoload!
-- 
cgit v1.2.3


From 808cad2bb4f1534a66e20fb5bfedd09e3678e278 Mon Sep 17 00:00:00 2001
From: Dwayne Litzenberger <dlitz@infonium.ca>
Date: Tue, 22 Dec 2009 15:17:55 -0500
Subject: Fix ActiveSupport::JSON encoding of control characters [\x00-\x1f]

According to RFC 4627, only the following Unicode code points are
allowed unescaped in JSON:

  unescaped = %x20-21 / %x23-5B / %x5D-10FFFF

However, ActiveSupport::JSON did not escape the range %x00-1f.  This caused
parse errors when trying to decode the resulting output.

[#3345 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activesupport/lib/active_support/json/encoding.rb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index 3c15056c41..c8415d5449 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -65,6 +65,15 @@ module ActiveSupport
 
 
       ESCAPED_CHARS = {
+        "\x00" => '\u0000', "\x01" => '\u0001', "\x02" => '\u0002',
+        "\x03" => '\u0003', "\x04" => '\u0004', "\x05" => '\u0005',
+        "\x06" => '\u0006', "\x07" => '\u0007', "\x0B" => '\u000B',
+        "\x0E" => '\u000E', "\x0F" => '\u000F', "\x10" => '\u0010',
+        "\x11" => '\u0011', "\x12" => '\u0012', "\x13" => '\u0013',
+        "\x14" => '\u0014', "\x15" => '\u0015', "\x16" => '\u0016',
+        "\x17" => '\u0017', "\x18" => '\u0018', "\x19" => '\u0019',
+        "\x1A" => '\u001A', "\x1B" => '\u001B', "\x1C" => '\u001C',
+        "\x1D" => '\u001D', "\x1E" => '\u001E', "\x1F" => '\u001F',
         "\010" =>  '\b',
         "\f"   =>  '\f',
         "\n"   =>  '\n',
@@ -86,9 +95,9 @@ module ActiveSupport
         def escape_html_entities_in_json=(value)
           self.escape_regex = \
             if @escape_html_entities_in_json = value
-              /[\010\f\n\r\t"\\><&]/
+              /[\x00-\x1F"\\><&]/
             else
-              /[\010\f\n\r\t"\\]/
+              /[\x00-\x1F"\\]/
             end
         end
 
-- 
cgit v1.2.3


From f3b072189a6a77717f99e38403392a68f5818a49 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@Yehuda-Katz.local>
Date: Thu, 24 Dec 2009 21:49:50 -0800
Subject: Instead of marking raw text in templates as safe, and then putting
 them through String#<< which checks if the String is safe, use safe_concat,
 which uses the original (internal) String#<< and leaves the safe flag as is.
 Results in a significant performance improvement.

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

(limited to 'activesupport/lib')

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 a2a88eb7df..9db563f78b 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -23,6 +23,7 @@ class String
   end
 
   alias original_concat <<
+  alias safe_concat <<
   def <<(other)
     result = original_concat(other)
     unless html_safe? && also_html_safe?(other)
-- 
cgit v1.2.3


From 3b1642c23cb433dde3d96f0b70dfdc66d15f6713 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@Yehuda-Katz.local>
Date: Thu, 24 Dec 2009 22:44:21 -0800
Subject: Simplify and improve the performance of output_safety

---
 .../core_ext/string/output_safety.rb               | 28 +++++-----------------
 1 file changed, 6 insertions(+), 22 deletions(-)

(limited to 'activesupport/lib')

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 9db563f78b..3e6ab0ebd2 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -1,7 +1,6 @@
 class String
-  def html_safe?
-    defined?(@_rails_html_safe) && @_rails_html_safe
-  end
+  attr_accessor :_rails_html_safe
+  alias html_safe? _rails_html_safe
 
   def html_safe!
     @_rails_html_safe = true
@@ -15,31 +14,16 @@ class String
   alias original_plus +
   def +(other)
     result = original_plus(other)
-    if html_safe? && also_html_safe?(other)
-      result.html_safe!
-    else
-      result
-    end
+    result._rails_html_safe = html_safe? && other.html_safe?
+    result
   end
 
   alias original_concat <<
   alias safe_concat <<
   def <<(other)
+    @_rails_html_safe = false unless other.html_safe?
     result = original_concat(other)
-    unless html_safe? && also_html_safe?(other)
-      @_rails_html_safe = false
-    end
-    result
   end
 
-  remove_method :concat
-  def concat(other)
-    self << other
-  end
-
-  private
-    def also_html_safe?(other)
-      other.respond_to?(:html_safe?) && other.html_safe?
-    end
-
+  alias concat <<
 end
\ No newline at end of file
-- 
cgit v1.2.3


From 1c66f85eb6cd80053cf60889634a8c39c21b11a1 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@Yehuda-Katz.local>
Date: Thu, 24 Dec 2009 23:48:35 -0800
Subject: This code was needed to work around
 http://redmine.ruby-lang.org/issues/show/2494. Since that bug is now closed
 in Ruby, we can remove it.

---
 activesupport/lib/active_support/whiny_nil.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/whiny_nil.rb b/activesupport/lib/active_support/whiny_nil.rb
index c3ed659d6b..4f6ff7d3b5 100644
--- a/activesupport/lib/active_support/whiny_nil.rb
+++ b/activesupport/lib/active_support/whiny_nil.rb
@@ -43,10 +43,7 @@ class NilClass
 
   private
     def method_missing(method, *args, &block)
-      # Ruby 1.9.2: disallow explicit coercion via method_missing.
-      if method == :to_ary || method == :to_str
-        raise NoMethodError, "undefined method `#{method}' for nil:NilClass"
-      elsif klass = METHOD_CLASS_MAP[method]
+      if klass = METHOD_CLASS_MAP[method]
         raise_nil_warning_for klass, method, caller
       else
         super
-- 
cgit v1.2.3


From 135d32c8bd91608c12a394ca5dbd65f358bbce42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 25 Dec 2009 15:15:13 +0100
Subject: Move i18n to Gemfile.

---
 activesupport/lib/active_support/vendor.rb         |   2 +-
 .../active_support/vendor/i18n-0.1.3/MIT-LICENSE   |  20 -
 .../vendor/i18n-0.1.3/README.textile               |  20 -
 .../lib/active_support/vendor/i18n-0.1.3/Rakefile  |   5 -
 .../active_support/vendor/i18n-0.1.3/i18n.gemspec  |  27 -
 .../active_support/vendor/i18n-0.1.3/lib/i18n.rb   | 204 --------
 .../vendor/i18n-0.1.3/lib/i18n/backend/simple.rb   | 215 --------
 .../vendor/i18n-0.1.3/lib/i18n/exceptions.rb       |  53 --
 .../active_support/vendor/i18n-0.1.3/test/all.rb   |   5 -
 .../vendor/i18n-0.1.3/test/i18n_exceptions_test.rb |  99 ----
 .../vendor/i18n-0.1.3/test/i18n_test.rb            | 124 -----
 .../vendor/i18n-0.1.3/test/locale/en.rb            |   1 -
 .../vendor/i18n-0.1.3/test/locale/en.yml           |   3 -
 .../vendor/i18n-0.1.3/test/simple_backend_test.rb  | 567 ---------------------
 14 files changed, 1 insertion(+), 1344 deletions(-)
 delete mode 100755 activesupport/lib/active_support/vendor/i18n-0.1.3/MIT-LICENSE
 delete mode 100644 activesupport/lib/active_support/vendor/i18n-0.1.3/README.textile
 delete mode 100644 activesupport/lib/active_support/vendor/i18n-0.1.3/Rakefile
 delete mode 100644 activesupport/lib/active_support/vendor/i18n-0.1.3/i18n.gemspec
 delete mode 100755 activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n.rb
 delete mode 100644 activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend/simple.rb
 delete mode 100644 activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/exceptions.rb
 delete mode 100644 activesupport/lib/active_support/vendor/i18n-0.1.3/test/all.rb
 delete mode 100644 activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb
 delete mode 100644 activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb
 delete mode 100644 activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.rb
 delete mode 100644 activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.yml
 delete mode 100644 activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb
index eb5080888c..1e46491d83 100644
--- a/activesupport/lib/active_support/vendor.rb
+++ b/activesupport/lib/active_support/vendor.rb
@@ -4,7 +4,7 @@ def ActiveSupport.requirable?(file)
   $LOAD_PATH.any? { |p| Dir.glob("#{p}/#{file}.*").any? }
 end
 
-[%w(builder 2.1.2), %w(i18n 0.1.3), %w(memcache-client 1.7.5), %w(tzinfo 0.3.15)].each do |lib, version|
+[%w(builder 2.1.2), %w(memcache-client 1.7.5), %w(tzinfo 0.3.15)].each do |lib, version|
   # If the lib is not already requirable
   unless ActiveSupport.requirable? lib
     # Try to activate a gem ~> satisfying the requested version first.
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/MIT-LICENSE b/activesupport/lib/active_support/vendor/i18n-0.1.3/MIT-LICENSE
deleted file mode 100755
index ed8e9ee66d..0000000000
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/MIT-LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2008 The Ruby I18n team
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/README.textile b/activesupport/lib/active_support/vendor/i18n-0.1.3/README.textile
deleted file mode 100644
index a07fc8426d..0000000000
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/README.textile
+++ /dev/null
@@ -1,20 +0,0 @@
-h1. Ruby I18n gem
-
-I18n and localization solution for Ruby.
-
-For information please refer to http://rails-i18n.org
-
-h2. Authors
-
-* "Matt Aimonetti":http://railsontherun.com
-* "Sven Fuchs":http://www.artweb-design.de
-* "Joshua Harvey":http://www.workingwithrails.com/person/759-joshua-harvey
-* "Saimon Moore":http://saimonmoore.net
-* "Stephan Soller":http://www.arkanis-development.de
-
-h2. License
-
-MIT License. See the included MIT-LICENCE file.
-
-
-
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/Rakefile b/activesupport/lib/active_support/vendor/i18n-0.1.3/Rakefile
deleted file mode 100644
index 2164e13e69..0000000000
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/Rakefile
+++ /dev/null
@@ -1,5 +0,0 @@
-task :default => [:test]
-
-task :test do
-  ruby "test/all.rb"
-end
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/i18n.gemspec b/activesupport/lib/active_support/vendor/i18n-0.1.3/i18n.gemspec
deleted file mode 100644
index f102689a6f..0000000000
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/i18n.gemspec
+++ /dev/null
@@ -1,27 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = "i18n"
-  s.version = "0.1.3"
-  s.date = "2009-01-09"
-  s.summary = "Internationalization support for Ruby"
-  s.email = "rails-i18n@googlegroups.com"
-  s.homepage = "http://rails-i18n.org"
-  s.description = "Add Internationalization support to your Ruby application."
-  s.has_rdoc = false
-  s.authors = ['Sven Fuchs', 'Joshua Harvey', 'Matt Aimonetti', 'Stephan Soller', 'Saimon Moore']
-  s.files = [
-    'i18n.gemspec',
-    'lib/i18n/backend/simple.rb',
-    'lib/i18n/exceptions.rb',
-    'lib/i18n.rb',
-    'MIT-LICENSE',
-    'README.textile'
-  ]
-  s.test_files = [
-    'test/all.rb',
-    'test/i18n_exceptions_test.rb',
-    'test/i18n_test.rb',
-    'test/locale/en.rb',
-    'test/locale/en.yml',
-    'test/simple_backend_test.rb'
-  ]
-end
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n.rb b/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n.rb
deleted file mode 100755
index 1b49debc05..0000000000
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n.rb
+++ /dev/null
@@ -1,204 +0,0 @@
-#--
-# Authors::   Matt Aimonetti (http://railsontherun.com/),
-#             Sven Fuchs (http://www.artweb-design.de),
-#             Joshua Harvey (http://www.workingwithrails.com/person/759-joshua-harvey),
-#             Saimon Moore (http://saimonmoore.net),
-#             Stephan Soller (http://www.arkanis-development.de/)
-# Copyright:: Copyright (c) 2008 The Ruby i18n Team
-# License::   MIT
-#++
-
-module I18n
-  autoload :ArgumentError, 'i18n/exceptions'
-  module Backend
-    autoload :Simple, 'i18n/backend/simple'
-  end
-
-  @@backend = nil
-  @@load_path = nil
-  @@default_locale = :'en'
-  @@exception_handler = :default_exception_handler
-
-  class << self
-    # Returns the current backend. Defaults to +Backend::Simple+.
-    def backend
-      @@backend ||= Backend::Simple.new
-    end
-
-    # Sets the current backend. Used to set a custom backend.
-    def backend=(backend)
-      @@backend = backend
-    end
-
-    # Returns the current default locale. Defaults to :'en'
-    def default_locale
-      @@default_locale
-    end
-
-    # Sets the current default locale. Used to set a custom default locale.
-    def default_locale=(locale)
-      @@default_locale = locale
-    end
-
-    # Returns the current locale. Defaults to I18n.default_locale.
-    def locale
-      Thread.current[:locale] ||= default_locale
-    end
-
-    # Sets the current locale pseudo-globally, i.e. in the Thread.current hash.
-    def locale=(locale)
-      Thread.current[:locale] = locale
-    end
-
-    # Returns an array of locales for which translations are available
-    def available_locales
-      backend.available_locales
-    end
-
-    # Sets the exception handler.
-    def exception_handler=(exception_handler)
-      @@exception_handler = exception_handler
-    end
-
-    # Allow clients to register paths providing translation data sources. The
-    # backend defines acceptable sources.
-    #
-    # E.g. the provided SimpleBackend accepts a list of paths to translation
-    # files which are either named *.rb and contain plain Ruby Hashes or are
-    # named *.yml and contain YAML data. So for the SimpleBackend clients may
-    # register translation files like this:
-    #   I18n.load_path << 'path/to/locale/en.yml'
-    def load_path
-      @@load_path ||= []
-    end
-
-    # Sets the load path instance. Custom implementations are expected to
-    # behave like a Ruby Array.
-    def load_path=(load_path)
-      @@load_path = load_path
-    end
-
-    # Tells the backend to reload translations. Used in situations like the
-    # Rails development environment. Backends can implement whatever strategy
-    # is useful.
-    def reload!
-      backend.reload!
-    end
-
-    # Translates, pluralizes and interpolates a given key using a given locale,
-    # scope, and default, as well as interpolation values.
-    #
-    # *LOOKUP*
-    #
-    # Translation data is organized as a nested hash using the upper-level keys
-    # as namespaces. <em>E.g.</em>, ActionView ships with the translation:
-    # <tt>:date => {:formats => {:short => "%b %d"}}</tt>.
-    #
-    # Translations can be looked up at any level of this hash using the key argument
-    # and the scope option. <em>E.g.</em>, in this example <tt>I18n.t :date</tt>
-    # returns the whole translations hash <tt>{:formats => {:short => "%b %d"}}</tt>.
-    #
-    # Key can be either a single key or a dot-separated key (both Strings and Symbols
-    # work). <em>E.g.</em>, the short format can be looked up using both:
-    #   I18n.t 'date.formats.short'
-    #   I18n.t :'date.formats.short'
-    #
-    # Scope can be either a single key, a dot-separated key or an array of keys
-    # or dot-separated keys. Keys and scopes can be combined freely. So these
-    # examples will all look up the same short date format:
-    #   I18n.t 'date.formats.short'
-    #   I18n.t 'formats.short', :scope => 'date'
-    #   I18n.t 'short', :scope => 'date.formats'
-    #   I18n.t 'short', :scope => %w(date formats)
-    #
-    # *INTERPOLATION*
-    #
-    # Translations can contain interpolation variables which will be replaced by
-    # values passed to #translate as part of the options hash, with the keys matching
-    # the interpolation variable names.
-    #
-    # <em>E.g.</em>, with a translation <tt>:foo => "foo {{bar}}"</tt> the option
-    # value for the key +bar+ will be interpolated into the translation:
-    #   I18n.t :foo, :bar => 'baz' # => 'foo baz'
-    #
-    # *PLURALIZATION*
-    #
-    # Translation data can contain pluralized translations. Pluralized translations
-    # are arrays of singluar/plural versions of translations like <tt>['Foo', 'Foos']</tt>.
-    #
-    # Note that <tt>I18n::Backend::Simple</tt> only supports an algorithm for English
-    # pluralization rules. Other algorithms can be supported by custom backends.
-    #
-    # This returns the singular version of a pluralized translation:
-    #   I18n.t :foo, :count => 1 # => 'Foo'
-    #
-    # These both return the plural version of a pluralized translation:
-    #   I18n.t :foo, :count => 0 # => 'Foos'
-    #   I18n.t :foo, :count => 2 # => 'Foos'
-    #
-    # The <tt>:count</tt> option can be used both for pluralization and interpolation.
-    # <em>E.g.</em>, with the translation
-    # <tt>:foo => ['{{count}} foo', '{{count}} foos']</tt>, count will
-    # be interpolated to the pluralized translation:
-    #   I18n.t :foo, :count => 1 # => '1 foo'
-    #
-    # *DEFAULTS*
-    #
-    # This returns the translation for <tt>:foo</tt> or <tt>default</tt> if no translation was found:
-    #   I18n.t :foo, :default => 'default'
-    #
-    # This returns the translation for <tt>:foo</tt> or the translation for <tt>:bar</tt> if no
-    # translation for <tt>:foo</tt> was found:
-    #   I18n.t :foo, :default => :bar
-    #
-    # Returns the translation for <tt>:foo</tt> or the translation for <tt>:bar</tt>
-    # or <tt>default</tt> if no translations for <tt>:foo</tt> and <tt>:bar</tt> were found.
-    #   I18n.t :foo, :default => [:bar, 'default']
-    #
-    # <b>BULK LOOKUP</b>
-    #
-    # This returns an array with the translations for <tt>:foo</tt> and <tt>:bar</tt>.
-    #   I18n.t [:foo, :bar]
-    #
-    # Can be used with dot-separated nested keys:
-    #   I18n.t [:'baz.foo', :'baz.bar']
-    #
-    # Which is the same as using a scope option:
-    #   I18n.t [:foo, :bar], :scope => :baz
-    def translate(key, options = {})
-      locale = options.delete(:locale) || I18n.locale
-      backend.translate(locale, key, options)
-    rescue I18n::ArgumentError => e
-      raise e if options[:raise]
-      send(@@exception_handler, e, locale, key, options)
-    end
-    alias :t :translate
-
-    # Localizes certain objects, such as dates and numbers to local formatting.
-    def localize(object, options = {})
-      locale = options[:locale] || I18n.locale
-      format = options[:format] || :default
-      backend.localize(locale, object, format)
-    end
-    alias :l :localize
-
-  protected
-    # Handles exceptions raised in the backend. All exceptions except for
-    # MissingTranslationData exceptions are re-raised. When a MissingTranslationData
-    # was caught and the option :raise is not set the handler returns an error
-    # message string containing the key/scope.
-    def default_exception_handler(exception, locale, key, options)
-      return exception.message if MissingTranslationData === exception
-      raise exception
-    end
-
-    # Merges the given locale, key and scope into a single array of keys.
-    # Splits keys that contain dots into multiple keys. Makes sure all
-    # keys are Symbols.
-    def normalize_translation_keys(locale, key, scope)
-      keys = [locale] + Array(scope) + [key]
-      keys = keys.map { |k| k.to_s.split(/\./) }
-      keys.flatten.map { |k| k.to_sym }
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend/simple.rb b/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend/simple.rb
deleted file mode 100644
index c32cc76f34..0000000000
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend/simple.rb
+++ /dev/null
@@ -1,215 +0,0 @@
-require 'i18n/exceptions'
-
-module I18n
-  module Backend
-    class Simple
-      INTERPOLATION_RESERVED_KEYS = %w(scope default)
-      MATCH = /(\\\\)?\{\{([^\}]+)\}\}/
-
-      # Accepts a list of paths to translation files. Loads translations from
-      # plain Ruby (*.rb) or YAML files (*.yml). See #load_rb and #load_yml
-      # for details.
-      def load_translations(*filenames)
-        filenames.each { |filename| load_file(filename) }
-      end
-
-      # Stores translations for the given locale in memory.
-      # This uses a deep merge for the translations hash, so existing
-      # translations will be overwritten by new ones only at the deepest
-      # level of the hash.
-      def store_translations(locale, data)
-        merge_translations(locale, data)
-      end
-
-      def translate(locale, key, options = {})
-        raise InvalidLocale.new(locale) if locale.nil?
-        return key.map { |k| translate(locale, k, options) } if key.is_a? Array
-
-        reserved = :scope, :default
-        count, scope, default = options.values_at(:count, *reserved)
-        options.delete(:default)
-        values = options.reject { |name, value| reserved.include?(name) }
-
-        entry = lookup(locale, key, scope)
-        if entry.nil?
-          entry = default(locale, default, options)
-          if entry.nil?
-            raise(I18n::MissingTranslationData.new(locale, key, options))
-          end
-        end
-        entry = pluralize(locale, entry, count)
-        entry = interpolate(locale, entry, values)
-        entry
-      end
-
-      # Acts the same as +strftime+, but returns a localized version of the
-      # formatted date string. Takes a key from the date/time formats
-      # translations as a format argument (<em>e.g.</em>, <tt>:short</tt> in <tt>:'date.formats'</tt>).
-      def localize(locale, object, format = :default)
-        raise ArgumentError, "Object must be a Date, DateTime or Time object. #{object.inspect} given." unless object.respond_to?(:strftime)
-
-        type = object.respond_to?(:sec) ? 'time' : 'date'
-        # TODO only translate these if format is a String?
-        formats = translate(locale, :"#{type}.formats")
-        format = formats[format.to_sym] if formats && formats[format.to_sym]
-        # TODO raise exception unless format found?
-        format = format.to_s.dup
-
-        # TODO only translate these if the format string is actually present
-        # TODO check which format strings are present, then bulk translate then, then replace them
-        format.gsub!(/%a/, translate(locale, :"date.abbr_day_names")[object.wday])
-        format.gsub!(/%A/, translate(locale, :"date.day_names")[object.wday])
-        format.gsub!(/%b/, translate(locale, :"date.abbr_month_names")[object.mon])
-        format.gsub!(/%B/, translate(locale, :"date.month_names")[object.mon])
-        format.gsub!(/%p/, translate(locale, :"time.#{object.hour < 12 ? :am : :pm}")) if object.respond_to? :hour
-        object.strftime(format)
-      end
-
-      def initialized?
-        @initialized ||= false
-      end
-
-      # Returns an array of locales for which translations are available
-      def available_locales
-        init_translations unless initialized?
-        translations.keys
-      end
-
-      def reload!
-        @initialized = false
-        @translations = nil
-      end
-
-      protected
-        def init_translations
-          load_translations(*I18n.load_path.flatten)
-          @initialized = true
-        end
-
-        def translations
-          @translations ||= {}
-        end
-
-        # Looks up a translation from the translations hash. Returns nil if
-        # eiher key is nil, or locale, scope or key do not exist as a key in the
-        # nested translations hash. Splits keys or scopes containing dots
-        # into multiple keys, i.e. <tt>currency.format</tt> is regarded the same as
-        # <tt>%w(currency format)</tt>.
-        def lookup(locale, key, scope = [])
-          return unless key
-          init_translations unless initialized?
-          keys = I18n.send(:normalize_translation_keys, locale, key, scope)
-          keys.inject(translations) do |result, k|
-            if (x = result[k.to_sym]).nil?
-              return nil
-            else
-              x
-            end
-          end
-        end
-
-        # Evaluates a default translation.
-        # If the given default is a String it is used literally. If it is a Symbol
-        # it will be translated with the given options. If it is an Array the first
-        # translation yielded will be returned.
-        #
-        # <em>I.e.</em>, <tt>default(locale, [:foo, 'default'])</tt> will return +default+ if
-        # <tt>translate(locale, :foo)</tt> does not yield a result.
-        def default(locale, default, options = {})
-          case default
-            when String then default
-            when Symbol then translate locale, default, options
-            when Array  then default.each do |obj|
-              result = default(locale, obj, options.dup) and return result
-            end and nil
-          end
-        rescue MissingTranslationData
-          nil
-        end
-
-        # Picks a translation from an array according to English pluralization
-        # rules. It will pick the first translation if count is not equal to 1
-        # and the second translation if it is equal to 1. Other backends can
-        # implement more flexible or complex pluralization rules.
-        def pluralize(locale, entry, count)
-          return entry unless entry.is_a?(Hash) and count
-          # raise InvalidPluralizationData.new(entry, count) unless entry.is_a?(Hash)
-          key = :zero if count == 0 && entry.has_key?(:zero)
-          key ||= count == 1 ? :one : :other
-          raise InvalidPluralizationData.new(entry, count) unless entry.has_key?(key)
-          entry[key]
-        end
-
-        # Interpolates values into a given string.
-        #
-        #   interpolate "file {{file}} opened by \\{{user}}", :file => 'test.txt', :user => 'Mr. X'
-        #   # => "file test.txt opened by {{user}}"
-        #
-        # Note that you have to double escape the <tt>\\</tt> when you want to escape
-        # the <tt>{{...}}</tt> key in a string (once for the string and once for the
-        # interpolation).
-        def interpolate(locale, string, values = {})
-          return string unless string.is_a?(String)
-
-          string.gsub(MATCH) do
-            escaped, pattern, key = $1, $2, $2.to_sym
-
-            if escaped
-              pattern
-            elsif INTERPOLATION_RESERVED_KEYS.include?(pattern)
-              raise ReservedInterpolationKey.new(pattern, string)
-            elsif !values.include?(key)
-              raise MissingInterpolationArgument.new(pattern, string)
-            else
-              values[key].to_s
-            end
-          end
-        end
-
-        # Loads a single translations file by delegating to #load_rb or
-        # #load_yml depending on the file extension and directly merges the
-        # data to the existing translations. Raises I18n::UnknownFileType
-        # for all other file extensions.
-        def load_file(filename)
-          type = File.extname(filename).tr('.', '').downcase
-          raise UnknownFileType.new(type, filename) unless respond_to?(:"load_#{type}")
-          data = send :"load_#{type}", filename # TODO raise a meaningful exception if this does not yield a Hash
-          data.each { |locale, d| merge_translations(locale, d) }
-        end
-
-        # Loads a plain Ruby translations file. eval'ing the file must yield
-        # a Hash containing translation data with locales as toplevel keys.
-        def load_rb(filename)
-          eval(IO.read(filename), binding, filename)
-        end
-
-        # Loads a YAML translations file. The data must have locales as
-        # toplevel keys.
-        def load_yml(filename)
-          require 'yaml' unless defined? :YAML
-          YAML::load(IO.read(filename))
-        end
-
-        # Deep merges the given translations hash with the existing translations
-        # for the given locale
-        def merge_translations(locale, data)
-          locale = locale.to_sym
-          translations[locale] ||= {}
-          data = deep_symbolize_keys(data)
-
-          # deep_merge by Stefan Rusterholz, see http://www.ruby-forum.com/topic/142809
-          merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
-          translations[locale].merge!(data, &merger)
-        end
-
-        # Return a new hash with all keys and nested keys converted to symbols.
-        def deep_symbolize_keys(hash)
-          hash.inject({}) { |result, (key, value)|
-            value = deep_symbolize_keys(value) if value.is_a? Hash
-            result[(key.to_sym rescue key) || key] = value
-            result
-          }
-        end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/exceptions.rb b/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/exceptions.rb
deleted file mode 100644
index 6897055d6d..0000000000
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/exceptions.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-module I18n
-  class ArgumentError < ::ArgumentError; end
-
-  class InvalidLocale < ArgumentError
-    attr_reader :locale
-    def initialize(locale)
-      @locale = locale
-      super "#{locale.inspect} is not a valid locale"
-    end
-  end
-
-  class MissingTranslationData < ArgumentError
-    attr_reader :locale, :key, :options
-    def initialize(locale, key, options)
-      @key, @locale, @options = key, locale, options
-      keys = I18n.send(:normalize_translation_keys, locale, key, options[:scope])
-      keys << 'no key' if keys.size < 2
-      super "translation missing: #{keys.join(', ')}"
-    end
-  end
-
-  class InvalidPluralizationData < ArgumentError
-    attr_reader :entry, :count
-    def initialize(entry, count)
-      @entry, @count = entry, count
-      super "translation data #{entry.inspect} can not be used with :count => #{count}"
-    end
-  end
-
-  class MissingInterpolationArgument < ArgumentError
-    attr_reader :key, :string
-    def initialize(key, string)
-      @key, @string = key, string
-      super "interpolation argument #{key} missing in #{string.inspect}"
-    end
-  end
-
-  class ReservedInterpolationKey < ArgumentError
-    attr_reader :key, :string
-    def initialize(key, string)
-      @key, @string = key, string
-      super "reserved key #{key.inspect} used in #{string.inspect}"
-    end
-  end
-
-  class UnknownFileType < ArgumentError
-    attr_reader :type, :filename
-    def initialize(type, filename)
-      @type, @filename = type, filename
-      super "can not load translations from #{filename}, the file type #{type} is not known"
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/all.rb b/activesupport/lib/active_support/vendor/i18n-0.1.3/test/all.rb
deleted file mode 100644
index 353712da49..0000000000
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/all.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-dir = File.dirname(__FILE__)
-require dir + '/i18n_test.rb'
-require dir + '/simple_backend_test.rb'
-require dir + '/i18n_exceptions_test.rb'
-# *require* dir + '/custom_backend_test.rb'
\ No newline at end of file
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb b/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb
deleted file mode 100644
index 4e78e71b34..0000000000
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-$:.unshift "lib"
-
-require 'rubygems'
-require 'test/unit'
-require 'i18n'
-require 'active_support'
-
-class I18nExceptionsTest < Test::Unit::TestCase
-  def test_invalid_locale_stores_locale
-    force_invalid_locale
-  rescue I18n::ArgumentError => e
-    assert_nil e.locale
-  end
-
-  def test_invalid_locale_message
-    force_invalid_locale
-  rescue I18n::ArgumentError => e
-    assert_equal 'nil is not a valid locale', e.message
-  end
-
-  def test_missing_translation_data_stores_locale_key_and_options
-    force_missing_translation_data
-  rescue I18n::ArgumentError => e
-    options = {:scope => :bar}
-    assert_equal 'de', e.locale
-    assert_equal :foo, e.key
-    assert_equal options, e.options
-  end
-
-  def test_missing_translation_data_message
-    force_missing_translation_data
-  rescue I18n::ArgumentError => e
-    assert_equal 'translation missing: de, bar, foo', e.message
-  end
-
-  def test_invalid_pluralization_data_stores_entry_and_count
-    force_invalid_pluralization_data
-  rescue I18n::ArgumentError => e
-    assert_equal [:bar], e.entry
-    assert_equal 1, e.count
-  end
-
-  def test_invalid_pluralization_data_message
-    force_invalid_pluralization_data
-  rescue I18n::ArgumentError => e
-    assert_equal 'translation data [:bar] can not be used with :count => 1', e.message
-  end
-
-  def test_missing_interpolation_argument_stores_key_and_string
-    force_missing_interpolation_argument
-  rescue I18n::ArgumentError => e
-    assert_equal 'bar', e.key
-    assert_equal "{{bar}}", e.string
-  end
-
-  def test_missing_interpolation_argument_message
-    force_missing_interpolation_argument
-  rescue I18n::ArgumentError => e
-    assert_equal 'interpolation argument bar missing in "{{bar}}"', e.message
-  end
-
-  def test_reserved_interpolation_key_stores_key_and_string
-    force_reserved_interpolation_key
-  rescue I18n::ArgumentError => e
-    assert_equal 'scope', e.key
-    assert_equal "{{scope}}", e.string
-  end
-
-  def test_reserved_interpolation_key_message
-    force_reserved_interpolation_key
-  rescue I18n::ArgumentError => e
-    assert_equal 'reserved key "scope" used in "{{scope}}"', e.message
-  end
-
-  private
-    def force_invalid_locale
-      I18n.backend.translate nil, :foo
-    end
-
-    def force_missing_translation_data
-      I18n.backend.store_translations 'de', :bar => nil
-      I18n.backend.translate 'de', :foo, :scope => :bar
-    end
-
-    def force_invalid_pluralization_data
-      I18n.backend.store_translations 'de', :foo => [:bar]
-      I18n.backend.translate 'de', :foo, :count => 1
-    end
-
-    def force_missing_interpolation_argument
-      I18n.backend.store_translations 'de', :foo => "{{bar}}"
-      I18n.backend.translate 'de', :foo, :baz => 'baz'
-    end
-
-    def force_reserved_interpolation_key
-      I18n.backend.store_translations 'de', :foo => "{{scope}}"
-      I18n.backend.translate 'de', :foo, :baz => 'baz'
-    end
-end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb b/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb
deleted file mode 100644
index 2835ec4eab..0000000000
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-$:.unshift "lib"
-
-require 'rubygems'
-require 'test/unit'
-require 'i18n'
-require 'active_support'
-
-class I18nTest < Test::Unit::TestCase
-  def setup
-    I18n.backend.store_translations :'en', {
-      :currency => {
-        :format => {
-          :separator => '.',
-          :delimiter => ',',
-        }
-      }
-    }
-  end
-
-  def test_uses_simple_backend_set_by_default
-    assert I18n.backend.is_a?(I18n::Backend::Simple)
-  end
-
-  def test_can_set_backend
-    assert_nothing_raised{ I18n.backend = self }
-    assert_equal self, I18n.backend
-    I18n.backend = I18n::Backend::Simple.new
-  end
-
-  def test_uses_en_us_as_default_locale_by_default
-    assert_equal 'en', I18n.default_locale
-  end
-
-  def test_can_set_default_locale
-    assert_nothing_raised{ I18n.default_locale = 'de' }
-    assert_equal 'de', I18n.default_locale
-    I18n.default_locale = 'en'
-  end
-
-  def test_uses_default_locale_as_locale_by_default
-    assert_equal I18n.default_locale, I18n.locale
-  end
-
-  def test_can_set_locale_to_thread_current
-    assert_nothing_raised{ I18n.locale = 'de' }
-    assert_equal 'de', I18n.locale
-    assert_equal 'de', Thread.current[:locale]
-    I18n.locale = 'en'
-  end
-
-  def test_can_set_exception_handler
-    assert_nothing_raised{ I18n.exception_handler = :custom_exception_handler }
-    I18n.exception_handler = :default_exception_handler # revert it
-  end
-
-  def test_uses_custom_exception_handler
-    I18n.exception_handler = :custom_exception_handler
-    I18n.expects(:custom_exception_handler)
-    I18n.translate :bogus
-    I18n.exception_handler = :default_exception_handler # revert it
-  end
-
-  def test_delegates_translate_to_backend
-    I18n.backend.expects(:translate).with 'de', :foo, {}
-    I18n.translate :foo, :locale => 'de'
-  end
-
-  def test_delegates_localize_to_backend
-    I18n.backend.expects(:localize).with 'de', :whatever, :default
-    I18n.localize :whatever, :locale => 'de'
-  end
-
-  def test_translate_given_no_locale_uses_i18n_locale
-    I18n.backend.expects(:translate).with 'en', :foo, {}
-    I18n.translate :foo
-  end
-
-  def test_translate_on_nested_symbol_keys_works
-    assert_equal ".", I18n.t(:'currency.format.separator')
-  end
-
-  def test_translate_with_nested_string_keys_works
-    assert_equal ".", I18n.t('currency.format.separator')
-  end
-
-  def test_translate_with_array_as_scope_works
-    assert_equal ".", I18n.t(:separator, :scope => ['currency.format'])
-  end
-
-  def test_translate_with_array_containing_dot_separated_strings_as_scope_works
-    assert_equal ".", I18n.t(:separator, :scope => ['currency.format'])
-  end
-
-  def test_translate_with_key_array_and_dot_separated_scope_works
-    assert_equal [".", ","], I18n.t(%w(separator delimiter), :scope => 'currency.format')
-  end
-
-  def test_translate_with_dot_separated_key_array_and_scope_works
-    assert_equal [".", ","], I18n.t(%w(format.separator format.delimiter), :scope => 'currency')
-  end
-
-  def test_translate_with_options_using_scope_works
-    I18n.backend.expects(:translate).with('de', :precision, :scope => :"currency.format")
-    I18n.with_options :locale => 'de', :scope => :'currency.format' do |locale|
-      locale.t :precision
-    end
-  end
-
-  # def test_translate_given_no_args_raises_missing_translation_data
-  #   assert_equal "translation missing: en, no key", I18n.t
-  # end
-
-  def test_translate_given_a_bogus_key_raises_missing_translation_data
-    assert_equal "translation missing: en, bogus", I18n.t(:bogus)
-  end
-
-  def test_localize_nil_raises_argument_error
-    assert_raise(I18n::ArgumentError) { I18n.l nil }
-  end
-
-  def test_localize_object_raises_argument_error
-    assert_raise(I18n::ArgumentError) { I18n.l Object.new }
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.rb b/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.rb
deleted file mode 100644
index 6044ce10d9..0000000000
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.rb
+++ /dev/null
@@ -1 +0,0 @@
-{:'en-Ruby' => {:foo => {:bar => "baz"}}}
\ No newline at end of file
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.yml b/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.yml
deleted file mode 100644
index 0b298c9c0e..0000000000
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-en-Yaml:
-  foo:
-    bar: baz
\ No newline at end of file
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb b/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb
deleted file mode 100644
index a1696c77f6..0000000000
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb
+++ /dev/null
@@ -1,567 +0,0 @@
-# encoding: utf-8
-$:.unshift "lib"
-
-require 'rubygems'
-require 'test/unit'
-require 'i18n'
-require 'time'
-require 'yaml'
-
-module I18nSimpleBackendTestSetup
-  def setup_backend
-    # backend_reset_translations!
-    @backend = I18n::Backend::Simple.new
-    @backend.store_translations 'en', :foo => {:bar => 'bar', :baz => 'baz'}
-    @locale_dir = File.dirname(__FILE__) + '/locale'
-  end
-  alias :setup :setup_backend
-
-  # def backend_reset_translations!
-  #   I18n::Backend::Simple::ClassMethods.send :class_variable_set, :@@translations, {}
-  # end
-
-  def backend_get_translations
-    # I18n::Backend::Simple::ClassMethods.send :class_variable_get, :@@translations
-    @backend.instance_variable_get :@translations
-  end
-
-  def add_datetime_translations
-    @backend.store_translations :'de', {
-      :date => {
-        :formats => {
-          :default => "%d.%m.%Y",
-          :short => "%d. %b",
-          :long => "%d. %B %Y",
-        },
-        :day_names => %w(Sonntag Montag Dienstag Mittwoch Donnerstag Freitag Samstag),
-        :abbr_day_names => %w(So Mo Di Mi Do Fr  Sa),
-        :month_names => %w(Januar Februar März April Mai Juni Juli August September Oktober November Dezember).unshift(nil),
-        :abbr_month_names => %w(Jan Feb Mar Apr Mai Jun Jul Aug Sep Okt Nov Dez).unshift(nil),
-        :order => [:day, :month, :year]
-      },
-      :time => {
-        :formats => {
-          :default => "%a, %d. %b %Y %H:%M:%S %z",
-          :short => "%d. %b %H:%M",
-          :long => "%d. %B %Y %H:%M",
-        },
-        :am => 'am',
-        :pm => 'pm'
-      },
-      :datetime => {
-        :distance_in_words => {
-          :half_a_minute => 'half a minute',
-          :less_than_x_seconds => {
-            :one => 'less than 1 second',
-            :other => 'less than {{count}} seconds'
-          },
-          :x_seconds => {
-            :one => '1 second',
-            :other => '{{count}} seconds'
-          },
-          :less_than_x_minutes => {
-            :one => 'less than a minute',
-            :other => 'less than {{count}} minutes'
-          },
-          :x_minutes => {
-            :one => '1 minute',
-            :other => '{{count}} minutes'
-          },
-          :about_x_hours => {
-            :one => 'about 1 hour',
-            :other => 'about {{count}} hours'
-          },
-          :x_days => {
-            :one => '1 day',
-            :other => '{{count}} days'
-          },
-          :about_x_months => {
-            :one => 'about 1 month',
-            :other => 'about {{count}} months'
-          },
-          :x_months => {
-            :one => '1 month',
-            :other => '{{count}} months'
-          },
-          :about_x_years => {
-            :one => 'about 1 year',
-            :other => 'about {{count}} year'
-          },
-          :over_x_years => {
-            :one => 'over 1 year',
-            :other => 'over {{count}} years'
-          }
-        }
-      }
-    }
-  end
-end
-
-class I18nSimpleBackendTranslationsTest < Test::Unit::TestCase
-  include I18nSimpleBackendTestSetup
-
-  def test_store_translations_adds_translations # no, really :-)
-    @backend.store_translations :'en', :foo => 'bar'
-    assert_equal Hash[:'en', {:foo => 'bar'}], backend_get_translations
-  end
-
-  def test_store_translations_deep_merges_translations
-    @backend.store_translations :'en', :foo => {:bar => 'bar'}
-    @backend.store_translations :'en', :foo => {:baz => 'baz'}
-    assert_equal Hash[:'en', {:foo => {:bar => 'bar', :baz => 'baz'}}], backend_get_translations
-  end
-
-  def test_store_translations_forces_locale_to_sym
-    @backend.store_translations 'en', :foo => 'bar'
-    assert_equal Hash[:'en', {:foo => 'bar'}], backend_get_translations
-  end
-
-  def test_store_translations_converts_keys_to_symbols
-    # backend_reset_translations!
-    @backend.store_translations 'en', 'foo' => {'bar' => 'bar', 'baz' => 'baz'}
-    assert_equal Hash[:'en', {:foo => {:bar => 'bar', :baz => 'baz'}}], backend_get_translations
-  end
-end
-
-class I18nSimpleBackendAvailableLocalesTest < Test::Unit::TestCase
-  def test_available_locales
-    @backend = I18n::Backend::Simple.new
-    @backend.store_translations 'de', :foo => 'bar'
-    @backend.store_translations 'en', :foo => 'foo'
-
-    assert_equal ['de', 'en'], @backend.available_locales.map{|locale| locale.to_s }.sort
-  end
-end
-
-class I18nSimpleBackendTranslateTest < Test::Unit::TestCase
-  include I18nSimpleBackendTestSetup
-
-  def test_translate_calls_lookup_with_locale_given
-    @backend.expects(:lookup).with('de', :bar, [:foo]).returns 'bar'
-    @backend.translate 'de', :bar, :scope => [:foo]
-  end
-
-  def test_given_no_keys_it_returns_the_default
-    assert_equal 'default', @backend.translate('en', nil, :default => 'default')
-  end
-
-  def test_translate_given_a_symbol_as_a_default_translates_the_symbol
-    assert_equal 'bar', @backend.translate('en', nil, :scope => [:foo], :default => :bar)
-  end
-
-  def test_translate_given_an_array_as_default_uses_the_first_match
-    assert_equal 'bar', @backend.translate('en', :does_not_exist, :scope => [:foo], :default => [:does_not_exist_2, :bar])
-  end
-
-  def test_translate_given_an_array_of_inexistent_keys_it_raises_missing_translation_data
-    assert_raise I18n::MissingTranslationData do
-      @backend.translate('en', :does_not_exist, :scope => [:foo], :default => [:does_not_exist_2, :does_not_exist_3])
-    end
-  end
-
-  def test_translate_an_array_of_keys_translates_all_of_them
-    assert_equal %w(bar baz), @backend.translate('en', [:bar, :baz], :scope => [:foo])
-  end
-
-  def test_translate_calls_pluralize
-    @backend.expects(:pluralize).with 'en', 'bar', 1
-    @backend.translate 'en', :bar, :scope => [:foo], :count => 1
-  end
-
-  def test_translate_calls_interpolate
-    @backend.expects(:interpolate).with 'en', 'bar', {}
-    @backend.translate 'en', :bar, :scope => [:foo]
-  end
-
-  def test_translate_calls_interpolate_including_count_as_a_value
-    @backend.expects(:interpolate).with 'en', 'bar', {:count => 1}
-    @backend.translate 'en', :bar, :scope => [:foo], :count => 1
-  end
-
-  def test_translate_given_nil_as_a_locale_raises_an_argument_error
-    assert_raise(I18n::InvalidLocale){ @backend.translate nil, :bar }
-  end
-
-  def test_translate_with_a_bogus_key_and_no_default_raises_missing_translation_data
-    assert_raise(I18n::MissingTranslationData){ @backend.translate 'de', :bogus }
-  end
-end
-
-class I18nSimpleBackendLookupTest < Test::Unit::TestCase
-  include I18nSimpleBackendTestSetup
-
-  # useful because this way we can use the backend with no key for interpolation/pluralization
-  def test_lookup_given_nil_as_a_key_returns_nil
-    assert_nil @backend.send(:lookup, 'en', nil)
-  end
-
-  def test_lookup_given_nested_keys_looks_up_a_nested_hash_value
-    assert_equal 'bar', @backend.send(:lookup, 'en', :bar, [:foo])
-  end
-end
-
-class I18nSimpleBackendPluralizeTest < Test::Unit::TestCase
-  include I18nSimpleBackendTestSetup
-
-  def test_pluralize_given_nil_returns_the_given_entry
-    entry = {:one => 'bar', :other => 'bars'}
-    assert_equal entry, @backend.send(:pluralize, nil, entry, nil)
-  end
-
-  def test_pluralize_given_0_returns_zero_string_if_zero_key_given
-    assert_equal 'zero', @backend.send(:pluralize, nil, {:zero => 'zero', :one => 'bar', :other => 'bars'}, 0)
-  end
-
-  def test_pluralize_given_0_returns_plural_string_if_no_zero_key_given
-    assert_equal 'bars', @backend.send(:pluralize, nil, {:one => 'bar', :other => 'bars'}, 0)
-  end
-
-  def test_pluralize_given_1_returns_singular_string
-    assert_equal 'bar', @backend.send(:pluralize, nil, {:one => 'bar', :other => 'bars'}, 1)
-  end
-
-  def test_pluralize_given_2_returns_plural_string
-    assert_equal 'bars', @backend.send(:pluralize, nil, {:one => 'bar', :other => 'bars'}, 2)
-  end
-
-  def test_pluralize_given_3_returns_plural_string
-    assert_equal 'bars', @backend.send(:pluralize, nil, {:one => 'bar', :other => 'bars'}, 3)
-  end
-
-  def test_interpolate_given_incomplete_pluralization_data_raises_invalid_pluralization_data
-    assert_raise(I18n::InvalidPluralizationData){ @backend.send(:pluralize, nil, {:one => 'bar'}, 2) }
-  end
-
-  # def test_interpolate_given_a_string_raises_invalid_pluralization_data
-  #   assert_raise(I18n::InvalidPluralizationData){ @backend.send(:pluralize, nil, 'bar', 2) }
-  # end
-  #
-  # def test_interpolate_given_an_array_raises_invalid_pluralization_data
-  #   assert_raise(I18n::InvalidPluralizationData){ @backend.send(:pluralize, nil, ['bar'], 2) }
-  # end
-end
-
-class I18nSimpleBackendInterpolateTest < Test::Unit::TestCase
-  include I18nSimpleBackendTestSetup
-
-  def test_interpolate_given_a_value_hash_interpolates_the_values_to_the_string
-    assert_equal 'Hi David!', @backend.send(:interpolate, nil, 'Hi {{name}}!', :name => 'David')
-  end
-
-  def test_interpolate_given_a_value_hash_interpolates_into_unicode_string
-    assert_equal 'Häi David!', @backend.send(:interpolate, nil, 'Häi {{name}}!', :name => 'David')
-  end
-
-  def test_interpolate_given_an_unicode_value_hash_interpolates_to_the_string
-    assert_equal 'Hi ゆきひろ!', @backend.send(:interpolate, nil, 'Hi {{name}}!', :name => 'ゆきひろ')
-  end
-
-  def test_interpolate_given_an_unicode_value_hash_interpolates_into_unicode_string
-    assert_equal 'こんにちは、ゆきひろさん!', @backend.send(:interpolate, nil, 'こんにちは、{{name}}さん!', :name => 'ゆきひろ')
-  end
-
-  if Kernel.const_defined?(:Encoding)
-    def test_interpolate_given_a_non_unicode_multibyte_value_hash_interpolates_into_a_string_with_the_same_encoding
-      assert_equal euc_jp('Hi ゆきひろ!'), @backend.send(:interpolate, nil, 'Hi {{name}}!', :name => euc_jp('ゆきひろ'))
-    end
-
-    def test_interpolate_given_an_unicode_value_hash_into_a_non_unicode_multibyte_string_raises_encoding_compatibility_error
-      assert_raise(Encoding::CompatibilityError) do
-        @backend.send(:interpolate, nil, euc_jp('こんにちは、{{name}}さん!'), :name => 'ゆきひろ')
-      end
-    end
-
-    def test_interpolate_given_a_non_unicode_multibyte_value_hash_into_an_unicode_string_raises_encoding_compatibility_error
-      assert_raise(Encoding::CompatibilityError) do
-        @backend.send(:interpolate, nil, 'こんにちは、{{name}}さん!', :name => euc_jp('ゆきひろ'))
-      end
-    end
-  end
-
-  def test_interpolate_given_nil_as_a_string_returns_nil
-    assert_nil @backend.send(:interpolate, nil, nil, :name => 'David')
-  end
-
-  def test_interpolate_given_an_non_string_as_a_string_returns_nil
-    assert_equal [], @backend.send(:interpolate, nil, [], :name => 'David')
-  end
-
-  def test_interpolate_given_a_values_hash_with_nil_values_interpolates_the_string
-    assert_equal 'Hi !', @backend.send(:interpolate, nil, 'Hi {{name}}!', {:name => nil})
-  end
-
-  def test_interpolate_given_an_empty_values_hash_raises_missing_interpolation_argument
-    assert_raise(I18n::MissingInterpolationArgument) { @backend.send(:interpolate, nil, 'Hi {{name}}!', {}) }
-  end
-
-  def test_interpolate_given_a_string_containing_a_reserved_key_raises_reserved_interpolation_key
-    assert_raise(I18n::ReservedInterpolationKey) { @backend.send(:interpolate, nil, '{{default}}', {:default => nil}) }
-  end
-  
-  private
-  
-  def euc_jp(string)
-    string.encode!(Encoding::EUC_JP)
-  end
-end
-
-class I18nSimpleBackendLocalizeDateTest < Test::Unit::TestCase
-  include I18nSimpleBackendTestSetup
-
-  def setup
-    @backend = I18n::Backend::Simple.new
-    add_datetime_translations
-    @date = Date.new 2008, 1, 1
-  end
-
-  def test_translate_given_the_short_format_it_uses_it
-    assert_equal '01. Jan', @backend.localize('de', @date, :short)
-  end
-
-  def test_translate_given_the_long_format_it_uses_it
-    assert_equal '01. Januar 2008', @backend.localize('de', @date, :long)
-  end
-
-  def test_translate_given_the_default_format_it_uses_it
-    assert_equal '01.01.2008', @backend.localize('de', @date, :default)
-  end
-
-  def test_translate_given_a_day_name_format_it_returns_a_day_name
-    assert_equal 'Dienstag', @backend.localize('de', @date, '%A')
-  end
-
-  def test_translate_given_an_abbr_day_name_format_it_returns_an_abbrevated_day_name
-    assert_equal 'Di', @backend.localize('de', @date, '%a')
-  end
-
-  def test_translate_given_a_month_name_format_it_returns_a_month_name
-    assert_equal 'Januar', @backend.localize('de', @date, '%B')
-  end
-
-  def test_translate_given_an_abbr_month_name_format_it_returns_an_abbrevated_month_name
-    assert_equal 'Jan', @backend.localize('de', @date, '%b')
-  end
-
-  def test_translate_given_no_format_it_does_not_fail
-    assert_nothing_raised{ @backend.localize 'de', @date }
-  end
-
-  def test_translate_given_an_unknown_format_it_does_not_fail
-    assert_nothing_raised{ @backend.localize 'de', @date, '%x' }
-  end
-
-  def test_localize_nil_raises_argument_error
-    assert_raise(I18n::ArgumentError) { @backend.localize 'de', nil }
-  end
-
-  def test_localize_object_raises_argument_error
-    assert_raise(I18n::ArgumentError) { @backend.localize 'de', Object.new }
-  end
-end
-
-class I18nSimpleBackendLocalizeDateTimeTest < Test::Unit::TestCase
-  include I18nSimpleBackendTestSetup
-
-  def setup
-    @backend = I18n::Backend::Simple.new
-    add_datetime_translations
-    @morning = DateTime.new 2008, 1, 1, 6
-    @evening = DateTime.new 2008, 1, 1, 18
-  end
-
-  def test_translate_given_the_short_format_it_uses_it
-    assert_equal '01. Jan 06:00', @backend.localize('de', @morning, :short)
-  end
-
-  def test_translate_given_the_long_format_it_uses_it
-    assert_equal '01. Januar 2008 06:00', @backend.localize('de', @morning, :long)
-  end
-
-  def test_translate_given_the_default_format_it_uses_it
-    assert_equal 'Di, 01. Jan 2008 06:00:00 +0000', @backend.localize('de', @morning, :default)
-  end
-
-  def test_translate_given_a_day_name_format_it_returns_the_correct_day_name
-    assert_equal 'Dienstag', @backend.localize('de', @morning, '%A')
-  end
-
-  def test_translate_given_an_abbr_day_name_format_it_returns_the_correct_abbrevated_day_name
-    assert_equal 'Di', @backend.localize('de', @morning, '%a')
-  end
-
-  def test_translate_given_a_month_name_format_it_returns_the_correct_month_name
-    assert_equal 'Januar', @backend.localize('de', @morning, '%B')
-  end
-
-  def test_translate_given_an_abbr_month_name_format_it_returns_the_correct_abbrevated_month_name
-    assert_equal 'Jan', @backend.localize('de', @morning, '%b')
-  end
-
-  def test_translate_given_a_meridian_indicator_format_it_returns_the_correct_meridian_indicator
-    assert_equal 'am', @backend.localize('de', @morning, '%p')
-    assert_equal 'pm', @backend.localize('de', @evening, '%p')
-  end
-
-  def test_translate_given_no_format_it_does_not_fail
-    assert_nothing_raised{ @backend.localize 'de', @morning }
-  end
-
-  def test_translate_given_an_unknown_format_it_does_not_fail
-    assert_nothing_raised{ @backend.localize 'de', @morning, '%x' }
-  end
-end
-
-class I18nSimpleBackendLocalizeTimeTest < Test::Unit::TestCase
-  include I18nSimpleBackendTestSetup
-
-  def setup
-    @old_timezone, ENV['TZ'] = ENV['TZ'], 'UTC'
-    @backend = I18n::Backend::Simple.new
-    add_datetime_translations
-    @morning = Time.parse '2008-01-01 6:00 UTC'
-    @evening = Time.parse '2008-01-01 18:00 UTC'
-  end
-
-  def teardown
-    @old_timezone ? ENV['TZ'] = @old_timezone : ENV.delete('TZ')
-  end
-
-  def test_translate_given_the_short_format_it_uses_it
-    assert_equal '01. Jan 06:00', @backend.localize('de', @morning, :short)
-  end
-
-  def test_translate_given_the_long_format_it_uses_it
-    assert_equal '01. Januar 2008 06:00', @backend.localize('de', @morning, :long)
-  end
-
-  # TODO Seems to break on Windows because ENV['TZ'] is ignored. What's a better way to do this?
-  # def test_translate_given_the_default_format_it_uses_it
-  #   assert_equal 'Di, 01. Jan 2008 06:00:00 +0000', @backend.localize('de', @morning, :default)
-  # end
-
-  def test_translate_given_a_day_name_format_it_returns_the_correct_day_name
-    assert_equal 'Dienstag', @backend.localize('de', @morning, '%A')
-  end
-
-  def test_translate_given_an_abbr_day_name_format_it_returns_the_correct_abbrevated_day_name
-    assert_equal 'Di', @backend.localize('de', @morning, '%a')
-  end
-
-  def test_translate_given_a_month_name_format_it_returns_the_correct_month_name
-    assert_equal 'Januar', @backend.localize('de', @morning, '%B')
-  end
-
-  def test_translate_given_an_abbr_month_name_format_it_returns_the_correct_abbrevated_month_name
-    assert_equal 'Jan', @backend.localize('de', @morning, '%b')
-  end
-
-  def test_translate_given_a_meridian_indicator_format_it_returns_the_correct_meridian_indicator
-    assert_equal 'am', @backend.localize('de', @morning, '%p')
-    assert_equal 'pm', @backend.localize('de', @evening, '%p')
-  end
-
-  def test_translate_given_no_format_it_does_not_fail
-    assert_nothing_raised{ @backend.localize 'de', @morning }
-  end
-
-  def test_translate_given_an_unknown_format_it_does_not_fail
-    assert_nothing_raised{ @backend.localize 'de', @morning, '%x' }
-  end
-end
-
-class I18nSimpleBackendHelperMethodsTest < Test::Unit::TestCase
-  def setup
-    @backend = I18n::Backend::Simple.new
-  end
-
-  def test_deep_symbolize_keys_works
-    result = @backend.send :deep_symbolize_keys, 'foo' => {'bar' => {'baz' => 'bar'}}
-    expected = {:foo => {:bar => {:baz => 'bar'}}}
-    assert_equal expected, result
-  end
-end
-
-class I18nSimpleBackendLoadTranslationsTest < Test::Unit::TestCase
-  include I18nSimpleBackendTestSetup
-
-  def test_load_translations_with_unknown_file_type_raises_exception
-    assert_raise(I18n::UnknownFileType) { @backend.load_translations "#{@locale_dir}/en.xml" }
-  end
-
-  def test_load_translations_with_ruby_file_type_does_not_raise_exception
-    assert_nothing_raised { @backend.load_translations "#{@locale_dir}/en.rb" }
-  end
-
-  def test_load_rb_loads_data_from_ruby_file
-    data = @backend.send :load_rb, "#{@locale_dir}/en.rb"
-    assert_equal({:'en-Ruby' => {:foo => {:bar => "baz"}}}, data)
-  end
-
-  def test_load_rb_loads_data_from_yaml_file
-    data = @backend.send :load_yml, "#{@locale_dir}/en.yml"
-    assert_equal({'en-Yaml' => {'foo' => {'bar' => 'baz'}}}, data)
-  end
-
-  def test_load_translations_loads_from_different_file_formats
-    @backend = I18n::Backend::Simple.new
-    @backend.load_translations "#{@locale_dir}/en.rb", "#{@locale_dir}/en.yml"
-    expected = {
-      :'en-Ruby' => {:foo => {:bar => "baz"}},
-      :'en-Yaml' => {:foo => {:bar => "baz"}}
-    }
-    assert_equal expected, backend_get_translations
-  end
-end
-
-class I18nSimpleBackendLoadPathTest < Test::Unit::TestCase
-  include I18nSimpleBackendTestSetup
-
-  def teardown
-    I18n.load_path = []
-  end
-
-  def test_nested_load_paths_do_not_break_locale_loading
-    @backend = I18n::Backend::Simple.new
-    I18n.load_path = [[File.dirname(__FILE__) + '/locale/en.yml']]
-    assert_nil backend_get_translations
-    assert_nothing_raised { @backend.send :init_translations }
-    assert_not_nil backend_get_translations
-  end
-
-  def test_adding_arrays_of_filenames_to_load_path_do_not_break_locale_loading
-    @backend = I18n::Backend::Simple.new
-    I18n.load_path << Dir[File.dirname(__FILE__) + '/locale/*.{rb,yml}']
-    assert_nil backend_get_translations
-    assert_nothing_raised { @backend.send :init_translations }
-    assert_not_nil backend_get_translations
-  end
-end
-
-class I18nSimpleBackendReloadTranslationsTest < Test::Unit::TestCase
-  include I18nSimpleBackendTestSetup
-  
-  def setup
-    @backend = I18n::Backend::Simple.new
-    I18n.load_path = [File.dirname(__FILE__) + '/locale/en.yml']
-    assert_nil backend_get_translations
-    @backend.send :init_translations
-  end
-  
-  def teardown
-    I18n.load_path = []
-  end
-  
-  def test_setup
-    assert_not_nil backend_get_translations
-  end
-  
-  def test_reload_translations_unloads_translations
-    @backend.reload!
-    assert_nil backend_get_translations
-  end
-  
-  def test_reload_translations_uninitializes_translations
-    @backend.reload!
-    assert_equal @backend.initialized?, false
-  end
-end
-- 
cgit v1.2.3


From 561885aea28c9422fbdfb2be54220b10d4911973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 25 Dec 2009 12:32:16 +0100
Subject: String#<< should work for any object which responds to :to_str, so
 enable this without the performance hit and make Fixnum safe by default.

---
 .../lib/active_support/core_ext/string/output_safety.rb      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'activesupport/lib')

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 3e6ab0ebd2..ceed90ce79 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -1,3 +1,15 @@
+class Object
+  def html_safe?
+    false
+  end
+end
+
+class Fixnum
+  def html_safe?
+    true
+  end
+end
+
 class String
   attr_accessor :_rails_html_safe
   alias html_safe? _rails_html_safe
-- 
cgit v1.2.3


From 75ba102a80965b2612df0253d1278581a88b8d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 26 Dec 2009 20:28:53 +0100
Subject: Remove ActionView inline logging to ActiveSupport::Notifications and
 create ActionController::Base#log_event, so everything can be logged within
 one listener. Also expose log_process_action as a hook for different modules
 to include their own information during the action processing. This allow
 ActiveRecord to hook and any other ORM. Finally, this commit changes
 'Processing' and 'Rendering' in logs to 'Processed' and 'Rendered' because at
 the point it's logged, everying already happened.

---
 .../lib/active_support/notifications/instrumenter.rb          | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/notifications/instrumenter.rb b/activesupport/lib/active_support/notifications/instrumenter.rb
index fb95422af2..0655dd0cb6 100644
--- a/activesupport/lib/active_support/notifications/instrumenter.rb
+++ b/activesupport/lib/active_support/notifications/instrumenter.rb
@@ -10,10 +10,10 @@ module ActiveSupport
       end
 
       def instrument(name, payload={})
-        time   = Time.now
-        result = yield if block_given?
+        time = Time.now
+        yield if block_given?
       ensure
-        @notifier.publish(name, time, Time.now, result, @id, payload)
+        @notifier.publish(name, time, Time.now, @id, payload)
       end
 
       private
@@ -23,15 +23,14 @@ module ActiveSupport
     end
 
     class Event
-      attr_reader :name, :time, :end, :transaction_id, :result, :payload
+      attr_reader :name, :time, :end, :transaction_id, :payload
 
-      def initialize(name, start, ending, result, transaction_id, payload)
+      def initialize(name, start, ending, transaction_id, payload)
         @name           = name
         @payload        = payload.dup
         @time           = start
         @transaction_id = transaction_id
         @end            = ending
-        @result         = result
       end
 
       def duration
-- 
cgit v1.2.3


From 1cd949006a419807d5ae3400442942b752780ca2 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 27 Dec 2009 14:43:06 -0800
Subject: Fix the i18n dependency problem

---
 activesupport/lib/active_support.rb                            | 3 ---
 activesupport/lib/active_support/all.rb                        | 1 +
 activesupport/lib/active_support/core_ext/array/conversions.rb | 1 +
 activesupport/lib/active_support/i18n.rb                       | 2 ++
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 activesupport/lib/active_support/i18n.rb

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index f2baa5a56a..8215cfaf0d 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -70,6 +70,3 @@ module ActiveSupport
 end
 
 require 'active_support/vendor'
-
-require 'i18n'
-I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml"
diff --git a/activesupport/lib/active_support/all.rb b/activesupport/lib/active_support/all.rb
index f537818300..64600575d9 100644
--- a/activesupport/lib/active_support/all.rb
+++ b/activesupport/lib/active_support/all.rb
@@ -1,3 +1,4 @@
 require 'active_support'
+require 'active_support/i18n'
 require 'active_support/time'
 require 'active_support/core_ext'
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
index db140225e8..7fcef38372 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -1,6 +1,7 @@
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/inflector'
+require 'active_support/i18n'
 
 class Array
   # Converts the array to a comma-separated sentence where the last element is joined by the connector word. Options:
diff --git a/activesupport/lib/active_support/i18n.rb b/activesupport/lib/active_support/i18n.rb
new file mode 100644
index 0000000000..854c60eec1
--- /dev/null
+++ b/activesupport/lib/active_support/i18n.rb
@@ -0,0 +1,2 @@
+require 'i18n'
+I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml"
\ No newline at end of file
-- 
cgit v1.2.3


From 19c48281a7bd94a42a80c1f8fc905e95820e8506 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 27 Dec 2009 15:49:29 -0800
Subject: String#exclude? core extension: inverse of #include?

---
 activesupport/lib/active_support/core_ext/string.rb         | 3 ++-
 activesupport/lib/active_support/core_ext/string/exclude.rb | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 activesupport/lib/active_support/core_ext/string/exclude.rb

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/string.rb b/activesupport/lib/active_support/core_ext/string.rb
index 0365b6af1c..411ea0f016 100644
--- a/activesupport/lib/active_support/core_ext/string.rb
+++ b/activesupport/lib/active_support/core_ext/string.rb
@@ -7,4 +7,5 @@ require 'active_support/core_ext/string/access'
 require 'active_support/core_ext/string/xchar'
 require 'active_support/core_ext/string/behavior'
 require 'active_support/core_ext/string/interpolation'
-require 'active_support/core_ext/string/output_safety'
\ No newline at end of file
+require 'active_support/core_ext/string/output_safety'
+require 'active_support/core_ext/string/exclude'
diff --git a/activesupport/lib/active_support/core_ext/string/exclude.rb b/activesupport/lib/active_support/core_ext/string/exclude.rb
new file mode 100644
index 0000000000..5ca268b953
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/string/exclude.rb
@@ -0,0 +1,6 @@
+class String
+  # The inverse of String#include?. Returns true if the string does not include the other string.
+  def exclude?(string)
+    !include?(string)
+  end
+end
-- 
cgit v1.2.3


From 1c47d04ea5ac19601b316daf8fdc6f38c50eec73 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 27 Dec 2009 17:54:43 -0800
Subject: Added Object#presence that returns the object if it's #present?
 otherwise returns nil [DHH/Colin Kelley]

---
 .../lib/active_support/core_ext/object/blank.rb    | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib')

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


From 9a650a6547d2a83004db1bf913e26a8daa1c0b6e Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 28 Dec 2009 16:28:26 -0800
Subject: Silence some trivial warnings: shadowed local vars, indentation
 mismatches

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 67e9b0103f..97e2a478b5 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -467,8 +467,8 @@ module ActiveSupport
       # method that took into consideration the per_key conditions. This
       # is a speed improvement for ActionPack.
       #
-      def set_callback(name, *filters, &block)
-        __update_callbacks(name, filters, block) do |chain, type, filters, options|
+      def set_callback(name, *filter_list, &block)
+        __update_callbacks(name, filter_list, block) do |chain, type, filters, options|
           filters.map! do |filter|
             chain.delete_if {|c| c.matches?(type, filter) }
             Callback.new(chain, filter, type, options.dup, self)
@@ -480,8 +480,8 @@ module ActiveSupport
 
       # Skip a previously defined callback for a given type.
       #
-      def skip_callback(name, *filters, &block)
-        __update_callbacks(name, filters, block) do |chain, type, filters, options|
+      def skip_callback(name, *filter_list, &block)
+        __update_callbacks(name, filter_list, block) do |chain, type, filters, options|
           chain = send("_#{name}_callbacks=", chain.clone(self))
 
           filters.each do |filter|
-- 
cgit v1.2.3


From e58ad8ed9cb0e67fde93c7edc8a0e13b8bc342ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 30 Dec 2009 11:09:27 +0100
Subject: Setup and teardown now use new callbacks.

---
 activesupport/lib/active_support/callbacks.rb      |  2 +-
 .../active_support/testing/setup_and_teardown.rb   | 73 ++++++++++++++--------
 2 files changed, 47 insertions(+), 28 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 97e2a478b5..05bc453dbf 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -90,7 +90,7 @@ module ActiveSupport
     class Callback
       @@_callback_sequence = 0
 
-      attr_accessor :chain, :filter, :kind, :options, :per_key, :klass
+      attr_accessor :chain, :filter, :kind, :options, :per_key, :klass, :raw_filter
 
       def initialize(chain, filter, kind, options, klass)
         @chain, @kind, @klass = chain, kind, klass
diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb
index 0e998d2dbe..6ce9495cee 100644
--- a/activesupport/lib/active_support/testing/setup_and_teardown.rb
+++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -1,16 +1,26 @@
 module ActiveSupport
   module Testing
     module SetupAndTeardown
-      def self.included(base)
-        base.class_eval do
-          include ActiveSupport::DeprecatedCallbacks
-          define_callbacks :setup, :teardown
+      extend ActiveSupport::Concern
 
-          if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
-            include ForMiniTest
-          else
-            include ForClassicTestUnit
-          end
+      included do
+        include ActiveSupport::Callbacks
+        define_callbacks :setup, :teardown
+
+        if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
+          include ForMiniTest
+        else
+          include ForClassicTestUnit
+        end
+      end
+
+      module ClassMethods
+        def setup(*args, &block)
+          set_callback(:setup, :before, *args, &block)
+        end
+
+        def teardown(*args, &block)
+          set_callback(:teardown, :after, *args, &block)
         end
       end
 
@@ -18,13 +28,14 @@ module ActiveSupport
         def run(runner)
           result = '.'
           begin
-            run_callbacks :setup
-            result = super
+            _run_setup_callbacks do
+              result = super
+            end
           rescue Exception => e
             result = runner.puke(self.class, method_name, e)
           ensure
             begin
-              run_callbacks :teardown, :enumerator => :reverse_each
+              _run_teardown_callbacks
             rescue Exception => e
               result = runner.puke(self.class, method_name, e)
             end
@@ -42,23 +53,17 @@ module ActiveSupport
         def run(result)
           return if @method_name.to_s == "default_test"
 
-          if using_mocha = respond_to?(:mocha_verify)
-            assertion_counter_klass = if defined?(Mocha::TestCaseAdapter::AssertionCounter)
-                                        Mocha::TestCaseAdapter::AssertionCounter
-                                      else
-                                        Mocha::Integration::TestUnit::AssertionCounter
-                                      end
-            assertion_counter = assertion_counter_klass.new(result)
-          end
-
+          mocha_counter = retrieve_mocha_counter(result)
           yield(Test::Unit::TestCase::STARTED, name)
           @_result = result
+
           begin
             begin
-              run_callbacks :setup
-              setup
-              __send__(@method_name)
-              mocha_verify(assertion_counter) if using_mocha
+              _run_setup_callbacks 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
@@ -69,7 +74,7 @@ module ActiveSupport
             ensure
               begin
                 teardown
-                run_callbacks :teardown, :enumerator => :reverse_each
+                _run_teardown_callbacks
               rescue Test::Unit::AssertionFailedError => e
                 add_failure(e.message, e.backtrace)
               rescue Exception => e
@@ -78,12 +83,26 @@ module ActiveSupport
               end
             end
           ensure
-            mocha_teardown if using_mocha
+            mocha_teardown if mocha_counter
           end
+
           result.add_run
           yield(Test::Unit::TestCase::FINISHED, name)
         end
+
+        protected
+
+        def retrieve_mocha_counter(result) #:nodoc:
+          if using_mocha = respond_to?(:mocha_verify)
+            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 97a64b6b22d87cb6f89a224f7832433b86b545c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 30 Dec 2009 11:43:34 +0100
Subject: Get rid of DeprecatedCallbacks in ActiveRecord::Associations and
 finally remove it.

---
 activesupport/lib/active_support.rb                |   1 -
 .../lib/active_support/deprecated_callbacks.rb     | 284 ---------------------
 2 files changed, 285 deletions(-)
 delete mode 100644 activesupport/lib/active_support/deprecated_callbacks.rb

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 8215cfaf0d..3463000529 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -50,7 +50,6 @@ module ActiveSupport
     autoload :Callbacks
     autoload :Concern
     autoload :Configurable
-    autoload :DeprecatedCallbacks
     autoload :Deprecation
     autoload :Gzip
     autoload :Inflector
diff --git a/activesupport/lib/active_support/deprecated_callbacks.rb b/activesupport/lib/active_support/deprecated_callbacks.rb
deleted file mode 100644
index f56fef0b6d..0000000000
--- a/activesupport/lib/active_support/deprecated_callbacks.rb
+++ /dev/null
@@ -1,284 +0,0 @@
-require 'active_support/core_ext/array/extract_options'
-require 'active_support/core_ext/array/wrap'
-
-module ActiveSupport
-  # Callbacks are hooks into the lifecycle of an object that allow you to trigger logic
-  # before or after an alteration of the object state.
-  #
-  # Mixing in this module allows you to define callbacks in your class.
-  #
-  # Example:
-  #   class Storage
-  #     include ActiveSupport::DeprecatedCallbacks
-  #
-  #     define_callbacks :before_save, :after_save
-  #   end
-  #
-  #   class ConfigStorage < Storage
-  #     before_save :saving_message
-  #     def saving_message
-  #       puts "saving..."
-  #     end
-  #
-  #     after_save do |object|
-  #       puts "saved"
-  #     end
-  #
-  #     def save
-  #       run_callbacks(:before_save)
-  #       puts "- save"
-  #       run_callbacks(:after_save)
-  #     end
-  #   end
-  #
-  #   config = ConfigStorage.new
-  #   config.save
-  #
-  # Output:
-  #   saving...
-  #   - save
-  #   saved
-  #
-  # Callbacks from parent classes are inherited.
-  #
-  # Example:
-  #   class Storage
-  #     include ActiveSupport::DeprecatedCallbacks
-  #
-  #     define_callbacks :before_save, :after_save
-  #
-  #     before_save :prepare
-  #     def prepare
-  #       puts "preparing save"
-  #     end
-  #   end
-  #
-  #   class ConfigStorage < Storage
-  #     before_save :saving_message
-  #     def saving_message
-  #       puts "saving..."
-  #     end
-  #
-  #     after_save do |object|
-  #       puts "saved"
-  #     end
-  #
-  #     def save
-  #       run_callbacks(:before_save)
-  #       puts "- save"
-  #       run_callbacks(:after_save)
-  #     end
-  #   end
-  #
-  #   config = ConfigStorage.new
-  #   config.save
-  #
-  # Output:
-  #   preparing save
-  #   saving...
-  #   - save
-  #   saved
-  module DeprecatedCallbacks
-    class CallbackChain < Array
-      def self.build(kind, *methods, &block)
-        methods, options = extract_options(*methods, &block)
-        methods.map! { |method| Callback.new(kind, method, options) }
-        new(methods)
-      end
-
-      def run(object, options = {}, &terminator)
-        enumerator = options[:enumerator] || :each
-
-        unless block_given?
-          send(enumerator) { |callback| callback.call(object) }
-        else
-          send(enumerator) do |callback|
-            result = callback.call(object)
-            break result if terminator.call(result, object)
-          end
-        end
-      end
-
-      # TODO: Decompose into more Array like behavior
-      def replace_or_append!(chain)
-        if index = index(chain)
-          self[index] = chain
-        else
-          self << chain
-        end
-        self
-      end
-
-      def find(callback, &block)
-        select { |c| c == callback && (!block_given? || yield(c)) }.first
-      end
-
-      def delete(callback)
-        super(callback.is_a?(Callback) ? callback : find(callback))
-      end
-
-      private
-        def self.extract_options(*methods, &block)
-          methods.flatten!
-          options = methods.extract_options!
-          methods << block if block_given?
-          return methods, options
-        end
-
-        def extract_options(*methods, &block)
-          self.class.extract_options(*methods, &block)
-        end
-    end
-
-    class Callback
-      attr_reader :kind, :method, :identifier, :options
-
-      def initialize(kind, method, options = {})
-        @kind       = kind
-        @method     = method
-        @identifier = options[:identifier]
-        @options    = options
-      end
-
-      def ==(other)
-        case other
-        when Callback
-          (self.identifier && self.identifier == other.identifier) || self.method == other.method
-        else
-          (self.identifier && self.identifier == other) || self.method == other
-        end
-      end
-
-      def eql?(other)
-        self == other
-      end
-
-      def dup
-        self.class.new(@kind, @method, @options.dup)
-      end
-
-      def hash
-        if @identifier
-          @identifier.hash
-        else
-          @method.hash
-        end
-      end
-
-      def call(*args, &block)
-        evaluate_method(method, *args, &block) if should_run_callback?(*args)
-      rescue LocalJumpError
-        raise ArgumentError,
-          "Cannot yield from a Proc type filter. The Proc must take two " +
-          "arguments and execute #call on the second argument."
-      end
-
-      private
-        def evaluate_method(method, *args, &block)
-          case method
-            when Symbol
-              object = args.shift
-              object.send(method, *args, &block)
-            when String
-              eval(method, args.first.instance_eval { binding })
-            when Proc, Method
-              method.call(*args, &block)
-            else
-              if method.respond_to?(kind)
-                method.send(kind, *args, &block)
-              else
-                raise ArgumentError,
-                  "Callbacks must be a symbol denoting the method to call, a string to be evaluated, " +
-                  "a block to be invoked, or an object responding to the callback method."
-              end
-          end
-        end
-
-        def should_run_callback?(*args)
-          Array.wrap(options[:if]).flatten.compact.all? { |a| evaluate_method(a, *args) } &&
-          !Array.wrap(options[:unless]).flatten.compact.any? { |a| evaluate_method(a, *args) }
-        end
-    end
-
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def define_callbacks(*callbacks)
-        ActiveSupport::Deprecation.warn('ActiveSupport::DeprecatedCallbacks has been deprecated in favor of ActiveSupport::Callbacks', caller)
-
-        callbacks.each do |callback|
-          class_eval <<-"end_eval", __FILE__, __LINE__ + 1
-            def self.#{callback}(*methods, &block)                             # def self.before_save(*methods, &block)
-              callbacks = CallbackChain.build(:#{callback}, *methods, &block)  #   callbacks = CallbackChain.build(:before_save, *methods, &block)
-              @#{callback}_callbacks ||= CallbackChain.new                     #   @before_save_callbacks ||= CallbackChain.new
-              @#{callback}_callbacks.concat callbacks                          #   @before_save_callbacks.concat callbacks
-            end                                                                # end
-                                                                               #
-            def self.#{callback}_callback_chain                                # def self.before_save_callback_chain
-              @#{callback}_callbacks ||= CallbackChain.new                     #   @before_save_callbacks ||= CallbackChain.new
-                                                                               #
-              if superclass.respond_to?(:#{callback}_callback_chain)           #   if superclass.respond_to?(:before_save_callback_chain)
-                CallbackChain.new(                                             #     CallbackChain.new(
-                  superclass.#{callback}_callback_chain +                      #       superclass.before_save_callback_chain +
-                  @#{callback}_callbacks                                       #       @before_save_callbacks
-                )                                                              #     )
-              else                                                             #   else
-                @#{callback}_callbacks                                         #     @before_save_callbacks
-              end                                                              #   end
-            end                                                                # end
-          end_eval
-        end
-      end
-    end
-
-    # Runs all the callbacks defined for the given options.
-    #
-    # If a block is given it will be called after each callback receiving as arguments:
-    #
-    #  * the result from the callback
-    #  * the object which has the callback
-    #
-    # If the result from the block evaluates to +true+, the callback chain is stopped.
-    #
-    # Example:
-    #   class Storage
-    #     include ActiveSupport::DeprecatedCallbacks
-    #
-    #     define_callbacks :before_save, :after_save
-    #   end
-    #
-    #   class ConfigStorage < Storage
-    #     before_save :pass
-    #     before_save :pass
-    #     before_save :stop
-    #     before_save :pass
-    #
-    #     def pass
-    #       puts "pass"
-    #     end
-    #
-    #     def stop
-    #       puts "stop"
-    #       return false
-    #     end
-    #
-    #     def save
-    #       result = run_callbacks(:before_save) { |result, object| result == false }
-    #       puts "- save" if result
-    #     end
-    #   end
-    #
-    #   config = ConfigStorage.new
-    #   config.save
-    #
-    # Output:
-    #   pass
-    #   pass
-    #   stop
-    def run_callbacks(kind, options = {}, &block)
-      self.class.send("#{kind}_callback_chain").run(self, options, &block)
-    end
-  end
-end
-- 
cgit v1.2.3


From d39d7f5f444db724ddfb2dc5c15177e519b349f0 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Wed, 30 Dec 2009 20:48:15 -0800
Subject: Allow ActiveSupport's isolation tests to run with MiniTest on 1.9

---
 .../lib/active_support/testing/isolation.rb        | 64 ++++++++++++++++------
 1 file changed, 46 insertions(+), 18 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index 81f7e3c9df..453f4fcc0f 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -36,28 +36,56 @@ module ActiveSupport
         !ENV["NO_FORK"] && RUBY_PLATFORM !~ /mswin|mingw|java/
       end
 
-      def run(result)
-        unless defined?(@@ran_class_setup)
-          self.class.setup if self.class.respond_to?(:setup)
-          @@ran_class_setup = true
+      def self.included(base)
+        if defined?(::MiniTest) && base < ::MiniTest::Unit::TestCase
+          base.send :include, MiniTest
+        elsif defined?(Test::Unit)
+          base.send :include, TestUnit
         end
+      end
+
+      module TestUnit
+        def run(result)
+          unless defined?(@@ran_class_setup)
+            self.class.setup if self.class.respond_to?(:setup)
+            @@ran_class_setup = true
+          end
 
-        yield(Test::Unit::TestCase::STARTED, name)
+          yield(Test::Unit::TestCase::STARTED, name)
 
-        @_result = result
+          @_result = result
 
-        serialized = run_in_isolation do |proxy|
-          begin
-            super(proxy) { }
-          rescue Exception => e
-            proxy.add_error(Test::Unit::Error.new(name, e))
+          serialized = run_in_isolation do |proxy|
+            begin
+              super(proxy) { }
+            rescue Exception => e
+              proxy.add_error(Test::Unit::Error.new(name, e))
+            end
           end
+
+          retval, proxy = Marshal.load(serialized)
+          proxy.__replay__(@_result)
+
+          yield(Test::Unit::TestCase::FINISHED, name)
+          retval
         end
+      end
 
-        proxy = Marshal.load(serialized)
-        proxy.__replay__(@_result)
+      module MiniTest
+        def run(runner)
+          unless defined?(@@ran_class_setup)
+            self.class.setup if self.class.respond_to?(:setup)
+            @@ran_class_setup = true
+          end
 
-        yield(Test::Unit::TestCase::FINISHED, name)
+          serialized = run_in_isolation do |runner|
+            super(runner)
+          end
+
+          retval, proxy = Marshal.load(serialized)
+          proxy.__replay__(runner)
+          retval
+        end
       end
 
       module Forking
@@ -67,8 +95,8 @@ module ActiveSupport
           pid = fork do
             read.close
             proxy = ProxyTestResult.new
-            yield proxy
-            write.puts [Marshal.dump(proxy)].pack("m")
+            retval = yield proxy
+            write.puts [Marshal.dump([retval, proxy])].pack("m")
             exit!
           end
 
@@ -87,9 +115,9 @@ module ActiveSupport
 
           if ENV["ISOLATION_TEST"]
             proxy = ProxyTestResult.new
-            yield proxy
+            retval = yield proxy
             File.open(ENV["ISOLATION_OUTPUT"], "w") do |file|
-              file.puts [Marshal.dump(proxy)].pack("m")
+              file.puts [Marshal.dump([retval, proxy])].pack("m")
             end
             exit!
           else
-- 
cgit v1.2.3


From 50fbb7405665ba1c2b7c6f23574053a4764cef7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 1 Jan 2010 01:48:12 +0100
Subject: Fix inheritance issue with new callbacks.

---
 activesupport/lib/active_support/callbacks.rb      | 76 ++++++++++++++++------
 .../core_ext/class/inheritable_attributes.rb       |  3 +-
 2 files changed, 59 insertions(+), 20 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 05bc453dbf..2fdba2ef1f 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -367,12 +367,6 @@ module ActiveSupport
         method << "halted ? false : (block_given? ? value : true)"
         method.compact.join("\n")
       end
-
-      def clone(klass)
-        chain = CallbackChain.new(@name, @config.dup)
-        callbacks = map { |c| c.clone(chain, klass) }
-        chain.push(*callbacks)
-      end
     end
 
     module ClassMethods
@@ -389,10 +383,16 @@ module ActiveSupport
       # key. See #define_callbacks for more information.
       #
       def __define_runner(symbol) #:nodoc:
+        send("_update_#{symbol}_superclass_callbacks")
         body = send("_#{symbol}_callbacks").compile(nil)
 
         body, line = <<-RUBY_EVAL, __LINE__
           def _run_#{symbol}_callbacks(key = nil, &blk)
+            if self.class.send("_update_#{symbol}_superclass_callbacks")
+              self.class.__define_runner(#{symbol.inspect})
+              return _run_#{symbol}_callbacks
+            end
+
             if key
               name = "_run__\#{self.class.name.hash.abs}__#{symbol}__\#{key.hash.abs}__callbacks"
 
@@ -431,6 +431,8 @@ module ActiveSupport
       # CallbackChain.
       #
       def __update_callbacks(name, filters = [], block = nil) #:nodoc:
+        send("_update_#{name}_superclass_callbacks")
+
         type = [:before, :after, :around].include?(filters.first) ? filters.shift : :before
         options = filters.last.is_a?(Hash) ? filters.pop : {}
         filters.unshift(block) if block
@@ -470,7 +472,8 @@ module ActiveSupport
       def set_callback(name, *filter_list, &block)
         __update_callbacks(name, filter_list, block) do |chain, type, filters, options|
           filters.map! do |filter|
-            chain.delete_if {|c| c.matches?(type, filter) }
+            removed = chain.delete_if {|c| c.matches?(type, filter) } 
+            send("_removed_#{name}_callbacks").push(*removed)
             Callback.new(chain, filter, type, options.dup, self)
           end
 
@@ -482,16 +485,17 @@ module ActiveSupport
       #
       def skip_callback(name, *filter_list, &block)
         __update_callbacks(name, filter_list, block) do |chain, type, filters, options|
-          chain = send("_#{name}_callbacks=", chain.clone(self))
-
           filters.each do |filter|
             filter = chain.find {|c| c.matches?(type, filter) }
 
             if filter && options.any?
-              filter.recompile!(options, options[:per_key] || {})
-            else
-              chain.delete(filter)
+              new_filter = filter.clone(chain, self)
+              chain.insert(chain.index(filter), new_filter)
+              new_filter.recompile!(options, options[:per_key] || {})
             end
+
+            chain.delete(filter)
+            send("_removed_#{name}_callbacks") << filter
           end
         end
       end
@@ -499,7 +503,9 @@ module ActiveSupport
       # Reset callbacks for a given type.
       #
       def reset_callbacks(symbol)
-        send("_#{symbol}_callbacks").clear
+        callbacks = send("_#{symbol}_callbacks")
+        callbacks.clear
+        send("_removed_#{symbol}_callbacks").concat(callbacks)
         __define_runner(symbol)
       end
 
@@ -546,14 +552,46 @@ module ActiveSupport
       #
       # Defaults to :kind.
       #
-      def define_callbacks(*symbols)
-        config = symbols.last.is_a?(Hash) ? symbols.pop : {}
-        symbols.each do |symbol|
-          extlib_inheritable_accessor("_#{symbol}_callbacks") do
-            CallbackChain.new(symbol, config)
+      def define_callbacks(*callbacks)
+        config = callbacks.last.is_a?(Hash) ? callbacks.pop : {}
+        callbacks.each do |callback|
+          extlib_inheritable_reader("_#{callback}_callbacks") do
+            CallbackChain.new(callback, config)
+          end
+
+          extlib_inheritable_reader("_removed_#{callback}_callbacks") do
+            []
           end
 
-          __define_runner(symbol)
+          class_eval <<-METHOD, __FILE__, __LINE__ + 1
+            def self._#{callback}_superclass_callbacks
+              if superclass.respond_to?(:_#{callback}_callbacks)
+                superclass._#{callback}_callbacks + superclass._#{callback}_superclass_callbacks
+              else
+                []
+              end
+            end
+
+            def self._update_#{callback}_superclass_callbacks
+              changed, index = false, 0
+
+              callbacks  = (_#{callback}_superclass_callbacks -
+                _#{callback}_callbacks) - _removed_#{callback}_callbacks
+
+              callbacks.each do |callback|
+                if new_index = _#{callback}_callbacks.index(callback)
+                  index = new_index + 1
+                else
+                  changed = true
+                  _#{callback}_callbacks.insert(index, callback)
+                  index = index + 1
+                end
+              end
+              changed
+            end
+          METHOD
+
+          __define_runner(callback)
         end
       end
     end
diff --git a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
index e4d22516c1..2b8e2b544f 100644
--- a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
+++ b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
@@ -159,7 +159,7 @@ class Class
   #   (error out or do the same as other methods above) instead of silently
   #   moving on). In particular, this makes the return value of this function
   #   less useful.
-  def extlib_inheritable_reader(*ivars)
+  def extlib_inheritable_reader(*ivars, &block)
     options = ivars.extract_options!
 
     ivars.each do |ivar|
@@ -178,6 +178,7 @@ class Class
           end
         RUBY
       end
+      instance_variable_set(:"@#{ivar}", yield) if block_given?
     end
   end
 
-- 
cgit v1.2.3


From 8c5fe60ec82986ab4aa337a69c2ab753f518976d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 1 Jan 2010 03:20:38 +0100
Subject: Simplify repair_validations on AR and make it work with new
 callbacks.

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 2fdba2ef1f..47e90df200 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -390,7 +390,7 @@ module ActiveSupport
           def _run_#{symbol}_callbacks(key = nil, &blk)
             if self.class.send("_update_#{symbol}_superclass_callbacks")
               self.class.__define_runner(#{symbol.inspect})
-              return _run_#{symbol}_callbacks
+              return _run_#{symbol}_callbacks(key, &blk)
             end
 
             if key
-- 
cgit v1.2.3


From 34b03cebf9c9f2ce2a53511a4b2160485e270f12 Mon Sep 17 00:00:00 2001
From: Willem van Bergen <willem@vanbergen.org>
Date: Fri, 1 Jan 2010 10:12:30 +0100
Subject: Code cleanup, bugfixes and speed improvements for the Nokogiri and
 LibXML XmlMini backends

[#3641 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 .../lib/active_support/xml_mini/libxml.rb          | 108 +++++----------------
 .../lib/active_support/xml_mini/nokogiri.rb        |  50 +++++-----
 2 files changed, 48 insertions(+), 110 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/xml_mini/libxml.rb b/activesupport/lib/active_support/xml_mini/libxml.rb
index 0f7ba1918b..67bc81e1a6 100644
--- a/activesupport/lib/active_support/xml_mini/libxml.rb
+++ b/activesupport/lib/active_support/xml_mini/libxml.rb
@@ -12,7 +12,7 @@ module ActiveSupport
       if !data.respond_to?(:read)
         data = StringIO.new(data || '')
       end
-      
+
       char = data.getc
       if char.nil?
         {}
@@ -34,106 +34,42 @@ module LibXML #:nodoc:
     end
 
     module Node #:nodoc:
-      CONTENT_ROOT = '__content__'
-      LIB_XML_LIMIT = 30000000 # Hardcoded LibXML limit
+      CONTENT_ROOT = '__content__'.freeze
 
       # Convert XML document to hash
       #
       # hash::
       #   Hash to merge the converted element into.
       def to_hash(hash={})
-        if text? || cdata?
-          raise LibXML::XML::Error if hash[CONTENT_ROOT].to_s.length + content.length >= LIB_XML_LIMIT
-          hash[CONTENT_ROOT] = hash[CONTENT_ROOT].to_s + content
-        else
-          sub_hash = insert_name_into_hash(hash, name)
-          attributes_to_hash(sub_hash)
-          if array?
-            children_array_to_hash(sub_hash)
-          elsif yaml?
-            children_yaml_to_hash(sub_hash)
-          else
-            children_to_hash(sub_hash)
-          end
-        end
-        hash
-      end
+        node_hash = {}
 
-      protected
-
-        # Insert name into hash
-        #
-        # hash::
-        #   Hash to merge the converted element into.
-        # name::
-        #   name to to merge into hash
-        def insert_name_into_hash(hash, name)
-          sub_hash = {}
-          if hash[name]
-            if !hash[name].kind_of? Array
-              hash[name] = [hash[name]]
-            end
-            hash[name] << sub_hash
-          else
-            hash[name] = sub_hash
-          end
-          sub_hash
+        # Insert node hash into parent hash correctly.
+        case hash[name]
+          when Array then hash[name] << node_hash
+          when Hash  then hash[name] = [hash[name], node_hash]
+          when nil   then hash[name] = node_hash
         end
 
-        # Insert children into hash
-        #
-        # hash::
-        #   Hash to merge the children into.
-        def children_to_hash(hash={})
-          each { |child| child.to_hash(hash) }
-
-          if hash.length > 1 && hash[CONTENT_ROOT].blank?
-            hash.delete(CONTENT_ROOT)
+        # Handle child elements
+        each_child do |c|
+          if c.element?
+            c.to_hash(node_hash)
+          elsif c.text? || c.cdata?
+            node_hash[CONTENT_ROOT] ||= ''
+            node_hash[CONTENT_ROOT] << c.content
           end
-
-          attributes_to_hash(hash)
-          hash
         end
 
-        # Convert xml attributes to hash
-        #
-        # hash::
-        #   Hash to merge the attributes into
-        def attributes_to_hash(hash={})
-          each_attr { |attr| hash[attr.name] = attr.value }
-          hash
+        # Remove content node if it is blank
+        if node_hash.length > 1 && node_hash[CONTENT_ROOT].blank?
+          node_hash.delete(CONTENT_ROOT)
         end
 
-        # Convert array into hash
-        #
-        # hash::
-        #   Hash to merge the array into
-        def children_array_to_hash(hash={})
-          hash[child.name] = map do |child|
-            returning({}) { |sub_hash| child.children_to_hash(sub_hash) }
-          end
-          hash
-        end
-
-        # Convert yaml into hash
-        #
-        # hash::
-        #   Hash to merge the yaml into
-        def children_yaml_to_hash(hash = {})
-          hash[CONTENT_ROOT] = content unless content.blank?
-          hash
-        end
-
-        # Check if child is of type array
-        def array?
-          child? && child.next? && child.name == child.next.name
-        end
-
-        # Check if child is of type yaml
-        def yaml?
-          attributes.collect{|x| x.value}.include?('yaml')
-        end
+        # Handle attributes
+        each_attr { |a| node_hash[a.name] = a.value }
 
+        hash
+      end
     end
   end
 end
diff --git a/activesupport/lib/active_support/xml_mini/nokogiri.rb b/activesupport/lib/active_support/xml_mini/nokogiri.rb
index 17bacd8441..e312a0248a 100644
--- a/activesupport/lib/active_support/xml_mini/nokogiri.rb
+++ b/activesupport/lib/active_support/xml_mini/nokogiri.rb
@@ -12,13 +12,13 @@ module ActiveSupport
       if !data.respond_to?(:read)
         data = StringIO.new(data || '')
       end
-      
+
       char = data.getc
       if char.nil?
         {}
       else
         data.ungetc(char)
-        doc = Nokogiri::XML(data) { |cfg| cfg.noblanks }
+        doc = Nokogiri::XML(data)
         raise doc.errors.first if doc.errors.length > 0
         doc.to_hash
       end
@@ -32,39 +32,41 @@ module ActiveSupport
       end
 
       module Node #:nodoc:
-        CONTENT_ROOT = '__content__'
+        CONTENT_ROOT = '__content__'.freeze
 
         # Convert XML document to hash
         #
         # hash::
         #   Hash to merge the converted element into.
-        def to_hash(hash = {})
-          attributes = attributes_as_hash
-          if hash[name]
-            hash[name] = [hash[name]].flatten
-            hash[name] << attributes
-          else
-            hash[name] ||= attributes
-          end
+        def to_hash(hash={})
+          node_hash = {}
 
-          children.each { |child|
-            next if child.blank? && 'file' != self['type']
+          # Insert node hash into parent hash correctly.
+          case hash[name]
+            when Array then hash[name] << node_hash
+            when Hash  then hash[name] = [hash[name], node_hash]
+            when nil   then hash[name] = node_hash
+          end
 
-            if child.text? || child.cdata?
-              (attributes[CONTENT_ROOT] ||= '') << child.content
-              next
+          # Handle child elements
+          children.each do |c|
+            if c.element?
+              c.to_hash(node_hash)
+            elsif c.text? || c.cdata?
+              node_hash[CONTENT_ROOT] ||= ''
+              node_hash[CONTENT_ROOT] << c.content
             end
+          end
 
-            child.to_hash attributes
-          }
+          # Remove content node if it is blank and there are child tags
+          if node_hash.length > 1 && node_hash[CONTENT_ROOT].blank?
+            node_hash.delete(CONTENT_ROOT)
+          end
 
-          hash
-        end
+          # Handle attributes
+          attribute_nodes.each { |a| node_hash[a.node_name] = a.value }
 
-        def attributes_as_hash
-          Hash[*(attribute_nodes.map { |node|
-            [node.node_name, node.value]
-          }.flatten)]
+          hash
         end
       end
     end
-- 
cgit v1.2.3


From d7f9b9fd244228d3503d7d37ac2f07365d54df3c Mon Sep 17 00:00:00 2001
From: Willem van Bergen <willem@vanbergen.org>
Date: Fri, 1 Jan 2010 12:08:48 +0100
Subject: Added SAX-based parser for XmlMini, using Nokogiri.

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 .../lib/active_support/xml_mini/nokogirisax.rb     | 82 ++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 activesupport/lib/active_support/xml_mini/nokogirisax.rb

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/xml_mini/nokogirisax.rb b/activesupport/lib/active_support/xml_mini/nokogirisax.rb
new file mode 100644
index 0000000000..42a44897ba
--- /dev/null
+++ b/activesupport/lib/active_support/xml_mini/nokogirisax.rb
@@ -0,0 +1,82 @@
+require 'nokogiri'
+
+# = XmlMini Nokogiri implementation using a SAX-based parser
+module ActiveSupport
+  module XmlMini_NokogiriSAX
+    extend self
+
+    # Class that will build the hash while the XML document
+    # is being parsed using SAX events.
+    class HashBuilder < Nokogiri::XML::SAX::Document
+
+      CONTENT_KEY   = '__content__'.freeze
+      HASH_SIZE_KEY = '__hash_size__'.freeze
+
+      attr_reader :hash
+
+      def current_hash
+        @hash_stack.last
+      end
+
+      def start_document
+        @hash = {}
+        @hash_stack = [@hash]
+      end
+
+      def end_document
+        raise "Parse stack not empty!" if @hash_stack.size > 1
+      end
+
+      def error(error_message)
+        raise Nokogiri::XML::SyntaxError, error_message
+      end
+
+      def start_element(name, attrs = [])
+        new_hash = { CONTENT_KEY => '' }
+        new_hash[attrs.shift] = attrs.shift while attrs.length > 0
+        new_hash[HASH_SIZE_KEY] = new_hash.size + 1
+
+        case current_hash[name]
+          when Array then current_hash[name] << new_hash
+          when Hash  then current_hash[name] = [current_hash[name], new_hash]
+          when nil   then current_hash[name] = new_hash
+        end
+
+        @hash_stack.push(new_hash)
+      end
+
+      def end_element(name)
+        if current_hash.length > current_hash.delete(HASH_SIZE_KEY) && current_hash[CONTENT_KEY].blank? || current_hash[CONTENT_KEY] == ''
+          current_hash.delete(CONTENT_KEY)
+        end
+        @hash_stack.pop
+      end
+
+      def characters(string)
+        current_hash[CONTENT_KEY] << string
+      end
+
+      alias_method :cdata_block, :characters
+    end
+
+    attr_accessor :document_class
+    self.document_class = HashBuilder
+
+    def parse(data)
+      if !data.respond_to?(:read)
+        data = StringIO.new(data || '')
+      end
+
+      char = data.getc
+      if char.nil?
+        {}
+      else
+        data.ungetc(char)
+        document = self.document_class.new
+        parser = Nokogiri::XML::SAX::Parser.new(document)
+        parser.parse(data)
+        document.hash
+      end
+    end
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From 96a2b3905ce14df8f25b1646d3b110505bf8820b Mon Sep 17 00:00:00 2001
From: Willem van Bergen <willem@vanbergen.org>
Date: Fri, 1 Jan 2010 12:57:36 +0100
Subject: Added SAX-based parser for XmlMini, using LibXML

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 .../lib/active_support/xml_mini/libxmlsax.rb       | 84 ++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 activesupport/lib/active_support/xml_mini/libxmlsax.rb

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/xml_mini/libxmlsax.rb b/activesupport/lib/active_support/xml_mini/libxmlsax.rb
new file mode 100644
index 0000000000..dba1f8755a
--- /dev/null
+++ b/activesupport/lib/active_support/xml_mini/libxmlsax.rb
@@ -0,0 +1,84 @@
+require 'libxml'
+
+# = XmlMini LibXML implementation using a SAX-based parser
+module ActiveSupport
+  module XmlMini_LibXMLSAX
+    extend self
+
+    # Class that will build the hash while the XML document
+    # is being parsed using SAX events.
+    class HashBuilder
+
+      include LibXML::XML::SaxParser::Callbacks
+
+      CONTENT_KEY   = '__content__'.freeze
+      HASH_SIZE_KEY = '__hash_size__'.freeze
+
+      attr_reader :hash
+
+      def current_hash
+        @hash_stack.last
+      end
+
+      def on_start_document
+        @hash = {}
+        @hash_stack = [@hash]
+      end
+
+      def on_end_document
+        raise "Parse stack not empty!" if @hash_stack.size > 1
+      end
+
+      def on_error(error_message)
+        raise LibXML::XML::Error, error_message
+      end
+
+      def on_start_element(name, attrs = {})
+        new_hash = { CONTENT_KEY => '' }.merge(attrs)
+        new_hash[HASH_SIZE_KEY] = new_hash.size + 1
+
+        case current_hash[name]
+          when Array then current_hash[name] << new_hash
+          when Hash  then current_hash[name] = [current_hash[name], new_hash]
+          when nil   then current_hash[name] = new_hash
+        end
+
+        @hash_stack.push(new_hash)
+      end
+
+      def on_end_element(name)
+        if current_hash.length > current_hash.delete(HASH_SIZE_KEY) && current_hash[CONTENT_KEY].blank? || current_hash[CONTENT_KEY] == ''
+          current_hash.delete(CONTENT_KEY)
+        end
+        @hash_stack.pop
+      end
+
+      def on_characters(string)
+        current_hash[CONTENT_KEY] << string
+      end
+
+      alias_method :on_cdata_block, :on_characters
+    end
+
+    attr_accessor :document_class
+    self.document_class = HashBuilder
+
+    def parse(data)
+      if !data.respond_to?(:read)
+        data = StringIO.new(data || '')
+      end
+
+      char = data.getc
+      if char.nil?
+        {}
+      else
+        data.ungetc(char)
+        document = self.document_class.new
+        parser = LibXML::XML::SaxParser.io(data)
+        parser.callbacks = document
+        parser.parse
+        document.hash
+      end
+    end
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From 689984ddd3a482b5c0986fdf1889323f096050fa Mon Sep 17 00:00:00 2001
From: Willem van Bergen <willem@vanbergen.org>
Date: Fri, 1 Jan 2010 13:44:42 +0100
Subject: Fixed some bugs and fixed some tests in new SAX-based XmlMini
 backends.

[#3636 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activesupport/lib/active_support/xml_mini/libxmlsax.rb   | 14 +++++++-------
 activesupport/lib/active_support/xml_mini/nokogirisax.rb |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/xml_mini/libxmlsax.rb b/activesupport/lib/active_support/xml_mini/libxmlsax.rb
index dba1f8755a..d7b2f4c5be 100644
--- a/activesupport/lib/active_support/xml_mini/libxmlsax.rb
+++ b/activesupport/lib/active_support/xml_mini/libxmlsax.rb
@@ -21,16 +21,13 @@ module ActiveSupport
       end
 
       def on_start_document
-        @hash = {}
+        @hash = { CONTENT_KEY => '' }
         @hash_stack = [@hash]
       end
 
       def on_end_document
-        raise "Parse stack not empty!" if @hash_stack.size > 1
-      end
-
-      def on_error(error_message)
-        raise LibXML::XML::Error, error_message
+        @hash = @hash_stack.pop
+        @hash.delete(CONTENT_KEY)
       end
 
       def on_start_element(name, attrs = {})
@@ -73,8 +70,11 @@ module ActiveSupport
         {}
       else
         data.ungetc(char)
-        document = self.document_class.new
+
+        LibXML::XML::Error.set_handler(&LibXML::XML::Error::QUIET_HANDLER)
         parser = LibXML::XML::SaxParser.io(data)
+        document = self.document_class.new
+
         parser.callbacks = document
         parser.parse
         document.hash
diff --git a/activesupport/lib/active_support/xml_mini/nokogirisax.rb b/activesupport/lib/active_support/xml_mini/nokogirisax.rb
index 42a44897ba..d538a9110f 100644
--- a/activesupport/lib/active_support/xml_mini/nokogirisax.rb
+++ b/activesupport/lib/active_support/xml_mini/nokogirisax.rb
@@ -28,7 +28,7 @@ module ActiveSupport
       end
 
       def error(error_message)
-        raise Nokogiri::XML::SyntaxError, error_message
+        raise error_message
       end
 
       def start_element(name, attrs = [])
-- 
cgit v1.2.3


From 4a27d42637f47ed7410208a11a8b752e027c3bfd Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 27 Dec 2009 23:50:41 +0100
Subject: require cgi to reopen it, not technically needed but makes sense

---
 .../lib/active_support/core_ext/cgi/escape_skipping_slashes.rb          | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb b/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
index 1c3ef05526..d3c3575748 100644
--- a/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
+++ b/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
@@ -1,3 +1,5 @@
+require 'cgi'
+
 class CGI #:nodoc:
   if RUBY_VERSION >= '1.9'
     def self.escape_skipping_slashes(str)
-- 
cgit v1.2.3


From a2595a1f0f066390c5827818417f045b3b042164 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 27 Dec 2009 23:52:42 +0100
Subject: delegating_attributes.rb does not use duplicable

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
index 301c09fc73..72e0eefb0a 100644
--- a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
+++ b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
@@ -1,5 +1,4 @@
 require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/object/duplicable'
 require 'active_support/core_ext/array/extract_options'
 
 class Class
-- 
cgit v1.2.3


From 39667c846bbe8dc0b14112d6b1144928bbc0a7a0 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 27 Dec 2009 23:55:08 +0100
Subject: make sure returning is available for the libxml extension

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/xml_mini/libxml.rb b/activesupport/lib/active_support/xml_mini/libxml.rb
index 67bc81e1a6..231b2a0d0b 100644
--- a/activesupport/lib/active_support/xml_mini/libxml.rb
+++ b/activesupport/lib/active_support/xml_mini/libxml.rb
@@ -1,4 +1,5 @@
 require 'libxml'
+require 'active_support/core_ext/object/returning'
 
 # = XmlMini LibXML implementation
 module ActiveSupport
-- 
cgit v1.2.3


From da97b51fdf4e78724b48c1e74f24e135fb0b95e6 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:03:39 +0100
Subject: requires active_support/core_ext/hash/keys in benchmarkable because
 it uses assert_valid_keys

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/benchmarkable.rb b/activesupport/lib/active_support/benchmarkable.rb
index 6a41aab166..ee02ecb043 100644
--- a/activesupport/lib/active_support/benchmarkable.rb
+++ b/activesupport/lib/active_support/benchmarkable.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/benchmark'
+require 'active_support/core_ext/hash/keys'
 
 module ActiveSupport
   module Benchmarkable
-- 
cgit v1.2.3


From 7f7f5d619a6e0988359ac18de33d6f6e49b42838 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:17:29 +0100
Subject: requires active_support/gzip in CompressedMemCacheStore because it
 uses ActiveSupport::Gzip

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb b/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb
index d87eb17337..d2370d78c5 100644
--- a/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb
@@ -1,3 +1,5 @@
+require 'active_support/gzip'
+
 module ActiveSupport
   module Cache
     class CompressedMemCacheStore < MemCacheStore
-- 
cgit v1.2.3


From f1e34cc41de124cab5fa78f7c27483d4610074a7 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:19:26 +0100
Subject: requires active_support/core_ext/array/extract_options in
 mem_cache_store.rb because it uses extract_options!

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index 1b6b820ca4..d584c9e254 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -1,4 +1,5 @@
 require 'memcache'
+require 'active_support/core_ext/array/extract_options'
 
 module ActiveSupport
   module Cache
-- 
cgit v1.2.3


From 13168e659465df26e66df61f100e9d701ee88061 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:21:53 +0100
Subject: requires active_support/inflector/methods
 active_support/core_ext/string/inflections in local_cache.rb because it uses
 underscore

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index 5f6fe22416..66df7ad7f9 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/object/duplicable'
+require 'active_support/inflector/methods active_support/core_ext/string/inflections'
 
 module ActiveSupport
   module Cache
-- 
cgit v1.2.3


From 3337da9e9424035583f9f5fb4bf710f3bcd68afc Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:25:06 +0100
Subject: cache.rb requires active_support/core_ext/string/inflections because
 it uses camelize

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index f2d957f154..ad238c1d96 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -4,6 +4,7 @@ require 'active_support/core_ext/benchmark'
 require 'active_support/core_ext/exception'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/object/to_param'
+require 'active_support/core_ext/string/inflections'
 
 module ActiveSupport
   # See ActiveSupport::Cache::Store for documentation.
-- 
cgit v1.2.3


From 5b295a65c3a1388b25b3a95bb8a9f1a62618740d Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:27:22 +0100
Subject: callbacks.rb needs active_support/core_ext/object/metaclass because
 it uses metaclass

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 47e90df200..8719dc0e3f 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -1,6 +1,7 @@
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/kernel/reporting'
+require 'active_support/core_ext/object/metaclass'
 
 module ActiveSupport
   # Callbacks are hooks into the lifecycle of an object that allow you to trigger logic
-- 
cgit v1.2.3


From 44f98133446dea6f7ad1ff002dbf011f1450b01d Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:32:26 +0100
Subject: date/calculations.rb needs active_support/core_ext/object/acts_like
 because it uses acts_like?

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index 2b76b93153..9d2ad2bbcf 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -1,6 +1,7 @@
 require 'date'
 require 'active_support/duration'
 require 'active_support/core_ext/time/zones'
+require 'active_support/core_ext/object/acts_like'
 
 class Date
   class << self
-- 
cgit v1.2.3


From 2f9fc1fe015839b77f1e1ec5a3252e58cd7ae2f1 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:35:01 +0100
Subject: date_time/calculations.rb needs
 active_support/core_ext/object/acts_like because it uses acts_like?

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

(limited to 'activesupport/lib')

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 e93abfa4a3..26979aa906 100644
--- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
@@ -1,4 +1,5 @@
 require 'rational' unless RUBY_VERSION >= '1.9.2'
+require 'active_support/core_ext/object/acts_like'
 
 class DateTime
   class << self
-- 
cgit v1.2.3


From e6385a912acf654eb4ea506f48fbea965daf15be Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:39:41 +0100
Subject: hash/conversions.rb needs active_support/core_ext/object/blank
 because it uses blank?

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index 35ccec5df4..48fb6050c6 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -1,6 +1,7 @@
 require 'active_support/time'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/hash/reverse_merge'
+require 'active_support/core_ext/object/blank'
 
 class Hash
   # This module exists to decorate files deserialized using Hash.from_xml with
-- 
cgit v1.2.3


From 7ba8c9e78ec4400b0c74031eefa035ee0e7514a3 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:41:54 +0100
Subject: hash/conversions.rb needs active_support/core_ext/string/inflections
 because it uses singularize and a few others

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index 48fb6050c6..cfd840fb93 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -2,6 +2,7 @@ require 'active_support/time'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/string/inflections'
 
 class Hash
   # This module exists to decorate files deserialized using Hash.from_xml with
-- 
cgit v1.2.3


From 8ae9ef75f3074290ed860c7cbec31913a4fa325b Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:46:26 +0100
Subject: loading.rb needs active_support/core_ext/string/inflections because
 it uses underscore

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/module/loading.rb b/activesupport/lib/active_support/core_ext/module/loading.rb
index 4b4b110b25..43d0578ae6 100644
--- a/activesupport/lib/active_support/core_ext/module/loading.rb
+++ b/activesupport/lib/active_support/core_ext/module/loading.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/string/inflections'
+
 class Module
   # Returns String#underscore applied to the module name minus trailing classes.
   #
-- 
cgit v1.2.3


From 4d2f0d2287a4fde4e6425814e85d812dd7c4b203 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:48:08 +0100
Subject: synchronization.rb needs
 active_support/core_ext/array/extract_options

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/module/synchronization.rb b/activesupport/lib/active_support/core_ext/module/synchronization.rb
index f72d512340..115b8abd4e 100644
--- a/activesupport/lib/active_support/core_ext/module/synchronization.rb
+++ b/activesupport/lib/active_support/core_ext/module/synchronization.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/module/aliasing'
+require 'active_support/core_ext/array/extract_options'
 
 class Module
   # Synchronize access around a method, delegating synchronization to a
-- 
cgit v1.2.3


From 7f17b23aea3008e1d4ae01ef2713bf4555f29efe Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:50:04 +0100
Subject: extending.rb needs active_support/core_ext/class/removal because it
 uses reachable?

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/object/extending.rb b/activesupport/lib/active_support/core_ext/object/extending.rb
index de8121f274..7ac13d3d1a 100644
--- a/activesupport/lib/active_support/core_ext/object/extending.rb
+++ b/activesupport/lib/active_support/core_ext/object/extending.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class/removal'
+
 class Class
   # Rubinius
   if defined?(Class.__subclasses__)
-- 
cgit v1.2.3


From cbab9c0347d2f17598a67a400448533628e6ad1d Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:51:49 +0100
Subject: extending.rb needs active_support/core_ext/object/blank

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/object/extending.rb b/activesupport/lib/active_support/core_ext/object/extending.rb
index 7ac13d3d1a..b8b6970382 100644
--- a/activesupport/lib/active_support/core_ext/object/extending.rb
+++ b/activesupport/lib/active_support/core_ext/object/extending.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/class/removal'
+require 'active_support/core_ext/object/blank'
 
 class Class
   # Rubinius
-- 
cgit v1.2.3


From 9036bf82c62d7b9eb211526e7f8ec90ac07fc84b Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:53:34 +0100
Subject: to_param.rb needs active_support/core_ext/object/to_query

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/object/to_param.rb b/activesupport/lib/active_support/core_ext/object/to_param.rb
index 7ca763cbad..745c4d7dad 100644
--- a/activesupport/lib/active_support/core_ext/object/to_param.rb
+++ b/activesupport/lib/active_support/core_ext/object/to_param.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/to_query'
+
 class Object
   # Alias of <tt>to_s</tt>.
   def to_param
-- 
cgit v1.2.3


From e7c08c1e297408ee391ca752df6a11e56cda243e Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:55:31 +0100
Subject: method_wrappers.rb needs
 active_support/core_ext/array/extract_options

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/deprecation/method_wrappers.rb b/activesupport/lib/active_support/deprecation/method_wrappers.rb
index deb29a82b8..cec8024b17 100644
--- a/activesupport/lib/active_support/deprecation/method_wrappers.rb
+++ b/activesupport/lib/active_support/deprecation/method_wrappers.rb
@@ -1,5 +1,6 @@
 require 'active_support/core_ext/module/deprecation'
 require 'active_support/core_ext/module/aliasing'
+require 'active_support/core_ext/array/extract_options'
 
 module ActiveSupport
   class << Deprecation
-- 
cgit v1.2.3


From f15313c0c8c728e14f3a08ad728ff194f550fb80 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:57:07 +0100
Subject: duration.rb needs active_support/core_ext/object/acts_like

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/duration.rb b/activesupport/lib/active_support/duration.rb
index 713ae1b671..c1f0e4bf81 100644
--- a/activesupport/lib/active_support/duration.rb
+++ b/activesupport/lib/active_support/duration.rb
@@ -1,5 +1,6 @@
 require 'active_support/basic_object'
 require 'active_support/core_ext/array/conversions'
+require 'active_support/core_ext/object/acts_like'
 
 module ActiveSupport
   # Provides accurate date and time measurements using Date#advance and 
-- 
cgit v1.2.3


From d26d671e389385a1146a2dbbdd334ff0ade8392a Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:58:58 +0100
Subject: message_encriptor.rb needs active_support/base64

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb
index 347af9dc76..51fa626b45 100644
--- a/activesupport/lib/active_support/message_encryptor.rb
+++ b/activesupport/lib/active_support/message_encryptor.rb
@@ -1,4 +1,5 @@
 require 'openssl'
+require 'active_support/base64'
 
 module ActiveSupport
   # MessageEncryptor is a simple way to encrypt values which get stored somewhere 
-- 
cgit v1.2.3


From 679acfbefd2f3dae18b97f2e859a5aa3fa28e970 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 20:59:51 +0100
Subject: message_verifier.rb needs active_support/base64

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/message_verifier.rb b/activesupport/lib/active_support/message_verifier.rb
index 87e4b1ad33..8ca61a08b1 100644
--- a/activesupport/lib/active_support/message_verifier.rb
+++ b/activesupport/lib/active_support/message_verifier.rb
@@ -1,3 +1,5 @@
+require 'active_support/base64'
+
 module ActiveSupport
   # MessageVerifier makes it easy to generate and verify messages which are signed
   # to prevent tampering.
-- 
cgit v1.2.3


From b7afaa08bf7bc3e9b34e97ea2353bc82f7deaba9 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 21:00:37 +0100
Subject: message_verifier.rb needs active_support/core_ext/object/blank

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/message_verifier.rb b/activesupport/lib/active_support/message_verifier.rb
index 8ca61a08b1..6c46b68eaf 100644
--- a/activesupport/lib/active_support/message_verifier.rb
+++ b/activesupport/lib/active_support/message_verifier.rb
@@ -1,4 +1,5 @@
 require 'active_support/base64'
+require 'active_support/core_ext/object/blank'
 
 module ActiveSupport
   # MessageVerifier makes it easy to generate and verify messages which are signed
-- 
cgit v1.2.3


From bddf0a6fd336bde7b74fcc5cbf9d3f29f23a1738 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 21:02:19 +0100
Subject: rescuable.rb needs active_support/core_ext/string/inflections because
 it uses constantize

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/rescuable.rb b/activesupport/lib/active_support/rescuable.rb
index f0119f5994..9168dd518a 100644
--- a/activesupport/lib/active_support/rescuable.rb
+++ b/activesupport/lib/active_support/rescuable.rb
@@ -1,5 +1,6 @@
 require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/proc'
+require 'active_support/core_ext/string/inflections'
 
 module ActiveSupport
   # Rescuable module adds support for easier exception handling.
-- 
cgit v1.2.3


From 0e5b9d7d7dbeb15eefa9ec96a70adf36bc6f483b Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 21:03:16 +0100
Subject: rescuable.rb needs active_support/core_ext/array/extract_options

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/rescuable.rb b/activesupport/lib/active_support/rescuable.rb
index 9168dd518a..6e660f8647 100644
--- a/activesupport/lib/active_support/rescuable.rb
+++ b/activesupport/lib/active_support/rescuable.rb
@@ -1,6 +1,7 @@
 require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/proc'
 require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/array/extract_options'
 
 module ActiveSupport
   # Rescuable module adds support for easier exception handling.
-- 
cgit v1.2.3


From 606203c03494168c03fa81b5fdf71ee8ede7faf0 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 21:06:27 +0100
Subject: testing/performance.rb needs
 active_support/core_ext/string/inflections because it uses demodulize

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index 66e32fa5d7..24eea1e40b 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -4,6 +4,7 @@ begin
   require 'fileutils'
   require 'rails/version'
   require 'active_support/core_ext/class/delegating_attributes'
+  require 'active_support/core_ext/string/inflections'
 
   module ActiveSupport
     module Testing
-- 
cgit v1.2.3


From 388dde9f9d1ee3e6262c79a8ef81c93ab67a8677 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 21:07:38 +0100
Subject: time_with_zone.rb needs active_support/core_ext/object/acts_like

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index 8304f6c434..6b554e7158 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -1,4 +1,5 @@
 require "active_support/values/time_zone"
+require 'active_support/core_ext/object/acts_like'
 
 module ActiveSupport
   # A Time-like class that can represent a time in any time zone. Necessary because standard Ruby Time instances are
-- 
cgit v1.2.3


From 173f8287604a112d8efcd09572ada09052bd79d2 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 21:09:08 +0100
Subject: jdom.rb needs active_support/core_ext/object/blank

---
 activesupport/lib/active_support/xml_mini/jdom.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/xml_mini/jdom.rb b/activesupport/lib/active_support/xml_mini/jdom.rb
index 5c3d93c4a1..48c1cb3fe9 100644
--- a/activesupport/lib/active_support/xml_mini/jdom.rb
+++ b/activesupport/lib/active_support/xml_mini/jdom.rb
@@ -3,6 +3,8 @@ raise "JRuby is required to use the JDOM backend for XmlMini" unless RUBY_PLATFO
 require 'jruby'
 include Java
 
+require 'active_support/core_ext/object/blank'
+
 import javax.xml.parsers.DocumentBuilder unless defined? DocumentBuilder
 import javax.xml.parsers.DocumentBuilderFactory unless defined? DocumentBuilderFactory
 import java.io.StringReader unless defined? StringReader
-- 
cgit v1.2.3


From 2d233ebdcf0de9e769da52fd289c29a2b0db2c62 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 21:12:19 +0100
Subject: libxml.rb needs active_support/core_ext/object/blank

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/xml_mini/libxml.rb b/activesupport/lib/active_support/xml_mini/libxml.rb
index 231b2a0d0b..9cf187302f 100644
--- a/activesupport/lib/active_support/xml_mini/libxml.rb
+++ b/activesupport/lib/active_support/xml_mini/libxml.rb
@@ -1,5 +1,6 @@
 require 'libxml'
 require 'active_support/core_ext/object/returning'
+require 'active_support/core_ext/object/blank'
 
 # = XmlMini LibXML implementation
 module ActiveSupport
-- 
cgit v1.2.3


From 9ab528df8db1ad226888f3f99495dddd7ad8f912 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 21:12:54 +0100
Subject: nokogiri.rb needs active_support/core_ext/object/blank

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

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/xml_mini/nokogiri.rb b/activesupport/lib/active_support/xml_mini/nokogiri.rb
index e312a0248a..eb61a7fc22 100644
--- a/activesupport/lib/active_support/xml_mini/nokogiri.rb
+++ b/activesupport/lib/active_support/xml_mini/nokogiri.rb
@@ -1,4 +1,5 @@
 require 'nokogiri'
+require 'active_support/core_ext/object/blank'
 
 # = XmlMini Nokogiri implementation
 module ActiveSupport
-- 
cgit v1.2.3


From abae712213f663b447d49e9b06001cf51e3b5811 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Jan 2010 21:22:20 +0100
Subject: fixes a couple of wrong requires

---
 activesupport/lib/active_support/cache/strategy/local_cache.rb | 2 +-
 activesupport/lib/active_support/core_ext/object/to_param.rb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index 66df7ad7f9..86c7703c27 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -1,5 +1,5 @@
 require 'active_support/core_ext/object/duplicable'
-require 'active_support/inflector/methods active_support/core_ext/string/inflections'
+require 'active_support/core_ext/string/inflections'
 
 module ActiveSupport
   module Cache
diff --git a/activesupport/lib/active_support/core_ext/object/to_param.rb b/activesupport/lib/active_support/core_ext/object/to_param.rb
index 745c4d7dad..49e41e919a 100644
--- a/activesupport/lib/active_support/core_ext/object/to_param.rb
+++ b/activesupport/lib/active_support/core_ext/object/to_param.rb
@@ -1,4 +1,4 @@
-require 'active_support/core_ext/object/to_query'
+
 
 class Object
   # Alias of <tt>to_s</tt>.
-- 
cgit v1.2.3


From 7a2554d9a35545ad24937f04c6416df3ed3f26d9 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 15 Nov 2009 01:22:26 +0100
Subject: Let Integer#multiple_of? accept zero as argument

[#2982 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activesupport/lib/active_support/core_ext/integer/multiple.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/core_ext/integer/multiple.rb b/activesupport/lib/active_support/core_ext/integer/multiple.rb
index 40bea54c67..8dff217ddc 100644
--- a/activesupport/lib/active_support/core_ext/integer/multiple.rb
+++ b/activesupport/lib/active_support/core_ext/integer/multiple.rb
@@ -1,6 +1,6 @@
 class Integer
   # Check whether the integer is evenly divisible by the argument.
   def multiple_of?(number)
-    self % number == 0
+    number != 0 ? self % number == 0 : zero?
   end
 end
-- 
cgit v1.2.3