locationator 0.1.2 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjZjZGRmNGE4M2ZkMDJjNDc1OTk5NjFmMjlhYWIwNDNkNGQ3YjJjNQ==
+    ZTkxZGU5ZTZkODY4MDQ5OWI1YjhkMDA1YzRiZjAzODgzNWMwNGViZA==
   data.tar.gz: !binary |-
-    ZWE0ZjcxMzU1M2U3ZDhiYjYxNGIwYjZiZWI2ZDQwMWQ3OTVlOTE4OQ==
+    MjZlNjAwMzM2MGI0MWQyN2VkMjJkOTkxYWIzZmE0M2IyNzMyYWQyZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmJiZjg1YTBjM2NiZWYxYzcwZDQ3ZTk4OTk4OTFmODE4ZjA4ZDA2ZDI2NzU2
-    NTkyYWMyMGI0YWEwOTQ4MGMxMzdkNTIxNDY5YjcwZjBiOWYzOTI0OTUwZGQy
-    ZTM4Yzk5NjY1N2Y3MzJmMzIzYWRhYzI5ZGNjZmI0OWU1NjU2M2U=
+    NWExZGE2ZjU4NWI1Zjk3NmUwOWU5ZDUxZWViN2Q0NWNiNThhYjMyNTRkNzAw
+    MTRjYmY0NDA2MmMwZTk5M2NmMjRhYzY2ZWI3NmI2N2M2MzVlOTI5ZDNmZjUz
+    ZTgzZDk4ZWE5YTQ5MDBlNWRjZWYyMDM0N2Q4NGI5NjcxZDBlNjk=
   data.tar.gz: !binary |-
-    NzlhOTA3NWU2Y2M5NjU5ZjI1NWFkM2Q0ZTNhMjZjN2RkZGM3Mzk1YTQxYjFk
-    ODUyZGMyMzhlY2Q0ZDNkZjgxODVjZjIxYWViZDE5MTA1ZmYxYWE1M2JlOWMz
-    MTk1MWRmYjAwOWUyZGVmYzA3MTU2NzgwZjJlMjFjYTY0ZWRiOWM=
+    NDg4YWE3YWE1Mzc0YjAwM2QxYzg5YjNlYmY0ZjQ3ZDliMDhlMjlmMjFiYTc5
+    ODg5YTcyOWIzY2FhYjczMTQ1OWRhYmE0ZTM4MWZhZTE4MGZkNDAyOWFmMWJh
+    MDYyMzdkZDE5ZWU1MTg2ZWE5NmUwNTVlMGJhODc0OWZhYjdlNjg=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locationator (0.1.2)
+    locationator (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/locationator.rb

@@ -8,28 +8,33 @@ module Locationator
   # Returns the latitude
   def self.lat(address)
     geocodeResponse = get_data(address)
-    result = geocodeResponse["status"] == "ZERO_RESULTS" ? "Address not found." : geocodeResponse["results"][0]["geometry"]["location"]["lat"]
+    result = geocodeResponse["status"] == "ZERO_RESULTS" ? nil : geocodeResponse["results"][0]["geometry"]["location"]["lat"]
   end
 
   # Returns the longitude
   def self.lng(address)
     geocodeResponse = get_data(address)
-    result = geocodeResponse["status"] == "ZERO_RESULTS" ? "Address not found." : geocodeResponse["results"][0]["geometry"]["location"]["lng"]
+    result = geocodeResponse["status"] == "ZERO_RESULTS" ? nil : geocodeResponse["results"][0]["geometry"]["location"]["lng"]
   end
 
   # Builds an array of the latitude and longitude
   def self.lat_lng(address)
-    lat_lng_array = []
-    lat_lng_array.push(self.lat(address))
-    lat_lng_array.push(self.lng(address))
-    result = lat_lng_array == ["Address not found.", "Address not found."] ? "Address not found." : lat_lng_array 
+    myArray = []
+    geocodeResponse = get_data(address)
+    myArray.push(geocodeResponse["status"] == "ZERO_RESULTS" ? nil : geocodeResponse["results"][0]["geometry"]["location"]["lat"])
+    myArray.push(geocodeResponse["status"] == "ZERO_RESULTS" ? nil : geocodeResponse["results"][0]["geometry"]["location"]["lng"])
+    if myArray == [nil, nil]
+      result = nil
+    else
+      result = myArray
+    end
   end
 
   # Returns the zip code for an address
   def self.zip(address)
     geocodeResponse = get_data(address)
     if geocodeResponse["status"] == "ZERO_RESULTS"
-      zip = "Address not found."
+      zip = nil
     else
       components = geocodeResponse["results"][0]["address_components"]
       # The postal code is always the last address component returned
@@ -41,7 +46,7 @@ module Locationator
   # Returns a properly formatted address
   def self.format(address)
     geocodeResponse = get_data(address)
-    result = geocodeResponse["status"] == "ZERO_RESULTS" ? "Address not found." : geocodeResponse["results"][0]["formatted_address"] 
+    result = geocodeResponse["status"] == "ZERO_RESULTS" ? nil : geocodeResponse["results"][0]["formatted_address"] 
   end
 
   # Returns the latitude based on the current user's IP address
@@ -59,7 +64,7 @@ module Locationator
   # Returns an array of the latitude and longitude based on the current user's IP address
   def self.ip_lat_lng
     myArray = []
-    geocodeResponse = get_data(address)
+    geocodeResponse = get_ip_data
     myArray.push(geocodeResponse["latitude"])
     myArray.push(geocodeResponse["longitude"])
     result = myArray

data/lib/locationator/version.rb

@@ -1,3 +1,3 @@
 module Locationator
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locationator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Lawrence Davis