geoip 1.3.5 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2RkZmNiODFiYjM5OTc5ZmNlMzFiYmViMWU1ODVkZjkyY2MzNDZlYw==
+    YTNjMGMyYjJlNmYzY2JmZTFlZTI2ZDMwYmJiMWZjODVjZjA1ZTI4NQ==
   data.tar.gz: !binary |-
-    YTY4MjNlNDUzNWFlZTAyZTA3NThhMzFjNzcyODc4MGYzNzk4ZjBmZg==
+    NTIwNDVkMzA2NWI3YjNjODA2ODY5ZDkzZTY3MDI0NDljYjMwNTYxNw==
 SHA512:
   metadata.gz: !binary |-
-    MGY4ODA1ZTg4MjYwMDMxNTQ2NDNmMGI3YzRkNzVjMTVkNzBhNGI2NzgxZDI5
-    NjY3MzJiYTA4ZmE3NjJhNTY1ZjE0MDlhMjZkNDExZjJmYzIzMzQyZDA1ZDUx
-    N2IwNWY3OWMwNzlkYjQ3MGM3YjUxYzE1ZjQzNjI3Zjg1MzAzNDU=
+    NThlNDBhZGYwOGFlODY3ODQ1NzBlZDQ1OGI3NzVkYzAzY2ZmOTg5OTEwYTFm
+    NmVkNzY2YmVhOTc1ZTIyNWEyNDlhNjhjYWNhNmZhZTAyYWVhNWIyMWFlYzdm
+    MjAxNjY0NzI4ODkyZmE3MmNiMjIzMWY3YmQwNjc0ZTQxYzYxMTE=
   data.tar.gz: !binary |-
-    ZDExNTRiOGY2NjU0OGQyNGFlYWRjNjhhY2MzODg5YWQ3MmE3YTBjNDI3OGM5
-    ZjgwODI0M2Y3OWIwOTk3NDYxZGQ1OGI2ZWMxMGIwYzljOTFkMDkwNTJmM2Q2
-    YjY5ZjE1NmQyZGUwMDAxMjViMzkxMGEwM2ExYjlkOTNlZDBkOGU=
+    ODBjOWM0ODA1NWUyNDRlYTQ0NmJkY2ViZTI3MGQwNjI5N2JiODRhZTY3YTIx
+    NzdkN2EzZGZkYWZkM2JlZDA0MmFiMTk4MzRmNTU3NTVmMWMxYmYyN2JmNTAx
+    YmUzYWZkMGE4OTE5NmFkOTM1YmVmMjAwMTczODQ2Yzg0ZTJkMzc=

data/geoip.gemspec

@@ -2,15 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: geoip 1.3.5 ruby lib
+# stub: geoip 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "geoip"
-  s.version = "1.3.5"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Clifford Heath", "Roland Moriz"]
-  s.date = "2013-12-20"
+  s.date = "2014-03-26"
   s.description = "GeoIP searches a GeoIP database for a given host or IP address, and\nreturns information about the country where the IP address is allocated,\nand the city, ISP and other information, if you have that database version."
   s.email = ["clifford.heath@gmail.com", "rmoriz@gmail.com"]
   s.executables = ["geoip"]
@@ -40,8 +41,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/cjheath/geoip"
   s.licenses = ["LGPL"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.10"
+  s.rubygems_version = "2.2.2"
   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.3.5"
+  VERSION = "1.4.0"
 
   # The +data/+ directory for geoip
   DATA_DIR = File.expand_path(File.join(File.dirname(__FILE__),'..','data','geoip'))
@@ -171,19 +171,23 @@ class GeoIP
   # Open the GeoIP database and determine the file format version.
   #
   # +filename+ is a String holding the path to the GeoIP.dat file
-  # +options+ is an integer holding caching flags (unimplemented)
+  # +options+ is a Hash allowing you to specify the caching options
   #
-  def initialize(filename, flags = 0)
-    @mutex = unless IO.respond_to?(:pread)
-               Mutex.new
-             end
+  def initialize(filename, options = {})
+    if options[:preload] || !IO.respond_to?(:pread)
+      @mutex = Mutex.new
+    end
+
+    @use_pread = IO.respond_to?(:pread) && !options[:preload]
 
-    @flags = flags
+    @options = options
     @database_type = GEOIP_COUNTRY_EDITION
     @record_length = STANDARD_RECORD_LENGTH
     @file = File.open(filename, 'rb')
 
     detect_database_type!
+
+    preload_data if options[:preload]
   end
 
   # Search the GeoIP database for the specified host, returning country
@@ -420,6 +424,13 @@ class GeoIP
 
   private
 
+  # Loads data into a StringIO which is Copy-on-write friendly
+  def preload_data
+    @file.seek(0)
+    @contents = StringIO.new(@file.read)
+    @file.close
+  end
+
   # Detects the type of the database.
   def detect_database_type! # :nodoc:
     @file.seek(-3, IO::SEEK_END)
@@ -708,18 +719,26 @@ class GeoIP
 
   # reads +length+ bytes from +offset+ as atomically as possible
   # if IO.pread is available, it'll use that (making it both multithread
-  # and multiprocess-safe). Otherwise we'll use a mutex to synchronize
+  # and multiprocess-safe). Otherwise we'll use a mutex to synchronize
   # access (only providing protection against multiple threads, but not
   # file descriptors shared across multiple processes).
+  # If the contents of the database have been preloaded it'll work with
+  # the StringIO object directly.
   def atomic_read(length, offset) #:nodoc:
     if @mutex
-      @mutex.synchronize do
-        @file.seek(offset)
-        @file.read(length)
-      end
+      @mutex.synchronize { atomic_read_unguarded(length, offset) }
     else
-      IO.pread(@file.fileno, length, offset)
+      atomic_read_unguarded(length, offset)
     end
   end
 
+  def atomic_read_unguarded(length, offset)
+    if @use_pread
+      IO.pread(@file.fileno, length, offset)
+    else
+      io = @contents || @file
+      io.seek(offset)
+      io.read(length)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoip
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors:
 - Clifford Heath
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies: []
 description: ! 'GeoIP searches a GeoIP database for a given host or IP address, and
 
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: GeoIP searches a GeoIP database for a given host or IP address, and returns