whoisxmlapi 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe3b9a00715ebd01c80e1378d9f64c57051f4af98848fe8fba3b548dac9716c4
-  data.tar.gz: 4cbb2e345411dd433820b4ec4c465635e4cbb6c13ac4ae687175ada3d776c64d
+  metadata.gz: 2442b889d8fed140f51f7d83bf621f30403d81bace0d7fa3f16db5fba1c61ba5
+  data.tar.gz: 248927a9e820129a2cb6bfe0ba3656de0e361d9624ca375f0896fd55f1a774f4
 SHA512:
-  metadata.gz: c6be612f3c774ad9d4a0511c49bc3a78cf53b3cc592fcd47c02a7c94423be084d3ce54728f5b96b9a568194c76a4ed6d912a6ab101b9576cdef937cc45c73f22
-  data.tar.gz: ebe16297aa08021577cecca96c15be662cb0da4995940ccf9bcb7041ca2047854d720281434bdfd88b0c02af496e61c22ff7527d891419d02b6ea333e20c1d92
+  metadata.gz: ba31775e1e05d8b9c482ab67b52858d401defa81b746a8e5a7913a6da3536f38c2786337c9d0c47cb402779d90408445cf98ac3ebc2b9fd526dacea03efad509
+  data.tar.gz: 1e9d36cf33a50560a604ffdf5085228dbb7ff51f53b4721568a5da72095b1f507e05e97de5babd48149795bdfab5b6baedae7f822c5c0afc703711106612bcc2

data/lib/whoisxmlapi/client.rb

@@ -42,11 +42,14 @@ module WhoisXMLAPI
         if r
           if r.parsed_response.is_a?(String)
             WhoisXMLAPI.logger.debug "WhoisXMLAPI#whois - WARNING: passed back parsed_response as a String instead of a Hash for \'#{domain}\'."
-            presponse = JSON.parse(r.parsed_response)
+            presponse = JSON.parse(r.parsed_response) rescue nil
           else
             presponse = r.parsed_response
           end
-          if presponse.key? 'ErrorMessage'
+
+          if presponse.nil?
+            res = {:error => {message: 'Failed to parse response from API.'}}
+          elsif presponse.key? 'ErrorMessage'
             WhoisXMLAPI.logger.info "WhoisXMLAPI#whois - Error getting Whois info: #{presponse['ErrorMessage']['msg']}"
             res = WhoisXMLAPI::Unavailable.new(:whoisable => owner)
             res.parse(domain)                     # parse will save document for Unavailable
@@ -112,12 +115,12 @@ module WhoisXMLAPI
       # Logger message is to monitor whether WhoisXML and/or HTTParty will still return a string on occasion.
       if r.parsed_response.is_a?(String)
         WhoisXMLAPI.logger.debug "WhoisXMLAPI#exists? - passed back parsed_response as a String instead of a Hash for \'#{domain}\'."
-        resp = JSON.parse(r.parsed_response)
+        presponse = JSON.parse(r.parsed_response) rescue nil
       else
-        resp = r.parsed_response
+        presponse = r.parsed_response
       end
 
-      resp["DomainInfo"]["domainAvailability"] == "UNAVAILABLE"
+      presponse && presponse["DomainInfo"]["domainAvailability"] == "UNAVAILABLE"
     end
 
 
@@ -239,21 +242,25 @@ module WhoisXMLAPI
         r = nil
       end
 
-      if r.response.is_a? Net::HTTPOK
-        if r && r.parsed_response
+      if r && r.response.is_a?(Net::HTTPOK)
+        if r.parsed_response
           # WhoisXML and HTTParty are sometimes returning a Hash and not a JSON string as requested,
           # which is causing an error of "no implicit conversion of Hash into String" when we call JSON.parse.
           # Logger message is to monitor whether WhoisXML and/or HTTParty will still return a string on occasion.
           if r.parsed_response.is_a?(String)
             WhoisXMLAPI.logger.debug "WhoisXMLAPI#account_balance - passed back parsed_response as a String instead of a Hash."
-            JSON.parse(r.parsed_response)
+            presponse = JSON.parse(r.parsed_response) rescue nil
+          else
+            presponse = r.parsed_response
           end
 
-          if r.parsed_response["error"]
-            result = {:error => {message: r.parsed_response["error"]}}
-          elsif r.parsed_response["data"]
+          if presponse.nil?
+            result = {:error => {message: 'Failed to parse response from API.'}}
+          elsif presponse["error"]
+            result = {:error => {message: presponse["error"]}}
+          elsif presponse["data"]
             result = {}
-            r.parsed_response["data"].each do |datum|
+            presponse["data"].each do |datum|
               key = datum["product"]["name"]
               result[key] = {product_id: datum["product_id"], credits: datum["credits"]}
             end

data/lib/whoisxmlapi/version.rb

@@ -1,3 +1,3 @@
 module WhoisXMLAPI
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whoisxmlapi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - David Hillard
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport