activesupport 3.1.12 → 3.2.0.rc1

data/lib/active_support/ordered_hash.rb

@@ -6,7 +6,7 @@ end
 require 'yaml'
 
 YAML.add_builtin_type("omap") do |type, val|
-  ActiveSupport::OrderedHash[val.map(&:to_a).map(&:first)]
+  ActiveSupport::OrderedHash[val.map{ |v| v.to_a.first }]
 end
 
 module ActiveSupport
@@ -20,7 +20,7 @@ module ActiveSupport
   #   oh.keys # => [:a, :b], this order is guaranteed
   #
   # <tt>ActiveSupport::OrderedHash</tt> is namespaced to prevent conflicts with other implementations.
-  class OrderedHash < ::Hash #:nodoc:
+  class OrderedHash < ::Hash
     def to_yaml_type
       "!tag:yaml.org,2002:omap"
     end
@@ -163,7 +163,11 @@ module ActiveSupport
         self
       end
 
-      alias_method :each_pair, :each
+      def each_pair
+        return to_enum(:each_pair) unless block_given?
+        @keys.each {|key| yield key, self[key]}
+        self
+      end
 
       alias_method :select, :find_all
 

data/lib/active_support/tagged_logging.rb

@@ -0,0 +1,63 @@
+require 'active_support/core_ext/object/blank'
+require 'logger'
+
+module ActiveSupport
+  # Wraps any standard Logger class to provide tagging capabilities. Examples:
+  #
+  #   Logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
+  #   Logger.tagged("BCX") { Logger.info "Stuff" }                            # Logs "[BCX] Stuff"
+  #   Logger.tagged("BCX", "Jason") { Logger.info "Stuff" }                   # Logs "[BCX] [Jason] Stuff"
+  #   Logger.tagged("BCX") { Logger.tagged("Jason") { Logger.info "Stuff" } } # Logs "[BCX] [Jason] Stuff"
+  #
+  # This is used by the default Rails.logger as configured by Railties to make it easy to stamp log lines
+  # with subdomains, request ids, and anything else to aid debugging of multi-user production applications.
+  class TaggedLogging
+    def initialize(logger)
+      @logger = logger
+      @tags   = Hash.new { |h,k| h[k] = [] }
+    end
+
+    def tagged(*new_tags)
+      tags     = current_tags
+      new_tags = Array.wrap(new_tags).flatten.reject(&:blank?)
+      tags.concat new_tags
+      yield
+    ensure
+      new_tags.size.times { tags.pop }
+    end
+
+    def add(severity, message = nil, progname = nil, &block)
+      @logger.add(severity, "#{tags_text}#{message}", progname, &block)
+    end
+
+    %w( fatal error warn info debug unknown ).each do |severity|
+      eval <<-EOM, nil, __FILE__, __LINE__ + 1
+        def #{severity}(progname = nil, &block)
+          add(Logger::#{severity.upcase}, progname, &block)
+        end
+      EOM
+    end
+
+    def flush
+      @tags.delete(Thread.current)
+      @logger.flush if @logger.respond_to?(:flush)
+    end
+
+    def method_missing(method, *args)
+      @logger.send(method, *args)
+    end
+
+    protected
+
+    def tags_text
+      tags = current_tags
+      if tags.any?
+        tags.collect { |tag| "[#{tag}]" }.join(" ") + " "
+      end
+    end
+
+    def current_tags
+      @tags[Thread.current]
+    end
+  end
+end

data/lib/active_support/testing/assertions.rb

@@ -70,7 +70,7 @@ module ActiveSupport
       #
       # A error message can be specified.
       #
-      #   assert_no_difference 'Article.count', "An Article should not be destroyed" do
+      #   assert_no_difference 'Article.count', "An Article should not be created" do
       #     post :create, :article => invalid_attributes
       #   end
       def assert_no_difference(expression, message = nil, &block)

data/lib/active_support/testing/mochaing.rb

@@ -1,7 +1,7 @@
 begin
-  silence_warnings { require 'mocha/setup' }
+  silence_warnings { require 'mocha' }
 rescue LoadError
   # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
   Object.const_set :Mocha, Module.new
   Mocha.const_set :ExpectationError, Class.new(StandardError)
-end
+end

data/lib/active_support/testing/performance/ruby.rb

@@ -36,7 +36,7 @@ module ActiveSupport
           RubyProf.pause
           full_profile_options[:runs].to_i.times { run_test(@metric, :profile) }
           @data = RubyProf.stop
-          @total = @data.threads.sum(0) { |thread| thread.methods.max.total_time }
+          @total = @data.threads.values.sum(0) { |method_infos| method_infos.max.total_time }
         end
 
         def record

data/lib/active_support/testing/setup_and_teardown.rb

@@ -28,22 +28,17 @@ module ActiveSupport
       end
 
       module ForMiniTest
-        PASSTHROUGH_EXCEPTIONS = MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS rescue [NoMemoryError, SignalException, Interrupt, SystemExit]
         def run(runner)
           result = '.'
           begin
             run_callbacks :setup do
               result = super
             end
-          rescue *PASSTHROUGH_EXCEPTIONS => e
-            raise e
           rescue Exception => e
             result = runner.puke(self.class, method_name, e)
           ensure
             begin
               run_callbacks :teardown
-            rescue *PASSTHROUGH_EXCEPTIONS => e
-              raise e
             rescue Exception => e
               result = runner.puke(self.class, method_name, e)
             end
@@ -61,7 +56,7 @@ module ActiveSupport
         def run(result)
           return if @method_name.to_s == "default_test"
 
-          mocha_counter = retrieve_mocha_counter(self, result)
+          mocha_counter = retrieve_mocha_counter(result)
           yield(Test::Unit::TestCase::STARTED, name)
           @_result = result
 
@@ -83,8 +78,6 @@ module ActiveSupport
               begin
                 teardown
                 run_callbacks :teardown
-              rescue Mocha::ExpectationError => e
-                add_failure(e.message, e.backtrace)
               rescue Test::Unit::AssertionFailedError => e
                 add_failure(e.message, e.backtrace)
               rescue Exception => e
@@ -102,18 +95,17 @@ module ActiveSupport
 
         protected
 
-        def retrieve_mocha_counter(test_case, result) #:nodoc:
+        def retrieve_mocha_counter(result) #:nodoc:
           if respond_to?(:mocha_verify) # using mocha
             if defined?(Mocha::TestCaseAdapter::AssertionCounter)
               Mocha::TestCaseAdapter::AssertionCounter.new(result)
-            elsif defined?(Mocha::Integration::TestUnit::AssertionCounter)
-              Mocha::Integration::TestUnit::AssertionCounter.new(result)
             else
-              Mocha::Integration::AssertionCounter.new(test_case)
+              Mocha::Integration::TestUnit::AssertionCounter.new(result)
             end
           end
         end
       end
+
     end
   end
 end

data/lib/active_support/time_with_zone.rb

@@ -109,7 +109,7 @@ module ActiveSupport
 
     def xmlschema(fraction_digits = 0)
       fraction = if fraction_digits > 0
-        ".%i" % time.usec.to_s[0, fraction_digits]
+        (".%06i" % time.usec)[0, fraction_digits + 1]
       end
 
       "#{time.strftime("%Y-%m-%dT%H:%M:%S")}#{fraction}#{formatted_offset(true, 'Z')}"
@@ -203,7 +203,11 @@ module ActiveSupport
     end
 
     def eql?(other)
-      utc == other
+      utc.eql?(other)
+    end
+
+    def hash
+      utc.hash
     end
 
     def +(other)
@@ -277,7 +281,6 @@ module ActiveSupport
     def to_i
       utc.to_i
     end
-    alias_method :hash, :to_i
     alias_method :tv_sec, :to_i
 
     # A TimeWithZone acts like a Time, so just return +self+.

data/lib/active_support/values/time_zone.rb

@@ -28,7 +28,7 @@ module ActiveSupport
     MAPPING = {
       "International Date Line West" => "Pacific/Midway",
       "Midway Island"                => "Pacific/Midway",
-      "American Samoa"               => "Pacific/Pago_Pago",
+      "Samoa"                        => "Pacific/Pago_Pago",
       "Hawaii"                       => "Pacific/Honolulu",
       "Alaska"                       => "America/Juneau",
       "Pacific Time (US & Canada)"   => "America/Los_Angeles",
@@ -167,9 +167,7 @@ module ActiveSupport
       "Marshall Is."                 => "Pacific/Majuro",
       "Auckland"                     => "Pacific/Auckland",
       "Wellington"                   => "Pacific/Auckland",
-      "Nuku'alofa"                   => "Pacific/Tongatapu",
-      "Tokelau Is."                  => "Pacific/Fakaofo",
-      "Samoa"                        => "Pacific/Apia"
+      "Nuku'alofa"                   => "Pacific/Tongatapu"
     }.each { |name, zone| name.freeze; zone.freeze }
     MAPPING.freeze
 
@@ -313,10 +311,8 @@ module ActiveSupport
       tzinfo.period_for_local(time, dst)
     end
 
-    # TODO: Preload instead of lazy load for thread safety
     def self.find_tzinfo(name)
-      require 'active_support/tzinfo' unless defined?(::TZInfo)
-      ::TZInfo::TimezoneProxy.new(MAPPING[name] || name)
+      TZInfo::TimezoneProxy.new(MAPPING[name] || name)
     end
 
     class << self

data/lib/active_support/version.rb

@@ -1,9 +1,9 @@
 module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 1
-    TINY  = 12
-    PRE   = nil
+    MINOR = 2
+    TINY  = 0
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/lib/active_support/xml_mini.rb

@@ -1,3 +1,4 @@
+require 'time'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/string/inflections'
 
@@ -51,13 +52,12 @@ module ActiveSupport
       "yaml"     => Proc.new { |yaml| yaml.to_yaml }
     } unless defined?(FORMATTING)
 
-    # TODO: use Time.xmlschema instead of Time.parse;
-    #       use regexp instead of Date.parse
+    # TODO use regexp instead of Date.parse
     unless defined?(PARSING)
       PARSING = {
         "symbol"       => Proc.new { |symbol|  symbol.to_sym },
         "date"         => Proc.new { |date|    ::Date.parse(date) },
-        "datetime"     => Proc.new { |time|    ::Time.parse(time).utc rescue ::DateTime.parse(time).utc },
+        "datetime"     => Proc.new { |time|    Time.xmlschema(time).utc rescue ::DateTime.parse(time).utc },
         "integer"      => Proc.new { |integer| integer.to_i },
         "float"        => Proc.new { |float|   float.to_f },
         "decimal"      => Proc.new { |number|  BigDecimal(number) },

data/lib/active_support/xml_mini/jdom.rb

@@ -38,12 +38,6 @@ module ActiveSupport
         {}
       else
         @dbf = DocumentBuilderFactory.new_instance
-        # secure processing of java xml
-        # http://www.ibm.com/developerworks/xml/library/x-tipcfsx/index.html
-        @dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
-        @dbf.setFeature("http://xml.org/sax/features/external-general-entities", false)
-        @dbf.setFeature("http://xml.org/sax/features/external-parameter-entities", false)
-        @dbf.setFeature(javax.xml.XMLConstants::FEATURE_SECURE_PROCESSING, true)
         xml_string_reader = StringReader.new(data)
         xml_input_source = InputSource.new(xml_string_reader)
         doc = @dbf.new_document_builder.parse(xml_input_source)
@@ -64,7 +58,7 @@ module ActiveSupport
       merge!(hash, element.tag_name, collapse(element))
     end
 
-    def delete_empty(hash) 
+    def delete_empty(hash)
       hash.delete(CONTENT_KEY) if hash[CONTENT_KEY] == ''
     end
 
@@ -140,9 +134,9 @@ module ActiveSupport
       attribute_hash = {}
       attributes = element.attributes
       for i in 0...attributes.length
-        attribute_hash[CONTENT_KEY] ||= ''
-        attribute_hash[attributes.item(i).name] =  attributes.item(i).value
-      end
+         attribute_hash[CONTENT_KEY] ||= ''
+         attribute_hash[attributes.item(i).name] =  attributes.item(i).value
+       end
       attribute_hash
     end
 

metadata

@@ -1,29 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 3.1.12
+  version: 3.2.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2011-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  name: i18n
+  requirement: &2156027620 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2156027620
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &2156024920 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156024920
 description: A toolkit of support libraries and Ruby core extensions extracted from
   the Rails framework. Rich support for multibyte strings, internationalization, time
   zones, and testing.
@@ -42,12 +51,11 @@ files:
 - lib/active_support/benchmarkable.rb
 - lib/active_support/buffered_logger.rb
 - lib/active_support/builder.rb
-- lib/active_support/cache/compressed_mem_cache_store.rb
 - lib/active_support/cache/file_store.rb
 - lib/active_support/cache/mem_cache_store.rb
 - lib/active_support/cache/memory_store.rb
+- lib/active_support/cache/null_store.rb
 - lib/active_support/cache/strategy/local_cache.rb
-- lib/active_support/cache/synchronized_memory_store.rb
 - lib/active_support/cache.rb
 - lib/active_support/callbacks.rb
 - lib/active_support/concern.rb
@@ -56,6 +64,7 @@ files:
 - lib/active_support/core_ext/array/conversions.rb
 - lib/active_support/core_ext/array/extract_options.rb
 - lib/active_support/core_ext/array/grouping.rb
+- lib/active_support/core_ext/array/prepend_and_append.rb
 - lib/active_support/core_ext/array/random_access.rb
 - lib/active_support/core_ext/array/uniq_by.rb
 - lib/active_support/core_ext/array/wrap.rb
@@ -66,7 +75,6 @@ files:
 - lib/active_support/core_ext/class/attribute.rb
 - lib/active_support/core_ext/class/attribute_accessors.rb
 - lib/active_support/core_ext/class/delegating_attributes.rb
-- lib/active_support/core_ext/class/inheritable_attributes.rb
 - lib/active_support/core_ext/class/subclasses.rb
 - lib/active_support/core_ext/class.rb
 - lib/active_support/core_ext/date/acts_like.rb
@@ -99,23 +107,23 @@ files:
 - lib/active_support/core_ext/integer/multiple.rb
 - lib/active_support/core_ext/integer/time.rb
 - lib/active_support/core_ext/integer.rb
+- lib/active_support/core_ext/io.rb
 - lib/active_support/core_ext/kernel/agnostics.rb
 - lib/active_support/core_ext/kernel/debugger.rb
 - lib/active_support/core_ext/kernel/reporting.rb
-- lib/active_support/core_ext/kernel/requires.rb
 - lib/active_support/core_ext/kernel/singleton_class.rb
 - lib/active_support/core_ext/kernel.rb
 - lib/active_support/core_ext/load_error.rb
 - lib/active_support/core_ext/logger.rb
 - lib/active_support/core_ext/module/aliasing.rb
 - lib/active_support/core_ext/module/anonymous.rb
-- lib/active_support/core_ext/module/attr_accessor_with_default.rb
 - lib/active_support/core_ext/module/attr_internal.rb
 - lib/active_support/core_ext/module/attribute_accessors.rb
 - lib/active_support/core_ext/module/delegation.rb
 - lib/active_support/core_ext/module/deprecation.rb
 - lib/active_support/core_ext/module/introspection.rb
 - lib/active_support/core_ext/module/method_names.rb
+- lib/active_support/core_ext/module/qualified_const.rb
 - lib/active_support/core_ext/module/reachable.rb
 - lib/active_support/core_ext/module/remove_method.rb
 - lib/active_support/core_ext/module/synchronization.rb
@@ -215,8 +223,8 @@ files:
 - lib/active_support/railtie.rb
 - lib/active_support/rescuable.rb
 - lib/active_support/ruby/shim.rb
-- lib/active_support/secure_random.rb
 - lib/active_support/string_inquirer.rb
+- lib/active_support/tagged_logging.rb
 - lib/active_support/test_case.rb
 - lib/active_support/testing/assertions.rb
 - lib/active_support/testing/declarative.rb
@@ -248,28 +256,27 @@ files:
 - lib/active_support.rb
 homepage: http://www.rubyonrails.org
 licenses: []
-metadata: {}
 post_install_message: 
-rdoc_options:
-- --encoding
-- UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.7
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A toolkit of support libraries and Ruby core extensions extracted from the
   Rails framework.
 test_files: []