i18n-inflector 2.4.0 → 2.5.0

data/ChangeLog

@@ -1,3 +1,33 @@
+commit 2fddd234ffe5847ad21d46c36495c02431684ad4
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Wed Feb 23 23:12:04 2011 +0100
+
+    Release 2.5.0
+
+commit 0b49cd677a695db4b8f50151529555155fadce59
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Wed Feb 23 23:08:06 2011 +0100
+
+    Added tests covering fixed bug that caused Arrays to be interpolated in a wrong way
+
+commit 80fa0b092de9bc08ee16e64ae6d93b799e6ee521
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Wed Feb 23 23:07:34 2011 +0100
+
+    Interpolation wrapper refactored; it now operates on Arrays, Hashes, Symbols and other objects
+
+commit ab5f5bc04814c1181bd9919ce159292362abc3bb
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Wed Feb 23 23:06:18 2011 +0100
+
+    Added string version of regexps to constants for debugging purposes
+
+commit 8a27302b1535c68496cc60b55bcdfc958f837300
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Wed Feb 23 23:05:34 2011 +0100
+
+    Dependencies updated
+
 commit 6d343ad3137735492e130b7abdd8f86bf23a4a06
 Author: Paweł Wilk <siefca@gnu.org>
 Date:   Wed Feb 23 02:20:18 2011 +0100

data/README.rdoc

@@ -1,6 +1,6 @@
 = Simple Inflector for I18n
 
-<b>i18n-inflector version <tt>2.3</tt></b> (<b><tt>Dogma</tt></b>)
+<b>i18n-inflector version <tt>2.5</tt></b> (<b><tt>Akasha</tt></b>)
 
 
 

data/Rakefile

@@ -56,9 +56,9 @@ Hoe.spec 'i18n-inflector' do
   self.history_file    = 'docs/HISTORY'
 
   extra_deps          << ['i18n',             '>= 0.4.1']
-  extra_dev_deps      << ['test_declarative', '>= 0.0.4'] <<
-                         ['yard',             '>= 0.6.4'] <<
-                         ['bundler',          '>= 1.0.7'] <<
+  extra_dev_deps      << ['test_declarative', '>= 0.0.4']   <<
+                         ['yard',             '>= 0.6.4']   <<
+                         ['bundler',          '>= 1.0.10']  <<
                          ['hoe-bundler',      '>= 1.0.0']
 
   unless extra_dev_deps.flatten.include?('hoe-yard')

data/ci/i18n-inflector.gemspec

@@ -19,13 +19,14 @@ Gem::Specification.new do |s|
   s.platform     = Gem::Platform::RUBY
   s.require_path = 'lib'
   s.rubyforge_project = '[none]'
-  s.required_rubygems_version = '>= 1.3.5'
+  s.required_rubygems_version = '>= 1.4.0'
   s.specification_version = 3
 
   s.add_dependency             'i18n',              '>= 0.4.1'
   s.add_development_dependency 'test_declarative',  '>= 0.0.4'
   s.add_development_dependency 'rspec',             '>= 2.3.0'
   s.add_development_dependency 'yard',              '>= 1.0.7'
+  s.add_development_dependency 'yard',              '>= 1.0.10'
   s.add_development_dependency 'hoe-yard',          '>= 0.1.2'
   s.add_development_dependency 'hoe-bundler',       '>= 1.0.0'
 

data/docs/HISTORY

@@ -1,8 +1,29 @@
+=== 2.5.0 / 2011-02-24
+
+* major enhancements
+
+  * Interpolation wrapper refactored; works with many types of results
+  * Added :inflector_interpolate_symbols switch
+
+* minor enhancements
+
+  * Added TOKENS_RESTR, MULTI_RESTR and PATTERN_RESTR configuration constants
+  * Dependencies updated
+
+* major bugfixes
+
+  * Fixed interpolation of Arrays
+
+* minor bugfixes
+
+  * Fixed pattern filtering when locale is invalid or not inflected
+
 === 2.4.0 / 2011-02-23
 
 * major enhancements
 
   * Added nested translations (collections) support
+  * Added :inflector_traverses switch
 
 === 2.3.1 / 2011-02-14
 

data/lib/i18n-inflector/config.rb

@@ -258,24 +258,33 @@ module I18n
 
       end # module Reserved
 
+      # A string for regular expression that catches patterns.
+      PATTERN_RESTR   = '(.?)'  + Markers::PATTERN       +
+                        '([^\\' + Markers::PATTERN_BEGIN + ']*)\\' + Markers::PATTERN_BEGIN +
+                        '([^\\' + Markers::PATTERN_END   + ']+)\\' + Markers::PATTERN_END   +
+                        '((?:\\'+ Markers::PATTERN_BEGIN + '([^\\' + Markers::PATTERN_BEGIN +
+                        ']+)\\' + Markers::PATTERN_END   + ')*)'
+
+      # A string for regular expression that extracts additional patterns attached.
+      MULTI_RESTR     = '\\'    + Markers::PATTERN_BEGIN          +
+                        '([^\\' + Markers::PATTERN_END + ']+)\\'  +
+                        Markers::PATTERN_END
+
+      # A regular expression that catches token groups or single tokens.
+      TOKENS_RESTR   = '(?:'   +
+                       '([^'   + Operators::Tokens::ASSIGN + '\\'      + Operators::Tokens::OR + ']+)' +
+                                 Operators::Tokens::ASSIGN + '+'       +
+                       '([^\\' + Operators::Tokens::OR     + ']+)\1?)' +
+                       '|([^'  + Operators::Tokens::ASSIGN + '\\'      + Operators::Tokens::OR + ']+)'
+
       # A regular expression that catches patterns.
-      PATTERN_REGEXP  = Regexp.new  '(.?)'  + Markers::PATTERN       +
-                                    '([^\\' + Markers::PATTERN_BEGIN + ']*)\\' + Markers::PATTERN_BEGIN +
-                                    '([^\\' + Markers::PATTERN_END   + ']+)\\' + Markers::PATTERN_END   +
-                                    '((?:\\'+ Markers::PATTERN_BEGIN + '([^\\' + Markers::PATTERN_BEGIN +
-                                    ']+)\\' + Markers::PATTERN_END   + ')*)'
+      PATTERN_REGEXP  = Regexp.new PATTERN_RESTR
 
       # A regular expression that extracts additional patterns attached.
-      MULTI_REGEXP    = Regexp.new  '\\'    + Markers::PATTERN_BEGIN          +
-                                    '([^\\' + Markers::PATTERN_END + ']+)\\'  +
-                                    Markers::PATTERN_END
+      MULTI_REGEXP    = Regexp.new MULTI_RESTR
 
       # A regular expression that catches token groups or single tokens.
-      TOKENS_REGEXP   = Regexp.new  '(?:'   +
-                                    '([^'   + Operators::Tokens::ASSIGN + '\\'      + Operators::Tokens::OR + ']+)' +
-                                              Operators::Tokens::ASSIGN + '+'       +
-                                    '([^\\' + Operators::Tokens::OR     + ']+)\1?)' +
-                                    '|([^'  + Operators::Tokens::ASSIGN + '\\'      + Operators::Tokens::OR + ']+)'
+      TOKENS_REGEXP   = Regexp.new TOKENS_RESTR
 
     end # module Config
 

data/lib/i18n-inflector/inflector.rb

@@ -22,7 +22,7 @@ module I18n
     end
   end
 
-  # @version 2.3
+  # @version 2.5
   # @api public
   # 
   # This module contains inflection classes and modules for enabling

data/lib/i18n-inflector/interpolate.rb

@@ -40,29 +40,48 @@ module I18n
       #   that overrides global setting (see: {I18n::Inflector::InflectionOptions#cache_aware})
       # @option options [Boolean] :inflector_traverses (true) local switch
       #   that overrides global setting (see: {I18n::Inflector::InflectionOptions#traverses})
+      # @option options [Boolean] :inflector_interpolate_symbols (false) local switch
+      #   that overrides global setting (see: {I18n::Inflector::InflectionOptions#interpolate_symbols})
       # @return [String] the string with interpolated patterns
       def interpolate(string, locale, options = {})
 
-        # traverse tree and call interpolate for each value
-        if string.is_a?(Hash)
-          return string unless options[:inflector_traverses]
-          return string.merge(string) do |k, v|
-            interpolate(v, locale, options)
+        case string
+
+        when String
+
+          if (locale.nil? || !inflected_locale?(locale))
+            string.gsub(PATTERN_REGEXP) { Escapes::PATTERN[$1] ? $& : $1 }
+          elsif !string.include?(Markers::PATTERN)
+            string
+          else
+            interpolate_core(string, locale, options)
           end
-        end
 
-        # return immediatelly if something is wrong with locale (preventive)
-        # return if locale is not inflected - return string cleaned from pattern
-        if (locale.nil? || !inflected_locale?(locale))
-          return string.to_s.gsub(PATTERN_REGEXP) do
-            Escapes::PATTERN[$1] ? $& : ''
+        when Hash
+
+          options[:inflector_traverses] ?
+            string.merge(string) { |k,v| interpolate(v, locale, options) } : string
+
+        when Array
+
+          options[:inflector_traverses] ?
+            string.map { |v| interpolate(v, locale, options) } : string
+
+        when Symbol
+
+          if options[:inflector_interpolate_symbols]
+            r = interpolate(string.to_s, locale, options)
+            r.to_sym rescue :" "
+          else
+            string
           end
-        end
 
-        # no pattern in a string - return string as is
-        return string unless string.to_s.include?(Markers::PATTERN)
+        else
+
+          string
+
+        end
 
-        interpolate_core(string, locale, options)
       end
 
       # This method creates an inflection pattern

data/lib/i18n-inflector/options.rb

@@ -121,6 +121,27 @@ module I18n
       # @param [Boolean] state +true+ enables, +false+ disables this switch
       attr_accessor :traverses
 
+      # This is a switch that enables interpolation of symbols. Whenever
+      # interpolation method will receive a collection of symbols as a result
+      # of calling underlying translation method
+      # it won't process them, returning as they are, unless
+      # this switch is enabled.
+      # 
+      # Note that using symbols as values in translation data creates
+      # I18n aliases. This option is intended to work with arrays of
+      # symbols or hashes with symbols as values, if the original translation
+      # method returns such structures.
+      # 
+      # This switch is by default set to +false+.
+      # 
+      # @note Local option +:inflector_interpolate_symbols+ passed to the
+      #   {I18n::Backend::Inflector#translate} overrides this setting.
+      # 
+      # @api public
+      # @return [Boolean] state of the switch
+      # @param [Boolean] state +true+ enables, +false+ disables this switch
+      attr_accessor :interpolate_symbols
+
       # 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+.
@@ -264,6 +285,7 @@ module I18n
       def reset
         @unknown_defaults   = true
         @traverses          = true
+        @interpolate_symbols= false
         @excluded_defaults  = false
         @aliased_patterns   = false
         @cache_aware        = false

data/lib/i18n-inflector/version.rb

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

data/test/inflector_test.rb

@@ -373,6 +373,32 @@ class I18nInflectorTest < Test::Unit::TestCase
     assert_equal h, I18n.t('welcomes', :gender => :m, :foo => 5, :locale => :xx)
   end
 
+  test "backend inflector translate: works with arrays as results" do
+    a = [ :one, :two, :three ]
+    store_translations(:xx, 'welcomes' => {'hi' => a})
+    store_translations(:uu, 'welcomes' => {'hi' => a})
+    assert_equal a, I18n.t('welcomes.hi', :gender => :m, :locale => :xx)
+    assert_equal a, I18n.t('welcomes.hi', :gender => :m, :locale => :uu)
+    a = [ :one, :two, :"x@{m:man|woman}d" ]
+    store_translations(:xx, 'welcomes' => {'hi' => a})
+    store_translations(:uu, 'welcomes' => {'hi' => a})
+    assert_equal a, I18n.t('welcomes.hi', :gender => :m, :locale => :xx)
+    assert_equal a, I18n.t('welcomes.hi', :gender => :m, :locale => :uu)
+    a = [ :one, :two, :xmand ]
+    assert_equal a, I18n.t('welcomes.hi', :gender => :m, :locale => :xx, :inflector_interpolate_symbols => true)
+    a = [ :one, :two, :xd ]
+    assert_equal a, I18n.t('welcomes.hi', :gender => :m, :locale => :uu, :inflector_interpolate_symbols => true)
+    a = [ :one, :two, :"x@{m:man|woman}d" ]
+    assert_equal a, I18n.t('welcomes.hi', :gender => :m, :locale => :xx, :inflector_traverses => false, :inflector_interpolate_symbols => true)
+    a = [ :one, :two, :"x@{m:man|woman}d" ]
+    assert_equal a, I18n.t('welcomes.hi', :gender => :m, :locale => :uu, :inflector_traverses => false, :inflector_interpolate_symbols => true)
+  end
+
+  test "backend inflector translate: works with other types as results" do
+    store_translations(:xx, 'welcomes' => {'hi' => 31337})
+    assert_equal 31337, I18n.t('welcomes.hi', :gender => :m, :locale => :xx)
+  end
+
   test "backend inflector translate: works with negative tokens" do
     store_translations(:xx, 'hi' => 'Dear @{!m:Lady|m:Sir|n:You|All}!')
     assert_equal 'Dear Lady!',    I18n.t('hi', :gender => :n, :locale => :xx)

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: i18n-inflector
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 4
-  - 0
-  version: 2.4.0
+  prerelease: 
+  version: 2.5.0
 platform: ruby
 authors: 
 - "Pawe\xC5\x82 Wilk"
@@ -44,10 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 1
         version: 0.4.1
   type: :runtime
   prerelease: false
@@ -59,10 +51,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 2
         version: 0.1.2
   type: :development
   prerelease: false
@@ -74,10 +62,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 4
         version: 0.0.4
   type: :development
   prerelease: false
@@ -89,10 +73,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 4
         version: 0.6.4
   type: :development
   prerelease: false
@@ -104,11 +84,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 7
-        version: 1.0.7
+        version: 1.0.10
   type: :development
   prerelease: false
   version_requirements: *id005
@@ -119,10 +95,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   prerelease: false
@@ -134,11 +106,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
+        version: 2.9.1
   type: :development
   prerelease: false
   version_requirements: *id007
@@ -186,7 +154,8 @@ files:
 - lib/i18n-inflector/version.rb
 - test/inflector_test.rb
 - test/test_helper.rb
-has_rdoc: yard
+- .gemtest
+has_rdoc: true
 homepage: https://rubygems.org/gems/i18n-inflector/
 licenses: []
 
@@ -202,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1561613972170107536
+      hash: -3056232506908455898
       segments: 
       - 0
       version: "0"
@@ -211,13 +180,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: i18n-inflector
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Simple inflection module for I18n