distance_finder 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87ff87fa819023f3a7df1755f6ea105407153493
-  data.tar.gz: 58405c0061e23763bf2c413ecb1c3a49fb9217c5
+  metadata.gz: 3b361ceccd2ff21ea46a6ef366b16e05363d0b8e
+  data.tar.gz: 6f7930cef858da3d9cd2cc97d8f5fcfdedd496b0
 SHA512:
-  metadata.gz: 0b8303f7579e002366f355e59b052f3302ab3450e5aa7efa2ffff08d785b7aa17b26a4e2168ddbc6f2aaaebf8bee503eb840b58dfb71af4087a19f80403b7db4
-  data.tar.gz: 764b47fe6f8c5f4eaa3f6bc3da8bf689e83992ae6fefd7335882f01e516ec948b64d7c0e6e08bbc685eae26a1989d5f87c2e8a35898a22dc6b1e8126f784825a
+  metadata.gz: 4eaf183421df25673cc1b3834504ba7e66b715d5120122ddf9cd6e54ae176ae54372cfd7265e406cef925f77c7cbad3f67b00f0ad1a590836f273a9f75fa7dc0
+  data.tar.gz: 46f1e9165dff400595ffdebf0b9f35cbd24b7b3209e4a459443d2a037aa76fae22135ee6646a1eae52039266cee95e1fd7a15efd15c12d5075fff350cfc1e008

data/Guardfile

@@ -21,4 +21,5 @@ guard :minitest do
   watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
   watch(%r{^test/test_helper\.rb$})      { 'test' }
   watch(%r{^test/(.+)_test\.rb$})        { 'test' }
+  watch(%r{^lib/(.*)})                   { 'test' }
 end

data/lib/distance_finder/calculator.rb

@@ -2,10 +2,13 @@ module DistanceFinder
   class Calculator
 
     attr_reader :distance, :duration, :start_address, :end_address, :display_full_response
+    attr_accessor :status
 
-    def initialize(origin, destination)
-      @origin = strip_input(origin)
-      @destination = strip_input(destination)
+    def initialize(origin, destination, mode = "driving", units = "imperial")
+      @origin = origin.strip()
+      @destination = destination.strip()
+      @mode = "mode=" + mode
+      @units = "units=" + units
       @google_object = parse_response
     end
 
@@ -17,7 +20,7 @@ module DistanceFinder
 
     # Return distance
     def distance
-      @google_object["routes"][0]["legs"][0]["distance"]["value"] / 1000 * 0.621371
+      @google_object["routes"][0]["legs"][0]["distance"]["text"]
     end
 
     # Return duration
@@ -27,11 +30,13 @@ module DistanceFinder
 
     # Return origin name
     def start_address
+      return @origin unless status == "OK"
       @google_object["routes"][0]["legs"][0]["start_address"]
     end
 
     # Returns destination name
     def end_address
+      return @destination unless status == "OK"
       @google_object["routes"][0]["legs"][0]["end_address"]
     end
 
@@ -62,11 +67,13 @@ module DistanceFinder
     end
 
     def build_url
-      "https://maps.googleapis.com/maps/api/directions/json?origin=#{@origin}&destination=#{@destination}"
+      "https://maps.googleapis.com/maps/api/directions/json?origin=#{convert_input(@origin)}&destination=#{convert_input(@destination)}&#{@units}&#{@mode}"
     end
 
-    def strip_input(string)
-      ActiveSupport::Inflector.transliterate(string).strip()
+    # Converts non english characters into english equivalents
+    # Replaces spaces with "+"
+    def convert_input(string)
+      ActiveSupport::Inflector.transliterate(string).strip().tr(" ", "+")
     end
 
   end

data/lib/distance_finder/interface.rb

@@ -42,7 +42,7 @@ module DistanceFinder
         if route.status == "OK"
           puts format_result("⊗ Origin:", route.start_address)
           puts format_result("⊗ Destination:", route.end_address)
-          puts format_result("⇄ Distance:", route.distance.round(1).to_s + " miles")
+          puts format_result("⇄ Distance:", route.distance)
           puts format_result("🕑 Travel time:", route.duration)
         else
           puts format_result("Sorry, unable to find the route.")

data/lib/distance_finder/version.rb

@@ -1,3 +1,3 @@
 module DistanceFinder
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: distance_finder
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Slawomir Cieslak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport