rack-geo-locale 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/rack/geo_locale.rb

@@ -1,16 +1,17 @@
-require 'ostruct'
+require 'geoip'
 
 module Rack
   class GeoLocale
     def initialize(app)
       @app = app
-
-      @geoip = GeoIP.new(ENV["GEOIP_DATABASE"])
     end
 
     def call(env)
-      env["locale.country"] = parse_country(env)
-      env["locale.languages"] = parse_languages(env)
+      env["locale.language"], env["locale.country"] = parse_locale(env)
+
+      if country = parse_country(env)
+        env["locale.country"] = country
+      end
 
       @app.call(env)
     end
@@ -21,7 +22,7 @@ module Rack
 
         return nil unless remote_addr
 
-        result = @geoip.country(remote_addr).country_code2
+        result = geoip.country(remote_addr).country_code2
 
         if result != "--"
           result
@@ -30,7 +31,7 @@ module Rack
         end
       end
 
-      def parse_languages(env)
+      def parse_locale(env)
         env["HTTP_ACCEPT_LANGUAGE"] ||= ""
         language_ranges = env["HTTP_ACCEPT_LANGUAGE"].split(",")
         language_ranges.map do |language_range|
@@ -38,10 +39,30 @@ module Rack
 
           locale, q = language_range.split(";q=")
 
-          language = locale.strip.split("-").first
+          language, country = locale.strip.split("-")
+
+          {:language => language, :country => country, :q => q}
+        end.sort {|x, y| y[:q] <=> x[:q]}.map{|o| [o[:language], o[:country]]}.first
+      end
+
+      def database?
+        if ENV["GEOIP_DATABASE"]
+          ::File.exist? ENV["GEOIP_DATABASE"]
+        else
+          false
+        end
+      end
+
+      def database
+        ENV["GEOIP_DATABASE"]
+      end
 
-          {:language => language, :q => q}
-        end.sort {|x, y| y[:q] <=> x[:q]}.map{|lr| lr[:language]}
+      def geoip
+        if database?
+          GeoIP.new(database)
+        else
+          nil
+        end
       end
   end
 end

data/spec/lib/rack/geo_locale_spec.rb

@@ -43,44 +43,45 @@ describe Rack::GeoLocale do
   describe "parsing HTTP_ACCEPT_LANGUAGE" do
     it "should return an empty result if no HTTP_ACCEPT_LANGUAGE passed" do
       get '/', {}, {}
-      last_request.env["locale.languages"].should == []
+      last_request.env["locale.language"].should == nil
     end
 
     it "should parse HTTP_ACCEPT_LANGUAGE 'en'" do
       get '/', {}, {"HTTP_ACCEPT_LANGUAGE" => "en"}
-      last_request.env["locale.languages"].should == ["en"]
+      last_request.env["locale.language"].should == "en"
     end
 
     it "should parse HTTP_ACCEPT_LANGUAGE 'sv'" do
       get '/', {}, {"HTTP_ACCEPT_LANGUAGE" => "sv"}
-      last_request.env["locale.languages"].should == ["sv"]
+      last_request.env["locale.language"].should == "sv"
     end
 
     it "should parse HTTP_ACCEPT_LANGUAGE 'sv;q=0.1, en'" do
       get '/', {}, {"HTTP_ACCEPT_LANGUAGE" => "sv;q=0.1, en"}
-      last_request.env["locale.languages"].should == ["en", "sv"]
+      last_request.env["locale.language"].should == "en"
     end
 
     it "should parse HTTP_ACCEPT_LANGUAGE 'sv, en'" do
       get '/', {}, {"HTTP_ACCEPT_LANGUAGE" => "sv, en"}
-      last_request.env["locale.languages"].should == ["sv", "en"]
+      last_request.env["locale.language"].should == "sv"
     end
 
     it "should parse HTTP_ACCEPT_LANGUAGE 'en;q=0.4, de;q=0.7'" do
       get '/', {}, {"HTTP_ACCEPT_LANGUAGE" => "en;q=0.4, de;q=0.7"}
-      last_request.env["locale.languages"].should == ["de", "en"]
+      last_request.env["locale.language"].should == "de"
     end
 
     it "should parse HTTP_ACCEPT_LANGUAGE 'en-US;q=0.7'" do
       get '/', {}, {"HTTP_ACCEPT_LANGUAGE" => "en-US;q=0.7"}
-      last_request.env["locale.languages"].should == ["en"]
+      last_request.env["locale.language"].should == "en"
     end
   end
 
   describe "missing database" do
-    xit "should fallback on HTTP_ACCEPT_LANGUAGE" do
-      get '/', {}, {"HTTP_ACCEPT_LANGUAGE" => "en-US;q=0.7"}
-      last_request.env["locale.languages"].should == ["en"]
+    it "should fallback on HTTP_ACCEPT_LANGUAGE for country" do
+      get '/', {}, {"HTTP_ACCEPT_LANGUAGE" => "en-US", "REMOTE_ADDR" => "10.0.0.1"}
+      last_request.env["locale.language"].should == "en"
+      last_request.env["locale.country"].should == "US"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-geo-locale
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70169376395940 !ruby/object:Gem::Requirement
+  requirement: &70157091906880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169376395940
+  version_requirements: *70157091906880
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70169376395300 !ruby/object:Gem::Requirement
+  requirement: &70157091905180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169376395300
+  version_requirements: *70157091905180
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70169376394740 !ruby/object:Gem::Requirement
+  requirement: &70157091903000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169376394740
+  version_requirements: *70157091903000
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70169376394220 !ruby/object:Gem::Requirement
+  requirement: &70157091900900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169376394220
+  version_requirements: *70157091900900
 - !ruby/object:Gem::Dependency
   name: geoip
-  requirement: &70169376393660 !ruby/object:Gem::Requirement
+  requirement: &70157091899860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169376393660
+  version_requirements: *70157091899860
 description: Simple Rack middleware for setting the locale.country via GeoIP using
   the MaxMind GeoIP database, and setting the locale.languages based on the HTTP_ACCEPT_LANGUAGE
   header.