geolookup 0.5.4 → 0.5.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2YwNTRkYzNiNGY3NTEzMGNmNzIyNjVmNmFkMWI4ZWY4MjkzN2I2OQ==
+    YjQ3MmMwYmZlNmJhYjM2ZjhmMWY1YjFjNTIzNmI1NTc1MjdhNjk4NQ==
   data.tar.gz: !binary |-
-    MTU3ZWU4YmE3NzY3YzBkZTlmZTg3ZjgwMGU0MDhmZWRjZmNjZWI1ZA==
+    OWM2MzYzOWNmOWQzMWMzMjZhZGI1OGZlY2YyYTcyMmJhMTRjNGI2Mw==
 SHA512:
   metadata.gz: !binary |-
-    YzMwNTNkYjFlOWE0OTMyOGMzNDRmNDEzYTNjZmIwMzVmODhjZWZhYWVlMWEy
-    ZjMyMjY0OTcyNTIzOTFkOTlmODQ0MjZjMTQ2ZGY2MTMwZTVhODE0MmE0OTZh
-    ZWMyZGQzNTE2Mzg0OGY4YTcxMTBlOGVmMjllNmY5MDQxNGEwZjY=
+    NzhiMTM1YzM5OWE2ZTY4ZTRiMzA0NmIwOTk4MzQ5Yjg0ODU4YmFiZjIxYzIx
+    YTc5MDUwMTIwOTNlMWNkMTY2NTdiOTRiYTgyODhjN2NmMzZmNjkwNzVkODIy
+    N2E3ZTM2NGFiMmY4MjNkNzVkYzAzNTI4ZjA4NzU3YmI2OWExM2E=
   data.tar.gz: !binary |-
-    M2NiMTY1NWJiNTZhZGU3M2NlNjczOWVlODAxMDMzYmE0YjA5YTlhZjRkMTgz
-    NzQ5ZmU0YWE2NTVhNDlmYTlhM2Q5NTg5MjdmZGZlMzdmNjI2MmNkZDY1YjFk
-    YWU4NzIwOTY4M2ZjZTI3NGNiOTk3YTk1M2ViMmUyOGJkYjNkNDk=
+    NmZmMTQ4YWY4ZTIxNTczMjEyM2U0MGZjM2I1YmUzOWZkNzI2YmQ1OGRlOTM5
+    MTQ0NjYyZTk3M2I2ZWRlOTc0ZGYyZGMzZDc3MjY3ZDYwZWJkYjJiN2JkOTQ4
+    MmFmYjRiZmZjOTg4NTk1ODMzMjQwMzVjYTI4OWVkYTZkY2ViYTM=

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+=== 0.5.5
+ - Fixes to the data from files
+
 === 0.5.4
  - Loading data from files thanks @ekuecks!
 

data/lib/geolookup.rb

@@ -9,10 +9,7 @@ module Geolookup
   #
   # Loads a given .yml file that contains a hash and returns the hash
   #
-  def self.load_hash_from_file(file)
-    fileName = File.open(file, "r")
-    hash = YAML.load(fileName)     
-    fileName.close
-    hash
+  def self.load_hash_from_file(file_name)
+    YAML.load_file(File.join(File.dirname(__FILE__), "data/", file_name))
   end
 end

data/lib/geolookup/country.rb

@@ -10,16 +10,16 @@ require 'yaml'
 module Geolookup
 
   module Country
-    COUNTRY_NAME_TO_CODE_FILE = "./lib/data/COUNTRY_NAME_TO_CODE.yml"
-    COUNTRY_CODE_TO_NAME_FILE = "./lib/data/COUNTRY_CODE_TO_NAME.yml"
-    COUNTRY_LAT_LONG_FILE     = "./lib/data/COUNTRY_LAT_LONG.yml"
+    COUNTRY_NAME_TO_CODE_FILE = "COUNTRY_NAME_TO_CODE.yml"
+    COUNTRY_CODE_TO_NAME_FILE = "COUNTRY_CODE_TO_NAME.yml"
+    COUNTRY_LAT_LONG_FILE     = "COUNTRY_LAT_LONG.yml"
 
     @country_name_to_code
     @country_code_to_name
     @country_lat_long
-    
+
     def self.name_to_code(country_name)
-      @country_name_to_code ||= Geolookup.load_hash_from_file(COUNTRY_NAME_TO_CODE_FILE)      
+      @country_name_to_code ||= Geolookup.load_hash_from_file(COUNTRY_NAME_TO_CODE_FILE)
       @country_name_to_code[country_name.to_s.upcase]
     end
 
@@ -32,7 +32,7 @@ module Geolookup
     #  LAT_LONG[country_code.to_s.upcase]
     #end
 
-    def self.name_to_lat_long(country_name) 
+    def self.name_to_lat_long(country_name)
       @country_lat_long ||= Geolookup.load_hash_from_file(COUNTRY_LAT_LONG_FILE)
       @country_lat_long[country_name.to_s.upcase]
     end

data/lib/geolookup/usa/county.rb

@@ -2,14 +2,14 @@
 module Geolookup
   module USA
     module County
-      COUNTY_CODE_TO_NAME_FILE = './lib/data/COUNTY_CODE_TO_NAME.yml'
-      COUNTY_NAME_TO_CODE_FILE = './lib/data/COUNTY_NAME_TO_CODE.yml'
-      COUNTY_LAT_LONG_FILE     = './lib/data/COUNTY_LAT_LONG.yml'
+      COUNTY_CODE_TO_NAME_FILE = 'COUNTY_CODE_TO_NAME.yml'
+      COUNTY_NAME_TO_CODE_FILE = 'COUNTY_NAME_TO_CODE.yml'
+      COUNTY_LAT_LONG_FILE     = 'COUNTY_LAT_LONG.yml'
 
       @county_code_to_name
       @county_name_to_code
       @county_lat_long
-      
+
       ###################################################################
       # self.code_to_name
       #
@@ -17,10 +17,10 @@ module Geolookup
       # Else return nil
       #
       # EX: code_to_name(1, 1) => "AUTAUGA"
-      def self.code_to_name(state_code, county_code) 
+      def self.code_to_name(state_code, county_code)
         @county_code_to_name ||= Geolookup.load_hash_from_file(COUNTY_CODE_TO_NAME_FILE)
         return nil unless @county_code_to_name[state_code.to_s.to_i]
-              
+
         @county_code_to_name[state_code.to_s.to_i][county_code.to_s.to_i]
       end
 

data/lib/geolookup/usa/state.rb

@@ -2,11 +2,11 @@
 module Geolookup
   module USA
     module State
-      STATE_CODE_TO_FULL_FILE         = './lib/data/STATE_CODE_TO_FULL.yml'
-      STATE_CODE_TO_ABBREVIATION_FILE = './lib/data/STATE_CODE_TO_STATE.yml'
-      STATE_NAME_TO_CODE_FILE         = './lib/data/STATE_NAME_TO_CODE.yml'
-      STATE_ABBREVIATION_TO_NAME_FILE = './lib/data/STATE_FULL_STATE_NAMES.yml'
-      STATE_LAT_LONG_FILE             = './lib/data/STATE_LAT_LONG.yml'
+      STATE_CODE_TO_FULL_FILE         = 'STATE_CODE_TO_FULL.yml'
+      STATE_CODE_TO_ABBREVIATION_FILE = 'STATE_CODE_TO_STATE.yml'
+      STATE_NAME_TO_CODE_FILE         = 'STATE_NAME_TO_CODE.yml'
+      STATE_ABBREVIATION_TO_NAME_FILE = 'STATE_FULL_STATE_NAMES.yml'
+      STATE_LAT_LONG_FILE             = 'STATE_LAT_LONG.yml'
 
       @state_code_to_full
       @state_code_to_abbreviation

data/lib/geolookup/version.rb

@@ -1,3 +1,3 @@
 module Geolookup
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geolookup
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Austin Fonacier