timezone 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f91fb2c17c8b8a03e18f1867cbbc561f39bbfa2c
-  data.tar.gz: bc255d696fb86617af8873c64906b8bc8b7cd3fc
+  metadata.gz: 8fb2ccb43fbad42a105270baf016dee990f3c5d9
+  data.tar.gz: f72e8df98c7261ccdef15ea14a4b660e6f877a8c
 SHA512:
-  metadata.gz: 1bbdefc95abeaebedf6d8987f030c6bca5a71471cfd3db70567fdfb18c6dda0b803b2b9546a3c46f15c2a89af3aa866e4f5701d45f68aefeb2b65f3d684fd3fa
-  data.tar.gz: ece0fb0d7da9b3f52a02f6aa2834fbc282ce9ae0eb53679c0bba6c2d52d02b4e0375ee8b8fa278b336cad15a5962cf455206b86a8eabe163996ebc85e74b3725
+  metadata.gz: 28391163d770b63a803d9d2114156e1550d08e5652af45cde75ee4cc6204852908e65a614f34044eaefceb4da677d58c466d024f290a60b8304247b3b7de191f
+  data.tar.gz: aec09d26909656631909b53db3440c6f04af0f8b12f541f66a962a891de3a5c94400b62e7e7b84a539ae71325cc73a8e225c69c4f285e152fb21dee8babd15d4

data/.rubocop_todo.yml

@@ -22,7 +22,7 @@ Metrics/AbcSize:
 # Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 190
+  Max: 219
 
 # Offense count: 32
 # Configuration parameters: AllowURI, URISchemes.

data/CHANGES.markdown

@@ -1,3 +1,9 @@
+# Unreleased (master)
+
+# 0.5.0
+
+* Added support for `DateTime` and `Date` objects. (panthomakos)
+
 # 0.4.3
 
 * Updated with tzdata-2015g-1. (panthomakos)

data/lib/timezone/version.rb

@@ -1,3 +1,3 @@
 module Timezone
-  VERSION = "0.4.3"
+  VERSION = '0.5.0'
 end

data/lib/timezone/zone.rb

@@ -55,6 +55,8 @@ module Timezone
     # offset in the timezone rules. Once the offset has been found that offset is added to the reference UTC time
     # to calculate the reference time in the timezone.
     def time(reference)
+      reference = sanitize(reference)
+
       reference.utc + utc_offset(reference)
     end
 
@@ -69,6 +71,8 @@ module Timezone
     # separate UTC times (during a fall back). All of these cases are ignored here and the best
     # (first) guess is used instead.
     def local_to_utc(time)
+      time = sanitize(time)
+
       time.utc - rule_for_local(time).rules.first[OFFSET_BIT]
     end
 
@@ -84,6 +88,8 @@ module Timezone
     # to calculate the reference time in the timezone. The offset is then
     # appended to put the time object into the proper offset.
     def time_with_offset(reference)
+      reference = sanitize(reference)
+
       utc = time(reference)
       offset = utc_offset(reference)
       Time.new(utc.year, utc.month, utc.day, utc.hour, utc.min, utc.sec, offset)
@@ -91,6 +97,8 @@ module Timezone
 
     # Whether or not the time in the timezone is in DST.
     def dst?(reference)
+      reference = sanitize(reference)
+
       rule_for_utc(reference)[DST_BIT]
     end
 
@@ -98,6 +106,8 @@ module Timezone
     #
     #   timezone.utc_offset(reference)
     def utc_offset(reference=Time.now)
+      reference = sanitize(reference)
+
       rule_for_utc(reference)[OFFSET_BIT]
     end
 
@@ -142,6 +152,10 @@ module Timezone
 
     private
 
+    def sanitize(reference)
+      reference.to_time
+    end
+
     # Does the given time (in seconds) match this rule?
     #
     # Each rule has a SOURCE bit which is the number of seconds, since the

data/test/timezone_test.rb

@@ -249,4 +249,44 @@ class TimezoneTest < ::Minitest::Unit::TestCase
     assert_equal 'America/Anchorage', timezone.zone
     assert_equal 'America/Anchorage', timezone.active_support_time_zone
   end
+
+  EQUIVALENCE_METHODS = [
+    :time,
+    :local_to_utc,
+    :time_with_offset,
+    :dst?,
+    :utc_offset
+  ]
+
+  def check_equivalence(zone, time, other)
+    tz = Timezone::Zone.new(:zone => zone)
+
+    EQUIVALENCE_METHODS.each do |m|
+      assert_equal(tz.public_send(m, time), tz.public_send(m, other))
+    end
+  end
+
+  def test_date_equivalence
+    time = Time.new(2011, 2, 3, 0, 0, 0)
+    date = Date.new(2011, 2, 3)
+
+    check_equivalence('America/Los_Angeles', time, date)
+
+    time = Time.new(2011, 6, 3, 0, 0, 0)
+    date = Date.new(2011, 6, 3)
+
+    check_equivalence('America/Los_Angeles', time, date)
+  end
+
+  def test_datetime_equivalence
+    time = Time.new(2011, 2, 3, 13, 5, 0)
+    datetime = DateTime.new(2011, 2, 3, 13, 5, 0)
+
+    check_equivalence('America/Los_Angeles', time, datetime)
+
+    time = Time.new(2011, 6, 3, 13, 5, 0)
+    datetime = DateTime.new(2011, 6, 3, 13, 5, 0)
+
+    check_equivalence('America/Los_Angeles', time, datetime)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timezone
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Pan Thomakos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -735,10 +735,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: timezone
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: timezone-0.4.3
+summary: timezone-0.5.0
 test_files:
 - test/basic_lookup_test.rb
 - test/data/Helsinki_rules_without_timestamps.json