dynamic_time_zone 0.3.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84f3075f7955fcf37f67f664b03c10993bb839163a4c078309940e98db9febc6
-  data.tar.gz: c5860bb4c02c2926749209108287dca5b0a7fe60135fd3995b3f82f86fc061e4
+  metadata.gz: 144d2486964c275f2f0ad745f47c0998bbeba7ca9fec93d1c20ce3c84907fe91
+  data.tar.gz: 348f7227a746af62cf47996951027a49be3e7ac51b8e0a5f4d384843b6d3a412
 SHA512:
-  metadata.gz: 7da51a26b381b6e64df3dae5afd70ea5c99b1531de98ccea72d116d6d54db39624e27295fbe383fc52794afec1fdba54309f8b0e319b812f7178b06699d0c5d1
-  data.tar.gz: 4f675e03f7cd75d31173896e5433cad3b1de1b4b599b8561f87f9529d1d0e491e71ae1f8e5a46dde555e79415ef96ad9f1c683e818df7774a1ea14056b495f1f
+  metadata.gz: 5eeb14dfab601d17c8a4e792e460a4b6913ac93e03d29eb3e5c100521672c08d4d27509bcc69fda40e53d2ecef614d97d3881e789d52521499090f2aa3173e79
+  data.tar.gz: 20ac01f71d6163865095ce8a4db1c6ccfb661548e339ce4f12c8ea7cffd4d246803098eb2f36e6fb26dd08579d513f36ee907fce326d825450d318f1c0619899

data/lib/dynamic_time_zone/time_patch.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module TimePatch
+  def compare_with_coercion(other)
+    if DynamicTimeZone.enabled && other.is_a?(ActiveSupport::TimeWithZone) && other.using_dynamic_time_zone?
+      self.utc <=> other.utc
+    else
+      super
+    end
+  end
+  alias_method :<=>, :compare_with_coercion
+end
+
+Time.prepend(TimePatch)

data/lib/dynamic_time_zone/time_with_zone_patch.rb

@@ -9,7 +9,11 @@ module TimeWithZonePatch
   alias_method :getlocal, :localtime
 
   def formatted_offset(*args)
-    using_dynamic_time_zone? ? '+0000' : super
+    actual_formatted_offset = super
+    return actual_formatted_offset unless using_dynamic_time_zone?
+
+    seconds_in_24_hours = 24 * 60 * 60
+    utc_offset.abs > seconds_in_24_hours ?  '+0000' : actual_formatted_offset
   end
 
   def using_dynamic_time_zone?

data/lib/dynamic_time_zone/time_zone_data_source.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DynamicTimeZone
-  class TimeZoneDataSource < TZInfo::ZoneinfoDataSource
+  class TimeZoneDataSource < TZInfo::DataSources::ZoneinfoDataSource
     def load_timezone_info(identifier)
       return super unless DynamicTimeZone.enabled
 
@@ -12,8 +12,8 @@ module DynamicTimeZone
       offset_amount = offset_amount.to_i
       offset_amount = 0 - offset_amount if sign == '-'
 
-      timezone_info = TZInfo::TransitionDataTimezoneInfo.new(identifier)
-      timezone_info.offset(identifier, offset_amount, 0, 'DynamicTimeZone')
+      offset = TZInfo::TimezoneOffset.new(offset_amount, 0, 'DynamicTimeZone')
+      timezone_info = TZInfo::DataSources::ConstantOffsetDataTimezoneInfo.new(identifier, offset)
       timezone_info
     end
   end

data/lib/dynamic_time_zone/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DynamicTimeZone
-  VERSION = '0.3.1'
+  VERSION = '0.6.0'
 end

data/lib/dynamic_time_zone.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'time'
+require 'rails'
+require 'active_support'
 require 'active_support/core_ext/date_time/conversions'
 require 'active_support/time_with_zone'
 require 'active_support/core_ext/time/zones'
@@ -21,5 +23,6 @@ require 'dynamic_time_zone/validator'
 require 'dynamic_time_zone/identifier_builder'
 require 'dynamic_time_zone/time_zone_data_source'
 require 'dynamic_time_zone/time_with_zone_patch'
+require 'dynamic_time_zone/time_patch'
 require 'dynamic_time_zone/offset_format_convertor'
 require 'dynamic_time_zone/time_parser'

metadata

@@ -1,49 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_time_zone
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Appfolio
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tzinfo
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '6.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description:
 email:
 executables: []
@@ -55,6 +75,7 @@ files:
 - lib/dynamic_time_zone/offset_format_convertor.rb
 - lib/dynamic_time_zone/test_helper.rb
 - lib/dynamic_time_zone/time_parser.rb
+- lib/dynamic_time_zone/time_patch.rb
 - lib/dynamic_time_zone/time_with_zone_patch.rb
 - lib/dynamic_time_zone/time_zone_data_source.rb
 - lib/dynamic_time_zone/validator.rb
@@ -77,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Dynamically set the offset from UTC from timezone identifier