i18n 0.5.3 → 0.5.4

data/test/backend/pluralization_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+class I18nBackendPluralizationTest < Test::Unit::TestCase
+  class Backend < I18n::Backend::Simple
+    include I18n::Backend::Pluralization
+    include I18n::Backend::Fallbacks
+  end
+
+  def setup
+    I18n.backend = Backend.new
+    @rule = lambda { |n| n == 1 ? :one : n == 0 || (2..10).include?(n % 100) ? :few : (11..19).include?(n % 100) ? :many : :other }
+    store_translations(:xx, :i18n => { :plural => { :rule => @rule } })
+    @entry = { :zero => 'zero', :one => 'one', :few => 'few', :many => 'many', :other => 'other' }
+  end
+
+  test "pluralization picks a pluralizer from :'i18n.pluralize'" do
+    assert_equal @rule, I18n.backend.send(:pluralizer, :xx)
+  end
+
+  test "pluralization picks :one for 1" do
+    assert_equal 'one', I18n.t(:count => 1, :default => @entry, :locale => :xx)
+  end
+
+  test "pluralization picks :few for 2" do
+    assert_equal 'few', I18n.t(:count => 2, :default => @entry, :locale => :xx)
+  end
+
+  test "pluralization picks :many for 11" do
+    assert_equal 'many', I18n.t(:count => 11, :default => @entry, :locale => :xx)
+  end
+
+  test "pluralization picks zero for 0 if the key is contained in the data" do
+    assert_equal 'zero', I18n.t(:count => 0, :default => @entry, :locale => :xx)
+  end
+
+  test "pluralization picks few for 0 if the key is not contained in the data" do
+    @entry.delete(:zero)
+    assert_equal 'few', I18n.t(:count => 0, :default => @entry, :locale => :xx)
+  end
+
+  test "Fallbacks can pick up rules from fallback locales, too" do
+    assert_equal @rule, I18n.backend.send(:pluralizer, :'xx-XX')
+  end
+end

data/test/backend/simple_test.rb

@@ -0,0 +1,79 @@
+require 'test_helper'
+
+class I18nBackendSimpleTest < Test::Unit::TestCase
+  def setup
+    I18n.backend = I18n::Backend::Simple.new
+    I18n.load_path = [locales_dir + '/en.yml']
+  end
+
+  # useful because this way we can use the backend with no key for interpolation/pluralization
+  test "simple backend translate: given nil as a key it still interpolations the default value" do
+    assert_equal "Hi David", I18n.t(nil, :default => "Hi %{name}", :name => "David")
+  end
+
+  # loading translations
+  test "simple load_translations: given an unknown file type it raises I18n::UnknownFileType" do
+    assert_raise(I18n::UnknownFileType) { I18n.backend.load_translations("#{locales_dir}/en.xml") }
+  end
+
+  test "simple load_translations: given a Ruby file name it does not raise anything" do
+    assert_nothing_raised { I18n.backend.load_translations("#{locales_dir}/en.rb") }
+  end
+
+  test "simple load_translations: given no argument, it uses I18n.load_path" do
+    I18n.backend.load_translations
+    assert_equal({ :en => { :foo => { :bar => 'baz' } } }, I18n.backend.send(:translations))
+  end
+
+  test "simple load_rb: loads data from a Ruby file" do
+    data = I18n.backend.send(:load_rb, "#{locales_dir}/en.rb")
+    assert_equal({ :en => { :fuh => { :bah => 'bas' } } }, data)
+  end
+
+  test "simple load_yml: loads data from a YAML file" do
+    data = I18n.backend.send(:load_yml, "#{locales_dir}/en.yml")
+    assert_equal({ 'en' => { 'foo' => { 'bar' => 'baz' } } }, data)
+  end
+
+  test "simple load_translations: loads data from known file formats" do
+    I18n.backend = I18n::Backend::Simple.new
+    I18n.backend.load_translations("#{locales_dir}/en.rb", "#{locales_dir}/en.yml")
+    expected = { :en => { :fuh => { :bah => "bas" }, :foo => { :bar => "baz" } } }
+    assert_equal expected, translations
+  end
+
+  # storing translations
+
+  test "simple store_translations: stores translations, ... no, really :-)" do
+    I18n.backend.store_translations :'en', :foo => 'bar'
+    assert_equal Hash[:'en', {:foo => 'bar'}], translations
+  end
+
+  test "simple store_translations: deep_merges with existing translations" do
+    I18n.backend.store_translations :'en', :foo => {:bar => 'bar'}
+    I18n.backend.store_translations :'en', :foo => {:baz => 'baz'}
+    assert_equal Hash[:'en', {:foo => {:bar => 'bar', :baz => 'baz'}}], translations
+  end
+
+  test "simple store_translations: converts the given locale to a Symbol" do
+    I18n.backend.store_translations 'en', :foo => 'bar'
+    assert_equal Hash[:'en', {:foo => 'bar'}], translations
+  end
+
+  test "simple store_translations: converts keys to Symbols" do
+    I18n.backend.store_translations 'en', 'foo' => {'bar' => 'bar', 'baz' => 'baz'}
+    assert_equal Hash[:'en', {:foo => {:bar => 'bar', :baz => 'baz'}}], translations
+  end
+
+  # reloading translations
+
+  test "simple reload_translations: unloads translations" do
+    I18n.backend.reload!
+    assert_nil translations
+  end
+
+  test "simple reload_translations: uninitializes the backend" do
+    I18n.backend.reload!
+    assert_equal I18n.backend.initialized?, false
+  end
+end

data/test/backend/transliterator_test.rb

@@ -0,0 +1,81 @@
+# :coding: utf-8
+require 'test_helper'
+
+class I18nBackendTransliterator < Test::Unit::TestCase
+  def setup
+    I18n.backend = I18n::Backend::Simple.new
+    @proc = lambda { |n| n.upcase }
+    @hash = { :"ü" => "ue", :"ö" => "oe" }
+    @transliterator = I18n::Backend::Transliterator.get
+  end
+
+  test "transliteration rule can be a proc" do
+    store_translations(:xx, :i18n => {:transliterate => {:rule => @proc}})
+    assert_equal "HELLO", I18n.backend.transliterate(:xx, "hello")
+  end
+
+  test "transliteration rule can be a hash" do
+    store_translations(:xx, :i18n => {:transliterate => {:rule => @hash}})
+    assert_equal "ue", I18n.backend.transliterate(:xx, "ü")
+  end
+
+  test "transliteration rule must be a proc or hash" do
+    store_translations(:xx, :i18n => {:transliterate => {:rule => ""}})
+    assert_raise I18n::ArgumentError do
+      I18n.backend.transliterate(:xx, "ü")
+    end
+  end
+
+  test "transliterator defaults to latin => ascii when no rule is given" do
+    assert_equal "AEroskobing", I18n.backend.transliterate(:xx, "Ærøskøbing")
+  end
+
+  test "default transliterator should not modify ascii characters" do
+    (0..127).each do |byte|
+      char = [byte].pack("U")
+      assert_equal char, @transliterator.transliterate(char)
+    end
+  end
+
+  test "default transliterator correctly transliterates latin characters" do
+    # create string with range of Unicode's western characters with
+    # diacritics, excluding the division and multiplication signs which for
+    # some reason or other are floating in the middle of all the letters.
+    string = (0xC0..0x17E).to_a.reject {|c| [0xD7, 0xF7].include? c}.pack("U*")
+    string.split(//) do |char|
+      assert_match %r{^[a-zA-Z']*$}, @transliterator.transliterate(string)
+    end
+  end
+
+  test "should replace non-ASCII chars not in map with a replacement char" do
+    assert_equal "abc?", @transliterator.transliterate("abcſ")
+  end
+
+  test "can replace non-ASCII chars not in map with a custom replacement string" do
+    assert_equal "abc#", @transliterator.transliterate("abcſ", "#")
+  end
+
+  if RUBY_VERSION >= "1.9"
+    test "default transliterator raises errors for invalid UTF-8" do
+      assert_raise ArgumentError do
+        @transliterator.transliterate("a\x92b")
+      end
+    end
+  end
+
+  test "I18n.transliterate should transliterate using a default transliterator" do
+    assert_equal "aeo", I18n.transliterate("áèö")
+  end
+
+  test "I18n.transliterate should transliterate using a locale" do
+    store_translations(:xx, :i18n => {:transliterate => {:rule => @hash}})
+    assert_equal "ue", I18n.transliterate("ü", :locale => :xx)
+  end
+
+  test "default transliterator fails with custom rules with uncomposed input" do
+    char = [117, 776].pack("U*") # "ü" as ASCII "u" plus COMBINING DIAERESIS
+    transliterator = I18n::Backend::Transliterator.get(@hash)
+    assert_not_equal "ue", transliterator.transliterate(char)
+  end
+
+end

data/test/core_ext/hash_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+require 'i18n/core_ext/hash'
+
+class I18nCoreExtHashInterpolationTest < Test::Unit::TestCase
+  test "#deep_symbolize_keys" do
+    hash = { 'foo' => { 'bar' => { 'baz' => 'bar' } } }
+    expected = { :foo => { :bar => { :baz => 'bar' } } }
+    assert_equal expected, hash.deep_symbolize_keys
+  end
+
+  test "#slice" do
+    hash = { :foo => 'bar',  :baz => 'bar' }
+    expected = { :foo => 'bar' }
+    assert_equal expected, hash.slice(:foo)
+  end
+
+  test "#except" do
+    hash = { :foo => 'bar',  :baz => 'bar' }
+    expected = { :foo => 'bar' }
+    assert_equal expected, hash.except(:baz)
+  end
+
+  test "#deep_merge!" do
+    hash = { :foo => { :bar => { :baz => 'bar' } }, :baz => 'bar' }
+    hash.deep_merge!(:foo => { :bar => { :baz => 'foo' } })
+
+    expected = { :foo => { :bar => { :baz => 'foo' } }, :baz => 'bar' }
+    assert_equal expected, hash
+  end
+end

data/test/core_ext/string/interpolate_test.rb

@@ -0,0 +1,99 @@
+require '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 I18nCoreExtStringInterpolationTest < Test::Unit::TestCase
+  test "String interpolates a single argument" do
+    assert_equal "Masao", "%s" % "Masao"
+  end
+
+  test "String interpolates an array argument" do
+    assert_equal "1 message", "%d %s" % [1, 'message']
+  end
+
+  test "String interpolates a hash argument w/ named placeholders" do
+    assert_equal "Masao Mutoh", "%{first} %{last}" % { :first => 'Masao', :last => 'Mutoh' }
+  end
+
+  test "String interpolates a hash argument w/ named placeholders (reverse order)" do
+    assert_equal "Mutoh, Masao", "%{last}, %{first}" % { :first => 'Masao', :last => 'Mutoh' }
+  end
+
+  test "String interpolates named placeholders with sprintf syntax" do
+    assert_equal "10, 43.4", "%<integer>d, %<float>.1f" % {:integer => 10, :float => 43.4}
+  end
+
+  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
+
+  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
+
+  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
+
+  test "String interpolation old-style sprintf still works" do
+    assert_equal("foo 1.000000", "%s %f" % ["foo", 1.0])
+  end
+
+  test "String interpolation raises an ArgumentError when the string has extra placeholders (Array)" do
+    assert_raise(ArgumentError) do # Ruby 1.9 msg: "too few arguments"
+      "%s %s" % %w(Masao)
+    end
+  end
+
+  test "String interpolation raises a KeyError when the string has extra placeholders (Hash)" do
+    assert_raise(KeyError) do # Ruby 1.9 msg: "key not found"
+      "%{first} %{last}" % { :first => 'Masao' }
+    end
+  end
+
+  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
+
+  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
+
+  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
+
+  test "% can be used in Ruby's own sprintf behavior" do
+    assert_equal "70%", "%d%%" % 70
+    assert_equal "70-100%", "%d-%d%%" % [70, 100]
+    assert_equal "+2.30%", "%+.2f%%" % 2.3
+  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_raise(ArgumentError) { "%{name} %f" % [1.0] }
+    assert_raise(ArgumentError) { "%{name} %f" % [1.0, 2.0] }
+  end
+end
+

data/test/gettext/api_test.rb

@@ -0,0 +1,206 @@
+# encoding: utf-8
+require 'test_helper'
+require 'i18n/gettext/helpers'
+
+include I18n::Gettext::Helpers
+
+class I18nGettextApiTest < Test::Unit::TestCase
+  def setup
+    I18n.locale = :en
+    I18n.backend.store_translations :de, {
+      'Hi Gettext!' => 'Hallo Gettext!',
+      'Sentence 1. Sentence 2.' => 'Satz 1. Satz 2.',
+      "An apple" => { :one => 'Ein Apfel', :other => '%{count} Äpfel' },
+      :special => { "A special apple" => { :one => 'Ein spezieller Apfel', :other => '%{count} spezielle Äpfel' } },
+      :foo => { :bar => 'bar-de' },
+      'foo.bar' => 'Foo Bar'
+    }, :separator => '|'
+  end
+
+  # gettext
+  def test_gettext_uses_msg_as_default
+    assert_equal 'Hi Gettext!', _('Hi Gettext!')
+  end
+
+  def test_gettext_uses_msg_as_key
+    I18n.locale = :de
+    assert_equal 'Hallo Gettext!', gettext('Hi Gettext!')
+    assert_equal 'Hallo Gettext!', _('Hi Gettext!')
+  end
+
+  def test_gettext_uses_msg_containing_dots_as_default
+    assert_equal 'Sentence 1. Sentence 2.', gettext('Sentence 1. Sentence 2.')
+    assert_equal 'Sentence 1. Sentence 2.', _('Sentence 1. Sentence 2.')
+  end
+
+  def test_gettext_uses_msg_containing_dots_as_key
+    I18n.locale = :de
+    assert_equal 'Satz 1. Satz 2.', gettext('Sentence 1. Sentence 2.')
+    assert_equal 'Satz 1. Satz 2.', _('Sentence 1. Sentence 2.')
+  end
+
+  # sgettext
+  def test_sgettext_defaults_to_the_last_token_of_a_scoped_msgid
+    assert_equal 'bar', sgettext('foo|bar')
+    assert_equal 'bar', s_('foo|bar')
+  end
+
+  def test_sgettext_looks_up_a_scoped_translation
+    I18n.locale = :de
+    assert_equal 'bar-de', sgettext('foo|bar')
+    assert_equal 'bar-de', s_('foo|bar')
+  end
+
+  def test_sgettext_ignores_dots
+    I18n.locale = :de
+    assert_equal 'Foo Bar', sgettext('foo.bar')
+    assert_equal 'Foo Bar', s_('foo.bar')
+  end
+
+  # pgettext
+  def test_pgettext_defaults_to_msgid
+    assert_equal 'bar', pgettext('foo', 'bar')
+    assert_equal 'bar', p_('foo', 'bar')
+  end
+
+  def test_pgettext_looks_up_a_scoped_translation
+    I18n.locale = :de
+    assert_equal 'bar-de', pgettext('foo', 'bar')
+    assert_equal 'bar-de', p_('foo', 'bar')
+  end
+
+  # ngettext
+  def test_ngettext_looks_up_msg_id_as_default_singular
+    assert_equal 'An apple', ngettext('An apple', '%{count} apples', 1)
+    assert_equal 'An apple', n_('An apple', '%{count} apples', 1)
+  end
+
+  def test_ngettext_looks_up_msg_id_plural_as_default_plural
+    assert_equal '2 apples', ngettext('An apple', '%{count} apples', 2)
+    assert_equal '2 apples', n_('An apple', '%{count} apples', 2)
+  end
+
+  def test_ngettext_looks_up_a_singular
+    I18n.locale = :de
+    assert_equal 'Ein Apfel', ngettext('An apple', '%{count} apples', 1)
+    assert_equal 'Ein Apfel', n_('An apple', '%{count} apples', 1)
+  end
+
+  def test_ngettext_looks_up_a_plural
+    I18n.locale = :de
+    assert_equal '2 Äpfel', ngettext('An apple', '%{count} apples', 2)
+    assert_equal '2 Äpfel', n_('An apple', '%{count} apples', 2)
+  end
+
+  def test_ngettext_looks_up_msg_id_as_default_singular_with_alternative_syntax
+    assert_equal 'An apple', ngettext(['An apple', '%{count} apples'], 1)
+    assert_equal 'An apple', n_(['An apple', '%{count} apples'], 1)
+  end
+
+  def test_ngettext_looks_up_msg_id_plural_as_default_plural_with_alternative_syntax
+    assert_equal '2 apples', ngettext(['An apple', '%{count} apples'], 2)
+    assert_equal '2 apples', n_(['An apple', '%{count} apples'], 2)
+  end
+
+  def test_ngettext_looks_up_a_singular_with_alternative_syntax
+    I18n.locale = :de
+    assert_equal 'Ein Apfel', ngettext(['An apple', '%{count} apples'], 1)
+    assert_equal 'Ein Apfel', n_(['An apple', '%{count} apples'], 1)
+  end
+
+  def test_ngettext_looks_up_a_plural_with_alternative_syntax
+    I18n.locale = :de
+    assert_equal '2 Äpfel', ngettext(['An apple', '%{count} apples'], 2)
+    assert_equal '2 Äpfel', n_(['An apple', '%{count} apples'], 2)
+  end
+
+  # nsgettext
+  def test_nsgettext_looks_up_msg_id_as_default_singular
+    assert_equal 'A special apple', nsgettext('special|A special apple', '%{count} special apples', 1)
+    assert_equal 'A special apple', ns_('special|A special apple', '%{count} special apples', 1)
+  end
+
+  def test_nsgettext_looks_up_msg_id_plural_as_default_plural
+    assert_equal '2 special apples', nsgettext('special|A special apple', '%{count} special apples', 2)
+    assert_equal '2 special apples', ns_('special|A special apple', '%{count} special apples', 2)
+  end
+
+  def test_nsgettext_looks_up_a_singular
+    I18n.locale = :de
+    assert_equal 'Ein spezieller Apfel', nsgettext('special|A special apple', '%{count} special apples', 1)
+    assert_equal 'Ein spezieller Apfel', ns_('special|A special apple', '%{count} special apples', 1)
+  end
+
+  def test_nsgettext_looks_up_a_plural
+    I18n.locale = :de
+    assert_equal '2 spezielle Äpfel', nsgettext('special|A special apple', '%{count} special apples', 2)
+    assert_equal '2 spezielle Äpfel', ns_('special|A special apple', '%{count} special apples', 2)
+  end
+
+  def test_nsgettext_looks_up_msg_id_as_default_singular_with_alternative_syntax
+    assert_equal 'A special apple', nsgettext(['special|A special apple', '%{count} special apples'], 1)
+    assert_equal 'A special apple', ns_(['special|A special apple', '%{count} special apples'], 1)
+  end
+
+  def test_nsgettext_looks_up_msg_id_plural_as_default_plural_with_alternative_syntax
+    assert_equal '2 special apples', nsgettext(['special|A special apple', '%{count} special apples'], 2)
+    assert_equal '2 special apples', ns_(['special|A special apple', '%{count} special apples'], 2)
+  end
+
+  def test_nsgettext_looks_up_a_singular_with_alternative_syntax
+    I18n.locale = :de
+    assert_equal 'Ein spezieller Apfel', nsgettext(['special|A special apple', '%{count} special apples'], 1)
+    assert_equal 'Ein spezieller Apfel', ns_(['special|A special apple', '%{count} special apples'], 1)
+  end
+
+  def test_nsgettext_looks_up_a_plural_with_alternative_syntax
+    I18n.locale = :de
+    assert_equal '2 spezielle Äpfel', nsgettext(['special|A special apple', '%{count} special apples'], 2)
+    assert_equal '2 spezielle Äpfel', ns_(['special|A special apple', '%{count} special apples'], 2)
+  end
+
+  # npgettext
+  def test_npgettext_looks_up_msg_id_as_default_singular
+    assert_equal 'A special apple', npgettext('special', 'A special apple', '%{count} special apples', 1)
+    assert_equal 'A special apple', np_('special', 'A special apple', '%{count} special apples', 1)
+  end
+
+  def test_npgettext_looks_up_msg_id_plural_as_default_plural
+    assert_equal '2 special apples', npgettext('special', 'A special apple', '%{count} special apples', 2)
+    assert_equal '2 special apples', np_('special', 'A special apple', '%{count} special apples', 2)
+  end
+
+  def test_npgettext_looks_up_a_singular
+    I18n.locale = :de
+    assert_equal 'Ein spezieller Apfel', npgettext('special', 'A special apple', '%{count} special apples', 1)
+    assert_equal 'Ein spezieller Apfel', np_('special', 'A special apple', '%{count} special apples', 1)
+  end
+
+  def test_npgettext_looks_up_a_plural
+    I18n.locale = :de
+    assert_equal '2 spezielle Äpfel', npgettext('special', 'A special apple', '%{count} special apples', 2)
+    assert_equal '2 spezielle Äpfel', np_('special', 'A special apple', '%{count} special apples', 2)
+  end
+
+  def test_npgettext_looks_up_msg_id_as_default_singular_with_alternative_syntax
+    assert_equal 'A special apple', npgettext('special', ['A special apple', '%{count} special apples'], 1)
+    assert_equal 'A special apple', np_('special', ['A special apple', '%{count} special apples'], 1)
+  end
+
+  def test_npgettext_looks_up_msg_id_plural_as_default_plural_with_alternative_syntax
+    assert_equal '2 special apples', npgettext('special', ['A special apple', '%{count} special apples'], 2)
+    assert_equal '2 special apples', np_('special', ['A special apple', '%{count} special apples'], 2)
+  end
+
+  def test_npgettext_looks_up_a_singular_with_alternative_syntax
+    I18n.locale = :de
+    assert_equal 'Ein spezieller Apfel', npgettext('special', ['A special apple', '%{count} special apples'], 1)
+    assert_equal 'Ein spezieller Apfel', np_('special', ['A special apple', '%{count} special apples'], 1)
+  end
+
+  def test_npgettext_looks_up_a_plural_with_alternative_syntax
+    I18n.locale = :de
+    assert_equal '2 spezielle Äpfel', npgettext('special', ['A special apple', '%{count} special apples'], 2)
+    assert_equal '2 spezielle Äpfel', np_('special', ['A special apple', '%{count} special apples'], 2)
+  end
+end