geocode_records 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97c3fbf26bb7ebaec1fac57e9212476b1a3ddf64
-  data.tar.gz: b98b65636292d3b74f53f6045aaacfac99784b07
+  metadata.gz: 2cec9b1bf42ae7aa40359d9a4d84f0ab30273358
+  data.tar.gz: 6aa1c9fab15253fd0f16b7ba5ba12a3d73390d1e
 SHA512:
-  metadata.gz: 1ca4fdc59c870dab258bd10de6c8bcdc10ba7120b6bfa5f620cb7f67249cffd47b8936116326991c09df85cc870479a4d8c4e74d37df9935ed8bf02e7f899cb2
-  data.tar.gz: 47723ada9b16c31654080114a01de9899e7457e4e5022f71510525515322632e78fd9620dacf56adb489012cf2fd98eeae5de1fbc9fe5b42d4023cbc033ef513
+  metadata.gz: 805f6cf61202f52be4078e6df883ddefc8eee9cb559742ee912fd9f5b1469f2c06de840218030f8ab1b682254dca515eaec2a5f57b66dc76b5fea00b9eeb8112
+  data.tar.gz: 17fbb907970b4bc2608250598366159dd5501f14568bb649c3070f5b67b27314fe8e16d1e1013de21e2539c3466a85825664e62078d9cafb2745994ed154290a

data/CHANGELOG

@@ -1,3 +1,11 @@
+0.1.0 / 2016-02-01
+
+* Enhancements
+
+  * Don't preemptively chop off postcode after 5 chars
+  * include_invalid: option
+  * Requires latest smartystreets
+
 0.0.5 / 2015-07-16
 
 * Enhancements

data/bin/geocode_records

@@ -6,12 +6,6 @@ require 'geocode_records'
 
 ActiveRecord::Base.establish_connection ENV.fetch('DATABASE_URL')
 
-# http://gray.fm/2013/09/17/unknown-oid-with-rails-and-postgresql/
-require 'active_record/connection_adapters/postgresql/oid'
-ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.tap do |klass|
-  klass::OID.register_type('geometry', klass::OID::Identity.new)
-end
-
 logger = Logger.new($stderr)
 logger.level = Logger::WARN
 ActiveRecord::Base.logger = logger

data/geocode_records.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'activerecord', '~>4.1.9'
+  spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'pg'
   spec.add_runtime_dependency 'attr_extras'
   spec.add_runtime_dependency 'zaru'

data/lib/geocode_records/geocode_csv.rb

@@ -10,11 +10,13 @@ require 'geocode_records/smarty_streets'
 class GeocodeRecords
   class GeocodeCsv
     attr_reader :glob
+    attr_reader :include_invalid
 
     def initialize(input_path, options = {})
       @input_path = input_path
       options ||= {}
       @glob = options[:glob]
+      @include_invalid = options[:include_invalid]
       @mutex = Mutex.new
     end
 
@@ -53,6 +55,9 @@ class GeocodeRecords
         '--auth-id', ENV.fetch('SMARTY_STREETS_AUTH_ID'),
         '--auth-token', ENV.fetch('SMARTY_STREETS_AUTH_TOKEN')
       ]
+      if include_invalid
+        args += [ '--include-invalid' ]
+      end
       input_map.each do |ss, local|
         args += [ "--#{ss}-col", local.to_s ]
       end

data/lib/geocode_records/smarty_streets.rb

@@ -2,7 +2,7 @@ class GeocodeRecords
 
   module SmartyStreets
 
-    VERSION = '1.6.2'
+    VERSION = '1.7.2'
 
     def self.bin_path
       @bin_path ||= if File.exist?('node_modules/.bin/smartystreets')

data/lib/geocode_records/version.rb

@@ -1,3 +1,3 @@
 class GeocodeRecords
-  VERSION = '0.0.5'
+  VERSION = '0.1.0'
 end

data/lib/geocode_records.rb

@@ -1,4 +1,6 @@
 require 'active_record'
+require 'active_support'
+require 'active_support/core_ext'
 require 'attr_extras'
 require 'pasqual'
 
@@ -14,7 +16,7 @@ class GeocodeRecords
   attr_reader :options
   def initialize(records, options = {})
     records.is_a?(ActiveRecord::Relation) or raise(ArgumentError, "expected AR::Relation, got #{records.class}")
-    @options = options || {}
+    @options = (options || {}).symbolize_keys
     @records = records
   end
   
@@ -51,7 +53,7 @@ class GeocodeRecords
       if glob
         c.to_sql records.select('id', 'glob').arel, records.bind_values
       else
-        c.to_sql records.select('id', 'house_number_and_street', 'house_number', 'unit_number', 'city', 'state', "left(regexp_replace(postcode, '.0$', ''), 5) AS postcode").arel, records.bind_values
+        c.to_sql records.select('id', 'house_number_and_street', 'house_number', 'unit_number', 'city', 'state', "regexp_replace(postcode, '.0$', '') AS postcode").arel, records.bind_values
       end
     end
   end

data/package.json

@@ -2,6 +2,6 @@
   "name": "rolodeck",
   "private": true,
   "dependencies": {
-    "smartystreets": "^1.6.2"
+    "smartystreets": "^1.7.2"
   }
 }

data/spec/geocode_records/smarty_streets_spec.rb

@@ -21,8 +21,8 @@ describe GeocodeRecords::SmartyStreets do
       it { is_expected.to be false }
     end
 
-    context 'v1.6.2' do
-      let(:version) { '1.6.2' }
+    context 'v1.7.2' do
+      let(:version) { '1.7.2' }
 
       it { is_expected.to be true }
     end

data/spec/geocode_records_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 dbname = 'geocode_records_test'
-ENV['DATABASE_URL'] ||= "postgresql://127.0.0.1/#{dbname}"
+ENV['DATABASE_URL'] = "postgresql://127.0.0.1/#{dbname}"
 
 unless ENV['FAST'] == 'true'
   psql = Pasqual.for ENV['DATABASE_URL']
@@ -43,11 +43,6 @@ end
 
 require 'active_record'
 ActiveRecord::Base.establish_connection
-# http://gray.fm/2013/09/17/unknown-oid-with-rails-and-postgresql/
-require 'active_record/connection_adapters/postgresql/oid'
-ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.tap do |klass|
-  klass::OID.register_type('geometry', klass::OID::Identity.new)
-end
 
 class Home < ActiveRecord::Base
 end
@@ -95,6 +90,27 @@ describe GeocodeRecords do
     expect(home.house_number_and_street).to eq('36 Main St')
   end
 
+  it "doesn't break on zip-4" do
+    home = Home.create! house_number_and_street: '1038 e dayton st', postcode: '53703-2428'
+    GeocodeRecords.new(Home.all).perform
+    home.reload
+    expect(home.house_number_and_street).to eq('1038 E Dayton St')
+  end
+
+  it "accepts city and state only" do
+    home = Home.create! house_number_and_street: '1038 e dayton st', city: 'madison', state: 'wisconsin'
+    GeocodeRecords.new(Home.all).perform
+    home.reload
+    expect(home.house_number_and_street).to eq('1038 E Dayton St')
+  end
+
+  it "allows invalid" do
+    home = Home.create! house_number_and_street: '1039 e dayton st', city: 'madison', state: 'wisconsin'
+    GeocodeRecords.new(Home.all, include_invalid: true).perform
+    home.reload
+    expect(home.house_number_and_street).to eq('1039 E Dayton St')
+  end
+
   describe 'known issues' do
     it "doesn't fix float-format postcode on records that it can't geocode" do
       home = Home.create! house_number_and_street: 'gibberish', postcode: '53703.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocode_records
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.9
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement