geocode_records 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edc2c231e4b2b56695ce060e5712a20f5af64b53
-  data.tar.gz: 1aa1438ca13d54c8fcf042ada691e7d5c3c53175
+  metadata.gz: bfc6e01f883ce3a016471d9e3f74198bf47a341a
+  data.tar.gz: d48772e3d9cd635d3adf03c83871ffd3a467a6e5
 SHA512:
-  metadata.gz: 71e2a3a9fe9d42bd815c02844c6d14cdde9599f7e6480459a2d217290b06fddeb13faf3027402e5bc222aa74de568bb09ccf56bc734f4aec4991f88b29b2101c
-  data.tar.gz: 629c638c72442db0d31409066e9ba09917463b588c8a1117256475dcee54fd5886b1420e69342f9092ca751175b82f33570f43172e960befe3cc55d466e6d2a3
+  metadata.gz: 0ba48446ffa487e0195415d59955da64ef112349583033f508d78e9c4aa9c236a64e9a50394cd1afdb7abe17ef1941babfb943fbf9ee9a959168118250651092
+  data.tar.gz: a821dba02207e2eb881404555e7294d677309bb4a63aad4987fdf85351e62b7a37f770b2c32fe10da95e8b0e52c267d4a2381b475087dc2fcbda0a0aa3543385

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.0.4 / 2015-06-02
+
+* Enhancements
+
+  * Depend on new fixed version of smartystreets geocoder module
+
 0.0.3 / 2015-03-27
 
 * Enhancements

data/lib/geocode_records.rb

@@ -6,6 +6,7 @@ require_relative 'geocode_records/version'
 require_relative 'geocode_records/dump_sql_to_csv'
 require_relative 'geocode_records/geocode_csv'
 require_relative 'geocode_records/update_table_from_csv'
+require_relative 'geocode_records/smarty_streets'
 
 class GeocodeRecords
 
@@ -18,6 +19,8 @@ class GeocodeRecords
   end
   
   def perform
+    raise "smartystreets >= 1.5.0 is required" unless SmartyStreets.compatible?
+
     if records.count > 0
       # $stderr.puts "GeocodeRecords: #{records.count} to go!"
       ungeocoded_path = DumpSqlToCsv.new(pasqual, to_sql, options).path

data/lib/geocode_records/geocode_csv.rb

@@ -4,6 +4,8 @@ require 'csv'
 require 'shellwords'
 require 'zaru'
 
+require 'geocode_records/smarty_streets'
+
 # copied from hotdog/app/services/file_geocoder.rb with seamus variations
 class GeocodeRecords
   class GeocodeCsv
@@ -46,7 +48,6 @@ class GeocodeRecords
     def geocode
       @geocoded_path = Dir::Tmpname.create(Zaru.sanitize!(input_path + '.geocode')) {}
       args = [
-        smartystreets_bin_path,
         '-i', input_path,
         '-o', geocoded_path,
         '--auth-id', ENV.fetch('SMARTY_STREETS_AUTH_ID'),
@@ -55,8 +56,7 @@ class GeocodeRecords
       input_map.each do |ss, local|
         args += [ "--#{ss}-col", local.to_s ]
       end
-      puts Shellwords.join(args)
-      system(*args)
+      SmartyStreets.run *args
       raise "Geocoding failed on #{input_path.inspect} with args #{Shellwords.join(args)}" unless $?.success?
     end
 
@@ -92,21 +92,5 @@ class GeocodeRecords
         RECODE_MAP[output_k] || output_k
       end
     end
-
-    def smartystreets_bin_path
-      @smartystreets_bin_path ||= begin
-        memo = if File.exist?('node_modules/.bin/smartystreets')
-          'node_modules/.bin/smartystreets'
-        else
-          'smartystreets'
-        end
-        `#{memo} -V` =~ /\A(\d+)\.(\d+)\.(\d+)/
-        major, minor, patch = [$1, $2, $3].map(&:to_i)
-        unless major >= 1 and minor >= 3 and patch >= 2
-          raise "smartystreets >= 1.3.2 required, got #{major}.#{minor}.#{patch}"
-        end
-        memo
-      end
-    end
   end
 end

data/lib/geocode_records/smarty_streets.rb

@@ -0,0 +1,32 @@
+class GeocodeRecords
+
+  module SmartyStreets
+
+    def self.bin_path
+      @bin_path ||= if File.exist?('node_modules/.bin/smartystreets')
+        'node_modules/.bin/smartystreets'
+      else
+        'smartystreets'
+      end
+    end
+
+    def self.compatible?
+      output = run_with_output('-V')
+      current_version = Gem::Version.new output.chomp
+      min_version = Gem::Version.new '1.5.0'
+      current_version >= min_version
+    end
+
+    def self.run(*args)
+      shargs = Shellwords.join(args)
+      system "#{bin_path} #{shargs}"
+    end
+    
+    def self.run_with_output(*args)
+      shargs = Shellwords.join(args)
+      `#{bin_path} #{shargs}`
+    end
+
+  end
+
+end

data/lib/geocode_records/version.rb

@@ -1,3 +1,3 @@
 class GeocodeRecords
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/package.json

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

data/spec/geocode_records/smarty_streets_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+require 'geocode_records/smarty_streets'
+
+describe GeocodeRecords::SmartyStreets do
+
+  describe '.bin_path' do
+    subject { described_class.bin_path }
+
+    it { is_expected.to eq 'node_modules/.bin/smartystreets' }
+  end
+
+  describe '.compatible?' do
+    before { allow(described_class).to receive(:run_with_output).and_return("#{version}\n") }
+
+    subject { described_class.compatible? }
+
+    context 'v1.3.1' do
+      let(:version) { '1.3.1' }
+
+      it { is_expected.to be false }
+    end
+
+    context 'v1.3.2' do
+      let(:version) { '1.3.2' }
+
+      it { is_expected.to be false }
+    end
+
+    context 'v1.5.0' do
+      let(:version) { '1.5.0' }
+
+      it { is_expected.to be true }
+    end
+    
+  end
+
+  describe '.run_with_output' do
+    subject { described_class.run_with_output '-V' }
+
+    it { is_expected.to match /\d+\.\d+.\d+/ }
+  end
+
+end
+

data/spec/geocode_records_spec.rb

@@ -1,13 +1,28 @@
 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'
-  system 'dropdb', '--if-exists', dbname
-  system 'createdb', dbname
-  system 'psql', dbname, '--command', 'CREATE EXTENSION postgis'
-  system 'psql', dbname, '--command', 'CREATE TABLE homes (id serial primary key, the_geom geometry(Geometry,4326), the_geom_webmercator geometry(Geometry,3857), house_number_and_street text, house_number int, unit_number text, city text, state text, postcode text, latitude float, longitude float)'
+  psql = Pasqual.for ENV['DATABASE_URL']
+  psql.dropdb rescue nil
+  psql.createdb
+  psql.command 'CREATE EXTENSION postgis'
+  psql.command <<-SQL
+  CREATE TABLE homes (
+    id serial primary key,
+    the_geom geometry(Geometry,4326),
+    the_geom_webmercator geometry(Geometry,3857),
+    house_number_and_street text,
+    house_number int,
+    unit_number text,
+    city text,
+    state text,
+    postcode text,
+    latitude float,
+    longitude float
+  )
+  SQL
 end
 
 require 'active_record'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocode_records
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -157,9 +157,11 @@ files:
 - lib/geocode_records.rb
 - lib/geocode_records/dump_sql_to_csv.rb
 - lib/geocode_records/geocode_csv.rb
+- lib/geocode_records/smarty_streets.rb
 - lib/geocode_records/update_table_from_csv.rb
 - lib/geocode_records/version.rb
 - package.json
+- spec/geocode_records/smarty_streets_spec.rb
 - spec/geocode_records_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/seamusabshere/geocode_records
@@ -187,5 +189,7 @@ signing_key:
 specification_version: 4
 summary: Geocode an ActiveRecord::Relation with node_smartystreets
 test_files:
+- spec/geocode_records/smarty_streets_spec.rb
 - spec/geocode_records_spec.rb
 - spec/spec_helper.rb
+has_rdoc: