i18n 0.5.0beta1 → 0.5.0beta2

data/lib/i18n/tests/localization/procs.rb

@@ -6,23 +6,23 @@ module I18n
       module Procs
         test "localize: using day names from lambdas" do
           setup_time_proc_translations
-          time = ::Time.parse('2008-03-01 6:00 UTC')
-          assert_match /Суббота/, I18n.l(time, :format => "%A, %d %B", :locale => :ru)
-          assert_match /суббота/, I18n.l(time, :format => "%d %B (%A)", :locale => :ru)
+          time = ::Time.utc(2008, 3, 1, 6, 0)
+          assert_match(/Суббота/, I18n.l(time, :format => "%A, %d %B", :locale => :ru))
+          assert_match(/суббота/, I18n.l(time, :format => "%d %B (%A)", :locale => :ru))
         end
 
         test "localize: using month names from lambdas" do
           setup_time_proc_translations
-          time = ::Time.parse('2008-03-01 6:00 UTC')
-          assert_match /марта/, I18n.l(time, :format => "%d %B %Y", :locale => :ru)
-          assert_match /Март /, I18n.l(time, :format => "%B %Y", :locale => :ru)
+          time = ::Time.utc(2008, 3, 1, 6, 0)
+          assert_match(/марта/, I18n.l(time, :format => "%d %B %Y", :locale => :ru))
+          assert_match(/Март /, I18n.l(time, :format => "%B %Y", :locale => :ru))
         end
 
         test "localize: using abbreviated day names from lambdas" do
           setup_time_proc_translations
-          time = ::Time.parse('2008-03-01 6:00 UTC')
-          assert_match /марта/, I18n.l(time, :format => "%d %b %Y", :locale => :ru)
-          assert_match /март /, I18n.l(time, :format => "%b %Y", :locale => :ru)
+          time = ::Time.utc(2008, 3, 1, 6, 0)
+          assert_match(/марта/, I18n.l(time, :format => "%d %b %Y", :locale => :ru))
+          assert_match(/март /, I18n.l(time, :format => "%b %Y", :locale => :ru))
         end
 
         test "localize Date: given a format that resolves to a Proc it calls the Proc with the object" do
@@ -40,44 +40,57 @@ module I18n
         test "localize DateTime: given a format that resolves to a Proc it calls the Proc with the object" do
           setup_time_proc_translations
           datetime = ::DateTime.new(2008, 3, 1, 6)
-          assert_equal '[Sat, 01 Mar 2008 06:00:00 +0000, {}]', I18n.l(datetime, :format => :proc, :locale => :ru)
+          assert_equal '[Sat, 01 Mar 2008 06:00:00 +00:00, {}]', I18n.l(datetime, :format => :proc, :locale => :ru)
         end
 
         test "localize DateTime: given a format that resolves to a Proc it calls the Proc with the object and extra options" do
           setup_time_proc_translations
           datetime = ::DateTime.new(2008, 3, 1, 6)
-          assert_equal '[Sat, 01 Mar 2008 06:00:00 +0000, {:foo=>"foo"}]', I18n.l(datetime, :format => :proc, :foo => 'foo', :locale => :ru)
+          assert_equal '[Sat, 01 Mar 2008 06:00:00 +00:00, {:foo=>"foo"}]', I18n.l(datetime, :format => :proc, :foo => 'foo', :locale => :ru)
         end
 
         test "localize Time: given a format that resolves to a Proc it calls the Proc with the object" do
           setup_time_proc_translations
-          time = ::Time.parse('2008-03-01 6:00 UTC')
-          assert_equal [time, {}].inspect, I18n.l(time, :format => :proc, :locale => :ru)
+          time = ::Time.utc(2008, 3, 1, 6, 0)
+          assert_equal inspect_args([time, {}]), I18n.l(time, :format => :proc, :locale => :ru)
         end
 
         test "localize Time: given a format that resolves to a Proc it calls the Proc with the object and extra options" do
           setup_time_proc_translations
-          time    = ::Time.parse('2008-03-01 6:00 UTC')
+          time = ::Time.utc(2008, 3, 1, 6, 0)
           options = { :foo => 'foo' }
-          assert_equal [time, options].inspect, I18n.l(time, options.merge(:format => :proc, :locale => :ru))
+          assert_equal inspect_args([time, options]), I18n.l(time, options.merge(:format => :proc, :locale => :ru))
         end
 
         protected
 
-          def filter_args(*args)
-            args.map {|arg| arg.delete(:fallback) if arg.is_a?(Hash) ; arg }.inspect
+          def inspect_args(args)
+            args = args.map do |arg|
+              case arg
+              when ::Time, ::DateTime
+                arg.strftime('%a, %d %b %Y %H:%M:%S %Z').sub('+0000', '+00:00')
+              when ::Date
+                arg.strftime('%a, %d %b %Y')
+              when Hash
+                arg.delete(:fallback)
+                arg.inspect
+              else
+                arg.inspect
+              end
+            end
+            "[#{args.join(', ')}]"
           end
 
           def setup_time_proc_translations
             I18n.backend.store_translations :ru, {
               :time => {
                 :formats => {
-                  :proc => lambda { |*args| filter_args(*args) }
+                  :proc => lambda { |*args| inspect_args(args) }
                 }
               },
               :date => {
                 :formats => {
-                  :proc => lambda { |*args| filter_args(*args) }
+                  :proc => lambda { |*args| inspect_args(args) }
                 },
                 :'day_names' => lambda { |key, options|
                   (options[:format] =~ /^%A/) ?

data/lib/i18n/tests/localization/time.rb

@@ -7,8 +7,8 @@ module I18n
         def setup
           super
           setup_time_translations
-          @time = ::Time.parse('2008-03-01 6:00 UTC')
-          @other_time = ::Time.parse('2008-03-01 18:00 UTC')
+          @time = ::Time.utc(2008, 3, 1, 6, 0)
+          @other_time = ::Time.utc(2008, 3, 1, 18, 0)
         end
 
         test "localize Time: given the short format it uses it" do

data/lib/i18n/version.rb

@@ -1,3 +1,3 @@
 module I18n
-  VERSION = "0.5.0beta1"
+  VERSION = "0.5.0beta2"
 end

data/test/all.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(dir)
+
+Dir["#{dir}/**/*_test.rb"].sort.each do |file|
+  require file.sub(/^#{dir}\/(.*)\.rb$/, '\1')
+end

data/test/api/all_features_test.rb

@@ -0,0 +1,58 @@
+require 'test_helper'
+
+begin
+  require 'rubygems'
+  require 'active_support'
+rescue LoadError
+  puts "not testing with Cache enabled because active_support can not be found"
+end
+
+class I18nAllFeaturesApiTest < Test::Unit::TestCase
+  class Backend < I18n::Backend::Simple
+    include I18n::Backend::Metadata
+    include I18n::Backend::Cache
+    include I18n::Backend::Cascade
+    include I18n::Backend::Fallbacks
+    include I18n::Backend::Pluralization
+    include I18n::Backend::Memoize
+  end
+
+  def setup
+    I18n.backend = I18n::Backend::Chain.new(Backend.new, I18n::Backend::Simple.new)
+    I18n.cache_store = cache_store
+    super
+  end
+
+  def teardown
+    I18n.cache_store.clear if I18n.cache_store
+    I18n.cache_store = nil
+    super
+  end
+
+  def cache_store
+    ActiveSupport::Cache.lookup_store(:memory_store) if cache_available?
+  end
+
+  def cache_available?
+    defined?(ActiveSupport) && defined?(ActiveSupport::Cache)
+  end
+
+  include I18n::Tests::Basics
+  include I18n::Tests::Defaults
+  include I18n::Tests::Interpolation
+  include I18n::Tests::Link
+  include I18n::Tests::Lookup
+  include I18n::Tests::Pluralization
+  include I18n::Tests::Procs
+  include I18n::Tests::Localization::Date
+  include I18n::Tests::Localization::DateTime
+  include I18n::Tests::Localization::Time
+  include I18n::Tests::Localization::Procs
+
+  test "make sure we use a Chain backend with an all features backend" do
+    assert_equal I18n::Backend::Chain, I18n.backend.class
+    assert_equal Backend, I18n.backend.backends.first.class
+  end
+
+  # links: test that keys stored on one backend can link to keys stored on another backend
+end

data/test/api/cascade_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class I18nCascadeApiTest < Test::Unit::TestCase
+  class Backend < I18n::Backend::Simple
+    include I18n::Backend::Cascade
+  end
+
+  def setup
+    I18n.backend = Backend.new
+    super
+  end
+
+  include I18n::Tests::Basics
+  include I18n::Tests::Defaults
+  include I18n::Tests::Interpolation
+  include I18n::Tests::Link
+  include I18n::Tests::Lookup
+  include I18n::Tests::Pluralization
+  include I18n::Tests::Procs
+  include I18n::Tests::Localization::Date
+  include I18n::Tests::Localization::DateTime
+  include I18n::Tests::Localization::Time
+  include I18n::Tests::Localization::Procs
+
+  test "make sure we use a backend with Cascade included" do
+    assert_equal Backend, I18n.backend.class
+  end
+end

data/test/api/chain_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+class I18nApiChainTest < Test::Unit::TestCase
+  def setup
+    super
+    I18n.backend = I18n::Backend::Chain.new(I18n::Backend::Simple.new, I18n.backend)
+  end
+
+  include I18n::Tests::Basics
+  include I18n::Tests::Defaults
+  include I18n::Tests::Interpolation
+  include I18n::Tests::Link
+  include I18n::Tests::Lookup
+  include I18n::Tests::Pluralization
+  include I18n::Tests::Procs
+  include I18n::Tests::Localization::Date
+  include I18n::Tests::Localization::DateTime
+  include I18n::Tests::Localization::Time
+  include I18n::Tests::Localization::Procs
+
+  test "make sure we use the Chain backend" do
+    assert_equal I18n::Backend::Chain, I18n.backend.class
+  end
+end

data/test/api/fallbacks_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+class I18nFallbacksApiTest < Test::Unit::TestCase
+  class Backend < I18n::Backend::Simple
+    include I18n::Backend::Fallbacks
+  end
+
+  def setup
+    I18n.backend = Backend.new
+    super
+  end
+
+  include I18n::Tests::Basics
+  include I18n::Tests::Defaults
+  include I18n::Tests::Interpolation
+  include I18n::Tests::Link
+  include I18n::Tests::Lookup
+  include I18n::Tests::Pluralization
+  include I18n::Tests::Procs
+  include I18n::Tests::Localization::Date
+  include I18n::Tests::Localization::DateTime
+  include I18n::Tests::Localization::Time
+  include I18n::Tests::Localization::Procs
+
+  test "make sure we use a backend with Fallbacks included" do
+    assert_equal Backend, I18n.backend.class
+  end
+
+  # links: test that keys stored on one backend can link to keys stored on another backend
+end

data/test/api/key_value_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+I18n::Tests.setup_rufus_tokyo
+
+class I18nKeyValueApiTest < Test::Unit::TestCase
+  include I18n::Tests::Basics
+  include I18n::Tests::Defaults
+  include I18n::Tests::Interpolation
+  include I18n::Tests::Link
+  include I18n::Tests::Lookup
+  include I18n::Tests::Pluralization
+  # include Tests::Api::Procs
+  include I18n::Tests::Localization::Date
+  include I18n::Tests::Localization::DateTime
+  include I18n::Tests::Localization::Time
+  # include Tests::Api::Localization::Procs
+
+  STORE = Rufus::Tokyo::Cabinet.new('*')
+
+  def setup
+    I18n.backend = I18n::Backend::KeyValue.new(STORE)
+    super
+  end
+
+  test "make sure we use the KeyValue backend" do
+    assert_equal I18n::Backend::KeyValue, I18n.backend.class
+  end
+end if defined?(Rufus::Tokyo::Cabinet)

data/test/api/memoize_test.rb

@@ -0,0 +1,60 @@
+require 'test_helper'
+
+class I18nMemoizeBackendWithSimpleApiTest < Test::Unit::TestCase
+  include I18n::Tests::Basics
+  include I18n::Tests::Defaults
+  include I18n::Tests::Interpolation
+  include I18n::Tests::Link
+  include I18n::Tests::Lookup
+  include I18n::Tests::Pluralization
+  include I18n::Tests::Procs
+  include I18n::Tests::Localization::Date
+  include I18n::Tests::Localization::DateTime
+  include I18n::Tests::Localization::Time
+  include I18n::Tests::Localization::Procs
+
+  class MemoizeBackend < I18n::Backend::Simple
+    include I18n::Backend::Memoize
+  end
+
+  def setup
+    I18n.backend = MemoizeBackend.new
+    super
+  end
+
+  test "make sure we use the MemoizeBackend backend" do
+    assert_equal MemoizeBackend, I18n.backend.class
+  end
+end
+
+I18n::Tests.setup_rufus_tokyo
+
+class I18nMemoizeBackendWithKeyValueApiTest < Test::Unit::TestCase
+  include I18n::Tests::Basics
+  include I18n::Tests::Defaults
+  include I18n::Tests::Interpolation
+  include I18n::Tests::Link
+  include I18n::Tests::Lookup
+  include I18n::Tests::Pluralization
+  include I18n::Tests::Localization::Date
+  include I18n::Tests::Localization::DateTime
+  include I18n::Tests::Localization::Time
+
+  # include I18n::Tests::Procs
+  # include I18n::Tests::Localization::Procs
+
+  class MemoizeBackend < I18n::Backend::KeyValue
+    include I18n::Backend::Memoize
+  end
+
+  STORE = Rufus::Tokyo::Cabinet.new('*')
+
+  def setup
+    I18n.backend = MemoizeBackend.new(STORE)
+    super
+  end
+
+  test "make sure we use the MemoizeBackend backend" do
+    assert_equal MemoizeBackend, I18n.backend.class
+  end
+end if defined?(Rufus::Tokyo::Cabinet)

data/test/api/pluralization_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+class I18nPluralizationApiTest < Test::Unit::TestCase
+  class Backend < I18n::Backend::Simple
+    include I18n::Backend::Pluralization
+  end
+
+  def setup
+    I18n.backend = Backend.new
+    super
+  end
+
+  include I18n::Tests::Basics
+  include I18n::Tests::Defaults
+  include I18n::Tests::Interpolation
+  include I18n::Tests::Link
+  include I18n::Tests::Lookup
+  include I18n::Tests::Pluralization
+  include I18n::Tests::Procs
+  include I18n::Tests::Localization::Date
+  include I18n::Tests::Localization::DateTime
+  include I18n::Tests::Localization::Time
+  include I18n::Tests::Localization::Procs
+
+  test "make sure we use a backend with Pluralization included" do
+    assert_equal Backend, I18n.backend.class
+  end
+
+  # links: test that keys stored on one backend can link to keys stored on another backend
+end

data/test/api/simple_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class I18nSimpleBackendApiTest < Test::Unit::TestCase
+  class Backend < I18n::Backend::Simple
+    include I18n::Backend::Pluralization
+  end
+
+  def setup
+    I18n.backend = I18n::Backend::Simple.new
+    super
+  end
+
+  include I18n::Tests::Basics
+  include I18n::Tests::Defaults
+  include I18n::Tests::Interpolation
+  include I18n::Tests::Link
+  include I18n::Tests::Lookup
+  include I18n::Tests::Pluralization
+  include I18n::Tests::Procs
+  include I18n::Tests::Localization::Date
+  include I18n::Tests::Localization::DateTime
+  include I18n::Tests::Localization::Time
+  include I18n::Tests::Localization::Procs
+
+  test "make sure we use the Simple backend" do
+    assert_equal I18n::Backend::Simple, I18n.backend.class
+  end
+end

data/test/backend/cache_test.rb

@@ -0,0 +1,83 @@
+require 'test_helper'
+
+begin
+  require 'active_support'
+rescue LoadError
+  $stderr.puts "Skipping cache tests using ActiveSupport"
+else
+
+class I18nBackendCacheTest < Test::Unit::TestCase
+  class Backend < I18n::Backend::Simple
+    include I18n::Backend::Cache
+  end
+
+  def setup
+    I18n.backend = Backend.new
+    super
+    I18n.cache_store = ActiveSupport::Cache.lookup_store(:memory_store)
+  end
+
+  def teardown
+    I18n.cache_store = nil
+  end
+
+  test "it uses the cache" do
+    assert I18n.cache_store.is_a?(ActiveSupport::Cache::MemoryStore)
+  end
+
+  test "translate hits the backend and caches the response" do
+    I18n.backend.expects(:lookup).returns('Foo')
+    assert_equal 'Foo', I18n.t(:foo)
+
+    I18n.backend.expects(:lookup).never
+    assert_equal 'Foo', I18n.t(:foo)
+
+    I18n.backend.expects(:lookup).returns('Bar')
+    assert_equal 'Bar', I18n.t(:bar)
+  end
+
+  test "still raises MissingTranslationData but also caches it" do
+    I18n.backend.expects(:lookup).returns(nil)
+    assert_raise(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
+
+    I18n.cache_store.expects(:write).never
+    I18n.backend.expects(:lookup).never
+    assert_raise(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
+  end
+
+  test "uses 'i18n' as a cache key namespace by default" do
+    assert_equal 0, I18n.backend.send(:cache_key, :en, :foo, {}).index('i18n')
+  end
+
+  test "adds a custom cache key namespace" do
+    with_cache_namespace('bar') do
+      assert_equal 0, I18n.backend.send(:cache_key, :en, :foo, {}).index('i18n/bar/')
+    end
+  end
+
+  test "adds locale and hash of key and hash of options" do
+    options = { :bar=>1 }
+    options_hash = I18n::Backend::Cache::USE_INSPECT_HASH ? options.inspect.hash : options.hash
+    assert_equal "i18n//en/#{:foo.hash}/#{options_hash}", I18n.backend.send(:cache_key, :en, :foo, options)
+  end
+
+  test "keys should not be equal" do
+    interpolation_values1 = { :foo => 1, :bar => 2 }
+    interpolation_values2 = { :foo => 2, :bar => 1 }
+
+    key1 = I18n.backend.send(:cache_key, :en, :some_key, interpolation_values1)
+    key2 = I18n.backend.send(:cache_key, :en, :some_key, interpolation_values2)
+
+    assert key1 != key2
+  end
+
+  protected
+
+    def with_cache_namespace(namespace)
+      I18n.cache_namespace = namespace
+      yield
+      I18n.cache_namespace = nil
+    end
+end
+
+end # AS cache check