et-orbi 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0e76c51b164aaa3749e6865594a141100e4e6e1e
-  data.tar.gz: dbc982c799a79da7408ed7e7cb9ff9d9481ea91c
+SHA256:
+  metadata.gz: d3ad790bb200e2bb944f6d8b69abb66a3f5563c0d601fd51839c19fa9b2585ed
+  data.tar.gz: 1a9c61b4371a23fb0e4c4db5dfdf5ffb0fd440415f811e232a580e6ce71d37f0
 SHA512:
-  metadata.gz: b2780226defd2f1ad6aad04291e6dc77bcf9e56d60c75f2f68ea0471f931bf75f434cf44e52a17d5e41dff79947c571d7179cf70759d0429e3d6631f02f4d996
-  data.tar.gz: 8cad684822abf9f08a3811867a5c0010e24d175527fa65c7f4f67e580fd540b5e798cf94131b95b9942ec239b00c1fccc470a5c8a0cadeacfd4dfa3c8f5299a0
+  metadata.gz: 5f6032e29f4f91a638c5d524cd94854128ad9f59d2a017989088dd44c130098bbce44460f0d57396e3dd81a155b770fdcc3454be8069513924aa1dfe1807ea0d
+  data.tar.gz: 2b9b2e1b4dd3c49c103d856509096ca0672c3efff4b9e3d5affb87559de010416c9944de55cd4284a8f3bc949ef2f6251fe0fd56c7a055aa516f63b046a09c28

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## et-orbi 1.2.2  released 2019-08-19
+
+- Let EoTime#== accept EoTime or ::Time instances, gh-20, gh-7
+
+
 ## et-orbi 1.2.1  released 2019-05-01
 
 - More US time zone corrections, Vais Salikhov, gh-19

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # et-orbi credits
 
+* d-m-u (https://github.com/d-m-u) EoTime#==(Time), gh-20, gh-7
 * Vais Salikhov (https://github.com/vais) missing US timezone aliases, gh-18 gh-19
 * Wenhui Wang https://github.com/w11th .parse vs Chronic+ActiveSupport, fugit 11
 * Marcel https://github.com/MTRNord "Mitteleuropaeische Sommerzeit", gh-15

data/lib/et-orbi.rb

@@ -13,6 +13,6 @@ require 'et-orbi/zone'
 
 module EtOrbi
 
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end
 

data/lib/et-orbi/time.rb

@@ -205,11 +205,24 @@ module EtOrbi
 
     def ==(o)
 
-      o.is_a?(EoTime) &&
-      o.seconds == @seconds &&
-      (o.zone == @zone || o.zone.current_period == @zone.current_period)
+      if o.is_a?(EoTime)
+        o.seconds == @seconds &&
+        (o.zone == @zone || o.zone.current_period == @zone.current_period)
+      elsif o.is_a?(::Time)
+        (to_f * 1000).to_i == (o.to_f * 1000).to_i
+      else
+        false
+      end
     end
-    #alias eql? == # FIXME see Object#== (ri)
+
+    # Nota Bene:
+    #
+    # Unlike ==, the equal? method should never be overridden by subclasses
+    # as it is used to determine object identity (that is, a.equal?(b) if and
+    # only if a is the same object as b)
+    #
+    # The eql? method returns true if obj and other refer to the same hash key.
+    # This is used by Hash to test members for equality.
 
     def >(o); @seconds > _to_f(o); end
     def >=(o); @seconds >= _to_f(o); end
@@ -414,7 +427,7 @@ module EtOrbi
 
       fail ArgumentError(
         "Comparison of EoTime with #{o.inspect} failed"
-      ) unless o.is_a?(EoTime) || o.is_a?(Time)
+      ) unless o.respond_to?(:to_f)
 
       o.to_f
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et-orbi
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: time with zones