et-orbi 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16693871e0e1a8330e6ecade907b21302ad124ab
-  data.tar.gz: 00fee3dbf2143ee21043597a1d64f7d19c2c6dfa
+  metadata.gz: 5a73f3948e76c89fdb79154e903e590594eadee8
+  data.tar.gz: '068a020b01766dad22cad3e2b0f3d20a612ceaaf'
 SHA512:
-  metadata.gz: 6f151d68c6c1f070945f9cf9718e7d38004117832b53acac741de0e5e2c38ec8cd06c4bccca60a93072bc1b7dad2342a6e5bac7ed17f2a8829ec47554e36e0be
-  data.tar.gz: 66af905287bb713bc376adb0e67b7c1eac19a486fbc4a93c902615f33280dad69586f245726e3fb19a57ac6ab5649a7737391d3b1ead3d13b7aef6a945f96e65
+  metadata.gz: 256b38da4dd9788c36d6499ff06e29915f5ee80413112a7bf5a9d5b678ac1b6a9fc520de4d5234a34c727adde6e5e0fe02cf815b37927d839e87271eda46ed66
+  data.tar.gz: fe1b1a1bf20569bfe2a2c96d94bd3b9ed32c75a3df400622fef34d907ac20b4c154d055f4e3a991171655e685b40b3c84cc2b2687634bba28d6583c65312a54b

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # et-orbi CHANGELOG.md
 
 
+## et-orbi 1.0.7  released 2017-10-07
+
+- Leverage ActiveSupport::TimeWithZone when present, gh-6
+- Start error messages with a capital
+
+
 ## et-orbi 1.0.6  released 2017-10-05
 
 - Introduce `make info`

data/lib/et-orbi.rb

@@ -7,7 +7,7 @@ require 'tzinfo'
 
 module EtOrbi
 
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 
   #
   # module methods
@@ -30,7 +30,7 @@ module EtOrbi
       begin
         DateTime.parse(str)
       rescue
-        fail ArgumentError, "no time information in #{str.inspect}"
+        fail ArgumentError, "No time information in #{str.inspect}"
       end #if rold
         #
         # is necessary since Time.parse('xxx') in Ruby < 1.9 yields `now`
@@ -87,7 +87,7 @@ module EtOrbi
       when Numeric then make_from_numeric(o, zone)
       when ::EtOrbi::EoTime then make_from_eotime(o, zone)
       else fail ArgumentError.new(
-        "cannot turn #{o.inspect} to a ::EtOrbi::EoTime instance")
+        "Cannot turn #{o.inspect} to a ::EtOrbi::EoTime instance")
       end
     end
 
@@ -95,6 +95,7 @@ module EtOrbi
 
       z =
         zone ||
+        get_as_tzone(t) ||
         get_tzone(t.zone) ||
         get_local_tzone(t)
 
@@ -218,21 +219,28 @@ module EtOrbi
 
     def get_local_tzone(t)
 
-#      lt = local_tzone
-#      lp = lt.period_for_local(t)
-#      ab = lp.abbreviation.to_s
-#
-#      return lt \
-#        if ab == t.zone
-#      return lt \
-#        if ab.match(/\A[-+]\d{2}(:?\d{2})?\z/) && lp.utc_offset == t.utc_offset
-#
-#      nil
+      #lt = local_tzone
+      #lp = lt.period_for_local(t)
+      #ab = lp.abbreviation.to_s
+      #
+      #return lt \
+      #  if ab == t.zone
+      #return lt \
+      #  if ab.match(/\A[-+]\d{2}(:?\d{2})?\z/) && lp.utc_offset == t.utc_offset
+      #
+      #nil
+        #
+        # keep that in the fridge for now
 
       l = Time.local(t.year, t.month, t.day, t.hour, t.min, t.sec, t.usec)
 
       t.zone == l.zone ? local_tzone : nil
     end
+
+    def get_as_tzone(t)
+
+      t.respond_to?(:time_zone) ? t.time_zone : nil
+    end
   end
 
   # Our EoTime class (which quacks like a ::Time).
@@ -294,7 +302,7 @@ module EtOrbi
       @zone = self.class.get_tzone(zone || :local)
 
       fail ArgumentError.new(
-        "cannot determine timezone from #{zone.inspect}" +
+        "Cannot determine timezone from #{zone.inspect}" +
         "\n#{EtOrbi.render_nozone_time(s)}" +
         "\n#{EtOrbi.platform_info.sub(',debian:', ",\ndebian:")}" +
         "\nTry setting `ENV['TZ'] = 'Continent/City'` in your script " +
@@ -479,11 +487,11 @@ module EtOrbi
         nt
       when ::Time, ::EtOrbi::EoTime
         fail ArgumentError.new(
-          "cannot add #{t.class} to EoTime") if dir > 0
+          "Cannot add #{t.class} to EoTime") if dir > 0
         @seconds + dir * t.to_f
       else
         fail ArgumentError.new(
-          "cannot call add or subtract #{t.class} to EoTime instance")
+          "Cannot call add or subtract #{t.class} to EoTime instance")
       end
     end
 
@@ -550,7 +558,7 @@ module EtOrbi
     def _to_f(o)
 
       fail ArgumentError(
-        "comparison of EoTime with #{o.inspect} failed"
+        "Comparison of EoTime with #{o.inspect} failed"
       ) unless o.is_a?(EoTime) || o.is_a?(Time)
 
       o.to_f

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et-orbi
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo