quova 0.0.1 → 0.0.2

data/README.md

@@ -11,35 +11,54 @@ ruby Hash objects in response.  Data-types will be cast where appropriate (e.g.
 
 ## Usage
 
-Currently, support is only provided for the QOD (Query on Demand) REST API.
+There are two interfaces, depending on which API you want to use.  You can use
+either `Quova::QOD` (Quova on Demand), which is for the paid service and
+includes slightly more data, or you can use `Quova::REST`, which is for the
+standard service, providing slightly less data (such as anonymizer information).
 
-Usage is simple:
+You'll need the appropriate credential for each of these.  You can register for
+a free account at http://developer.quova.com/.
 
-    qod = Quova::QOD.new(:id => "your-id", :password => "your-password")
-    info = qod.info("4.2.2.2")
+### Quova on Demand
+
+    lookup = Quova::QOD.new(:id => "your-id", :password => "your-password")
+    info = lookup.info("4.2.2.2")
 
 Or you can use the alternative syntax:
 
-    info = qod["4.2.2.2"]
+    info = lookup["4.2.2.2"]
+
+### Standard REST API
 
-This returns a Hash with the following elements:
+    lookup = Quova::REST.new(:api_key => "your-key", :secret => "your-secret")
+    info = lookup.info("4.2.2.2")
+
+Or you can use the alternative syntax:
+
+    info = lookup["4.2.2.2"]
+
+Both clients return the same Result object, which acts like a Hash.  How much
+information you get depends on the API you're using.  Anything that is not
+provided, will be left as `nil`:
 
     :ip_address         => String
     :ip_type            => String
     :anonymizer_status  => String
-    :network_tld        => String
-    :network_sld        => String
+    :domain_tld         => String
+    :domain_sld         => String
     :aol                => Boolean
+    :organization       => String
     :carrier            => String
     :asn                => String
-    :connection         => String
+    :connection_type    => String
     :line_speed         => String
-    :routing_type       => String
+    :ip_routing_type    => String
     :continent_name     => String
     :country_code       => String
+    :country_name       => String
     :country_confidence => Integer
     :region_name        => String
-    :region_confidence  => Integer
+    :state_code         => String
     :state_name         => String
     :state_confidence   => Integer
     :city_name          => String
@@ -53,7 +72,12 @@ This returns a Hash with the following elements:
     :msa_id             => Integer
 	
 For any field that was returned blank, or missing, `nil` will be present in the
-result Hash.
+result.
+
+The Result is an object with [Virtus](https://github.com/solnic/virtus) mixed
+in to ensure valid data types.  As a side-effect, you may access the properties
+either using a Hash (`[:key]`) syntax, or just like a regular method call.
+(`result.longitude`).  If you want a plain Hash, call `result.attributes`.
 
 ## Resources
 

data/lib/quova.rb

@@ -1 +1,6 @@
+require 'rest_client'
+require 'nokogiri'
+
 require 'quova/qod'
+require 'quova/rest'
+require 'quova/result'

data/lib/quova/qod.rb

@@ -1,10 +1,6 @@
-require 'rest_client'
-require 'virtus'
-require 'nokogiri'
-
 module Quova
   
-  # Interface to the Quova QOD (Query On Demand) service
+  # Interface to the Quova QOD (Quova On Demand) service
   # 
   # @api public
   class QOD
@@ -31,25 +27,25 @@ module Quova
     # @param [String, IPAddr, #to_s] ip
     #   The IP address to look up
     # 
-    # @return [Hash]
-    #   A Hash containing a key for each element.  Provided fields:
+    # @return [Quova::Result<Virtus>]
+    #   A Hash-like object containing a key for each element.  Provided fields:
     # 
     #    :ip_address
     #    :ip_type
     #    :anonymizer_status
-    #    :network_tld
-    #    :network_sld
+    #    :domain_tld
+    #    :domain_sld
     #    :aol
+    #    :organization
     #    :carrier
     #    :asn
-    #    :connection
+    #    :connection_type
     #    :line_speed
-    #    :routing_type
+    #    :ip_routing_type
     #    :continent_name
     #    :country_code
     #    :country_confidence
     #    :region_name
-    #    :region_confidence
     #    :state_name
     #    :state_confidence
     #    :city_name
@@ -71,7 +67,7 @@ module Quova
     
     private
     
-    # Map XML to a meaningful Hash
+    # Map XML to a meaningful Result
     # 
     # @api private
     def parse_xml(xml)
@@ -79,19 +75,19 @@ module Quova
         :ip_address         => "IPAddress",
         :ip_type            => "IPType",
         :anonymizer_status  => "AnonymizerStatus",
-        :network_tld        => "Domain TopLevel",
-        :network_sld        => "Domain SecondLevel",
+        :domain_tld         => "Domain TopLevel",
+        :domain_sld         => "Domain SecondLevel",
         :aol                => "AOL",
+        :organization       => "Organization",
         :carrier            => "Carrier",
         :asn                => "ASN",
-        :connection         => "Connection",
+        :connection_type    => "Connection",
         :line_speed         => "LineSpeed",
-        :routing_type       => "IPRoutingType",
+        :ip_routing_type    => "IPRoutingType",
         :continent_name     => "Continent Name",
         :country_code       => "Country Name",
         :country_confidence => "Country Confidence",
         :region_name        => "Region Name",
-        :region_confidence  => "Region Confidence",
         :state_name         => "State Name",
         :state_confidence   => "State Confidence",
         :city_name          => "City Name",
@@ -109,46 +105,11 @@ module Quova
       result = Result.new
       
       paths.each_pair do |attr, selector|
-        node = doc.at_css(selector)
-        result.attribute_set(attr, node.text) if node && node.text != ""
+        next unless node = doc.at_css(selector)
+        result[attr] = node.text unless node.text == ""
       end
       
-      result.attributes
-    end
-    
-    # Internally maps Strings from the API to the correct types
-    # 
-    # @api private
-    class Result
-      include Virtus
-      
-      attribute :ip_address,         String
-      attribute :ip_type,            String
-      attribute :anonymizer_status,  String
-      attribute :network_tld,        String
-      attribute :network_sld,        String
-      attribute :aol,                Boolean
-      attribute :carrier,            String
-      attribute :asn,                String
-      attribute :connection,         String
-      attribute :line_speed,         String
-      attribute :routing_type,       String
-      attribute :continent_name,     String
-      attribute :country_code,       String
-      attribute :country_confidence, Integer
-      attribute :region_name,        String
-      attribute :region_confidence,  Integer
-      attribute :state_name,         String
-      attribute :state_confidence,   Integer
-      attribute :city_name,          String
-      attribute :city_confidence,    Integer
-      attribute :postal_code,        String
-      attribute :time_zone,          String
-      attribute :area_code,          String
-      attribute :longitude,          Float
-      attribute :latitude,           Float
-      attribute :dma_id,             Integer
-      attribute :msa_id,             Integer
+      result
     end
   end
 end

data/lib/quova/rest.rb

@@ -0,0 +1,127 @@
+require 'digest/md5'
+
+module Quova
+  
+  # Interface to the standard Quova REST API.
+  # 
+  # @api public
+  class REST
+    
+    # Initialize the REST client with the Quova credentials.
+    # 
+    # @example Quova::REST.new(:api_key => 'your-key', :secret => 'your-secret')
+    # 
+    # @api public
+    def initialize(options)
+      @options  = options.dup
+      @resource = RestClient::Resource.new("http://api.quova.com/v1/ipinfo")
+    end
+    
+    # Query the API for a given IP address
+    # 
+    # @example
+    #   rest.info("4.2.2.2") # => { ... }
+    # 
+    # @param [String, IPAddr, #to_s] ip
+    #   The IP address to look up
+    # 
+    # @return [Quova::Result<Virtus>]
+    #   A Hash-like object containing a key for each element.  Provided fields:
+    # 
+    #    :ip_address
+    #    :ip_type
+    #    :domain_tld
+    #    :domain_sld
+    #    :organization
+    #    :carrier
+    #    :asn
+    #    :connection_type
+    #    :line_speed
+    #    :ip_routing_type
+    #    :continent_name
+    #    :country_code
+    #    :country_name
+    #    :country_confidence
+    #    :region_name
+    #    :state_code
+    #    :state_name
+    #    :state_confidence
+    #    :city_name
+    #    :city_confidence
+    #    :postal_code
+    #    :time_zone
+    #    :area_code
+    #    :longitude
+    #    :latitude
+    #    :dma_id
+    #    :msa_id
+    # 
+    # @api public
+    def info(ip)
+      parse_xml(@resource[ip].get(:params => params_for_ip(ip)).body)
+    end
+    
+    alias_method :[], :info
+    
+    private
+    
+    # Map XML to a meaningful Result
+    # 
+    # @api private
+    def parse_xml(xml)
+      paths = {
+        :ip_address         => "ip_address",
+        :ip_type            => "ip_type",
+        :domain_tld         => "Domain tld",
+        :domain_sld         => "Domain sld",
+        :organization       => "organization",
+        :carrier            => "carrier",
+        :asn                => "asn",
+        :connection_type    => "connection_type",
+        :line_speed         => "line_speed",
+        :ip_routing_type    => "ip_routing_type",
+        :continent_name     => "continent",
+        :country_name       => "country",
+        :country_code       => "country_code",
+        :country_confidence => "country_cf",
+        :region_name        => "region",
+        :state_name         => "state",
+        :state_code         => "state_code",
+        :state_confidence   => "state_cf",
+        :city_name          => "city",
+        :city_confidence    => "city_cf",
+        :postal_code        => "postal_code",
+        :time_zone          => "time_zone",
+        :area_code          => "area_code",
+        :longitude          => "longitude",
+        :latitude           => "latitude",
+        :dma_id             => "dma",
+        :msa_id             => "msa"
+      }
+      
+      doc    = Nokogiri::XML(xml)
+      result = Result.new
+      
+      paths.each_pair do |attr, selector|
+        next unless node = doc.at_css(selector)
+        result[attr] = node.text unless node.text == ""
+      end
+      
+      result
+    end
+    
+    # See http://developer.quova.com/docs#parameters
+    # 
+    # @api private
+    def params_for_ip(ip)
+      { :apikey => @options[:api_key], :sig => signature }
+    end
+    
+    # See http://developer.quova.com/docs#signing_api
+    # 
+    # @api private
+    def signature
+      Digest::MD5.hexdigest(@options[:api_key].to_s + @options[:secret].to_s + Time.now.to_i.to_s)
+    end
+  end
+end

data/lib/quova/result.rb

@@ -0,0 +1,48 @@
+require 'virtus'
+require 'forwardable'
+
+module Quova
+  
+  # Provides the result data from a Quova API call.
+  # Acts both like a Hash and Plain Old Ruby Object.
+  # 
+  # @api private
+  class Result
+    include Virtus
+    extend Forwardable
+    
+    def_delegators :attributes, :each, :each_pair
+    
+    attribute :ip_address,         String
+    attribute :ip_type,            String
+    attribute :anonymizer_status,  String
+    attribute :domain_tld,         String
+    attribute :domain_sld,         String
+    attribute :aol,                Boolean
+    attribute :organization,       String
+    attribute :carrier,            String
+    attribute :asn,                String
+    attribute :connection_type,    String
+    attribute :line_speed,         String
+    attribute :ip_routing_type,    String
+    attribute :continent_name,     String
+    attribute :country_name,       String
+    attribute :country_code,       String
+    attribute :country_confidence, Integer
+    attribute :region_name,        String
+    attribute :state_code,         String
+    attribute :state_name,         String
+    attribute :state_confidence,   Integer
+    attribute :city_name,          String
+    attribute :city_confidence,    Integer
+    attribute :postal_code,        String
+    attribute :time_zone,          String
+    attribute :area_code,          String
+    attribute :longitude,          Float
+    attribute :latitude,           Float
+    attribute :dma_id,             Integer
+    attribute :msa_id,             Integer
+    
+    include Enumerable
+  end
+end

data/lib/quova/version.rb

@@ -1,3 +1,3 @@
 module Quova
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/quova.gemspec

@@ -6,16 +6,16 @@ Gem::Specification.new do |s|
   s.name        = "quova"
   s.version     = Quova::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Flippa.com Pty. Ltd."]
-  s.email       = ["chris@flippa.com"]
-  s.homepage    = "http://flippa.com/"
+  s.authors     = ["Chris Corbyn"]
+  s.email       = ["chris@w3style.co.uk"]
+  s.homepage    = "https://github.com/d11wtq/quova"
   s.summary     = %q{Quova GeoIP Client for Ruby}
   s.description = %q{Provides a high-level client for Quova's On-Demand REST API}
 
   s.rubyforge_project = "quova"
   
   s.add_dependency "rest-client", "~> 1.6.3"
-  s.add_dependency "virtus"
+  s.add_dependency "virtus",      ">= 0.0.5"
   s.add_dependency "nokogiri",    "~> 1.5.0"
   
   s.add_development_dependency "rspec", "~> 2.6"

data/spec/qod_spec.rb

@@ -30,7 +30,7 @@ describe Quova::QOD do
       @resource.should_receive(:[]).with("4.2.2.2") { @resource }
       @resource.should_receive(:get) { @response }
       
-      @qod["4.2.2.2"].should == @qod.info("4.2.2.2")
+      @qod["4.2.2.2"]
     end
     
     it "maps <IPAddress/> to :ip_address" do
@@ -69,7 +69,7 @@ describe Quova::QOD do
       @qod.info("4.2.2.2")[:anonymizer_status].should == "SUSPECT"
     end
     
-    it "maps <Network><Domain><TopLevel/></Domain></Network> to :network_tld" do
+    it "maps <Network><Domain><TopLevel/></Domain></Network> to :domain_tld" do
       @response.stub(:body) do
         <<-XML
         <IpInfo xmlns="https://webservices.quova.com/ipinfo" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
@@ -78,10 +78,10 @@ describe Quova::QOD do
         XML
       end
       
-      @qod.info("4.2.2.2")[:network_tld].should == ".net.au"
+      @qod.info("4.2.2.2")[:domain_tld].should == ".net.au"
     end
     
-    it "maps <Network><Domain><SecondLevel/></Domain></Network> to :network_sld" do
+    it "maps <Network><Domain><SecondLevel/></Domain></Network> to :domain_sld" do
       @response.stub(:body) do
         <<-XML
         <IpInfo xmlns="https://webservices.quova.com/ipinfo" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
@@ -90,7 +90,7 @@ describe Quova::QOD do
         XML
       end
       
-      @qod.info("4.2.2.2")[:network_sld].should == "iinet"
+      @qod.info("4.2.2.2")[:domain_sld].should == "iinet"
     end
     
     it "maps <Network><AOL/></Network> to :aol" do
@@ -105,6 +105,18 @@ describe Quova::QOD do
       @qod.info("4.2.2.2")[:aol].should be(false)
     end
     
+    it "maps <Network><Organization/></Network> to :organization" do
+      @response.stub(:body) do
+        <<-XML
+        <IpInfo xmlns="https://webservices.quova.com/ipinfo" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+          <Network><Organization>iinet limited</Organization></Network>
+        </IpInfo>
+        XML
+      end
+      
+      @qod.info("4.2.2.2")[:organization].should == "iinet limited"
+    end
+    
     it "maps <Network><Carrier/></Network> to :carrier" do
       @response.stub(:body) do
         <<-XML
@@ -129,7 +141,7 @@ describe Quova::QOD do
       @qod.info("4.2.2.2")[:asn].should == "3356"
     end
     
-    it "maps <Network><Connection/></Network> to :connection" do
+    it "maps <Network><Connection/></Network> to :connection_type" do
       @response.stub(:body) do
         <<-XML
         <IpInfo xmlns="https://webservices.quova.com/ipinfo" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
@@ -138,7 +150,7 @@ describe Quova::QOD do
         XML
       end
       
-      @qod.info("4.2.2.2")[:connection].should == "dsl"
+      @qod.info("4.2.2.2")[:connection_type].should == "dsl"
     end
     
     it "maps <Network><LineSpeed/></Network> to :line_speed" do
@@ -153,7 +165,7 @@ describe Quova::QOD do
       @qod.info("4.2.2.2")[:line_speed].should == "medium"
     end
     
-    it "maps <Network><IPRoutingType/></Network> to :routing_type" do
+    it "maps <Network><IPRoutingType/></Network> to :ip_routing_type" do
       @response.stub(:body) do
         <<-XML
         <IpInfo xmlns="https://webservices.quova.com/ipinfo" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
@@ -162,7 +174,7 @@ describe Quova::QOD do
         XML
       end
       
-      @qod.info("4.2.2.2")[:routing_type].should == "fixed"
+      @qod.info("4.2.2.2")[:ip_routing_type].should == "fixed"
     end
     
     it "maps <Location><Continent><Name/></Continent></Location> to :continent_name" do
@@ -214,18 +226,6 @@ describe Quova::QOD do
       @qod.info("4.2.2.2")[:region_name].should == "test"
     end
     
-    it "maps <Location><Region><Confidence/></Region></Location> to :region_confidence" do
-      @response.stub(:body) do
-        <<-XML
-        <IpInfo xmlns="https://webservices.quova.com/ipinfo" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
-          <Location><Region><Confidence>43</Confidence></Region></Location>
-        </IpInfo>
-        XML
-      end
-      
-      @qod.info("4.2.2.2")[:region_confidence].should == 43
-    end
-    
     it "maps <Location><State><Name/></State></Location> to :state_name" do
       @response.stub(:body) do
         <<-XML

data/spec/rest_spec.rb

@@ -0,0 +1,360 @@
+require 'spec_helper'
+
+describe Quova::REST do
+  describe "#initialize" do
+    it "prepares a RestClient with the base URI" do
+      RestClient::Resource.should_receive(:new).with("http://api.quova.com/v1/ipinfo")
+      Quova::REST.new(:api_key => "key", :secret => "secrit")
+    end
+  end
+  
+  describe "#info" do
+    before(:each) do
+      @resource = double()
+      @response = double()
+      @resource.stub(:[])   { @resource }
+      @resource.stub(:get)  { @response }
+      @response.stub(:body) { "" }
+      RestClient::Resource.stub(:new) { @resource }
+      @api = Quova::REST.new(:api_key => "key", :secret => "secrit")
+    end
+    
+    it "queries the API for the given IP" do
+      @resource.should_receive(:[]).with("4.2.2.2") { @resource }
+      @resource.should_receive(:get) { @response }
+      
+      @api.info("4.2.2.2")
+    end
+    
+    it "is aliased by []" do
+      @resource.should_receive(:[]).with("4.2.2.2") { @resource }
+      @resource.should_receive(:get) { @response }
+      
+      @api["4.2.2.2"]
+    end
+    
+    it "maps <ip_address/> to :ip_address" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <ip_address>4.2.2.2</ip_address>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:ip_address].should == "4.2.2.2"
+    end
+    
+    it "maps <ip_type/> to :ip_type" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <ip_type>Mapped</ip_type>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:ip_type].should == "Mapped"
+    end
+    
+    it "maps <Network><Domain><tld/></Domain></Network> to :domain_tld" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Network><Domain><tld>.net.au</tld></Domain></Network>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:domain_tld].should == ".net.au"
+    end
+    
+    it "maps <Network><Domain><sld/></Domain></Network> to :domain_sld" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Network><Domain><sld>iinet</sld></Domain></Network>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:domain_sld].should == "iinet"
+    end
+    
+    it "maps <Network><organization/></Network> to :organization" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Network><organization>iinet limited</organization></Network>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:organization].should == "iinet limited"
+    end
+    
+    it "maps <Network><carrier/></Network> to :carrier" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Network><carrier>iinet limited</carrier></Network>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:carrier].should == "iinet limited"
+    end
+    
+    it "maps <Network><asn/></Network> to :asn" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Network><asn>3356</asn></Network>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:asn].should == "3356"
+    end
+    
+    it "maps <Network><connection_type/></Network> to :connection_type" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Network><connection_type>dsl</connection_type></Network>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:connection_type].should == "dsl"
+    end
+    
+    it "maps <Network><line_speed/></Network> to :line_speed" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Network><line_speed>medium</line_speed></Network>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:line_speed].should == "medium"
+    end
+    
+    it "maps <Network><ip_routing_type/></Network> to :ip_routing_type" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Network><ip_routing_type>fixed</ip_routing_type></Network>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:ip_routing_type].should == "fixed"
+    end
+    
+    it "maps <Location><continent/></Location> to :continent_name" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><continent>oceania</continent></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:continent_name].should == "oceania"
+    end
+    
+    it "maps <Location><CountryData><country_code/></CountryData></Location> to :country_code" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><CountryData><country_code>au</country_code></CountryData></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:country_code].should == "au"
+    end
+    
+    it "maps <Location><CountryData><country/></CountryData></Location> to :country_name" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><CountryData><country>australia</country></CountryData></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:country_name].should == "australia"
+    end
+    
+    it "maps <Location><CountryData><country_cf/></CountryData></Location> to :country_confidence" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><CountryData><country_cf>94</country_cf></CountryData></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:country_confidence].should == 94
+    end
+    
+    it "maps <Location><region/></Location> to :region_name" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><region>test</region></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:region_name].should == "test"
+    end
+    
+    it "maps <Location><StateData><state_code/></StateData></Location> to :state_code" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><StateData><state_code>vic</state_code></StateData></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:state_code].should == "vic"
+    end
+    
+    it "maps <Location><StateData><state/></StateData></Location> to :state_name" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><StateData><state>victoria</state></StateData></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:state_name].should == "victoria"
+    end
+    
+    it "maps <Location><state_cf/></Location> to :state_confidence" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><state_cf>86</state_cf></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:state_confidence].should == 86
+    end
+    
+    it "maps <Location><CityData><city/></CityData></Location> to :city_name" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><CityData><city>melbourne</city></CityData></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:city_name].should == "melbourne"
+    end
+    
+    it "maps <Location><CityData><city_cf/></CityData></Location> to :city_confidence" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><CityData><city_cf>51</city_cf></CityData></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:city_confidence].should == 51
+    end
+    
+    it "maps <Location><CityData><postal_code/></CityData></Location> to :postal_code" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><CityData><postal_code>3000</postal_code></CityData></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:postal_code].should == "3000"
+    end
+    
+    it "maps <Location><CityData><time_zone/></CityData></Location> to :time_zone" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><CityData><time_zone>10</time_zone></CityData></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:time_zone].should == "10"
+    end
+    
+    it "maps <Location><CityData><area_code/></CityData></Location> to :area_code" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><CityData><area_code>03</area_code></CityData></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:area_code].should == "03"
+    end
+    
+    it "maps <Location><longitude/></Location> to :longitude" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><longitude>145.031113</longitude></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:longitude].should == 145.031113
+    end
+    
+    it "maps <Location><latitude/></Location> to :latitude" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><latitude>-37.8808327</latitude></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:latitude].should == -37.8808327
+    end
+    
+    it "maps <Location><dma/></Location> to :dma_id" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><dma>1234</dma></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:dma_id].should == 1234
+    end
+    
+    it "maps <Location><msa/></Location> to :msa_id" do
+      @response.stub(:body) do
+        <<-XML
+        <ipinfo xmlns="http://data.quova.com/1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+          <Location><msa>1234</msa></Location>
+        </ipinfo>
+        XML
+      end
+      
+      @api.info("4.2.2.2")[:msa_id].should == 1234
+    end
+  end
+end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: quova
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
-- Flippa.com Pty. Ltd.
+- Chris Corbyn
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -13,7 +13,7 @@ date: 2011-07-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &14962280 !ruby/object:Gem::Requirement
+  requirement: &16674100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *14962280
+  version_requirements: *16674100
 - !ruby/object:Gem::Dependency
   name: virtus
-  requirement: &14961780 !ruby/object:Gem::Requirement
+  requirement: &16673560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *14961780
+  version_requirements: *16673560
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &14961200 !ruby/object:Gem::Requirement
+  requirement: &16673100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *14961200
+  version_requirements: *16673100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14960620 !ruby/object:Gem::Requirement
+  requirement: &16672640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *14960620
+  version_requirements: *16672640
 description: Provides a high-level client for Quova's On-Demand REST API
 email:
-- chris@flippa.com
+- chris@w3style.co.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -69,11 +69,14 @@ files:
 - Rakefile
 - lib/quova.rb
 - lib/quova/qod.rb
+- lib/quova/rest.rb
+- lib/quova/result.rb
 - lib/quova/version.rb
 - quova.gemspec
 - spec/qod_spec.rb
+- spec/rest_spec.rb
 - spec/spec_helper.rb
-homepage: http://flippa.com/
+homepage: https://github.com/d11wtq/quova
 licenses: []
 post_install_message: 
 rdoc_options: []