zipcoder 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77f0c35bbd27d057f681505f7acb9ee053a5aa6b
-  data.tar.gz: 3ee6d1f08486f19717609b2cd113e22447679488
+  metadata.gz: 6a8c448625e1f29e651486fe183f07fa0b5b5b4d
+  data.tar.gz: 9234087086d3e048d8ca50eae52f2bf2f5b21e4a
 SHA512:
-  metadata.gz: 278c9af7fbdeaa1045d1611816cff18c3309bdd9a2cbb36d1a9a74d510b269cce23c670be3e50e5cdb1c425fbd7aefb7934c9910747350ceffb38687aa3dd5d4
-  data.tar.gz: 5c161707534917c5cd770b7d34689b4c4b9403b3783c55e8803a7bc2d0e2924195a8c7efb19dd8a7d37c75126cc2835fe63a1cdfd382604649362e19ccf7162c
+  metadata.gz: 02a075c911f38c1f14035b0dd52f0fee5417c900d19f23b4a1cf9c26a08c32f3015ef421c30bf4a8405c913c3dba4492cc09b65221d4f31694a05c91ffd8f337
+  data.tar.gz: 6d2c2eb7f9b5af8c28f73390fef20152c9cb2f60dcd7c55c469305073e5f5fab2fe887704052503e5859ac1cb89d362f7a457d32ab8f2f228bb794dfc20bd75b

data/README.md

@@ -7,8 +7,12 @@ Gem for performing zip code lookup operations
 
 ## Revision History
 
- - v0.7.2:
-   - minro bug fixes
+ - v0.7.4:
+   - updates "zip_cities" to return valid zip_codes (and not just what you enter)
+   - also added "specified_zip" to the city object when entering zip codes.  This
+     will allow a client to know if all of the zip codes were specified for a city
+ - v0.7.2/3:
+   - minor bug fixes
  - v0.7.0:
    - added "zips_only" option to "city_info"
  - v0.6.1:
@@ -183,7 +187,7 @@ require 'zipcoder'
 
 # Returns the cities for a zip_code
 puts "78701-78750,78613".zip_cities
-# > [{:zip=>"78748", :city=>"Austin", :state=>"TX", :lat=>30.26, :long=>-97.74}, ...
+# > [{:zip=>"78701-78705,78710,78712,78717,...", :specified_zip => "78701-78750", :city=>"Austin", :state=>"TX", :lat=>30.26, :long=>-97.74}, ...
 
 # Returns just the name of the cities
 puts "78701-78750,78613".zip_cities names_only: true

data/lib/zipcoder.rb

@@ -57,21 +57,12 @@ module Zipcoder
     max = kwargs[:max]
 
     cities = {}
-    last_key = nil
-    last_zip = nil
     self._parse_zip_string(zip_string).each do |zip|
       info = zip.zip_info
-      if info == nil
-        if last_zip != nil and zip.to_i == last_zip.to_i + 1
-          key = last_key
-        else
-          key = nil
-        end
-      else
+      key = nil
+      if info != nil
         key = "#{info[:city]}, #{info[:state]}"
       end
-      last_key = key
-      last_zip = zip
 
       if key == nil
         next
@@ -98,13 +89,18 @@ module Zipcoder
         end
       end
     else
-      cities = cities.keys.uniq.sort
+      sorted_cities = cities.keys.uniq.sort
       if kwargs[:names_only]
-        zips = cities
+        zips = sorted_cities
       else
         zips = []
-        cities.each do |key|
-          zips << key.city_info(keys: kwargs[:keys])
+        sorted_cities.each do |city|
+          zip_codes = cities[city]
+          city_detail = city.city_info(keys: kwargs[:keys])
+          if kwargs[:keys] == nil or kwargs[:keys].include? :specified_zip
+            city_detail[:specified_zip] = zip_codes.combine_zips
+          end
+          zips << city_detail
         end
       end
     end

data/lib/zipcoder/version.rb

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

data/spec/zipcoder_spec.rb

@@ -157,7 +157,8 @@ describe Zipcoder do
       zip_info = zip_cities[0]
       expect(zip_info[:city]).to eq("Austin")
       expect(zip_info[:state]).to eq("TX")
-      expect(zip_info[:zip].start_with?("78701")).to eq(true)
+      expect(zip_info[:zip]).to eq("78701-78705,78710,78712,78717,78719,78721-78739,78741-78742,78744-78754,78756-78759,78798-78799")
+      expect(zip_info[:specified_zip]).to eq("78748")
       expect(zip_info[:lat]).to eq(30.315)
       expect(zip_info[:long]).to eq(-97.71)
     end
@@ -169,7 +170,8 @@ describe Zipcoder do
       zip_info = zip_cities[0]
       expect(zip_info[:city]).to eq("Austin")
       expect(zip_info[:state]).to eq("TX")
-      expect(zip_info[:zip].start_with?("78701")).to eq(true)
+      expect(zip_info[:zip]).to eq("78701-78705,78710,78712,78717,78719,78721-78739,78741-78742,78744-78754,78756-78759,78798-78799")
+      expect(zip_info[:specified_zip]).to eq("78702-78705,78710,78712,78717,78719,78721-78739,78741-78742,78744-78750")
       expect(zip_info[:lat]).to eq(30.315)
       expect(zip_info[:long]).to eq(-97.71)
 
@@ -177,6 +179,7 @@ describe Zipcoder do
       expect(zip_info[:city]).to eq("Cedar Park")
       expect(zip_info[:state]).to eq("TX")
       expect(zip_info[:zip]).to eq("78613")
+      expect(zip_info[:specified_zip]).to eq("78613")
       expect(zip_info[:lat]).to eq(30.51)
       expect(zip_info[:long]).to eq(-97.83)
     end
@@ -194,12 +197,12 @@ describe Zipcoder do
     context "#grouped" do
       it "returns the cities grouped" do
         zip_cities = "78751,13601,78613,78700-78750".zip_cities grouped: true
-        expect(zip_cities.keys.sort).to eq(["13601", "78613", "78701-78751"])
+        expect(zip_cities.keys.sort).to eq(["13601", "78613", "78701-78705,78710,78712,78717,78719,78721-78739,78741-78742,78744-78751"])
 
-        zip_info = zip_cities["78701-78751"]
+        zip_info = zip_cities["78701-78705,78710,78712,78717,78719,78721-78739,78741-78742,78744-78751"]
         expect(zip_info[:city]).to eq("Austin")
         expect(zip_info[:state]).to eq("TX")
-        expect(zip_info[:zip].start_with?("78701")).to eq(true)
+        expect(zip_info[:zip]).to eq("78701-78705,78710,78712,78717,78719,78721-78739,78741-78742,78744-78754,78756-78759,78798-78799")
         expect(zip_info[:lat]).to eq(30.315)
         expect(zip_info[:long]).to eq(-97.71)
 
@@ -220,8 +223,13 @@ describe Zipcoder do
 
       it "returns just names of cities grouped" do
         zip_cities = "78751,13601,78613,78700-78750".zip_cities grouped: true, names_only: true
-        expect(zip_cities.keys.sort).to eq(["13601", "78613", "78701-78751"])
-        expect(zip_cities).to eq({"78701-78751" => "Austin, TX", "78613" => "Cedar Park, TX", "13601" => "Watertown, NY"})
+        expect(zip_cities.keys.sort).to eq(["13601", "78613", "78701-78705,78710,78712,78717,78719,78721-78739,78741-78742,78744-78751"])
+        expected = {
+            "78701-78705,78710,78712,78717,78719,78721-78739,78741-78742,78744-78751" => "Austin, TX",
+            "78613" => "Cedar Park, TX",
+            "13601" => "Watertown, NY"
+        }
+        expect(zip_cities).to eq(expected)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zipcoder
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Eric Chapman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-29 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler