hexillion 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9e568653299f167d50a5b6101f844cb237e42f9
-  data.tar.gz: 95fcf1bbe848f96430cb3d787725ad0c4e5bd210
+  metadata.gz: 4e8cfd9597be0f53d98aa7a46153a7ed32a1f66d
+  data.tar.gz: 5b64a7a7bebd0b67f082c3d19d9ffa2e689b995c
 SHA512:
-  metadata.gz: 9e9f64c0257fe716ab970a9f2513d19ce95beff433f99f278c63eac4fc9404b1558f80fa940dda8cd7d80a18c7129fd908a3522345ddea5cfce75e1717cb569c
-  data.tar.gz: bdb8ba56779d42b04c7e45e6ab3880f5c267fcf672163fb6995318b52b5343392ce39f8e7a22ea2eb5d47901bd1f5e9040723227a0d4eb5478fa0b903bc7dbfc
+  metadata.gz: 3f8f4e9d592aae5b187a176aa637decbb211fc555d1d22b2cc3998adb45b2f77f04b221da0fc5e4065a18a464496287c983754d9f0d23ea020ee76f7186cdd4f
+  data.tar.gz: 9a17946de7e3c0eb7f5fe10f71a04db3aafcca1534878588cd0b06fbe5912a069f667826fa23a0037991dc11c069f61c9a2802f4c931a3fc8fae01a1167095e3

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - '1.9.3'
-  - '2.0.0'
   - '2.1.0'
   - '2.2.0'
+  - '2.3.0'
+  - '2.4.0'

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.3.0
+
+* Replace rest-client usage with net/http.
+* End support for Ruby < 2.1.
+
 # 1.2.0
 
 * Loosen nokogiri dependency version to >= 1.5.

data/hexillion.gemspec

@@ -2,16 +2,15 @@
 require File.expand_path('../lib/hexillion/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Louis Simoneau"]
-  gem.email         = ["simoneau.louis@gmail.com"]
+  gem.authors       = ["Flippa Developers"]
+  gem.email         = ["developers@flippa.com"]
   gem.description   = %q{Hexillion WhoIs API Client for Ruby}
   gem.summary       = %q{Provides a simple client for the Hexillion API}
-  gem.homepage      = ''
+  gem.homepage      = 'https://github.com/flippa/hexillion'
 
-  gem.add_dependency "rest-client", "~> 1.7"
-  gem.add_dependency "nokogiri",    ">= 1.5"
+  gem.add_dependency "nokogiri", ">= 1.5"
 
-  gem.add_development_dependency "rspec", "~> 2.6"
+  gem.add_development_dependency "rspec", "~> 3.6"
   gem.add_development_dependency "rake"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/hexillion.rb

@@ -1,99 +1,118 @@
 require 'date'
-require 'rest-client'
+require 'net/http'
 require 'nokogiri'
+require 'openssl'
+require 'uri'
 
 module Hexillion
   class Client
+    AUTH_ENDPOINT = "https://hexillion.com/rf/xml/1.0/auth/".freeze
+    DATA_ENDPOINT = "http://hexillion.com/rf/xml/1.0/whois/".freeze
+
     def initialize(options)
-      response = RestClient.post "https://hexillion.com/rf/xml/1.0/auth/", :username => options[:username], :password => options[:password]
-      doc = Nokogiri::XML(response)
-      begin
-        @session_key = doc.at_css('SessionKey').content
-      rescue
-        raise "Authentication failed"
-      end
+      @session_key = fetch_session_key(options)
+    rescue
+      raise "Authentication failed"
     end
 
     # Query the API for a given domain
     #
     # @example
-    #   client.whois('flippa.com', {optional_param: value, ...}) # => { ... }
+    #   client.whois('flippa.com', {optional_param: value, ...})
     #
     #
 
     def whois(domain, extra_params = {})
-      base_params = {:sessionkey => @session_key, :query => domain}
-      params = base_params.merge(extra_params)
+      params = {sessionkey: @session_key, query: domain}.merge(extra_params)
+
+      uri = URI(DATA_ENDPOINT)
+      uri.query = URI.encode_www_form(params)
 
-      response = RestClient.get "http://hexillion.com/rf/xml/1.0/whois/", :params => params
+      response = Net::HTTP.get_response(uri)
       parse_xml(response.body)
     end
 
     private
 
+    def fetch_session_key(options = {})
+      uri = URI(AUTH_ENDPOINT)
+
+      http = Net::HTTP.new(uri.host, uri.port).tap do |http|
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      request = Net::HTTP::Post.new(uri.request_uri)
+      request.set_form_data(username: options[:username], password: options[:password])
+      response = http.request(request)
+
+      doc = Nokogiri::XML(response.body)
+      doc.at_css('SessionKey').content
+    end
+
     def parse_xml(xml)
       doc = Nokogiri::XML(xml)
       records = doc.xpath(".//QueryResult[ErrorCode='Success' and FoundMatch='Yes']/WhoisRecord")
 
       strings = {
-        :registrant_name => "Registrant Name",
-        :registrant_person => "Registrant Person",
-        :registrant_handle => "Registrant Handle",
-        :registrant_address => "Registrant Address",
-        :registrant_city => "Registrant City",
-        :registrant_state_province => "Registrant StateProvince",
-        :registrant_postal_code => "Registrant PostalCode",
-        :registrant_country => "Registrant Country",
-        :registrant_country_code => "Registrant CountryCode",
-        :registrant_email => "Registrant Email",
-        :registrar_name => "Registrar Name",
-        :registrar_whois_server => "Registrar WhoisServer",
-        :registrar_homepage => "Registrar HomePage",
-        :admin_contact_name => "AdminContact Name",
-        :admin_contact_person => "AdminContact Person",
-        :admin_contact_handle => "AdminContact Handle",
-        :admin_contact_address => "AdminContact Address",
-        :admin_contact_state_province => "AdminContact StateProvince",
-        :admin_contact_postal_code => "AdminContact PostalCode",
-        :admin_contact_country_code => "AdminContact CountryCode",
-        :admin_contact_country => "AdminContact Country",
-        :admin_contact_email => "AdminContact Email",
-        :admin_contact_phone => "AdminContact Phone",
-        :admin_contact_fax => "AdminContact Fax",
-        :tech_contact_name => "TechContact Name",
-        :tech_contact_person => "TechContact Person",
-        :tech_contact_handle => "TechContact Handle",
-        :tech_contact_address => "TechContact Address",
-        :tech_contact_state_province => "TechContact StateProvince",
-        :tech_contact_postal_code => "TechContact PostalCode",
-        :tech_contact_country_code => "TechContact CountryCode",
-        :tech_contact_country => "TechContact Country",
-        :tech_contact_email => "TechContact Email",
-        :tech_contact_phone => "TechContact Phone",
-        :tech_contact_fax => "TechContact Fax",
-        :zone_contact_name => "ZoneContact Name",
-        :zone_contact_person => "ZoneContact Person",
-        :zone_contact_handle => "ZoneContact Handle",
-        :zone_contact_address => "ZoneContact Address",
-        :zone_contact_state_province => "ZoneContact StateProvince",
-        :zone_contact_postal_code => "ZoneContact PostalCode",
-        :zone_contact_country_code => "ZoneContact CountryCode",
-        :zone_contact_country => "ZoneContact Country",
-        :zone_contact_email => "ZoneContact Email",
-        :zone_contact_phone => "ZoneContact Phone",
-        :zone_contact_fax => "ZoneContact Fax",
-        :header_text => "HeaderText",
-        :stripped_text => "StrippedText",
-        :raw_text => "RawText"
+        registrant_name: "Registrant Name",
+        registrant_person: "Registrant Person",
+        registrant_handle: "Registrant Handle",
+        registrant_address: "Registrant Address",
+        registrant_city: "Registrant City",
+        registrant_state_province: "Registrant StateProvince",
+        registrant_postal_code: "Registrant PostalCode",
+        registrant_country: "Registrant Country",
+        registrant_country_code: "Registrant CountryCode",
+        registrant_email: "Registrant Email",
+        registrar_name: "Registrar Name",
+        registrar_whois_server: "Registrar WhoisServer",
+        registrar_homepage: "Registrar HomePage",
+        admin_contact_name: "AdminContact Name",
+        admin_contact_person: "AdminContact Person",
+        admin_contact_handle: "AdminContact Handle",
+        admin_contact_address: "AdminContact Address",
+        admin_contact_state_province: "AdminContact StateProvince",
+        admin_contact_postal_code: "AdminContact PostalCode",
+        admin_contact_country_code: "AdminContact CountryCode",
+        admin_contact_country: "AdminContact Country",
+        admin_contact_email: "AdminContact Email",
+        admin_contact_phone: "AdminContact Phone",
+        admin_contact_fax: "AdminContact Fax",
+        tech_contact_name: "TechContact Name",
+        tech_contact_person: "TechContact Person",
+        tech_contact_handle: "TechContact Handle",
+        tech_contact_address: "TechContact Address",
+        tech_contact_state_province: "TechContact StateProvince",
+        tech_contact_postal_code: "TechContact PostalCode",
+        tech_contact_country_code: "TechContact CountryCode",
+        tech_contact_country: "TechContact Country",
+        tech_contact_email: "TechContact Email",
+        tech_contact_phone: "TechContact Phone",
+        tech_contact_fax: "TechContact Fax",
+        zone_contact_name: "ZoneContact Name",
+        zone_contact_person: "ZoneContact Person",
+        zone_contact_handle: "ZoneContact Handle",
+        zone_contact_address: "ZoneContact Address",
+        zone_contact_state_province: "ZoneContact StateProvince",
+        zone_contact_postal_code: "ZoneContact PostalCode",
+        zone_contact_country_code: "ZoneContact CountryCode",
+        zone_contact_country: "ZoneContact Country",
+        zone_contact_email: "ZoneContact Email",
+        zone_contact_phone: "ZoneContact Phone",
+        zone_contact_fax: "ZoneContact Fax",
+        header_text: "HeaderText",
+        stripped_text: "StrippedText",
+        raw_text: "RawText",
       }
 
       dates = {
-        :created_date => './CreatedDate',
-        :expires_date => './ExpiresDate',
-        :updated_date => './UpdatedDate'
+        created_date: './CreatedDate',
+        expires_date: './ExpiresDate',
+        updated_date: './UpdatedDate',
       }
 
-      result = { :xml_response => xml }
+      result = { xml_response: xml }
 
       records.each do |record|
         result[:nameservers] = record.css('Domain NameServer').map { |x| x.content unless x.content == '' }

data/lib/hexillion/version.rb

@@ -1,3 +1,3 @@
 module Hexillion
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/spec/client_spec.rb

@@ -10,60 +10,66 @@ AUTH_RESPONSE =  '<?xml version="1.0" encoding="utf-8" ?>
 describe Hexillion::Client do
   describe '#initialize' do
     it "requests a session key from Hexillion and assigns it as an instance variable" do
-      RestClient
-        .should_receive(:post)
-        .with("https://hexillion.com/rf/xml/1.0/auth/", {:username => "username", :password => "password"})
-        .and_return(AUTH_RESPONSE)
+      http = double(Net::HTTP, :'use_ssl=' => 1, :'verify_mode=' => 1)
+      post = double(Net::HTTP::Post, 'set_form_data' => 1)
+      resp = double(body: AUTH_RESPONSE)
+
+      allow(Net::HTTP).to receive(:new) { http }
+      allow(Net::HTTP::Post).to receive(:new) { post }
+
+      expect(http).to receive(:request).with(post).and_return(resp)
+
       hex = Hexillion::Client.new(:username => "username", :password => "password")
-      hex.instance_variable_get('@session_key').should == 'nOIANdfjL4524ynjlssasjfDFaqe4'
+      expect(hex.instance_variable_get('@session_key')).to eq('nOIANdfjL4524ynjlssasjfDFaqe4')
     end
   end
 
   describe "#whois" do
     before(:each) do
-      @response = double()
-      RestClient.stub(:post) { AUTH_RESPONSE }
-      RestClient.stub(:get) { @response }
-      @response.stub(:body) { "" }
+      allow_any_instance_of(Net::HTTP)
+        .to receive(:request)
+        .with(an_instance_of(Net::HTTP::Post))
+        .and_return(double(body: AUTH_RESPONSE))
+
+      @response_body = ""
+
+      allow(@response).to receive(:body) { @response_body }
+      allow(Net::HTTP).to receive(:get_response) { @response }
+
       @hex = Hexillion::Client.new(:username => "username", :password => "password")
     end
 
     it "queries the API and passes all the params to the endpoint" do
       domain_name = "example.com"
       extra_params = {:data => "awesome", :more_data => "awesomer"}
-      endpoint_url = kind_of(String)
-      sessionkey = kind_of(String)
-
-      payload = [
-        endpoint_url,
-        :params => {
-          :sessionkey => sessionkey,
-          :query => domain_name
-        }.merge(extra_params)
-      ]
-
-      expect(RestClient).to receive(:get).with(*payload)
+
+      request_uri = URI([
+        "http://hexillion.com/rf/xml/1.0/whois/",
+        "?sessionkey=nOIANdfjL4524ynjlssasjfDFaqe4",
+        "&query=#{domain_name}",
+        "&data=#{extra_params[:data]}",
+        "&more_data=#{extra_params[:more_data]}",
+      ].join)
+
+      expect(Net::HTTP).to receive(:get_response).with(request_uri)
       @hex.whois(domain_name, extra_params)
     end
 
     it "concats multiline address fields" do
-      @response.stub(:body) do
-        <<-XML
+      @response_body = <<-XML
         <QueryResult><ErrorCode>Success</ErrorCode><FoundMatch>Yes</FoundMatch><WhoisRecord>
           <Registrant>
             <Address>48 Cambridge Street</Address>
             <Address>Level 3</Address>
           </Registrant>
         </WhoisRecord></QueryResult>
-        XML
-      end
+      XML
 
-      @hex.whois("example.com")[:registrant_address].should == "48 Cambridge Street\nLevel 3"
+      expect(@hex.whois("example.com")[:registrant_address]).to eq("48 Cambridge Street\nLevel 3")
     end
 
     it "provides the registrant email address" do
-      @response.stub(:body) do
-        <<-XML
+      @response_body = <<-XML
         <QueryResult><ErrorCode>Success</ErrorCode><FoundMatch>Yes</FoundMatch><WhoisRecord>
           <Registrant>
             <Address>48 Cambridge Street</Address>
@@ -71,30 +77,26 @@ describe Hexillion::Client do
             <Email>me@example.com</Email>
           </Registrant>
         </WhoisRecord></QueryResult>
-        XML
-      end
+      XML
 
-      @hex.whois("example.com")[:registrant_email].should == "me@example.com"
+      expect(@hex.whois("example.com")[:registrant_email]).to eq("me@example.com")
     end
 
     it "returns the first email when multiple specified" do
-      @response.stub(:body) do
-        <<-XML
+      @response_body = <<-XML
         <QueryResult><ErrorCode>Success</ErrorCode><FoundMatch>Yes</FoundMatch><WhoisRecord>
           <AdminContact>
             <Email>john@example.com</Email>
             <Email>fred@example.com</Email>
           </AdminContact>
         </WhoisRecord></QueryResult>
-        XML
-      end
+      XML
 
-      @hex.whois("example.com")[:admin_contact_email].should == "john@example.com"
+      expect(@hex.whois("example.com")[:admin_contact_email]).to eq("john@example.com")
     end
 
     it "makes an array of nameservers" do
-      @response.stub(:body) do
-        <<-XML
+      @response_body = <<-XML
         <QueryResult><ErrorCode>Success</ErrorCode><FoundMatch>Yes</FoundMatch><WhoisRecord>
           <Domain>
             <NameServer>ns1.registrar.com</NameServer>
@@ -102,24 +104,21 @@ describe Hexillion::Client do
             <NameServer>ns3.registrar.com</NameServer>
           </Domain>
         </WhoisRecord></QueryResult>
-        XML
-      end
+      XML
 
-      @hex.whois("example.com")[:nameservers].should == ['ns1.registrar.com', 'ns2.registrar.com', 'ns3.registrar.com']
+      expect(@hex.whois("example.com")[:nameservers]).to eq(['ns1.registrar.com', 'ns2.registrar.com', 'ns3.registrar.com'])
     end
 
     it "parses date fields" do
-      @response.stub(:body) do
-        <<-XML
+      @response_body = <<-XML
         <QueryResult><ErrorCode>Success</ErrorCode><FoundMatch>Yes</FoundMatch><WhoisRecord>
           <CreatedDate>1999-10-04T00:00:00Z</CreatedDate>
           <UpdatedDate>2010-11-25T00:00:00Z</UpdatedDate>
           <ExpiresDate>2019-10-04T00:00:00Z</ExpiresDate>
         </WhoisRecord></QueryResult>
-        XML
-      end
+      XML
 
-      @hex.whois("example.com")[:created_date].should == DateTime::civil(1999,10,4)
+      expect(@hex.whois("example.com")[:created_date]).to eq(DateTime::civil(1999,10,4))
     end
 
     it "returns the entire xml response as :xml_response" do
@@ -129,11 +128,11 @@ describe Hexillion::Client do
               <UpdatedDate>2010-11-25T00:00:00Z</UpdatedDate>
               <ExpiresDate>2019-10-04T00:00:00Z</ExpiresDate>
             </WhoisRecord></QueryResult>
-            XML
+      XML
 
-      @response.stub(:body) { xml }
+      @response_body = xml
 
-      @hex.whois("example.com")[:xml_response].should == xml
+      expect(@hex.whois("example.com")[:xml_response]).to eq(xml)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,4 @@
 require 'bundler/setup'
-require 'hexillion'
+require 'hexillion'
+
+RSpec::Mocks.configuration.allow_message_expectations_on_nil = true

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hexillion
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
-- Louis Simoneau
+- Flippa Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2017-07-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +54,7 @@ dependencies:
         version: '0'
 description: Hexillion WhoIs API Client for Ruby
 email:
-- simoneau.louis@gmail.com
+- developers@flippa.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -85,7 +71,7 @@ files:
 - lib/hexillion/version.rb
 - spec/client_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/flippa/hexillion
 licenses: []
 metadata: {}
 post_install_message: 
@@ -104,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Provides a simple client for the Hexillion API