arin-whois 1.1.0 → 1.2.0

data/Gemfile

@@ -3,8 +3,8 @@ gem 'rest-client'
 gem 'hashie'
 
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
+  gem "rspec", "~> 2.8.0"
+  gem "bundler"
   gem "jeweler", "~> 1.6.0"
   gem "simplecov", ">= 0"
 end

data/Gemfile.lock

@@ -13,14 +13,14 @@ GEM
     rake (0.9.2.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.8.0)
     simplecov (0.6.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
@@ -30,9 +30,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler
   hashie
   jeweler (~> 1.6.0)
   rest-client
-  rspec (~> 2.3.0)
+  rspec (~> 2.8.0)
   simplecov

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/arin-whois.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "arin-whois"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian Morgan"]
-  s.date = "2012-04-10"
+  s.date = "2012-07-25"
   s.description = "Ruby wrapper for ARIN's REST interface to whois/POC data"
   s.email = "ian@ruby-code.com"
   s.extra_rdoc_files = [
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/seeingidog/arin-whois"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "Ruby wrapper for ARIN's REST interface to whois/POC data"
 
   if s.respond_to? :specification_version then
@@ -42,23 +42,23 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
       s.add_runtime_dependency(%q<hashie>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<hashie>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
     s.add_dependency(%q<rest-client>, [">= 0"])
     s.add_dependency(%q<hashie>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
   end

data/lib/arin-whois.rb

@@ -8,51 +8,59 @@ module ARIN
       RestClient::Resource.new 'http://whois.arin.net/rest'
     end
     
+    def self.get_resource(rootel, query)
+      begin
+        resource["#{rootel}/#{query}.json"].get
+      rescue RestClient::ResourceNotFound
+        raise RecordNotFound
+      end
+    end
+    
     def self.parse_and_objectify(rootel, query)
-      Hashie::Mash.new(JSON.parse(resource["#{rootel}/#{query}.json"].get)[rootel])
+      Hashie::Mash.new(JSON.parse(get_resource(rootel, query))[rootel])
+    end
+    
+    def self.root_element(classname)
+      classname.split('::').last.downcase
     end
   end
   
+  class RecordNotFound < StandardError
+  end
+  
   class POC < Base
-    
     def self.find(query)    
-      rootel = 'poc'
-      parse_and_objectify(rootel, query)
+      parse_and_objectify(root_element(self.name), query)
     end
   end
 
   class Org < Base
     def self.find(query)  
-      rootel = 'org'
-      parse_and_objectify(rootel, query)
+      parse_and_objectify(root_element(self.name), query)
     end
   end
 
   class Net < Base
     def self.find(query)  
-      rootel = 'net'
-      parse_and_objectify(rootel, query)
+      parse_and_objectify(root_element(self.name), query)
     end
   end
 
   class ASN < Base
     def self.find(query)
-      rootel = 'asn'
-      parse_and_objectify(rootel, query)
+      parse_and_objectify(root_element(self.name), query)
     end
   end
 
   class Customer < Base
     def self.find(query) 
-      rootel = 'customer'
-      parse_and_objectify(rootel, query)
+      parse_and_objectify(root_element(self.name), query)
     end
   end
 
   class Rdns < Base
     def self.find(query) 
-      rootel = 'rdns'
-      parse_and_objectify(rootel, query)
+      parse_and_objectify(root_element(self.name), query)
     end
   end
 end

data/spec/arin-whois_spec.rb

@@ -4,4 +4,12 @@ describe "ArinWhois" do
   it "should query ARIN for an AS number result" do
     ARIN::ASN.find(32244).name.values.first.should == "LIQUID-WEB-INC"
   end
+  
+  it "should query for org records" do
+    ARIN::Org.find("LQWB").name.values.first.should == "Liquid Web, Inc."
+  end
+  
+  it "should return a not found error for a 404" do
+    lambda {ARIN::Org.find("LQWBZZZ")}.should raise_error ARIN::RecordNotFound
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arin-whois
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000Z
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2161783680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161783680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2161782740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,32 +37,47 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161782740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161781560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2161781560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2161780740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161780740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2161779680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *2161779680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2161778020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161778020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby wrapper for ARIN's REST interface to whois/POC data
 email: ian@ruby-code.com
 executables: []
@@ -112,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4322084907860887839
+      hash: -4094311308806368107
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for ARIN's REST interface to whois/POC data