gettext_i18n_rails 0.7.1 → 0.7.2

data/gemfiles/rails31.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal"
+gem "haml"
+gem "slim"
+gem "hamlet"
+gem "ruby_parser"
+gem "gettext", "2.3.1"
+gem "sqlite3", "~>1.3.6"
+gem "rake"
+gem "rspec", "~>2"
+gem "rails", "~>3.1.0"
+
+gemspec :path=>"../"

data/gemfiles/rails31.gemfile.lock

@@ -0,0 +1,130 @@
+PATH
+  remote: /Users/mgrosser/code/tools/gettext_i18n_rails
+  specs:
+    gettext_i18n_rails (0.7.1)
+      fast_gettext (>= 0.4.8)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.8)
+      actionpack (= 3.1.8)
+      mail (~> 2.3.3)
+    actionpack (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.8)
+      activesupport (= 3.1.8)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+    activesupport (3.1.8)
+      multi_json (>= 1.0, < 1.3)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (2.2.3)
+    builder (3.0.4)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    fast_gettext (0.6.11)
+    gettext (2.3.1)
+      locale
+    haml (3.1.7)
+    hamlet (0.5.0.1)
+      slim (~> 1.0.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    json (1.7.5)
+    locale (2.0.8)
+    mail (2.3.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    multi_json (1.2.0)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.1.8)
+      actionmailer (= 3.1.8)
+      actionpack (= 3.1.8)
+      activerecord (= 3.1.8)
+      activeresource (= 3.1.8)
+      activesupport (= 3.1.8)
+      bundler (~> 1.0)
+      railties (= 3.1.8)
+    railties (3.1.8)
+      actionpack (= 3.1.8)
+      activesupport (= 3.1.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    ruby_parser (3.0.1)
+      sexp_processor (~> 4.1)
+    sexp_processor (4.1.2)
+    slim (1.0.4)
+      temple (~> 0.3.4)
+      tilt (~> 1.3.2)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
+    temple (0.3.5)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  gettext (= 2.3.1)
+  gettext_i18n_rails!
+  haml
+  hamlet
+  rails (~> 3.1.0)
+  rake
+  rspec (~> 2)
+  ruby_parser
+  slim
+  sqlite3 (~> 1.3.6)

data/gemfiles/rails32.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal"
+gem "haml"
+gem "slim"
+gem "hamlet"
+gem "ruby_parser"
+gem "gettext", "2.3.1"
+gem "sqlite3", "~>1.3.6"
+gem "rake"
+gem "rspec", "~>2"
+gem "rails", "~>3.2.0"
+
+gemspec :path=>"../"

data/gemfiles/rails32.gemfile.lock

@@ -0,0 +1,128 @@
+PATH
+  remote: /Users/mgrosser/code/tools/gettext_i18n_rails
+  specs:
+    gettext_i18n_rails (0.7.1)
+      fast_gettext (>= 0.4.8)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (3.0.2)
+    builder (3.0.4)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    fast_gettext (0.6.11)
+    gettext (2.3.1)
+      locale
+    haml (3.1.7)
+    hamlet (0.5.0.1)
+      slim (~> 1.0.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
+    locale (2.0.8)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    multi_json (1.3.7)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
+      bundler (~> 1.0)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    ruby_parser (3.0.1)
+      sexp_processor (~> 4.1)
+    sexp_processor (4.1.2)
+    slim (1.0.4)
+      temple (~> 0.3.4)
+      tilt (~> 1.3.2)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
+    temple (0.3.5)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  gettext (= 2.3.1)
+  gettext_i18n_rails!
+  haml
+  hamlet
+  rails (~> 3.2.0)
+  rake
+  rspec (~> 2)
+  ruby_parser
+  slim
+  sqlite3 (~> 1.3.6)

data/lib/gettext_i18n_rails/backend.rb

@@ -56,7 +56,8 @@ module GettextI18nRails
           I18n::Backend::Base::RESERVED_KEYS
         end
 
-        string % values.except(*reserved_keys)
+        options = values.except(*reserved_keys)
+        options.any? ? (string % options) : string
       else
         string
       end

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '0.7.1'
+  Version = VERSION = '0.7.2'
 end

data/spec/gettext_i18n_rails/backend_spec.rb

@@ -4,6 +4,10 @@ require "spec_helper"
 FastGettext.silence_errors
 
 describe GettextI18nRails::Backend do
+  before do
+    FastGettext.current_cache = {}
+  end
+
   it "redirects calls to another I18n backend" do
     subject.backend.should_receive(:xxx).with(1,2)
     subject.xxx(1,2)
@@ -23,42 +27,47 @@ describe GettextI18nRails::Backend do
 
   describe :translate do
     it "uses gettext when the key is translatable" do
-      FastGettext.stub(:current_repository).and_return 'xy.z.u'=>'a'
+      FastGettext.should_receive(:current_repository).and_return 'xy.z.u'=>'a'
       subject.translate('xx','u',:scope=>['xy','z']).should == 'a'
     end
 
     it "interpolates options" do
-      FastGettext.stub(:current_repository).and_return 'ab.c'=>'a%{a}b'
+      FastGettext.should_receive(:current_repository).and_return 'ab.c'=>'a%{a}b'
       subject.translate('xx','c',:scope=>['ab'], :a => 'X').should == 'aXb'
     end
 
+    it "will not try and interpolate when there are no options given" do
+      FastGettext.should_receive(:current_repository).and_return 'ab.d' => 'a%{a}b'
+      subject.translate('xx', 'd', :scope=>['ab']).should == 'a%{a}b'
+    end
+
     it "can translate with gettext using symbols" do
-      FastGettext.stub(:current_repository).and_return 'xy.z.v'=>'a'
+      FastGettext.should_receive(:current_repository).and_return 'xy.z.v'=>'a'
       subject.translate('xx',:v ,:scope=>['xy','z']).should == 'a'
     end
 
     it "can translate with gettext using a flat scope" do
-      FastGettext.stub(:current_repository).and_return 'xy.z.x'=>'a'
+      FastGettext.should_receive(:current_repository).and_return 'xy.z.x'=>'a'
       subject.translate('xx',:x ,:scope=>'xy.z').should == 'a'
     end
 
     it "passes non-gettext keys to default backend" do
       subject.backend.should_receive(:translate).with('xx', 'c', {}).and_return 'd'
-      FastGettext.stub(:current_repository).and_return 'a'=>'b'
+      FastGettext.should_receive(:current_repository).and_return 'a'=>'b'
       subject.translate('xx', 'c', {}).should == 'd'
     end
 
     if RUBY_VERSION > "1.9"
       it "produces UTF-8 when not using FastGettext to fix weird encoding bug" do
         subject.backend.should_receive(:translate).with('xx', 'c', {}).and_return 'ü'.force_encoding("US-ASCII")
-        FastGettext.stub(:current_repository).and_return 'a'=>'b'
+        FastGettext.should_receive(:current_repository).and_return 'a'=>'b'
         result = subject.translate('xx', 'c', {})
         result.should == 'ü'
       end
 
       it "does not force_encoding on non-strings" do
         subject.backend.should_receive(:translate).with('xx', 'c', {}).and_return ['aa']
-        FastGettext.stub(:current_repository).and_return 'a'=>'b'
+        FastGettext.should_receive(:current_repository).and_return 'a'=>'b'
         result = subject.translate('xx', 'c', {})
         result.should == ['aa']
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-02 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext
@@ -34,10 +34,27 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Appraisals
 - Gemfile
 - Gemfile.lock
 - Rakefile
 - Readme.md
+- gemfiles/rails.2.3.gemfile
+- gemfiles/rails.2.3.gemfile.lock
+- gemfiles/rails.3.0.gemfile
+- gemfiles/rails.3.0.gemfile.lock
+- gemfiles/rails.3.1.gemfile
+- gemfiles/rails.3.1.gemfile.lock
+- gemfiles/rails.3.2.gemfile
+- gemfiles/rails.3.2.gemfile.lock
+- gemfiles/rails23.gemfile
+- gemfiles/rails23.gemfile.lock
+- gemfiles/rails30.gemfile
+- gemfiles/rails30.gemfile.lock
+- gemfiles/rails31.gemfile
+- gemfiles/rails31.gemfile.lock
+- gemfiles/rails32.gemfile
+- gemfiles/rails32.gemfile.lock
 - gettext_i18n_rails.gemspec
 - init.rb
 - lib/gettext_i18n_rails.rb
@@ -85,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4474784702351779304
+      hash: 1915795330397940793
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4474784702351779304
+      hash: 1915795330397940793
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24