i18n-inflector 2.2.0 → 2.3.0

data/lib/i18n-inflector/version.rb

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

data/test/inflector_test.rb

@@ -194,9 +194,11 @@ class I18nInflectorTest < Test::Unit::TestCase
   end
 
   test "backend inflector translate: falls back to default token for ommited gender option when :inflector_excluded_defaults is true" do
-    assert_equal 'Dear You!', I18n.t('welcome', :gender => :s, :locale => :xx, :inflector_excluded_defaults => true)
+    assert_equal 'Dear You!', I18n.t('welcome',       :gender => :s, :locale => :xx, :inflector_excluded_defaults => true)
+    assert_equal 'Dear You!', I18n.t('named_welcome', :@gender => :s, :locale => :xx, :inflector_excluded_defaults => true)
     I18n.inflector.options.excluded_defaults = true
-    assert_equal 'Dear You!', I18n.t('welcome', :gender => :s, :locale => :xx)
+    assert_equal 'Dear You!', I18n.t('welcome',       :gender => :s, :locale => :xx)
+    assert_equal 'Dear You!', I18n.t('named_welcome', :gender => :s, :locale => :xx)
   end
 
   test "backend inflector translate: falls back to free text for ommited gender option when :inflector_excluded_defaults is false" do
@@ -316,9 +318,20 @@ class I18nInflectorTest < Test::Unit::TestCase
     end
   end
 
+  test "backend inflector translate: works with wildcard tokens" do
+    store_translations(:xx, 'hi' => 'Dear @{n:You|*:Any|All}!')
+    assert_equal 'Dear You!', I18n.t('hi', :gender => :n, :locale => :xx)
+    assert_equal 'Dear Any!', I18n.t('hi', :gender => :m, :locale => :xx)
+    assert_equal 'Dear Any!', I18n.t('hi', :gender => :f, :locale => :xx)
+    assert_equal 'Dear You!', I18n.t('hi', :gender => :xxxxxx, :locale => :xx)
+    assert_equal 'Dear You!', I18n.t('hi', :locale => :xx)
+  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 @gender{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}!')
@@ -329,6 +342,23 @@ class I18nInflectorTest < Test::Unit::TestCase
     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)
+    store_translations(:xx, 'hi' => 'Dear @{*:~|n:You|All}!')
+    assert_equal 'Dear male!', I18n.t('hi', :gender => :m, :locale => :xx)
+    store_translations(:xx, 'hi' => 'Dear @{*:~|n:You|All}!')
+    assert_equal 'Dear neuter!', I18n.t('hi', :locale => :xx)
+    store_translations(:xx, 'hi' => 'Dear @{m:abc|*:~|n:You|All}!')
+    assert_equal 'Dear neuter!', I18n.t('hi', :locale => :xx)
+    store_translations(:xx, 'hi' => 'Dear @{*:~|All}!')
+    assert_equal 'Dear All!', I18n.t('hi', :gender => :unasdasd, :locale => :xx)
+    store_translations(:xx, 'hi' => 'Dear @{*:~|All}!')
+    assert_equal 'Dear All!', I18n.t('hi', :gender => nil, :locale => :xx)
+    store_translations(:xx, 'hi' => 'Dear @{*:~|All}!')
+    assert_equal 'Dear neuter!', I18n.t('hi', :gender => :n, :locale => :xx)
+    store_translations(:xx, :i18n => { :inflections => { :@tense => { :s => 's', :now => 'now', :past => 'later', :default => 'now' }}})
+    store_translations(:xx, 'hi' => 'Dear @gender+tense{*+*:~|All}!')
+    assert_equal 'Dear male now!', I18n.t('hi', :gender => :m, :person => :i, :locale => :xx)
+    assert_equal 'Dear neuter now!', I18n.t('hi', :locale => :xx)
+    assert_equal 'Dear neuter later!', I18n.t('hi', :tense => :past, :locale => :xx)
   end
 
   test "backend inflector translate: works with tokens separated by commas" do
@@ -376,6 +406,31 @@ class I18nInflectorTest < Test::Unit::TestCase
     assert_equal 'Dear Sir!', I18n.t('hi', :gender => :masculine, :locale => :xx)
   end
 
+  test "backend inflector translate: works with Method and Proc object given as inflection options" do
+    def femme
+      kind, locale = yield
+      (locale == :xx && kind == :gender) ? :f : :m
+    end
+    def excluded
+      :s
+    end
+    def bad_method(a,b,c)
+      :m
+    end
+    procek = method(:femme)
+    procun = method(:excluded)
+    badmet = method(:bad_method)
+    assert_equal 'Dear Lady!',    I18n.t('welcome',       :gender  => procek,     :locale => :xx, :inflector_raises  => true)
+    assert_equal 'Dear Lady!',    I18n.t('named_welcome', :gender  => procek,     :locale => :xx, :inflector_raises  => true)
+    assert_equal 'Dear Sir!',     I18n.t('named_welcome', :@gender => procek,     :locale => :xx, :inflector_raises  => true)
+    assert_equal 'Dear You!',     I18n.t('named_welcome', :@gender => procun,     :locale => :xx, :inflector_excluded_defaults => true)
+    assert_equal 'Dear All!',     I18n.t('named_welcome', :@gender => procun,     :locale => :xx, :inflector_excluded_defaults => false)
+    assert_raise(ArgumentError) { I18n.t('named_welcome', :@gender => badmet,     :locale => :xx, :inflector_raises => true) }
+    assert_equal 'Dear Sir!',     I18n.t('named_welcome', :@gender => lambda{|k,l|:m}, :locale => :xx, :inflector_raises  => true)
+    assert_equal 'Dear Lady!',    I18n.t('welcome',       :gender  => lambda{|k,l| k==:gender ? :f : :s},
+                                                          :locale => :xx, :inflector_raises  => true)
+  end
+
   test "backend inflector translate: recognizes named patterns and strict kinds" do
     store_translations(:xx, :i18n => { :inflections => { :@gender => { :s => 'sir', :o => 'other', :s => 'a', :n => 'n', :default => 'n' }}})
     store_translations(:xx, 'hi'  => 'Dear @gender{s:Sir|o:Other|n:You|All}!')

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 2
+  - 3
   - 0
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors: 
 - "Pawe\xC5\x82 Wilk"
@@ -34,7 +34,7 @@ cert_chain:
   NK3TIZaPCh1S2/ES6wXNvjQ+5EnEEL9j/pSEop9DYEBPaM2WDVR5i0jJTAaRWw==
   -----END CERTIFICATE-----
 
-date: 2011-02-09 00:00:00 +01:00
+date: 2011-02-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -166,8 +166,8 @@ files:
 - docs/HISTORY
 - docs/LEGAL
 - docs/LGPL
-- docs/RELATIONS
 - docs/TODO
+- docs/USAGE
 - docs/rdoc.css
 - lib/i18n-inflector.rb
 - lib/i18n-inflector/api.rb
@@ -202,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1312043178377028386
+      hash: 328005108320986089
       segments: 
       - 0
       version: "0"

data/docs/RELATIONS

@@ -1,28 +0,0 @@
-== This library contains
-
-* Module {I18n::Inflector} containing everything
-* Class {I18n::Inflector::API} used to create inflector object attached to I18n backend (handles regular and strict kinds)
-* Class {I18n::Inflector::API_Strict} which instance is attached to {I18n::Inflector::API} and handles strict kinds
-* Class {I18n::Inflector::InflectionData} used to store inflection data for regular kinds and tokens
-* Class {I18n::Inflector::InflectionData_Strict} used to store inflection data for strict kinds and tokens
-* Class {I18n::Inflector::InflectionOptions} used for keeping switches and options 
-* Class {I18n::Inflector::LazyHashEnumerator} used to manage lazy evaluation of internal data
-* Module {I18n::Backend::Inflector} used to alter methods of {I18n::Backend::Simple}
-* Several classes for error reporting
-
-== Relations
-
-* {I18n.backend} is the currently used backend and the instance of {I18n::Backend::Simple}
-* {I18n.backend.inflector} is the instance of {I18n::Inflector::API} attached to backend
-* {I18n.inflector} is the proxy module method that calls inflector for currently used backend {I18n.backend.inflector}
-* {I18n.backend.inflector.options} is the instance of {I18n::Inflector::InflectionOptions} and
-  mainly it controls a behavior of interpolation method
-* {I18n.backend.inflector.strict} is the instance of {I18n::Inflector::API_Strict} and handles strict kinds
-* {I18n.backend.inflector} uses {I18n.backend.inflector.strict} to access strict kinds when it's needed
-* {I18n::Inflector::API} has an instance variable @idb that contains database of inflections indexed by locale
-* {I18n::Inflector::API_Strict} has an instance variable @idb that contains database of inflections indexed by locale
-* Translation databases are kind of {I18n::Inflector::InflectionData} and {I18n::Inflector::InflectionData_Strict}
-* When initializing translations a method from {I18n::Backend::Simple} (altered by {I18n::Backend::Inflector})
-  takes the loaded data, processes their <tt>i18n.inflections</tt> scope for each locale and creates database
-  objects which are kind of {I18n::Inflector::InflectionData} and {I18n::Inflector::InflectionData_Strict}. That
-  objects are then attached to instances of {I18n::Inflector::API} and {I18n::Inflector::API_Strict}.