r18n-core 1.0.1 → 1.1.0

data/ChangeLog

@@ -1,3 +1,13 @@
+== 1.1.0 (Leipzig)
+* A lot of fixes in Rails I18n compatibility (thanks for Stephan Schubert).
+* Return Untranslted, when user try to call another translation key on
+  already translated string.
+* Add Translation#to_hash to get raw translation.
+* Add Translation#inspect to easy debug.
+* Return translation, when pluralization filter didn’t get count.
+* Set R18n backend on Rails plugin init, to use it in console.
+* Allow to use Fixnum in translation keys.
+
 == 1.0.1 (Phuket Town)
 * Fix translation reloading in Rails and Sinatra.
 * Use global R18n settings for Sinatra extension.

data/Rakefile

@@ -18,7 +18,7 @@ RSpec::Core::RakeTask.new
 
 task :spec_syck do
   ENV['test_syck'] = '1'
-  sh "#{RUBY} -S rake spec", :verbose => false
+  Rake::Task['spec'].execute
 end
 
 require 'yard'

data/lib/r18n-core/filters.rb

@@ -213,6 +213,10 @@ module R18n
     eval("proc { #{content} }").call(*params)
   end
 
+  # Class to mark unpluralized translation.
+  class UnpluralizetedTranslation < Translation
+  end
+
   Filters.add('pl', :pluralization) do |content, config, param|
     param = param.to_i if param.is_a? Float
     if param.is_a? Numeric
@@ -220,7 +224,8 @@ module R18n
       type = 'n' if not content.has_key? type
       content[type]
     else
-      content
+      UnpluralizetedTranslation.new(config[:locale], config[:path],
+        :locale => config[:locale], :translations => content)
     end
   end
 

data/lib/r18n-core/translated_string.rb

@@ -29,10 +29,11 @@ module R18n
 
     # Returns a new string object containing a copy of +str+, which translated
     # for +path+ to +locale+
-    def initialize(str, locale, path)
+    def initialize(str, locale, path, filters = nil)
       super(str)
-      @locale = locale
-      @path   = path
+      @filters = filters
+      @locale  = locale
+      @path    = path
     end
 
     # Return self for translated string.
@@ -55,8 +56,20 @@ module R18n
       if respond_to? :html_safe
         html_safe
       else
-        self
+        String.new(self)
       end
     end
+
+    # Return untranslated for deeper node `key`. It is in separated methods to
+    # be used in R18n I18n backend.
+    def get_untranslated(key)
+      translated = @path.empty? ? '' : "#{@path}."
+      Untranslated.new(translated, key, @locale, @filters)
+    end
+
+    # Return untranslated, when user try to go deeper in translation.
+    def method_missing(name, *params)
+      get_untranslated(name.to_s)
+    end
   end
 end

data/lib/r18n-core/translation.rb

@@ -94,7 +94,7 @@ module R18n
           when String
             c = { :locale => locale, :path => path }
             v = @filters.process_string(:passive, value, c, [])
-            value = TranslatedString.new(v, locale, path)
+            value = TranslatedString.new(v, locale, path, @filters)
           when Typed
             value.locale = locale
             value.path   = path
@@ -115,9 +115,25 @@ module R18n
                       [@path, '', @path])
     end
 
+    # Override inspect to easy debug.
+    def inspect
+      path = @path.empty? ? 'root' : "`#{@path}`"
+      "Translation #{path} for #{@locale.code} #{@data.inspect}"
+    end
+
     # Return current translation keys.
+    #
+    # Deprecated. Use <tt>to_hash.keys</tt>.
     def translation_keys
-      @data.keys
+      to_hash.keys
+    end
+
+    # Return hash of current translation node.
+    def to_hash
+      Utils.hash_map(@data) do |key, value|
+        value = value.to_hash if value.is_a? Translation
+        [key, value]
+      end
     end
 
     # Return +default+.
@@ -130,7 +146,8 @@ module R18n
     # Translation can contain variable part. Just set is as <tt>%1</tt>,
     # <tt>%2</tt>, etc in translations file and set values in next +params+.
     def [](name, *params)
-      value = @data[name.to_s]
+      name = name.to_s if not name.is_a? String and not name.is_a? Fixnum
+      value = @data[name]
       case value
       when TranslatedString
         @filters.process_string(:active, value, @path, params)
@@ -138,7 +155,7 @@ module R18n
         @filters.process_typed(:active, value, params)
       when nil
         translated = @path.empty? ? '' : "#{@path}."
-        Untranslated.new(translated, name.to_s, @locale, @filters)
+        Untranslated.new(translated, name, @locale, @filters)
       else
         value
       end

data/lib/r18n-core/version.rb

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

data/lib/r18n-core/yaml_loader.rb

@@ -89,14 +89,19 @@ module R18n
       # Wrap YAML private types to Typed.
       def transform(a_hash)
         R18n::Utils.hash_map(a_hash) do |key, value|
-          [key,
-           case value
-             when @private_type_class
-               Typed.new(value.type_id, value.value)
-             when Hash
-               transform(value)
-             else value
-           end]
+          value = case value
+          when @private_type_class
+            v = value.value
+            if v.respond_to?(:force_encoding) and v.encoding != __ENCODING__
+              v = v.force_encoding(__ENCODING__)
+            end
+            Typed.new(value.type_id, v)
+          when Hash
+            transform(value)
+          else
+            value
+          end
+          [key, value]
         end
       end
     end

data/lib/r18n-core.rb

@@ -29,9 +29,9 @@ require dir.join('locale').to_s
 require dir.join('unsupported_locale').to_s
 require dir.join('translated_string').to_s
 require dir.join('untranslated').to_s
+require dir.join('translation').to_s
 require dir.join('filters').to_s
 require dir.join('filter_list').to_s
-require dir.join('translation').to_s
 require dir.join('yaml_loader').to_s
 require dir.join('i18n').to_s
 require dir.join('helpers').to_s
@@ -84,6 +84,8 @@ module R18n
       thread[:r18n_i18n] = thread[:r18n_setter] = @i18n = @setter = nil
       clear_cache!
     end
+
+    # Deprecated.
     alias :reset :reset!
 
     # Get the current thread.

data/spec/filters_spec.rb

@@ -153,8 +153,10 @@ describe R18n::Filters do
   end
 
   it "shouldn't pluralize without first numeric parameter" do
-    @i18n.files.should     == { 1 => '1 file', 'n' => '%1 files' }
-    @i18n.files('').should == { 1 => '1 file', 'n' => '%1 files' }
+    @i18n.files.should       be_a(R18n::UnpluralizetedTranslation)
+    @i18n.files('').should   be_a(R18n::UnpluralizetedTranslation)
+    @i18n.files[1].should    == '1 file'
+    @i18n.files.n(5).should  == '5 files'
   end
 
   it "should convert first float parameter to number" do

data/spec/translation_spec.rb

@@ -68,4 +68,36 @@ describe R18n::Translation do
     translation.count(5).should == 'many'
   end
 
+  it "should return hash of translations" do
+    i18n = R18n::I18n.new('en', DIR)
+    i18n.in.to_hash.should == {
+      'another' => { 'level' => 'Hierarchical' }
+    }
+  end
+
+  it "should return untranslated, when we go deeper string" do
+    en = R18n.locale('en')
+    translation = R18n::Translation.new(en, '',
+      :locale => en, :translations => { 'a' => 'A' })
+
+    translation.a.b.should be_a(R18n::Untranslated)
+    translation.a.b.translated_path.should   == 'a.'
+    translation.a.b.untranslated_path.should == 'b'
+  end
+
+  it "should inspect translation" do
+    en = R18n.locale('en')
+
+    translation = R18n::Translation.new(en, 'a',
+      :locale => en, :translations => { 'a' => 'A' })
+    translation.inspect.should == 'Translation `a` for en {"a"=>"A"}'
+
+    translation = R18n::Translation.new(en, '',
+      :locale => en, :translations => { 'a' => 'A' })
+    translation.inspect.should == 'Translation root for en {"a"=>"A"}'
+
+    translation = R18n::Translation.new(en, '')
+    translation.inspect.should == 'Translation root for en {}'
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r18n-core
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -297,7 +297,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3931827469984591101
+      hash: 1266686224539252765
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -306,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3931827469984591101
+      hash: 1266686224539252765
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23