dc_address_lookup 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a92e780b8924d9a689c78786a8f0cc35b14992b0
-  data.tar.gz: 0490eb6833b8f49bec859f462ffa0711e62f3a4f
+  metadata.gz: 677528e5dacce954168dbedb9eefa326950ea723
+  data.tar.gz: 9a35c1825f44a12028922afcaa0ceee0ff913ab4
 SHA512:
-  metadata.gz: 2dd2ba6c035808119c41e618a8c49bc36a081116859d72843382ca1e2f3e224d5d19aa2a182a0ee81e1796b53c78d2b3274dc6476eb8094758feffdf4c3c4a7c
-  data.tar.gz: 727ec563285c370c5803a36e6a54c8f85263cd06c1b6491f50f35593474bf7ac3a48567a620fd5da2af232f1460f61f1e2a89c90deb56a80312dfceba13db70d
+  metadata.gz: e611b0ac557929f2806d75323393294cd02b7576fb45b3b36745fb6e692939c00acbe37d09a1e736d41e86dfff04fcb5a2ffd9f65859b59cd11750fdb0ec5cf8
+  data.tar.gz: f33e20e9cc389b181c121075b0e13b9a4a56b0798d2323433bdb139d69088e89687f82dc6d99f29f3120e306d44ac35dc2130cb5a5f285f9767352daf2e987fe

data/dc_address_lookup.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rest-client", "~> 1.8"
   spec.add_dependency "rest-client-components", "~> 1.4"
-  spec.add_dependency "nokogiri", "~> 1.6"
   spec.add_dependency "rack-cache", "~> 1.5"
 
   spec.add_development_dependency "bundler", "~> 1.10"

data/lib/dc_address_lookup.rb

@@ -1,7 +1,7 @@
-require 'nokogiri'
 require 'rest-client'
 require 'restclient/components'
 require 'rack/cache'
+require 'json'
 
 require "dc_address_lookup/version"
 require "dc_address_lookup/client"
@@ -9,7 +9,8 @@ require "dc_address_lookup/response"
 require "dc_address_lookup/location"
 
 module DcAddressLookup
-  ENDPOINT = "http://citizenatlas.dc.gov/newwebservices/locationverifier.asmx/findLocation"
+  DOMAIN = "http://citizenatlas.dc.gov"
+  ENDPOINT = "#{DOMAIN}/newwebservices/locationverifier.asmx/findLocation2"
 
   def self.lookup(address)
     Client.new.lookup(address)

data/lib/dc_address_lookup/client.rb

@@ -1,7 +1,8 @@
 module DcAddressLookup
   class Client
     def lookup(query)
-      response = RestClient.get DcAddressLookup::ENDPOINT, { params: { str: query } }
+      params = { f: "json", str: query } 
+      response = RestClient.get DcAddressLookup::ENDPOINT, { params: params }
       location = Response.new(response).location
       location if location.valid?
     end

data/lib/dc_address_lookup/location.rb

@@ -1,14 +1,19 @@
 module DcAddressLookup
   class Location
-    def self.from_table(xml)
+    def self.from_table(table)
       location = self.new
 
-      xml.children.each do |node|
-        next if node.node_name == "text"
-        key = node.name.downcase
-        value = node.text.gsub(/\A#{key.split("_").first}\b/i, "").squeeze("\s").strip
-        value = value.to_i if value.to_i.to_s == value
-        value = value.to_f if value.to_f.to_s == value
+      table.each do |key,value|
+        key = key.downcase
+
+        if value.class == String
+          value = value.gsub(/\A#{key.split("_").first}\b/i, "").squeeze("\s").strip
+          value = value.to_i if value =~ /\A[1-9][0-9]*\z/
+          value = value.to_f if value =~ /\A[0-9]+\.[0-9]+\z/
+        elsif value.class == Float
+          value = value.to_i if value.to_s =~ /\A[0-9]+\.0\z/
+        end
+
         location.data[key] = value
       end
 

data/lib/dc_address_lookup/response.rb

@@ -13,16 +13,12 @@ module DcAddressLookup
 
     private
 
-    def document
-      doc ||= begin
-        doc = Nokogiri::XML(body) { |config| config.strict.nonet }
-        doc.remove_namespaces!
-        doc
-      end
+    def parsed
+      @parsed ||= JSON.parse(body)
     end
 
     def table
-      document.xpath("ReturnObject//returnDataset//diffgram//NewDataSet//Table1")
+      parsed["returnDataset"]["Table1"].first
     end
   end
 end

data/lib/dc_address_lookup/version.rb

@@ -1,3 +1,3 @@
 module DcAddressLookup
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/script/console

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 
 ENV["DEBUG"] = "1"
+ENV["RESTCLIENT_LOG"] = "stdout"
+
 require "bundler/setup"
 require "dc_address_lookup"
-
-client = DcAddressLookup::Client.new
-
 require "pry"
 Pry.start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dc_address_lookup
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rack-cache
   requirement: !ruby/object:Gem::Requirement