geolocal 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94b1ea23b169d938aedf7afa726b35f8c59025e7
-  data.tar.gz: 7bde790f3742741c3ea0f94f0640927f93c02b6c
+  metadata.gz: a576db50e71f6e445ffd7159ca299f6301bcbd71
+  data.tar.gz: 548b0a82bc3e3459e7b2eb7e09ff40b898a654c1
 SHA512:
-  metadata.gz: 5c3267bab152d3583da3aeedb7d2ba1467c9d3762061392d972db95974a5297a56f03056d96e7274c2897bd0f98dc7174710a7e67570c90eddfd26ef38131569
-  data.tar.gz: 9427d86aa844125c4259c356801a3ad10716651b0b825306af08e3c3eb289d59fd98bc29e530526b72a0302278aa0a425d2e0b37284762fbfba5ff3183ee0974
+  metadata.gz: e6d417f096f6cb0bf601c4d74bd698a951766cd37bca686af96fcd66c8c43a92d8f48c8b773d436496a24897f73e7de8f7d6a9c2c82aca91ddd4b78306cf9757
+  data.tar.gz: eb79ad467e23ecf5e5d47e262e6ae7a0577b96e261971175bf9a1714f155ad9b53f61d46224546ba73b418ccabfd8a1ad97dd56a90fb606f2ec3444bb1ee23d8

data/lib/geolocal/provider/base.rb

@@ -16,37 +16,38 @@ module Geolocal
         download_files
       end
 
+      def add_to_results results, name, lostr, histr
+        loaddr = IPAddr.new(lostr)
+        hiaddr = IPAddr.new(histr)
+        lofam = loaddr.family
+        hifam = hiaddr.family
+        raise "#{lostr} is family #{lofam} but #{histr} is #{hifam}" if lofam != hifam
+
+        if lofam == Socket::AF_INET
+          namefam = name + 'v4' if config[:ipv4]
+        elsif lofam == Socket::AF_INET6
+          namefam = name + 'v6' if config[:ipv6]
+        else
+          raise "unknown family #{lofam} for #{lostr}"
+        end
+
+        if namefam
+          results[namefam] << "#{loaddr.to_i}..#{hiaddr.to_i},\n"
+        end
+      end
+
       def update
         countries = config[:countries].reduce({}) { |a, (k, v)|
           a.merge! k.to_s.upcase => Array(v).map(&:upcase).to_set
         }
 
-        ipv4 = Socket::AF_INET  if config[:ipv4]
-        ipv6 = Socket::AF_INET6 if config[:ipv6]
-
         results = countries.keys.reduce({}) { |a, k|
-          a.merge! k.upcase+'v4' => '' if ipv4
-          a.merge! k.upcase+'v6' => '' if ipv6
+          a.merge! k.upcase+'v4' => '' if config[:ipv4]
+          a.merge! k.upcase+'v6' => '' if config[:ipv6]
           a
         }
 
-        read_ranges(countries) do |name,lostr,histr|
-          loaddr = IPAddr.new(lostr)
-          hiaddr = IPAddr.new(histr)
-          lofam = loaddr.family
-          hifam = hiaddr.family
-          raise "#{lostr} is family #{lofam} but #{histr} is #{hifam}" if lofam != hifam
-
-          if lofam == ipv4
-            namefam = name+'v4'
-          elsif lofam == ipv6
-            namefam = name+'v6'
-          else
-            raise "unknown family #{lofam} for #{lostr}"
-          end
-
-          results[namefam] << "#{loaddr.to_i}..#{hiaddr.to_i},\n"
-        end
+        read_ranges(countries) { |*args| add_to_results(results, *args) }
 
         File.open(config[:file], 'w') do |file|
           output(file, results)

data/lib/geolocal/version.rb

@@ -1,3 +1,3 @@
 module Geolocal
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/provider/db_ip_spec.rb

@@ -55,7 +55,7 @@ describe Geolocal::Provider::DB_IP do
 
 
   describe 'generating' do
-    let(:example_output) {
+    let(:example_header) {
       <<EOL
 # This file is autogenerated by the Geolocal gem
 
@@ -74,6 +74,30 @@ module Geolocal
     true if mod.bsearch { |range| num > range.max ? 1 : num < range.min ? -1 : 0 }
   end
 
+EOL
+    }
+
+    def run_test example_body
+      outfile = 'tmp/geolocal.rb'
+      if File.exist?(outfile)
+        File.delete(outfile)
+      end
+
+      Geolocal.configure do |config|
+        config.tmpdir = 'spec/data'
+        config.file = outfile
+        config.countries = { us: 'US', au: 'AU' }
+        yield config
+      end
+
+      provider.update
+      expect(File.read outfile).to eq example_header + example_body
+      File.delete(outfile)
+    end
+
+
+    it 'can generate countries from a csv' do
+      example_output = <<EOL
   def self.in_us? address, family=nil
     search address, family, USv4, USv6
   end
@@ -89,6 +113,7 @@ Geolocal::USv4 = [
 ]
 
 Geolocal::USv6 = [
+55854460156896106951106838613354086400..55854460790721407065221539361705689087,
 ]
 
 Geolocal::AUv4 = [
@@ -96,25 +121,69 @@ Geolocal::AUv4 = [
 ]
 
 Geolocal::AUv6 = [
+55832834671488781931518904937387917312..55832834671488781949965649011097468927,
 ]
 
 EOL
-    }
 
-    it 'can generate countries from a csv' do
-      outfile = 'tmp/geolocal.rb'
-      if File.exist?(outfile)
-        File.delete(outfile)
+      run_test example_output do |config|
+        # no need to change config
       end
+    end
 
-      Geolocal.configure do |config|
-        config.tmpdir = 'spec/data'
-        config.file = outfile
-        config.countries = { us: 'US', au: 'AU' }
+    it 'can generate countries from a csv when ipv6 is turned off' do
+      example_output = <<EOL
+  def self.in_us? address, family=nil
+    search address, family, USv4, nil
+  end
+
+  def self.in_au? address, family=nil
+    search address, family, AUv4, nil
+  end
+
+end
+
+Geolocal::USv4 = [
+0..16777215,
+]
+
+Geolocal::AUv4 = [
+16777216..16777471,
+]
+
+EOL
+
+      run_test example_output do |config|
+        config.ipv6 = false
+      end
+    end
+
+
+    it 'can generate countries from a csv when ipv4 is turned off' do
+      example_output = <<EOL
+  def self.in_us? address, family=nil
+    search address, family, nil, USv6
+  end
+
+  def self.in_au? address, family=nil
+    search address, family, nil, AUv6
+  end
+
+end
+
+Geolocal::USv6 = [
+55854460156896106951106838613354086400..55854460790721407065221539361705689087,
+]
+
+Geolocal::AUv6 = [
+55832834671488781931518904937387917312..55832834671488781949965649011097468927,
+]
+
+EOL
+
+      run_test example_output do |config|
+        config.ipv4 = false
       end
-      provider.update
-      expect(File.read outfile).to eq example_output
-      File.delete(outfile)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geolocal
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Scott Bronson