rgeoip 0.0.2 → 0.0.3

data/Gemfile

@@ -11,4 +11,5 @@ group :development do
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
   gem "ZenTest"
+  gem "rack"
 end

data/Gemfile.lock

@@ -7,6 +7,7 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    rack (1.2.1)
     rake (0.8.7)
     rcov (0.9.9)
     yard (0.6.4)
@@ -18,5 +19,6 @@ DEPENDENCIES
   ZenTest
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
+  rack
   rcov
   yard (~> 0.6.0)

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/ext/rgeoip.c

@@ -113,8 +113,6 @@ static VALUE
 gi_new(int argc, VALUE *argv, VALUE self)
 {
     Rgeoip      *gi;
-    VALUE     flags;
-    VALUE filenames;
     int           i;
 
     Data_Get_Struct(self, Rgeoip, gi);
@@ -294,7 +292,7 @@ gid_new(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "11", &filename, &flags);
 
-    Check_Type(filename, T_STRING);
+    filename = StringValue(filename);
 
     gid->ptr = GeoIP_open(RSTRING_PTR(filename),
                           GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE | GEOIP_MMAP_CACHE);

data/lib/rack/rgeoip.rb

@@ -0,0 +1,27 @@
+require 'rack'
+require 'rgeoip'
+
+module Rack::Rgeoip
+  def self.new(app, options={})
+    Lookup.new(app, options)
+  end
+
+  class Lookup
+    DEFAULT = { :db => '/usr/share/GeoIP/GeoIP.dat' }
+
+    def initialize(app, options={})
+      @app, @options = app, DEFAULT.merge(options)
+      @rgeoip = Rgeoip.new @options[:db]
+    end
+
+    def call(env)
+      @app.call(lookup env)
+    end
+
+    def lookup(env)
+      env.tap do
+        env['rack.geoip'] = @rgeoip.country(Rack::Request.new(env).ip)
+      end
+    end
+  end
+end

data/rgeoip.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rgeoip}
-  s.version = "0.0.0"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["miyucy"]
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "ext/extconf.rb",
     "ext/rgeoip.c",
+    "rgeoip.gemspec",
     "test/helper.rb",
     "test/test_rgeoip.rb",
     "test/test_rgeoip_database.rb"

data/test/helper.rb

@@ -13,6 +13,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'ext'))
 require 'rgeoip'
+require 'rack/rgeoip'
 
 class Test::Unit::TestCase
 end

data/test/test_rack_rgeoip_lookup.rb

@@ -0,0 +1,15 @@
+require 'helper'
+
+class TestRackRgeoipLookup < Test::Unit::TestCase
+  def test_initialize
+    assert_respond_to(Rack::Rgeoip.new(nil), :call)
+  end
+
+  def test_initialize_with_hash
+    assert_nothing_raised { Rack::Rgeoip.new(nil, {}) }
+  end
+
+  def test_pass_to_app
+    Rack::Rgeoip.new(lambda { |env| assert env.has_key? 'rack.geoip' }).call({})
+  end
+end

data/test/test_rgeoip.rb

@@ -1,5 +1,6 @@
 require 'helper'
 require 'tempfile'
+require 'pathname'
 
 class TestRgeoip < Test::Unit::TestCase
   def test_constant
@@ -16,6 +17,12 @@ class TestRgeoip < Test::Unit::TestCase
     }
   end
 
+  def test_open_with_pathname
+    assert_nothing_raised {
+      Rgeoip.new.open Pathname.new(paths[:country])
+    }
+  end
+
   def test_open_invalid_dbfile
     assert_raise(RuntimeError) {
       Rgeoip.new.open Tempfile.new("rgeoip").path
@@ -60,8 +67,8 @@ class TestRgeoip < Test::Unit::TestCase
 
   def paths
     {
-      :country => File.expand_path("../GeoIP.dat", File.dirname(__FILE__)),
-      :city    => File.expand_path("../GeoLiteCity.dat", File.dirname(__FILE__)),
+      :country => File.expand_path("data/GeoIP.dat", File.dirname(__FILE__)),
+      :city    => File.expand_path("data/GeoLiteCity.dat", File.dirname(__FILE__)),
     }
   end
 

data/test/test_rgeoip_database.rb

@@ -76,8 +76,8 @@ class TestRgeoipDatabase < Test::Unit::TestCase
 
   def paths
     {
-      :country => File.expand_path("../GeoIP.dat", File.dirname(__FILE__)),
-      :city    => File.expand_path("../GeoLiteCity.dat", File.dirname(__FILE__)),
+      :country => File.expand_path("data/GeoIP.dat", File.dirname(__FILE__)),
+      :city    => File.expand_path("data/GeoLiteCity.dat", File.dirname(__FILE__)),
     }
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rgeoip
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - miyucy
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +09:00
+date: 2011-02-18 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +31,11 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  prerelease: false
   name: yard
-  type: :development
   version_requirements: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +47,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
   name: bundler
-  type: :development
   version_requirements: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,11 +63,11 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  prerelease: false
   name: jeweler
-  type: :development
   version_requirements: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,11 +77,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   name: rcov
-  type: :development
   version_requirements: *id004
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -90,10 +91,23 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   name: ZenTest
-  type: :development
   version_requirements: *id005
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rack
+  version_requirements: *id006
+  prerelease: false
 description: alternative libGeoIP binding for Ruby
 email: miyucy@gmail.com
 executables: []
@@ -105,6 +119,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .gemtest
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -113,8 +128,12 @@ files:
 - VERSION
 - ext/extconf.rb
 - ext/rgeoip.c
+- lib/rack/rgeoip.rb
 - rgeoip.gemspec
+- test/data/GeoIP.dat
+- test/data/GeoLiteCity.dat
 - test/helper.rb
+- test/test_rack_rgeoip_lookup.rb
 - test/test_rgeoip.rb
 - test/test_rgeoip_database.rb
 has_rdoc: true
@@ -147,11 +166,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: alternative libGeoIP binding for Ruby
 test_files: 
 - test/helper.rb
+- test/test_rack_rgeoip_lookup.rb
 - test/test_rgeoip.rb
 - test/test_rgeoip_database.rb