autometal-geoip 0.2.2 → 0.3.3

data/README.rdoc

@@ -34,7 +34,13 @@ You can also pass it a domain instead of an IP address
   @geo = Autometal::Geoip.new("www.google.com")
   @geo.country
   => US
-  
+
+If you have purchased the Organization edition of the GeoIP database, you can also do this:
+  @geo.organization
+  => Google
+Currently, the gem does not support installing the file itself, you will need to make sure that GeoIPOrg.dat is located in /usr/local/shared/
+
+
 You can make any object Geo-location aware, as long as it has an IP or a domain attribute:
   require "rubygems"
   require "geoip"
@@ -44,6 +50,7 @@ You can make any object Geo-location aware, as long as it has an IP or a domain
   Site.new(:domain => "google.com")
   site.country
   => "US"
+  site.organization # if GeoIPOrg.dat is not installed, this will return nil
 
 The above will work if your class has a +domain+ attribute.
 You can override the attribute used to geolocate by overriding +geo_attr+
@@ -61,14 +68,22 @@ You can override the attribute used to geolocate by overriding +geo_attr+
 == REQUIREMENTS:
 
 * GeoIP C bindings (installed along with the Gem)
-* Active Support
-  This isn't really needed, I just like using the 1.day.ago stuff too much...
 
 == INSTALL:
 
   sudo gem install autometal-geoip
   sudo install_geoip (unless already installed)
 
+== CHANGELOG
+* 0.3.3
+  Removed active_support dependency
+* 0.2.2
+  Reworked class hierarchy, added support for GeoIP's Organization database
+* 0.1.3
+  Installer bugfix, fixes datafile install crash
+* 0.1.1
+  Initial release
+
 == LICENSE:
 
 Copyright (c) 2010 Achillefs Charmpilas, Humbucker Ltd

data/Rakefile

@@ -9,7 +9,6 @@ $hoe = Hoe.spec 'autometal-geoip' do
   self.developer 'Achillefs Charmpilas', 'ac@humbuckercode.co.uk'
   self.post_install_message = File.read('PostInstall.txt')
   self.rubyforge_name       = self.name
-  self.extra_deps           = [['activesupport','>= 0']]
 end
 
 require 'newgem/tasks'

data/autometal-geoip.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{autometal-geoip}
-  s.version = "0.2.2"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Achillefs Charmpilas"]
-  s.date = %q{2010-12-07}
+  s.date = %q{2010-12-08}
   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.
@@ -37,16 +37,13 @@ For more information on autometal-geoip, see http://humbuckercode.co.uk/licks/ge
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_development_dependency(%q<rubyforge>, [">= 2.0.4"])
       s.add_development_dependency(%q<hoe>, [">= 2.6.2"])
     else
-      s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
       s.add_dependency(%q<hoe>, [">= 2.6.2"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
     s.add_dependency(%q<hoe>, [">= 2.6.2"])
   end

data/lib/geoip.rb

@@ -3,14 +3,28 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 module Autometal
   class Geoip
-    VERSION = '0.2.2'
+    VERSION = '0.3.3'
     DATA_FILE_PATH = "/usr/local/share/GeoIP/"
     BIN = "geoiplookup"
+    def initialize ip_or_domain
+      @org = Organization.new(ip_or_domain) if Organization.installed?
+      @geo = City.new(ip_or_domain) if City.installed?
+    end
+    
+    def method_missing(m, *args, &block)
+      return @org.send(m, *args, &block) if @org and @org.respond_to?(m)
+      return @geo.send(m, *args, &block) if @geo and @geo.respond_to?(m)
+    end
     
     def self.bin_installed?
       %x{ #{self::BIN} --version } == "" ? false : true
     end
-    
+=begin rdoc
+  Extensible class that uses the Geoip binaries and data files to geolocate IPs and Hostnames.
+  To extend it to use a database, you will need to subclass Geoip::Package, define process_response, and self.data_file
+  
+  See geoip/city.rb and geoip/organization.rb for extension examples
+=end
     class Package
       attr_accessor :version
       def initialize ip_or_domain
@@ -19,6 +33,14 @@ module Autometal
         process_response
       end
       
+      def process_response
+        # deine this in the extension models
+      end
+      
+      def self.data_file
+        
+      end
+      
       def self.installed?
         return false unless Geoip.bin_installed?
         return false unless File.exists? data_file
@@ -26,7 +48,6 @@ module Autometal
       end
       
       def lookup ip_or_domain
-        puts "#{Geoip::BIN} -f #{self.class.data_file} #{ip_or_domain}"
         %x{ #{Geoip::BIN} -f #{self.class.data_file} #{ip_or_domain} }
       end
     end

data/lib/geoip/installer.rb

@@ -1,8 +1,9 @@
-require "active_support"
 require "fileutils"
-
 module Autometal
   class Geoip
+=begin rdoc
+  Installer class that handles downloading and installing databases and binaries
+=end
     class Installer
       BASE_DB_URL = "http://geolite.maxmind.com/download/geoip/database/*.dat.gz"
       PACKAGE_URL = "http://geolite.maxmind.com/download/geoip/api/c/GeoIP.tar.gz"
@@ -25,7 +26,7 @@ module Autometal
 
       def install_database
         target = File.join(Autometal::Geoip::DATA_FILE_PATH,"#{@package_name}.dat")
-        if File.exists?(target) and File::ctime(target) > 1.month.ago
+        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}`

data/test/test_geoip.rb

@@ -15,6 +15,13 @@ class TestGeoip < Test::Unit::TestCase
     assert_not_nil @dummy.organization if Autometal::Geoip::Organization.installed?
   end
   
+  def test_geopi_proxy_class_works
+    assert_not_nil Autometal::Geoip.new(@dummy.ip).city, "City Package Delegation should work"
+    if Autometal::Geoip::Organization.installed?
+      assert_not_nil Autometal::Geoip.new(@dummy.ip).organization, "Organization Package Delegation should work"
+    end
+  end
+  
   def test_gem_can_install_binaries
     assert_nothing_raised do
       Autometal::Geoip::Installer.new("GeoLiteCity")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autometal-geoip
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 21
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Achillefs Charmpilas
@@ -15,27 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 +01:00
+date: 2010-12-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rubyforge
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,11 +33,11 @@ dependencies:
         - 4
         version: 2.0.4
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,7 +49,7 @@ dependencies:
         - 2
         version: 2.6.2
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 description: |-
   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.