route_translator 7.0.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b48ef0fed8291cf19c3f8bbbc03276061bbebfeca5ebe69f7cec013e1ec2e41c
-  data.tar.gz: 7601140f98d82f866b9f32a801c1057f0949390df7a0832f8cf8331e1c54c2fd
+  metadata.gz: baff0e31d0c0f72b8daddc3754594542af32f47ffa29a0cacb6801a69e8a12c9
+  data.tar.gz: 277a5c0d34be1d75ab2aaefc16cd7e7d5f5a87d6c00e999445d5968121a699b2
 SHA512:
-  metadata.gz: 823890c7d82fe2918f5eef719ecd3ba204875d68f25dc5659f29870e80db5246926225c47dc79f2af46e64b936a82d9d508bcdfa2eeb1e7be8b0bf63a1ad3414
-  data.tar.gz: 3a0b3401cedb34b0fe9884cbc15f26a3decea8c3984152512869b00ea0cf9d3f26c2db7c275ec110db94338774796cee1417eba97e8b7837ebb045e0ef3856f4
+  metadata.gz: e0a20daed33d3f7979dd0f18eb235944230351a4f730fde34da6642455bfbdcc0d435d405405cc8cb9e7bab8a467b4b4654dd87375e7019eac4bc9e4d0854c37
+  data.tar.gz: 9e321b96018d925b0cb42dd960243f2211258cf686d53939a6e637e683177bf93ab01cccd2abb7611dc4d7f1d15d2f21265d976c0bde8a8f54758abbf074c489

data/CHANGELOG.md

@@ -1,5 +1,53 @@
 # Changelog
 
+## 9.0.0 / 2020-11-07
+
+* [ENHANCEMENT] Check for `empty?` instead of `any?` on available_locales array
+* [ENHANCEMENT] Update development dependencies
+
+## 8.2.1 / 2020-11-03
+
+* [ENHANCEMENT] Fix deprecation with URI.parser ([#234](https://github.com/enriclluelles/route_translator/pull/234))
+
+## 8.2.0 / 2020-11-03
+
+* [FEATURE] Add Rails 6.1 compatibility
+* [ENHANCEMENT] Update development dependencies
+
+## 8.1.0 / 2020-08-10
+
+* [FEATURE] Allow Ruby 3.0.0
+* [ENHANCEMENT] Test against latest Ruby versions
+* [ENHANCEMENT] Update development dependencies
+
+## 8.0.0 / 2020-04-17
+
+* [FEATURE] Drop Ruby 2.3 support
+* [ENHANCEMENT] Add gem metadata for RubyGems.org
+* [ENHANCEMENT] Test against latest Ruby versions
+* [ENHANCEMENT] Update development dependencies
+
+## 7.1.2 / 2020-03-02
+
+* [BUGFIX] Fix lazy load of action controller ([#206](https://github.com/enriclluelles/route_translator/pull/206))
+* [ENHANCEMENT] Update development dependencies
+
+## 7.1.1 / 2019-12-26
+
+* [ENHANCEMENT] Minor improvements to configuration and tests
+
+## 7.1.0 / 2019-12-26
+
+* [ENHANCEMENT] Use Addressable gem for URI parsing
+* [ENHANCEMENT] Fix Ruby 2.7 deprecations
+* [ENHANCEMENT] Update dependencies
+
+## 7.0.1 / 2019-10-14
+
+* [BUGFIX] Fix missing dup on blocks ([#203](https://github.com/enriclluelles/route_translator/pull/203))
+* [ENHANCEMENT] Test against latest Ruby versions
+* [ENHANCEMENT] Update development dependencies
+
 ## 7.0.0 / 2019-07-30
 
 * [FEATURE] Add Rails > 6.0.0.rc1 compatibility

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2007 Raul Murciano [http://raul.murciano.net], Domestika INTERNET S.L. [http://domestika.org], 2015 Enric Lluelles [http://enric.lluell.es], 2019 Geremia Taglialatela
+Copyright (c) 2007 Raul Murciano [http://raul.murciano.net], Domestika INTERNET S.L. [http://domestika.org], 2015 Enric Lluelles [http://enric.lluell.es], 2020 Geremia Taglialatela
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,6 +1,7 @@
 # RouteTranslator
 
 [![Gem Version](https://badge.fury.io/rb/route_translator.svg)](https://badge.fury.io/rb/route_translator)
+[![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=route_translator&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=route_translator&package-manager=bundler&version-scheme=semver)
 [![Build Status](https://travis-ci.org/enriclluelles/route_translator.svg?branch=master)](https://travis-ci.org/enriclluelles/route_translator)
 [![Maintainability](https://api.codeclimate.com/v1/badges/1c369ce6147724b353fc/maintainability)](https://codeclimate.com/github/enriclluelles/route_translator/maintainability)
 [![Coverage Status](https://coveralls.io/repos/github/enriclluelles/route_translator/badge.svg?branch=master)](https://coveralls.io/github/enriclluelles/route_translator?branch=master)
@@ -9,7 +10,7 @@ RouteTranslator is a gem to allow you to manage the translations of your app rou
 
 It started as a fork of the awesome [translate_routes](https://github.com/raul/translate_routes) plugin by [Raúl Murciano](https://github.com/raul).
 
-Right now it works with Rails 5.x and Rails 6.0
+Right now it works with Rails 5.x and Rails 6.x
 
 
 
@@ -144,6 +145,21 @@ Right now it works with Rails 5.x and Rails 6.0
     Note: you might be tempted to use `before_action` instead of `around_action`: just don't. That could lead to [thread-related issues](https://github.com/enriclluelles/route_translator/issues/44).
 
 
+### Changing the Language
+
+To change the language and reload the appropriate route while staying on the same page, use the following code snippet:
+
+```ruby
+link_to url_for(locale: 'es'), hreflang: 'es', rel: 'alternate'
+```
+
+Although locales are stored by Rails as a symbol (`:es`), when linking to a page in a different locale you need to use a string (`'es'`). Otherwise, instead of a namespaced route (`/es/my-route`) you will get a parameterized route (`/my-route?locale=es`).
+
+If the page contains a localized slug, the above snippet does not work and a custom implementation is neede.
+
+More information at [Generating translated URLs](https://github.com/enriclluelles/route_translator/wiki/Generating-translated-URLs)
+
+
 ### Namespaces
 
 You can translate a namespace route by either its `name` or `path` option:
@@ -358,11 +374,12 @@ end
 
 
 ## Testing
-Testing your controllers with routes-translator is easy, just add a locale parameter for your localized routes. Otherwise, an ActionController::UrlGenerationError will raise.
+Testing your controllers with routes-translator is easy, just add a locale parameter as `String` for your localized routes. Otherwise, an `ActionController::UrlGenerationError` will raise.
 
 ```ruby
 describe 'GET index' do
   it 'should respond with success' do
+    # Remember to pass the locale param as String
     get :index, locale: 'fr'
 
     expect(response).to be_success

data/lib/route_translator/extensions/action_controller.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'action_controller'
 require 'active_support/concern'
 
 module RouteTranslator
@@ -21,22 +20,12 @@ module RouteTranslator
       I18n.locale = old_locale if locale_from_url
     end
   end
-
-  module TestCase
-    extend ActiveSupport::Concern
-    include ActionController::UrlFor
-
-    included do
-      delegate :env, :request, to: :@controller
-    end
-
-    def _routes
-      @routes
-    end
-  end
 end
 
 ActiveSupport.on_load(:action_controller) do
-  ActionController::Base.send :include, RouteTranslator::Controller
-  ActionController::TestCase.send :include, RouteTranslator::TestCase if ENV['RAILS_ENV'] == 'test'
+  include RouteTranslator::Controller
+  if ENV['RAILS_ENV'] == 'test'
+    require 'route_translator/extensions/test_case'
+    ActionController::TestCase.include RouteTranslator::TestCase
+  end
 end

data/lib/route_translator/extensions/mapper.rb

@@ -11,7 +11,7 @@ module ActionDispatch
         @localized = false
       end
 
-      # rubocop:disable Lint/UnderscorePrefixedVariableName
+      # rubocop:disable Lint/UnderscorePrefixedVariableName, Metrics/PerceivedComplexity
       def add_route(action, controller, options, _path, to, via, formatted, anchor, options_constraints) # :nodoc:
         return super unless @localized
 
@@ -22,25 +22,25 @@ module ActionDispatch
 
         default_action = options.delete(:action) || @scope[:action]
 
-        if action =~ %r{^[\w\-\/]+$}
+        if %r{^[\w\-\/]+$}.match?(action)
           default_action ||= action.tr('-', '_') unless action.include?('/')
         else
           action = nil
         end
 
-        as = if !options.fetch(:as, true) # if it's set to nil or false
-               options.delete(:as)
-             else
+        as = if options.fetch(:as, true)
                name_for_action(options.delete(:as), action)
+             else
+               options.delete(:as)
              end
 
-        path = Mapping.normalize_path URI.parser.escape(path), formatted
+        path = Mapping.normalize_path URI::DEFAULT_PARSER.escape(path), formatted
         ast = Journey::Parser.parse path
 
         mapping = Mapping.build(@scope, @set, ast, controller, default_action, to, via, formatted, options_constraints, anchor, options)
         @set.add_localized_route(mapping, ast, as, anchor, @scope, path, controller, default_action, to, via, formatted, options_constraints, options)
       end
-      # rubocop:enable Lint/UnderscorePrefixedVariableName
+      # rubocop:enable Lint/UnderscorePrefixedVariableName, Metrics/PerceivedComplexity
 
       private
 

data/lib/route_translator/extensions/route_set.rb

@@ -26,9 +26,9 @@ module ActionDispatch
 
       def translate_mapping(locale, route_set, translated_options, translated_path_ast, scope, controller, default_action, to, formatted, via, translated_options_constraints, anchor)
         scope_params = {
-          blocks:      scope[:blocks] || [],
+          blocks:      (scope[:blocks] || []).dup,
           constraints: scope[:constraints] || {},
-          defaults:    (scope[:defaults] || {}).dup,
+          defaults:    scope[:defaults] || {},
           module:      scope[:module],
           options:     scope[:options] ? scope[:options].merge(translated_options) : translated_options
         }

data/lib/route_translator/extensions/test_case.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'action_controller'
+
+module RouteTranslator
+  module TestCase
+    extend ActiveSupport::Concern
+    include ActionController::UrlFor
+
+    included do
+      delegate :env, :request, to: :@controller
+    end
+
+    def _routes
+      @routes
+    end
+  end
+end

data/lib/route_translator/host.rb

@@ -12,7 +12,7 @@ module RouteTranslator
     end
 
     def native_locale?(locale)
-      locale.to_s.match(/native_/).present?
+      locale.to_s.include?('native_')
     end
 
     def native_locales
@@ -23,7 +23,7 @@ module RouteTranslator
 
     def locale_from_host(host)
       locales = RouteTranslator.config.host_locales.each_with_object([]) do |(pattern, locale), result|
-        result << locale.to_sym if host =~ regex_for(pattern)
+        result << locale.to_sym if host&.match?(regex_for(pattern))
       end
       locales &= I18n.available_locales
       locales.first&.to_sym

data/lib/route_translator/translator/path/segment.rb

@@ -24,10 +24,10 @@ module RouteTranslator
             handler = proc { |exception| exception }
             opts    = { locale: locale, scope: scope }
 
-            if I18n.translate(str, opts.merge(exception_handler: handler)).is_a?(I18n::MissingTranslation)
-              I18n.translate(str, opts.merge(fallback_options(str, locale)))
+            if I18n.t(str, **opts.merge(exception_handler: handler)).is_a?(I18n::MissingTranslation)
+              I18n.t str, **opts.merge(fallback_options(str, locale))
             else
-              I18n.translate(str, opts)
+              I18n.t str, **opts
             end
           end
 
@@ -35,7 +35,7 @@ module RouteTranslator
             sanitized_locale = RouteTranslator::LocaleSanitizer.sanitize(locale)
             translated_resource = translate_resource(str, sanitized_locale, scope)
 
-            URI.escape translated_resource
+            Addressable::URI.normalize_component translated_resource
           end
         end
 
@@ -51,12 +51,12 @@ module RouteTranslator
         def translate(segment, locale, scope)
           return segment if segment.empty?
 
-          if segment.starts_with?(':')
+          if segment.start_with?(':')
             named_param, hyphenized = segment.split('-', 2)
             return "#{named_param}-#{translate(hyphenized, locale, scope)}" if hyphenized
           end
 
-          return segment if segment.starts_with?('(') || segment.starts_with?('*') || segment.include?(':')
+          return segment if segment.start_with?('(', '*') || segment.include?(':')
 
           appended_part = segment.slice!(/(\()$/)
           str = translatable_segment(segment)

data/lib/route_translator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RouteTranslator
-  VERSION = '7.0.0'
+  VERSION = '9.0.0'
 end

data/lib/route_translator.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support'
+require 'addressable/uri'
 
 require 'route_translator/extensions'
 require 'route_translator/translator'
@@ -41,27 +42,33 @@ module RouteTranslator
 
   module_function
 
-  def config(&block)
+  def config
     @config ||= Configuration.new
 
     DEFAULT_CONFIGURATION.each do |option, value|
       @config[option] ||= value
     end
 
-    yield @config if block
+    yield @config if block_given?
 
-    resolve_host_locale_config_conflicts unless @config.host_locales.empty?
+    resolve_host_locale_config_conflicts if @config.host_locales.present?
 
     @config
   end
 
+  def reset_config
+    @config = nil
+
+    config
+  end
+
   def available_locales
     locales = config.available_locales
 
-    if locales.any?
-      locales.map(&:to_sym)
-    else
+    if locales.empty?
       I18n.available_locales.dup
+    else
+      locales.map(&:to_sym)
     end
   end
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: route_translator
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Geremia Taglialatela
 - Enric Lluelles
 - Raul Murciano
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-30 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -21,7 +21,7 @@ dependencies:
         version: 5.0.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: 5.0.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +41,7 @@ dependencies:
         version: 5.0.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,21 +51,35 @@ dependencies:
         version: 5.0.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -92,28 +106,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +137,7 @@ dependencies:
         version: 5.0.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -133,77 +147,83 @@ dependencies:
         version: 5.0.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.18.5
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.20'
 description: Translates the Rails routes of your application into the languages defined
   in your locale files
 email:
@@ -221,6 +241,7 @@ files:
 - lib/route_translator/extensions/action_controller.rb
 - lib/route_translator/extensions/mapper.rb
 - lib/route_translator/extensions/route_set.rb
+- lib/route_translator/extensions/test_case.rb
 - lib/route_translator/host.rb
 - lib/route_translator/host_path_consistency_lambdas.rb
 - lib/route_translator/locale_sanitizer.rb
@@ -233,24 +254,27 @@ files:
 homepage: https://github.com/enriclluelles/route_translator
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/enriclluelles/route_translator/issues
+  changelog_uri: https://github.com/enriclluelles/route_translator/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/enriclluelles/route_translator
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Translate your Rails routes in a simple manner
 test_files: []