address-matcher 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1831908f206efe59220256895312e2ce97de4129
-  data.tar.gz: 32f4b6abc67ad11c50a996c57540c0fb8c4923c9
+  metadata.gz: 3d2d27af283ba186e00ff6ddbb3055b509b8e0b4
+  data.tar.gz: 5ceafeb2391eb02c0b3b037f5142f4b8e6082024
 SHA512:
-  metadata.gz: d4276c12dc3d9e21d3664d334aac9a1562d85414d6a6fc59bdcf5618aad6fe08a149256103a22c00c065f70664eda00d953a1cc6e49097f053d05f4c77458398
-  data.tar.gz: 0745c45623cf69e85ff962332ed1b5fa2f3cf0e6a2b663a5e1f3918cb064ff0ff41c1aad9e4de37e78cc8f33fbe146e769c860a3b0add63d0297c7dfe87f4a75
+  metadata.gz: 106dc2f97921d4cf2c5a0d19a815574477ca537106bad49e2cd67eb03ae7e75411a96ad91f21e4f77e1e6e2d6f637e8e9724c94983d8271c7200466e1b5b25a2
+  data.tar.gz: a0b5921cb6120bfae41c0e630c813fee91f28d968b4f3049f1f2280a2a401306be8faa1b0308b5f2bcf797e6a9195c04f470925e7495730214a9ce2b642f0d22

data/VERSION

@@ -0,0 +1 @@
+0.1.0

data/address_matcher.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'address-matcher'
-  s.version     = '0.0.1'
+  s.version     = '0.1.0'
   s.date        = '2015-04-07'
   s.summary     = "Matches addresses by geocoding"
   s.description = "Uses geocoding to perform fuzzy match on address strings"

data/spec/address_group_spec.rb

@@ -1,49 +1,32 @@
 require 'spec_helper'
 
 describe AddressGroup do
-  let(:symphony_hall) do
-    { lat_long: [42.3426, -71.0858],
-      address: '301 Massachusetts Ave, Boston, MA 02115'
-    }
-  end
-
-  let(:nec) do
-    { lat_long: [42.3406, -71.0869],
-      address: '290 Huntington Ave, Boston, MA 02115'
-    }
-  end
-
-  let(:boco) do
-    { lat_long: [42.3462, -71.0901],
-      address: '8 Fenway, Boston, MA 02215'
-    }
-  end
-
+  include Locations
 
   it 'stores addresses keyed by lat/long' do
     address_group = AddressGroup.new
-    address_group[symphony_hall[:lat_long]] = symphony_hall[:address]
+    address_group[symphony_hall.coords] = symphony_hall.address
 
-    expect(address_group[symphony_hall[:lat_long]]).to eq symphony_hall[:address]
+    expect(address_group[symphony_hall.coords]).to eq symphony_hall.address
   end
 
   it 'returns the address of an exact lat/long match' do
     address_group = AddressGroup.new
-    address_group[symphony_hall[:lat_long]] = symphony_hall[:address]
-    address_group[nec[:lat_long]] = nec[:address]
+    address_group[symphony_hall.coords] = symphony_hall.address
+    address_group[nec.coords] = nec.address
 
-    match = address_group.match(symphony_hall[:lat_long])
+    match = address_group.match(symphony_hall.coords)
 
-    expect(match).to eq symphony_hall[:address]
+    expect(match).to eq symphony_hall.address
   end
 
   it 'returns the address of the closest lat/long if there is not an exact match' do
     address_group = AddressGroup.new
-    address_group[boco[:lat_long]] = boco[:address]
-    address_group[nec[:lat_long]] = nec[:address]
+    address_group[boco.coords] = boco.address
+    address_group[nec.coords] = nec.address
 
-    match = address_group.match(symphony_hall[:lat_long])
+    match = address_group.match(symphony_hall.coords)
 
-    expect(match).to eq nec[:address]
+    expect(match).to eq nec.address
   end
 end

data/spec/address_library_spec.rb

@@ -1,120 +1,124 @@
 require 'spec_helper'
 
 describe AddressLibrary do
+  include Locations
+
   it 'geocodes an address' do
     allow(Geocoder).to receive(:search).and_call_original
 
-    AddressLibrary.new.add_address('30 Lincoln Center Plaza, New York, NY 10023')
+    AddressLibrary.new.add_address(met_opera_short.address)
 
     expect(Geocoder).to(
-      have_received(:search).with('30 Lincoln Center Plaza, New York, NY 10023')
+      have_received(:search).with(met_opera_short.address)
     )
   end
 
   it 'adds address to an AddressGroup indexed by lat-long to 3 digit precision' do
-    lib = AddressLibrary.new.add_address('30 Lincoln Center Plaza, New York, NY 10023')
+    lib = AddressLibrary.new.add_address(met_opera_short.address)
 
-    group = lib.near([40.773, -73.984])
+    group = lib.near(met_opera_short.coords)
 
     expect(group).to be_an_instance_of AddressGroup
-    expect(group[[40.772748, -73.98384759999]]).to(
-      eq '30 Lincoln Center Plaza, New York, NY 10023'
+    expect(group[met_opera_short.coords]).to(
+      eq met_opera_short.address
     )
   end
 
   it 'adds multiple nearby addresses to the same AddressGroup' do
     lib = AddressLibrary.new
-                        .add_address('1000 5th Avenue, New York, NY 10028')
-                        .add_address('1002 5th Avenue, New York, NY 10028')
+                        .add_address(met_art_avenue.address)
+                        .add_address(met_next_door.address)
 
-    group = lib.near([40.779, -73.963])
+    group = lib.near(met_art_avenue.coords)
 
-    expect(group[[40.7791655, -73.9629278]]).to(
-      eq '1000 5th Avenue, New York, NY 10028'
+    expect(group[met_art_avenue.coords]).to(
+      eq met_art_avenue.address
     )
-    expect(group[[40.7785016, -73.9625847]]).to(
-      eq '1002 5th Avenue, New York, NY 10028'
+    expect(group[met_next_door.coords]).to(
+      eq met_next_door.address
     )
   end
 
   it 'adds multiple far-apart addresses to different AddressGroups' do
     lib = AddressLibrary.new
-                        .add_address('1000 5th Avenue, New York, NY 10028')
-                        .add_address('30 Lincoln Center Plaza, New York, NY 10023')
+                        .add_address(met_art_avenue.address)
+                        .add_address(met_opera_short.address)
 
-    group_1 = lib.near([40.779, -73.963])
-    group_2 = lib.near([40.773, -73.984])
+    group_1 = lib.near(met_art_avenue.coords)
+    group_2 = lib.near(met_opera_short.coords)
 
-    expect(group_1[[40.7791655, -73.9629278]]).to(
-      eq '1000 5th Avenue, New York, NY 10028'
+    expect(group_1[met_art_avenue.coords]).to(
+      eq met_art_avenue.address
     )
-    expect(group_2[[40.7791655, -73.9629278]]).to be_nil
-    expect(group_1[[40.772748, -73.98384759999]]).to be_nil
-    expect(group_2[[40.772748, -73.98384759999]]).to(
-      eq '30 Lincoln Center Plaza, New York, NY 10023'
+    expect(group_2[met_art_avenue.coords]).to be_nil
+    expect(group_1[met_opera_short.coords]).to be_nil
+    expect(group_2[met_opera_short.coords]).to(
+      eq met_opera_short.address
     )
   end
 
   it 'adds an array of addresses' do
-    addresses = ['30 Lincoln Center Plaza, New York, NY 10023',
-                 '1000 5th Ave, New York, NY 10028',
-                 '1001 5th Avenue, New York, NY 10028',
-                 '1002 5th Avenue, New York, NY 10028'
+    addresses = [met_opera_short.address,
+                 met_art_ave.address,
+                 apartments_1001.address,
+                 met_next_door.address
                 ]
 
     lib = AddressLibrary.build(addresses)
 
-    group_1 = lib.near([40.779, -73.963])
-    group_2 = lib.near([40.773, -73.984])
-    group_3 = lib.near([40.779, -73.962])
+    group_1 = lib.near(met_art_ave.coords)
+    group_2 = lib.near(met_opera_short.coords)
+    group_3 = lib.near(apartments_1001.coords)
 
-    expect(group_1[[40.77916555, -73.9629278]]).to(
-      eq '1000 5th Ave, New York, NY 10028'
+    expect(group_1[met_art_ave.coords]).to(
+      eq met_art_ave.address
     )
-    expect(group_1[[40.7785016, -73.9625847]]).to(
-      eq '1002 5th Avenue, New York, NY 10028'
+    expect(group_1[met_next_door.coords]).to(
+      eq met_next_door.address
     )
-    expect(group_2[[40.772748, -73.98384759999]]).to(
-      eq '30 Lincoln Center Plaza, New York, NY 10023'
+    expect(group_2[met_opera_short.coords]).to(
+      eq met_opera_short.address
     )
-    expect(group_3[[40.7785889, -73.9621559]]).to(
-      eq '1001 5th Avenue, New York, NY 10028'
+    expect(group_3[apartments_1001.coords]).to(
+      eq apartments_1001.address
     )
   end
 
   describe '#near' do
     it 'returns the address group indexed at the 3-digit precision for a given set of coordinates' do
     lib = AddressLibrary.new
-                        .add_address('1000 5th Avenue, New York, NY 10028')
-                        .add_address('30 Lincoln Center Plaza, New York, NY 10023')
+                        .add_address(met_art_avenue.address)
+                        .add_address(met_opera_long.address)
 
-    group_1 = lib.near([40.7791655, -73.9629278])
-    group_2 = lib.near([40.772748, -73.98384759999])
+    group_1 = lib.near(met_art_avenue.coords)
+    group_2 = lib.near(met_opera_long.coords)
 
-    expect(group_1[[40.7791655, -73.9629278]]).to(
-      eq '1000 5th Avenue, New York, NY 10028'
+    expect(group_1[met_art_avenue.coords]).to(
+      eq met_art_avenue.address
     )
-    expect(group_2[[40.7791655, -73.9629278]]).to be_nil
-    expect(group_1[[40.772748, -73.98384759999]]).to be_nil
-    expect(group_2[[40.772748, -73.98384759999]]).to(
-      eq '30 Lincoln Center Plaza, New York, NY 10023'
+    expect(group_1[met_opera_long.coords]).to be_nil
+    expect(group_2[met_art_avenue.coords]).to be_nil
+    expect(group_2[met_opera_long.coords]).to(
+      eq met_opera_long.address
     )
     end
   end
 
   describe '#match' do
     it 'returns the address which most nearly matches the given address' do
-      addresses = ['30 Lincoln Center Plaza, New York, NY 10023',
-                  '1000 5th Ave, New York, NY 10028',
-                  '1001 5th Avenue, New York, NY 10028',
-                  '1002 5th Avenue, New York, NY 10028'
+      addresses = [met_opera_short.address,
+                   met_art_ave.address,
+                   apartments_1001.address,
+                   met_next_door.address
                   ]
 
       lib = AddressLibrary.build(addresses)
 
-      match = lib.match('1000 5th Avenue, New York, NY 10028')
+      match_1 = lib.match(met_art_avenue.address)
+      match_2 = lib.match(met_opera_long.address)
 
-      expect(match).to eq '1000 5th Ave, New York, NY 10028'
+      expect(match_1).to eq met_art_ave.address
+      expect(match_2).to eq met_opera_short.address
     end
   end
 end

data/spec/data/geocoder_data.yaml

@@ -0,0 +1,89 @@
+met_opera_long:
+  address: 'Lincoln Center for the Performing Arts, 30 Lincoln Center Plaza, New York, NY 10023'
+  latitude: 40.772748
+  longitude: -73.98384759999
+  canonical_address: '30 Lincoln Center Plaza, New York, NY 10023'
+  state: 'New York'
+  state_code: 'NY'
+  country: 'United States'
+  country_code: 'US'
+
+met_opera_short:
+  address: '30 Lincoln Center Plaza, New York, NY 10023'
+  latitude: 40.772748
+  longitude: -73.98384759999
+  canonical_address: '30 Lincoln Center Plaza, New York, NY 10023'
+  state: 'New York'
+  state_code: 'NY'
+  country: 'United States'
+  country_code: 'US'
+
+met_art_ave:
+  address: '1000 5th Ave, New York, NY 10028'
+  latitude: 40.77916555
+  longitude: -73.9629278
+  canonical_address: '1000 5th Ave, New York, NY 10028'
+  state: 'New York'
+  state_code: 'NY'
+  country: 'United States'
+  country_code: 'US'
+
+met_art_avenue:
+  address: '1000 5th Avenue, New York, NY 10028'
+  latitude: 40.7791655
+  longitude: -73.9629278
+  canonical_address: '1000 5th Ave, New York, NY 10028'
+  state: 'New York'
+  state_code: 'NY'
+  country: 'United States'
+  country_code: 'US'
+
+apartments_1001:
+  address: '1001 5th Avenue, New York, NY 10028'
+  latitude: 40.7785889
+  longitude: -73.9621559
+  canonical_address: '1000 5th Ave, New York, NY 10028'
+  state: 'New York'
+  state_code: 'NY'
+  country: 'United States'
+  country_code: 'US'
+
+met_next_door:
+  address: '1002 5th Avenue, New York, NY 10028'
+  latitude: 40.7785016
+  longitude: -73.9625847
+  canonical_address: '1002 5th Ave, New York, NY 10028'
+  state: 'New York'
+  state_code: 'NY'
+  country: 'United States'
+  country_code: 'US'
+
+symphony_hall:
+  address: '301 Massachusetts Ave, Boston, MA 02115'
+  latitude: 42.3426
+  longitude: -71.0858
+  canonical_address: '301 Massachusetts Ave, Boston, MA 02115'
+  state: 'Massachusetts'
+  state_code: 'MA'
+  country: 'United States'
+  country_code: 'US'
+
+nec:
+  address: '290 Huntington Ave, Boston, MA 02115'
+  latitude: 42.3406
+  longitude: -71.0869
+  canonical_address: '290 Huntington Ave, Boston, MA 02115'
+  state: 'Massachusetts'
+  state_code: 'MA'
+  country: 'United States'
+  country_code: 'US'
+
+boco:
+  address: '8 Fenway, Boston, MA 02215'
+  latitude: 42.3462
+  longitude: -71.0901
+  canonical_address: '8 Fenway, Boston, MA 02215'
+  state: 'Massachusetts'
+  state_code: 'MA'
+  country: 'United States'
+  country_code: 'US'

data/spec/spec_helper.rb

@@ -1,5 +1,10 @@
-require 'simplecov'
+require 'geocoder'
+require 'ostruct'
 require 'pry'
+require 'rspec'
+require 'simplecov'
+require 'yaml'
+require_relative 'support/geocoder'
 
 SimpleCov.start do
   add_filter 'spec/'
@@ -9,14 +14,9 @@ end
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'geocoder'
-require_relative 'support/geocoder'
-
 Dir['./spec/shared/**/*.rb'].sort.each { |f| require f }
 require_relative '../lib/address_matcher'
 
-require 'rspec'
-
 RSpec.configure do |config|
   config.order = 'random'
 end

data/spec/support/geocoder.rb

@@ -1,77 +1,27 @@
 Geocoder.configure(lookup: :test)
 
-Geocoder::Lookup::Test.add_stub(
-  'Lincoln Center for the Performing Arts, 30 Lincoln Center Plaza, New York, NY 10023', [
-    { 'latitude'     => 40.772748,
-      'longitude'    => -73.98384759999,
-      'address'      => '30 Lincoln Center Plaza, New York, NY 10023',
-      'state'        => 'New York',
-      'state_code'   => 'NY',
-      'country'      => 'United States',
-      'country_code' => 'US'
-    }
-  ]
-)
-Geocoder::Lookup::Test.add_stub(
-  '30 Lincoln Center Plaza, New York, NY 10023', [
-    { 'latitude'     => 40.772748,
-      'longitude'    => -73.98384759999,
-      'address'      => '30 Lincoln Center Plaza, New York, NY 10023',
-      'state'        => 'New York',
-      'state_code'   => 'NY',
-      'country'      => 'United States',
-      'country_code' => 'US'
-    }
-  ]
-)
+module Locations
+  DATA_PATH = Pathname.new('spec/data')
+  TEST_DATA = YAML.load(File.read(DATA_PATH.join('geocoder_data.yaml')))
 
-Geocoder::Lookup::Test.add_stub(
-  '1000 5th Ave, New York, NY 10028', [
-    { 'latitude'     => 40.77916555,
-      'longitude'    => -73.9629278,
-      'address'      => '1000 5th Ave, New York, NY 10028',
-      'state'        => 'New York',
-      'state_code'   => 'NY',
-      'country'      => 'United States',
-      'country_code' => 'US'
-    }
-  ]
-)
-Geocoder::Lookup::Test.add_stub(
-  '1000 5th Avenue, New York, NY 10028', [
-    { 'latitude'     => 40.7791655,
-      'longitude'    => -73.9629278,
-      'address'      => '1000 5th Ave, New York, NY 10028',
-      'state'        => 'New York',
-      'state_code'   => 'NY',
-      'country'      => 'United States',
-      'country_code' => 'US'
-    }
-  ]
-)
+  TEST_DATA.each do |location, data|
+    define_method location do
+      OpenStruct.new(data.merge(coords: [data['latitude'], data['longitude']]))
+    end
+  end
+end
 
-Geocoder::Lookup::Test.add_stub(
-  '1001 5th Avenue, New York, NY 10028', [
-    { 'latitude'     => 40.7785889,
-      'longitude'    => -73.9621559,
-      'address'      => '1000 5th Ave, New York, NY 10028',
-      'state'        => 'New York',
-      'state_code'   => 'NY',
-      'country'      => 'United States',
-      'country_code' => 'US'
-    }
-  ]
-)
-
-Geocoder::Lookup::Test.add_stub(
-  '1002 5th Avenue, New York, NY 10028', [
-    { 'latitude'     => 40.7785016,
-      'longitude'    => -73.9625847,
-      'address'      => '1002 5th Ave, New York, NY 10028',
-      'state'        => 'New York',
-      'state_code'   => 'NY',
-      'country'      => 'United States',
-      'country_code' => 'US'
-    }
-  ]
-)
+Locations::TEST_DATA.values.each do |location|
+  Geocoder::Lookup::Test.add_stub(
+    location['address'], [
+      { 'latitude'     => location['latitude'],
+        'longitude'    => location['longitude'],
+        'address'      => location['canonical_address'],
+        'state'        => location['state'],
+        'state_code'   => location['state_code'],
+        'country'      => location['country'],
+        'country_code' => location['country_code']
+      }
+    ]
+  )
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: address-matcher
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Stuart Terrett
@@ -98,6 +98,7 @@ files:
 - lib/address_matcher/address_library.rb
 - spec/address_group_spec.rb
 - spec/address_library_spec.rb
+- spec/data/geocoder_data.yaml
 - spec/spec_helper.rb
 - spec/support/geocoder.rb
 homepage: http://github.com/shterrett/address_matcher
@@ -127,5 +128,6 @@ summary: Matches addresses by geocoding
 test_files:
 - spec/address_group_spec.rb
 - spec/address_library_spec.rb
+- spec/data/geocoder_data.yaml
 - spec/spec_helper.rb
 - spec/support/geocoder.rb