geocodio 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21e41867efad01a6ce62377cf2646b24422d4e4cbb4c500a932de477a8a3e67a
-  data.tar.gz: 16c8aa12408252f8ae4330e77d7d9a486419baae880d706e871d72dee1da24b4
+  metadata.gz: 4cfd3cac7a1ad430766ac95a5e2c62f19f00f5da4154a80c33f1ecfa6992509f
+  data.tar.gz: 2a1fe5eb2f4471f841e0a5e0f4653099b10a1fa2a8ba342376b7ddff18929e1d
 SHA512:
-  metadata.gz: 5b68c8951600d1ab745e3aaead6995d3d96272c14638fb7a11fbe885f940253e1ffca3e4cd99ce354c6aab983dfb6365fd616f92653e30743e59d8b569625cc9
-  data.tar.gz: 00f34185069e96d2e013c4bae6bd86991e51dcfff42f89f3d66c45dbf4d56b824e8a4a8726c139dbf643c47bd2a8b4397887b369f192d35d8305bbf9c0b51ab9
+  metadata.gz: 5f3c3158f187ea4ba28cef389881978aaf7e69b003a9a262023bfee02b43f7b31f1b4264a6f7a079e6762c482400ac6e848ef48ec5aed2561e3bac99719bb76f
+  data.tar.gz: ba9774ac73a69bce566fea407415b3f42201f058292090e9142659c960e9d2471995e5dd056c6a1f9a8d5afc96328573f55ff68799c5fefa717720197736aca0

data/lib/geocodio/address.rb

@@ -12,7 +12,7 @@ module Geocodio
     alias :lat :latitude
     alias :lng :longitude
 
-    attr_reader :congressional_district, :house_district, :senate_district,
+    attr_reader :congressional_districts, :house_district, :senate_district,
                 :unified_school_district, :elementary_school_district,
                 :secondary_school_district
 
@@ -60,16 +60,16 @@ module Geocodio
     end
 
     def set_additional_fields(fields)
-      set_congressional_district(fields['congressional_district'])     if fields['congressional_district']
+      set_congressional_districts(fields['congressional_districts'])   if fields['congressional_districts']
       set_legislative_districts(fields['state_legislative_districts']) if fields['state_legislative_districts']
       set_school_districts(fields['school_districts'])                 if fields['school_districts']
       set_timezone(fields['timezone'])                                 if fields['timezone']
     end
 
-    def set_congressional_district(district)
-      return if district.empty?
+    def set_congressional_districts(districts)
+      return if districts.empty?
 
-      @congressional_district = CongressionalDistrict.new(district)
+      @congressional_districts = districts.map { |district| CongressionalDistrict.new(district) }
     end
 
     def set_legislative_districts(districts)

data/lib/geocodio/address_set.rb

@@ -11,9 +11,10 @@ module Geocodio
     # @return [String] the original query
     attr_reader :query
 
-    def initialize(query, *addresses)
-      @query     = query
-      @addresses = addresses
+    def initialize(query, *addresses, input: nil)
+      @query           = query
+      @addresses       = addresses
+      @formatted_input = input
     end
 
     def each(&block)
@@ -24,6 +25,9 @@ module Geocodio
     #
     # @return [Geocodio::Address] the most accurate address
     def best
+      best = @addresses.find { |address| address.to_s == @formatted_input }
+      return best if best
+
       max_by(&:accuracy)
     end
 

data/lib/geocodio/client.rb

@@ -92,9 +92,9 @@ module Geocodio
         params[:q] = address
 
         response  = get '/geocode', params, options
-        addresses = parse_results(response)
+        addresses, input = parse_results(response)
 
-        AddressSet.new(address, *addresses)
+        AddressSet.new(address, *addresses, input: input)
       end
 
       def reverse_geocode_single(pair, options = {})
@@ -103,9 +103,9 @@ module Geocodio
         params[:q] = pair
 
         response  = get '/reverse', params, options
-        addresses = parse_results(response)
+        addresses, input = parse_results(response)
 
-        AddressSet.new(pair, *addresses)
+        AddressSet.new(pair, *addresses, input: input)
       end
 
       def geocode_batch(addresses, options = {})

data/lib/geocodio/congressional_district.rb

@@ -1,14 +1,23 @@
+require 'geocodio/legislator'
+
 module Geocodio
   class CongressionalDistrict
     attr_reader :name
     attr_reader :district_number
     attr_reader :congress_number
+    attr_reader :proportion
+    attr_reader :current_legislators
 
     def initialize(payload = {})
       @name            = payload['name']
       @district_number = payload['district_number'].to_i
       @congress_number = payload['congress_number'].to_i
       @congress_years  = payload['congress_years']
+      @proportion      = payload['proportion'].to_i
+
+      @current_legislators = payload['current_legislators'].map do |legislator|
+        Legislator.new(legislator)
+      end
     end
 
     def congress_years

data/lib/geocodio/legislator.rb

@@ -0,0 +1,69 @@
+module Geocodio
+  class Legislator
+    attr_reader :type
+    attr_reader :name
+    attr_reader :birthday
+    attr_reader :gender
+    attr_reader :party
+    attr_reader :url
+    attr_reader :address
+    attr_reader :phone
+    attr_reader :contact_form
+    attr_reader :rss_url
+    attr_reader :twitter
+    attr_reader :facebook
+    attr_reader :youtube
+    attr_reader :youtube_id
+    attr_reader :bioguide_id
+    attr_reader :thomas_id
+    attr_reader :opensecrets_id
+    attr_reader :lis_id
+    attr_reader :cspan_id
+    attr_reader :govtrack_id
+    attr_reader :votesmart_id
+    attr_reader :ballotpedia_id
+    attr_reader :washington_post_id
+    attr_reader :icpsr_id
+    attr_reader :wikipedia_id
+
+    def initialize(payload = {})
+      @type = payload['type']
+
+      if payload['bio']
+        @name = "#{payload['bio']['first_name']} #{payload['bio']['last_name']}"
+        @birthday = Date.new(*payload['bio']['birthday'].split('-').map(&:to_i))
+        @gender = payload['bio']['gender']
+        @party = payload['bio']['party']
+      end
+
+      if payload['contact']
+        @url          = payload['contact']['url']
+        @address      = payload['contact']['address']
+        @phone        = payload['contact']['phone']
+        @contact_form = payload['contact']['contact_form']
+      end
+
+      if payload['social']
+        @rss_url    = payload['social']['rss_url']
+        @twitter    = payload['social']['twitter']
+        @facebook   = payload['social']['facebook']
+        @youtube    = payload['social']['youtube']
+        @youtube_id = payload['social']['youtube_id']
+      end
+
+      if payload['references']
+        @bioguide_id        = payload['references']['bioguide_id']
+        @thomas_id          = payload['references']['thomas_id']
+        @opensecrets_id     = payload['references']['opensecrets_id']
+        @lis_id             = payload['references']['lis_id']
+        @cspan_id           = payload['references']['cspan_id']
+        @govtrack_id        = payload['references']['govtrack_id']
+        @votesmart_id       = payload['references']['votesmart_id']
+        @ballotpedia_id     = payload['references']['ballotpedia_id']
+        @washington_post_id = payload['references']['washington_post_id']
+        @icpsr_id           = payload['references']['icpsr_id']
+        @wikipedia_id       = payload['references']['wikipedia_id']
+      end
+    end
+  end
+end

data/lib/geocodio/state_legislative_district.rb

@@ -5,7 +5,8 @@ module Geocodio
 
     def initialize(payload = {})
       @name            = payload['name']
-      @district_number = payload['district_number']
+      @district_number = payload['district_number'].to_i
+      @district_number = payload['district_number'] if @district_number == 0
     end
   end
 end

data/lib/geocodio/utils.rb

@@ -2,19 +2,21 @@ module Geocodio
   module Utils
     def parse_results(response)
       results   = response.body['results']
-      addresses = results.map { |result| Address.new(result) }
+      input     = response.body['input']['formatted_address'] if response.body['input']
+      [results.map { |result| Address.new(result) }, input]
     end
 
     def parse_nested_results(response)
       results = response.body['results']
 
-      results.map do |result_set|
+      results = results.map do |result_set|
         addresses = Array(result_set['response']['results'])
         addresses.map! { |result| Address.new(result) }
 
         query = result_set['query']
+        input = result_set['response']['input']['formatted_address'] if result_set['response']['input']
 
-        AddressSet.new(query, *addresses)
+        AddressSet.new(query, *addresses, input: input)
       end
     end
 

data/lib/geocodio/version.rb

@@ -1,7 +1,7 @@
 module Geocodio
   class Version
-    MAJOR = 2
-    MINOR = 1
+    MAJOR = 3
+    MINOR = 0
     PATCH = 0
 
     def self.to_s

data/spec/address_spec.rb

@@ -21,7 +21,7 @@ describe Geocodio::Address do
     it 'has a street' do
       expect(address.street).to eq('Colorado')
     end
-    
+
     it 'has a formatted_street' do
       expect(address.formatted_street).to eq('W Colorado Blvd')
     end
@@ -76,7 +76,7 @@ describe Geocodio::Address do
       it 'has a street' do
         expect(address.street).to eq('Colorado')
       end
-      
+
       it 'has a formatted_street' do
         expect(address.formatted_street).to eq('W Colorado Blvd')
       end
@@ -102,20 +102,20 @@ describe Geocodio::Address do
       end
 
       it 'has a latitude' do
-        expect(address.latitude).to eq(34.145764409091)
-        expect(address.lat).to      eq(34.145764409091)
+        expect(address.latitude).to eq(34.145375)
+        expect(address.lat).to      eq(34.145375)
       end
 
       it 'has a longitude' do
-        expect(address.longitude).to eq(-118.15159636364)
-        expect(address.lng).to       eq(-118.15159636364)
+        expect(address.longitude).to eq(-118.151622)
+        expect(address.lng).to       eq(-118.151622)
       end
 
       it 'has an accuracy' do
         expect(address.accuracy).to eq(1)
       end
     end
-    
+
     context 'has postdirectional' do
       subject(:address) do
         VCR.use_cassette('geocode_with_postdirectional') do
@@ -130,11 +130,11 @@ describe Geocodio::Address do
       it 'has a street' do
         expect(address.street).to eq('Pennsylvania')
       end
-      
+
       it 'has a formatted_street' do
         expect(address.formatted_street).to eq('Pennsylvania Ave NW')
       end
-      
+
       it 'has a postdirectional' do
         expect(address.postdirectional).to eq('NW')
       end
@@ -160,13 +160,13 @@ describe Geocodio::Address do
       end
 
       it 'has a latitude' do
-        expect(address.latitude).to eq(38.897667)
-        expect(address.lat).to      eq(38.897667)
+        expect(address.latitude).to eq(38.897675)
+        expect(address.lat).to      eq(38.897675)
       end
 
       it 'has a longitude' do
-        expect(address.longitude).to eq(-77.036545)
-        expect(address.lng).to       eq(-77.036545)
+        expect(address.longitude).to eq(-77.036547)
+        expect(address.lng).to       eq(-77.036547)
       end
 
       it 'has an accuracy' do
@@ -181,8 +181,10 @@ describe Geocodio::Address do
         end
       end
 
-      it 'has a congressional district' do
-        expect(address.congressional_district).to be_a(Geocodio::CongressionalDistrict)
+      it 'has congressional districts' do
+        address.congressional_districts.each do |district|
+          expect(district).to be_a(Geocodio::CongressionalDistrict)
+        end
       end
 
       it 'has a house district' do

data/spec/client_spec.rb

@@ -99,17 +99,23 @@ describe Geocodio::Client do
         VCR.use_cassette('reverse') do
           addresses = geocodio.reverse_geocode([coordinates])
 
-          expect(addresses.size).to eq(3)
+          expect(addresses.size).to eq(5)
           expect(addresses).to be_a(Geocodio::AddressSet)
         end
       end
 
+      it 'handles a response without legislator house info' do
+        VCR.use_cassette('reverse_with_fields_no_house_info') do
+          expect { geocodio.reverse_geocode(["41.25,-96.00"], fields: %w[cd stateleg school timezone]) }.not_to raise_error(NoMethodError)
+        end
+      end
+
       it 'uses hashes' do
         VCR.use_cassette('reverse') do
           lat, lng = coordinates.split(',')
           addresses = geocodio.reverse_geocode([{ latitude: lat, longitude: lng }])
 
-          expect(addresses.size).to eq(3)
+          expect(addresses.size).to eq(5)
           expect(addresses).to be_a(Geocodio::AddressSet)
         end
       end
@@ -119,7 +125,7 @@ describe Geocodio::Client do
           lat, lng = coordinates.split(',')
           addresses = geocodio.reverse_geocode([{ latitude: lat, longitude: lng} ], fields: %w[cd stateleg school timezone])
 
-          expect(addresses.size).to eq(3)
+          expect(addresses.size).to eq(5)
           expect(addresses).to be_a(Geocodio::AddressSet)
         end
       end

data/spec/congressional_district_spec.rb

@@ -5,7 +5,10 @@ describe Geocodio::CongressionalDistrict do
 
   subject(:district) do
     VCR.use_cassette('geocode_with_fields') do
-      geocodio.geocode(['54 West Colorado Boulevard Pasadena CA 91105'], fields: %w[cd stateleg school timezone]).best.congressional_district
+      geocodio.geocode(['54 West Colorado Boulevard Pasadena CA 91105'], fields: %w[cd stateleg school timezone]).
+        best.
+        congressional_districts.
+        first
     end
   end
 
@@ -18,11 +21,21 @@ describe Geocodio::CongressionalDistrict do
   end
 
   it 'has a congress_number' do
-    expect(district.congress_number).to eq(114)
+    expect(district.congress_number).to eq(115)
   end
 
   it 'has a congress_years' do
-    expect(district.congress_years).to eq(2015..2017)
+    expect(district.congress_years).to eq(2017..2019)
   end
 
+  it 'has a proportion' do
+    expect(district.proportion).to eq(1)
+  end
+
+
+  it 'has current_legislators' do
+    district.current_legislators.each do |legislator|
+      expect(legislator).to be_a(Geocodio::Legislator)
+    end
+  end
 end

data/spec/legislator_spec.rb

@@ -0,0 +1,116 @@
+require 'spec_helper'
+
+describe Geocodio::Legislator do
+  let(:geocodio) { Geocodio::Client.new }
+
+  subject(:legislator) do
+    VCR.use_cassette('geocode_with_fields') do
+      geocodio.geocode(['54 West Colorado Boulevard Pasadena CA 91105'], fields: %w[cd stateleg school timezone]).
+        best.
+        congressional_districts.
+        first.
+        current_legislators.
+        first
+    end
+  end
+
+  it 'has a type' do
+    expect(legislator.type).to eq('representative')
+  end
+
+  it 'has a name' do
+    expect(legislator.name).to eq('Judy Chu')
+  end
+
+  it 'has a birthday' do
+    expect(legislator.birthday).to eq(Date.new(1953, 07, 07))
+  end
+
+  it 'has a gender' do
+    expect(legislator.gender).to eq('F')
+  end
+
+  it 'has a party' do
+    expect(legislator.party).to eq('Democrat')
+  end
+
+  it 'has a url' do
+    expect(legislator.url).to eq('https://chu.house.gov')
+  end
+
+  it 'has a address' do
+    expect(legislator.address).to eq('2423 Rayburn HOB; Washington DC 20515-0527')
+  end
+
+  it 'has a phone' do
+    expect(legislator.phone).to eq('202-225-5464')
+  end
+
+  it 'has a contact_form' do
+    expect(legislator.contact_form).to be_nil
+  end
+
+  it 'has a rss_url' do
+    expect(legislator.rss_url).to eq('http://chu.house.gov/rss.xml')
+  end
+
+  it 'has a twitter' do
+    expect(legislator.twitter).to eq('RepJudyChu')
+  end
+
+  it 'has a facebook' do
+    expect(legislator.facebook).to eq('RepJudyChu')
+  end
+
+  it 'has a youtube' do
+    expect(legislator.youtube).to eq('RepJudyChu')
+  end
+
+  it 'has a youtube_id' do
+    expect(legislator.youtube_id).to eq('UCfcbYOvdEXZNelM8T05nK-w')
+  end
+
+  it 'has a bioguide_id' do
+    expect(legislator.bioguide_id).to eq('C001080')
+  end
+
+  it 'has a thomas_id' do
+    expect(legislator.thomas_id).to eq('01970')
+  end
+
+  it 'has a opensecrets_id' do
+    expect(legislator.opensecrets_id).to eq('N00030600')
+  end
+
+  it 'has a lis_id' do
+    expect(legislator.lis_id).to be_nil
+  end
+
+  it 'has a cspan_id' do
+    expect(legislator.cspan_id).to eq('92573')
+  end
+
+  it 'has a govtrack_id' do
+    expect(legislator.govtrack_id).to eq('412379')
+  end
+
+  it 'has a votesmart_id' do
+    expect(legislator.votesmart_id).to eq('16539')
+  end
+
+  it 'has a ballotpedia_id' do
+    expect(legislator.ballotpedia_id).to eq('Judy Chu')
+  end
+
+  it 'has a washington_post_id' do
+    expect(legislator.washington_post_id).to be_nil
+  end
+
+  it 'has a icpsr_id' do
+    expect(legislator.icpsr_id).to eq('20955')
+  end
+
+  it 'has a wikipedia_id' do
+    expect(legislator.wikipedia_id).to eq('Judy Chu')
+  end
+end