geocode_records 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f99f57199e7a46638cfdbf0e3f234dff58af60f
-  data.tar.gz: 934a907fa2ac94a3285b0129eb04d3b0ef4ea4bf
+  metadata.gz: e306eee237615f69d7580cc6a245bf23766c3396
+  data.tar.gz: 6824133fe7beaa511e33ee6ce7a0160fe1b08a4d
 SHA512:
-  metadata.gz: fa195a1637c5b4f6590e5a53bb52f0b67654ea3cfc803328b81982b52061fedb00f295c98dc3a98c9a7780149c40b27d78f3c12b53c0351cffd27e4bf4aac04b
-  data.tar.gz: c83a4804cc4aab1f68eac5e10132dae7bb837c601d4ad291bb7ef1400b7a7c5bb3cfa2c45a61db46647099dace86afba2198f367d577f091ba0f04cbf039afa5
+  metadata.gz: 51d9e3d00efd93895dbbd94699cbdf95bce45db2f93e5ec0479e04b1b2e3c38a22ffac70b6dd731bddde77f4032f91a9e49da98e8326732262495a752064b708
+  data.tar.gz: 198b8e4790376b65e8cee69dfbe697333b5cb1455132196da090519ca586220ddd4d6a810aa9cd3572d4aa0d94dc4b00b405000e59c591f097f2f5ae6789c7ee

data/CHANGELOG

@@ -1,3 +1,16 @@
+1.1.2 / 2018-01-23
+
+* Enhancements
+
+  * More robust house number handling
+
+1.1.1 / 2018-01-22
+
+* Enhancements
+
+  * Remove non-working binary
+  * Remove debug warning when it doesn't find records for a glob
+
 1.1.0 / 2018-01-16
 
 * Breaking changes

data/lib/geocode_records.rb

@@ -74,7 +74,6 @@ class GeocodeRecords
         glob: glob
       ).perform
       unless File.size(ungeocoded_path) > 32
-        $stderr.puts "No records found for #{table_name} #{subquery}, skipping"
         return
       end
       geocoded_path = GeocodeCsv.new(

data/lib/geocode_records/update_table_from_csv.rb

@@ -34,7 +34,14 @@ class GeocodeRecords
       UPDATE $TABLE_NAME AS target
       SET
         house_number_and_street = src.ss_delivery_line_1,
-        house_number = CASE WHEN LENGTH(src.ss_primary_number) > 7 THEN NULL ELSE src.ss_primary_number::int END,
+        house_number = 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
+          WHEN src.ss_primary_number ~ '/' THEN (regexp_matches(src.ss_primary_number, '(\\d+)'))[1]::int
+          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 (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,

data/lib/geocode_records/version.rb

@@ -1,3 +1,3 @@
 class GeocodeRecords
-  VERSION = '1.1.0'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocode_records
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -111,8 +111,7 @@ dependencies:
 description: A quick way to re-geocode a table. Requires 2 binaries, so YMMV.
 email:
 - seamus@abshere.net
-executables:
-- geocode_records
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -124,7 +123,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/geocode_records
 - geocode_records.gemspec
 - lib/geocode_records.rb
 - lib/geocode_records/dump_sql_to_csv.rb

data/bin/geocode_records

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'logger'
-
-require 'geocode_records'
-
-ActiveRecord::Base.establish_connection ENV.fetch('DATABASE_URL')
-
-logger = Logger.new($stderr)
-logger.level = Logger::WARN
-ActiveRecord::Base.logger = logger
-Upsert.logger = logger
-
-class Whatever < ActiveRecord::Base
-  self.table_name = ARGV[0]
-end
-
-GeocodeRecords.new(Whatever.all).perform