locotimezone 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 337171fec57c496eedd9e382daeba4613d28d119
-  data.tar.gz: 5e2f61e63b6e3cc818a781fe5f29fce5b7542043
+  metadata.gz: c0e7631eda8f0cda4fc507c70ea07b8a14bf04ea
+  data.tar.gz: 70c038d85f1bf0305ef1cb2210b3a205bcf38566
 SHA512:
-  metadata.gz: 37ac2f7f62e90c0b9d27426e0f6cbbfcec54904e33f4f3005aaef66105ed17ca9bf003e4987eca89643e783c34b55932107a05d14aba8945c45278a6b8249517
-  data.tar.gz: 5e07f8f7c83cc98d304a74ae92fe50d62e45444c68f0108b02af12db93f6305609a906dd57c5a9111a7e42016c95b35a093de8b630122470037254f2ff14020e
+  metadata.gz: b1db75e3ffc577a0b95135a01d2d380eb2a8772d463261ddb5e9e999148be1d6be91d2f5addccd37aeb9eff9c17f61f2f22ef3b47bc9da19bf22a33bfe40498f
+  data.tar.gz: 76feec5b03b369128fd3681b07c947b90dd0b5db4f9e783f7b1298d3791c19cc40fefaa1d81f51a2c22e2081c1c217189b1b2e79450c3964a510271e555869cb

data/lib/locotimezone.rb

@@ -2,7 +2,10 @@ require 'locotimezone/version'
 require 'locotimezone/locotime'
 require 'locotimezone/geolocate'
 require 'locotimezone/timezone'
+require 'locotimezone/errors'
+require 'locotimezone/error_logger'
 require 'locotimezone/configuration'
+require 'locotimezone/results_formatter'
 require 'locotimezone/active_record_helper'
 require 'locotimezone/railtie' if defined?(Rails)
 
@@ -12,10 +15,10 @@ module Locotimezone
   end
 
   def self.locotime(options = {})
-    set_default_configuration if configuration.nil?
-    Locotime.new(location: options.fetch(:location, nil),
-                 address: options.fetch(:address, nil),
-                 skip: options.fetch(:skip, nil)).call
+    configure_with_defaults if configuration.nil?
+    Locotime.new(location: options[:location],
+                 address: options[:address],
+                 skip: options[:skip]).call
   end
 
   def self.configure
@@ -26,10 +29,10 @@ module Locotimezone
 
   def self.reset_configuration
     self.configuration = Configuration.new
-    set_default_configuration
+    configure_with_defaults
   end
 
-  def self.set_default_configuration
+  def self.configure_with_defaults
     Locotimezone.configure { |config| config.google_api_key = '' }
   end
 end

data/lib/locotimezone/active_record_helper.rb

@@ -1,38 +1,22 @@
 module Locotimezone
   module ActiveRecordHelper
+    def locotime(options = {})
+      data = Locotimezone.locotime(options)
+      attr_writers = Locotimezone.configuration.attr_writers
 
-   def locotime(options = {})
-     data = Locotimezone.locotime(options)
-     geolocation_attributes data[:geo] unless data[:geo].nil?
-     timezone_attribute data[:timezone] unless data[:timezone].nil?
-   end
+      unless data[:geo].nil? || data[:geo].empty?
+        data[:geo][:location].each do |key, value|
+          attr_key = (key == :lat ? :latitude : :longitude)
 
-   def geolocation_attributes(geolocation_data)
-     return nil if geolocation_data.empty?
-     geolocation_data[:location].each do |key, value|
-       attribute = :latitude
-       attribute = :longitude if key == :lng
-       save_attribute(attribute, value)
-     end
-   end
+          next unless respond_to?(attr_writers[attr_key])
+          send(attr_writers[attr_key], value)
+        end
+      end
 
-   def timezone_attribute(timezone_data)
-     return nil if timezone_data.empty?
-     save_attribute(:timezone_id, timezone_data[:timezone_id])
-   end
-
-   def save_attribute(attribute, value)
-     if self.respond_to? attr_writers[attribute]
-      send attr_writers[attribute], value
-     end
-   end
-
-   def attr_writers
-     attrs = {}
-     Locotimezone.configuration.attributes.each do |key, value|
-       attrs[key] = "#{value}="
-     end
-     attrs
-   end
+      unless data[:timezone].nil? || data[:timezone].empty?
+        tz_writer = attr_writers[:timezone_id]
+        send(tz_writer, data[:timezone][:timezone_id]) if respond_to?(tz_writer)
+      end
+    end
   end
 end

data/lib/locotimezone/configuration.rb

@@ -2,19 +2,30 @@ module Locotimezone
   class Configuration
     attr_accessor :google_api_key
     attr_reader :attributes
-    
+
     def initialize
-      @attributes = {
-        latitude: :latitude,
-        longitude: :longitude,
-        timezone_id: :timezone_id
-      }
+      @attributes = default_attributes
     end
 
     def attributes=(value)
-      if value.respond_to? :has_key?
-        @attributes = attributes.merge value
+      return unless value.respond_to? :has_key?
+      @attributes = attributes.merge value
+    end
+
+    def attr_writers
+      attributes.each_with_object({}) do |(key, value), hash|
+        hash[key] = "#{value}="
       end
     end
+
+    private
+
+    def default_attributes
+      {
+        latitude: :latitude,
+        longitude: :longitude,
+        timezone_id: :timezone_id
+      }
+    end
   end
 end

data/lib/locotimezone/error_logger.rb

@@ -0,0 +1,13 @@
+require 'logger'
+
+module Locotimezone
+  class ErrorLogger
+    def self.stdout_log_for(error, severity: :warn)
+      logger = Logger.new(STDOUT)
+      logger.send(severity, 'locotimezone') do
+        'Unable to complete API request. Server responded '\
+        "with: #{error.message}"
+      end
+    end
+  end
+end

data/lib/locotimezone/errors.rb

@@ -0,0 +1,9 @@
+module Locotimezone
+  class LocoError < StandardError; end
+
+  class InvalidOptionsError < LocoError
+    def initialize(message = 'address or location is required')
+      super(message)
+    end
+  end
+end

data/lib/locotimezone/geolocate.rb

@@ -7,30 +7,21 @@ module Locotimezone
     end
 
     def call
-      response = open(geolocation_query_url) { |f| JSON.parse f.read }
-    rescue OpenURI::HTTPError
+      ResultsFormatter.build_geolocation_hash_for geolocation
+    rescue OpenURI::HTTPError => e
+      ErrorLogger.stdout_log_for(e, severity: :error)
       {}
-    else
-      format_results response
     end
 
     private
 
+    def geolocation
+      open(geolocation_query_url) { |f| JSON.parse f.read }
+    end
+
     def geolocation_query_url
       "https://maps.googleapis.com/maps/api/geocode/json?address="\
       "#{address}&key=#{Locotimezone.configuration.google_api_key}"
     end
-
-    def format_results(response)
-      return {} if response['results'].empty?
-      Hash[
-        formatted_address: response['results'][0]['formatted_address'],
-        location: symbolize_keys(response['results'][0]['geometry']['location'])
-      ]
-    end
-
-    def symbolize_keys(response)
-      response.map { |k, v| [k.to_sym, v] }.to_h
-    end
   end
 end

data/lib/locotimezone/locotime.rb

@@ -7,41 +7,36 @@ module Locotimezone
     attr_accessor :location
 
     def initialize(address:, location:, skip:)
-      @location      = location
-      @address       = address
-      @skip          = location ? :location : skip
+      @location = location
+      @address = address
+      @skip = location ? :location : skip
     end
 
     def call
       validate_options
-      location_data = get_location unless skip == :location
-      timezone_data = get_timezone unless skip == :timezone
-      build_hash(location_data, timezone_data)
+      ResultsFormatter.build_hash_for(geolocation, timezone)
     end
 
     private
 
     def validate_options
-      if address.nil? && (skip == :timezone || skip.nil?)
-        raise ArgumentError, 'locotimezone is missing address or location.'
-      end
+      raise InvalidOptionsError if options_invalid?
     end
 
-    def get_location
+    def options_invalid?
+      address.nil? && (skip == :timezone || skip.nil?)
+    end
+
+    def geolocation
+      return if skip == :location
       results = Geolocate.new(address).call
-      self.location = results[:location] || {}
+      @location = results[:location] || {}
       results
     end
 
-    def get_timezone
+    def timezone
+      return if skip == :timezone
       Timezone.new(location).call
     end
-
-    def build_hash(location_data, timezone_data)
-      data = Hash.new
-      data[:geo]      = location_data unless location_data.nil?
-      data[:timezone] = timezone_data unless timezone_data.nil?
-      data
-    end
   end
 end

data/lib/locotimezone/results_formatter.rb

@@ -0,0 +1,30 @@
+module Locotimezone
+  module ResultsFormatter
+    def self.build_hash_for(location, timezone)
+      {
+        geo: location,
+        timezone: timezone
+      }
+    end
+
+    def self.build_timezone_hash_for(timezone)
+      return {} if timezone['timeZoneId'].nil?
+      {
+        timezone_id: timezone['timeZoneId'],
+        timezone_name: timezone['timeZoneName']
+      }
+    end
+
+    def self.build_geolocation_hash_for(location)
+      return {} if location['results'].empty?
+      {
+        formatted_address: location['results'][0]['formatted_address'],
+        location: symbolize_keys(location['results'][0]['geometry']['location'])
+      }
+    end
+
+    def self.symbolize_keys(hash)
+      hash.map { |key, value| [key.to_sym, value] }.to_h
+    end
+  end
+end

data/lib/locotimezone/timezone.rb

@@ -8,14 +8,15 @@ module Locotimezone
 
     def call
       return {} if location_invalid?
-      response = open(timezone_query_url) { |f| JSON.parse f.read }
-    rescue OpenURI::HTTPError
+      ResultsFormatter.build_timezone_hash_for timezone_response
+    rescue OpenURI::HTTPError => e
+      ErrorLogger.stdout_log_for(e, severity: :error)
       {}
-    else
-      format_results response
     end
 
-    private
+    def timezone_response
+      open(timezone_query_url) { |response| JSON.parse response.read }
+    end
 
     def location_invalid?
       return true unless location.respond_to? :has_key?
@@ -23,27 +24,17 @@ module Locotimezone
     end
 
     def timezone_query_url
-      'https://maps.googleapis.com/maps/api/timezone/json' + '?key=' + 
-        Locotimezone.configuration.google_api_key + '&location=' + 
-        latitude_longitude + '&timestamp=' + timestamp
+      "https://maps.googleapis.com/maps/api/timezone/json?key="\
+      "#{Locotimezone.configuration.google_api_key}&location="\
+      "#{comma_delimited_location}&timestamp=#{timestamp}"
     end
 
-    def latitude_longitude
-      lat_lng = Array.new
-      location.each { |k, v| lat_lng.push v.to_s }
-      lat_lng.join(',')
+    def comma_delimited_location
+      location.values.join(',')
     end
 
     def timestamp
       Time.now.to_i.to_s
     end
-
-    def format_results(response)
-      return {} if response['timeZoneId'].nil?
-      Hash[
-        timezone_id: response['timeZoneId'], 
-        timezone_name: response['timeZoneName']
-      ]
-    end
   end
 end

data/lib/locotimezone/version.rb

@@ -1,3 +1,3 @@
 module Locotimezone
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locotimezone
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Alex Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-20 00:00:00.000000000 Z
+date: 2017-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -147,9 +147,12 @@ files:
 - lib/locotimezone.rb
 - lib/locotimezone/active_record_helper.rb
 - lib/locotimezone/configuration.rb
+- lib/locotimezone/error_logger.rb
+- lib/locotimezone/errors.rb
 - lib/locotimezone/geolocate.rb
 - lib/locotimezone/locotime.rb
 - lib/locotimezone/railtie.rb
+- lib/locotimezone/results_formatter.rb
 - lib/locotimezone/timezone.rb
 - lib/locotimezone/version.rb
 - locotimezone.gemspec
@@ -174,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Get timezone and gelocation data for a street address.