maxminddb 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8637e3f4ecc8e4f58d5c8af760d7e2a2ead66a03
-  data.tar.gz: ef77114d3b291de887419089610ae7dcba866661
+  metadata.gz: 060a8073660803af80c0e767c46b8e0206ec20b9
+  data.tar.gz: 6360690707519d82e97f0b6b79d81ca189d05b51
 SHA512:
-  metadata.gz: b05b703f559465f178bcfa6d5ad37a6a5a2a166cfbfcebb79380e95d52f974a9793fa4957a3c238780823816b15d45ab46b548de6c97904df9b9f220ba0a771f
-  data.tar.gz: 505663ceb677df3deb1702f8984ac01c35b17a25c6f42eda0dcdde4eb3c4254f14ba1a1ec8d61681bba0cf7328bbad58ef86712879044d8106ec671e70bbb24f
+  metadata.gz: 51a624b1d899191fbc61bfb76bb75e5d26fb421320bf37a12396661ae85208b33c16be00090228eb7a6d96daf7a5baf59bf81ce2ca4fd3d294d2422a6fc4ff9a
+  data.tar.gz: 3de3d8614f824ea706a459163fce9019b90d10fbdf825a5a39178c6c91ea2b54034a3e96beaebdfa20b3ccbd81ab392363235d7f823e8f238bf9dccc0eceac9e

data/lib/maxminddb.rb

@@ -23,6 +23,7 @@ module MaxMindDB
       pos += METADATA_BEGIN_MARKER.size
       metadata = decode(pos, 0)[1]
 
+      @ip_version = metadata['ip_version']
       @node_count = metadata['node_count']
       @node_byte_size = metadata['record_size'] * 2 / 8
       @search_tree_size = @node_count * @node_byte_size
@@ -35,7 +36,8 @@ module MaxMindDB
     def lookup(ip)
       node_no = 0
       addr = addr_from_ip(ip)
-      for i in 0 ... 128
+      start_idx = @ip_version == 4 ? 96 : 0
+      for i in start_idx ... 128
         flag = (addr >> (127 - i)) & 1
         next_node_no = read_record(node_no, flag)
         if next_node_no == 0

data/lib/maxminddb/version.rb

@@ -1,3 +1,3 @@
 module MaxMindDB
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/spec/maxminddb_spec.rb

@@ -3,6 +3,7 @@ require 'maxminddb'
 describe MaxMindDB do
   let(:city_db) { MaxMindDB.new('spec/cache/GeoLite2-City.mmdb') }
   let(:country_db) { MaxMindDB.new('spec/cache/GeoLite2-Country.mmdb') }
+  let(:rec32_db) { MaxMindDB.new('spec/data/32bit_record_data.mmdb') }
 
   context 'for the ip 74.125.225.224' do
     let(:ip) { '74.125.225.224' }
@@ -84,6 +85,14 @@ describe MaxMindDB do
     end
   end
 
+  context 'for 32bit record data' do
+    let(:ip) { '1.0.16.1' }
+
+    it 'finds data' do
+      expect(rec32_db.lookup(ip)).to be_found
+    end
+  end
+
   context 'test ips' do
     [
       ['185.23.124.1', 'SA'],

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: maxminddb
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - yhirose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Pure Ruby MaxMind DB (GeoIP2) binary file reader.
@@ -73,9 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -89,6 +89,7 @@ files:
 - lib/maxminddb/version.rb
 - maxminddb.gemspec
 - spec/cache/.gitkeep
+- spec/data/32bit_record_data.mmdb
 - spec/maxminddb/result/location_spec.rb
 - spec/maxminddb/result/named_location_spec.rb
 - spec/maxminddb/result/postal_spec.rb
@@ -105,22 +106,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: MaxMind DB binary file reader.
 test_files:
 - spec/cache/.gitkeep
+- spec/data/32bit_record_data.mmdb
 - spec/maxminddb/result/location_spec.rb
 - spec/maxminddb/result/named_location_spec.rb
 - spec/maxminddb/result/postal_spec.rb