i18n-inflector 2.1.0 → 2.2.0

data/lib/i18n-inflector/options.rb

@@ -22,14 +22,70 @@ module I18n
     # the translation method. Such option should have the name of a
     # global option but prefixed with +inflector_+:
     #   translate('welcome', :inflector_<option_name> => value)
+    # @note This class uses modified version of +attr_accessor+ that
+    #   memorizes any added method name as an option name. These options
+    #   (with +inflector_+ prefix added) are accessible through
+    #   {#known} method. The last method is used by options preparing
+    #   routine when the interpolation is performed.
     class InflectionOptions
 
+      # Prefix used to mark option as a controlling option.
+      OPTION_PREFIX = 'inflector_'
+
+      class <<self
+
+        # @private
+        def known
+          @known
+        end
+
+        # @private
+        alias old_attr_accessor attr_accessor
+        def attr_accessor(*args)
+          r = old_attr_accessor(*args)
+          @known ||= Hash.new
+          args.each do |arg|
+            key = '@' + arg.to_s
+            @known[key.to_sym] = (OPTION_PREFIX + arg.to_s).to_sym
+          end
+          r
+        end
+
+      end
+
+      # This switch enables cache-aware mode. In that mode inflection
+      # options and flags are evaluated before calling original translate
+      # method and all options are passed to that method. Because options
+      # preparation for inflection methods is explicit (any missing switches
+      # and their default values are added to options) then original
+      # translate (or proxy caching method) will receive even those options
+      # that might have been changed globally.
+      # 
+      # Caching modules for I18n may use options passed to the translate
+      # method (if they are plugged in before inflector) for key
+      # transformation since the inflection options may influence
+      # the interpolation process and therefore the resulting string.
+      # 
+      # If however, the caching variant of the translate method is
+      # positioned before inflected variant in methods chain, then
+      # the only way of knowing all the settings by caching routine is to call
+      # <tt>options.options.prepare_options!(options)</tt> on the used backend,
+      # for example:
+      #   I18n.backend.inflector.options.prepare(options)
+      # That will alter the +options+ data so they will contain all switches
+      # and values.
+      # 
+      # @api public
+      # @return [Boolean] state of the switch
+      # @param [Boolean] state +true+ enables, +false+ disables this switch
+      attr_accessor :cache_aware
+
       # This is a switch that enables extended error reporting. When it's enabled then
       # errors are raised in case of unknown or empty tokens present in a pattern
       # or in options. This switch is by default set to +false+.
       # 
-      # @note Local option +:raises+ passed to the {I18n::Backend::Inflector#translate}
-      #   overrides this setting.
+      # @note Local option +:inflector_raises+ passed
+      #   to the {I18n::Backend::Inflector#translate} overrides this setting.
       # 
       # @api public
       # @return [Boolean] state of the switch
@@ -41,8 +97,8 @@ module I18n
       # may make your translation data a bit messy if you're not alert.
       # That's why this switch is by default set to +false+.
       # 
-      # @note Local option +:aliased_patterns+ passed to the {I18n::Backend::Inflector#translate}
-      #   overrides this setting.
+      # @note Local option +:inflector_aliased_patterns+ passed to the
+      #   {I18n::Backend::Inflector#translate} overrides this setting.
       # 
       # @api public
       # @return [Boolean] state of the switch
@@ -50,13 +106,14 @@ module I18n
       attr_accessor :aliased_patterns
 
       # When this switch is set to +true+ then inflector falls back to the default
-      # token for a kind if an inflection option passed to the {I18n::Backend::Inflector#translate} is unknown
-      # or +nil+. Note that the value of the default token will be
+      # token for a kind if an inflection option passed to the
+      # {I18n::Backend::Inflector#translate} is unknown or +nil+.
+      # Note that the value of the default token will be
       # interpolated only when this token is present in a pattern. This switch
       # is by default set to +true+.
       # 
-      # @note Local option +:unknown_defaults+ passed to the {I18n::Backend::Inflector#translate}
-      #   overrides this setting.
+      # @note Local option +:inflector_unknown_defaults+ passed
+      #   to the {I18n::Backend::Inflector#translate} overrides this setting.
       # 
       # @api public
       # @return [Boolean] state of the switch
@@ -85,7 +142,7 @@ module I18n
       #   # :gender option is not present,
       #   # unknown tokens from options are not falling back to default
       #   
-      #   I18n.t('welcome', :unknown_defaults => false)
+      #   I18n.t('welcome', :inflector_unknown_defaults => false)
       #   # => "Dear You"
       # 
       #   # other way of setting an option – globally
@@ -97,7 +154,7 @@ module I18n
       #   # :gender option is not present, free text is present,
       #   # unknown tokens from options are not falling back to default
       #   
-      #   I18n.t('welcome_free', :unknown_defaults => false)
+      #   I18n.t('welcome_free', :inflector_unknown_defaults => false)
       #   # => "Dear You"
       #   
       # @example Example 2
@@ -111,13 +168,13 @@ module I18n
       #   # :gender option is nil
       #   # unknown tokens from options are not falling back to default token for a kind
       #   
-      #   I18n.t('welcome', :gender => nil, :unknown_defaults => false)
+      #   I18n.t('welcome', :gender => nil, :inflector_unknown_defaults => false)
       #   # => "Dear "
       #   
       #   # :gender option is nil, free text is present
       #   # unknown tokens from options are not falling back to default token for a kind
       #   
-      #   I18n.t('welcome_free', :gender => nil, :unknown_defaults => false)
+      #   I18n.t('welcome_free', :gender => nil, :inflector_unknown_defaults => false)
       #   # => "Dear Free"
       # 
       # @example Example 3
@@ -131,20 +188,21 @@ module I18n
       #   # :gender option is unknown,
       #   # unknown tokens from options are not falling back to default token for a kind
       #   
-      #   I18n.t('welcome', :gender => :unknown_blabla, :unknown_defaults => false)
+      #   I18n.t('welcome', :gender => :unknown_blabla, :inflector_unknown_defaults => false)
       #   # => "Dear "
       #   
       #   # :gender option is unknown, free text is present
       #   # unknown tokens from options are not falling back to default token for a kind
       #   
-      #   I18n.t('welcome_free', :gender => :unknown_blabla, :unknown_defaults => false)
+      #   I18n.t('welcome_free', :gender => :unknown_blabla, :inflector_unknown_defaults => false)
       #   # => "Dear Free"
       attr_accessor :unknown_defaults
 
       # When this switch is set to +true+ then inflector falls back to the default
-      # token for a kind if the given inflection option is correct but doesn't exist in a pattern.
+      # token for a kind if the given inflection option is correct but doesn't exist
+      # in a pattern.
       # 
-      # There might happend that the inflection option
+      # There might happen that the inflection option
       # given to {#translate} method will contain some proper token, but that token
       # will not be present in a processed pattern. Normally an empty string will
       # be generated from such a pattern or a free text (if a local fallback is present
@@ -153,7 +211,7 @@ module I18n
       # 
       # This switch is by default set to +false+.
       # 
-      # @note Local option +:excluded_defaults+ passed to the {I18n::Backend::Inflector#translate}
+      # @note Local option +:inflector_excluded_defaults+ passed to the {I18n::Backend::Inflector#translate}
       #   overrides this setting.
       # 
       # @api public
@@ -171,11 +229,11 @@ module I18n
       #           default: n
       #   
       #     welcome:  'Dear @{n:You|m:Sir}'
-      # @example Usage of +:excluded_defaults+ option
+      # @example Usage of +:inflector_excluded_defaults+ option
       #   I18n.t('welcome', :gender => :o)
       #   # => "Dear "
       #   
-      #   I18n.t('welcome', :gender => :o, :excluded_defaults => true)
+      #   I18n.t('welcome', :gender => :o, :inflector_excluded_defaults => true)
       #   # => "Dear You"
       attr_accessor :excluded_defaults
 
@@ -188,13 +246,51 @@ module I18n
       # 
       # @return [void]
       def reset
-        @excluded_defaults  = false
         @unknown_defaults   = true
+        @excluded_defaults  = false
         @aliased_patterns   = false
+        @cache_aware        = false
         @raises             = false
         nil
       end
 
+      # This method processes the given argument
+      # in a way that it will use default values
+      # for options that are missing.
+      # 
+      # @api public
+      # @note It modifies the given object.
+      # @param [Hash] options the options
+      # @return [Hash] the given options
+      def prepare_options!(options)
+        self.class.known.
+        reject { |name,long| options.has_key?(long) }.
+        each   { |name,long| options[long] = instance_variable_get(name) }
+        options
+      end
+
+      # This method prepares options for translate method.
+      # That means removal of all kind-related options
+      # and all options that are flags.
+      # 
+      # @api public
+      # @note It modifies the given object.
+      # @param [Hash] options the given options
+      # @return [Hash] the given options
+      def clean_for_translate!(options)
+        self.class.known.each { |name,long| options.delete long }
+        options
+      end
+
+      # Lists all known options in a long format
+      # (each name preceeded by <tt>inflector_</tt>).
+      # 
+      # @api public
+      # @return [Array<Symbol>] the known options
+      def known
+        self.class.known.values
+      end
+
     end
 
   end

data/lib/i18n-inflector/version.rb

@@ -14,7 +14,7 @@ module I18n
     # @private
     EMAIL       = 'pw@gnu.org'
     # @private
-    VERSION     = '2.1.0'
+    VERSION     = '2.2.0'
     # @private
     NAME        = 'i18n-inflector'
     # @private

data/lib/i18n-inflector.rb

@@ -3,13 +3,16 @@
 require 'i18n'
 
 require 'i18n-inflector/version'
+require 'i18n-inflector/hset'
 require 'i18n-inflector/lazy_enum'
 require 'i18n-inflector/inflection_data_strict'
 require 'i18n-inflector/inflection_data'
 require 'i18n-inflector/options'
-require 'i18n-inflector/backend'
 require 'i18n-inflector/inflector'
+require 'i18n-inflector/config'
+require 'i18n-inflector/backend'
 require 'i18n-inflector/errors'
+require 'i18n-inflector/interpolate'
 require 'i18n-inflector/api_strict'
 require 'i18n-inflector/api'
 

data/test/inflector_test.rb

@@ -73,18 +73,27 @@ class I18nInflectorTest < Test::Unit::TestCase
   end
 
   test "backend inflector store_translations: raises I18n::BadInflectionAlias when bad alias is given" do
-     assert_raise I18n::BadInflectionAlias do
-       store_translations(:xx, :i18n => { :inflections => { :gender => { :o => '@nonexistant' }}})
-     end
-     assert_raise I18n::BadInflectionAlias do
-       store_translations(:xx, :i18n => { :inflections => { :gender => { :default => '@nonexistant' }}})
-     end
-      assert_raise I18n::BadInflectionAlias do
-        store_translations(:xx, :i18n => { :inflections => { :@gender => { :oh => '@nonex' }}})
-      end
-      assert_raise I18n::BadInflectionAlias do
-        store_translations(:xx, :i18n => { :inflections => { :@gender => { :default => '@nonex' }}})
-      end
+    assert_raise I18n::BadInflectionAlias do
+      store_translations(:xx, :i18n => { :inflections => { :gender => { :o => '@xnonexistant' }}})
+    end
+  end
+
+  test "backend inflector store_translations: raises I18n::BadInflectionAlias when bad default is given" do
+    assert_raise I18n::BadInflectionAlias do
+      store_translations(:xx, :i18n => { :inflections => { :gender => { :default => '@ynonexistant' }}})
+    end
+  end
+
+  test "backend inflector strict store_translations: raises I18n::BadInflectionAlias when bad alias is given" do
+    assert_raise I18n::BadInflectionAlias do
+      store_translations(:xx, :i18n => { :inflections => { :@gender => { :oh => '@znonex' }}})
+    end
+  end
+
+  test "backend inflector strict store_translations: raises I18n::BadInflectionAlias when bad default is given" do
+    assert_raise I18n::BadInflectionAlias do
+      store_translations(:xx, :i18n => { :inflections => { :@gender => { :default => '@cnonex' }}})
+    end
   end
 
   test "backend inflector store_translations: raises I18n::BadInflectionToken when bad token is given" do
@@ -108,6 +117,9 @@ class I18nInflectorTest < Test::Unit::TestCase
     assert_equal '@{f:AAAAA|m:BBBBB}', I18n.t('escaped_welcome', :gender => 'f', :locale => :xx)
     store_translations(:xx, 'escaped_welcome' => '\@{f:AAAAA|m:BBBBB}')
     assert_equal '@{f:AAAAA|m:BBBBB}', I18n.t('escaped_welcome', :gender => 'f', :locale => :xx)
+    assert_equal 'Dear All!', I18n.t('welcome', :gender => nil, :locale => :xx, :inflector_unknown_defaults => false)
+    store_translations(:xx, 'escaped_welcome' => 'Dear \@{f:Lady|m:Sir|n:You|All}!');
+    assert_equal 'Dear @{f:Lady|m:Sir|n:You|All}!', I18n.t('escaped_welcome', :locale => :xx, :inflector_unknown_defaults => false)
   end
 
   test "backend inflector translate: picks Lady for :f gender option" do
@@ -162,7 +174,12 @@ class I18nInflectorTest < Test::Unit::TestCase
     assert_equal 'Dear All!', I18n.t('welcome', :gender => nil,       :locale => :xx, :inflector_unknown_defaults => false)
   end
 
-  test "backend inflector translate: falls back to default for no gender option when :inflector_unknown_defaults is false" do
+  test "backend inflector translate: uses default token when inflection option is set to :default" do
+    assert_equal 'Dear You!', I18n.t('welcome', :gender => :default,  :locale => :xx, :inflector_unknown_defaults => true)
+    assert_equal 'Dear You!', I18n.t('welcome', :gender => :default,  :locale => :xx, :inflector_unknown_defaults => false)
+  end
+
+  test "backend inflector translate: falls back to default for no inflection option when :inflector_unknown_defaults is false" do
     assert_equal 'Dear You!', I18n.t('welcome', :locale => :xx, :inflector_unknown_defaults => false)
   end
 
@@ -196,18 +213,18 @@ class I18nInflectorTest < Test::Unit::TestCase
     tr[:xx][:i18n][:inflections][:gender].delete(:default)
     store_translations(:xx, :i18n => { :inflections => { :gender => { :o => 'other' }}})
     assert_raise(I18n::InflectionOptionNotFound)  { I18n.t('welcome', :locale => :xx, :inflector_raises => true) }
-    assert_raise(I18n::InflectionOptionIncorrect) { I18n.t('welcome', :locale => :xx, :gender => "", :inflector_raises => true) }
-    assert_raise(I18n::InflectionOptionIncorrect) { I18n.t('welcome', :locale => :xx, :gender => nil, :inflector_raises => true) }
+    assert_raise(I18n::InvalidInflectionOption) { I18n.t('welcome', :locale => :xx, :gender => "", :inflector_raises => true) }
+    assert_raise(I18n::InvalidInflectionOption) { I18n.t('welcome', :locale => :xx, :gender => nil, :inflector_raises => true) }
     assert_raise I18n::InflectionOptionNotFound do
      I18n.inflector.options.raises = true
      I18n.t('welcome', :locale => :xx)
     end
   end
 
-  test "backend inflector translate: raises I18n::InvalidInflectionToken when bad token is given and inflector_raises is true" do
-    store_translations(:xx, 'hi' => 'Dear @{f:Lady|o:BAD_TOKEN|n:You|First}!')
-    assert_raise(I18n::InvalidInflectionToken) { I18n.t('hi', :locale => :xx, :inflector_raises => true) }
-    assert_raise I18n::InvalidInflectionToken do
+  test "backend inflector translate: raises I18n::MisplacedInflectionToken when misplaced token is given and inflector_raises is true" do
+    store_translations(:xx, 'hi' => 'Dear @{f:Lady|i:BAD_TOKEN|n:You|First}!')
+    assert_raise(I18n::MisplacedInflectionToken) { I18n.t('hi', :locale => :xx, :inflector_raises => true) }
+    assert_raise I18n::MisplacedInflectionToken do
       I18n.inflector.options.raises = true
       I18n.t('hi', :locale => :xx)
     end
@@ -236,6 +253,84 @@ class I18nInflectorTest < Test::Unit::TestCase
     assert_equal 'Dear Dude! Dear Dude!', I18n.t('hi', :gender => :m, :locale => :xx, :test => "Dude")
   end
 
+  test "backend inflector translate: works with complex patterns" do
+    store_translations(:xx, :i18n => { :inflections => { :@tense => { :s => 's', :now => 'now', :past => 'later', :default => 'now' }}})
+    store_translations(:xx, 'hi'  => '@gender+tense{m+now:he is|f+past:she was} here!')
+    assert_equal 'he is here!',   I18n.t('hi', :gender => :m, :locale => :xx, :inflector_raises => true)
+    assert_equal 'he is here!',   I18n.t('hi', :gender => :m, :locale => :xx, :inflector_raises => true)
+    assert_equal 'he is here!',   I18n.t('hi', :gender => :m, :tense  => :s, :locale => :xx, :inflector_excluded_defaults => true)
+    assert_equal 'she was here!', I18n.t('hi', :gender => :f, :tense => :past, :locale => :xx, :inflector_raises => true)
+    assert_equal 'she was here!', I18n.t('hi', :gender => :feminine, :tense => :past, :locale => :xx, :inflector_raises => true)
+    store_translations(:xx, 'hi' => '@gender+tense{masculine+now:he is|feminine+past:she was}')
+    assert_equal 'he is',   I18n.t('hi', :gender => :m, :tense => :now, :inflector_aliased_patterns => true, :locale => :xx)
+    assert_equal 'she was', I18n.t('hi', :gender => :f, :tense => :past, :inflector_aliased_patterns => true, :locale => :xx)
+    store_translations(:xx, 'hi' => '@gender+tense{masculine+now:he is|feminine+past:she was}')
+    assert_equal 'she was', I18n.t('hi', :gender => :f, :tense => :past, :inflector_aliased_patterns => true, :locale => :xx)
+    store_translations(:xx, 'hi' => '@gender+tense{masculine+now:he is|feminine+past:she was}')
+    assert_equal 'she was', I18n.t('hi', :gender => :feminine, :tense => :past, :inflector_aliased_patterns => true, :locale => :xx)
+    store_translations(:xx, 'hi' => '@gender+tense{masculine+now:he is|m+past:he was}')
+    assert_equal 'he was', I18n.t('hi', :gender => :m, :tense => :past, :inflector_aliased_patterns => true, :locale => :xx)
+    store_translations(:xx, 'hi' => '@gender+tense{m+now:he is|masculine+past:he was}')
+    assert_equal 'he was', I18n.t('hi', :gender => :m, :tense => :past, :inflector_aliased_patterns => true, :locale => :xx)
+    store_translations(:xx, 'hi' => '@gender+tense{m+now:~|f+past:she was}')
+    assert_equal 'male now', I18n.t('hi', :gender => :m, :tense => :now, :locale => :xx)
+  end
+
+  test "backend inflector translate: works with multiple patterns" do
+    store_translations(:xx, 'hi'  => '@gender{m:Sir|f:Lady}{m: Lancelot|f: Morgana}')
+    assert_equal 'Sir Lancelot', I18n.t('hi', :gender => :m, :locale => :xx)
+    assert_equal 'Lady Morgana', I18n.t('hi', :gender => :f, :locale => :xx)
+    store_translations(:xx, 'hi'  => '@{m:Sir|f:Lady}{m: Lancelot|f: Morgana}')
+    assert_equal 'Sir Lancelot', I18n.t('hi', :gender => :m, :locale => :xx)
+    assert_equal 'Lady Morgana', I18n.t('hi', :gender => :f, :locale => :xx)
+    store_translations(:xx, 'hi'  => 'Hi @{m:Sir|f:Lady}{m: Lancelot|f: Morgana}!')
+    assert_equal 'Hi Sir Lancelot!', I18n.t('hi', :gender => :m, :locale => :xx)
+  end
+
+  test "backend inflector translate: works with key-based inflections" do
+    I18n.backend.store_translations(:xx, '@hi'  => { :m => 'Sir', :f => 'Lady', :n => 'You',
+                                                     :@free => 'TEST', :@prefix => 'Dear ', :@suffix => '!' })
+    assert_equal 'Dear Sir!',  I18n.t('@hi', :gender => :m, :locale => :xx, :inflector_raises=>true)
+    assert_equal 'Dear Lady!', I18n.t('@hi', :gender => :f, :locale => :xx, :inflector_raises=>true)
+    assert_equal 'Dear TEST!', I18n.t('@hi', :gender => :x, :locale => :xx, :inflector_unknown_defaults => false)
+    assert_equal 'Dear TEST!', I18n.t('@hi', :gender => :x, :locale => :xx, :inflector_unknown_defaults => false)
+  end
+
+  test "backend inflector translate: raises I18n::ComplexPatternMalformed for malformed complex patterns" do
+    store_translations(:xx, :i18n => { :inflections => { :@tense => { :now => 'now', :past => 'later', :default => 'now' }}})
+    store_translations(:xx, 'hi' => '@gender+tense{m+now+cos:he is|f+past:she was} here!')
+    assert_raise I18n::ComplexPatternMalformed do
+      I18n.t('hi', :gender => :m, :person => :you, :locale => :xx, :inflector_raises => true)
+    end
+    store_translations(:xx, 'hi' => '@gender+tense{m+:he is|f+past:she was} here!')
+    assert_raise I18n::ComplexPatternMalformed do
+      I18n.t('hi', :gender => :m, :person => :you, :locale => :xx, :inflector_raises => true)
+    end
+    store_translations(:xx, 'hi' => '@gender+tense{+:he is|f+past:she was} here!')
+    assert_raise I18n::ComplexPatternMalformed do
+      I18n.t('hi', :gender => :m, :person => :you, :locale => :xx, :inflector_raises => true)
+    end
+    store_translations(:xx, 'hi' => '@gender+tense{m:he is|f+past:she was} here!')
+    assert_raise I18n::ComplexPatternMalformed do
+      I18n.t('hi', :gender => :m, :person => :you, :locale => :xx, :inflector_raises => true)
+    end
+  end
+
+  test "backend inflector translate: works with loud tokens" do
+    store_translations(:xx, 'hi' => 'Dear @{m:~|n:You|All}!')
+    assert_equal 'Dear male!', I18n.t('hi', :gender => :m, :locale => :xx)
+    store_translations(:xx, 'hi' => 'Dear @{masculine:~|n:You|All}!')
+    assert_equal 'Dear male!', I18n.t('hi', :gender => :m, :locale => :xx, :inflector_aliased_patterns => true)
+    store_translations(:xx, 'hi' => 'Dear @{f,m:~|n:You|All}!')
+    assert_equal 'Dear male!', I18n.t('hi', :gender => :m, :locale => :xx)
+    store_translations(:xx, 'hi' => 'Dear @{!n:~|n:You|All}!')
+    assert_equal 'Dear male!', I18n.t('hi', :gender => :m, :locale => :xx)
+    store_translations(:xx, 'hi' => 'Dear @{!n:\~|n:You|All}!')
+    assert_equal 'Dear ~!', I18n.t('hi', :gender => :m, :locale => :xx)
+    store_translations(:xx, 'hi' => 'Dear @{!n:\\\\~|n:You|All}!')
+    assert_equal 'Dear \\~!', I18n.t('hi', :gender => :m, :locale => :xx)
+  end
+
   test "backend inflector translate: works with tokens separated by commas" do
     store_translations(:xx, 'hi' => 'Dear @{f,m:Someone|n:You|All}!')
     assert_equal 'Dear Someone!', I18n.t('hi', :gender => :m, :locale => :xx)
@@ -253,7 +348,7 @@ class I18nInflectorTest < Test::Unit::TestCase
     assert_equal 'Hello ',        I18n.t('hi', :gender => :m, :locale => :xx)
     assert_equal 'Hello Ladies',  I18n.t('hi', :locale => :xx)
     store_translations(:xx, 'hi' => 'Hello @{!n:Ladies|m,f:You}')
-    assert_equal 'Hello ',  I18n.t('hi', :locale => :xx, :inflector_raises => true)
+    assert_equal 'Hello ',  I18n.t('hi', :locale => :xx, :inflector_raises => false)
   end
 
   test "backend inflector translate: works with tokens separated by commas and negative tokens" do
@@ -274,6 +369,7 @@ class I18nInflectorTest < Test::Unit::TestCase
     assert_equal 'Dear Sir!',   I18n.t('hi', :gender => :m,         :locale => :xx, :inflector_aliased_patterns => true)
     assert_equal 'Dear Sir!',   I18n.t('hi', :gender => :masculine, :locale => :xx, :inflector_aliased_patterns => true)
     assert_equal 'Dear Lady!',  I18n.t('hi', :gender => :f,         :locale => :xx, :inflector_aliased_patterns => true)
+    assert_equal 'Dear Lady!',  I18n.t('hi', :gender => :feminine,  :locale => :xx, :inflector_aliased_patterns => true)
     assert_equal 'Dear All!',   I18n.t('hi', :gender => :s,         :locale => :xx, :inflector_aliased_patterns => true)
     assert_equal 'Dear You!',   I18n.t('hi', :locale => :xx, :inflector_aliased_patterns => true)
     I18n.inflector.options.aliased_patterns = true
@@ -298,7 +394,68 @@ class I18nInflectorTest < Test::Unit::TestCase
     assert_equal 'Dear You!',   I18n.t('hi', :gender => :s, :@gender => :unknown, :locale => :xx)
     assert_equal 'Dear You!',   I18n.t('hi', :gender => :s, :@gender => nil,      :locale => :xx)
     assert_equal 'Dear Sir!',   I18n.t('hi', :gender => :s, :@gender => :s,       :locale => :xx)
+  end
+
+  test "backend inflector translate: is immune to reserved or bad content" do
+    store_translations(:xx, :i18n => { :inflections => { :@gender => { :s => 'sir', :o => 'other', :s => 'a', :n => 'n', :default => 'n' }}})
+    store_translations(:xx, :i18n => { :inflections => { :@tense => { :now => ''}}})
+    store_translations(:xx, 'hi'  => 'Dear @nonexistant{s:Sir|o:Other|n:You|All}!')
+    assert_equal 'Dear All!',   I18n.t('hi', :gender => 'm',  :locale => :xx)
+    store_translations(:xx, 'hi'  => 'Dear @gender{s:Sir|o:Other|n:You|All}!')
+    assert_equal 'Dear You!',   I18n.t('hi', :gender => '@', :@gender => '+',  :locale => :xx)
+    assert_equal 'Dear You!',   I18n.t('hi', :gender => '',  :@gender => '',   :locale => :xx)
+    store_translations(:xx, 'hi' => '@gender+tense{m+now:~|f+past:she was}')
+    assert_equal 'male ', I18n.t('hi', :gender => :m, :tense => :now, :locale => :xx)
+    assert_raise I18n::ArgumentError do
+      I18n.t('', :gender => :s, :locale => :xx)
+    end
+    assert_raise I18n::InvalidInflectionKind do
+      store_translations(:xx, 'hop' => '@gen,der{m+now:~|f+past:she was}')
+      I18n.t('hop', :gender => :s, :locale => :xx, :inflector_raises => true)
+    end
+    assert_raise I18n::InvalidInflectionToken do
+      I18n.backend.store_translations(:xx, 'hop' => '@{m+now:~|f+past:she was}')
+      I18n.t('hop', :gender => :s, :locale => :xx, :inflector_raises => true)
+    end
+    assert_raise I18n::InvalidInflectionKind do
+      store_translations(:xx, 'hi'  => 'Dear @uuuuuuuu{s:Sir|o:Other|n:You|All}!')
+      I18n.t('hi', :gender => 'm',  :locale => :xx, :inflector_raises => true)
+    end
+    assert_raise I18n::MisplacedInflectionToken do
+      store_translations(:xx, 'hi'  => 'Dear @tense{s:Sir|o:Other|n:You|All}!')
+      I18n.t('hi', :gender => 'm',  :locale => :xx, :inflector_raises => true)
+    end
 
+    I18n.backend = Backend.new
+    assert_raise I18n::BadInflectionKind do
+      store_translations(:xx, :i18n => { :inflections => { :@gender => 'something' }})
+    end
+    I18n.backend = Backend.new
+    store_translations(:xx, 'hi' => '@gender+tense{m+now:~|f+past:she was}')
+    assert_equal '',   I18n.t('hi', :gender => :s, :@gender => :s, :locale => :xx)
+    assert_raise I18n::BadInflectionToken do
+      store_translations(:xx, :i18n => { :inflections => { :@gender => { :sb => '@', :d=>'1'}}})
+    end
+    I18n.backend = Backend.new
+    assert_raise I18n::BadInflectionToken do
+      store_translations(:xx, :i18n => { :inflections => { :@gender => { :sa => nil, :d=>'1'}}})
+    end
+    I18n.backend = Backend.new
+    assert_raise I18n::BadInflectionToken do
+      store_translations(:xx, :i18n => { :inflections => { :@gender => { '' => 'a', :d=>'1'}}})
+    end
+    ['@',',','cos,cos','@cos+cos','+','cos!cos',':','cos:',':cos','cos:cos','!d'].each do |token|
+      I18n.backend = Backend.new
+      assert_raise I18n::BadInflectionToken do
+        store_translations(:xx, :i18n => { :inflections => { :@gender => { token.to_sym => 'a', :d=>'1' }}})
+      end
+    end
+    ['@',',','inflector_something','default','cos,cos','@cos+cos','+','cos!cos',':','cos:',':cos','cos:cos','!d'].each do |kind|
+      I18n.backend = Backend.new
+      assert_raise I18n::BadInflectionKind do
+        store_translations(:xx, :i18n => { :inflections => { kind.to_sym => { :s => 'a', :d=>'1' }}})
+      end
+    end
   end
 
   test "inflector inflected_locales: lists languages that support inflection" do
@@ -648,7 +805,7 @@ class I18nInflectorTest < Test::Unit::TestCase
     assert_equal "male",    I18n.inflector.token_description(:m, :xx)
     I18n.locale = :xx
     assert_equal "male",    I18n.inflector.token_description(:m)
-    assert_equal nil,       I18n.inflector.token_description(:nonexistent,  :xx)
+    assert_equal nil,       I18n.inflector.token_description(:vnonexistent,  :xx)
     assert_equal "neuter",  I18n.inflector.token_description(:neutral,      :xx)
   end
 
@@ -656,7 +813,7 @@ class I18nInflectorTest < Test::Unit::TestCase
     assert_equal "male",    I18n.inflector.strict.token_description(:m, :gender, :xx)
     I18n.locale = :xx
     assert_equal "male",    I18n.inflector.strict.token_description(:m,            :gender)
-    assert_equal nil,       I18n.inflector.strict.token_description(:nonexistent,  :gender, :xx)
+    assert_equal nil,       I18n.inflector.strict.token_description(:bnonexistent,  :gender, :xx)
     assert_equal "neuter",  I18n.inflector.strict.token_description(:neutral,      :gender, :xx)
   end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - "Pawe\xC5\x82 Wilk"
@@ -34,7 +34,7 @@ cert_chain:
   NK3TIZaPCh1S2/ES6wXNvjQ+5EnEEL9j/pSEop9DYEBPaM2WDVR5i0jJTAaRWw==
   -----END CERTIFICATE-----
 
-date: 2011-01-27 00:00:00 +01:00
+date: 2011-02-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -173,10 +173,13 @@ files:
 - lib/i18n-inflector/api.rb
 - lib/i18n-inflector/api_strict.rb
 - lib/i18n-inflector/backend.rb
+- lib/i18n-inflector/config.rb
 - lib/i18n-inflector/errors.rb
+- lib/i18n-inflector/hset.rb
 - lib/i18n-inflector/inflection_data.rb
 - lib/i18n-inflector/inflection_data_strict.rb
 - lib/i18n-inflector/inflector.rb
+- lib/i18n-inflector/interpolate.rb
 - lib/i18n-inflector/lazy_enum.rb
 - lib/i18n-inflector/long_comments.rb
 - lib/i18n-inflector/options.rb
@@ -199,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3836781751216313437
+      hash: -1312043178377028386
       segments: 
       - 0
       version: "0"