zipcoder 0.7.4 → 0.8.0

data/lib/zipcoder/cacher/base.rb

@@ -52,19 +52,23 @@ module Zipcoder
         state_lookup = {}
 
         # Add the zip codes to the cache
-        zip_codes.each do |zip, info|
-          city = _capitalize_all(info[:city])
-          info[:city] = city
-          state = info[:state]
-
-          # Iterate through the zip codes and add them to the zip cache
-          _write_cache _zip_cache(zip), info
-
-          # Create the city lookups
-          city_state = "#{city.upcase},#{state.upcase}"
-          infos = city_states[city_state] || []
-          infos << info
-          city_states[city_state] = infos
+        zip_codes.each do |zip, cities|
+          cities.each do |info|
+            city = _capitalize_all(info[:city])
+            info[:city] = city
+            state = info[:state]
+
+            # For the zip codes, only store the primary
+            if info[:primary]
+              _write_cache _zip_cache(zip), info
+            end
+
+            # Create the city lookups
+            city_state = "#{city.upcase},#{state.upcase}"
+            infos = city_states[city_state] || []
+            infos << info
+            city_states[city_state] = infos
+          end
         end
 
         # Normalize each city and populate the state cache
@@ -156,11 +160,13 @@ module Zipcoder
 
         # Iterate through the info and get min/max of zip/lat/long
         infos.each do |info|
+          if info[:primary]
+            lat_min = info[:lat] if info[:lat] < lat_min
+            lat_max = info[:lat] if info[:lat] > lat_max
+            long_min = info[:long] if info[:long] < long_min
+            long_max = info[:long] if info[:long] > long_max
+          end
           zips << info[:zip]
-          lat_min = info[:lat] if info[:lat] < lat_min
-          lat_max = info[:lat] if info[:lat] > lat_max
-          long_min = info[:long] if info[:long] < long_min
-          long_max = info[:long] if info[:long] > long_max
         end
 
         # Create the normalized value

data/lib/zipcoder/version.rb

@@ -1,3 +1,3 @@
 module Zipcoder
-  VERSION = "0.7.4"
+  VERSION = "0.8.0"
 end

data/spec/zipcoder_spec.rb

@@ -121,7 +121,7 @@ describe Zipcoder do
   describe "#state_cities" do
     it "returns the cities for a state" do
       cities = described_class.state_cities "TX"
-      expect(cities.count).to eq(1170)
+      expect(cities.count).to eq(1586)
 
       city_info = cities[0]
       expect(city_info[:city]).to eq("Abbott")
@@ -132,7 +132,7 @@ describe Zipcoder do
     end
     it "returns the cities for a state filtered" do
       cities = described_class.state_cities "TX", keys: [:zip, :city]
-      expect(cities.count).to eq(1170)
+      expect(cities.count).to eq(1586)
 
       city_info = cities[0]
       expect(city_info[:city]).to eq("Abbott")
@@ -143,7 +143,7 @@ describe Zipcoder do
     end
     it "returns the names of the cities" do
       cities = described_class.state_cities "TX", names_only: true
-      expect(cities.count).to eq(1170)
+      expect(cities.count).to eq(1586)
 
       expect(cities[0]).to eq("Abbott")
     end
@@ -216,7 +216,7 @@ describe Zipcoder do
         zip_info = zip_cities["13601"]
         expect(zip_info[:city]).to eq("Watertown")
         expect(zip_info[:state]).to eq("NY")
-        expect(zip_info[:zip]).to eq("13601,13603")
+        expect(zip_info[:zip]).to eq("13601-13603")
         expect(zip_info[:lat]).to eq(43.97)
         expect(zip_info[:long]).to eq(-75.91)
       end
@@ -282,6 +282,7 @@ describe Zipcoder do
         expect(city_info[:lat]).to eq(30.315)
         expect(city_info[:long]).to eq(-97.71)
       end
+
       it "only returns specified keys" do
         city_info = "Austin, TX".city_info keys: [:zip, :city]
         expect(city_info[:city]).to eq("Austin")
@@ -290,22 +291,33 @@ describe Zipcoder do
         expect(city_info[:lat]).to be_nil
         expect(city_info[:long]).to be_nil
       end
+
       it "only returns the zip codes" do
         zip_codes = "Austin, TX".city_info zips_only: true
         expect(zip_codes.count).to eq(47)
         expect(zip_codes[0]).to eq('78701')
         expect(zip_codes[-1]).to eq('78799')
       end
+
       it "returns an nil when the city state is non-existent" do
         zip_codes = ", ".city_info
         expect(zip_codes).to be_nil
       end
+
+      it "returns the info for an acceptable city" do
+        city_info = "West Lake Hills, TX".city_info
+        expect(city_info[:city]).to eq("West Lake Hills")
+        expect(city_info[:state]).to eq("TX")
+        expect(city_info[:zip]).to eq("78746")
+        expect(city_info[:lat]).to eq(30.26)
+        expect(city_info[:long]).to eq(-97.74)
+      end
     end
 
     describe "state_cities" do
       it "returns the cities for a state" do
         cities = "TX".state_cities
-        expect(cities.count).to eq(1170)
+        expect(cities.count).to eq(1586)
 
         city_info = cities[0]
         expect(city_info[:city]).to eq("Abbott")
@@ -316,7 +328,7 @@ describe Zipcoder do
       end
       it "returns the cities for a state filtered" do
         cities = "TX".state_cities keys: [:zip, :city]
-        expect(cities.count).to eq(1170)
+        expect(cities.count).to eq(1586)
 
         city_info = cities[0]
         expect(city_info[:city]).to eq("Abbott")
@@ -325,6 +337,18 @@ describe Zipcoder do
         expect(city_info[:lat]).to be_nil
         expect(city_info[:long]).to be_nil
       end
+
+      it "has secondary cities" do
+        contains_acceptable = false
+        "TX".state_cities.each do |info|
+          if info[:city] == "West Lake Hills"
+            contains_acceptable = true
+            break
+          end
+        end
+
+        expect(contains_acceptable).to eq(true)
+      end
     end
   end
 

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: zipcoder
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Eric Chapman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   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
   name: codecov
   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
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.5
 description: 
@@ -103,9 +103,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -138,17 +138,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Converts zip codes to cities, lat/long, and vice-versa