time_zone_converter 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23de7d2a76414b511e4322aad37a2ddb56803247861f7a8182197ffd37d7cea1
-  data.tar.gz: 1e52e262174c681d71fff650d147340a6ded44abe34ccdfc709a0f6b281e9127
+  metadata.gz: df821687ee506d0d1b1d0bebf2f928ffcbfbcd068afcc2d43acdb941c33b90ad
+  data.tar.gz: 4f374c9d6270b157b04c4472186a297eb261f0541b4c20f01899680c3fc44aa6
 SHA512:
-  metadata.gz: 6da257eddd5c8cf82ff94ca3fa0b07a10721d7845c3ff8e33258a9bf5e81fd1b7e7ce9867a16b0302ab7d393bc6b497f91690dde94faf789d13754681797fd6b
-  data.tar.gz: fdd50f7b6a9396d8522fac924c7820a6955aeee3fd72d3a17c4c646bdc900c13856cac2e16c70133d7fbbd62a5bd23bb42c5b0bac83deb5a80c3c7cbd35e1116
+  metadata.gz: 837ab5580d01ec1cab2308806894442494852d851f3b1c0068f6c6712691648c88703927d0c4d86a2840ed7a3c51e4a9caa49ddb4ec0d04bbad1b179da2b95d9
+  data.tar.gz: ac9c36c131134eb16838989056656042732d9222829e0792e9dce803a9aed9c0751a7034db619402cc3665cb19684f5340448bc9e74416d0c81db5eca1af26b9

data/.gitignore

@@ -12,3 +12,4 @@
 
 .DS_Store
 .byebug_history
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    time_zone_converter (0.1.0)
+    time_zone_converter (0.2.0)
       activesupport
       nearest_time_zone
       oj

data/lib/time_zone_converter.rb

@@ -13,77 +13,61 @@ module TimeZoneConverter
   # https://stackoverflow.com/questions/8349817/ruby-gem-for-finding-timezone-of-location
 
   def self.call(args, time = Time.current, method = :utc)
-    if method == :local
-      time_zone = get_zone(args.first)
+    arr = Array.new
+
+    if method == :utc
+      time = string_to_time(time, "UTC")
+      arr = args.map { |city| [city, get_time(city, time)] }
+    else # :local
+      # Get time with zone for the first city
+      time_zone = get_nearest_time_zone(args.first)
+      time = string_to_time(time, time_zone)
+
+      # Add first item
+      arr << [args.first, time]
+
+      # Convert time for the rest of the cities in the args
+      args[1..-1].each { |city| arr << [city, get_time(city, time)] }
+      arr
     end
-    time = string_to_time(time, method, time_zone) if time.is_a? String
-    args.map { |city| [city, get_time(city, time)] }
   end
 
   private
 
-    def self.get_time(city, time)
-      json_file = 'data/cities.json'
-      json = Oj.load(File.read(json_file))
-      item = json.select! { |k, _| k == city }
+    JSON_FILE = 'data/cities.json'
 
+    def self.get_nearest_time_zone(city)
+      json = Oj.load(File.read(JSON_FILE))
+      item = json.select! { |k, _| k == city }
       raise "Not found #{city}" unless item
 
-      lat = item[city][0]
-      lng = item[city][1]
-
+      lat, lng = item[city][0], item[city][1]
       time_zone = NearestTimeZone.to(lat.to_f, lng.to_f)
-      time = time.in_time_zone(time_zone)
     end
 
-    def self.get_zone(city)
-      json_file = 'data/cities.json'
-      json = Oj.load(File.read(json_file))
-      item = json.select! { |k, _| k == city }
-
-      raise "Not found #{city}" unless item
-
-      lat = item[city][0]
-      lng = item[city][1]
-
-      time_zone = NearestTimeZone.to(lat.to_f, lng.to_f)
+    def self.get_time(city, time)
+      time_zone = get_nearest_time_zone(city)
+      time.in_time_zone(time_zone)
     end
 
     ISO_TIME = /\A(\d\d):(\d\d)\z/
 
-    # returns UTC
-    def self.string_to_time(string, method, time_zone)
-      # https://github.com/rails/rails/blob/aeba121a83965d242ed6d7fd46e9c166079a3230/activemodel/lib/active_model/type/helpers/time_value.rb#L65
+    def self.string_to_time(string, time_zone)
+      return unless string.is_a? String
 
       if string =~ ISO_TIME
-        if method == :utc
-          offset = 0 # UTC +0
-          current_time = Time.new.utc
-
-          Time.new(
-            current_time.year,
-            current_time.month,
-            current_time.day,
-            $1.to_i,
-            $2.to_i,
-            0,
-            offset
-          )
-        else
-          current_time = Time.current
-          zone = ActiveSupport::TimeZone[time_zone]
-          offset = zone.utc_offset
-
-          Time.new(
-            current_time.year,
-            current_time.month,
-            current_time.day,
-            $1.to_i,
-            $2.to_i,
-            0,
-            offset
-          )
-        end
+        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
+        )
       end
     end
 end

data/lib/time_zone_converter/version.rb

@@ -1,3 +1,3 @@
 module TimeZoneConverter
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_zone_converter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Rafał Trojanowski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2019-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,7 +176,6 @@ files:
 - lib/time_zone_converter/cli.rb
 - lib/time_zone_converter/json_data_transformer.rb
 - lib/time_zone_converter/version.rb
-- time_zone_converter-0.1.0.gem
 - time_zone_converter.gemspec
 homepage: https://github.com/rafaltrojanowski/time_zone_converter
 licenses: