grs-search 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a4de9986aecb5baab9c00a9c50c585e9631271c
-  data.tar.gz: 24c38ebc5aaac85d18eecc058bc6ea6ce0f428ff
+  metadata.gz: d0493d89a4af2f4c4e227b55728f6eeab1c54784
+  data.tar.gz: 83f87e4ce30f5e80f031247a95bc355e74cffd8f
 SHA512:
-  metadata.gz: 4c6503cca673e497f56b2fa82d66a54da8bff2aec64d391b6f402ba70a3d8a0495cb028335aa2962eb226c55bdf7abf9338c662319c60bf69c31ae0c00f328f3
-  data.tar.gz: 1a01604738eb772c9c3ec4429ee75da644517e9eaf76281c7d28ea586bf0ec28d2f68c1796ed01774f29da701f2d763b973ba8906121d7c135e69b7d0f8aa37e
+  metadata.gz: 730f1aecc25ae3cd8747f6c60ef94411accd2c20dda8190a0afb4ae3521554365b120a6d03cce442eaf2a4d4e9449e752fb95be76383b362df943f61951a151c
+  data.tar.gz: 6f948acfb31aa77496b153128104259ff7e2980e9a1ed4b4152a88e19f8abb9e55575e225f00c3f744b94668d5cca917e601deb76699fdd7f20169705a31417c

data/VERSION

@@ -1 +1 @@
-1.0.0
+2.0.0

data/grs-search.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: grs-search 1.0.0 ruby lib
+# stub: grs-search 2.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "grs-search"
-  s.version = "1.0.0"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Tobias Begalke"]
-  s.date = "2015-01-27"
+  s.date = "2016-04-12"
   s.description = "This Ruby library looks up GRS data via the Ripe API (http://rest.db.ripe.net)"
   s.email = "tob@spyz.org"
   s.extra_rdoc_files = [
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/elcamino/grs-search"
   s.licenses = ["BSD"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.6"
   s.summary = "Look up GRS data via the RIPE API"
 
   if s.respond_to? :specification_version then

data/lib/grs-search/response.rb

@@ -7,58 +7,66 @@ class GRSSearch
            
     
     def initialize(json_data)
-      json_data['objects']['object'].find_all { |data| data['type'] == 'inetnum' }.each do |i|
+      json_data['objects']['object'].find_all { |data| data['type'] =~ /inet6?num/ }.each do |i|
         @source ||= i['source']['id']
         
         # IP address range
         #
-        if item = i['attributes']['attribute'].detect { |a| a['name'] == 'inetnum' }
+        if item = i['attributes']['attribute'].detect { |a| a['name'] =~ /inet6?num/ }
           _ip_from, _ip_to = item['value'].split(/\s+-\s+/).map { |ip| ip.strip }
-          @ip_from ||= IPAddr.new _ip_from
-          @ip_to ||= IPAddr.new _ip_to
+          
+          if ! _ip_to
+            _ipaddr = IPAddr.new item['value'].strip
+            _range = _ipaddr.to_range
+            @ip_from = _range.first
+            @ip_to   = _range.last
+          else
+            @ip_from ||= IPAddr.new _ip_from
+            @ip_to ||= IPAddr.new _ip_to
+          end
         end
-
+        
         # net name
         #
         if item = i['attributes']['attribute'].detect { |a| a['name'] == 'netname' }
           @name ||= item['value']
         end
-
+        
         # net description
         #
         if item = i['attributes']['attribute'].detect { |a| a['name'] == 'descr' }
           @description ||= item['value']
         end
-
+        
         # country
         #
         if item = i['attributes']['attribute'].detect { |a| a['name'] == 'country' }
           @country ||= item['value']
         end
-
+        
         # status
         #
         if item = i['attributes']['attribute'].detect { |a| a['name'] == 'status' }
           @status ||= item['value']
         end
-
+        
         # organization
         #
         if item = i['attributes']['attribute'].detect { |a| a['name'] == 'org' }
           @org ||= item['value']
         end
-
+        
       end
-
+      
       json_data['objects']['object'].find_all { |data| data['type'] == 'route' }.each do |i|
-
+        
         # network CIDR notation
         #
         if item = i['attributes']['attribute'].detect { |a| a['name'] == 'route' }
           @cidr = item['value']
         end
       end
-
+      
       def inspect
         "GRSSearch::Response\##{self.object_id} - source:#{source} ip_from:#{ip_from} ip_to:#{ip_to} name:#{name} description:#{description} country:#{country} status:#{status} cidr:#{cidr} org:#{org}"
       end

data/spec/grs-search_spec.rb

@@ -4,6 +4,7 @@ describe GRSSearch do
   let(:res_afrinic) { GRSSearch.lookup('41.206.1.10') }
   let(:res_google) { GRSSearch.lookup('66.249.64.0') }
   let(:res_kabel) { GRSSearch.lookup('178.27.236.214') }
+	let(:res_ipv6) { GRSSearch.lookup('2804:14c:8793:89b5:add7:e834:9d29:5f75') }
 
   it "is able to fetch data from the API endpoint" do
     expect(res_google.class).to eq GRSSearch::Response
@@ -15,7 +16,7 @@ describe GRSSearch do
     expect(res_google.org).to eq 'GOGL'
     expect(res_google.name).to eq 'GOOGLE'
     expect(res_google.description).not_to be
-    expect(res_google.status).to eq 'allocation'
+    expect(res_google.status.downcase).to eq 'allocation'
     expect(res_google.country).not_to be
     expect(res_google.cidr).to eq '66.249.64.0/24'
 
@@ -43,5 +44,17 @@ describe GRSSearch do
     expect(res_kabel.country).to eq 'DE'
     expect(res_kabel.cidr).to eq '178.27.128.0/17'
 
+
+    expect(res_ipv6.class).to eq GRSSearch::Response
+    expect(res_ipv6.source).to eq 'lacnic-grs'
+    expect(res_ipv6.ip_from.to_s).to eq "2804:14c::"
+    expect(res_ipv6.ip_to.to_s).to eq "2804:14d:ffff:ffff:ffff:ffff:ffff:ffff"
+    expect(res_ipv6.ip_from.to_i).to eq 53189915322580728962426485453122174976
+    expect(res_ipv6.ip_to.to_i).to eq 53189915481037053990955160640210075647
+    expect(res_ipv6.org).not_to be
+    expect(res_ipv6.name).not_to be
+    expect(res_ipv6.status).to eq 'ALLOCATED'
+    expect(res_ipv6.country).to eq 'BR'
+    expect(res_ipv6.cidr).to eq 'CLATO S.A.'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grs-search
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tobias Begalke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Look up GRS data via the RIPE API