i18n 0.6.11 → 0.7.0.beta1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b8187a8b397f09fc92f74aab28add40becb5c0bf
+  data.tar.gz: 2c51a444a3b6919d4f407444cfa920500efc0dff
+SHA512:
+  metadata.gz: 89409a78b2822b57ac485a0479017c5b725d28b22f1143f1b579f6b41a82b1f11e94e92509faaf8489e4c43ec7e2f4306cd9613767e895bfecba444637582318
+  data.tar.gz: bc606a452a926441015813ee126218249e862ab414388de14f8b9d263838214058c0fdc010c1837fdcbd6f24f80e6960c6925ab083565887e4468b750683627d

data/README.md

@@ -35,39 +35,16 @@ For more information and lots of resources see: [http://ruby-i18n.org/wiki](http
 
 ## Installation
 
-gem install i18n
-
-#### Rails version warning
-
-On Rails < 2.3.6 the method I18n.localize will fail with MissingInterpolationArgument (issue [20](http://github.com/svenfuchs/i18n/issues/issue/20). Upgrade to Rails 2.3.6 or higher (2.3.8 preferably) is recommended.
-
-### Installation on Rails < 2.3.5 (deprecated)
-
-Up to version 2.3.4 Rails will not accept i18n gems > 0.1.3. There is an unpacked
-gem inside of active_support/lib/vendor which gets loaded unless `gem 'i18n', '~> 0.1.3'`.
-This requirement is relaxed in [6da03653](http://github.com/rails/rails/commit/6da03653)
-
-The new i18n gem can be loaded from vendor/plugins like this:
-
 ```
-def reload_i18n!
-  raise "Move to i18n version 0.2.0 or greater" if Rails.version > "2.3.4"
-
-  $:.grep(/i18n/).each { |path| $:.delete(path) }
-  I18n::Backend.send :remove_const, "Simple"
-  $: << Rails.root.join('vendor', 'plugins', 'i18n', 'lib').to_s
-end
+gem install i18n
 ```
 
-Then you can `reload_i18n!` inside an i18n initializer.
-
 ## Tests
 
 You can run tests both with
 
 * `rake test` or just `rake`
-* run any test file directly, e.g. `ruby -Ilib -Itest test/api/simple_test.rb`
-* run all tests with `ruby -Ilib -Itest test/all.rb`
+* run any test file directly, e.g. `ruby -Ilib:test test/api/simple_test.rb`
 
 You can run all tests against all Gemfiles with
 
@@ -98,7 +75,7 @@ follow the usual test setup and should be easy to grok.
 
 ## Contributors
 
-http://github.com/svenfuchs/i18n/contributors
+https://github.com/svenfuchs/i18n/graphs/contributors
 
 ## License
 

data/gemfiles/Gemfile.rails-3.2.x

@@ -5,6 +5,4 @@ gemspec :path => '..'
 gem 'activesupport', '~> 3.2.0'
 gem 'mocha'
 gem 'test_declarative'
-gem 'rufus-tokyo'
-gem 'ffi'
 gem 'rake'

data/gemfiles/Gemfile.rails-3.2.x.lock

@@ -1,21 +1,19 @@
 PATH
   remote: ..
   specs:
-    i18n (0.6.11)
+    i18n (0.7.0.beta1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.18)
+    activesupport (3.2.19)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    ffi (1.9.3)
     metaclass (0.0.4)
-    mocha (1.0.0)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.10.0)
-    rake (10.3.1)
-    rufus-tokyo (1.0.7)
+    multi_json (1.10.1)
+    rake (10.3.2)
     test_declarative (0.0.5)
 
 PLATFORMS
@@ -23,9 +21,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 3.2.0)
-  ffi
   i18n!
   mocha
   rake
-  rufus-tokyo
   test_declarative

data/gemfiles/Gemfile.rails-4.0.x

@@ -5,6 +5,4 @@ gemspec :path => '..'
 gem 'activesupport', '~> 4.0.0'
 gem 'mocha'
 gem 'test_declarative'
-gem 'rufus-tokyo'
-gem 'ffi'
 gem 'rake'

data/gemfiles/Gemfile.rails-4.0.x.lock

@@ -1,37 +1,33 @@
 PATH
   remote: ..
   specs:
-    i18n (0.6.11)
+    i18n (0.7.0.beta1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.5)
+    activesupport (4.0.8)
       i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    ffi (1.9.3)
     metaclass (0.0.4)
     minitest (4.7.5)
-    mocha (1.0.0)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.10.0)
-    rake (10.3.1)
-    rufus-tokyo (1.0.7)
+    multi_json (1.10.1)
+    rake (10.3.2)
     test_declarative (0.0.5)
-    thread_safe (0.3.3)
-    tzinfo (0.3.39)
+    thread_safe (0.3.4)
+    tzinfo (0.3.40)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activesupport (~> 4.0.0)
-  ffi
   i18n!
   mocha
   rake
-  rufus-tokyo
   test_declarative

data/gemfiles/Gemfile.rails-4.1.x

@@ -5,6 +5,4 @@ gemspec :path => '..'
 gem 'activesupport', '~> 4.1.0'
 gem 'mocha'
 gem 'test_declarative'
-gem 'rufus-tokyo'
-gem 'ffi'
 gem 'rake'

data/gemfiles/Gemfile.rails-4.1.x.lock

@@ -1,28 +1,26 @@
 PATH
   remote: ..
   specs:
-    i18n (0.6.11)
+    i18n (0.7.0.beta1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.1)
+    activesupport (4.1.4)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    ffi (1.9.3)
     json (1.8.1)
     metaclass (0.0.4)
-    minitest (5.3.3)
-    mocha (1.0.0)
+    minitest (5.4.0)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    rake (10.3.1)
-    rufus-tokyo (1.0.7)
+    rake (10.3.2)
     test_declarative (0.0.5)
-    thread_safe (0.3.3)
-    tzinfo (1.1.0)
+    thread_safe (0.3.4)
+    tzinfo (1.2.1)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -30,9 +28,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 4.1.0)
-  ffi
   i18n!
   mocha
   rake
-  rufus-tokyo
   test_declarative

data/gemfiles/{Gemfile.rails-3.1.x → Gemfile.rails-master}

@@ -2,9 +2,7 @@ source 'https://rubygems.org'
 
 gemspec :path => '..'
 
-gem 'activesupport', '~> 3.1.0'
+gem 'activesupport', github: 'rails/rails', branch: 'master'
 gem 'mocha'
 gem 'test_declarative'
-gem 'rufus-tokyo'
-gem 'ffi'
 gem 'rake'

data/gemfiles/Gemfile.rails-master.lock

@@ -0,0 +1,40 @@
+PATH
+  remote: ..
+  specs:
+    i18n (0.7.0.beta1)
+
+GIT
+  remote: git://github.com/rails/rails.git
+  revision: c9cd532ba6be0316d80e93a8ac1b28f532222dcb
+  branch: master
+  specs:
+    activesupport (4.2.0.alpha)
+      i18n (>= 0.7.0.beta1, < 0.8)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    json (1.8.1)
+    metaclass (0.0.4)
+    minitest (5.4.0)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    rake (10.3.2)
+    test_declarative (0.0.5)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport!
+  i18n!
+  mocha
+  rake
+  test_declarative

data/lib/i18n.rb

@@ -9,7 +9,7 @@ module I18n
   autoload :Locale,  'i18n/locale'
   autoload :Tests,   'i18n/tests'
 
-  RESERVED_KEYS = [:scope, :default, :separator, :resolve, :object, :fallback, :format, :cascade, :throw, :raise, :rescue_format]
+  RESERVED_KEYS = [:scope, :default, :separator, :resolve, :object, :fallback, :format, :cascade, :throw, :raise]
   RESERVED_KEYS_PATTERN = /%\{(#{RESERVED_KEYS.join("|")})\}/
 
   extend(Module.new {
@@ -41,6 +41,7 @@ module I18n
     # Rails development environment. Backends can implement whatever strategy
     # is useful.
     def reload!
+      config.clear_available_locales_set
       config.backend.reload!
     end
 
@@ -279,15 +280,11 @@ module I18n
 
     # Raises an InvalidLocale exception when the passed locale is not available.
     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
@@ -300,18 +297,18 @@ module I18n
     #
     # Examples:
     #
-    #   I18n.exception_handler = :default_exception_handler             # this is the default
-    #   I18n.default_exception_handler(exception, locale, key, options) # will be called like this
+    #   I18n.exception_handler = :custom_exception_handler              # this is the default
+    #   I18n.custom_exception_handler(exception, locale, key, options)  # will be called like this
     #
     #   I18n.exception_handler = lambda { |*args| ... }                 # a lambda
     #   I18n.exception_handler.call(exception, locale, key, options)    # will be called like this
     #
-    #  I18n.exception_handler = I18nExceptionHandler.new                # an object
-    #  I18n.exception_handler.call(exception, locale, key, options)     # will be called like this
+    #   I18n.exception_handler = I18nExceptionHandler.new               # an object
+    #   I18n.exception_handler.call(exception, locale, key, options)    # will be called like this
     def handle_exception(handling, exception, locale, key, options)
       case handling
       when :raise
-        raise(exception.respond_to?(:to_exception) ? exception.to_exception : exception)
+        raise exception.respond_to?(:to_exception) ? exception.to_exception : exception
       when :throw
         throw :exception, exception
       else
@@ -340,25 +337,5 @@ module I18n
     def normalized_key_cache
       @normalized_key_cache ||= Hash.new { |h,k| h[k] = {} }
     end
-
-    # DEPRECATED. Use I18n.normalize_keys instead.
-    def normalize_translation_keys(locale, key, scope, separator = nil)
-      puts "I18n.normalize_translation_keys is deprecated. Please use the class I18n.normalize_keys instead."
-      normalize_keys(locale, key, scope, separator)
-    end
-
-    # DEPRECATED. Please use the I18n::ExceptionHandler class instead.
-    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)."
-      exception.is_a?(MissingTranslation) ? exception.message : raise(exception)
-    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
-      end
-    end
   })
 end

data/lib/i18n/backend/base.rb

@@ -81,7 +81,6 @@ module I18n
       end
 
       def reload!
-        @skip_syntax_deprecation = false
       end
 
       protected

data/lib/i18n/backend/interpolation_compiler.rb

@@ -12,7 +12,7 @@
 #
 # Note that InterpolationCompiler does not yield meaningful results and consequently
 # should not be used with Ruby 1.9 (YARV) but improves performance everywhere else
-# (jRuby, Rubinius and 1.8.7).
+# (jRuby, Rubinius).
 module I18n
   module Backend
     module InterpolationCompiler

data/lib/i18n/backend/key_value.rb

@@ -1,6 +1,5 @@
 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/config.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module I18n
   class Config
     # The only configuration value that is not global and scoped to thread is :locale.
@@ -9,7 +11,7 @@ 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
+      @locale = locale && locale.to_sym
     end
 
     # Returns the current backend. Defaults to +Backend::Simple+.
@@ -30,7 +32,7 @@ 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
+      @@default_locale = locale && locale.to_sym
     end
 
     # Returns an array of locales for which translations are available.
@@ -56,6 +58,12 @@ module I18n
       @@available_locales_set = nil
     end
 
+    # Clears the available locales set so it can be recomputed again after I18n
+    # gets reloaded.
+    def clear_available_locales_set #:nodoc:
+      @@available_locales_set = nil
+    end
+
     # Returns the current default scope separator. Defaults to '.'
     def default_separator
       @@default_separator ||= '.'
@@ -66,7 +74,8 @@ module I18n
       @@default_separator = separator
     end
 
-    # Return the current exception handler. Defaults to :default_exception_handler.
+    # Returns the current exception handler. Defaults to an instance of
+    # I18n::ExceptionHandler.
     def exception_handler
       @@exception_handler ||= ExceptionHandler.new
     end
@@ -117,10 +126,11 @@ module I18n
       @@load_path = load_path
     end
 
-    # [Deprecated] this will default to true in the future
-    # Defaults to nil so that it triggers the deprecation warning
+    # Whether or not to verify if locales are in the list of available locales.
+    # Defaults to true.
+    @@enforce_available_locales = true
     def enforce_available_locales
-      defined?(@@enforce_available_locales) ? @@enforce_available_locales : nil
+      @@enforce_available_locales
     end
 
     def enforce_available_locales=(enforce_available_locales)

data/lib/i18n/exceptions.rb

@@ -8,21 +8,10 @@ module I18n
   class ExceptionHandler
     include Module.new {
       def call(exception, locale, key, options)
-        if exception.is_a?(MissingTranslation)
-          #
-          # 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
-
-        elsif exception.is_a?(Exception)
+        case exception
+        when MissingTranslation
+          exception.message
+        when Exception
           raise exception
         else
           throw :exception, exception
@@ -58,12 +47,6 @@ module I18n
         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 keys
         @keys ||= I18n.normalize_keys(locale, key, options[:scope]).tap do |keys|
           keys << 'no key' if keys.size < 2
@@ -78,13 +61,6 @@ module I18n
       def to_exception
         MissingTranslationData.new(locale, key, options)
       end
-
-      protected
-
-      # TODO : remove when #html_message is removed
-      def titleize(key)
-        key.to_s.gsub('_', ' ').gsub(/\b('?[a-z])/) { $1.capitalize }
-      end
     end
 
     include Base