geocode_records 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1bb6e6ee4a30c021bd9f73c98b924c8036dbab8
-  data.tar.gz: 25397fe6679e1252f8e65d5b9c0c53dfc01f7dc5
+  metadata.gz: '0029323e5f514aa576ae5e004ef8cf67cf2bf7ad'
+  data.tar.gz: 0d259095fec73b543de21b9dc4dc29df6c86b235
 SHA512:
-  metadata.gz: 35ba47791b0b92eee27adffb5c158e6c15e7bbcd3c84e160ba910e41e2d28f9b421cb9a2d484b1e35d66ef9355d3aadc6d6e0f25d5dc78d3d2431ed28cab9b02
-  data.tar.gz: 152742e01ff0060af7f3e45d7ec0f17fee6ab64a29a3fc631cabb0776df9275707cc30e273bf2f295d8b42b4a76ee43c0bc2cbe60a47455c099a5581c5fab874
+  metadata.gz: 4b3cd140b300378d863d75b3ed627970144e46933f36baa59efdfa909b4f424f175fcf761a008fee7f011995bb694cb3a39991c718ba163fff7fa60b0e9f039b
+  data.tar.gz: 5fb84c6b8f813a02738f5bde02a497051e915ece5b59c90ce59454860a4fd714f2179618f323082aeb033007af851a90cd87cb98fad536909dc8161fcc411eb6

data/CHANGELOG

@@ -1,3 +1,9 @@
+1.3.0 / 2018-02-22
+
+* Breaking changes
+
+  * Set street/street2
+
 1.2.0 / 2018-02-14
 
 * Breaking changes

data/lib/geocode_records/geocode_csv.rb

@@ -11,6 +11,10 @@ class GeocodeRecords
     COLUMN_DEFINITION = {
       delivery_line_1: true,
       components: {
+        street_predirection: true,
+        street_name: true,
+        street_suffix: true,
+        street_postdirection: true,
         primary_number: true,
         secondary_number: true,
         city_name: true,

data/lib/geocode_records/update_table_from_csv.rb

@@ -3,6 +3,10 @@ class GeocodeRecords
     CREATE_TABLE_SQL = (<<-SQL).gsub('      ', '').freeze
       CREATE TABLE $TMP_TABLE_NAME (
         id uuid primary key,
+        ss_street_predirection text,
+        ss_street_name text,
+        ss_street_suffix text,
+        ss_street_postdirection text,
         ss_delivery_line_1 text,
         ss_primary_number text,
         ss_secondary_number text,
@@ -18,6 +22,10 @@ class GeocodeRecords
 
     DESIRED_COLUMNS = %w{
       id
+      ss_street_predirection
+      ss_street_name
+      ss_street_suffix
+      ss_street_postdirection
       ss_delivery_line_1
       ss_primary_number
       ss_secondary_number
@@ -35,6 +43,7 @@ class GeocodeRecords
     UPDATE_TABLE_SQL = (<<-SQL).gsub('      ', '').freeze
       UPDATE $TABLE_NAME AS target
       SET
+        street$NUM_SUFFIX = concat_ws(' ', src.ss_street_predirection, src.ss_street_name, src.ss_street_suffix, src.ss_street_postdirection),
         house_number_and_street$NUM_SUFFIX = src.ss_delivery_line_1,
         house_number$NUM_SUFFIX = CASE
           WHEN src.ss_primary_number IS NULL THEN NULL

data/lib/geocode_records/version.rb

@@ -1,3 +1,3 @@
 class GeocodeRecords
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/spec/geocode_records_spec.rb

@@ -4,18 +4,24 @@ describe GeocodeRecords do
   subject { GeocodeRecords.new(database_url: ENV.fetch('DATABASE_URL'), table_name: 'homes').perform }
   
   it "geocodes" do
-    home = Home.create! house_number_and_street: '1038 e deyton st', postcode: '53703'
+    home = Home.create! house_number_and_street: '123 n blount st apt 403', postcode: '53703'
     subject
     home.reload
-    expect(home.house_number_and_street).to eq('1038 E Dayton St')
+    expect(home.house_number_and_street).to eq('123 N Blount St Unit 403')
+    expect(home.street).to eq('N Blount St')
+    expect(home.unit_number).to eq('403')
+    expect(home.house_number).to eq(123)
     expect(home.latitude).to be_present
   end
 
   it "geocodes addr 2" do
-    home = Home.create! house_number_and_street2: '1038 e deyton st', postcode2: '53703'
+    home = Home.create! house_number_and_street2: '123 n blount st apt 403', postcode2: '53703'
     GeocodeRecords.new(database_url: ENV.fetch('DATABASE_URL'), table_name: 'homes', num: 2).perform
     home.reload
-    expect(home.house_number_and_street2).to eq('1038 E Dayton St')
+    expect(home.house_number_and_street2).to eq('123 N Blount St Unit 403')
+    expect(home.street2).to eq('N Blount St')
+    expect(home.unit_number2).to eq('403')
+    expect(home.house_number2).to eq(123)
     expect(home.latitude2).to be_present
   end
 

data/spec/spec_helper.rb

@@ -22,6 +22,7 @@ unless ENV['FAST'] == 'true'
       the_geom geometry(Geometry,4326),
       the_geom_webmercator geometry(Geometry,3857),
       glob text,
+      street text,
       house_number_and_street text,
       house_number int,
       unit_number text,
@@ -32,6 +33,7 @@ unless ENV['FAST'] == 'true'
       latitude float,
       longitude float,
       glob2 text,
+      street2 text,
       house_number_and_street2 text,
       house_number2 int,
       unit_number2 text,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocode_records
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport