activesupport 4.0.0.beta1 → 4.0.0.rc1

data/lib/active_support/testing/constant_lookup.rb

@@ -38,6 +38,8 @@ module ActiveSupport
             begin
               constant = names.join("::").constantize
               break(constant) if yield(constant)
+            rescue NoMethodError # subclass of NameError
+              raise
             rescue NameError
               # Constant wasn't found, move on
             ensure

data/lib/active_support/time_with_zone.rb

@@ -366,6 +366,8 @@ module ActiveSupport
     # TimeWithZone with the existing +time_zone+.
     def method_missing(sym, *args, &block)
       wrap_with_time_zone time.__send__(sym, *args, &block)
+    rescue NoMethodError => e
+      raise e, e.message.sub(time.inspect, self.inspect), e.backtrace
     end
 
     private

data/lib/active_support/values/time_zone.rb

@@ -5,7 +5,7 @@ module ActiveSupport
   # The TimeZone class serves as a wrapper around TZInfo::Timezone instances.
   # It allows us to do the following:
   #
-  # * Limit the set of zones provided by TZInfo to a meaningful subset of 142
+  # * Limit the set of zones provided by TZInfo to a meaningful subset of 146
   #   zones.
   # * Retrieve and display zones with a friendlier name
   #   (e.g., "Eastern Time (US & Canada)" instead of "America/New_York").
@@ -62,6 +62,7 @@ module ActiveSupport
       "Newfoundland"                 => "America/St_Johns",
       "Brasilia"                     => "America/Sao_Paulo",
       "Buenos Aires"                 => "America/Argentina/Buenos_Aires",
+      "Montevideo"                   => "America/Montevideo",
       "Georgetown"                   => "America/Guyana",
       "Greenland"                    => "America/Godthab",
       "Mid-Atlantic"                 => "Atlantic/South_Georgia",
@@ -150,7 +151,7 @@ module ActiveSupport
       "Taipei"                       => "Asia/Taipei",
       "Perth"                        => "Australia/Perth",
       "Irkutsk"                      => "Asia/Irkutsk",
-      "Ulaan Bataar"                 => "Asia/Ulaanbaatar",
+      "Ulaanbaatar"                  => "Asia/Ulaanbaatar",
       "Seoul"                        => "Asia/Seoul",
       "Osaka"                        => "Asia/Tokyo",
       "Sapporo"                      => "Asia/Tokyo",
@@ -176,6 +177,7 @@ module ActiveSupport
       "Wellington"                   => "Pacific/Auckland",
       "Nuku'alofa"                   => "Pacific/Tongatapu",
       "Tokelau Is."                  => "Pacific/Fakaofo",
+      "Chatham Is."                  => "Pacific/Chatham",
       "Samoa"                        => "Pacific/Apia"
     }
 
@@ -238,7 +240,7 @@ module ActiveSupport
     # Compare #name and TZInfo identifier to a supplied regexp, returning +true+
     # if a match is found.
     def =~(re)
-      return true if name =~ re || MAPPING[name] =~ re
+      re === name || re === MAPPING[name]
     end
 
     # Returns a textual representation of this time zone.

data/lib/active_support/version.rb

@@ -1,10 +1,11 @@
 module ActiveSupport
-  module VERSION #:nodoc:
-    MAJOR = 4
-    MINOR = 0
-    TINY  = 0
-    PRE   = "beta1"
+  # Returns the version of the currently loaded ActiveSupport as a Gem::Version
+  def self.version
+    Gem::Version.new "4.0.0.rc1"
+  end
 
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
+  module VERSION #:nodoc:
+    MAJOR, MINOR, TINY, PRE = ActiveSupport.version.segments
+    STRING = ActiveSupport.version.to_s
   end
 end

data/lib/active_support/xml_mini/jdom.rb

@@ -37,6 +37,12 @@ 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)

data/lib/active_support/xml_mini/libxmlsax.rb

@@ -32,7 +32,7 @@ module ActiveSupport
       end
 
       def on_start_element(name, attrs = {})
-        new_hash = { CONTENT_KEY => '' }.merge(attrs)
+        new_hash = { CONTENT_KEY => '' }.merge!(attrs)
         new_hash[HASH_SIZE_KEY] = new_hash.size + 1
 
         case current_hash[name]

data/lib/active_support/xml_mini/nokogirisax.rb

@@ -38,7 +38,7 @@ module ActiveSupport
       end
 
       def start_element(name, attrs = [])
-        new_hash = { CONTENT_KEY => '' }.merge(Hash[attrs])
+        new_hash = { CONTENT_KEY => '' }.merge!(Hash[attrs])
         new_hash[HASH_SIZE_KEY] = new_hash.size + 1
 
         case current_hash[name]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.6'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.6'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +50,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.33
+        version: 0.3.37
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.33
+        version: 0.3.37
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +216,6 @@ files:
 - lib/active_support/core_ext/string/output_safety.rb
 - lib/active_support/core_ext/string/starts_ends_with.rb
 - lib/active_support/core_ext/string/strip.rb
-- lib/active_support/core_ext/string/xchar.rb
 - lib/active_support/core_ext/string/zones.rb
 - lib/active_support/core_ext/string.rb
 - lib/active_support/core_ext/struct.rb
@@ -268,11 +273,13 @@ files:
 - lib/active_support/option_merger.rb
 - lib/active_support/ordered_hash.rb
 - lib/active_support/ordered_options.rb
+- lib/active_support/per_thread_registry.rb
 - lib/active_support/proxy_object.rb
 - lib/active_support/rails.rb
 - lib/active_support/railtie.rb
 - lib/active_support/rescuable.rb
 - lib/active_support/string_inquirer.rb
+- lib/active_support/subscriber.rb
 - lib/active_support/tagged_logging.rb
 - lib/active_support/test_case.rb
 - lib/active_support/testing/assertions.rb

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

@@ -1,18 +0,0 @@
-begin
-  # See http://fast-xs.rubyforge.org/ by Eric Wong.
-  # Also included with hpricot.
-  require 'fast_xs'
-rescue LoadError
-  # fast_xs extension unavailable
-else
-  begin
-    require 'builder'
-  rescue LoadError
-    # builder demands the first shot at defining String#to_xs
-  end
-
-  class String
-    alias_method :original_xs, :to_xs if method_defined?(:to_xs)
-    alias_method :to_xs, :fast_xs
-  end
-end