whoisxmlapi2 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6cbd991e4b0f167cec3709c978ead0b4188980724ce30810992e30a616fa84b
-  data.tar.gz: eaa417be9860ad92f76cf17ffa9c2e1163ceaccd7323aea51815c033bb587103
+  metadata.gz: 8f3e0b0c78161a79947adaf6f7c19fd203de96584d569dc416c1d00a76d82beb
+  data.tar.gz: a7824f0d38b1faac430dea297d22e1fd83d4d3b6a677ce55561a66fe2fe23440
 SHA512:
-  metadata.gz: 3c329ed3911a269390bbc13ff594bebfd9ea35802343e669ab216a7d2649bf6bf6980015a04f3cb83681af2b589e9da8cc729d86479c3dfcb9daa1e31b1e184c
-  data.tar.gz: 07e2ec1634c2f6d8e898e95f4be88f06fa7036f044692747877f1272edffb150b4f2a2ed2d5af6b0c1880ed26c612bc4032ce57cc6f810aaaf5596a78f0b5f63
+  metadata.gz: bb032822ed9d0033af75ebcd04cf0a286bb64e2d170603c88731f18773f78b66b9cbb4a428cae62493265eed74d44ee797f5675758c9ac85cf44ff6a6e000eaf
+  data.tar.gz: 5ef1abb7b4f9236e0b1d097e4a406a95e742315993a7095d584214c7c234ce1d53422b72f44b520c60eb2ad25ae2b8a044a9748a0ca434d7673967eaa3114bb7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    whoisxmlapi2 (0.1.0)
+    whoisxmlapi2 (0.1.1)
       json (>= 2.0)
       openssl (>= 2.0)
 

data/README.md

@@ -16,6 +16,28 @@ Or install it yourself as:
 
 ## Usage
 
+### API version 2.0
+
+Provide your credentials
+
+```ruby
+WhoisXMLAPI2.configure do |config|
+  config.api_key  = "your-api-key"
+end
+```
+
+Make a request
+
+```ruby
+WhoisXMLAPI2::Request.go("cnn.com")
+# => {"WhoisRecord"=>{"createdDate"=>"1993-09-22T04:00:00Z", ...
+```
+
+The output is hash parsed from the the API's JSON response.
+
+
+### API Version 1.0
+
 Provide your credentials
 
 ```ruby
@@ -29,15 +51,15 @@ end
 Make a request
 
 ```ruby
-WhoisXMLAPI2::Request.go("cnn.com")
+WhoisXMLAPI2::Request::V1.go("cnn.com")
 # => {"WhoisRecord"=>{"createdDate"=>"1993-09-22T04:00:00Z", ...
 ```
 
-The output is the API response.
+The output is hash parsed from the the API's JSON response.
 
 ## Development
 
-TODO: This
+File bugs against the GitHub issue tracker and pull requests to match, where possible.
 
 ## Contributing
 

data/lib/whoisxmlapi2/configuration.rb

@@ -9,6 +9,11 @@ module WhoisXMLAPI2
     end
 
     def self.set?
+      WhoisXMLAPI2.configuration.url && \
+      WhoisXMLAPI2.configuration.api_key
+    end
+
+    def self.set_v1?
       WhoisXMLAPI2.configuration.url && \
       WhoisXMLAPI2.configuration.username && \
       WhoisXMLAPI2.configuration.api_key && \

data/lib/whoisxmlapi2/request.rb

@@ -2,25 +2,12 @@ module WhoisXMLAPI2
   class Request
     class << self
       def go(domain)
-        timestamp = (Time.now.to_f * 1000).to_i
-        digest = generate_digest(timestamp)
-
-        JSON.parse(open(config.url + params(digest, domain, timestamp)).read)
+        JSON.parse(open(config.url + params(domain)).read)
       end
 
       private
-        def generate_digest(timestamp)
-          digest = config.username + timestamp.to_s + config.api_key
-
-          URI.escape(OpenSSL::HMAC.hexdigest(OpenSSL::Digest::MD5.new, config.secret, digest))
-        end
-
-        def params(digest, domain, timestamp)
-          "requestObject=#{prepare_data(timestamp)}&digest=#{digest}&domainName=#{domain}&outputFormat=json"
-        end
-
-        def prepare_data(timestamp)
-          Base64.encode64( { u: config.username, t: timestamp }.to_json )
+        def params(domain)
+          "apiKey=#{config.api_key}&domainName=#{domain}&outputFormat=json"
         end
 
         def config
@@ -29,5 +16,37 @@ module WhoisXMLAPI2
           WhoisXMLAPI2.configuration
         end
     end
+
+    class V1
+      class << self
+        def go(domain)
+          timestamp = (Time.now.to_f * 1000).to_i
+          digest = generate_digest(timestamp)
+
+          JSON.parse(open(config.url + params(digest, domain, timestamp)).read)
+        end
+
+        private
+          def generate_digest(timestamp)
+            digest = config.username + timestamp.to_s + config.api_key
+
+            URI.escape(OpenSSL::HMAC.hexdigest(OpenSSL::Digest::MD5.new, config.secret, digest))
+          end
+
+          def params(digest, domain, timestamp)
+            "requestObject=#{prepare_data(timestamp)}&digest=#{digest}&domainName=#{domain}&outputFormat=json"
+          end
+
+          def prepare_data(timestamp)
+            Base64.encode64( { u: config.username, t: timestamp }.to_json )
+          end
+
+          def config
+            raise 'Missing configuration' unless WhoisXMLAPI2::Configuration.set_v1?
+
+            WhoisXMLAPI2.configuration
+          end
+      end
+    end
   end
 end

data/lib/whoisxmlapi2/version.rb

@@ -1,3 +1,3 @@
 module WhoisXMLAPI2
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whoisxmlapi2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sam Nissen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler