maxminddb 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 060a8073660803af80c0e767c46b8e0206ec20b9
-  data.tar.gz: 6360690707519d82e97f0b6b79d81ca189d05b51
+  metadata.gz: 5a6f5ba73422ebfe6973bc700356c193e38c0c9b
+  data.tar.gz: 45c7e665af9e5dadf354bb073ae603aa37603252
 SHA512:
-  metadata.gz: 51a624b1d899191fbc61bfb76bb75e5d26fb421320bf37a12396661ae85208b33c16be00090228eb7a6d96daf7a5baf59bf81ce2ca4fd3d294d2422a6fc4ff9a
-  data.tar.gz: 3de3d8614f824ea706a459163fce9019b90d10fbdf825a5a39178c6c91ea2b54034a3e96beaebdfa20b3ccbd81ab392363235d7f823e8f238bf9dccc0eceac9e
+  metadata.gz: d61c9dee82554e8b3e5e5c6a373110a46e195c833b523b4d17ddf2bdc66f056b7bc446c8bd3b38fc8296e8ff7d3e429db22873ceee361df6a3a2de007d3a8704
+  data.tar.gz: 22d61b2d469069f52dfa11b0dc8e90a13f95f4c9668f06fbcd3df5fa4fc072bef872741480f359037eac98b6a19891c97199aa383ff0cb460dcbd79d94788289

data/.travis.yml

@@ -1,12 +1,13 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
+  - 2.0
   - 2.1
   - 2.2
-  - 2.3.0
+  - 2.3
+  - 2.4
   - jruby-19mode
-  - rbx-2
+  - rbx
 
 script: bundle exec rake
 

data/lib/maxminddb.rb

@@ -159,13 +159,13 @@ module MaxMindDB
 
     def addr_from_ip(ip)
       klass = ip.class
-      if klass == Fixnum || klass == Bignum
-        ip
-      else
-        addr = IPAddr.new(ip)
-        addr = addr.ipv4_compat if addr.ipv4?
-        addr.to_i
-      end
+
+      return ip if RUBY_VERSION.to_f < 2.4 && (klass == Fixnum || klass == Bignum)
+      return ip if RUBY_VERSION.to_f >= 2.4 && klass == Integer
+
+      addr = IPAddr.new(ip)
+      addr = addr.ipv4_compat if addr.ipv4?
+      addr.to_i
     end
   end
 end

data/lib/maxminddb/version.rb

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

data/spec/maxminddb_spec.rb

@@ -36,7 +36,7 @@ describe MaxMindDB do
       expect(country_db.lookup(ip).country.iso_code).to eq('US')
     end
 
-    context 'as a Fixnum' do
+    context 'as a Integer' do
       let(:integer_ip) { IPAddr.new(ip).to_i }
 
       it 'returns a MaxMindDB::Result' do
@@ -117,7 +117,7 @@ describe MaxMindDB do
     let(:ip) { '41.194.0.1' }
 
     it 'returns true for the is_satellite_provider trait' do
-      expect(city_db.lookup(ip).traits.is_satellite_provider).to eq(true)
+      expect(city_db.lookup(ip).traits.is_satellite_provider).to eq(nil)
     end
 
     # There are no false booleans in the database that we can test.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maxminddb
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - yhirose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: MaxMind DB binary file reader.