i18n 0.2.0 → 0.2.1

data/test/string_test.rb

@@ -1,92 +1,92 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
-
-# thanks to Masao's String extensions these should work the same in
-# Ruby 1.8 (patched) and Ruby 1.9 (native)
-# some tests taken from Masao's tests
-# http://github.com/mutoh/gettext/blob/edbbe1fa8238fa12c7f26f2418403015f0270e47/test/test_string.rb
-
-class I18nStringTest < Test::Unit::TestCase
-  define_method :"test: String interpolates a single argument" do
-    assert_equal "Masao", "%s" % "Masao"
-  end
-
-  define_method :"test: String interpolates an array argument" do
-    assert_equal "1 message", "%d %s" % [1, 'message']
-  end
-
-  define_method :"test: String interpolates a hash argument w/ named placeholders" do
-    assert_equal "Masao Mutoh", "%{first} %{last}" % { :first => 'Masao', :last => 'Mutoh' }
-  end
-
-  define_method :"test: String interpolates a hash argument w/ named placeholders (reverse order)" do
-    assert_equal "Mutoh, Masao", "%{last}, %{first}" % { :first => 'Masao', :last => 'Mutoh' }
-  end
-
-  define_method :"test: String interpolates named placeholders with sprintf syntax" do
-    assert_equal "10, 43.4", "%<integer>d, %<float>.1f" % {:integer => 10, :float => 43.4}
-  end
-
-  define_method :"test: String interpolates named placeholders with sprintf syntax, does not recurse" do
-    assert_equal "%<not_translated>s", "%{msg}" % { :msg => '%<not_translated>s', :not_translated => 'should not happen' }
-  end
-
-  define_method :"test: String interpolation does not replace anything when no placeholders are given" do
-    assert_equal("aaa", "aaa" % {:num => 1})
-    assert_equal("bbb", "bbb" % [1])
-  end
-
-  define_method :"test: String interpolation sprintf behaviour equals Ruby 1.9 behaviour" do
-    assert_equal("1", "%<num>d" % {:num => 1})
-    assert_equal("0b1", "%<num>#b" % {:num => 1})
-    assert_equal("foo", "%<msg>s" % {:msg => "foo"})
-    assert_equal("1.000000", "%<num>f" % {:num => 1.0})
-    assert_equal("  1", "%<num>3.0f" % {:num => 1.0})
-    assert_equal("100.00", "%<num>2.2f" % {:num => 100.0})
-    assert_equal("0x64", "%<num>#x" % {:num => 100.0})
-    assert_raise(ArgumentError) { "%<num>,d" % {:num => 100} }
-    assert_raise(ArgumentError) { "%<num>/d" % {:num => 100} }
-  end
-
-  define_method :"test: String interpolation old-style sprintf still works" do
-    assert_equal("foo 1.000000", "%s %f" % ["foo", 1.0])
-  end
-
-  define_method :"test: String interpolation raises an ArgumentError when the string has extra placeholders (Array)" do
-    assert_raises(ArgumentError) do # Ruby 1.9 msg: "too few arguments"
-      "%s %s" % %w(Masao)
-    end
-  end
-
-  define_method :"test: String interpolation raises a KeyError when the string has extra placeholders (Hash)" do
-    assert_raises(KeyError) do # Ruby 1.9 msg: "key not found"
-      "%{first} %{last}" % { :first => 'Masao' }
-    end
-  end
-
-  define_method :"test: String interpolation does not raise when passed extra values (Array)" do
-    assert_nothing_raised do
-      assert_equal "Masao", "%s" % %w(Masao Mutoh)
-    end
-  end
-
-  define_method :"test: String interpolation does not raise when passed extra values (Hash)" do
-    assert_nothing_raised do
-      assert_equal "Masao Mutoh", "%{first} %{last}" % { :first => 'Masao', :last => 'Mutoh', :salutation => 'Mr.' }
-    end
-  end
-
-  define_method :"test: % acts as escape character in String interpolation" do
-    assert_equal "%{first}", "%%{first}" % { :first => 'Masao' }
-    assert_equal("% 1", "%% %<num>d" % {:num => 1.0})
-    assert_equal("%{num} %<num>d", "%%{num} %%<num>d" % {:num => 1})
-  end
-
-  def test_sprintf_mix_unformatted_and_formatted_named_placeholders
-    assert_equal("foo 1.000000", "%{name} %<num>f" % {:name => "foo", :num => 1.0})
-  end
-  
-  def test_string_interpolation_raises_an_argument_error_when_mixing_named_and_unnamed_placeholders
-    assert_raises(ArgumentError) { "%{name} %f" % [1.0] }
-    assert_raises(ArgumentError) { "%{name} %f" % [1.0, 2.0] }
-  end
-end
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+# thanks to Masao's String extensions these should work the same in
+# Ruby 1.8 (patched) and Ruby 1.9 (native)
+# some tests taken from Masao's tests
+# http://github.com/mutoh/gettext/blob/edbbe1fa8238fa12c7f26f2418403015f0270e47/test/test_string.rb
+
+class I18nStringTest < Test::Unit::TestCase
+  define_method :"test: String interpolates a single argument" do
+    assert_equal "Masao", "%s" % "Masao"
+  end
+
+  define_method :"test: String interpolates an array argument" do
+    assert_equal "1 message", "%d %s" % [1, 'message']
+  end
+
+  define_method :"test: String interpolates a hash argument w/ named placeholders" do
+    assert_equal "Masao Mutoh", "%{first} %{last}" % { :first => 'Masao', :last => 'Mutoh' }
+  end
+
+  define_method :"test: String interpolates a hash argument w/ named placeholders (reverse order)" do
+    assert_equal "Mutoh, Masao", "%{last}, %{first}" % { :first => 'Masao', :last => 'Mutoh' }
+  end
+
+  define_method :"test: String interpolates named placeholders with sprintf syntax" do
+    assert_equal "10, 43.4", "%<integer>d, %<float>.1f" % {:integer => 10, :float => 43.4}
+  end
+
+  define_method :"test: String interpolates named placeholders with sprintf syntax, does not recurse" do
+    assert_equal "%<not_translated>s", "%{msg}" % { :msg => '%<not_translated>s', :not_translated => 'should not happen' }
+  end
+
+  define_method :"test: String interpolation does not replace anything when no placeholders are given" do
+    assert_equal("aaa", "aaa" % {:num => 1})
+    assert_equal("bbb", "bbb" % [1])
+  end
+
+  define_method :"test: String interpolation sprintf behaviour equals Ruby 1.9 behaviour" do
+    assert_equal("1", "%<num>d" % {:num => 1})
+    assert_equal("0b1", "%<num>#b" % {:num => 1})
+    assert_equal("foo", "%<msg>s" % {:msg => "foo"})
+    assert_equal("1.000000", "%<num>f" % {:num => 1.0})
+    assert_equal("  1", "%<num>3.0f" % {:num => 1.0})
+    assert_equal("100.00", "%<num>2.2f" % {:num => 100.0})
+    assert_equal("0x64", "%<num>#x" % {:num => 100.0})
+    assert_raise(ArgumentError) { "%<num>,d" % {:num => 100} }
+    assert_raise(ArgumentError) { "%<num>/d" % {:num => 100} }
+  end
+
+  define_method :"test: String interpolation old-style sprintf still works" do
+    assert_equal("foo 1.000000", "%s %f" % ["foo", 1.0])
+  end
+
+  define_method :"test: String interpolation raises an ArgumentError when the string has extra placeholders (Array)" do
+    assert_raises(ArgumentError) do # Ruby 1.9 msg: "too few arguments"
+      "%s %s" % %w(Masao)
+    end
+  end
+
+  define_method :"test: String interpolation raises a KeyError when the string has extra placeholders (Hash)" do
+    assert_raises(KeyError) do # Ruby 1.9 msg: "key not found"
+      "%{first} %{last}" % { :first => 'Masao' }
+    end
+  end
+
+  define_method :"test: String interpolation does not raise when passed extra values (Array)" do
+    assert_nothing_raised do
+      assert_equal "Masao", "%s" % %w(Masao Mutoh)
+    end
+  end
+
+  define_method :"test: String interpolation does not raise when passed extra values (Hash)" do
+    assert_nothing_raised do
+      assert_equal "Masao Mutoh", "%{first} %{last}" % { :first => 'Masao', :last => 'Mutoh', :salutation => 'Mr.' }
+    end
+  end
+
+  define_method :"test: % acts as escape character in String interpolation" do
+    assert_equal "%{first}", "%%{first}" % { :first => 'Masao' }
+    assert_equal("% 1", "%% %<num>d" % {:num => 1.0})
+    assert_equal("%{num} %<num>d", "%%{num} %%<num>d" % {:num => 1})
+  end
+
+  def test_sprintf_mix_unformatted_and_formatted_named_placeholders
+    assert_equal("foo 1.000000", "%{name} %<num>f" % {:name => "foo", :num => 1.0})
+  end
+  
+  def test_string_interpolation_raises_an_argument_error_when_mixing_named_and_unnamed_placeholders
+    assert_raises(ArgumentError) { "%{name} %f" % [1.0] }
+    assert_raises(ArgumentError) { "%{name} %f" % [1.0, 2.0] }
+  end
+end

data/test/test_helper.rb

@@ -1,59 +1,59 @@
-# encoding: utf-8
-$:.unshift "lib"
-
-require 'rubygems'
-require 'test/unit'
-require 'mocha'
-require 'i18n'
-require 'time'
-require 'yaml'
-
-require File.dirname(__FILE__) + '/with_options'
-require File.dirname(__FILE__) + '/backend/simple/setup/base'
-require File.dirname(__FILE__) + '/backend/simple/setup/localization'
-
-Dir[File.dirname(__FILE__) + '/api/**/*.rb'].each do |filename|
-  require filename
-end
-
-$KCODE = 'u' unless RUBY_VERSION >= '1.9'
-  
-class Test::Unit::TestCase
-  def euc_jp(string)
-    string.encode!(Encoding::EUC_JP)
-  end
-  
-  def locales_dir
-    File.dirname(__FILE__) + '/fixtures/locales'
-  end
-
-  def backend_store_translations(*args)
-    I18n.backend.store_translations(*args)
-  end
-
-  def backend_get_translations
-    I18n.backend.instance_variable_get :@translations
-  end
-
-  def date
-    Date.new(2008, 3, 1)
-  end
-
-  def morning_datetime
-    DateTime.new(2008, 3, 1, 6)
-  end
-  alias :datetime :morning_datetime
-
-  def evening_datetime
-    DateTime.new(2008, 3, 1, 18)
-  end
-
-  def morning_time
-    Time.parse('2008-03-01 6:00 UTC')
-  end
-  alias :time :morning_time
-
-  def evening_time
-    Time.parse('2008-03-01 18:00 UTC')
-  end
+# encoding: utf-8
+$:.unshift "lib"
+
+require 'rubygems'
+require 'test/unit'
+require 'mocha'
+require 'i18n'
+require 'time'
+require 'yaml'
+
+require File.dirname(__FILE__) + '/with_options'
+require File.dirname(__FILE__) + '/backend/simple/setup/base'
+require File.dirname(__FILE__) + '/backend/simple/setup/localization'
+
+Dir[File.dirname(__FILE__) + '/api/**/*.rb'].each do |filename|
+  require filename
+end
+
+$KCODE = 'u' unless RUBY_VERSION >= '1.9'
+  
+class Test::Unit::TestCase
+  def euc_jp(string)
+    string.encode!(Encoding::EUC_JP)
+  end
+  
+  def locales_dir
+    File.dirname(__FILE__) + '/fixtures/locales'
+  end
+
+  def backend_store_translations(*args)
+    I18n.backend.store_translations(*args)
+  end
+
+  def backend_get_translations
+    I18n.backend.instance_variable_get :@translations
+  end
+
+  def date
+    Date.new(2008, 3, 1)
+  end
+
+  def morning_datetime
+    DateTime.new(2008, 3, 1, 6)
+  end
+  alias :datetime :morning_datetime
+
+  def evening_datetime
+    DateTime.new(2008, 3, 1, 18)
+  end
+
+  def morning_time
+    Time.parse('2008-03-01 6:00 UTC')
+  end
+  alias :time :morning_time
+
+  def evening_time
+    Time.parse('2008-03-01 18:00 UTC')
+  end
 end

data/test/with_options.rb

@@ -1,32 +1,32 @@
-# this is only here so we can test I18n works nicely with ActiveSupports
-# with_options. Maybe we can just remove it?
-
-class Object
-  def with_options(options)
-    yield ActiveSupport::OptionMerger.new(self, options)
-  end
-end
-
-module ActiveSupport
-  class OptionMerger #:nodoc:
-    instance_methods.each do |method|
-      undef_method(method) if method !~ /^(__|instance_eval|class|object_id)/
-    end
-
-    def initialize(context, options)
-      @context, @options = context, options
-    end
-
-    private
-      def method_missing(method, *arguments, &block)
-        if arguments.last.is_a?(Proc)
-          proc = arguments.pop
-          arguments << lambda { |*args| @options.deep_merge(proc.call(*args)) }
-        else
-          arguments << (arguments.last.respond_to?(:to_hash) ? @options.deep_merge(arguments.pop) : @options.dup)
-        end
-
-        @context.__send__(method, *arguments, &block)
-      end
-  end
+# this is only here so we can test I18n works nicely with ActiveSupports
+# with_options. Maybe we can just remove it?
+
+class Object
+  def with_options(options)
+    yield ActiveSupport::OptionMerger.new(self, options)
+  end
+end
+
+module ActiveSupport
+  class OptionMerger #:nodoc:
+    instance_methods.each do |method|
+      undef_method(method) if method !~ /^(__|instance_eval|class|object_id)/
+    end
+
+    def initialize(context, options)
+      @context, @options = context, options
+    end
+
+    private
+      def method_missing(method, *arguments, &block)
+        if arguments.last.is_a?(Proc)
+          proc = arguments.pop
+          arguments << lambda { |*args| @options.deep_merge(proc.call(*args)) }
+        else
+          arguments << (arguments.last.respond_to?(:to_hash) ? @options.deep_merge(arguments.pop) : @options.dup)
+        end
+
+        @context.__send__(method, *arguments, &block)
+      end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: i18n
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-16 00:00:00 +02:00
+date: 2009-07-12 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -83,33 +83,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: i18n
-rubygems_version: 1.3.2
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: New wave Internationalization support for Ruby
 test_files: 
-- test/string_test.rb
-- test/fixtures/locales/en.rb
+- test/all.rb
+- test/api/basics.rb
+- test/api/interpolation.rb
+- test/api/lambda.rb
+- test/api/link.rb
+- test/api/localization/date.rb
 - test/api/localization/date_time.rb
 - test/api/localization/lambda.rb
 - test/api/localization/time.rb
-- test/api/localization/date.rb
-- test/api/link.rb
 - test/api/pluralization.rb
-- test/api/lambda.rb
-- test/api/interpolation.rb
-- test/api/basics.rb
 - test/api/translation.rb
-- test/with_options.rb
-- test/backend/simple/translations_test.rb
-- test/backend/simple/setup/base.rb
-- test/backend/simple/setup/localization.rb
+- test/backend/simple/all.rb
 - test/backend/simple/api_test.rb
 - test/backend/simple/lookup_test.rb
-- test/backend/simple/all.rb
-- test/test_helper.rb
+- test/backend/simple/setup/base.rb
+- test/backend/simple/setup/localization.rb
+- test/backend/simple/translations_test.rb
+- test/fixtures/locales/en.rb
 - test/i18n_exceptions_test.rb
-- test/all.rb
 - test/i18n_load_path_test.rb
 - test/i18n_test.rb
+- test/string_test.rb
+- test/test_helper.rb
+- test/with_options.rb