geoip 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3520d7b15c106de43cc9c269bcec4cb371016f9
-  data.tar.gz: 0e88256388fb9550337811db7662a8c3bec6a57d
+  metadata.gz: ab8190ee1b2fa79345b98fa3f2f5c3be8cbc9d8c
+  data.tar.gz: c26e4ce7bbf543fdf07dae5dd3675fd6753ccd36
 SHA512:
-  metadata.gz: f583b543af13df3e630880c81be10f7a958e2fcd91aab4d7b1842b6322104c35bd60abb9c124b03fb8202a55ee0c5817505890dd22d5f633fe420a097aab6393
-  data.tar.gz: 3a32e4572920f66b226ec59f9fd997271d6ba92faadc08fbcd3b12a6eb62c412610fd1a4427766582e2c14abc15b0c8911d5e9e8377b1c2b291115ee6964e391
+  metadata.gz: e52b4d618ec4d514998cbfc6da3839ca8673fa456aca66738eb53c833b78ebda5b1373228e329f5a2603f4148ac00a60deba4a23d1e2a1fd15d0d9350e2d19ff
+  data.tar.gz: a5fdc6e0b9a48294f24932efb376be7ffe7e4624f161ed50ced01c685f37005669e2149384f765bb0f9cba4de9736b59c58887793bc9dab5226025e8a7ac06c3

data/geoip.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: geoip 1.6.2 ruby lib
+# stub: geoip 1.6.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "geoip"
-  s.version = "1.6.2"
+  s.version = "1.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
     "History.rdoc",
     "LICENSE",
     "README.rdoc",
-    "Rakefile",
     "bin/geoip",
     "data/geoip/country_code.yml",
     "data/geoip/country_code3.yml",
@@ -41,8 +40,8 @@ Gem::Specification.new do |s|
     "test/test_helper.rb"
   ]
   s.homepage = "http://github.com/cjheath/geoip"
-  s.licenses = ["LGPL"]
-  s.rubygems_version = "2.4.5"
+  s.licenses = ["LGPL-2.1"]
+  s.rubygems_version = "2.6.13"
   s.summary = "GeoIP searches a GeoIP database for a given host or IP address, and returns information about the country where the IP address is allocated, and the city, ISP and other information, if you have that database version."
 end
 

data/lib/geoip.rb

@@ -58,7 +58,7 @@ require 'yaml'
 class GeoIP
 
   # The GeoIP GEM version number
-  VERSION = "1.6.3"
+  VERSION = "1.6.4"
 
   # The +data/+ directory for geoip
   DATA_DIR = File.expand_path(File.join(File.dirname(__FILE__),'..','data','geoip'))
@@ -734,6 +734,7 @@ class GeoIP
   def read_isp offset
     record = atomic_read(MAX_ORG_RECORD_LENGTH, index_size+offset)
     record = record.sub(/\000.*/n, '')
+    record = record.force_encoding('iso-8859-1').encode('utf-8') if record.respond_to?(:force_encoding)
     record.start_with?('*') ? nil : ISP.new(record)
   end
 
@@ -884,7 +885,7 @@ class GeoIP
     @ip_bits.downto(1) do |depth|
       go_right = (ipnum & mask) != 0
       off = @record_length * (2 * offset + (go_right ? 1 : 0))
-      offset = le_to_ui(r2 = atomic_read(@record_length, off).unpack('C*'))
+      offset = le_to_ui(atomic_read(@record_length, off).unpack('C*'))
 
       return offset if offset >= @database_segments[0]
       mask >>= 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoip
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Clifford Heath
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-07 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies: []
 description: |-
   GeoIP searches a GeoIP database for a given host or IP address, and
@@ -28,7 +28,6 @@ files:
 - History.rdoc
 - LICENSE
 - README.rdoc
-- Rakefile
 - bin/geoip
 - data/geoip/country_code.yml
 - data/geoip/country_code3.yml
@@ -46,7 +45,7 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/cjheath/geoip
 licenses:
-- LGPL
+- LGPL-2.1
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -64,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: GeoIP searches a GeoIP database for a given host or IP address, and returns

data/Rakefile

@@ -1,58 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-require 'jeweler'
-require './lib/geoip'
-
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "geoip"
-  gem.version = GeoIP::VERSION
-  gem.homepage = "http://github.com/cjheath/geoip"
-  gem.license = "LGPL"
-  gem.summary = %Q{GeoIP searches a GeoIP database for a given host or IP address, and returns information about the country where the IP address is allocated, and the city, ISP and other information, if you have that database version.}
-  gem.description = %Q{GeoIP searches a GeoIP database for a given host or IP address, and
-returns information about the country where the IP address is allocated,
-and the city, ISP and other information, if you have that database version.}
-  gem.email = %w[clifford.heath@gmail.com rmoriz@gmail.com]
-  gem.authors = ["Clifford Heath", "Roland Moriz"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-  gem.files.exclude "website/**/*.*", "script/*", "config/*"
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-task :default => :test
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "geoip #{GeoIP::VERSION}"
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('History.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc 'Generate website files'
-task :website_generate do
-  sh %q{ruby script/txt2html website/index.txt > website/index.html}
-end
-
-desc 'Upload website files via rsync'
-task :website_upload do
-  local_dir  = 'website'
-  website_config = YAML.load(File.read("config/website.yml"))
-  host       = website_config["host"]
-  host       = host ? "#{host}:" : ""
-  remote_dir = website_config["remote_dir"]
-  sh %{rsync -aCv #{local_dir}/ #{host}#{remote_dir}}
-end
-