geocode_records 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a895a090a8b5d022953b811691a6e8b4caec813b
-  data.tar.gz: a29e9e2f6a3d926edcdd0c3152fe9d257cdb371f
+  metadata.gz: e5956f06797c3f79547c0385cc672b451e8ad23b
+  data.tar.gz: 6d4a9b488113ce87fe0bc4b8615dac61ecf60aec
 SHA512:
-  metadata.gz: 30d88e8e7121c28fa5f81cb32037f1f596411c7c4d40762d8f44c92f6a442cd57fb6bbaf941d29aaf229cb7d7ee39d6ddd819ee3d075db67dc7077c214bdb50a
-  data.tar.gz: '093ccaa9d2279430a359f080f66f4675583c7c649af6ac60432628bc9b8b210fc436ea4c58ded0cafe1288e86506e3708cc73a45972b3a009b146fd21b1d33b9'
+  metadata.gz: 1b3a7c67d72a3d38b0a76903f66fef501dea328f9c752df674aedc918a12ef2e7c166eb65c95ef9bf041e864ae7ce1caa81dea421d7b4852161c15d71dff87eb
+  data.tar.gz: eaa1f7f94982cb13ea692f43b42cf5b82e286c49787c8aa688b2b0764f83c36a63b1eaa0806b1c71bf8123295b086a08f67ea1eae012a1c5c1a6914c972d666f

data/CHANGELOG

@@ -1,3 +1,9 @@
+1.1.4 / 2018-01-29
+
+* Enhancements
+
+  * num: 2 to geocode hnst2, etc.
+
 1.1.3 / 2018-01-23
 
 * Bug fixes

data/lib/geocode_records.rb

@@ -43,17 +43,20 @@ class GeocodeRecords
   # optional
   attr_reader :include_invalid
   attr_reader :subquery
+  attr_reader :num
 
    def initialize(
     database_url:,
     table_name:,
     subquery: nil,
-    include_invalid: nil
+    include_invalid: false,
+    num: 1
   )
     @database_url = database_url
     @table_name = table_name
     @subquery = subquery
     @include_invalid = include_invalid
+    @num = num
   end
   
   def perform
@@ -71,7 +74,8 @@ class GeocodeRecords
         database_url: database_url,
         table_name: table_name,
         subquery: subquery,
-        glob: glob
+        glob: glob,
+        num: num,
       ).perform
       unless File.size(ungeocoded_path) > 32
         return
@@ -79,12 +83,14 @@ class GeocodeRecords
       geocoded_path = GeocodeCsv.new(
         path: ungeocoded_path,
         glob: glob,
-        include_invalid: include_invalid
+        include_invalid: include_invalid,
+        num: num,
       ).perform
       UpdateTableFromCsv.new(
         database_url: database_url,
         table_name: table_name,
-        path: geocoded_path
+        path: geocoded_path,
+        num: num,
       ).perform
     ensure
       FileUtils.rm_f geocoded_path if geocoded_path

data/lib/geocode_records/dump_sql_to_csv.rb

@@ -4,16 +4,20 @@ class GeocodeRecords
     attr_reader :glob
     attr_reader :table_name
     attr_reader :subquery
+    attr_reader :num
 
     def initialize(
       database_url:,
       glob:,
       table_name: nil,
-      subquery: nil)
+      subquery: nil,
+      num: nil
+    )
       @database_url = database_url
       @glob = glob
       @table_name = table_name
       @subquery = subquery
+      @num = num
     end
 
     def perform
@@ -28,10 +32,13 @@ class GeocodeRecords
     private
 
     def sql
-      @sql ||= unless glob
-        "SELECT id, house_number_and_street, city, state, regexp_replace(postcode, '.0$', '') AS postcode FROM #{subquery ? "(#{subquery}) t1" : table_name} WHERE city IS NOT NULL OR postcode IS NOT NULL"
-      else
-        "SELECT id, glob FROM #{subquery ? "(#{subquery}) t1" : table_name} WHERE (city IS NULL AND postcode IS NULL) AND glob IS NOT NULL"
+      @sql ||= begin
+        num_suffix = (num == 1 ? '' : num)
+        unless glob
+          "SELECT id, house_number_and_street#{num_suffix}, city#{num_suffix}, state#{num_suffix}, regexp_replace(postcode#{num_suffix}, '.0$', '') AS postcode#{num_suffix} FROM #{subquery ? "(#{subquery}) t1" : table_name} WHERE city#{num_suffix} IS NOT NULL OR postcode#{num_suffix} IS NOT NULL"
+        else
+          "SELECT id, glob#{num_suffix} FROM #{subquery ? "(#{subquery}) t1" : table_name} WHERE (city#{num_suffix} IS NULL AND postcode#{num_suffix} IS NULL) AND glob#{num_suffix} IS NOT NULL"
+        end
       end
     end
   end

data/lib/geocode_records/geocode_csv.rb

@@ -5,6 +5,7 @@ class GeocodeRecords
     attr_reader :path
     attr_reader :glob
     attr_reader :include_invalid
+    attr_reader :num
 
     REQUIRED_SMARTYSTREETS_VERSION = Gem::Version.new('1.8.2')
     COLUMN_DEFINITION = {
@@ -26,11 +27,13 @@ class GeocodeRecords
     def initialize(
       path:,
       glob:,
-      include_invalid:
+      include_invalid:,
+      num:
     )
       @path = path
       @glob = glob
       @include_invalid = include_invalid
+      @num = num
     end
 
     def perform
@@ -58,13 +61,18 @@ class GeocodeRecords
     private
 
     def input_map
-      @input_map ||= if glob
-        { 'street' => 'glob' }
-      else
-        {
-          'street' => 'house_number_and_street',
-          'zipcode' => 'postcode',
-        }
+      @input_map ||= begin
+        num_suffix = (num == 1 ? '' : num)
+        if glob
+          { 'street' => "glob#{num_suffix}" }
+        else
+          {
+            'street' => "house_number_and_street#{num_suffix}",
+            'zipcode' => "postcode#{num_suffix}",
+            'city' => "city#{num_suffix}",
+            'state' => "state#{num_suffix}",
+          }
+        end
       end
     end
 

data/lib/geocode_records/update_table_from_csv.rb

@@ -33,8 +33,8 @@ class GeocodeRecords
     UPDATE_TABLE_SQL = (<<-SQL).gsub('      ', '').freeze
       UPDATE $TABLE_NAME AS target
       SET
-        house_number_and_street = src.ss_delivery_line_1,
-        house_number = CASE
+        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
           WHEN LENGTH(src.ss_primary_number) > 8 THEN NULL
           WHEN src.ss_primary_number ~ '\\A\\d+\\Z' THEN src.ss_primary_number::int
@@ -42,12 +42,12 @@ class GeocodeRecords
           WHEN src.ss_primary_number ~ '-' THEN (SELECT ROUND(AVG(v)) FROM unnest(array_remove(regexp_split_to_array(src.ss_primary_number, '\\D+'), '')::int[]) v)
           ELSE (SELECT regexp_matches(src.ss_primary_number, '(\\d+)'))[1]::int
         END,
-        unit_number = src.ss_secondary_number,
-        city = COALESCE(src.ss_default_city_name, src.ss_city_name),
-        state = src.ss_state_abbreviation,
-        postcode = src.ss_zipcode,
-        latitude = src.ss_latitude,
-        longitude = src.ss_longitude
+        unit_number$NUM_SUFFIX = src.ss_secondary_number,
+        city$NUM_SUFFIX = COALESCE(src.ss_default_city_name, src.ss_city_name),
+        state$NUM_SUFFIX = src.ss_state_abbreviation,
+        postcode$NUM_SUFFIX = src.ss_zipcode,
+        latitude$NUM_SUFFIX = src.ss_latitude,
+        longitude$NUM_SUFFIX = src.ss_longitude
       FROM $TMP_TABLE_NAME AS src
       WHERE
             target.id = src.id
@@ -57,15 +57,18 @@ class GeocodeRecords
     attr_reader :database_url
     attr_reader :table_name
     attr_reader :path
+    attr_reader :num
 
     def initialize(
       database_url:,
       table_name:,
-      path:
+      path:,
+      num:
     )
       @database_url = database_url
       @table_name = table_name
       @path = path
+      @num = num
     end
 
     def perform
@@ -84,7 +87,7 @@ class GeocodeRecords
       memo = "geocode_records_#{table_name}_#{rand(999999)}".gsub(/[^a-z0-9_]/i, '')
       GeocodeRecords.psql(
         database_url,
-        CREATE_TABLE_SQL.sub('$TMP_TABLE_NAME', memo)
+        CREATE_TABLE_SQL.gsub('$TMP_TABLE_NAME', memo)
       )
       memo
     end
@@ -103,14 +106,15 @@ class GeocodeRecords
     def load_csv_into_tmp_table(path:, table_name:)
       GeocodeRecords.psql(
         database_url,
-        COPY_SQL.sub('$TMP_TABLE_NAME', table_name).sub('$PATH', path)
+        COPY_SQL.gsub('$TMP_TABLE_NAME', table_name).gsub('$PATH', path)
       )
     end
 
     def update_original_table(tmp_table_name)
+      num_suffix = (num == 1 ? '' : num.to_s)
       GeocodeRecords.psql(
         database_url,
-        UPDATE_TABLE_SQL.sub('$TMP_TABLE_NAME', tmp_table_name).sub('$TABLE_NAME', table_name)
+        UPDATE_TABLE_SQL.gsub('$TMP_TABLE_NAME', tmp_table_name).gsub('$TABLE_NAME', table_name).gsub('$NUM_SUFFIX', num_suffix)
       )
     end
 

data/lib/geocode_records/version.rb

@@ -1,3 +1,3 @@
 class GeocodeRecords
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

data/spec/geocode_records_spec.rb

@@ -8,6 +8,15 @@ describe GeocodeRecords do
     subject
     home.reload
     expect(home.house_number_and_street).to eq('1038 E Dayton St')
+    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'
+    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.latitude2).to be_present
   end
 
   it "geocodes quoted table name" do
@@ -25,6 +34,14 @@ describe GeocodeRecords do
     expect(home.postcode).to eq('53703')
   end
 
+  it "geocodes glob2" do
+    home = Home.create! glob2: '1038 e dayton st, madison, wi 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.postcode2).to eq('53703')
+  end
+
   it "geocodes by sql" do
     home = Home.create! house_number_and_street: '1038 e deyton st', postcode: '53703', foo: 'bar'
     home_ignored = Home.create! house_number_and_street: '1038 e deyton st', postcode: '53703'
@@ -35,6 +52,16 @@ describe GeocodeRecords do
     expect(home_ignored.latitude).to be_nil
   end
 
+  it "geocodes by sql num 2" do
+    home = Home.create! house_number_and_street2: '1038 e deyton st', postcode2: '53703', foo: 'bar'
+    home_ignored = Home.create! house_number_and_street2: '1038 e deyton st', postcode2: '53703'
+    GeocodeRecords.new(database_url: ENV.fetch('DATABASE_URL'), table_name: 'homes', subquery: %{SELECT * FROM homes WHERE foo = 'bar'}, num: 2).perform  
+    home.reload
+    home_ignored.reload
+    expect(home.latitude2).to be_present
+    expect(home_ignored.latitude2).to be_nil
+  end
+
   it "doesn't break on float-format postcode" do
     home = Home.create! house_number_and_street: '1038 e deyton st', postcode: '53703.0'
     subject

data/spec/spec_helper.rb

@@ -30,6 +30,15 @@ unless ENV['FAST'] == 'true'
       postcode text,
       latitude float,
       longitude float,
+      glob2 text,
+      house_number_and_street2 text,
+      house_number2 int,
+      unit_number2 text,
+      city2 text,
+      state2 text,
+      postcode2 text,
+      latitude2 float,
+      longitude2 float,
       foo text
     )
   SQL

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocode_records
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport