i18n-inflector 2.5.1 → 2.6.1

data/ChangeLog

@@ -1,3 +1,83 @@
+commit fd7508c5bd759e071feae8180b98ed9bf6c2931f
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sun Jul 10 03:16:21 2011 +0200
+
+    Release 2.6.1
+
+commit 613cf034568c536b2dc0edc2d0cf0e80f95afe6a
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sat Jul 9 18:58:06 2011 +0200
+
+    Added @inflected_locales_cache that speeds up reporting of locales that support inflection
+
+commit 950e6b8589f2d8893d30e1b892c8ed0fa1e26a78
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sat Jul 9 02:42:14 2011 +0200
+
+    Gem dependencies updated.
+
+commit cd549b15580aff33d212e92870b16942b6cf8f55
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Fri Jul 8 16:30:01 2011 +0200
+
+    Handling methods and Proc objects to obtain inflection options seriously improved
+    
+     - added cache for inflection options that keeps them between calls to interpolate_core.
+
+commit 5858b52225759e9760ec2301671cf78e64d02f33
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sat Apr 30 18:47:04 2011 +0200
+
+    Lazy operations optimized a bit
+
+commit ee37910a2419afb9710ff0f1472634b29be7f0d8
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sat Apr 30 18:46:23 2011 +0200
+
+    Fixed documentation links
+
+commit e6b753ac280b14a7c32de2bab3dd9540d72cde72
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Mon Mar 7 00:45:23 2011 +0100
+
+    Release 2.6.0
+
+commit a949e5aad5a2bed695fc3e00f129dd56dda73daa
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sun Mar 6 23:41:32 2011 +0100
+
+    Engine initialization improved
+
+commit af4ea17f1961dd54bd600d789c33187af9cc9d69
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sun Mar 6 23:36:15 2011 +0100
+
+    Added union operators to some arrays
+
+commit e21b810282bd98e3e49030267382d2a4358ab285
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sun Mar 6 23:35:14 2011 +0100
+
+    Added lazy iteration interfaces to API and core classes
+
+commit 8f480682b1f5c418c31cbbdfb3b5f1b3d3549713
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sat Mar 5 14:32:52 2011 +0100
+
+    Added a note about YAML parsing issues.
+
+commit 9fb6687d1e7ae003fb653d2af426e522f6d9f399
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sat Mar 5 14:32:25 2011 +0100
+
+    Fixed static gemspec
+
+commit 6ccbc782f089c603afeff48a7b7492011b486dfe
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sat Mar 5 14:31:42 2011 +0100
+
+    Optimized contatenations if Strings
+
 commit b62605859be67525a5c2f902a387fa92f0adebb8
 Author: Paweł Wilk <siefca@gnu.org>
 Date:   Fri Feb 25 19:33:24 2011 +0100

data/Gemfile

@@ -1,14 +1,17 @@
 # -*- ruby -*-
 
+# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.
+
 source :gemcutter
 
 gem "i18n", ">=0.4.1"
 
 gem "hoe-yard", ">=0.1.2", :group => [:development, :test]
-gem "test_declarative", ">=0.0.4", :group => [:development, :test]
-gem "yard", ">=0.6.4", :group => [:development, :test]
-gem "bundler", ">=1.0.7", :group => [:development, :test]
-gem "hoe-bundler", ">=1.0.0", :group => [:development, :test]
-gem "hoe", ">=2.8.0", :group => [:development, :test]
+gem "test_declarative", ">=0.0.5", :group => [:development, :test]
+gem "yard", ">=0.7.2", :group => [:development, :test]
+gem "rdoc", ">=3.8.0", :group => [:development, :test]
+gem "bundler", ">=1.0.15", :group => [:development, :test]
+gem "hoe-bundler", ">=1.1.0", :group => [:development, :test]
+gem "hoe", "~>2.10", :group => [:development, :test]
 
 # vim: syntax=ruby

data/Gemfile.lock

@@ -0,0 +1,27 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    hoe (2.10.0)
+      rake (~> 0.8)
+    hoe-bundler (1.1.0)
+      hoe (>= 2.2.0)
+    hoe-yard (0.1.2)
+      yard (>= 0.2.3.1)
+    i18n (0.6.0)
+    rake (0.9.2)
+    rdoc (3.8)
+    test_declarative (0.0.5)
+    yard (0.7.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.0.15)
+  hoe (~> 2.10)
+  hoe-bundler (>= 1.1.0)
+  hoe-yard (>= 0.1.2)
+  i18n (>= 0.4.1)
+  rdoc (>= 3.8.0)
+  test_declarative (>= 0.0.5)
+  yard (>= 0.7.2)

data/Manifest.txt

@@ -1,12 +1,14 @@
 .yardopts
 ChangeLog
 Gemfile
+Gemfile.lock
 LGPL-LICENSE
 Manifest.txt
 README.rdoc
 Rakefile
 ci/i18n-inflector.gemspec
 ci/i18nv4-Gemfile
+ci/i18nv4-Gemfile.lock
 docs/COPYING
 docs/EXAMPLES
 docs/HISTORY

data/README.rdoc

@@ -1,6 +1,6 @@
 = Simple Inflector for I18n
 
-<b>i18n-inflector version <tt>2.5</tt></b> (<b><tt>Akasha</tt></b>)
+<b>i18n-inflector version <tt>2.6</tt></b> (<b><tt>Madonna</tt></b>)
 
 
 
@@ -62,6 +62,32 @@ Example translation data:
       @prefix:  "Dear "
       @suffix:  "!"
       @free:    "All"
+      
+=== Note about YAML parsing
+
+The example above is not compatible with Psych parser, which is used
+by Rails 3. There are two ways to solve that problem.
+
+First is to change a YAML file and replace any value that has
+special meaning with a symbol:
+
+  en:
+    i18n:
+      inflections:
+        gender:
+          f:        "female"
+          m:        "male"
+          n:        "neuter"
+          female:   :@f
+          male:     :@m
+          default:  :n
+  
+Second way is to use other parser by adding to +config/boot.rb+:
+
+  require 'yaml'
+  YAML::ENGINE.yamler = 'syck'
+
+== New features
 
 From version 2.1.0 the Inflector supports so called named patterns,
 which can be used if there is a need to be strict and/or to

data/Rakefile

@@ -20,6 +20,14 @@ task :default do
   Rake::Task[:testv4].invoke
 end
 
+# Update Gemfile for I18n in version 4
+task :gemfilev4 do
+  gemprev = ENV['BUNDLE_GEMFILE']
+  ENV['BUNDLE_GEMFILE'] = 'ci/i18nv4-Gemfile'
+  `rake bundler:gemfile`
+  ENV['BUNDLE_GEMFILE'] = gemprev
+end
+
 # Tests for I18n in version 4
 task :testv4 do
   gemprev = ENV['BUNDLE_GEMFILE']
@@ -56,14 +64,16 @@ 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.10']  <<
-                         ['hoe-bundler',      '>= 1.0.0']
+  extra_dev_deps      << ['test_declarative', '>= 0.0.5']   <<
+                         ['yard',             '>= 0.7.2']   <<
+                         ['rdoc',             '>= 3.8.0']   <<
+                         ['bundler',          '>= 1.0.15']  <<
+                         ['hoe-bundler',      '>= 1.1.0']
 
   unless extra_dev_deps.flatten.include?('hoe-yard')
     extra_dev_deps << ['hoe-yard', '>= 0.1.2']
   end
+
 end
 
 task 'Manifest.txt' do

data/ci/i18n-inflector.gemspec

@@ -2,6 +2,7 @@
 
 lib = File.expand_path('../../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
+
 require 'i18n-inflector/version'
 
 Gem::Specification.new do |s|
@@ -13,9 +14,9 @@ Gem::Specification.new do |s|
   s.summary      = I18n::Inflector::SUMMARY
   s.description  = I18n::Inflector::DESCRIPTION
 
-  s.files        = Dir.glob("{ci,lib,spec,docs}/**/**") + %w(Gemfile .rspec .yardopts README.rdoc LGPL-LICENSE ChangeLog Manifest.txt)
+  s.files        = Dir.glob("{ci,lib,spec,docs}/**/**") + %w(Gemfile .yardopts README.rdoc LGPL-LICENSE ChangeLog Manifest.txt)
   s.extra_rdoc_files = ["README.rdoc", "docs/USAGE", "docs/EXAMPLES", "docs/TODO", "docs/HISTORY", "docs/LEGAL", "docs/LGPL", "docs/COPYING"]
-  s.rdoc_options = ["--main", "README.rdoc"]
+  s.rdoc_options = [ "--charset=UTF-8", "--main", "README.rdoc"]
   s.platform     = Gem::Platform::RUBY
   s.require_path = 'lib'
   s.rubyforge_project = '[none]'
@@ -23,11 +24,11 @@ Gem::Specification.new do |s|
   s.specification_version = 3
 
   s.add_dependency             'i18n',              '>= 0.4.1'
-  s.add_development_dependency 'test_declarative',  '>= 0.0.4'
+  s.add_development_dependency 'test_declarative',  '>= 0.0.5'
   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 'yard',              '>= 0.7.2'
+  s.add_development_dependency 'bundler',           '>= 1.0.15'
   s.add_development_dependency 'hoe-yard',          '>= 0.1.2'
-  s.add_development_dependency 'hoe-bundler',       '>= 1.0.0'
+  s.add_development_dependency 'hoe-bundler',       '>= 1.1.0'
 
 end

data/ci/i18nv4-Gemfile

@@ -10,6 +10,6 @@ gem "yard", ">=0.6.4", :group => [:development, :test]
 gem "bundler", ">=1.0.7", :group => [:development, :test]
 gem "hoe-bundler", ">=1.0.0", :group => [:development, :test]
 gem "hoe-yard", ">=0.1.2", :group => [:development, :test]
-gem "hoe", ">=2.8.0", :group => [:development, :test]
+gem "hoe", ">=2.10.0", :group => [:development, :test]
 
 # vim: syntax=ruby

data/ci/i18nv4-Gemfile.lock

@@ -0,0 +1,25 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    hoe (2.10.0)
+      rake (~> 0.8)
+    hoe-bundler (1.1.0)
+      hoe (>= 2.2.0)
+    hoe-yard (0.1.2)
+      yard (>= 0.2.3.1)
+    i18n (0.4.2)
+    rake (0.9.2)
+    test_declarative (0.0.5)
+    yard (0.7.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.0.7)
+  hoe (>= 2.10.0)
+  hoe-bundler (>= 1.0.0)
+  hoe-yard (>= 0.1.2)
+  i18n (>= 0.4.1, < 0.5.0)
+  test_declarative (>= 0.0.4)
+  yard (>= 0.6.4)

data/docs/HISTORY

@@ -1,3 +1,25 @@
+=== 2.6.1 / 2011-07-10
+
+* major enhancements
+
+  * Handling of methods and Proc objects used to obtain inflection options improved by caching
+  * Added caching for methods reporting locales that support inflection
+  * Lazy operations optimized
+
+* minor enhancements
+
+  * Fixed documentation links
+  * Dependencies updated
+
+=== 2.6.0 / 2011-03-08
+
+* minor enhancements
+
+  * Strings concatenation optimized
+  * API methods simplified
+  * Added lazy iteration methods to I18n::Inflector::InflectionData and I18n::Inflector::InflectionData_Strict
+  * Added lazy iteration methods to I18n::Inflector::API and I18n::Inflector::API_Strict
+
 === 2.5.1 / 2011-02-25
 
 * minor enhancements

data/docs/TODO

@@ -1,7 +1,8 @@
 == Near future
 
+
+
 == Distant future
 
 * split interpolate_core and make it more reusable by raw data (e.g. pattern content)
 * allow different descriptions for aliases pointing to the same token, e.g.: now: @present ="description"
-

data/docs/USAGE

@@ -64,6 +64,34 @@ Elements in the example above are:
 * <tt>@f</tt>, <tt>@m</tt>: pointers to real tokens 
 * +default+: default token for a kind +gender+
 
+=== Note about YAML parsing
+
+The example above is not compatible with Psych parser, which is used
+by Rails 3. There are two ways to solve that problem.
+
+First is to make a change in a YAML file and replace any value that has
+special meaning with a symbol:
+
+  en:
+    i18n:
+      inflections:
+        gender:
+          f:        "female"
+          m:        "male"
+          n:        "neuter"
+          female:   :@f
+          male:     :@m
+          default:  :n
+  
+Second way is to use other parser by adding to +config/boot.rb+:
+
+  require 'yaml'
+  YAML::ENGINE.yamler = 'syck'
+
+Note that all the examples in this documentation use the less strict format.
+If you will encounter any parsing problems in your application then change
+all problematic inflection values in YAML files into symbols.
+
 === Kind
 Note the fourth scope selector in the example above (+gender+). It's called
 the *kind* and contains *tokens*. We have the kind

data/lib/i18n-inflector/api.rb

@@ -2,7 +2,7 @@
 #
 # Author::    Paweł Wilk (mailto:pw@gnu.org)
 # Copyright:: (c) 2011 by Paweł Wilk
-# License::   This program is licensed under the terms of {file:docs/LGPL GNU Lesser General Public License} or {file:COPYING Ruby License}.
+# License::   This program is licensed under the terms of {file:docs/LGPL GNU Lesser General Public License} or {file:docs/COPYING Ruby License}.
 # 
 # This file contains {I18n::Inflector::API} class,
 # which is public API for I18n Inflector.
@@ -40,7 +40,7 @@ module I18n
     # @see I18n::Inflector::API_Strict The API_Strict class
     #   for accessing inflection data for named
     #   patterns (strict kinds).
-    # @see file:EXAMPLES The examples of real-life usage.
+    # @see file:docs/EXAMPLES The examples of real-life usage.
     # @api public
     class API < API_Strict
 
@@ -178,7 +178,7 @@ module I18n
       # Gets locales which have configured inflection support.
       # 
       # @api public
-      # @note That method uses information from regular and strict kinds.
+      # @note This method uses information from both regular and strict kinds.
       # @return [Array<Symbol>] the array containing locales that support inflection
       # 
       # @overload inflected_locales
@@ -194,10 +194,34 @@ module I18n
         if kind.to_s[0..0] == Markers::STRICT_KIND
           strict.inflected_locales(kind.to_s[1..-1])
         else
-          (super + strict.inflected_locales(kind)).uniq
+          kind = kind.to_s.empty? ? nil : kind.to_sym
+          r = ( @inflected_locales_cache[kind] ||= super(kind).uniq )
+          r.nil? ? r : r.dup
         end
       end
 
+      # Iterates through locales which have configured inflection support.
+      # 
+      # @api public
+      # @note This method uses information from both regular and strict kinds.
+      #   The locale identifiers may be duplicated!
+      # @return [LazyArrayEnumerator] the lazy enumerator
+      # @yield [locale] optional block in which each kind will be yielded
+      # @yieldparam [Symbol] locale the inflected locale identifier
+      # @yieldreturn [LazyArrayEnumerator] the lazy enumerator
+      # @overload each_inflected_locale
+      #   Iterates through locales which have configured inflection support.
+      #   @return [LazyArrayEnumerator] the lazy enumerator
+      # @overload each_inflected_locale(kind)
+      #   Iterates through locales which have configured inflection support for the given +kind+.
+      #   @param [Symbol] kind the identifier of a kind
+      #   @return [LazyArrayEnumerator] the lazy enumerator
+      def each_inflected_locale(kind=nil, &block)
+        super + strict.inflected_locales(kind)
+      end
+      alias_method :each_locale,            :each_inflected_locale
+      alias_method :each_supported_locale,  :each_inflected_locale
+
       # Tests if a kind exists.
       # 
       # @api public
@@ -480,159 +504,139 @@ module I18n
         data_safe(locale).get_kind(token.to_sym, kind)
       end
 
-      # Gets available inflection tokens and their descriptions.
+      # Iterates through available inflection tokens and their descriptions.
       # 
       # @api public
       # @note By default it uses regular kinds database, not strict kinds.
       # @raise [I18n::InvalidLocale] if there is no proper locale name
-      # @return [Hash] the hash containing available inflection tokens and descriptions
+      # @return [LazyHashEnumerator] the lazy enumerator (<tt>token => description</tt>)
+      # @yield [token, description] optional block in which each token will be yielded
+      # @yieldparam [Symbol] token a token
+      # @yieldparam [String] description a description string for a token
+      # @yieldreturn [LazyHashEnumerator] the lazy enumerator
       # @note You cannot deduce where aliases are pointing to, since the information
       #   about a target is replaced by the description. To get targets use the
       #   {#raw_tokens} method. To simply list aliases and their targets use
       #   the {#aliases} method.
-      # @overload tokens
-      #   Gets available inflection tokens and their descriptions.
-      #   @return [Hash] the hash containing available inflection tokens as keys
-      #     and their descriptions as values, including aliases,
-      #     for all kinds.
-      # @overload tokens(kind)
-      #   Gets available inflection tokens and their descriptions for some +kind+.
+      # @overload each_token
+      #   Iterates through available inflection tokens and their descriptions.
+      #   @return [LazyHashEnumerator] the lazy enumerator (<tt>token => description</tt>)
+      # @overload each_token(kind)
+      #   Iterates through available inflection tokens and their descriptions for some +kind+.
       #   @note If +kind+ begins with the +@+ symbol then the variant of this method
-      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#tokens})
+      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#each_token})
       #   @param [Symbol,String] kind the kind of inflection tokens to be returned
-      #   @return [Hash] the hash containing available inflection tokens as keys
-      #     and their descriptions as values, including aliases, for current locale.
-      # @overload tokens(kind, locale)
-      #   Gets available inflection tokens and their descriptions for some +kind+ and +locale+.
+      #   @return [LazyHashEnumerator] the lazy enumerator (<tt>token => description</tt>)
+      # @overload each_token(kind, locale)
+      #   Iterates through available inflection tokens and their descriptions for some +kind+ and +locale+.
       #   @note If +kind+ begins with the +@+ symbol then the variant of this method
-      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#tokens})
+      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#each_token})
       #   @param [Symbol,String] kind the kind of inflection tokens to be returned
       #   @param [Symbol] locale the locale to use
-      #   @return [Hash] the hash containing available inflection tokens as keys
-      #     and their descriptions as values, including aliases, for current locale
-      def tokens(kind=nil, locale=nil)
-        unless kind.nil?
-          kind = kind.to_s
-          return {} if kind.empty?
-          if kind[0..0] == Markers::STRICT_KIND
-            return strict.tokens(kind[1..-1], locale)
-          end
-          kind = kind.to_sym
+      #   @return [LazyHashEnumerator] the lazy enumerator (<tt>token => description</tt>)
+      def each_token(kind=nil, locale=nil)
+        if kind.to_s[0..0] == Markers::STRICT_KIND
+          return strict.each_token(kind.to_s[1..-1], locale)
         end
-        data_safe(locale).get_tokens(kind)
+        super
       end
 
-      # Gets available inflection tokens and their values.
+      # Iterates through available inflection tokens and their values.
       # 
       # @api public
-      # @return [Hash] the hash containing available inflection tokens and descriptions (or alias pointers)
+      # @return [LazyHashEnumerator] the lazy enumerator (<tt>token => description|target</tt>)
+      # @yield [token, value] optional block in which each token will be yielded
+      # @yieldparam [Symbol] token a token
+      # @yieldparam [Symbol, String] value a description string for a token or a target (if alias)
+      # @yieldreturn [LazyHashEnumerator] the lazy enumerator
       # @raise [I18n::InvalidLocale] if there is no proper locale name
       # @note You may deduce whether the returned values are aliases or true tokens
       #   by testing if a value is a type of Symbol or String.
-      # @overload tokens_raw
-      #   Gets available inflection tokens and their values for regular kinds.
-      #   @return [Hash] the hash containing available inflection tokens as keys
-      #     and their descriptions as values. In case of aliases the returned
-      #     values are Symbols
-      # @overload tokens_raw(kind)
-      #   Gets available inflection tokens and their values for the given +kind+.
+      # @overload each_token_raw
+      #   Iterates through available inflection tokens and their values for regular kinds.
+      #   @return [LazyHashEnumerator] the lazy enumerator (<tt>token => description|target</tt>)
+      # @overload each_token_raw(kind)
+      #   Iterates through available inflection tokens and their values for the given +kind+.
       #   @note If +kind+ begins with the +@+ symbol then the variant of this method
-      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#tokens_raw})
+      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#each_token_raw})
       #   @param [Symbol,String] kind the kind of inflection tokens to be returned
-      #   @return [Hash] the hash containing available inflection tokens as keys
-      #     and their descriptions as values. In case of aliases the returned
-      #     values are Symbols
-      # @overload tokens_raw(kind, locale)
-      #   Gets available inflection tokens and their values for the given +kind+ and +locale+.
+      #   @return [LazyHashEnumerator] the lazy enumerator (<tt>token => description|target</tt>)
+      # @overload each_token_raw(kind, locale)
+      #   Iterates through available inflection tokens and their values for the given +kind+ and +locale+.
       #   @note If +kind+ begins with the +@+ symbol then the variant of this method
-      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#tokens_raw})
+      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#each_token_raw})
       #   @param [Symbol,String] kind the kind of inflection tokens to be returned
       #   @param [Symbol] locale the locale to use
-      #   @return [Hash] the hash containing available inflection tokens as keys
-      #     and their descriptions as values. In case of aliases the returned
-      #     values are Symbols
-      def tokens_raw(kind=nil, locale=nil)
-        unless kind.nil?
-          kind = kind.to_s
-          return {} if kind.empty?
-          if kind[0..0] == Markers::STRICT_KIND
-            return strict.tokens_raw(kind[1..-1], locale)
-          end
-          kind = kind.to_sym
+      #   @return [LazyHashEnumerator] the lazy enumerator (<tt>token => description|target</tt>)
+      def each_token_raw(kind=nil, locale=nil)
+        if kind.to_s[0..0] == Markers::STRICT_KIND
+          return strict.each_token_raw(kind.to_s[1..-1], locale)
         end
-        data_safe(locale).get_raw_tokens(kind)
+        super
       end
-      alias_method :raw_tokens, :tokens_raw
+      alias_method :each_raw_token, :each_token_raw
 
-      # Gets true inflection tokens and their values.
+      # Iterates through true inflection tokens and their values.
       # 
       # @api public
-      # @return [Hash] the hash containing available inflection tokens and descriptions
+      # @return [LazyHashEnumerator] the lazy enumerator (<tt>token => description</tt>)
+      # @yield [token, description] optional block in which each token will be yielded
+      # @yieldparam [Symbol] token a token
+      # @yieldparam [String] description a description string for a token
+      # @yieldreturn [LazyHashEnumerator] the lazy enumerator
       # @raise [I18n::InvalidLocale] if there is no proper locale name
       # @note It returns only true tokens, not aliases.
-      # @overload tokens_true
-      #   Gets true inflection tokens and their values for regular kinds.
-      #   @return [Hash] the hash containing available inflection tokens as keys
-      #     and their descriptions as values
-      # @overload tokens_true(kind)
-      #   Gets true inflection tokens and their values for the given +kind+.
+      # @overload each_token_true
+      #   Iterates through true inflection tokens and their values for regular kinds.
+      #   @return [LazyHashEnumerator] the lazy enumerator (<tt>token => description</tt>)
+      # @overload each_token_true(kind)
+      #   Iterates through true inflection tokens and their values for the given +kind+.
       #   @note If +kind+ begins with the +@+ symbol then the variant of this method
-      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#tokens_true})
+      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#each_token_true})
       #   @param [Symbol,String] kind the kind of inflection tokens to be returned
-      #   @return [Hash] the hash containing available inflection tokens as keys
-      #     and their descriptions as values
-      # @overload tokens_true(kind, locale)
-      #   Gets true inflection tokens and their values for the given +kind+ and +value+.
+      #   @return [LazyHashEnumerator] the lazy enumerator (<tt>token => description</tt>)
+      # @overload each_token_true(kind, locale)
+      #   Iterates through true inflection tokens and their values for the given +kind+ and +value+.
       #   @note If +kind+ begins with the +@+ symbol then the variant of this method
-      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#tokens_true})
+      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#each_token_true})
       #   @param [Symbol,String] kind the kind of inflection tokens to be returned
       #   @param [Symbol] locale the locale to use
-      #   @return [Hash] the hash containing available inflection tokens as keys
-      #     and their descriptions as values
-      def tokens_true(kind=nil, locale=nil)
-        unless kind.nil?
-          kind = kind.to_s
-          return {} if kind.empty?
-          if kind[0..0] == Markers::STRICT_KIND
-            return strict.tokens_true(kind[1..-1], locale)
-          end
-          kind = kind.to_sym
+      #   @return [LazyHashEnumerator] the lazy enumerator (<tt>token => description</tt>)
+      def each_token_true(kind=nil, locale=nil, &block)
+        if kind.to_s[0..0] == Markers::STRICT_KIND
+          return strict.each_token_true(kind.to_s[1..-1], locale, &block)
         end
-        data_safe(locale).get_true_tokens(kind)
+        super
       end
-      alias_method :true_tokens, :tokens_true
+      alias_method :each_true_token, :each_token_true
 
-      # Gets inflection aliases and their pointers.
+      # Iterates through inflection aliases and their pointers.
       # 
       # @api public
       # @raise [I18n::InvalidLocale] if there is no proper locale name
-      # @return [Hash] the Hash containing available inflection aliases (<tt>alias => target</tt>)
-      # @overload aliases
-      #   Gets inflection aliases and their pointers for regular kinds.
-      #   @return [Hash] the Hash containing available inflection aliases
-      # @overload aliases(kind)
-      #   Gets inflection aliases and their pointers for the given +kind+.
+      # @return [LazyHashEnumerator] the lazy enumerator (<tt>token => target</tt>)
+      # @yield [alias, target] optional block in which each alias will be yielded
+      # @yieldparam [Symbol] alias an alias
+      # @yieldparam [Symbol] target a name of the target token
+      # @yieldreturn [LazyHashEnumerator] the lazy enumerator
+      # @overload each_alias(kind)
+      #   Iterates through inflection aliases (and their pointers) of the given +kind+ and the current locale.
       #   @note If +kind+ begins with the +@+ symbol then the variant of this method
-      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#aliases})
+      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#each_alias})
       #   @param [Symbol,String] kind the kind of aliases to get
-      #   @return [Hash] the Hash containing available inflection aliases
-      # @overload aliases(kind, locale)
-      #   Gets inflection aliases and their pointers for the given +kind+ and +locale+.
+      #   @return [LazyHashEnumerator] the lazy enumerator (<tt>token => target</tt>)
+      # @overload each_alias(kind, locale)
+      #   Iterates through inflection aliases (and their pointers) of the given +kind+ and +locale+.
       #   @note If +kind+ begins with the +@+ symbol then the variant of this method
-      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#aliases})
+      #     operating on strict kinds will be called ({I18n::Inflector::API_Strict#each_alias})
       #   @param [Symbol,String] kind the kind of aliases to get
       #   @param [Symbol] locale the locale to use
-      #   @return [Hash] the Hash containing available inflection aliases
-      def aliases(kind=nil, locale=nil)
-        unless kind.nil?
-          kind = kind.to_s
-          return nil if kind.empty?
-          if kind[0..0] == Markers::STRICT_KIND
-            return strict.aliases(kind[1..-1], locale)
-          end
-          kind = kind.to_sym
+      #   @return [LazyHashEnumerator] the lazy enumerator (<tt>token => target</tt>)
+      def each_alias(kind=nil, locale=nil, &block)
+        if kind.to_s[0..0] == Markers::STRICT_KIND
+          return strict.each_alias(kind.to_s[1..-1], locale, &block)
         end
-        data_safe(locale).get_aliases(kind)
+        super
       end
 
       # Gets the description of the given inflection token.