maxminddb 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab8d608c0e8a6e577bdf66c0d2523c33f8d61154
-  data.tar.gz: 7e2ab98277eef7c50c62e8878082ac404aade464
+  metadata.gz: ad81ea42768258609cdb8ed8212a4da3efd4bd4d
+  data.tar.gz: d7534f7038833a068b1ecf491a0792a382151824
 SHA512:
-  metadata.gz: 3c002cc49899ffa54ee320eb2c867e7b88d50e343da99a88217b5a7f0251863c1be4c8fc98c70c2038efd6362df78db1b8c2ff7ce77782d3d14fee561d2bdd75
-  data.tar.gz: a4888c65e1bf9bc8381f16c837f3b86cbd12f9dbf62eb840767ece6e8c18b2180cddff71c14b0630a49357635404176bf5dd9417a960c1bb6b01212c48db781d
+  metadata.gz: 99b03d59e8e3d46ef07652fcf6e07d2dd492492a7ee96f7e3feb5ded31b71055932b8112550dd3e3079dccda4f561c015edd9158886318e36331180aa5b19e0f
+  data.tar.gz: 718b0f9e14b4c38da3c43c0db7ebed587f8e6f83ac8b1c8c57c3c5175d6ba5591782ad0b47579fe7d5845f21f39ffd21a8a17116fc7861ce8a2a4a51da186764

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 0.1.22 (September 15, 2018)
+
+- Result includes 'network'
+
 ### 0.1.21 (July 20, 2018)
 
 - Make the low-memory file reader opt-in

data/README.md

@@ -101,3 +101,7 @@ The `LowMemoryReader` will not load the entire database into memory. It's import
 3.  Commit your changes (`git commit -am 'Add some feature'`)
 4.  Push to the branch (`git push origin my-new-feature`)
 5.  Create new Pull Request
+
+## Also see
+
+* [GeoLite2City](https://github.com/barsoom/geolite2_city), a Gem bundling the GeoLite2 City database.

data/lib/maxminddb.rb

@@ -63,7 +63,9 @@ module MaxMindDB
         elsif next_node_no >= @node_count
           data_section_start = @search_tree_size + DATA_SECTION_SEPARATOR_SIZE
           pos = (next_node_no - @node_count) - DATA_SECTION_SEPARATOR_SIZE
-          return MaxMindDB::Result.new(decode(pos, data_section_start)[1])
+          result            = decode(pos, data_section_start)[1]
+          result['network'] = network_from_addr(addr, i) unless result.empty?
+          return MaxMindDB::Result.new(result)
         else
           node_no = next_node_no
         end
@@ -185,6 +187,16 @@ module MaxMindDB
       addr = addr.ipv4_compat if addr.ipv4?
       addr.to_i
     end
+    
+    def network_from_addr(addr, i)
+      fam  = addr > 4294967295 ? Socket::AF_INET6 : Socket::AF_INET
+      ip   = IPAddr.new(addr, family = fam)
+      
+      subnet_size = ip.ipv4? ? i - 96 + 1 : i + 1
+      subnet      = IPAddr.new("#{ip}/#{subnet_size}")
+      
+      "#{subnet}/#{subnet_size}"
+    end
 
     def is_local?(ip_or_hostname)
       ["127.0.0.1", "localhost", "::1", "0000::1", "0:0:0:0:0:0:0:1"].include? ip_or_hostname

data/lib/maxminddb/result.rb

@@ -57,6 +57,10 @@ module MaxMindDB
     def connection_type
       @_connection_type ||= raw['connection_type']
     end
+    
+    def network
+      @_network ||= raw['network']
+    end
 
     def to_hash
       @_to_hash ||= raw.clone

data/lib/maxminddb/version.rb

@@ -1,3 +1,3 @@
 module MaxMindDB
-  VERSION = "0.1.21"
+  VERSION = "0.1.22"
 end

data/maxminddb.gemspec

@@ -13,8 +13,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/yhirose/maxminddb"
   spec.license       = "MIT"
 
-  spec.post_install_message = "MIT"
-
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

data/spec/maxminddb_spec.rb

@@ -46,6 +46,10 @@ describe MaxMindDB do
         it 'returns US as the country iso code' do
           expect(country_db.lookup(ip).country.iso_code).to eq('US')
         end
+        
+        it 'returns 74.125.192.0/18 as network' do 
+          expect(country_db.lookup(ip).network).to eq('74.125.192.0/18')
+        end
 
         context 'as a Integer' do
           let(:integer_ip) { IPAddr.new(ip).to_i }
@@ -78,6 +82,10 @@ describe MaxMindDB do
         it 'returns FI as the country iso code' do
           expect(country_db.lookup(ip).country.iso_code).to eq('FI')
         end
+        
+        it 'returns 2001:708::/32 as network' do 
+          expect(country_db.lookup(ip).network).to eq('2001:708::/32')
+        end
 
         context 'as an integer' do
           let(:integer_ip) { IPAddr.new(ip).to_i }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maxminddb
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - yhirose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-21 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,7 @@ homepage: https://github.com/yhirose/maxminddb
 licenses:
 - MIT
 metadata: {}
-post_install_message: MIT
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib