autometal-geoip 0.3.7 → 0.4.0

data/README.rdoc

@@ -75,6 +75,8 @@ You can override the attribute used to geolocate by overriding +geo_attr+
   sudo install_geoip (unless already installed)
 
 == CHANGELOG
+* 0.4
+  Ruby 1.9.* support. Previous version of this gem would product encoding errors in some instances due to the different way Ruby 1.9+ deals with source and text encodings.
 * 0.3.7
   Installation now checks for sudo command, and runs accordingly. Bear in mind that if you are not root and sudo does not exist, the installation will fail as it will not have enough permissions to install binaries.
 * 0.3.5

data/autometal-geoip.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{autometal-geoip}
-  s.version = "0.3.7"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Achillefs Charmpilas"]
-  s.date = %q{2011-01-12}
+  s.date = %q{2011-01-16}
   s.default_executable = %q{install_geoip}
   s.description = %q{A wrapper to MaxMind's GeoIP services, that can work with both free and paid versions.
 Also provides geo-location methods to Active Record and Sequel Models.
@@ -28,12 +28,11 @@ For more information on autometal-geoip, see http://humbuckercode.co.uk/licks/ge
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{autometal-geoip}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{A wrapper to MaxMind's GeoIP services, that can work with both free and paid versions}
   s.test_files = ["test/test_geoip.rb", "test/test_helper.rb"]
 
   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

@@ -3,7 +3,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 module Autometal
   class Geoip
-    VERSION = '0.3.7'
+    VERSION = '0.4.0'
     DATA_FILE_PATH = "/usr/local/share/GeoIP/"
     BIN = "geoiplookup"
     def initialize ip_or_domain
@@ -48,7 +48,11 @@ module Autometal
       end
       
       def lookup ip_or_domain
-        %x{ #{Geoip::BIN} -f #{self.class.data_file} #{ip_or_domain} }
+        str = %x{ #{Geoip::BIN} -f #{self.class.data_file} #{ip_or_domain} }
+        if RUBY_VERSION.to_f > 1.8
+          str.force_encoding("iso-8859-1") unless str.valid_encoding?
+        end
+        str
       end
     end
   end

data/lib/geoip/city.rb

@@ -1,5 +1,9 @@
 module Autometal
   class Geoip
+=begin rdoc
+  GeoLiteCity database extension
+  provides Country, City, Latitude and Longitude information.
+=end
     class City < Geoip::Package
       attr_accessor :country, :county, :city, :lat, :lng
       def latlng

data/lib/geoip/installer.rb

@@ -2,7 +2,8 @@ require "fileutils"
 module Autometal
   class Geoip
 =begin rdoc
-  Installer class that handles downloading and installing databases and binaries
+  Installer class that handles downloading and installing GeoIP databases and binaries
+  It will call the two shellscripts included in <gem_root>/shellscripts/
 =end
     class Installer
       BASE_DB_URL = "http://geolite.maxmind.com/download/geoip/database/*.dat.gz"
@@ -20,16 +21,20 @@ module Autometal
         if Autometal::Geoip.bin_installed?
           puts "Binary already installed, skipping"
         else
-          `cd #{File.dirname(__FILE__)}/../../shellscripts/ && ./install_binary #{PACKAGE_URL}` 
+          `cd #{shellscripts_path} && ./install_binary #{PACKAGE_URL}` 
         end
       end
-
+      
+      def shellscripts_path
+        File.join(File.dirname(__FILE__),"..","..","shellscripts")
+      end
+      
       def install_database
         target = File.join(Autometal::Geoip::DATA_FILE_PATH,"#{@package_name}.dat")
         if File.exists?(target) and File::ctime(target) > Time.now - (30*24*60*60)
           puts "Datafile is up to date, skipping"
         else
-          `cd #{File.dirname(__FILE__)}/../../shellscripts/ && ./install_db #{@db_url}`
+          `cd #{shellscripts_path} && ./install_db #{@db_url}`
         end
       end
     end

data/lib/geoip/organization.rb

@@ -1,5 +1,9 @@
 module Autometal
   class Geoip
+=begin rdoc
+  GeoIPOrg database extension
+  provides Country and Organization (ISP) information
+=end
     class Organization < Package
       attr_accessor :organization
       

data/test/test_geoip.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.join(File.dirname(__FILE__),"test_helper")
 
 class TestGeoip < Test::Unit::TestCase
 
@@ -22,11 +22,21 @@ class TestGeoip < Test::Unit::TestCase
     end
   end
   
+  # Test suite should be run on Ruby 1.8+ and Ruby 1.9+
+  def test_gem_handles_weird_chars_without_exceptions
+    assert_nothing_raised do
+      assert_equal "DE", Autometal::Geoip.new('78.46.60.181').country
+      assert_equal "SE", Autometal::Geoip.new('81.237.231.174').country
+    end
+  end
+  
   def test_gem_can_install_binaries
     assert_nothing_raised do
       Autometal::Geoip::Installer.new("GeoLiteCity")
     end
     assert_equal true, Autometal::Geoip.bin_installed?
+    assert_equal false, Autometal::StubbedGeoip.bin_installed?
+    
     assert_not_nil @dummy.country, "Country should not be nil"
     assert_not_nil @dummy.city, "City should not be nil"
     assert_not_nil @dummy.lat, "Latitude should not be nil"

data/test/test_helper.rb

@@ -17,4 +17,10 @@ class AnotherDummy
     @pantera = open("http://check-rankings.co.uk").read rescue "66.102.13.105"
   end
   def geo_attr; pantera; end
+end
+
+module Autometal
+  class StubbedGeoip < Geoip
+    BIN = "zoot-allures.666"
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autometal-geoip
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 7
-  version: 0.3.7
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Achillefs Charmpilas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 +01:00
+date: 2011-01-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: autometal-geoip
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A wrapper to MaxMind's GeoIP services, that can work with both free and paid versions