melissa_data 0.2.14 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06b64d5d7b8656d81ecf6c0b413cf4cbea7c9534
-  data.tar.gz: c02651c7504b10bda9ad1607e06bc99b9b257286
+  metadata.gz: 5ad99ffda47a41ab5769c579eb119ffae8353114
+  data.tar.gz: 5f88c441fc21210d7b458d31cfcb38443956c76f
 SHA512:
-  metadata.gz: 2e4c669f5894d837f0740dc5872ad2c936fbf9c873b32923cc5dd1642929bd734e4d9e33d6fdbc9b1370dc0d763c6eaf644ba209b19bf513c4b0c6066b330530
-  data.tar.gz: 0b1fce5d39861a0accbc6b1136bddddd5330b215deebd03544deec9114c1065300480788fa05a892d686c4c9b6b1d8ad22860fd058b47e953a659284c3e4b1e4
+  metadata.gz: 20a2f54106674585fcc5ca4aa1bb9ec479e6d2fb3806985b06cc8b0a812d3df6f90857c84058904ea5e15accb52553faa02d4eb3e13d99e51e5d674e8be4e719
+  data.tar.gz: c53bbde3abc59944433c42c495778cf6e2e6a0f13d58abf48c2d3b68f86e8dc5b7c64032086f3489e609933ef13eb98b85dc01759e5c8041d136196b195ccb9e

data/lib/melissa_data.rb

@@ -1,3 +1,4 @@
+require "active_support/core_ext/hash"
 require "melissa_data/version"
 require "melissa_data/web_smart/xml"
 require "melissa_data/web_smart/response_processor"
@@ -6,8 +7,6 @@ require "melissa_data/web_smart/property_api"
 require "melissa_data/config"
 require "melissa_data/geo_lookup/geocoder"
 
-require 'rest-client'
-require 'nokogiri'
 require 'geokit'
 
 module MelissaData

data/lib/melissa_data/geo_lookup/geocoder.rb

@@ -14,7 +14,7 @@ module MelissaData
       end
 
       def coordinates?(response)
-        if !response[:errors]
+        if !response[:errors] && !response[:property_address]&.empty?
           lat = response.fetch(:property_address)[:latitude]
           long =response.fetch(:property_address)[:longitude]
           lat != nil && long != nil

data/lib/melissa_data/version.rb

@@ -1,3 +1,3 @@
 module MelissaData
-  VERSION = "0.2.14"
+  VERSION = '1.0.0'
 end

data/lib/melissa_data/web_smart/client.rb

@@ -24,7 +24,7 @@ module MelissaData
 
       def resolve_response
         return @response unless success?
-        add_coordinates(@response) unless MelissaData::GeoLookup::Geocoder.coordinates? @response
+        add_coordinates(@response[:records].first) unless MelissaData::GeoLookup::Geocoder.coordinates? @response[:records].first
         @response
       end
 
@@ -42,9 +42,11 @@ module MelissaData
         city  = response.dig(:property_address, :city)
         state = response.dig(:property_address, :state)
         zip   = response.dig(:property_address, :zip)
-        full_address = "#{addr}, #{city}, #{state}, #{zip}"
-        MelissaData::GeoLookup::Geocoder
-          .address_to_coordinates(full_address)
+
+        if addr && city && state && zip
+          full_address = "#{addr}, #{city}, #{state}, #{zip}"
+          MelissaData::GeoLookup::Geocoder.address_to_coordinates(full_address)
+        end
       end
     end
   end

data/lib/melissa_data/web_smart/property_api.rb

@@ -1,40 +1,65 @@
-require 'rest-client'
-require 'nokogiri'
+require 'faraday'
+require 'typhoeus'
 require 'json'
 
 module MelissaData
   module WebSmart
     class PropertyAPI
+      USER_AGENT = "MelissaData-Rubygem/#{MelissaData::VERSION}"
+      BASE_URL = 'https://property.melissadata.net'
+
+      def default_connection(url = BASE_URL, json_headers: false)
+        Faraday.new(url: url) do |conn|
+          conn.response :logger
+          conn.headers[:user_agent] = USER_AGENT
+
+          if json_headers
+            conn.headers['Content-Type'] = 'application/json'
+            conn.headers['Accept'] = 'application/json'
+          end
+
+          conn.adapter :typhoeus
+        end
+      end
+
       def property_by_apn(fips:, apn:)
-        resp = RestClient.get('https://property.melissadata.net/v3/REST/Service.svc/doLookup/',
-                             { params: { id: MelissaData.web_smart_id,
-                                         fips: fips,
-                                         apn: apn,
-                                         opt: "True" } })
-        PropertyXMLParser.new(Nokogiri::XML(resp)).parse
+        raw = default_connection(BASE_URL).get '/v4/WEB/LookupProperty/', {
+          id: MelissaData.web_smart_id,
+          fips: fips,
+          apn: apn,
+          format: 'json'
+        }
+
+        res = JSON.parse(raw.body).deep_transform_keys(&:underscore)
+        res&.with_indifferent_access
       end
 
       def property_by_address_key(address_key:)
-        resp = RestClient.get('https://property.melissadata.net/v3/REST/Service.svc/doLookup/',
-                             { params: { id: MelissaData.web_smart_id,
-                                         AddressKey: address_key,
-                                         opt: "True" } })
-        PropertyXMLParser.new(Nokogiri::XML(resp)).parse
+        raw = default_connection(BASE_URL).get '/v4/WEB/LookupProperty/', {
+          id: MelissaData.web_smart_id,
+          AddressKey: address_key,
+          format: 'json'
+        }
+
+        res = JSON.parse(raw.body).deep_transform_keys(&:underscore)
+        res&.with_indifferent_access
       end
 
       def address(address:, city:, state:, zip:, country:)
-        resp = JSON.parse(RestClient.get("https://personator.melissadata.net/v3/WEB/ContactVerify/doContactVerify",
-                                         { params: { id: MelissaData.web_smart_id,
-                                                     Actions: "Check",
-                                                     a1: address,
-                                                     city: city,
-                                                     state: state,
-                                                     postal: zip,
-                                                     ctry: country,
-                                                     AdvancedAddressCorrection: "on",},
-                                           accept: :json,
-                                           content_type: :json }))
-        resp["Records"].first
+        raw = default_connection(BASE_URL, json_headers: true)
+          .get '/v3/WEB/ContactVerify/doContactVerify', {
+            id: MelissaData.web_smart_id,
+            Actions: 'Check',
+            a1: address,
+            city: city,
+            state: state,
+            postal: zip,
+            ctry: country,
+            AdvancedAddressCorrection: 'on'
+        }
+
+        res = JSON.parse(raw.body).deep_transform_keys(&:underscore)
+        res&.with_indifferent_access[:records]&.first
       end
     end
   end

data/lib/melissa_data/web_smart/response_processor.rb

@@ -31,9 +31,9 @@ module MelissaData
       def codes(response, resp_type)
         case resp_type
         when 'property'
-          response[:result][:code].split(",")
+          response[:records].first[:results].split(',')
         when 'address'
-          response[:results].split(",")
+          response[:records].first[:results].split(',')
         end
       end
 

data/melissa_data.gemspec

@@ -20,13 +20,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_runtime_dependency "nokogiri"
-  spec.add_runtime_dependency "rest-client"
-  spec.add_runtime_dependency "geokit"
+  spec.add_runtime_dependency 'geokit'
+  spec.add_runtime_dependency 'activesupport', '~> 4.2.2'
+  spec.add_runtime_dependency 'faraday', '~> 0.15.0'
+  spec.add_runtime_dependency 'typhoeus', '~> 1.3.0'
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.3"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "webmock"
+  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.3'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'webmock'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: melissa_data
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 1.0.0
 platform: ruby
 authors:
 - Robert Grayson
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: geokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -26,33 +26,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
-  name: geokit
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.0
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement