activesupport 2.3.5 → 2.3.6.pre

data/lib/active_support/version.rb

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

data/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

data/lib/active_support/xml_mini/libxml.rb

@@ -9,15 +9,12 @@ module ActiveSupport
     # string::
     #   XML Document string to parse
     def parse(string)
-      LibXML::XML.default_keep_blanks = false
-
       if string.blank?
         {}
       else
         LibXML::XML::Parser.string(string.strip).parse.to_hash
       end
     end
-
   end
 end
 
@@ -30,101 +27,44 @@ module LibXML
     end
 
     module Node
-      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?
-          raise LibXML::XML::Error if content.length >= LIB_XML_LIMIT
-          hash[CONTENT_ROOT] = 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
+        node_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
+          else raise "Unexpected error during hash insertion!"
         end
-        hash
-      end
 
-      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
+        # 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
-          sub_hash
         end
 
-        # Insert children into hash
-        #
-        # hash::
-        #   Hash to merge the children into.
-        def children_to_hash(hash={})
-          each { |child| child.to_hash(hash) }
-          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

data/lib/active_support/xml_mini/libxmlsax.rb

@@ -0,0 +1,74 @@
+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 = { CONTENT_KEY => '' }
+        @hash_stack = [@hash]
+      end
+
+      def on_end_document
+        @hash = @hash_stack.pop
+        @hash.delete(CONTENT_KEY)
+      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(string)
+      return {} if string.blank?
+      LibXML::XML::Error.set_handler(&LibXML::XML::Error::QUIET_HANDLER)
+      parser = LibXML::XML::SaxParser.string(string)
+      document = self.document_class.new
+
+      parser.callbacks = document
+      parser.parse
+      document.hash
+    end
+  end
+end

data/lib/active_support/xml_mini/nokogiri.rb

@@ -12,7 +12,7 @@ module ActiveSupport
       if string.blank?
         {}
       else
-        doc = Nokogiri::XML(string) { |cfg| cfg.noblanks }
+        doc = Nokogiri::XML(string)
         raise doc.errors.first if doc.errors.length > 0
         doc.to_hash
       end
@@ -26,40 +26,43 @@ module ActiveSupport
       end
 
       module Node
-        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
+          node_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
+            else raise "Unexpected error during hash insertion!"
           end
 
-          children.each { |child|
-            next if child.blank? && 'file' != self['type']
+          # 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
 
-            if child.text? || child.cdata?
-              (attributes[CONTENT_ROOT] ||= '') << child.content
-              next
-            end
+          # 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
 
-            child.to_hash attributes
-          }
+          # Handle attributes
+          attribute_nodes.each { |a| node_hash[a.node_name] = a.value }
 
           hash
         end
-
-        def attributes_as_hash
-          Hash[*(attribute_nodes.map { |node|
-            [node.node_name, node.value]
-          }.flatten)]
-        end
       end
     end
 

data/lib/active_support/xml_mini/nokogirisax.rb

@@ -0,0 +1,73 @@
+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 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(string)
+      return {} if string.blank?
+      document = self.document_class.new
+      parser = Nokogiri::XML::SAX::Parser.new(document)
+      parser.parse(string)
+      document.hash
+    end
+  end
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activesupport
 version: !ruby/object:Gem::Version 
-  version: 2.3.5
+  prerelease: true
+  segments: 
+  - 2
+  - 3
+  - 6
+  - pre
+  version: 2.3.6.pre
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-27 00:00:00 +13:00
+date: 2010-03-07 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -116,6 +122,7 @@ files:
 - lib/active_support/core_ext/object/instance_variables.rb
 - lib/active_support/core_ext/object/metaclass.rb
 - lib/active_support/core_ext/object/misc.rb
+- lib/active_support/core_ext/object/singleton_class.rb
 - lib/active_support/core_ext/object.rb
 - lib/active_support/core_ext/pathname/clean_within.rb
 - lib/active_support/core_ext/pathname.rb
@@ -156,6 +163,7 @@ files:
 - lib/active_support/inflections.rb
 - lib/active_support/inflector.rb
 - lib/active_support/json/backends/jsongem.rb
+- lib/active_support/json/backends/yajl.rb
 - lib/active_support/json/backends/yaml.rb
 - lib/active_support/json/decoding.rb
 - lib/active_support/json/encoders/date.rb
@@ -207,19 +215,93 @@ files:
 - lib/active_support/vendor/builder-2.1.2/builder/xmlevents.rb
 - lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb
 - lib/active_support/vendor/builder-2.1.2/builder.rb
-- lib/active_support/vendor/i18n-0.1.3/i18n.gemspec
-- lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend/simple.rb
-- lib/active_support/vendor/i18n-0.1.3/lib/i18n/exceptions.rb
-- lib/active_support/vendor/i18n-0.1.3/lib/i18n.rb
-- lib/active_support/vendor/i18n-0.1.3/MIT-LICENSE
-- lib/active_support/vendor/i18n-0.1.3/Rakefile
-- lib/active_support/vendor/i18n-0.1.3/README.textile
-- lib/active_support/vendor/i18n-0.1.3/test/all.rb
-- lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb
-- lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb
-- lib/active_support/vendor/i18n-0.1.3/test/locale/en.rb
-- lib/active_support/vendor/i18n-0.1.3/test/locale/en.yml
-- lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb
+- lib/active_support/vendor/i18n-0.3.3/benchmark/example.yml
+- lib/active_support/vendor/i18n-0.3.3/benchmark/run.rb
+- lib/active_support/vendor/i18n-0.3.3/CHANGELOG.textile
+- lib/active_support/vendor/i18n-0.3.3/contributors.txt
+- lib/active_support/vendor/i18n-0.3.3/i18n.gemspec
+- lib/active_support/vendor/i18n-0.3.3/init.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/active_record/missing.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/active_record/store_procs.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/active_record/translation.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/active_record.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/base.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/cache.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/cascade.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/chain.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/fallbacks.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/fast.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/gettext.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/helpers.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/interpolation_compiler.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/metadata.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/pluralization.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend/simple.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/backend.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/core_ext/object/meta_class.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/core_ext/string/interpolate.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/exceptions.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/gettext.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/helpers/gettext.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/helpers.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/locale/fallbacks.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/locale/tag/parents.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/locale/tag/rfc4646.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/locale/tag/simple.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/locale/tag.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/locale.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n/version.rb
+- lib/active_support/vendor/i18n-0.3.3/lib/i18n.rb
+- lib/active_support/vendor/i18n-0.3.3/MIT-LICENSE
+- lib/active_support/vendor/i18n-0.3.3/Rakefile
+- lib/active_support/vendor/i18n-0.3.3/README.textile
+- lib/active_support/vendor/i18n-0.3.3/test/all.rb
+- lib/active_support/vendor/i18n-0.3.3/test/api/basics.rb
+- lib/active_support/vendor/i18n-0.3.3/test/api/defaults.rb
+- lib/active_support/vendor/i18n-0.3.3/test/api/interpolation.rb
+- lib/active_support/vendor/i18n-0.3.3/test/api/link.rb
+- lib/active_support/vendor/i18n-0.3.3/test/api/localization/date.rb
+- lib/active_support/vendor/i18n-0.3.3/test/api/localization/date_time.rb
+- lib/active_support/vendor/i18n-0.3.3/test/api/localization/procs.rb
+- lib/active_support/vendor/i18n-0.3.3/test/api/localization/time.rb
+- lib/active_support/vendor/i18n-0.3.3/test/api/lookup.rb
+- lib/active_support/vendor/i18n-0.3.3/test/api/pluralization.rb
+- lib/active_support/vendor/i18n-0.3.3/test/api/procs.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/api/active_record_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/api/all_features_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/api/cascade_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/api/chain_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/api/fallbacks_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/api/fast_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/api/pluralization_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/api/simple_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/backend/active_record/missing_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/backend/active_record_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/backend/cache_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/backend/cascade_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/backend/chain_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/backend/fallbacks_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/backend/fast_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/backend/helpers_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/backend/interpolation_compiler_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/backend/metadata_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/backend/pluralization_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/backend/simple_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/core_ext/string/interpolate_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/gettext/api_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/gettext/backend_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/i18n_exceptions_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/i18n_load_path_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/i18n_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/locale/fallbacks_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/locale/tag/rfc4646_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/cases/locale/tag/simple_test.rb
+- lib/active_support/vendor/i18n-0.3.3/test/fixtures/locales/de.po
+- lib/active_support/vendor/i18n-0.3.3/test/fixtures/locales/en.rb
+- lib/active_support/vendor/i18n-0.3.3/test/fixtures/locales/en.yml
+- lib/active_support/vendor/i18n-0.3.3/test/fixtures/locales/plurals.rb
+- lib/active_support/vendor/i18n-0.3.3/test/test_helper.rb
+- lib/active_support/vendor/i18n-0.3.3/vendor/po_parser.rb
 - lib/active_support/vendor/memcache-client-1.7.4/memcache.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/data_timezone.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/data_timezone_info.rb
@@ -364,7 +446,9 @@ files:
 - lib/active_support/whiny_nil.rb
 - lib/active_support/xml_mini/jdom.rb
 - lib/active_support/xml_mini/libxml.rb
+- lib/active_support/xml_mini/libxmlsax.rb
 - lib/active_support/xml_mini/nokogiri.rb
+- lib/active_support/xml_mini/nokogirisax.rb
 - lib/active_support/xml_mini/rexml.rb
 - lib/active_support/xml_mini.rb
 - lib/active_support.rb
@@ -382,18 +466,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: activesupport
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Support and utility classes used by the Rails framework.