dynamic_time_zone 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ead0ab82fe327e7498de5548c8dbbb1742a622ffbdf53a7b85a039661fe1ad1f
-  data.tar.gz: 4e7374119a77057c74cc2d79b2b17de7508bb7d468e2cb27c6c3b006a0411ddb
+  metadata.gz: 495fbed668267a932e1719e9877a9450c404baaadc892a5d7c36c8d9fcfef45c
+  data.tar.gz: 708f132cbc5da54b49d9793f44f2c03f3c128c66a403d9ecf4f2c6c02f91c5c7
 SHA512:
-  metadata.gz: 931a7a54ece7f23763bf211b4f78451ec053bfba94ab42404b3809efe2196628eab8bfcf0aea2ab2ebd8143f57d72366aa42f1e7a1a21c799ce3daf70174792e
-  data.tar.gz: 39297ddf16cc70ed113dc450a091675e5776e73dff88aaa8289e49f03040d708b9ee3562c124869081cd5ff434201fcfbf2ff58f8e748787a534d7f481d610e3
+  metadata.gz: 41c199f3d118993457c9886c25740048a5171392376c32be79707faf12b6cfcd2904475029fc92322c6cb75e84d3e8a2a0564f80e11b5557025698d37d46ff9d
+  data.tar.gz: 2235ee587f21a9dd92c64024e7c0cb87cd693fef9705dbda86ed3465c9ea099bb84152a84742ff33e89f7b9f506b320f5227b762c6fc63d47a43aafae5fcf9e1

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

@@ -2,14 +2,22 @@
 
 module TimeWithZonePatch
   def localtime(utc_offset = nil)
-    return super unless DynamicTimeZone.enabled
+    return super unless using_dynamic_time_zone?
 
     utc + (utc_offset || 0).seconds
   end
   alias_method :getlocal, :localtime
 
   def formatted_offset(*args)
-    DynamicTimeZone.enabled ? '+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?
+    DynamicTimeZone::Validator.new.valid?(time_zone.name)
   end
 end
 

data/lib/dynamic_time_zone/version.rb

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

data/lib/dynamic_time_zone.rb

@@ -21,5 +21,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_time_zone
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Appfolio
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -55,6 +55,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 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Dynamically set the offset from UTC from timezone identifier