activesupport 4.2.11.3 → 5.0.0.beta1

data/lib/active_support/values/time_zone.rb

@@ -1,5 +1,5 @@
 require 'tzinfo'
-require 'thread_safe'
+require 'concurrent/map'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
 
@@ -23,15 +23,9 @@ module ActiveSupport
   #     config.time_zone = 'Eastern Time (US & Canada)'
   #   end
   #
-  #   Time.zone      # => #<TimeZone:0x514834...>
+  #   Time.zone      # => #<ActiveSupport::TimeZone:0x514834...>
   #   Time.zone.name # => "Eastern Time (US & Canada)"
   #   Time.zone.now  # => Sun, 18 May 2008 14:30:44 EDT -04:00
-  #
-  # The version of TZInfo bundled with Active Support only includes the
-  # definitions necessary to support the zones defined by the TimeZone class.
-  # If you need to use zones that aren't defined by TimeZone, you'll need to
-  # install the TZInfo gem (if a recent version of the gem is installed locally,
-  # this will be used instead of the bundled version.)
   class TimeZone
     # Keys are Rails TimeZone names, values are TZInfo identifiers.
     MAPPING = {
@@ -92,7 +86,8 @@ module ActiveSupport
       "Paris"                        => "Europe/Paris",
       "Amsterdam"                    => "Europe/Amsterdam",
       "Berlin"                       => "Europe/Berlin",
-      "Bern"                         => "Europe/Berlin",
+      "Bern"                         => "Europe/Zurich",
+      "Zurich"                       => "Europe/Zurich",
       "Rome"                         => "Europe/Rome",
       "Stockholm"                    => "Europe/Stockholm",
       "Vienna"                       => "Europe/Vienna",
@@ -189,13 +184,13 @@ module ActiveSupport
     UTC_OFFSET_WITH_COLON = '%s%02d:%02d'
     UTC_OFFSET_WITHOUT_COLON = UTC_OFFSET_WITH_COLON.tr(':', '')
 
-    @lazy_zones_map = ThreadSafe::Cache.new
+    @lazy_zones_map = Concurrent::Map.new
 
     class << self
       # Assumes self represents an offset from UTC in seconds (as returned from
       # Time#utc_offset) and turns this into an +HH:MM formatted string.
       #
-      #   TimeZone.seconds_to_utc_offset(-21_600) # => "-06:00"
+      #   ActiveSupport::TimeZone.seconds_to_utc_offset(-21_600) # => "-06:00"
       def seconds_to_utc_offset(seconds, colon = true)
         format = colon ? UTC_OFFSET_WITH_COLON : UTC_OFFSET_WITHOUT_COLON
         sign = (seconds < 0 ? '-' : '+')
@@ -205,7 +200,7 @@ module ActiveSupport
       end
 
       def find_tzinfo(name)
-        TZInfo::TimezoneProxy.new(MAPPING[name] || name)
+        TZInfo::Timezone.new(MAPPING[name] || name)
       end
 
       alias_method :create, :new
@@ -224,13 +219,6 @@ module ActiveSupport
         @zones ||= zones_map.values.sort
       end
 
-      def zones_map #:nodoc:
-        @zones_map ||= begin
-          MAPPING.each_key {|place| self[place]} # load all the zones
-          @lazy_zones_map
-        end
-      end
-
       # Locate a specific time zone object. If the argument is a string, it
       # is interpreted to mean the name of the timezone to locate. If it is a
       # numeric value it is either the hour offset, or the second offset, of the
@@ -240,7 +228,7 @@ module ActiveSupport
         case arg
           when String
           begin
-            @lazy_zones_map[arg] ||= create(arg).tap { |tz| tz.utc_offset }
+            @lazy_zones_map[arg] ||= create(arg)
           rescue TZInfo::InvalidTimezoneIdentifier
             nil
           end
@@ -257,6 +245,14 @@ module ActiveSupport
       def us_zones
         @us_zones ||= all.find_all { |z| z.name =~ /US|Arizona|Indiana|Hawaii|Alaska/ }
       end
+
+      private
+        def zones_map
+          @zones_map ||= begin
+            MAPPING.each_key {|place| self[place]} # load all the zones
+            @lazy_zones_map
+          end
+        end
     end
 
     include Comparable
@@ -271,10 +267,7 @@ module ActiveSupport
       @name = name
       @utc_offset = utc_offset
       @tzinfo = tzinfo || TimeZone.find_tzinfo(name)
-    end
-
-    def init_with(coder) #:nodoc:
-      initialize(coder['name'])
+      @current_period = nil
     end
 
     # Returns the offset of this time zone from UTC in seconds.
@@ -282,12 +275,17 @@ module ActiveSupport
       if @utc_offset
         @utc_offset
       else
-        tzinfo.current_period.utc_offset if tzinfo && tzinfo.current_period
+        @current_period ||= tzinfo.current_period if tzinfo
+        @current_period.utc_offset if @current_period
       end
     end
 
-    # Returns the offset of this time zone as a formatted string, of the
-    # format "+HH:MM".
+    # Returns a formatted string of the offset from UTC, or an alternative
+    # string if the time zone is already UTC.
+    #
+    #   zone = ActiveSupport::TimeZone['Central Time (US & Canada)']
+    #   zone.formatted_offset        # => "-06:00"
+    #   zone.formatted_offset(false) # => "-0600"
     def formatted_offset(colon=true, alternate_utc_string = nil)
       utc_offset == 0 && alternate_utc_string || self.class.seconds_to_utc_offset(utc_offset, colon)
     end
@@ -349,24 +347,31 @@ module ActiveSupport
     #
     #   Time.zone.parse('Mar 2000') # => Wed, 01 Mar 2000 00:00:00 HST -10:00
     def parse(str, now=now())
-      parts = Date._parse(str, false)
-      return if parts.empty?
-
-      time = Time.new(
-        parts.fetch(:year, now.year),
-        parts.fetch(:mon, now.month),
-        parts.fetch(:mday, parts[:year] || parts[:mon] ? 1 : now.day),
-        parts.fetch(:hour, 0),
-        parts.fetch(:min, 0),
-        parts.fetch(:sec, 0) + parts.fetch(:sec_fraction, 0),
-        parts.fetch(:offset, 0)
-      )
-
-      if parts[:offset]
-        TimeWithZone.new(time.utc, self)
-      else
-        TimeWithZone.new(nil, self, time)
-      end
+      parts_to_time(Date._parse(str, false), now)
+    end
+
+    # Parses +str+ according to +format+ and returns an ActiveSupport::TimeWithZone.
+    #
+    # Assumes that +str+ is a time in the time zone +self+,
+    # unless +format+ includes an explicit time zone.
+    # (This is the same behavior as +parse+.)
+    # In either case, the returned TimeWithZone has the timezone of +self+.
+    #
+    #   Time.zone = 'Hawaii'                   # => "Hawaii"
+    #   Time.zone.strptime('1999-12-31 14:00:00', '%Y-%m-%d %H:%M:%S') # => Fri, 31 Dec 1999 14:00:00 HST -10:00
+    #
+    # If upper components are missing from the string, they are supplied from
+    # TimeZone#now:
+    #
+    #   Time.zone.now                              # => Fri, 31 Dec 1999 14:00:00 HST -10:00
+    #   Time.zone.strptime('22:30:00', '%H:%M:%S') # => Fri, 31 Dec 1999 22:30:00 HST -10:00
+    #
+    # However, if the date component is not provided, but any other upper
+    # components are supplied, then the day of the month defaults to 1:
+    #
+    #   Time.zone.strptime('Mar 2000', '%b %Y') # => Wed, 01 Mar 2000 00:00:00 HST -10:00
+    def strptime(str, format, now=now())
+      parts_to_time(DateTime._strptime(str, format), now)
     end
 
     # Returns an ActiveSupport::TimeWithZone instance representing the current
@@ -378,7 +383,7 @@ module ActiveSupport
       time_now.utc.in_time_zone(self)
     end
 
-    # Return the current date in this time zone.
+    # Returns the current date in this time zone.
     def today
       tzinfo.now.to_date
     end
@@ -422,7 +427,36 @@ module ActiveSupport
       tzinfo.periods_for_local(time)
     end
 
+    def init_with(coder) #:nodoc:
+      initialize(coder['name'])
+    end
+
+    def encode_with(coder) #:nodoc:
+      coder.tag ="!ruby/object:#{self.class}"
+      coder.map = { 'name' => tzinfo.name }
+    end
+
     private
+      def parts_to_time(parts, now)
+        return if parts.empty?
+
+        time = Time.new(
+          parts.fetch(:year, now.year),
+          parts.fetch(:mon, now.month),
+          parts.fetch(:mday, parts[:year] || parts[:mon] ? 1 : now.day),
+          parts.fetch(:hour, 0),
+          parts.fetch(:min, 0),
+          parts.fetch(:sec, 0) + parts.fetch(:sec_fraction, 0),
+          parts.fetch(:offset, 0)
+        )
+
+        if parts[:offset]
+          TimeWithZone.new(time.utc, self)
+        else
+          TimeWithZone.new(nil, self, time)
+        end
+      end
+
       def time_now
         Time.now
       end

data/lib/active_support/xml_mini.rb

@@ -32,25 +32,20 @@ module ActiveSupport
       "binary" => "base64"
     } unless defined?(DEFAULT_ENCODINGS)
 
-    unless defined?(TYPE_NAMES)
-      TYPE_NAMES = {
-        "Symbol"     => "symbol",
-        "Integer"    => "integer",
-        "BigDecimal" => "decimal",
-        "Float"      => "float",
-        "TrueClass"  => "boolean",
-        "FalseClass" => "boolean",
-        "Date"       => "date",
-        "DateTime"   => "dateTime",
-        "Time"       => "dateTime",
-        "Array"      => "array",
-        "Hash"       => "hash"
-      }
-
-      # No need to map these on Ruby 2.4+
-      TYPE_NAMES["Fixnum"] = "integer" unless 0.class == Integer
-      TYPE_NAMES["Bignum"] = "integer" unless 0.class == Integer
-    end
+    TYPE_NAMES = {
+      "Symbol"     => "symbol",
+      "Fixnum"     => "integer",
+      "Bignum"     => "integer",
+      "BigDecimal" => "decimal",
+      "Float"      => "float",
+      "TrueClass"  => "boolean",
+      "FalseClass" => "boolean",
+      "Date"       => "date",
+      "DateTime"   => "dateTime",
+      "Time"       => "dateTime",
+      "Array"      => "array",
+      "Hash"       => "hash"
+    } unless defined?(TYPE_NAMES)
 
     FORMATTING = {
       "symbol"   => Proc.new { |symbol| symbol.to_s },
@@ -68,17 +63,7 @@ module ActiveSupport
         "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 do |number|
-          if String === number
-            begin
-              BigDecimal(number)
-            rescue ArgumentError
-              BigDecimal('0')
-            end
-          else
-            BigDecimal(number)
-          end
-        end,
+        "decimal"      => Proc.new { |number|  BigDecimal(number) },
         "boolean"      => Proc.new { |boolean| %w(1 true).include?(boolean.to_s.strip) },
         "string"       => Proc.new { |string|  string.to_s },
         "yaml"         => Proc.new { |yaml|    YAML::load(yaml) rescue yaml },

data/lib/active_support/xml_mini/jdom.rb

@@ -142,7 +142,7 @@ module ActiveSupport
       (0...attributes.length).each do |i|
          attribute_hash[CONTENT_KEY] ||= ''
          attribute_hash[attributes.item(i).name] =  attributes.item(i).value
-       end
+      end
       attribute_hash
     end
 

data/lib/active_support/xml_mini/libxml.rb

@@ -14,9 +14,11 @@ module ActiveSupport
         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
@@ -73,5 +75,5 @@ module LibXML #:nodoc:
   end
 end
 
-LibXML::XML::Document.send(:include, LibXML::Conversions::Document)
-LibXML::XML::Node.send(:include, LibXML::Conversions::Node)
+LibXML::XML::Document.include(LibXML::Conversions::Document)
+LibXML::XML::Node.include(LibXML::Conversions::Node)

data/lib/active_support/xml_mini/libxmlsax.rb

@@ -66,9 +66,12 @@ module ActiveSupport
         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

data/lib/active_support/xml_mini/nokogiri.rb

@@ -19,9 +19,11 @@ module ActiveSupport
         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
@@ -75,7 +77,7 @@ module ActiveSupport
       end
     end
 
-    Nokogiri::XML::Document.send(:include, Conversions::Document)
-    Nokogiri::XML::Node.send(:include, Conversions::Node)
+    Nokogiri::XML::Document.include(Conversions::Document)
+    Nokogiri::XML::Node.include(Conversions::Node)
   end
 end

data/lib/active_support/xml_mini/nokogirisax.rb

@@ -72,9 +72,11 @@ module ActiveSupport
         data = StringIO.new(data || '')
       end
 
-      if data.eof?
+      char = data.getc
+      if char.nil?
         {}
       else
+        data.ungetc(char)
         document = self.document_class.new
         parser = Nokogiri::XML::SAX::Parser.new(document)
         parser.parse(data)

data/lib/active_support/xml_mini/rexml.rb

@@ -20,9 +20,11 @@ module ActiveSupport
         data = StringIO.new(data || '')
       end
 
-      if data.eof?
+      char = data.getc
+      if char.nil?
         {}
       else
+        data.ungetc(char)
         silence_warnings { require 'rexml/document' } unless defined?(REXML::Document)
         doc = REXML::Document.new(data)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 4.2.11.3
+  version: 5.0.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -24,6 +24,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -53,25 +73,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: thread_safe
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: method_source
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 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.
@@ -85,6 +113,7 @@ files:
 - README.rdoc
 - lib/active_support.rb
 - lib/active_support/all.rb
+- lib/active_support/array_inquirer.rb
 - lib/active_support/backtrace_cleaner.rb
 - lib/active_support/benchmarkable.rb
 - lib/active_support/builder.rb
@@ -98,6 +127,7 @@ files:
 - 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
 - lib/active_support/core_ext/array.rb
@@ -105,29 +135,28 @@ 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/inquiry.rb
 - lib/active_support/core_ext/array/prepend_and_append.rb
 - lib/active_support/core_ext/array/wrap.rb
 - lib/active_support/core_ext/benchmark.rb
 - lib/active_support/core_ext/big_decimal.rb
 - lib/active_support/core_ext/big_decimal/conversions.rb
-- lib/active_support/core_ext/big_decimal/yaml_conversions.rb
 - lib/active_support/core_ext/class.rb
 - 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/subclasses.rb
 - lib/active_support/core_ext/date.rb
 - lib/active_support/core_ext/date/acts_like.rb
+- lib/active_support/core_ext/date/blank.rb
 - lib/active_support/core_ext/date/calculations.rb
 - lib/active_support/core_ext/date/conversions.rb
 - lib/active_support/core_ext/date/zones.rb
 - lib/active_support/core_ext/date_and_time/calculations.rb
-- lib/active_support/core_ext/date_and_time/compatibility.rb
 - lib/active_support/core_ext/date_and_time/zones.rb
 - lib/active_support/core_ext/date_time.rb
 - lib/active_support/core_ext/date_time/acts_like.rb
+- lib/active_support/core_ext/date_time/blank.rb
 - lib/active_support/core_ext/date_time/calculations.rb
-- lib/active_support/core_ext/date_time/compatibility.rb
 - lib/active_support/core_ext/date_time/conversions.rb
 - lib/active_support/core_ext/date_time/zones.rb
 - lib/active_support/core_ext/digest/uuid.rb
@@ -161,6 +190,7 @@ files:
 - lib/active_support/core_ext/module/anonymous.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/attribute_accessors_per_thread.rb
 - lib/active_support/core_ext/module/concerning.rb
 - lib/active_support/core_ext/module/delegation.rb
 - lib/active_support/core_ext/module/deprecation.rb
@@ -173,6 +203,7 @@ files:
 - lib/active_support/core_ext/numeric.rb
 - lib/active_support/core_ext/numeric/bytes.rb
 - lib/active_support/core_ext/numeric/conversions.rb
+- lib/active_support/core_ext/numeric/inquiry.rb
 - lib/active_support/core_ext/numeric/time.rb
 - lib/active_support/core_ext/object.rb
 - lib/active_support/core_ext/object/acts_like.rb
@@ -182,7 +213,6 @@ files:
 - lib/active_support/core_ext/object/duplicable.rb
 - lib/active_support/core_ext/object/inclusion.rb
 - lib/active_support/core_ext/object/instance_variables.rb
-- lib/active_support/core_ext/object/itself.rb
 - lib/active_support/core_ext/object/json.rb
 - lib/active_support/core_ext/object/to_param.rb
 - lib/active_support/core_ext/object/to_query.rb
@@ -194,6 +224,7 @@ files:
 - lib/active_support/core_ext/range/include_range.rb
 - lib/active_support/core_ext/range/overlaps.rb
 - lib/active_support/core_ext/regexp.rb
+- lib/active_support/core_ext/securerandom.rb
 - lib/active_support/core_ext/string.rb
 - lib/active_support/core_ext/string/access.rb
 - lib/active_support/core_ext/string/behavior.rb
@@ -209,17 +240,16 @@ files:
 - 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/thread.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
 - lib/active_support/dependencies/autoload.rb
+- lib/active_support/dependencies/interlock.rb
 - lib/active_support/deprecation.rb
 - lib/active_support/deprecation/behaviors.rb
 - lib/active_support/deprecation/instance_delegator.rb
@@ -228,6 +258,7 @@ files:
 - lib/active_support/deprecation/reporting.rb
 - lib/active_support/descendants_tracker.rb
 - lib/active_support/duration.rb
+- lib/active_support/evented_file_update_checker.rb
 - lib/active_support/file_update_checker.rb
 - lib/active_support/gem_version.rb
 - lib/active_support/gzip.rb
@@ -249,7 +280,6 @@ files:
 - lib/active_support/log_subscriber/test_helper.rb
 - lib/active_support/logger.rb
 - lib/active_support/logger_silence.rb
-- lib/active_support/logger_thread_safe_level.rb
 - lib/active_support/message_encryptor.rb
 - lib/active_support/message_verifier.rb
 - lib/active_support/multibyte.rb
@@ -282,11 +312,15 @@ files:
 - lib/active_support/test_case.rb
 - lib/active_support/testing/assertions.rb
 - lib/active_support/testing/autorun.rb
+- lib/active_support/testing/composite_filter.rb
 - lib/active_support/testing/constant_lookup.rb
 - lib/active_support/testing/declarative.rb
 - lib/active_support/testing/deprecation.rb
+- lib/active_support/testing/file_fixtures.rb
 - lib/active_support/testing/isolation.rb
+- lib/active_support/testing/method_call_assertions.rb
 - lib/active_support/testing/setup_and_teardown.rb
+- lib/active_support/testing/stream.rb
 - lib/active_support/testing/tagged_logging.rb
 - lib/active_support/testing/time_helpers.rb
 - lib/active_support/time.rb
@@ -315,16 +349,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      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.3
+rubyforge_project: 
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A toolkit of support libraries and Ruby core extensions extracted from the
   Rails framework.
 test_files: []
+has_rdoc: