autometal-geoip 0.1.3 → 0.2.2

data/Manifest.txt

@@ -6,8 +6,10 @@ Rakefile
 autometal-geoip.gemspec
 bin/install_geoip
 lib/geoip.rb
+lib/geoip/city.rb
 lib/geoip/geolocatable.rb
 lib/geoip/installer.rb
+lib/geoip/organization.rb
 script/console
 script/destroy
 script/generate

data/autometal-geoip.gemspec

@@ -2,21 +2,29 @@
 
 Gem::Specification.new do |s|
   s.name = %q{autometal-geoip}
-  s.version = "0.1.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Achillefs Charmpilas"]
-  s.date = %q{2010-10-11}
+  s.date = %q{2010-12-07}
+  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.}
+Also provides geo-location methods to Active Record and Sequel Models.
+
+This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/.}
   s.email = ["ac@humbuckercode.co.uk"]
+  s.executables = ["install_geoip"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt"]
-  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "geoip.gemspec", "lib/geoip.rb", "lib/geoip/geolocatable.rb", "lib/geoip/installer.rb", "script/console", "script/destroy", "script/generate", "shellscripts/install_binary", "shellscripts/install_db", "test/test_geoip.rb", "test/test_helper.rb"]
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "autometal-geoip.gemspec", "bin/install_geoip", "lib/geoip.rb", "lib/geoip/city.rb", "lib/geoip/geolocatable.rb", "lib/geoip/installer.rb", "lib/geoip/organization.rb", "script/console", "script/destroy", "script/generate", "shellscripts/install_binary", "shellscripts/install_db", "test/test_geoip.rb", "test/test_helper.rb"]
   s.homepage = %q{http://github.com/Achillefs/geoip}
-  s.post_install_message = %q{Thank you for installing autometal-geoip
-This gem will install and use MaxMind's GeoLiteCity database by default.
+  s.post_install_message = %q{
+Thank you for installing autometal-geoip
+
+Please run +sudo install_geoip+ to install the MaxMind binaries
+
+For more information on autometal-geoip, see http://humbuckercode.co.uk/licks/gems/geoip/
 
-For more information on autometal-geoip, see http://humbuckercode.co.uk/licks/gems/geoip/}
+}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{autometal-geoip}
@@ -29,13 +37,16 @@ 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

@@ -1,40 +1,36 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-%W[installer geolocatable].each { |r| require "#{File.dirname(__FILE__)}/geoip/#{r}" } 
-
 module Autometal
   class Geoip
-    VERSION = '0.1.3'
-    DEFAULT_PACKAGE = "GeoLiteCity"
+    VERSION = '0.2.2'
     DATA_FILE_PATH = "/usr/local/share/GeoIP/"
     BIN = "geoiplookup"
     
     def self.bin_installed?
-      %x{ #{BIN} --version } == "" ? false : true
+      %x{ #{self::BIN} --version } == "" ? false : true
     end
     
-    def initialize ip_or_domain, opts = {}
-      raise LoadError.new("No GeoIP binary is installed on your system.") unless self.class.bin_installed?
-      package = opts.delete(:package) || DEFAULT_PACKAGE
-      @data_file = File.join(DATA_FILE_PATH,"#{package}.dat")
-      @response = self.lookup ip_or_domain
-      ar = @response.split(", ")
-      @version = ar[0]
-      @country = ar[1].gsub("Rev 1: ","")
-      @county = ar[2]
-      @city = ar[3]
-      @lat = ar[5].to_f
-      @lng = ar[6].to_f
-    end
-    attr_accessor :country, :county, :city, :lat, :lng
-    def lookup ip_or_domain
-      %x{ #{BIN} -f #{@data_file} #{ip_or_domain} }
+    class Package
+      attr_accessor :version
+      def initialize ip_or_domain
+        return false unless self.class.installed?
+        @response = self.lookup ip_or_domain
+        process_response
+      end
+      
+      def self.installed?
+        return false unless Geoip.bin_installed?
+        return false unless File.exists? data_file
+        true
+      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
-    
-    def latlng
-      [self.lat,self.lng]
-    end
-    alias :latlon :latlng
   end
-end
+end
+
+%W[installer geolocatable city organization].each { |r| require "#{File.dirname(__FILE__)}/geoip/#{r}" } 

data/lib/geoip/city.rb

@@ -0,0 +1,25 @@
+module Autometal
+  class Geoip
+    class City < Geoip::Package
+      attr_accessor :country, :county, :city, :lat, :lng
+      def latlng
+        [self.lat,self.lng]
+      end
+      alias :latlon :latlng
+      
+      def self.data_file
+        File.join(Geoip::DATA_FILE_PATH,"GeoLiteCity.dat")
+      end
+      
+      def process_response
+        ar = @response.split(", ")
+        @version = ar[0]
+        @country = ar[1].gsub("Rev 1: ","")
+        @county = ar[2]
+        @city = ar[3]
+        @lat = ar[5].to_f
+        @lng = ar[6].to_f
+      end
+    end
+  end
+end

data/lib/geoip/geolocatable.rb

@@ -1,27 +1,40 @@
 module Autometal
   module Geolocatable
-    def geoip
-      @geoip = Autometal::Geoip.new(geo_attr) unless @geoip
-      @geoip
+    def geoip_city
+      @geoip_city = false unless @geoip_city
+      if Autometal::Geoip::City.installed?
+        @geoip_city = Autometal::Geoip::City.new(geo_attr) unless @geoip_city
+      end
+      @geoip_city
+    end
+    def geoip_org
+      @geoip_org = false unless @geoip_org
+      if Autometal::Geoip::Organization.installed?
+        @geoip_org = Autometal::Geoip::Organization.new(geo_attr) unless @geoip_org
+      end
+      @geoip_org
     end
+
     def geo_attr
       begin
         send(:ip)
-      rescue NoMethodError => e
+      rescue NoMethodError
         send(:domain)
       end
     end
-    def country; geoip.country; end
-
-    def county; geoip.county; end
-
-    def city; geoip.city; end
+    def country; geoip_city.country if geoip_city; end
+    
+    def county; geoip_city.county if geoip_city; end
 
-    def lat; geoip.lat; end
+    def city; geoip_city.city if geoip_city; end
 
-    def lng; geoip.lng; end
+    def lat; geoip_city.lat if geoip_city; end
 
-    def latlng; geoip.latlng; end
+    def lng; geoip_city.lng if geoip_city; end
+    
+    def organization; geoip_org.organization if geoip_org; end
+    
+    def latlng; geoip_city.latlng if geoip_city; end
     alias :latlon :latlng
   end
 end

data/lib/geoip/organization.rb

@@ -0,0 +1,17 @@
+module Autometal
+  class Geoip
+    class Organization < Package
+      attr_accessor :organization
+      
+      def self.data_file
+        File.join(Geoip::DATA_FILE_PATH,"GeoIPOrg.dat")
+      end
+      
+      def process_response
+        ar = @response.split(": ")
+        @version = ar[0].strip
+        @organization = ar[1].strip
+      end
+    end
+  end
+end

data/test/test_geoip.rb

@@ -8,7 +8,11 @@ class TestGeoip < Test::Unit::TestCase
   end
   
   def test_objects_are_geolocatable
-    assert_not_nil @dummy.country
+    assert_not_nil @dummy.country if Autometal::Geoip::City.installed?
+  end
+  
+  def test_object_responds_to_organization_if_installed
+    assert_not_nil @dummy.organization if Autometal::Geoip::Organization.installed?
   end
   
   def test_gem_can_install_binaries

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autometal-geoip
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Achillefs Charmpilas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 +01:00
+date: 2010-12-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,8 +88,10 @@ files:
 - autometal-geoip.gemspec
 - bin/install_geoip
 - lib/geoip.rb
+- lib/geoip/city.rb
 - lib/geoip/geolocatable.rb
 - lib/geoip/installer.rb
+- lib/geoip/organization.rb
 - script/console
 - script/destroy
 - script/generate