maxminddb 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19d1e58b79d3beb9ed5bd74ffdf5da41d62f5be4
-  data.tar.gz: d8e3f6acbc575111367caf90d73c0d3549061084
+  metadata.gz: 2950442ee2ba4359f1b315e930bdd1b657d27b90
+  data.tar.gz: c0a2768251d072966bb978fd7590864ebc2d2e68
 SHA512:
-  metadata.gz: 46d7fa5b3bd159eeae83360bff4dfe86ebfdbb1da2de64690d0a47a019437f6aee2464af7b6d4a88a11f79ed1253d1b3a0038ea9a4102ca242d31b5e3682f5fb
-  data.tar.gz: '028ee475caa88471dcd6bdbf35e7e66b75c6ae179e209d030d90c788c02413f41cf9900e89b4252500e070270e4a9531b8a945cfb7f80a25c27ee28c3f363cc9'
+  metadata.gz: '09488fd2b9863ea77ff054b500b218211187b2fa91e15307c7d126396a12b23be89c4932b92e92e6f5a57aca6e5a73da71c816e4d01c8632f65ca2d2634e0f85'
+  data.tar.gz: f8f60d819f9b81938a963cf0464462fcff067510db5ae6799b82531b60447d8812c7f3d353e4a7bcae596733faa5e9f9647af6c374d1b1558331b8aa40b2368e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 0.1.15 (December 18, 2017)
+
+- Implement #most_specific method for result subdivisions #31
+
 ### 0.1.14 (July 26, 2017)
 
 - Expose accuracy_radius in Location data #29

data/lib/maxminddb/result.rb

@@ -1,6 +1,7 @@
 require_relative 'result/location'
 require_relative 'result/named_location'
 require_relative 'result/postal'
+require_relative 'result/subdivisions'
 require_relative 'result/traits'
 
 module MaxMindDB
@@ -46,7 +47,7 @@ module MaxMindDB
     end
 
     def subdivisions
-      @_subdivisions ||= Array(raw['subdivisions']).map { |hash| NamedLocation.new(hash) }
+      @_subdivisions ||= Subdivisions.new(raw['subdivisions'])
     end
 
     def traits

data/lib/maxminddb/result/location.rb

@@ -20,7 +20,7 @@ module MaxMindDB
       def time_zone
         raw['time_zone']
       end
-      
+
       def accuracy_radius
         raw['accuracy_radius']
       end

data/lib/maxminddb/result/subdivisions.rb

@@ -0,0 +1,17 @@
+module MaxMindDB
+  class Result
+    class Subdivisions < Array
+      def initialize(raw)
+        super((raw || []).map { |hash| NamedLocation.new(hash) })
+      end
+
+      def most_specific
+        last || NamedLocation.new({})
+      end
+
+      def inspect
+        "#<MaxMindDB::Result::Subdivisions: #{super}>"
+      end
+    end
+  end
+end

data/lib/maxminddb/version.rb

@@ -1,3 +1,3 @@
 module MaxMindDB
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/spec/maxminddb/result/subdivisions_spec.rb

@@ -0,0 +1,65 @@
+# -*- encoding: utf-8 -*-
+require 'maxminddb'
+
+describe MaxMindDB::Result::Subdivisions do
+  subject(:subdivisions) { described_class.new(raw_subdivisions) }
+
+  context "with multiple subdivisions" do
+    let(:raw_subdivisions) { [{
+      "geoname_id"=>5037779,
+      "iso_code"=>"MN",
+      "names"=>{"en"=>"Minnesota"}
+    }, {
+      "geoname_id"=>123,
+      "iso_code"=>"HP",
+      "names"=>{"en"=>"Hennepin"}
+    }] }
+
+    it 'should be a kind of Array' do
+      expect(subdivisions).to be_kind_of(Array)
+    end
+
+    it 'should return as many items as there are subdivisions passed in' do
+      expect(subdivisions.length).to eq(raw_subdivisions.length)
+    end
+
+    it 'should contain only MaxMindDB::Result::NamedLocation' do
+      expect(subdivisions.all? { |r| r.kind_of?(MaxMindDB::Result::NamedLocation)}).to be_truthy
+    end
+
+    describe "most_specific" do
+      it 'should be a kind of MaxMindDB::Result::NamedLocation' do
+        expect(subdivisions.most_specific).to be_kind_of(MaxMindDB::Result::NamedLocation)
+      end
+
+      it 'should eq "Hennepin" subdivision' do
+        expect(subdivisions.most_specific.name).to eq("Hennepin")
+      end
+    end
+  end
+
+  context "without a result" do
+    let(:raw_subdivisions) { nil }
+
+    it 'should be a kind of Array' do
+      expect(subdivisions).to be_kind_of(Array)
+    end
+
+    it 'should be empty' do
+      expect(subdivisions.length).to eq(0)
+    end
+
+    describe "most_specific" do
+      it 'should be a kind of MaxMindDB::Result::NamedLocation' do
+        expect(subdivisions.most_specific).to be_kind_of(MaxMindDB::Result::NamedLocation)
+      end
+
+      it 'should be an empty MaxMindDB::Result::NamedLocation' do
+        expect(subdivisions.most_specific.code).to eq(nil)
+        expect(subdivisions.most_specific.geoname_id).to eq(nil)
+        expect(subdivisions.most_specific.iso_code).to eq(nil)
+        expect(subdivisions.most_specific.name).to eq(nil)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maxminddb
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - yhirose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,7 @@ files:
 - lib/maxminddb/result/location.rb
 - lib/maxminddb/result/named_location.rb
 - lib/maxminddb/result/postal.rb
+- lib/maxminddb/result/subdivisions.rb
 - lib/maxminddb/result/traits.rb
 - lib/maxminddb/version.rb
 - maxminddb.gemspec
@@ -94,6 +95,7 @@ files:
 - spec/maxminddb/result/location_spec.rb
 - spec/maxminddb/result/named_location_spec.rb
 - spec/maxminddb/result/postal_spec.rb
+- spec/maxminddb/result/subdivisions_spec.rb
 - spec/maxminddb/result/trait_spec.rb
 - spec/maxminddb/result_spec.rb
 - spec/maxminddb_spec.rb
@@ -127,6 +129,7 @@ test_files:
 - spec/maxminddb/result/location_spec.rb
 - spec/maxminddb/result/named_location_spec.rb
 - spec/maxminddb/result/postal_spec.rb
+- spec/maxminddb/result/subdivisions_spec.rb
 - spec/maxminddb/result/trait_spec.rb
 - spec/maxminddb/result_spec.rb
 - spec/maxminddb_spec.rb