rack-r18n 0.0.1 → 0.0.2

data/README.textile

@@ -1,5 +1,5 @@
 h1. Rack-R18n
 
 A small Rack middleware taking care of setting up your R18n locales.
-You may pass @:default@ for a default locale and @:dirs@ for translation dirs,
+You may pass @:default@ for a default locale and @:place@ for translation place,
 defaults to "i18n".

data/lib/rack-r18n.rb

@@ -5,29 +5,62 @@ module Rack
   class R18n
     # Avaible options:
     # :default => en
-    # :dirs => "i18n"
-    attr_reader :options, :dirs
+    # :place => "i18n"
+    # Note: This is relative to #root
+    attr_reader :options, :place
     def initialize(app, options = {})
       @app = app
       @options = options
 
       ::R18n::I18n.default = @options[:default] || "en"
-      @options[:dirs] ||= "i18n"
-      @dirs = Array(@options[:dirs]).map do |dir|
-        (Pathname(__FILE__).dirname + dir).expand_path
+      @options[:place] ||= "i18n"
+      @place = Array(@options[:place]).map do |dir|
+        (Pathname(self.class.root) + dir).expand_path
       end
     end
 
     def call(env)
-      set_r18n(env)
-      @app.call(env)
+      @env = env
+      ::R18n.thread_set {generate_r18n}
+      @app.call(@env)
     end
 
-    def set_r18n(env)
-      request = Rack::Request.new(env)
-      locales = ::R18n::I18n.parse_http(env['HTTP_ACCEPT_LANGUAGE'])
-      locales.insert(0, request.params[:locale]) if request.params[:locale]
-      ::R18n.set(::R18n::I18n.new(locales, @dirs))
+    def generate_r18n
+      request = Rack::Request.new(@env)
+      locales = ::R18n::I18n.parse_http(@env['HTTP_ACCEPT_LANGUAGE'])
+      if locale = session_locale(@env['rack.session'], locales, request.params[:locale])
+        locale.insert(0, locale)
+      end
+      ::R18n::I18n.new(locales, @place)
+    end
+
+    def session_locale(session, locales, locale=nil)
+      if locale
+        if session
+          session[:locale] = locale
+        end
+      elsif session && session[:locale]
+        locale = session[:locale]
+      end
+      locale
+    end
+
+    def self.root
+      @@root ||=  if defined? Merb
+                    Merb.root
+                  elsif defined? Sinatra
+                    Sinatra.root
+                  elsif defined? Rails
+                    Rails.root
+                  elsif defined? Rango
+                    Rango.root
+                  else
+                    Dir.pwd
+                  end
+    end
+
+    def self.root=(root)
+      @@root = root
     end
 
   end

data/test/setup.rb

@@ -0,0 +1,15 @@
+# Add PROJECT/lib to $LOAD_PATH
+$LOAD_PATH.unshift(File.expand_path("#{__FILE__}/../../lib"))
+
+# Ensure baretest is required
+require 'baretest'
+
+require 'rack-r18n'
+
+# Some defaults on BareTest (see Kernel#BareTest)
+BareTest do
+  require_baretest "0.4.0" # minimum baretest version to run these tests
+  require_ruby     "1.9.1" # minimum ruby version to run these tests
+  use              :support # Use :support in all suites
+  use :rack_test
+end

data/test/suite/lib/rack-r18n.rb

@@ -0,0 +1,29 @@
+BareTest.suite "rack-r18n" do
+  suite "#session_locale" do
+    setup do
+      @locales = Object.new
+      @r18n = Rack::R18n.new(proc {})
+    end
+    suite "setting a locale" do
+      suite "if a locale is given" do
+        assert "it gets written to the session" do
+          @r18n.session_locale(@session = {}, @locales, "en")
+          equal("en", @session[:locale])
+        end
+        assert "it doesn't bail if there's no session" do
+          equal("en", @r18n.session_locale(nil, @locales, "en"))
+        end
+      end
+      suite "if no locale is given" do
+        assert "it takes the one from session of avaible" do
+          equal("en", @r18n.session_locale({:locale => "en"}, @locales, nil))
+        end
+      end
+    end
+    suite "not setting a locale" do
+      assert "nothing is set" do
+        equal(nil, @r18n.session_locale(nil, @locales, nil))
+      end
+    end
+  end
+end

metadata

@@ -5,15 +5,15 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Simon Hafner aka Tass
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2010-03-20 00:00:00 +01:00
+date: 2010-05-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,8 @@ extra_rdoc_files: []
 
 files: 
 - lib/rack-r18n.rb
+- test/setup.rb
+- test/suite/lib/rack-r18n.rb
 - LICENSE
 - README.textile
 has_rdoc: true