et-orbi 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d6a8309df165816b992a3cf023e2402ee99fd43
-  data.tar.gz: 18054a7b9d63665fd8bec081125a813256d900ea
+  metadata.gz: 5c44c3ff9dc84f7dd7e87950a02dfcb9496a390a
+  data.tar.gz: 4c2ecd717ff29139f3689372368208cf9da040bf
 SHA512:
-  metadata.gz: 494279c96db53e01a9b7aabc72de4acaca3ae5be35695532c93f9d5cce3515d3ce6aece9de6cde1e3ff545f9ab6dcf86638a5c43ac20358b0f255a6a527c9db5
-  data.tar.gz: bebb4a2a3d67cfca571a67f5875c3ea877fd21a23b643730910880ca5c4a2877caa67c562b38d5bffa6dc8c60b71d4652f8aaa2e7d049b595ce3828f8db92993
+  metadata.gz: 58b50b5355dc89c6314b71a2b14bfd294a67ef4cc000bb500af3000e48e2b6741c8cf99e9509511920ee79870d4c36afe15677b9d7022d0cd5e816f6d61a56b6
+  data.tar.gz: 6e2e3aac93b0d0eefee5dd833e932b60235e18c4ef98355d9859950717d50891fddb5fe5e220c27c2728897de8fa923a8abaedefdb7b0082bbcfbc93cfef0675

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 # et-orbi CHANGELOG.md
 
 
+## et-orbi 1.0.9  released 2018-01-19
+
+- Silence EoTime#strfz warning
+- Silence warnings reported by @mdave16, gh-10
+- @philr added support for upcoming tzinfo 2.x, gh-9
+
+
 ## et-orbi 1.0.8  released 2017-10-24
 
 - Ensure ::EoTime.new accepts ActiveSupport::TimeZone, closes gh-8

data/CREDITS.md

@@ -1,10 +1,14 @@
 
 # et-orbi credits
 
+* Mayur Dave https://github.com/mdave16 reported trailing warning, gh-10
+* Phil Ross https://github.com/philr added support for upcoming TZInfo 2.x, gh-9
 * Miles Lane https://github.com/mileslane issue with ActiveSupport::TimeZone, gh-8
 * Chris Arcand https://github.com/chrisarcand shew various issues around America/Chicago on OSX, gh-4
 * Jeremy Strouse https://github.com/jstrouse helped alleviate issue with older versions of TZInfo
 
+See also https://github.com/floraison/et-orbi/graphs/contributors
+
 
 ## since rufus-scheduler
 

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2017-2017, John Mettraux, jmettraux+flor@gmail.com
+Copyright (c) 2017-2018, John Mettraux, jmettraux+flor@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/et-orbi.rb

@@ -7,7 +7,7 @@ require 'tzinfo'
 
 module EtOrbi
 
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 
   #
   # module methods
@@ -62,7 +62,7 @@ module EtOrbi
         if str_zone
           local.to_f
         else
-          zone.period_for_local(local).to_utc(local).to_f
+          zone.local_to_utc(local).to_f
         end
 #p [ :parse, :secs, secs ]
 
@@ -125,7 +125,6 @@ module EtOrbi
 
     def make_from_string(s, zone)
 
-#p [ :mfs, s, zone ]
       parse(s, zone: zone)
     end
 
@@ -159,6 +158,9 @@ module EtOrbi
 
     def local_tzone
 
+      @local_tzone_tz ||= nil
+      @local_tzone_loaded_at ||= nil
+
       @local_tzone = nil \
         if @local_tzone_loaded_at && (Time.now > @local_tzone_loaded_at + 1800)
       @local_tzone = nil \
@@ -510,11 +512,12 @@ module EtOrbi
 
     # Returns a Ruby Time instance.
     #
-    # Warning: the timezone of that Time instance will be UTC.
+    # Warning: the timezone of that Time instance will be UTC when used with
+    # TZInfo < 2.0.0.
     #
     def to_time
 
-      @time ||= begin; u = utc; @zone.period_for_utc(u).to_local(u); end
+      @time ||= begin; u = utc; @zone.utc_to_local(u); end
     end
 
     def count_weeks(dir)
@@ -544,16 +547,13 @@ module EtOrbi
       mn = (off % 3600) / 60
       sc = 0
 
-      fmt =
-        if code == '%z'
-          "%s%02d%02d"
-        elsif code == '%:z'
-          "%s%02d:%02d"
-        else
-          "%s%02d:%02d:%02d"
-        end
-
-      fmt % [ sn, hr, mn, sc ]
+      if code == '%z'
+        '%s%02d%02d' % [ sn, hr, mn ]
+      elsif code == '%:z'
+        '%s%02d:%02d' % [ sn, hr, mn ]
+      else
+        '%s%02d:%02d:%02d' % [ sn, hr, mn, sc ]
+      end
     end
 
     def _to_f(o)
@@ -660,17 +660,34 @@ module EtOrbi
       mn = -mn if hr && hr < 0
 
       return (
-        @custom_tz_cache[str] =
-          begin
-            tzi = TZInfo::TransitionDataTimezoneInfo.new(str)
-            tzi.offset(str, hr * 3600 + mn * 60, 0, str)
-            tzi.create_timezone
-          end
+        @custom_tz_cache[str] = create_offset_tzone(hr * 3600 + mn * 60, str)
       ) if hr
 
       nil
     end
 
+    if defined? TZInfo::DataSources::ConstantOffsetDataTimezoneInfo
+      # TZInfo >= 2.0.0
+
+      def create_offset_tzone(utc_off, id)
+
+        off = TZInfo::TimezoneOffset.new(utc_off, 0, id)
+        tzi = TZInfo::DataSources::ConstantOffsetDataTimezoneInfo.new(id, off)
+        tzi.create_timezone
+      end
+
+    else
+      # TZInfo < 2.0.0
+
+      def create_offset_tzone(utc_off, id)
+
+        tzi = TZInfo::TransitionDataTimezoneInfo.new(id)
+        tzi.offset(id, utc_off, 0, id)
+        tzi.create_timezone
+      end
+
+    end
+
     def determine_local_tzones
 
       tabbs = (-6..5)
@@ -679,7 +696,7 @@ module EtOrbi
         .sort
 
       t = Time.now
-      tu = t.dup.utc # /!\ dup is necessary, #utc modifies its target
+      #tu = t.dup.utc # /!\ dup is necessary, #utc modifies its target
 
       twin = Time.utc(t.year, 1, 1) # winter
       tsum = Time.utc(t.year, 7, 1) # summer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et-orbi
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo