time_zone_converter 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9203b26c2098a8c002ad9edc24f867bd3089a1c772b68ec136ee7c477384ba5
-  data.tar.gz: 6dac940cca915e4da0e631a02de0d658cbdc6374d9ddee9e93a905ec98e25fa2
+  metadata.gz: 9da080f96c7de30913760de1e43e35f3fb7f0d088e8b6b9ac217e6a68ffd964b
+  data.tar.gz: a91db4a3b1364222e35b247f760f2caa9ebc1dbecfa76430b798f697c94d21d8
 SHA512:
-  metadata.gz: 602cc22d5a521bbc444fc1e542fcaa73d4d3c058d188ed58a3f711224dee70e5a305f141a8ce67ba32ffb61cbee033bc06df3a2b4bf2e43ae5003b1e526c240c
-  data.tar.gz: cc9245f61a6dfbbadf1c133f728d86db14d464e11fcd0a3c3e69beacf3f27b1e37fb16b4ebdb3fedbf059976f7363739e39ee43cc4c4048d98d72d6d3dd5ddca
+  metadata.gz: fb07e9d4d82bc44b1094df087463a90a228ae9552c99cbb77b40598128795f69d9a81b98b029a4a2825fa08bc85c2e0bcc0b11ab0714246403277c1b3c95a07b
+  data.tar.gz: fb80ef816c59ac156469c8b7b1d7966a13ba3ddd16424da31bd9ae4530327677cda0b2c2c803052b2025ea67b8940d090106555fe5510bc84ae322e16e21f4cc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    time_zone_converter (0.2.3)
+    time_zone_converter (0.2.4)
       activesupport
       nearest_time_zone
       oj
@@ -25,7 +25,7 @@ GEM
       multi_json (~> 1.8)
     concurrent-ruby (1.1.5)
     diff-lcs (1.3)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     kdtree (0.4)
     minitest (5.12.2)
@@ -36,7 +36,7 @@ GEM
       require_all
     oj (3.9.2)
     rake (10.5.0)
-    require_all (2.0.0)
+    require_all (3.0.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -60,7 +60,7 @@ GEM
     timecop (0.9.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    zeitwerk (2.1.10)
+    zeitwerk (2.2.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,14 +1,13 @@
 # TimeZoneConverter
 
-A small gem that prints out the time in other locations.
-It does support a multiple cities, but it may be a bit slow in that case.
-Any ideas how to make it faster are highly welcomed.
+![screenshot](img/time-zone.gif)
 
-Inspired by:
-https://www.timeanddate.com/worldclock/converter.html
+A small gem, that can be used as a Command Line Interface. Inspired by:
 
-It uses cities data extracted from cities gem: https://github.com/joecorcoran/cities
-For lat, long calculation it uses another gem: https://rubygems.org/gems/nearest_time_zone
+- https://www.timeanddate.com/worldclock/converter.html
+- https://stackoverflow.com/questions/8349817/ruby-gem-for-finding-timezone-of-location
+
+In a few words, it prints out the time in other cities. Cities are passed as arguments.
 
 ## Usage:
 
@@ -16,22 +15,61 @@ For lat, long calculation it uses another gem: https://rubygems.org/gems/nearest
 ```
 time_zone_converter c Warszawa Bangkok
 ```
+Output:
+```
+[
+  ["Warszawa", Tue, 22 Oct 2019 13:30:02 CEST +02:00],
+  ["Bangkok", Tue, 22 Oct 2019 18:30:02 +07 +07:00]
+]
+```
 
 ### 'ct' command: given time in other cities (formant 'HH:MM' 24-hour)
 ```
 time_zone_converter ct 'Chiang Mai' Skopje '19:00'
 ```
+Output:
+```
+[
+  ["Chiang Mai", 2019-10-22 19:00:00 +0700], 
+  ["Skopje", Tue, 22 Oct 2019 14:00:00 CEST +02:00]
+]
+```
+
+Note: Time range are also supported:
 
-### 'ctu' command: given UTC+0 time in other cities
 ```
-time_zone_converter ctu Bangkok Warszawa '10:00'
+time_zone_converter ct Warszawa Bangkok '19:00-21:00'
 ```
 
+Output:
 
-### Output:
+```
+[
+  ["Warszawa",
+    [
+      2019-10-29 19:00:00 +0100,
+      2019-10-29 21:00:00 +0100
+    ]
+  ],
+  ["Bangkok",
+    [
+      Wed, 30 Oct 2019 01:00:00 +07 +07:00, 
+      Wed, 30 Oct 2019 03:00:00 +07 +07:00
+    ]
+  ]
+]
+```
 
+### 'ctu' command: given UTC+0 time in other cities
 ```
-[["Warszawa", 2019-10-04 10:00:00 +0200], ["Bangkok", Fri, 04 Oct 2019 15:00:00 +07 +07:00]]
+time_zone_converter ctu Bangkok Warszawa '10:00'
+```
+Output:
+```
+[
+  ["Bangkok", Tue, 22 Oct 2019 17:00:00 +07 +07:00], 
+  ["Warszawa", Tue, 22 Oct 2019 12:00:00 CEST +02:00]
+]
 ```
 
 ### Help:
@@ -39,4 +77,21 @@ time_zone_converter ctu Bangkok Warszawa '10:00'
 ```
 time_zone_converter
 time_zone_converter help c
-```
+```
+
+### More
+
+It supports multiple cities, however, it may be a bit slow in that case.
+Any ideas how to make it faster are highly welcomed :)
+
+Technically, this gem uses other gems under the hood:
+`cities` gem, see here:
+https://github.com/joecorcoran/cities
+which provides latitude and longitude for all cities around the world.
+
+The code responsible for extracting json data is placed in `json_data_transformer.rb` file.
+
+For nearest time zone calculation it uses another gem called `nearest_tine_zone`:
+https://rubygems.org/gems/nearest_time_zone
+
+Summing up, it does not use any external API, just pure Ruby with ActiveSupport dependency.

data/lib/time_zone_converter.rb

@@ -50,29 +50,45 @@ module TimeZoneConverter
       time_zone = NearestTimeZone.to(lat.to_f, lng.to_f)
     end
 
+    # time is a Time object or an Array of Time objects
     def self.get_time(city, time)
       time_zone = get_nearest_time_zone(city)
-      time.in_time_zone(time_zone)
+      if time.is_a? Array
+        time.map { |t| t.in_time_zone(time_zone) }
+      else
+        time.in_time_zone(time_zone) 
+      end
     end
 
     ISO_TIME = /\A(\d\d):(\d\d)\z/
+    ISO_TIME_RANGE = /\A(\d\d):(\d\d)-(\d\d):(\d\d)\z/
 
+    # Inspired by: https://github.com/rails/rails/blob/aeba121a83965d242ed6d7fd46e9c166079a3230/activemodel/lib/active_model/type/helpers/time_value.rb#L65
+    # @returns: Time object or an Array of Time objects
     def self.string_to_time(time, time_zone)
       return time unless time.is_a? String
+      current_time = Time.new.utc
+      zone = ActiveSupport::TimeZone[time_zone]
 
       if time =~ ISO_TIME
-        zone = ActiveSupport::TimeZone[time_zone]
-        current_time = Time.new.utc
-
-        Time.new(
-          current_time.year,
-          current_time.month,
-          current_time.day,
-          $1.to_i,
-          $2.to_i,
-          0,
-          zone
-        )
+        new_time(current_time.year, current_time.month, current_time.day, $1.to_i, $2.to_i, 0, 0, zone)
+      elsif time =~ ISO_TIME_RANGE
+        [
+          new_time(current_time.year, current_time.month, current_time.day, $1.to_i, $2.to_i, 0, 0, zone),
+          new_time(current_time.year, current_time.month, current_time.day, $3.to_i, $4.to_i, 0, 0, zone)
+        ]
       end
     end
+
+    def self.new_time(year, mon, mday, hour, min, sec, microsec, zone)
+      Time.new(
+        year,
+        mon,
+        mday,
+        hour,
+        min,
+        sec,
+        zone
+      )
+    end
 end

data/lib/time_zone_converter/version.rb

@@ -1,3 +1,3 @@
 module TimeZoneConverter
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_zone_converter
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Rafał Trojanowski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -185,6 +185,7 @@ files:
 - bin/setup
 - data/cities.json
 - exe/time_zone_converter
+- img/time-zone.gif
 - lib/time_zone_converter.rb
 - lib/time_zone_converter/cli.rb
 - lib/time_zone_converter/json_data_transformer.rb