maxminddb 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de3d917a3dc6c98952db3093c0b757f0118e214f
-  data.tar.gz: 825e4a603556972cb5455530b8961bdf55a3d9fe
+  metadata.gz: 640d5200605128fcd33cb0e4c5ce00239f2c89e0
+  data.tar.gz: cb17775a082a4e53a6035821fe66a506b1d19720
 SHA512:
-  metadata.gz: aa879149d7c2a6ed871bcf35a460b02267147a00a64f1c9c3facc5f8b1876aedeccb5cb1ab186e20c220906a051678736c1a5c429048b49fe907c4dfb07f8666
-  data.tar.gz: 3a7b04887875dad51eda9a3f1e670df59de0fe6d55a1bb823011214a4e098e7225c84726068e785dbb208e3defcff911418463de0f93cc3901844f3be5e331f2
+  metadata.gz: 3c1c713de0019cf7aaa1cb9c5421e0ae014ee3b7b2a411f87da91122288fd4ef765377463dd564c363df0b1e13a3b79777f1861d63416f2505afa1f7622905d4
+  data.tar.gz: 5211dd0f86395311a9ff137e0315ac95a5c169272551013215e2d5dcf9b1a3f308bb55937170ae92876c3d479071d2dcd0fb3c67ba71ccbae9f258e1e658f3a2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 0.1.17 (June 9, 2018)
+
+- Allow the database file reader to be overridden.
+- increase coverage for IPv6 and EU tests
+
 ### 0.1.16 (May 22, 2018)
 
 - Adds is_in_european_union feature

data/README.md

@@ -66,6 +66,10 @@ db.metadata # => {"binary_format_major_version"=>2, "binary_format_minor_version
 
 A MaxMindDB instance doesn't do any write operation after it is created. So we can consider it as an immutable object which is 'thread-safe'.
 
+### JSON web server on Docker
+
+maxminddb-docker: https://github.com/samnissen/maxminddb-docker
+
 ## Contributing
 
 1. Fork it ( http://github.com/yhirose/maxminddb/fork )

data/lib/maxminddb.rb

@@ -4,8 +4,10 @@ require 'ipaddr'
 
 module MaxMindDB
 
-  def self.new(path)
-    Client.new(path)
+  DEFAULT_FILE_READER = proc { |path| File.binread(path) }
+
+  def self.new(path, file_reader=DEFAULT_FILE_READER)
+    Client.new(path, file_reader)
   end
 
   class Client
@@ -16,9 +18,9 @@ module MaxMindDB
 
     attr_reader :metadata
 
-    def initialize(path)
+    def initialize(path, file_reader)
       @path = path
-      @data = File.binread(path)
+      @data = file_reader.call(path)
 
       pos = @data.rindex(METADATA_BEGIN_MARKER)
       raise 'invalid file format' unless pos

data/lib/maxminddb/version.rb

@@ -1,3 +1,3 @@
 module MaxMindDB
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

data/spec/maxminddb_spec.rb

@@ -64,7 +64,7 @@ describe MaxMindDB do
       expect(city_db.lookup(ip)).to be_found
     end
 
-    it 'returns false for the is_in_european_union' do
+    it 'returns true for the is_in_european_union' do
       expect(country_db.lookup(ip).country.is_in_european_union).to eq(true)
     end
 
@@ -81,6 +81,37 @@ describe MaxMindDB do
     end
   end
 
+  context 'for a Canadian ipv6' do
+    let(:ip) { '2607:5300:60:72ba::' }
+    it 'finds data' do
+      expect(city_db.lookup(ip)).to be_found
+    end
+
+    it 'returns true for the is_in_european_union' do
+      expect(country_db.lookup(ip).country.is_in_european_union).to be_falsey
+    end
+
+    it 'returns CA as the country iso code' do
+      expect(country_db.lookup(ip).country.iso_code).to eq('CA')
+    end
+  end
+
+  context 'for a German IPv6' do
+    let(:ip) { '2a01:488:66:1000:2ea3:495e::1' }
+
+    it 'finds data' do
+      expect(city_db.lookup(ip)).to be_found
+    end
+
+    it 'returns false for the is_in_european_union' do
+      expect(country_db.lookup(ip).country.is_in_european_union).to eq(true)
+    end
+
+    it 'returns DE as the country iso code' do
+      expect(country_db.lookup(ip).country.iso_code).to eq('DE')
+    end
+  end
+
   context 'for the ip 127.0.0.1' do
     let(:ip) { '127.0.0.1' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maxminddb
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - yhirose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler