et-orbi 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92e8f11466211f94bfe4d872c6a1566af6c1cf9f
-  data.tar.gz: '091a7dd8dd6981ff58bd661091f1ee6f07c67f40'
+  metadata.gz: db2e44b25fa9806ddea412a4c4ab67f404f8abf7
+  data.tar.gz: 28bff7ef341b1458b17a604638878f17c131ad76
 SHA512:
-  metadata.gz: abe51c5879807fe9b57f1487091bdaeee5ddbec7219824893d1f0068f6bae454400c980924e1eff5e9f4f30a76bcd165916e8430e57e041feae8f06b1ed30556
-  data.tar.gz: 406500144fbd7a87d61eb6cfe07e975fc05d5b9f50755b9a4a09326fae2a17997d99b15109c8d70d0d900492ed87518d2c0f0920f1d94573be5dbb97a100f265
+  metadata.gz: '0411908916cd638a834b73d73685c3615154c26b39d1ef264bb0e924808bbb845dab0ee7d89c12a2d0fc20757e748a0dc2b1785c12396a754123a65393cb7b5c'
+  data.tar.gz: bde96903887538a4f15885e74996882c68d662d6692e76f217fe471782ef9b8951df0aee97b0c6150ab0ffd5e6985579f9786f00b6e5c4b059b341eb4235b904

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # et-orbi CHANGELOG.md
 
 
+## et-orbi 1.1.1  released 2018-05-04
+
+- Stop caching the local tzone, cache the tools used for determining it
+
+
 ## et-orbi 1.1.0  released 2018-03-25
 
 - Implement EoTime .utc and .local (based on Time .utc and .local)

data/Makefile

@@ -8,6 +8,7 @@ VERSION = \
 
 count_lines:
 	find lib -name "*.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"
+	find spec -name "*_spec.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"
 cl: count_lines
 
 gemspec_validate:

data/lib/et-orbi.rb

@@ -7,7 +7,7 @@ require 'tzinfo'
 
 module EtOrbi
 
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 
   #
   # module methods
@@ -47,7 +47,7 @@ module EtOrbi
         opts[:zone] ||
         str_zone ||
         find_olson_zone(str) ||
-        local_tzone
+        determine_local_tzone
 #p [ :parse, :zone, zone ]
 
       str = str.sub(zone.name, '') unless zone.name.match(/\A[-+]/)
@@ -143,7 +143,7 @@ module EtOrbi
 
       return o if o.is_a?(::TZInfo::Timezone)
       return nil if o == nil
-      return local_tzone if o == :local
+      return determine_local_tzone if o == :local
       return ::TZInfo::Timezone.get('Zulu') if o == 'Z'
       return o.tzinfo if o.respond_to?(:tzinfo)
 
@@ -156,24 +156,6 @@ module EtOrbi
       (::TZInfo::Timezone.get(o) rescue nil)
     end
 
-    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 \
-        if @local_tzone_tz != ENV['TZ']
-
-      @local_tzone ||=
-        begin
-          @local_tzone_tz = ENV['TZ']
-          @local_tzone_loaded_at = Time.now
-          determine_local_tzone
-        end
-    end
-
     def render_nozone_time(seconds)
 
       t =
@@ -181,10 +163,10 @@ module EtOrbi
       ts =
         t.strftime('%Y-%m-%d %H:%M:%S') +
         ".#{(seconds % 1).to_s.split('.').last}"
+      tz =
+        EtOrbi.determine_local_tzone
       z =
-        EtOrbi.local_tzone ?
-        EtOrbi.local_tzone.period_for_local(t).abbreviation.to_s :
-        nil
+        tz ? tz.period_for_local(t).abbreviation.to_s : nil
 
       "(secs:#{seconds},utc~:#{ts.inspect},ltz~:#{z.inspect})"
     end
@@ -200,9 +182,12 @@ module EtOrbi
           'tzid' => defined?(TZInfo::Data),
           'rv' => RUBY_VERSION,
           'rp' => RUBY_PLATFORM,
-          'eov' => EtOrbi::VERSION,
           'rorv' => (Rails::VERSION::STRING rescue nil),
           'astz' => ([ Time.zone.class, Time.zone.tzinfo.name ] rescue nil),
+          'eov' => EtOrbi::VERSION,
+          'eotnz' => EtOrbi::EoTime.now.zone,
+          'eotnfz' => EtOrbi::EoTime.now.strftime('%z'),
+          'eotlzn' => EtOrbi::EoTime.local_tzone.name,
         }.collect(&etos).join(',') + ',' +
         gather_tzs.collect(&etos).join(',') +
       ')'
@@ -237,7 +222,7 @@ module EtOrbi
 
       l = Time.local(t.year, t.month, t.day, t.hour, t.min, t.sec, t.usec)
 
-      t.zone == l.zone ? local_tzone : nil
+      (t.zone == l.zone) ? determine_local_tzone : nil
     end
 
     def get_as_tzone(t)
@@ -279,7 +264,7 @@ module EtOrbi
 
       def local_tzone
 
-        EtOrbi.local_tzone
+        EtOrbi.determine_local_tzone
       end
 
       def platform_info
@@ -299,7 +284,7 @@ module EtOrbi
 
       def local(*a)
 
-        EtOrbi.make_from_array(a, EtOrbi.local_tzone)
+        EtOrbi.make_from_array(a, local_tzone)
       end
     end
 
@@ -648,7 +633,7 @@ module EtOrbi
 
     def os_tz
 
-      debian_tz || centos_tz || osx_tz
+      @os_tz ||= (debian_tz || centos_tz || osx_tz)
     end
 
     #
@@ -704,7 +689,6 @@ module EtOrbi
         tzi.offset(id, utc_off, 0, id)
         tzi.create_timezone
       end
-
     end
 
     def determine_local_tzones
@@ -713,6 +697,7 @@ module EtOrbi
         .collect { |i| (Time.now + i * 30 * 24 * 3600).zone }
         .uniq
         .sort
+        .join('|')
 
       t = Time.now
       #tu = t.dup.utc # /!\ dup is necessary, #utc modifies its target
@@ -720,16 +705,16 @@ module EtOrbi
       twin = Time.utc(t.year, 1, 1) # winter
       tsum = Time.utc(t.year, 7, 1) # summer
 
-      ::TZInfo::Timezone.all.select do |tz|
-
-        pabbs =
-          [
-            tz.period_for_utc(twin).abbreviation.to_s,
-            tz.period_for_utc(tsum).abbreviation.to_s
-          ].uniq.sort
+      @tz_all ||= ::TZInfo::Timezone.all
+      @tz_winter_summer ||= {}
 
-        pabbs == tabbs
-      end
+      @tz_winter_summer[tabbs] ||= @tz_all
+        .select { |tz|
+          tabbs ==
+            [
+              tz.period_for_utc(twin).abbreviation.to_s,
+              tz.period_for_utc(tsum).abbreviation.to_s
+            ].uniq.sort.join('|') }
     end
 
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et-orbi
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-25 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo