mm_geoip 0.1.0 → 0.1.1

data/bin/mm_geoip

@@ -35,7 +35,7 @@ When runing this tool you have three possibilities to define the database locati
 
 Download:
   curl http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz | gunzip > GeoLiteCity.dat
-                                                                                                            
+
 }
 
 end

data/lib/mm_geoip.rb

@@ -19,7 +19,10 @@ class MMGeoip
   def initialize(env)
     # May be a Rack @env or any hash containing initial data. Or just an IP.
     @env = env.is_a?(Hash) ? env.dup : {:ip => env}
-    @ip = @env[:ip] || @env["HTTP_X_REAL_IP"] || @env["HTTP_X_FORWARDED_FOR"] || @env["REMOTE_ADDR"]
+    @ip = @env[:ip] ||
+      @env["HTTP_X_REAL_IP"] ||
+      (@env["HTTP_X_FORWARDED_FOR"] && @env["HTTP_X_FORWARDED_FOR"].split(/[ ,]+/).first) ||
+      @env["REMOTE_ADDR"]
     
     raise NoIpGiven.new("No IP in env hash") unless @ip
     raise NoDatabaseFile.new("No database file: #{self.class.db_path}") unless File.exists? self.class.db_path

data/lib/mm_geoip/version.rb

@@ -1,3 +1,3 @@
 class MMGeoip
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/mm_geoip_spec.rb

@@ -27,19 +27,28 @@ describe MMGeoip do
   
   describe "#initialize" do
     it "works with the IP as :ip field" do
-      MMGeoip.new '134.34.3.2'
+      g = MMGeoip.new '134.34.3.2'
+      g.lat
     end
     it "works with just the IP" do
-      MMGeoip.new :ip => '134.34.3.2'
+      g = MMGeoip.new :ip => '134.34.3.2'
+      g.lat
     end
     it "works with the IP as 'REMOTE_ADDR' field" do
-      MMGeoip.new 'REMOTE_ADDR' => '134.34.3.2'
+      g = MMGeoip.new 'REMOTE_ADDR' => '134.34.3.2'
+      g.lat
     end
     it "works with the IP as 'HTTP_X_REAL_IP' field" do
-      MMGeoip.new 'HTTP_X_REAL_IP' => '134.34.3.2'
+      g = MMGeoip.new 'HTTP_X_REAL_IP' => '134.34.3.2'
+      g.lat
     end
     it "works with the IP as 'HTTP_X_FORWARDED_FOR' field" do
-      MMGeoip.new 'HTTP_X_FORWARDED_FOR' => '134.34.3.2'
+      g = MMGeoip.new 'HTTP_X_FORWARDED_FOR' => '134.34.3.2'
+      g.lat
+    end
+    it "works with multiple IPs as 'HTTP_X_FORWARDED_FOR' field" do
+      g = MMGeoip.new 'HTTP_X_FORWARDED_FOR' => '134.34.3.2, 134.34.3.3'
+      g.lat
     end
     it "raises, if not :ip or 'REMOTE_ADDR' is given" do
       lambda{ MMGeoip.new :whatelse => 'something' }.should raise_error(MMGeoip::NoIpGiven)

metadata

@@ -1,92 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mm_geoip
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Niko Dittmann
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: geoip
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70218519127740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70218519127740
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70218519126080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70218519126080
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70218519123940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70218519123940
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70218519123220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70218519123220
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70218519122480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70218519122480
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70218519120180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-description: A proxy object around the geoip gem for lazy lookup. Includes a Rack middleware.
+  prerelease: false
+  version_requirements: *70218519120180
+description: A proxy object around the geoip gem for lazy lookup. Includes a Rack
+  middleware.
 email: mail+git@niko-dittmann.com
-executables: 
+executables:
 - mm_geoip
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/mm_geoip/region.rb
 - lib/mm_geoip/version.rb
 - lib/mm_geoip.rb
@@ -101,32 +99,30 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/niko/mm_geoip
 licenses: []
-
-post_install_message: "Try your new mm_geoip installation: type mm_geoip 134.34.3.2 [RETURN] in the command line."
+post_install_message: ! 'Try your new mm_geoip installation: type mm_geoip 134.34.3.2
+  [RETURN] in the command line.'
 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 
-      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 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A proxy object around the geoip gem for lazy lookup. Includes a Rack middleware.
-test_files: 
+test_files:
 - spec/mm_geoip_region_spec.rb
 - spec/mm_geoip_spec.rb
 - spec/rack/mm_geoip_spec.rb