i18n 0.5.4 → 0.6.0beta1

data/ci/Gemfile.no-rails

@@ -0,0 +1,5 @@
+source :rubygems
+
+gem 'mocha'
+gem 'test_declarative'
+

data/ci/Gemfile.no-rails.lock

@@ -0,0 +1,14 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    mocha (0.9.9)
+      rake
+    rake (0.8.7)
+    test_declarative (0.0.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mocha
+  test_declarative

data/ci/Gemfile.rails-2.3.x

@@ -0,0 +1,9 @@
+source :rubygems
+
+gem 'activesupport', '~> 2.3'
+gem 'sqlite3-ruby'
+gem 'mocha'
+gem 'test_declarative'
+gem 'rufus-tokyo'
+gem 'ffi'
+

data/ci/Gemfile.rails-2.3.x.lock

@@ -0,0 +1,23 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (2.3.10)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    mocha (0.9.9)
+      rake
+    rake (0.8.7)
+    rufus-tokyo (1.0.7)
+    sqlite3-ruby (1.3.2)
+    test_declarative (0.0.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 2.3)
+  ffi
+  mocha
+  rufus-tokyo
+  sqlite3-ruby
+  test_declarative

data/ci/Gemfile.rails-3.x

@@ -0,0 +1,9 @@
+source :rubygems
+
+gem 'activesupport', '~> 3.0.0'
+gem 'sqlite3-ruby'
+gem 'mocha'
+gem 'test_declarative'
+gem 'rufus-tokyo'
+gem 'ffi'
+

data/ci/Gemfile.rails-3.x.lock

@@ -0,0 +1,23 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.3)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    mocha (0.9.9)
+      rake
+    rake (0.8.7)
+    rufus-tokyo (1.0.7)
+    sqlite3-ruby (1.3.2)
+    test_declarative (0.0.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 3.0.0)
+  ffi
+  mocha
+  rufus-tokyo
+  sqlite3-ruby
+  test_declarative

data/lib/i18n.rb

@@ -1,6 +1,6 @@
 require 'i18n/version'
 require 'i18n/exceptions'
-require 'i18n/interpolate/ruby.rb'
+require 'i18n/interpolate/ruby'
 
 module I18n
   autoload :Backend, 'i18n/backend'
@@ -9,7 +9,7 @@ module I18n
   autoload :Locale,  'i18n/locale'
   autoload :Tests,   'i18n/tests'
 
-  RESERVED_KEYS = [:scope, :default, :separator, :resolve, :object, :fallback, :format, :cascade, :raise, :rescue_format]
+  RESERVED_KEYS = [:scope, :default, :separator, :resolve, :object, :fallback, :format, :cascade, :throw, :raise, :rescue_format]
   RESERVED_KEYS_PATTERN = /%\{(#{RESERVED_KEYS.join("|")})\}/
 
   class << self
@@ -25,7 +25,7 @@ module I18n
 
     # Write methods which delegates to the configuration object
     %w(locale backend default_locale available_locales default_separator
-      exception_handler load_path enforce_available_locales).each do |method|
+      exception_handler load_path).each do |method|
       module_eval <<-DELEGATORS, __FILE__, __LINE__ + 1
         def #{method}
           config.#{method}
@@ -141,23 +141,22 @@ module I18n
     # always return the same translations/values per unique combination of argument
     # values.
     def translate(*args)
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      key     = args.shift
-      backend = config.backend
-      locale  = options.delete(:locale) || config.locale
-      raises  = options.delete(:raise)
+      options  = args.last.is_a?(Hash) ? args.pop : {}
+      key      = args.shift
+      backend  = config.backend
+      locale   = options.delete(:locale) || config.locale
+      handling = options.delete(:throw) && :throw || options.delete(:raise) && :raise # TODO deprecate :raise
 
-      enforce_available_locales!(locale)
       raise I18n::ArgumentError if key.is_a?(String) && key.empty?
 
-      if key.is_a?(Array)
-        key.map { |k| backend.translate(locale, k, options) }
-      else
-        backend.translate(locale, key, options)
+      result = catch(:exception) do
+        if key.is_a?(Array)
+          key.map { |k| backend.translate(locale, k, options) }
+        else
+          backend.translate(locale, key, options)
+        end
       end
-    rescue I18n::ArgumentError => exception
-      raise exception if raises
-      handle_exception(exception, locale, key, options)
+      result.is_a?(MissingTranslation) ? handle_exception(handling, result, locale, key, options) : result
     end
     alias :t :translate
 
@@ -223,7 +222,6 @@ module I18n
       locale       = options && options.delete(:locale) || config.locale
       raises       = options && options.delete(:raise)
       replacement  = options && options.delete(:replacement)
-      enforce_available_locales!(locale)
       config.backend.transliterate(locale, key, replacement)
     rescue I18n::ArgumentError => exception
       raise exception if raises
@@ -234,7 +232,6 @@ module I18n
     def localize(object, options = {})
       locale = options.delete(:locale) || config.locale
       format = options.delete(:format) || :default
-      enforce_available_locales!(locale)
       config.backend.localize(locale, object, format, options)
     end
     alias :l :localize
@@ -263,30 +260,13 @@ module I18n
       keys
     end
 
-    # Returns true when the passed locale is in I18.available_locales.
-    # Returns false otherwise.
-    # Compare with Strings as `locale` may be coming from user input
-    def locale_available?(locale)
-      I18n.available_locales.map(&:to_s).include?(locale.to_s)
-    end
-
-    # Raises an InvalidLocale exception when the passed locale is not
-    # included in I18n.available_locales.
-    # Returns false otherwise
-    def enforce_available_locales!(locale)
-      handle_enforce_available_locales_deprecation
-
-      if config.enforce_available_locales
-        raise I18n::InvalidLocale.new(locale) if !locale_available?(locale)
-      end
-    end
-
   # making these private until Ruby 1.9.2 can send to protected methods again
   # see http://redmine.ruby-lang.org/repositories/revision/ruby-19?rev=24280
   private
 
     # Any exceptions thrown in translate will be sent to the @@exception_handler
-    # which can be a Symbol, a Proc or any other Object.
+    # which can be a Symbol, a Proc or any other Object unless they're forced to
+    # be raised or thrown (MissingTranslation).
     #
     # If exception_handler is a Symbol then it will simply be sent to I18n as
     # a method call. A Proc will simply be called. In any other case the
@@ -302,19 +282,19 @@ module I18n
     #
     #  I18n.exception_handler = I18nExceptionHandler.new                # an object
     #  I18n.exception_handler.call(exception, locale, key, options)     # will be called like this
-    def handle_exception(exception, locale, key, options)
-      case handler = options[:exception_handler] || config.exception_handler
-      when Symbol
-        send(handler, exception, locale, key, options)
+    def handle_exception(handling, exception, locale, key, options)
+      case handling
+      when :raise
+        raise(exception.respond_to?(:to_exception) ? exception.to_exception : exception)
+      when :throw
+        throw :exception, exception
       else
-        handler.call(exception, locale, key, options)
-      end
-    end
-
-    def handle_enforce_available_locales_deprecation
-      if config.enforce_available_locales.nil? && !defined?(@unenforced_available_locales_deprecation)
-        $stderr.puts "[deprecated] I18n.enforce_available_locales will default to true in the future. If you really want to skip validation of your locale you can set I18n.enforce_available_locales = false to avoid this message."
-        @unenforced_available_locales_deprecation = true
+        case handler = options[:exception_handler] || config.exception_handler
+        when Symbol
+          send(handler, exception, locale, key, options)
+        else
+          handler.call(exception, locale, key, options)
+        end
       end
     end
 
@@ -326,7 +306,7 @@ module I18n
         else
           keys = key.to_s.split(separator)
           keys.delete('')
-          keys.map!{ |k| k.to_sym }
+          keys.map! { |k| k.to_sym }
           keys
         end
     end
@@ -345,8 +325,7 @@ module I18n
     def default_exception_handler(exception, locale, key, options)
       puts "I18n.default_exception_handler is deprecated. Please use the class I18n::ExceptionHandler instead " +
            "(an instance of which is set to I18n.exception_handler by default)."
-      return exception.message if MissingTranslationData === exception
-      raise exception
+      exception.is_a?(MissingTranslation) ? exception.message : raise(exception)
     end
   end
 end

data/lib/i18n/backend/base.rb

@@ -11,8 +11,8 @@ module I18n
       # plain Ruby (*.rb) or YAML files (*.yml). See #load_rb and #load_yml
       # for details.
       def load_translations(*filenames)
-        filenames = I18n.load_path.flatten if filenames.empty?
-        filenames.each { |filename| load_file(filename) }
+        filenames = I18n.load_path if filenames.empty?
+        filenames.flatten.each { |filename| load_file(filename) }
       end
 
       # This method receives a locale, a data hash and options for storing translations.
@@ -34,7 +34,7 @@ module I18n
             default(locale, key, default, options) : resolve(locale, key, entry, options)
         end
 
-        raise(I18n::MissingTranslationData.new(locale, key, options)) if entry.nil?
+        throw(:exception, I18n::MissingTranslation.new(locale, key, options)) if entry.nil?
         entry = entry.dup if entry.is_a?(String)
 
         entry = pluralize(locale, entry, count) if count
@@ -108,17 +108,18 @@ module I18n
         # subjects will be returned directly.
         def resolve(locale, object, subject, options = {})
           return subject if options[:resolve] == false
-          case subject
-          when Symbol
-            I18n.translate(subject, options.merge(:locale => locale, :raise => true))
-          when Proc
-            date_or_time = options.delete(:object) || object
-            resolve(locale, object, subject.call(date_or_time, options))
-          else
-            subject
+          result = catch(:exception) do
+            case subject
+            when Symbol
+              I18n.translate(subject, options.merge(:locale => locale, :throw => true))
+            when Proc
+              date_or_time = options.delete(:object) || object
+              resolve(locale, object, subject.call(date_or_time, options))
+            else
+              subject
+            end
           end
-        rescue MissingTranslationData
-          nil
+          result unless result.is_a?(MissingTranslation)
         end
 
         # Picks a translation from an array according to English pluralization

data/lib/i18n/backend/cache.rb

@@ -4,7 +4,7 @@
 # To enable caching you can simply include the Cache module to the Simple
 # backend - or whatever other backend you are using:
 #
-#   I18n::Backend::Simple.send(:include, I18n::Backend::Cache)
+#   I18n::Backend::Simple.include(I18n::Backend::Cache)
 #
 # You will also need to set a cache store implementation that you want to use:
 #
@@ -69,23 +69,17 @@ module I18n
       protected
 
         def fetch(cache_key, &block)
-          result = fetch_storing_missing_translation_exception(cache_key, &block)
-          raise result if result.is_a?(Exception)
+          result = _fetch(cache_key, &block)
+          throw(:exception, result) if result.is_a?(MissingTranslation)
           result = result.dup if result.frozen? rescue result
           result
         end
 
-        def fetch_storing_missing_translation_exception(cache_key, &block)
-          fetch_ignoring_procs(cache_key, &block)
-        rescue MissingTranslationData => exception
-          I18n.cache_store.write(cache_key, exception)
-          exception
-        end
-
-        def fetch_ignoring_procs(cache_key, &block)
-          I18n.cache_store.read(cache_key) || yield.tap do |result|
-            I18n.cache_store.write(cache_key, result) unless result.is_a?(Proc)
-          end
+        def _fetch(cache_key, &block)
+          result = I18n.cache_store.read(cache_key) and return result
+          result = catch(:exception, &block)
+          I18n.cache_store.write(cache_key, result) unless result.is_a?(Proc)
+          result
         end
 
         def cache_key(locale, key, options)

data/lib/i18n/backend/chain.rb

@@ -29,7 +29,7 @@ module I18n
         end
 
         def store_translations(locale, data, options = {})
-          backends.first.store_translations(locale, data, options = {})
+          backends.first.store_translations(locale, data, options)
         end
 
         def available_locales
@@ -41,7 +41,7 @@ module I18n
           options = default_options.except(:default)
 
           backends.each do |backend|
-            begin
+            catch(:exception) do
               options = default_options if backend == backends.last
               translation = backend.translate(locale, key, options)
               if namespace_lookup?(translation, options)
@@ -50,22 +50,20 @@ module I18n
               elsif !translation.nil?
                 return translation
               end
-            rescue MissingTranslationData
             end
           end
 
           return namespace if namespace
-          raise(I18n::MissingTranslationData.new(locale, key, options))
+          throw(:exception, I18n::MissingTranslation.new(locale, key, options))
         end
 
         def localize(locale, object, format = :default, options = {})
           backends.each do |backend|
-            begin
+            catch(:exception) do
               result = backend.localize(locale, object, format, options) and return result
-            rescue MissingTranslationData
             end
           end
-          raise(I18n::MissingTranslationData.new(locale, format, options))
+          throw(:exception, I18n::MissingTranslation.new(locale, format, options))
         end
 
         protected

data/lib/i18n/backend/fallbacks.rb

@@ -6,7 +6,7 @@
 # To enable locale fallbacks you can simply include the Fallbacks module to
 # the Simple backend - or whatever other backend you are using:
 #
-#   I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+#   I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 module I18n
   @@fallbacks = nil
 
@@ -29,8 +29,7 @@ module I18n
       # locale :"de-DE" it might try the locales :"de-DE", :de and :en
       # (depends on the fallbacks implementation) until it finds a result with
       # the given options. If it does not find any result for any of the
-      # locales it will then raise a MissingTranslationData exception as
-      # usual.
+      # locales it will then throw MissingTranslation as usual.
       #
       # The default option takes precedence over fallback locales
       # only when it's a Symbol. When the default contains a String or a Proc
@@ -41,20 +40,19 @@ module I18n
 
         options[:fallback] = true
         I18n.fallbacks[locale].each do |fallback|
-          begin
+          catch(:exception) do
             result = super(fallback, key, options)
             return result unless result.nil?
-          rescue I18n::MissingTranslationData
           end
         end
         options.delete(:fallback)
 
         return super(locale, nil, options.merge(:default => default)) if default
-        raise(I18n::MissingTranslationData.new(locale, key, options))
+        throw(:exception, I18n::MissingTranslation.new(locale, key, options))
       end
 
       def extract_string_or_lambda_default!(options)
-        defaults = Array(options[:default])
+        defaults = [options[:default]].flatten
         if index = find_first_string_or_lambda_default(defaults)
           options[:default] = defaults[0, index]
           defaults[index]

data/lib/i18n/backend/gettext.rb

@@ -6,7 +6,7 @@ require 'i18n/gettext/po_parser'
 # To use this you can simply include the module to the Simple backend - or
 # whatever other backend you are using.
 #
-#   I18n::Backend::Simple.send(:include, I18n::Backend::Gettext)
+#   I18n::Backend::Simple.include(I18n::Backend::Gettext)
 #
 # Now you should be able to include your Gettext translation (*.po) files to
 # the I18n.load_path so they're loaded to the backend and you can use them as

data/lib/i18n/backend/interpolation_compiler.rb

@@ -8,7 +8,7 @@
 # To enable pre-compiled interpolations you can simply include the
 # InterpolationCompiler module to the Simple backend:
 #
-#   I18n::Backend::Simple.send(:include, I18n::Backend::InterpolationCompiler)
+#   I18n::Backend::Simple.include(I18n::Backend::InterpolationCompiler)
 #
 # Note that InterpolationCompiler does not yield meaningful results and consequently
 # should not be used with Ruby 1.9 (YARV) but improves performance everywhere else

data/lib/i18n/backend/key_value.rb

@@ -1,5 +1,6 @@
 require 'i18n/backend/base'
 require 'active_support/json'
+require 'active_support/ordered_hash' # active_support/json/encoding uses ActiveSupport::OrderedHash but does not require it
 
 module I18n
   module Backend

data/lib/i18n/backend/memoize.rb

@@ -3,7 +3,7 @@
 #
 # To enable it you can simply include the Memoize module to your backend:
 #
-#   I18n::Backend::Simple.send(:include, I18n::Backend::Memoize)
+#   I18n::Backend::Simple.include(I18n::Backend::Memoize)
 #
 # Notice that it's the responsibility of the backend to define whenever the
 # cache should be cleaned.

data/lib/i18n/backend/metadata.rb

@@ -12,7 +12,7 @@
 # To enable translation metadata you can simply include the Metadata module
 # into the Simple backend class - or whatever other backend you are using:
 #
-#   I18n::Backend::Simple.send(:include, I18n::Backend::Metadata)
+#   I18n::Backend::Simple.include(I18n::Backend::Metadata)
 #
 module I18n
   module Backend

data/lib/i18n/backend/pluralization.rb

@@ -7,7 +7,7 @@
 # Pluralization module to the Simple backend - or whatever other backend you
 # are using.
 #
-#   I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
+#   I18n::Backend::Simple.include(I18n::Backend::Pluralization)
 #
 # You also need to make sure to provide pluralization algorithms to the
 # backend, i.e. include them to your I18n.load_path accordingly.
@@ -19,7 +19,7 @@ module I18n
       # rule and use it to pluralize the given entry. I.e. the library expects
       # pluralization rules to be stored at I18n.t(:'i18n.plural.rule')
       #
-      # Pluralization rules are expected to respond to #call(entry, count) and
+      # Pluralization rules are expected to respond to #call(count) and
       # return a pluralization key. Valid keys depend on the translation data
       # hash (entry) but it is generally recommended to follow CLDR's style,
       # i.e., return one of the keys :zero, :one, :few, :many, :other.

data/lib/i18n/backend/simple.rb

@@ -13,8 +13,10 @@ module I18n
     #   end
     # end
     #
-    # I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
+    # I18n::Backend::Simple.include(I18n::Backend::Pluralization)
     class Simple
+      (class << self; self; end).class_eval { public :include }
+
       module Implementation
         include Base
 

data/lib/i18n/config.rb

@@ -8,7 +8,6 @@ module I18n
 
     # Sets the current locale pseudo-globally, i.e. in the Thread.current hash.
     def locale=(locale)
-      I18n.enforce_available_locales!(locale)
       @locale = locale.to_sym rescue nil
     end
 
@@ -29,7 +28,6 @@ module I18n
 
     # Sets the current default locale. Used to set a custom default locale.
     def default_locale=(locale)
-      I18n.enforce_available_locales!(locale)
       @@default_locale = locale.to_sym rescue nil
     end
 
@@ -84,15 +82,5 @@ module I18n
     def load_path=(load_path)
       @@load_path = load_path
     end
-
-    # [Deprecated] this will default to true in the future
-    # Defaults to nil so that it triggers the deprecation warning
-    def enforce_available_locales
-      defined?(@@enforce_available_locales) ? @@enforce_available_locales : nil
-    end
-
-    def enforce_available_locales=(enforce_available_locales)
-      @@enforce_available_locales = enforce_available_locales
-    end
   end
 end

data/lib/i18n/exceptions.rb

@@ -1,29 +1,17 @@
-require 'cgi'
-
 module I18n
   # Handles exceptions raised in the backend. All exceptions except for
-  # MissingTranslationData exceptions are re-raised. When a MissingTranslationData
+  # MissingTranslationData exceptions are re-thrown. When a MissingTranslationData
   # was caught the handler returns an error message string containing the key/scope.
-  # Note that the exception handler is not called when the option :raise was given.
+  # Note that the exception handler is not called when the option :throw was given.
   class ExceptionHandler
     include Module.new {
       def call(exception, locale, key, options)
-        if exception.is_a?(MissingTranslationData)
-          #
-          # TODO: this block is to be replaced by `exception.message` when
-          # rescue_format is removed
-          if options[:rescue_format] == :html
-            if !defined?(@rescue_format_deprecation)
-              $stderr.puts "[DEPRECATED] I18n's :recue_format option will be removed from a future release. All exception messages will be plain text. If you need the exception handler to return an html format please set or pass a custom exception handler."
-              @rescue_format_deprecation = true
-            end
-            exception.html_message
-          else
-            exception.message
-          end
-
-        else
+        if exception.is_a?(MissingTranslation)
+          options[:rescue_format] == :html ? exception.html_message : exception.message
+        elsif exception.is_a?(Exception)
           raise exception
+        else
+          throw :exception, exception
         end
       end
     }
@@ -47,33 +35,41 @@ module I18n
     end
   end
 
-  class MissingTranslationData < ArgumentError
-    attr_reader :locale, :key, :options
+  class MissingTranslation
+    module Base
+      attr_reader :locale, :key, :options
 
-    def initialize(locale, key, opts = nil)
-      @key, @locale, @options = key, locale, opts.dup || {}
-      options.each { |k, v| options[k] = v.inspect if v.is_a?(Proc) }
-      super "translation missing: #{keys.join('.')}"
-    end
+      def initialize(locale, key, options = nil)
+        @key, @locale, @options = key, locale, options.dup || {}
+        options.each { |k, v| self.options[k] = v.inspect if v.is_a?(Proc) }
+      end
 
-    def html_message
-      key  = CGI.escapeHTML titleize(keys.last)
-      path = CGI.escapeHTML keys.join('.')
-      %(<span class="translation_missing" title="translation missing: #{path}">#{key}</span>)
-    end
+      def html_message
+        key = keys.last.to_s.gsub('_', ' ').gsub(/\b('?[a-z])/) { $1.capitalize }
+        %(<span class="translation_missing" title="translation missing: #{keys.join('.')}">#{key}</span>)
+      end
 
-    def keys
-      @keys ||= I18n.normalize_keys(locale, key, options[:scope]).tap do |keys|
-        keys << 'no key' if keys.size < 2
+      def keys
+        @keys ||= I18n.normalize_keys(locale, key, options[:scope]).tap do |keys|
+          keys << 'no key' if keys.size < 2
+        end
       end
-    end
 
-    protected
+      def message
+        "translation missing: #{keys.join('.')}"
+      end
+      alias :to_s :message
 
-    # TODO : remove when #html_message is removed
-    def titleize(key)
-      key.to_s.gsub('_', ' ').gsub(/\b('?[a-z])/) { $1.capitalize }
+      def to_exception
+        MissingTranslationData.new(locale, key, options)
+      end
     end
+
+    include Base
+  end
+
+  class MissingTranslationData < ArgumentError
+    include MissingTranslation::Base
   end
 
   class InvalidPluralizationData < ArgumentError

data/lib/i18n/locale/fallbacks.rb

@@ -89,7 +89,7 @@ module I18n
           tags
         end.flatten
         result.push(*defaults) if include_defaults
-        result.uniq
+        result.uniq.compact
       end
     end
   end

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

@@ -27,13 +27,13 @@ module I18n
 
         test "localize Date: given a format that resolves to a Proc it calls the Proc with the object" do
           setup_time_proc_translations
-          date = ::Date.new(2008, 3, 1)
+          date = ::Date.new(2008, 3, 1, 6)
           assert_equal '[Sat, 01 Mar 2008, {}]', I18n.l(date, :format => :proc, :locale => :ru)
         end
 
         test "localize Date: given a format that resolves to a Proc it calls the Proc with the object and extra options" do
           setup_time_proc_translations
-          date = ::Date.new(2008, 3, 1)
+          date = ::Date.new(2008, 3, 1, 6)
           assert_equal '[Sat, 01 Mar 2008, {:foo=>"foo"}]', I18n.l(date, :format => :proc, :foo => 'foo', :locale => :ru)
         end
 

data/lib/i18n/version.rb

@@ -1,3 +1,3 @@
 module I18n
-  VERSION = "0.5.4"
+  VERSION = "0.6.0beta1"
 end

data/test/backend/cache_test.rb

@@ -37,12 +37,14 @@ class I18nBackendCacheTest < Test::Unit::TestCase
   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) }
+    assert_equal 1, I18n.cache_store.instance_variable_get(:@data).size
+
+    # I18n.backend.expects(:lookup).returns(nil)
+    # assert_raise(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
+    # 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

data/test/backend/chain_test.rb

@@ -57,6 +57,11 @@ class I18nBackendChainTest < Test::Unit::TestCase
     assert_equal [{ :short => 'short', :long => 'long' }, { :one => 'one' }, 'Bah'], I18n.t([:formats, :plural_2, :bah], :default => 'Bah')
   end
 
+  test "store_translations options are not dropped while transfering to backend" do
+    @first.expects(:store_translations).with(:foo, {:bar => :baz}, {:option => 'persists'})
+    I18n.backend.store_translations :foo, {:bar => :baz}, {:option => 'persists'}
+  end
+
   protected
 
     def backend(translations)

data/test/backend/exceptions_test.rb

@@ -5,6 +5,13 @@ class I18nBackendExceptionsTest < Test::Unit::TestCase
     I18n.backend = I18n::Backend::Simple.new
   end
 
+  test "throw message: MissingTranslation message from #translate includes the given scope and full key" do
+    exception = catch(:exception) do
+      I18n.t(:'baz.missing', :scope => :'foo.bar', :throw => true)
+    end
+    assert_equal "translation missing: en.foo.bar.baz.missing", exception.message
+  end
+
   test "exceptions: MissingTranslationData message from #translate includes the given scope and full key" do
     begin
       I18n.t(:'baz.missing', :scope => :'foo.bar', :raise => true)

data/test/backend/fallbacks_test.rb

@@ -65,6 +65,10 @@ class I18nBackendFallbacksTranslateTest < Test::Unit::TestCase
     assert_raise(I18n::MissingTranslationData) { I18n.t(:faa, :locale => :en, :raise => true) }
     assert_raise(I18n::MissingTranslationData) { I18n.t(:faa, :locale => :de, :raise => true) }
   end
+
+  test "should ensure that default is not splitted on new line char" do
+    assert_equal "Default \n Bar", I18n.t(:missing_bar, :default => "Default \n Bar")
+  end
 end
 
 class I18nBackendFallbacksLocalizeTest < Test::Unit::TestCase

data/test/backend/simple_test.rb

@@ -42,6 +42,10 @@ class I18nBackendSimpleTest < Test::Unit::TestCase
     assert_equal expected, translations
   end
 
+  test "simple load_translations: given file names as array it does not raise anything" do
+    assert_nothing_raised { I18n.backend.load_translations(["#{locales_dir}/en.rb", "#{locales_dir}/en.yml"]) }
+  end
+
   # storing translations
 
   test "simple store_translations: stores translations, ... no, really :-)" do

data/test/i18n/exceptions_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class I18nExceptionsTest < Test::Unit::TestCase
   def test_invalid_locale_stores_locale
     force_invalid_locale
-  rescue I18n::ArgumentError => exception
+  rescue I18n::ArgumentError => e
     assert_nil exception.locale
   end
 
@@ -28,13 +28,9 @@ class I18nExceptionsTest < Test::Unit::TestCase
   end
 
   test "MissingTranslationData html_message is a span with the titlelized last key token" do
-    exception = I18n::MissingTranslationData.new(:de, :foo, :scope => :bar)
-    assert_equal '<span class="translation_missing" title="translation missing: de.bar.foo">Foo</span>', exception.html_message
-  end
-
-  test "MissingTranslationData html_message html escapes key names" do
-    exception = I18n::MissingTranslationData.new(:de, '<script>Evil</script>', :scope => '<iframe src="example.com" />')
-    assert_equal '<span class="translation_missing" title="translation missing: de.&lt;iframe src=&quot;example.com&quot; /&gt;.&lt;script&gt;Evil&lt;/script&gt;">&lt;Script&gt;Evil&lt;/Script&gt;</span>', exception.html_message
+    force_missing_translation_data do |exception|
+      assert_equal '<span class="translation_missing" title="translation missing: de.bar.foo">Foo</span>', exception.html_message
+    end
   end
 
   test "ExceptionHandler returns the html_message if :rescue_format => :html was given" do

data/test/i18n_test.rb

@@ -35,24 +35,6 @@ class I18nTest < Test::Unit::TestCase
     end
   end
 
-  test "translate given an unavailable locale rases an I18n::InvalidLocale" do
-    begin
-      I18n.config.enforce_available_locales = true
-      assert_raise(I18n::InvalidLocale) { I18n.t(:foo, :locale => 'klingon') }
-    ensure
-      I18n.config.enforce_available_locales = false
-    end
-  end
-
-  test "raises an I18n::InvalidLocale exception when setting an unavailable default locale" do
-    begin
-      I18n.config.enforce_available_locales = true
-      assert_raise(I18n::InvalidLocale) { I18n.default_locale = :klingon }
-    ensure
-      I18n.config.enforce_available_locales = false
-    end
-  end
-
   test "uses the default locale as a locale by default" do
     assert_equal I18n.default_locale, I18n.locale
   end
@@ -64,15 +46,6 @@ class I18nTest < Test::Unit::TestCase
     I18n.locale = :en
   end
 
-  test "raises an I18n::InvalidLocale exception when setting an unavailable locale" do
-    begin
-      I18n.config.enforce_available_locales = true
-      assert_raise(I18n::InvalidLocale) { I18n.locale = :klingon }
-    ensure
-      I18n.config.enforce_available_locales = false
-    end
-  end
-  
   test "can set the configuration object" do
     begin
       I18n.config = self
@@ -221,74 +194,23 @@ class I18nTest < Test::Unit::TestCase
     assert_raise(I18n::ArgumentError) { I18n.l Object.new }
   end
 
-  test "localize given an unavailable locale rases an I18n::InvalidLocale" do
-    begin
-      I18n.config.enforce_available_locales = true
-      assert_raise(I18n::InvalidLocale) { I18n.l(Time.now, :locale => 'klingon') }
-    ensure
-      I18n.config.enforce_available_locales = false
-    end
-  end
-
   test "can use a lambda as an exception handler" do
     begin
       previous_exception_handler = I18n.exception_handler
-      I18n.exception_handler = Proc.new { |exception, locale, key, options| exception }
-      assert_equal I18n::MissingTranslationData, I18n.translate(:test_proc_handler).class
+      I18n.exception_handler = Proc.new { |exception, locale, key, options| key }
+      assert_equal :test_proc_handler, I18n.translate(:test_proc_handler)
     ensure
       I18n.exception_handler = previous_exception_handler
     end
   end
 
-  test "transliterate given an unavailable locale rases an I18n::InvalidLocale" do
-    begin
-      I18n.config.enforce_available_locales = true
-      assert_raise(I18n::InvalidLocale) { I18n.transliterate('string', :locale => 'klingon') }
-    ensure
-      I18n.config.enforce_available_locales = false
-    end
-  end
-
-  test "I18n.locale_available? returns true when the passed locale is available" do
-    I18n.available_locales = [:en, :de]
-    assert_equal true, I18n.locale_available?(:de)
-  end
-
-  test "I18n.locale_available? returns true when the passed locale is a string and is available" do
-    I18n.available_locales = [:en, :de]
-    assert_equal true, I18n.locale_available?('de')
-  end
-
-  test "I18n.locale_available? returns false when the passed locale is unavailable" do
-    assert_equal false, I18n.locale_available?(:klingon)
-  end
-
-  test "I18n.enforce_available_locales! raises an I18n::InvalidLocale when the passed locale is unavailable" do
-    begin
-      I18n.config.enforce_available_locales = true
-      assert_raise(I18n::InvalidLocale) { I18n.enforce_available_locales!(:klingon) }
-    ensure
-      I18n.config.enforce_available_locales = false
-    end
-  end
-
-  test "I18n.enforce_available_locales! does nothing when the passed locale is available" do
-    I18n.available_locales = [:en, :de]
-    begin
-      I18n.config.enforce_available_locales = true
-      assert_nothing_raised { I18n.enforce_available_locales!(:en) }
-    ensure
-      I18n.config.enforce_available_locales = false
-    end
-  end
-
   test "can use an object responding to #call as an exception handler" do
     begin
       previous_exception_handler = I18n.exception_handler
       I18n.exception_handler = Class.new do
-        def call(exception, locale, key, options); exception; end
+        def call(exception, locale, key, options); key; end
       end.new
-      assert_equal I18n::MissingTranslationData, I18n.translate(:test_proc_handler).class
+      assert_equal :test_proc_handler, I18n.translate(:test_proc_handler)
     ensure
       I18n.exception_handler = previous_exception_handler
     end
@@ -311,13 +233,4 @@ class I18nTest < Test::Unit::TestCase
     assert_raise(I18n::ArgumentError) { I18n.with_locale(:pl) { raise I18n::ArgumentError } }
     assert_equal I18n.default_locale, I18n.locale
   end
-
-  test "I18n.enforce_available_locales config can be set to false" do
-    begin
-      I18n.config.enforce_available_locales = false
-      assert_equal false, I18n.config.enforce_available_locales
-    ensure
-      I18n.config.enforce_available_locales = false
-    end
-  end
 end

data/test/run_all.rb

@@ -1,13 +1,13 @@
 def bundle_check
-  `bundle check` == "Resolving dependencies...\nThe Gemfile's dependencies are satisfied\n"
+  `bundle check` == "The Gemfile's dependencies are satisfied\n"
 end
 
-command  = 'bundle exec ruby -w -Ilib -Itest test/all.rb'
-gemfiles = %w(Gemfile) + Dir['gemfiles/Gemfile*'].reject { |f| f.end_with?('.lock') }
+command  = 'ruby -w -Ilib -Itest test/all.rb'
+gemfiles = %w(ci/Gemfile.rails-3.x ci/Gemfile.rails-2.3.x ci/Gemfile.no-rails)
 
 results = gemfiles.map do |gemfile|
   puts "BUNDLE_GEMFILE=#{gemfile}"
-  ENV['BUNDLE_GEMFILE'] = File.expand_path("../../#{gemfile}", __FILE__)
+  ENV['BUNDLE_GEMFILE'] = gemfile
 
   unless bundle_check
     puts "bundle install"
@@ -15,7 +15,7 @@ results = gemfiles.map do |gemfile|
   end
 
   puts command
-  system command
+  system('ruby -w -Ilib -Itest test/all.rb')
 end
 
 exit(results.inject(true) { |a, b| a && b })

data/test/test_data/locales/invalid/empty.yml

@@ -0,0 +1 @@
+en:

data/test/test_helper.rb

@@ -14,7 +14,7 @@ end
 
 require 'bundler/setup'
 require 'i18n'
-require 'mocha/setup'
+require 'mocha'
 require 'test_declarative'
 
 class Test::Unit::TestCase

metadata

@@ -1,9 +1,17 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: i18n
-version: !ruby/object:Gem::Version
-  version: 0.5.4
+version: !ruby/object:Gem::Version 
+  hash: 62196417
+  prerelease: 5
+  segments: 
+  - 0
+  - 6
+  - 0
+  - beta
+  - 1
+  version: 0.6.0beta1
 platform: ruby
-authors:
+authors: 
 - Sven Fuchs
 - Joshua Harvey
 - Matt Aimonetti
@@ -12,19 +20,83 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
-dependencies: []
+
+date: 2011-04-26 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: test_declarative
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: New wave Internationalization support for Ruby.
 email: rails-i18n@googlegroups.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- CHANGELOG.textile
-- MIT-LICENSE
-- README.textile
-- lib/i18n.rb
-- lib/i18n/backend.rb
+
+files: 
+- ci/Gemfile.no-rails
+- ci/Gemfile.no-rails.lock
+- ci/Gemfile.rails-2.3.x
+- ci/Gemfile.rails-2.3.x.lock
+- ci/Gemfile.rails-3.x
+- ci/Gemfile.rails-3.x.lock
 - lib/i18n/backend/base.rb
 - lib/i18n/backend/cache.rb
 - lib/i18n/backend/cascade.rb
@@ -39,35 +111,37 @@ files:
 - lib/i18n/backend/pluralization.rb
 - lib/i18n/backend/simple.rb
 - lib/i18n/backend/transliterator.rb
+- lib/i18n/backend.rb
 - lib/i18n/config.rb
 - lib/i18n/core_ext/hash.rb
 - lib/i18n/core_ext/kernel/surpress_warnings.rb
 - lib/i18n/core_ext/string/interpolate.rb
 - lib/i18n/exceptions.rb
-- lib/i18n/gettext.rb
 - lib/i18n/gettext/helpers.rb
 - lib/i18n/gettext/po_parser.rb
+- lib/i18n/gettext.rb
 - lib/i18n/interpolate/ruby.rb
-- lib/i18n/locale.rb
 - lib/i18n/locale/fallbacks.rb
-- lib/i18n/locale/tag.rb
 - lib/i18n/locale/tag/parents.rb
 - lib/i18n/locale/tag/rfc4646.rb
 - lib/i18n/locale/tag/simple.rb
-- lib/i18n/tests.rb
+- lib/i18n/locale/tag.rb
+- lib/i18n/locale.rb
 - lib/i18n/tests/basics.rb
 - lib/i18n/tests/defaults.rb
 - lib/i18n/tests/interpolation.rb
 - lib/i18n/tests/link.rb
-- lib/i18n/tests/localization.rb
 - lib/i18n/tests/localization/date.rb
 - lib/i18n/tests/localization/date_time.rb
 - lib/i18n/tests/localization/procs.rb
 - lib/i18n/tests/localization/time.rb
+- lib/i18n/tests/localization.rb
 - lib/i18n/tests/lookup.rb
 - lib/i18n/tests/pluralization.rb
 - lib/i18n/tests/procs.rb
+- lib/i18n/tests.rb
 - lib/i18n/version.rb
+- lib/i18n.rb
 - test/all.rb
 - test/api/all_features_test.rb
 - test/api/cascade_test.rb
@@ -107,27 +181,44 @@ files:
 - test/test_data/locales/invalid/empty.yml
 - test/test_data/locales/plurals.rb
 - test/test_helper.rb
+- README.textile
+- MIT-LICENSE
+- CHANGELOG.textile
+has_rdoc: true
 homepage: http://github.com/svenfuchs/i18n
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 17
+      segments: 
+      - 1
+      - 3
+      - 5
       version: 1.3.5
 requirements: []
-rubyforge_project: ! '[none]'
-rubygems_version: 2.2.2
+
+rubyforge_project: "[none]"
+rubygems_version: 1.4.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: New wave Internationalization support for Ruby
 test_files: []
+

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzZlZTA2MGRlOTAzNTY4MGM1NmM2ODRhNjFjNWFkMTMyODNiNTU4Mg==
-  data.tar.gz: !binary |-
-    MGJmZmRhZjU1NGRlMzFjZjdjZDA2OWUxYWM3MmIwNmU0NzkyYmNmMA==
-SHA512:
-  metadata.gz: !binary |-
-    YjkxZmU3MGJkZmM2ZDAxMjA0ZGI5OGNkYWZiNGU3MDEzNGZlYWU0YWNhNzQ2
-    YmE1ZDAzZGE2MjQyZDJiMTZlZGFiMTUyOThlYjdkYTQ4MGUxNmYwZjVhOGY5
-    ZTFkNDkzNzlmOWRlODVkMGI5YmY0ZTk5YmZjYTNhZTlhZjk4NDk=
-  data.tar.gz: !binary |-
-    YmQwN2ViOWZhMDkwYmZiMDgyODMyMjg0NjY0ZmViZTg4YThmYWU0NzVjNjRl
-    ZTk5NzhiMjVjMTExYjc5MzVkYTIwMDAyODI1YjFlZGM4YjY0MWM0NDNiZDZk
-    MTIxOTI1NWEwNjBkZDhjZTZmNmQ4MTBhNmQyNDhlNjFiNjlhY2I=