r18n-core 1.1.5 → 1.1.6

data/ChangeLog

@@ -1,3 +1,7 @@
+== 1.1.6 (Vitebsk)
+* Return TranslatedString after global String filters.
+* Fix path in global String filters.
+
 == 1.1.5 (Hilo)
 * Fix Sinatra plugin under multithreaded web-server (by Viktors Rotanovs).
 * Fix BigDecimal localizing (by François Beausoleil).

data/README.md

@@ -429,6 +429,12 @@ If you want to load a translation with some type for filter, use
 t.users(5) #=> "5 users"
 ```
 
+You can also set several loaders to merge translations from different sources:
+
+```ruby
+R18n.default_places = [MyLoader.new, DBLoader.new, 'path/to/yaml']
+```
+
 ### Extension Translations
 
 For r18n plugin you can add loaders with translations, which will be used with

data/lib/r18n-core/filter_list.rb

@@ -56,7 +56,12 @@ module R18n
       enabled(filters_type, String).each do |f|
         value = f.call(value, config, *params)
       end
-      value
+
+      if value.class == String
+        TranslatedString.new(value, config[:locale], config[:path])
+      else
+        value
+      end
     end
 
     # Array of enabled filters with +filters_type+ for +type+.

data/lib/r18n-core/translation.rb

@@ -150,7 +150,8 @@ module R18n
       value = @data[name]
       case value
       when TranslatedString
-        @filters.process_string(:active, value, @path, params)
+        path = @path.empty? ? name : "#{@path}.#{name}"
+        @filters.process_string(:active, value, path, params)
       when Typed
         @filters.process_typed(:active, value, params)
       when nil

data/lib/r18n-core/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module R18n
-  VERSION = '1.1.5'.freeze unless defined? R18n::VERSION
+  VERSION = '1.1.6'.freeze unless defined? R18n::VERSION
 end

data/r18n-core.gemspec

@@ -22,14 +22,4 @@ Gem::Specification.new do |s|
   s.author   = 'Andrey "A.I." Sitnik'
   s.email    = 'andrey@sitnik.ru'
   s.homepage = 'https://github.com/ai/r18n'
-
-  s.add_development_dependency "bundler",            [">= 1.0.10"]
-  s.add_development_dependency "yard",               [">= 0"]
-  s.add_development_dependency "rake",               [">= 0", "!= 0.9.0"]
-  s.add_development_dependency "rspec-core",         [">= 0"]
-  s.add_development_dependency "rspec-expectations", [">= 0"]
-  s.add_development_dependency "rspec-mocks",        [">= 0"]
-  s.add_development_dependency "kramdown",           [">= 0"]
-  s.add_development_dependency "RedCloth",           [">= 0"]
-  s.add_development_dependency "redcarpet",          [">= 0"]
 end

data/spec/filters_spec.rb

@@ -42,7 +42,7 @@ describe R18n::Filters do
   end
 
   it "should use passive filters" do
-    filter = mock()
+    filter = double()
     filter.should_receive(:process).twice.and_return(1)
 
     R18n::Filters.add('my', :passive, :passive => true) { filter.process }
@@ -121,6 +121,22 @@ describe R18n::Filters do
     @i18n.my_filter[:unknown_value].should be_nil
   end
 
+  it "should set path in config" do
+    R18n::Filters.add(String) do |i, config|
+      config[:path]
+    end
+
+    @i18n.in.another.level.should == 'in.another.level'
+  end
+
+  it "should return translated string after filters" do
+    R18n::Filters.add(String) { |i, config| i + '1' }
+
+    @i18n.one.should be_a(R18n::TranslatedString)
+    @i18n.one.path.should   == 'one'
+    @i18n.one.locale.should == R18n.locale('en')
+  end
+
   it "should use one config for cascade filters" do
     R18n::Filters.add('my') { |content, config| config[:new_secret] ? 2 : 1 }
     @i18n.my_filter.should == 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r18n-core
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,158 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.10
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    - - ! '!='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    - - ! '!='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: kramdown
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: RedCloth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2013-08-25 00:00:00.000000000 Z
+dependencies: []
 description: ! "    R18n is a i18n tool to translate your Ruby application.\n    It
   has nice Ruby-style syntax, filters, flexible locales, custom loaders,\n    translation
   support for any classes, time and number localization, several\n    user language
@@ -300,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3696730246666431868
+      hash: -2490264881183161480
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -309,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3696730246666431868
+      hash: -2490264881183161480
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23