activesupport 5.0.7.2 → 5.1.0.beta1

data/lib/active_support/xml_mini/libxml.rb

@@ -1,6 +1,6 @@
-require 'libxml'
-require 'active_support/core_ext/object/blank'
-require 'stringio'
+require "libxml"
+require "active_support/core_ext/object/blank"
+require "stringio"
 
 module ActiveSupport
   module XmlMini_LibXML #:nodoc:
@@ -11,16 +11,17 @@ module ActiveSupport
     #   XML Document string or IO to parse
     def parse(data)
       if !data.respond_to?(:read)
-        data = StringIO.new(data || '')
+        data = StringIO.new(data || "")
       end
 
-      if data.eof?
+      char = data.getc
+      if char.nil?
         {}
       else
+        data.ungetc(char)
         LibXML::XML::Parser.io(data).parse.to_hash
       end
     end
-
   end
 end
 
@@ -33,20 +34,20 @@ module LibXML #:nodoc:
     end
 
     module Node #:nodoc:
-      CONTENT_ROOT = '__content__'.freeze
+      CONTENT_ROOT = "__content__".freeze
 
       # Convert XML document to hash.
       #
       # hash::
       #   Hash to merge the converted element into.
-      def to_hash(hash={})
+      def to_hash(hash = {})
         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
+        when Array then hash[name] << node_hash
+        when Hash  then hash[name] = [hash[name], node_hash]
+        when nil   then hash[name] = node_hash
         end
 
         # Handle child elements
@@ -54,7 +55,7 @@ module LibXML #:nodoc:
           if c.element?
             c.to_hash(node_hash)
           elsif c.text? || c.cdata?
-            node_hash[CONTENT_ROOT] ||= ''
+            node_hash[CONTENT_ROOT] ||= ""
             node_hash[CONTENT_ROOT] << c.content
           end
         end
@@ -73,5 +74,7 @@ module LibXML #:nodoc:
   end
 end
 
+# :enddoc:
+
 LibXML::XML::Document.include(LibXML::Conversions::Document)
 LibXML::XML::Node.include(LibXML::Conversions::Node)

data/lib/active_support/xml_mini/libxmlsax.rb

@@ -1,6 +1,6 @@
-require 'libxml'
-require 'active_support/core_ext/object/blank'
-require 'stringio'
+require "libxml"
+require "active_support/core_ext/object/blank"
+require "stringio"
 
 module ActiveSupport
   module XmlMini_LibXMLSAX #:nodoc:
@@ -9,11 +9,10 @@ module ActiveSupport
     # 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
+      CONTENT_KEY   = "__content__".freeze
+      HASH_SIZE_KEY = "__hash_size__".freeze
 
       attr_reader :hash
 
@@ -22,7 +21,7 @@ module ActiveSupport
       end
 
       def on_start_document
-        @hash = { CONTENT_KEY => '' }
+        @hash = { CONTENT_KEY => "" }
         @hash_stack = [@hash]
       end
 
@@ -32,20 +31,20 @@ 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]
-          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
+        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] == ''
+        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
@@ -63,15 +62,18 @@ module ActiveSupport
 
     def parse(data)
       if !data.respond_to?(:read)
-        data = StringIO.new(data || '')
+        data = StringIO.new(data || "")
       end
 
-      if data.eof?
+      char = data.getc
+      if char.nil?
         {}
       else
+        data.ungetc(char)
+
         LibXML::XML::Error.set_handler(&LibXML::XML::Error::QUIET_HANDLER)
         parser = LibXML::XML::SaxParser.io(data)
-        document = self.document_class.new
+        document = document_class.new
 
         parser.callbacks = document
         parser.parse

data/lib/active_support/xml_mini/nokogiri.rb

@@ -1,11 +1,11 @@
 begin
-  require 'nokogiri'
+  require "nokogiri"
 rescue LoadError => e
   $stderr.puts "You don't have nokogiri installed in your application. Please add it to your Gemfile and run bundle install"
   raise e
 end
-require 'active_support/core_ext/object/blank'
-require 'stringio'
+require "active_support/core_ext/object/blank"
+require "stringio"
 
 module ActiveSupport
   module XmlMini_Nokogiri #:nodoc:
@@ -16,12 +16,14 @@ module ActiveSupport
     #   XML Document string or IO to parse
     def parse(data)
       if !data.respond_to?(:read)
-        data = StringIO.new(data || '')
+        data = StringIO.new(data || "")
       end
 
-      if data.eof?
+      char = data.getc
+      if char.nil?
         {}
       else
+        data.ungetc(char)
         doc = Nokogiri::XML(data)
         raise doc.errors.first if doc.errors.length > 0
         doc.to_hash
@@ -36,20 +38,20 @@ module ActiveSupport
       end
 
       module Node #:nodoc:
-        CONTENT_ROOT = '__content__'.freeze
+        CONTENT_ROOT = "__content__".freeze
 
         # Convert XML document to hash.
         #
         # hash::
         #   Hash to merge the converted element into.
-        def to_hash(hash={})
+        def to_hash(hash = {})
           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
+          when Array then hash[name] << node_hash
+          when Hash  then hash[name] = [hash[name], node_hash]
+          when nil   then hash[name] = node_hash
           end
 
           # Handle child elements
@@ -57,7 +59,7 @@ module ActiveSupport
             if c.element?
               c.to_hash(node_hash)
             elsif c.text? || c.cdata?
-              node_hash[CONTENT_ROOT] ||= ''
+              node_hash[CONTENT_ROOT] ||= ""
               node_hash[CONTENT_ROOT] << c.content
             end
           end

data/lib/active_support/xml_mini/nokogirisax.rb

@@ -1,11 +1,11 @@
 begin
-  require 'nokogiri'
+  require "nokogiri"
 rescue LoadError => e
   $stderr.puts "You don't have nokogiri installed in your application. Please add it to your Gemfile and run bundle install"
   raise e
 end
-require 'active_support/core_ext/object/blank'
-require 'stringio'
+require "active_support/core_ext/object/blank"
+require "stringio"
 
 module ActiveSupport
   module XmlMini_NokogiriSAX #:nodoc:
@@ -14,9 +14,8 @@ module ActiveSupport
     # 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
+      CONTENT_KEY   = "__content__".freeze
+      HASH_SIZE_KEY = "__hash_size__".freeze
 
       attr_reader :hash
 
@@ -38,20 +37,20 @@ 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]
-          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
+        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] == ''
+        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
@@ -69,13 +68,15 @@ module ActiveSupport
 
     def parse(data)
       if !data.respond_to?(:read)
-        data = StringIO.new(data || '')
+        data = StringIO.new(data || "")
       end
 
-      if data.eof?
+      char = data.getc
+      if char.nil?
         {}
       else
-        document = self.document_class.new
+        data.ungetc(char)
+        document = document_class.new
         parser = Nokogiri::XML::SAX::Parser.new(document)
         parser.parse(data)
         document.hash

data/lib/active_support/xml_mini/rexml.rb

@@ -1,12 +1,12 @@
-require 'active_support/core_ext/kernel/reporting'
-require 'active_support/core_ext/object/blank'
-require 'stringio'
+require "active_support/core_ext/kernel/reporting"
+require "active_support/core_ext/object/blank"
+require "stringio"
 
 module ActiveSupport
   module XmlMini_REXML #:nodoc:
     extend self
 
-    CONTENT_KEY = '__content__'.freeze
+    CONTENT_KEY = "__content__".freeze
 
     # Parse an XML Document string or IO into a simple hash.
     #
@@ -17,13 +17,13 @@ module ActiveSupport
     #   XML Document string or IO to parse
     def parse(data)
       if !data.respond_to?(:read)
-        data = StringIO.new(data || '')
+        data = StringIO.new(data || "")
       end
 
       if data.eof?
         {}
       else
-        silence_warnings { require 'rexml/document' } unless defined?(REXML::Document)
+        silence_warnings { require "rexml/document" } unless defined?(REXML::Document)
         doc = REXML::Document.new(data)
 
         if doc.root
@@ -55,7 +55,7 @@ module ActiveSupport
         hash = get_attributes(element)
 
         if element.has_elements?
-          element.each_element {|child| merge_element!(hash, child, depth - 1) }
+          element.each_element { |child| merge_element!(hash, child, depth - 1) }
           merge_texts!(hash, element) unless empty_content?(element)
           hash
         else
@@ -74,7 +74,7 @@ module ActiveSupport
           hash
         else
           # must use value to prevent double-escaping
-          texts = ''
+          texts = ""
           element.texts.each { |t| texts << t.value }
           merge!(hash, CONTENT_KEY, texts)
         end
@@ -113,7 +113,7 @@ module ActiveSupport
       #   XML element to extract attributes from.
       def get_attributes(element)
         attributes = {}
-        element.attributes.each { |n,v| attributes[n] = v }
+        element.attributes.each { |n, v| attributes[n] = v }
         attributes
       end
 

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 5.0.7.2
+  version: 5.1.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +98,6 @@ files:
 - lib/active_support/cache/strategy/local_cache_middleware.rb
 - lib/active_support/callbacks.rb
 - lib/active_support/concern.rb
-- lib/active_support/concurrency/latch.rb
 - lib/active_support/concurrency/share_lock.rb
 - lib/active_support/configurable.rb
 - lib/active_support/core_ext.rb
@@ -159,7 +152,6 @@ files:
 - lib/active_support/core_ext/kernel.rb
 - lib/active_support/core_ext/kernel/agnostics.rb
 - lib/active_support/core_ext/kernel/concern.rb
-- lib/active_support/core_ext/kernel/debugger.rb
 - lib/active_support/core_ext/kernel/reporting.rb
 - lib/active_support/core_ext/kernel/singleton_class.rb
 - lib/active_support/core_ext/load_error.rb
@@ -174,8 +166,6 @@ files:
 - 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_transplanting.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/name_error.rb
@@ -218,13 +208,11 @@ files:
 - lib/active_support/core_ext/string/starts_ends_with.rb
 - lib/active_support/core_ext/string/strip.rb
 - lib/active_support/core_ext/string/zones.rb
-- lib/active_support/core_ext/struct.rb
 - lib/active_support/core_ext/time.rb
 - lib/active_support/core_ext/time/acts_like.rb
 - lib/active_support/core_ext/time/calculations.rb
 - lib/active_support/core_ext/time/compatibility.rb
 - lib/active_support/core_ext/time/conversions.rb
-- lib/active_support/core_ext/time/marshal.rb
 - lib/active_support/core_ext/time/zones.rb
 - lib/active_support/core_ext/uri.rb
 - lib/active_support/dependencies.rb
@@ -337,11 +325,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A toolkit of support libraries and Ruby core extensions extracted from the

data/lib/active_support/concurrency/latch.rb

@@ -1,26 +0,0 @@
-require 'concurrent/atomic/count_down_latch'
-
-module ActiveSupport
-  module Concurrency
-    class Latch
-
-      def initialize(count = 1)
-        if count == 1
-          ActiveSupport::Deprecation.warn("ActiveSupport::Concurrency::Latch is deprecated. Please use Concurrent::Event instead.")
-        else
-          ActiveSupport::Deprecation.warn("ActiveSupport::Concurrency::Latch is deprecated. Please use Concurrent::CountDownLatch instead.")
-        end
-
-        @inner = Concurrent::CountDownLatch.new(count)
-      end
-
-      def release
-        @inner.count_down
-      end
-
-      def await
-        @inner.wait(nil)
-      end
-    end
-  end
-end