geoip 1.1.1 → 1.1.2

data/geoip.gemspec

@@ -4,16 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{geoip}
-  s.version = "1.1.1"
+  s.name = "geoip"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Clifford Heath", "Roland Moriz"]
-  s.date = %q{2011-05-06}
-  s.default_executable = %q{geoip}
-  s.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.}
+  s.date = "2012-01-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"]
   s.extra_rdoc_files = [
@@ -42,18 +39,13 @@ and the city, ISP and other information, if you have that database version.}
     "website/stylesheets/screen.css",
     "website/template.rhtml"
   ]
-  s.homepage = %q{http://github.com/cjheath/geoip}
+  s.homepage = "http://github.com/cjheath/geoip"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.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.}
-  s.test_files = [
-    "test/test_geoip.rb",
-    "test/test_helper.rb"
-  ]
+  s.rubygems_version = "1.8.10"
+  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."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/geoip.rb

@@ -54,7 +54,7 @@ require 'yaml'
 class GeoIP
 
   # The GeoIP GEM version number
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 
   # The +data/+ directory for geoip
   DATA_DIR = File.expand_path(File.join(File.dirname(__FILE__),'..','data','geoip'))
@@ -487,7 +487,7 @@ class GeoIP
   end
 
   def lookup_ip(ip_or_hostname) # :nodoc:
-    return ip_or_hostname unless (ip_or_hostname.kind_of?(String) && ip_or_hostname !~ /^[0-9.]*$/)
+    return ip_or_hostname unless (ip_or_hostname.kind_of?(String) && ip_or_hostname !~ /^[0-9.]+$/)
 
     # Lookup IP address, we were given a name
     ip = IPSocket.getaddress(ip_or_hostname)
@@ -500,6 +500,8 @@ class GeoIP
     if (ip.kind_of?(String) &&
         ip =~ /^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)$/)
       ip = be_to_ui(Regexp.last_match().to_a.slice(1..4))
+    else
+      ip = ip.to_i
     end
 
     return ip

metadata

@@ -1,39 +1,31 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: geoip
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 1
-  version: 1.1.1
+version: !ruby/object:Gem::Version
+  version: 1.1.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Clifford Heath
 - Roland Moriz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-06 00:00:00 +10:00
-default_executable: geoip
+date: 2012-01-26 00:00:00.000000000 Z
 dependencies: []
+description: ! 'GeoIP searches a GeoIP database for a given host or IP address, and
 
-description: |-
-  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.
-email: 
+
+  and the city, ISP and other information, if you have that database version.'
+email:
 - clifford.heath@gmail.com
 - rmoriz@gmail.com
-executables: 
+executables:
 - geoip
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - History.rdoc
 - README.rdoc
 - Rakefile
@@ -55,40 +47,31 @@ files:
 - website/javascripts/rounded_corners_lite.inc.js
 - website/stylesheets/screen.css
 - website/template.rhtml
-has_rdoc: true
 homepage: http://github.com/cjheath/geoip
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-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.
-test_files: 
-- test/test_geoip.rb
-- test/test_helper.rb
+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.
+test_files: []