r18n-rails 1.1.2 → 1.1.3

data/spec/app/app/controllers/test_controller.rb

@@ -1,6 +1,8 @@
 class TestController < ApplicationController
   layout false
 
+  before_filter :reload_r18n, :only => :filter
+
   def locales
     render :text => R18n.get.locales.map { |i| i.code }.join(', ')
   end
@@ -24,8 +26,7 @@ class TestController < ApplicationController
   end
 
   def controller
-    render :text => "#{t('user.name')}" + "#{t.user.name}" +
-                    "#{r18n.t.user.name}"
+    render :text => "#{t.user.name} #{r18n.t.user.name} #{t('user.name')}"
   end
 
   def time

data/spec/rails_spec.rb

@@ -4,10 +4,6 @@ require File.expand_path('../spec_helper', __FILE__)
 describe TestController, :type => :controller do
   render_views
 
-  before do
-    ActionController::Base.send(:before_filter, :reload_r18n)
-  end
-
   it 'should use default locale' do
     get :locales
     response.should be_success
@@ -60,7 +56,7 @@ describe TestController, :type => :controller do
   it "should add methods to controller" do
     get :controller, :locale => 'en'
     response.should be_success
-    response.body.should == "NameNameName"
+    response.body.should == "Name Name Name"
   end
 
   it "should localize time by Rails I18n" do
@@ -140,4 +136,21 @@ describe TestController, :type => :controller do
     response.body.should == "1 000.1 руб.\n"
   end
 
+  it "should cache I18n object" do
+    R18n.clear_cache!
+
+    get :translations
+    R18n.cache.keys.length.should == 1
+
+    get :translations
+    R18n.cache.keys.length.should == 1
+
+    get :translations
+    request.env['HTTP_ACCEPT_LANGUAGE'] = 'ru,fr;q=0.9'
+    R18n.cache.keys.length.should == 1
+
+    get :translations, :locale => 'en'
+    R18n.cache.keys.length.should == 2
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r18n-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,60 +9,58 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: r18n-rails-api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
+    none: false
   type: :runtime
-  prerelease: false
+  name: r18n-rails-api
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.10
+    none: false
   type: :development
-  prerelease: false
+  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.10
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
+  name: yard
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,10 +68,10 @@ dependencies:
     - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.9.0
+    none: false
   type: :development
-  prerelease: false
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -81,70 +79,72 @@ dependencies:
     - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.9.0
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3'
+    none: false
   type: :development
-  prerelease: false
+  name: rails
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2'
+    none: false
   type: :development
-  prerelease: false
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2'
+    none: false
   type: :development
-  prerelease: false
+  name: rspec-rails
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
+  name: redcarpet
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 description: ! "    Out-of-box R18n support for Ruby on Rails.\n    It is just a wrapper
   for R18n Rails API and R18n core libraries.\n    R18n has nice Ruby-style syntax,
   filters, flexible locales, custom loaders,\n    translation support for any classes,
@@ -203,23 +203,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      hash: 147309096012253799
       version: '0'
       segments:
       - 0
-      hash: -1268755804857414664
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      hash: 147309096012253799
       version: '0'
       segments:
       - 0
-      hash: -1268755804857414664
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23