activesupport 1.4.2 → 1.4.3

data/CHANGELOG

@@ -1,3 +1,14 @@
+*1.4.3* (October 4th, 2007)
+
+* Demote Hash#to_xml to use XmlSimple#xml_in_string so it can't read files or stdin.  #8453 [candlerb, Jeremy Kemper]
+
+* Document Object#blank?.  #6491 [Chris Mear]
+
+* Update Dependencies to ignore constants inherited from ancestors. Closes #6951. [Nicholas Seckar]
+
+* Improved multibyte performance by relying less on exception raising #8159 [Blaine]
+
+
 *1.4.2* (March 12th, 2007)
 
 * Ruby 1.8.6 and 1.9 define private Time#to_date and #to_datetime; make them

data/lib/active_support/core_ext/blank.rb

@@ -1,5 +1,11 @@
-class Object #:nodoc:
-  # "", "   ", nil, [], and {} are blank
+class Object
+  # An object is blank if it's nil, empty, or a whitespace string.
+  # For example, "", "   ", nil, [], and {} are blank.
+  #
+  # This simplifies
+  #   if !address.nil? && !address.empty?
+  # to
+  #   if !address.blank?
   def blank?
     if respond_to?(:empty?) && respond_to?(:strip)
       empty? or strip.empty?
@@ -47,4 +53,4 @@ class Numeric #:nodoc:
   def blank?
     false
   end
-end
+end

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

@@ -1,6 +1,27 @@
 require 'date'
 require 'xml_simple'
 
+# Locked down XmlSimple#xml_in_string
+class XmlSimple
+  # Same as xml_in but doesn't try to smartly shoot itself in the foot.
+  def xml_in_string(string, options = nil)
+    handle_options('in', options)
+
+    @doc = parse(string)
+    result = collapse(@doc.root)
+
+    if @options['keeproot']
+      merge({}, @doc.root.name, result)
+    else
+      result
+    end
+  end
+
+  def self.xml_in_string(string, options = nil)
+    new.xml_in_string(string, options)
+  end
+end
+
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module Hash #:nodoc:
@@ -81,14 +102,14 @@ module ActiveSupport #:nodoc:
         module ClassMethods
           def from_xml(xml)
             # TODO: Refactor this into something much cleaner that doesn't rely on XmlSimple
-            undasherize_keys(typecast_xml_value(XmlSimple.xml_in(xml,
+            undasherize_keys(typecast_xml_value(XmlSimple.xml_in_string(xml,
               'forcearray'   => false,
               'forcecontent' => true,
               'keeproot'     => true,
               'contentkey'   => '__content__')
-            ))            
+            ))
           end
-          
+
           def create_from_xml(xml)
             ActiveSupport::Deprecation.warn("Hash.create_from_xml has been renamed to Hash.from_xml", caller)
             from_xml(xml)

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

@@ -18,4 +18,18 @@ class Module
     parents << Object unless parents.include? Object
     parents
   end
+  
+  # Return the constants that have been defined locally by this object and not
+  # in an ancestor. This method may miss some constants if their definition in
+  # the ancestor is identical to their definition in the receiver.
+  def local_constants
+    inherited = {}
+    ancestors.each do |anc|
+      next if anc == self
+      anc.constants.each { |const| inherited[const] = anc.const_get(const) }
+    end
+    constants.select do |const|
+      ! inherited.key?(const) || inherited[const].object_id != const_get(const).object_id
+    end
+  end
 end

data/lib/active_support/dependencies.rb

@@ -318,13 +318,13 @@ module Dependencies #:nodoc:
     watch_frames = descs.collect do |desc|
       if desc.is_a? Module
         mod_name = desc.name
-        initial_constants = desc.constants
+        initial_constants = desc.local_constants
       elsif desc.is_a?(String) || desc.is_a?(Symbol)
         mod_name = desc.to_s
         
         # Handle the case where the module has yet to be defined.
         initial_constants = if qualified_const_defined?(mod_name)
-          mod_name.constantize.constants
+          mod_name.constantize.local_constants
         else
          []
         end
@@ -349,7 +349,7 @@ module Dependencies #:nodoc:
         
         mod = mod_name.constantize
         next [] unless mod.is_a? Module
-        new_constants = mod.constants - prior_constants
+        new_constants = mod.local_constants - prior_constants
         
         # Make sure no other frames takes credit for these constants.
         constant_watch_stack.each do |frame_name, constants|

data/lib/active_support/multibyte/chars.rb

@@ -43,7 +43,7 @@ module ActiveSupport::Multibyte #:nodoc:
     
     # Create a new Chars instance.
     def initialize(str)
-      @string = (str.string rescue str)
+      @string = str.respond_to?(:string) ? str.string : str
     end
     
     # Returns -1, 0 or +1 depending on whether the Chars object is to be sorted before, equal or after the
@@ -70,18 +70,18 @@ module ActiveSupport::Multibyte #:nodoc:
     def method_missing(m, *a, &b)
       begin
         # Simulate methods with a ! at the end because we can't touch the enclosed string from the handlers.
-        if m.to_s =~ /^(.*)\!$/
+        if m.to_s =~ /^(.*)\!$/ && handler.respond_to?($1)
           result = handler.send($1, @string, *a, &b)
           if result == @string
             result = nil
           else
             @string.replace result
           end
-        else
+        elsif handler.respond_to?(m)
           result = handler.send(m, @string, *a, &b)
+        else
+          result = @string.send(m, *a, &b)
         end
-      rescue NoMethodError
-        result = @string.send(m, *a, &b)
       rescue Handlers::EncodingError
         @string.replace handler.tidy_bytes(@string)
         retry
@@ -126,4 +126,4 @@ begin
   ActiveSupport::Multibyte::Chars.handler = ActiveSupport::Multibyte::Handlers::UTF8HandlerProc
 rescue LoadError
   ActiveSupport::Multibyte::Chars.handler = ActiveSupport::Multibyte::Handlers::UTF8Handler
-end
+end

data/lib/active_support/version.rb

@@ -2,7 +2,7 @@ module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 4
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: activesupport
 version: !ruby/object:Gem::Version 
-  version: 1.4.2
-date: 2007-03-13 00:00:00 -05:00
+  version: 1.4.3
+date: 2007-10-04 00:00:00 -05:00
 summary: Support and utility classes used by the Rails framework.
 require_paths: 
 - lib
@@ -32,85 +32,52 @@ files:
 - CHANGELOG
 - README
 - lib/active_support
-- lib/active_support.rb
 - lib/active_support/binding_of_caller.rb
 - lib/active_support/breakpoint.rb
 - lib/active_support/caching_tools.rb
 - lib/active_support/clean_logger.rb
 - lib/active_support/core_ext
-- lib/active_support/core_ext.rb
-- lib/active_support/dependencies.rb
-- lib/active_support/deprecation.rb
-- lib/active_support/inflections.rb
-- lib/active_support/inflector.rb
-- lib/active_support/json
-- lib/active_support/json.rb
-- lib/active_support/multibyte
-- lib/active_support/multibyte.rb
-- lib/active_support/option_merger.rb
-- lib/active_support/ordered_options.rb
-- lib/active_support/reloadable.rb
-- lib/active_support/values
-- lib/active_support/vendor
-- lib/active_support/version.rb
-- lib/active_support/whiny_nil.rb
 - lib/active_support/core_ext/array
+- lib/active_support/core_ext/array/conversions.rb
+- lib/active_support/core_ext/array/grouping.rb
 - lib/active_support/core_ext/array.rb
 - lib/active_support/core_ext/bigdecimal
+- lib/active_support/core_ext/bigdecimal/formatting.rb
 - lib/active_support/core_ext/bigdecimal.rb
 - lib/active_support/core_ext/blank.rb
 - lib/active_support/core_ext/cgi
+- lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
 - lib/active_support/core_ext/cgi.rb
 - lib/active_support/core_ext/class
+- lib/active_support/core_ext/class/attribute_accessors.rb
+- lib/active_support/core_ext/class/inheritable_attributes.rb
+- lib/active_support/core_ext/class/removal.rb
 - lib/active_support/core_ext/class.rb
 - lib/active_support/core_ext/date
+- lib/active_support/core_ext/date/conversions.rb
 - lib/active_support/core_ext/date.rb
 - lib/active_support/core_ext/enumerable.rb
 - lib/active_support/core_ext/exception.rb
 - lib/active_support/core_ext/hash
-- lib/active_support/core_ext/hash.rb
-- lib/active_support/core_ext/integer
-- lib/active_support/core_ext/integer.rb
-- lib/active_support/core_ext/kernel
-- 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
-- lib/active_support/core_ext/module.rb
-- lib/active_support/core_ext/name_error.rb
-- lib/active_support/core_ext/numeric
-- lib/active_support/core_ext/numeric.rb
-- lib/active_support/core_ext/object
-- lib/active_support/core_ext/object.rb
-- lib/active_support/core_ext/pathname
-- lib/active_support/core_ext/pathname.rb
-- lib/active_support/core_ext/proc.rb
-- lib/active_support/core_ext/range
-- lib/active_support/core_ext/range.rb
-- lib/active_support/core_ext/string
-- lib/active_support/core_ext/string.rb
-- lib/active_support/core_ext/symbol.rb
-- lib/active_support/core_ext/time
-- lib/active_support/core_ext/time.rb
-- lib/active_support/core_ext/array/conversions.rb
-- lib/active_support/core_ext/array/grouping.rb
-- lib/active_support/core_ext/bigdecimal/formatting.rb
-- lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
-- lib/active_support/core_ext/class/attribute_accessors.rb
-- lib/active_support/core_ext/class/inheritable_attributes.rb
-- lib/active_support/core_ext/class/removal.rb
-- lib/active_support/core_ext/date/conversions.rb
 - lib/active_support/core_ext/hash/conversions.rb
 - lib/active_support/core_ext/hash/diff.rb
 - lib/active_support/core_ext/hash/indifferent_access.rb
 - lib/active_support/core_ext/hash/keys.rb
 - lib/active_support/core_ext/hash/reverse_merge.rb
+- lib/active_support/core_ext/hash.rb
+- lib/active_support/core_ext/integer
 - lib/active_support/core_ext/integer/even_odd.rb
 - lib/active_support/core_ext/integer/inflections.rb
+- lib/active_support/core_ext/integer.rb
+- lib/active_support/core_ext/kernel
 - lib/active_support/core_ext/kernel/agnostics.rb
 - lib/active_support/core_ext/kernel/daemonizing.rb
 - lib/active_support/core_ext/kernel/reporting.rb
 - lib/active_support/core_ext/kernel/requires.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
 - lib/active_support/core_ext/module/aliasing.rb
 - lib/active_support/core_ext/module/attr_internal.rb
 - lib/active_support/core_ext/module/attribute_accessors.rb
@@ -118,40 +85,73 @@ files:
 - lib/active_support/core_ext/module/inclusion.rb
 - lib/active_support/core_ext/module/introspection.rb
 - lib/active_support/core_ext/module/loading.rb
+- lib/active_support/core_ext/module.rb
+- lib/active_support/core_ext/name_error.rb
+- lib/active_support/core_ext/numeric
 - lib/active_support/core_ext/numeric/bytes.rb
 - lib/active_support/core_ext/numeric/time.rb
+- lib/active_support/core_ext/numeric.rb
+- lib/active_support/core_ext/object
 - lib/active_support/core_ext/object/extending.rb
 - lib/active_support/core_ext/object/misc.rb
+- lib/active_support/core_ext/object.rb
+- lib/active_support/core_ext/pathname
 - lib/active_support/core_ext/pathname/clean_within.rb
+- lib/active_support/core_ext/pathname.rb
+- lib/active_support/core_ext/proc.rb
+- lib/active_support/core_ext/range
 - lib/active_support/core_ext/range/conversions.rb
+- lib/active_support/core_ext/range.rb
+- lib/active_support/core_ext/string
 - lib/active_support/core_ext/string/access.rb
 - lib/active_support/core_ext/string/conversions.rb
 - lib/active_support/core_ext/string/inflections.rb
 - lib/active_support/core_ext/string/iterators.rb
 - lib/active_support/core_ext/string/starts_ends_with.rb
 - lib/active_support/core_ext/string/unicode.rb
+- lib/active_support/core_ext/string.rb
+- lib/active_support/core_ext/symbol.rb
+- lib/active_support/core_ext/time
 - lib/active_support/core_ext/time/calculations.rb
 - lib/active_support/core_ext/time/conversions.rb
+- lib/active_support/core_ext/time.rb
+- lib/active_support/core_ext.rb
+- lib/active_support/dependencies.rb
+- lib/active_support/deprecation.rb
+- lib/active_support/inflections.rb
+- lib/active_support/inflector.rb
+- lib/active_support/json
 - lib/active_support/json/encoders
-- lib/active_support/json/encoders.rb
 - lib/active_support/json/encoders/core.rb
+- lib/active_support/json/encoders.rb
+- lib/active_support/json.rb
+- lib/active_support/multibyte
 - lib/active_support/multibyte/chars.rb
 - lib/active_support/multibyte/generators
-- lib/active_support/multibyte/handlers
 - lib/active_support/multibyte/generators/generate_tables.rb
+- lib/active_support/multibyte/handlers
 - lib/active_support/multibyte/handlers/passthru_handler.rb
 - lib/active_support/multibyte/handlers/utf8_handler.rb
 - lib/active_support/multibyte/handlers/utf8_handler_proc.rb
+- lib/active_support/multibyte.rb
+- lib/active_support/option_merger.rb
+- lib/active_support/ordered_options.rb
+- lib/active_support/reloadable.rb
+- lib/active_support/values
 - lib/active_support/values/time_zone.rb
 - lib/active_support/values/unicode_tables.dat
+- lib/active_support/vendor
 - lib/active_support/vendor/builder
-- lib/active_support/vendor/builder.rb
-- lib/active_support/vendor/xml_simple.rb
 - lib/active_support/vendor/builder/blankslate.rb
 - lib/active_support/vendor/builder/xchar.rb
 - lib/active_support/vendor/builder/xmlbase.rb
 - lib/active_support/vendor/builder/xmlevents.rb
 - lib/active_support/vendor/builder/xmlmarkup.rb
+- lib/active_support/vendor/builder.rb
+- lib/active_support/vendor/xml_simple.rb
+- lib/active_support/version.rb
+- lib/active_support/whiny_nil.rb
+- lib/active_support.rb
 test_files: []
 
 rdoc_options: []