r18n-core 1.1.1 → 1.1.2

data/ChangeLog

@@ -1,3 +1,8 @@
+== 1.1.2 (Marshal)
+* Fix translation and untranslated marshalizing (by silentshade).
+* Allow to compare untranslated strings.
+* Fix untranslated strings output in tests.
+
 == 1.1.1 (Dunhuang)
 * Don’t change YAML parser in Ruby 1.9.
 * Allow to change locale by argument in R18n Rails backend.

data/lib/r18n-core/translated_string.rb

@@ -60,6 +60,17 @@ module R18n
       end
     end
 
+    # Override marshal_dump to avoid Marshalizing filter procs
+    def _dump(limit)
+      [@locale.code, @path, to_str].join(":")
+    end
+
+    # Load object from Marshalizing.
+    def self._load(str)
+      arr = str.split(":", 3)
+      new arr[2], R18n.locale(arr[0]), arr[1]
+    end
+
     # Return untranslated for deeper node `key`. It is in separated methods to
     # be used in R18n I18n backend.
     def get_untranslated(key)

data/lib/r18n-core/untranslated.rb

@@ -44,6 +44,9 @@ module R18n
     # Path, that exists in translation.
     attr_reader :translated_path
 
+    # Main locale, where string was try to find
+    attr_reader :locale
+
     def initialize(translated_path, untranslated_path, locale, filters)
       @translated_path   = translated_path
       @untranslated_path = untranslated_path
@@ -60,8 +63,24 @@ module R18n
       false
     end
 
-    def method_missing(*params)
-      self[params.first]
+    # Override marshal_dump to avoid Marshalizing filter procs
+    def _dump(limit)
+      [@locale.code, @translated_path, @untranslated_path].join(":")
+    end
+
+    # Load object from Marshalizing.
+    def self._load(str)
+      arr = str.split(":", 3)
+      new arr[1], arr[2], R18n.locale(arr[0]), GlobalFilterList.instance
+    end
+
+    def method_missing(name, *params)
+      # It is need to fix some hack in specs
+      if name == :to_ary
+        raise NoMethodError, "undefined method `to_ary' for #{to_s}"
+      end
+
+      self[name]
     end
 
     def [](*params)
@@ -79,5 +98,14 @@ module R18n
     end
 
     alias :to_str :to_s
+
+    # Is another locale has same code.
+    def ==(untrsl)
+      return false unless untrsl.is_a? Untranslated
+      return false unless locale            == untrsl.locale
+      return false unless translated_path   == untrsl.translated_path
+      return false unless untranslated_path == untrsl.untranslated_path
+      true
+    end
   end
 end

data/lib/r18n-core/version.rb

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

data/spec/i18n_spec.rb

@@ -220,4 +220,17 @@ describe R18n::I18n do
     i18n.l(Date.new(0)).should == '01.01.0000'
   end
 
+  it "should return marshalizable values", :not_ruby => 1.8 do
+    i18n    = R18n::I18n.new('en', DIR, :off_filters => :untranslated,
+                                        :on_filters  => :untranslated_html)
+    demarsh = Marshal.load(Marshal.dump(i18n.t.one))
+
+    i18n.t.one.should        == demarsh
+    i18n.t.one.path.should   == demarsh.path
+    i18n.t.one.locale.should == demarsh.locale
+
+    demarsh = Marshal.load(Marshal.dump(i18n.t.no_translation))
+    i18n.t.no_translation.should == demarsh
+  end
+
 end

data/spec/spec_helper.rb

@@ -40,3 +40,9 @@ end
 if '1.8.' != RUBY_VERSION[0..3]
   YAML::ENGINE.yamler = ENV['test_syck'] ? 'syck' : 'psych'
 end
+
+RSpec.configure do |c|
+  c.filter_run_excluding :not_ruby => lambda { |version|
+    RUBY_VERSION.to_s.start_with? version.to_s
+  }
+end

data/spec/translation_spec.rb

@@ -8,6 +8,10 @@ describe R18n::Translation do
     i18n.not.exists.should be_a(R18n::Untranslated)
     i18n.not.exists.should_not be_translated
     (i18n.not.exists | 'default').should == 'default'
+    i18n.not.exists.locale.should == R18n.locale('en')
+
+    i18n.not.exists.should == i18n.not.exists
+    i18n.not.exists.should_not == i18n.not.exists2
 
     (i18n.in | 'default').should == 'default'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r18n-core
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -298,7 +298,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1126722854268271207
+      hash: 631700017419690142
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -307,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1126722854268271207
+      hash: 631700017419690142
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23