geolookup 0.5.5 → 0.5.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjQ3MmMwYmZlNmJhYjM2ZjhmMWY1YjFjNTIzNmI1NTc1MjdhNjk4NQ==
-  data.tar.gz: !binary |-
-    OWM2MzYzOWNmOWQzMWMzMjZhZGI1OGZlY2YyYTcyMmJhMTRjNGI2Mw==
+SHA1:
+  metadata.gz: 580a97b4c3ccf09e13597b09ff662a7667ba4721
+  data.tar.gz: a9130c7074c9d1c4c2ef1d8fdfaec33dcd55967d
 SHA512:
-  metadata.gz: !binary |-
-    NzhiMTM1YzM5OWE2ZTY4ZTRiMzA0NmIwOTk4MzQ5Yjg0ODU4YmFiZjIxYzIx
-    YTc5MDUwMTIwOTNlMWNkMTY2NTdiOTRiYTgyODhjN2NmMzZmNjkwNzVkODIy
-    N2E3ZTM2NGFiMmY4MjNkNzVkYzAzNTI4ZjA4NzU3YmI2OWExM2E=
-  data.tar.gz: !binary |-
-    NmZmMTQ4YWY4ZTIxNTczMjEyM2U0MGZjM2I1YmUzOWZkNzI2YmQ1OGRlOTM5
-    MTQ0NjYyZTk3M2I2ZWRlOTc0ZGYyZGMzZDc3MjY3ZDYwZWJkYjJiN2JkOTQ4
-    MmFmYjRiZmZjOTg4NTk1ODMzMjQwMzVjYTI4OWVkYTZkY2ViYTM=
+  metadata.gz: ec3cbe285dd37dd4634f81fef802b6d99ccd2613e255f636cb80d0857d545a811ace2a2cadf4e9d0b184587d85159e8c83e02ee983e4fe4dbdf0b0e03475c344
+  data.tar.gz: 0d5d8da8942e24bd3726f2ce2ea9ffde147eacb606d7e34e37a4227d342650276fb3deb71895e84c9cbc1118d0f8b2add82f8f921bb7822c7fc6eb61ed8fc9b5

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.1.1
   - jruby-19mode

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+=== 0.5.6
+ - Small bug fix for USA State name_to_abbreviation returning a full state name not an abbreviation
+
 === 0.5.5
  - Fixes to the data from files
 

data/README.md

@@ -1,4 +1,5 @@
 # Geolookup [![Build Status](https://travis-ci.org/Spokeo/geolookup.png?branch=master)](https://travis-ci.org/Spokeo/geolookup)
+[![Code Climate](https://codeclimate.com/github/Spokeo/geolookup.png)](https://codeclimate.com/github/Spokeo/geolookup)
 
 This gem wraps very common Geo lookups to either FIPS data or the collection of international data lookups.  All codes on the app are FIPS codes.
 
@@ -52,6 +53,18 @@ Geolookup::USA::State.abbreviation_to_lat_long("AL")
 Geolookup::USA::State.code_to_lat_long(1)
 # => [ 32318231,  -86602298]
 
+# US State Names
+Geolookup::USA::State.names
+# => ["Alabama", "Alaska", ...]
+
+# US State Abbreviations
+Geolookup::USA::State.abbreviations
+# => ["AL", "AK", "AZ", ...]
+
+# US State Codes
+Geolookup::USA::State.codes
+# => [1, 2, 4, ...]
+
 # US County Examples:
 
 # Given a state code and county code return the county name

data/lib/geolookup/usa/county.rb

@@ -19,9 +19,7 @@ module Geolookup
       # EX: code_to_name(1, 1) => "AUTAUGA"
       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]
+        get_value_from_hash(@county_code_to_name, state_code.to_s.to_i, county_code.to_s.to_i)
       end
 
 
@@ -34,9 +32,7 @@ module Geolookup
       # EX: name_to_code(1, 'baldwin') => {1 => {"AUTAUGA" => 1, "BALDWIN" => 3, ....}}
       def self.name_to_code(state_code, county_name)
         @county_name_to_code ||= Geolookup.load_hash_from_file(COUNTY_NAME_TO_CODE_FILE)
-        return nil unless @county_name_to_code[state_code.to_s.to_i]
-
-        @county_name_to_code[state_code.to_s.to_i][county_name.to_s.upcase]
+        get_value_from_hash(@county_name_to_code, state_code.to_s.to_i, county_name.to_s.upcase)
       end
 
 
@@ -47,10 +43,23 @@ module Geolookup
       #
       def self.code_to_lat_long(state_code, county_code)
         @county_lat_long ||= Geolookup.load_hash_from_file(COUNTY_LAT_LONG_FILE)
-        return nil unless @county_lat_long[state_code.to_s.to_i]
+        get_value_from_hash(@county_lat_long, state_code.to_s.to_i, county_code.to_s.to_i)
+      end
 
-        @county_lat_long[state_code.to_s.to_i][county_code.to_s.to_i]
+      ###################################################################
+      # self.get_value_from_hash
+      #
+      # Helper function to reduce code repetition
+      # Given a hash and 2 keys returns the value at that hash
+      # Return nil if the either key is not in the hash
+      #
+      # EX: get_value(@county_code_to_name, 1, 1) => "AUTAUGA"
+      def self.get_value_from_hash(hash, key1, key2)
+        return nil unless hash[key1]
+        hash[key1][key2]
       end
+
+      private_class_method :get_value_from_hash
     end
   end
 end

data/lib/geolookup/usa/state.rb

@@ -40,7 +40,7 @@ module Geolookup
       # a state full name
       #
       def self.name_to_abbreviation(state_abbrev)
-        code_to_name(abbreviation_to_code(state_abbrev))
+        code_to_abbreviation(abbreviation_to_code(state_abbrev))
       end
 
       ###################################################################

data/lib/geolookup/version.rb

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

data/spec/lib/state_spec.rb

@@ -12,7 +12,7 @@ describe "Geolookup::USA::State" do
 
   describe "#name_to_abbreviation" do
     it "should return name to state abbreviation" do
-      expect(Geolookup::USA::State.name_to_abbreviation('CA')).to eql("California")
+      expect(Geolookup::USA::State.name_to_abbreviation('California')).to eql("CA")
     end
 
     it "should return nil if no state abbreviation" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geolookup
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Austin Fonacier
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -29,14 +29,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -102,17 +102,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Common geo lookups