route_translator 9.0.0 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baff0e31d0c0f72b8daddc3754594542af32f47ffa29a0cacb6801a69e8a12c9
-  data.tar.gz: 277a5c0d34be1d75ab2aaefc16cd7e7d5f5a87d6c00e999445d5968121a699b2
+  metadata.gz: 67af9e1b02cca5669da31e3de5ee80a70010828cdf8b7b40ad9e281a4b336384
+  data.tar.gz: 9464d33a1006b8208ecddb10bac6fbea0b582d0183cc8be3b726307e665ace80
 SHA512:
-  metadata.gz: e0a20daed33d3f7979dd0f18eb235944230351a4f730fde34da6642455bfbdcc0d435d405405cc8cb9e7bab8a467b4b4654dd87375e7019eac4bc9e4d0854c37
-  data.tar.gz: 9e321b96018d925b0cb42dd960243f2211258cf686d53939a6e637e683177bf93ab01cccd2abb7611dc4d7f1d15d2f21265d976c0bde8a8f54758abbf074c489
+  metadata.gz: 0e65a1a4017de472931459fa414e0066ebf9f3c1dadcfc2889093bda3ea67a7e2aa031e89e2e39d9c6821e5b55d25b3fa0d5084c9604413fe6176d45a0b90619
+  data.tar.gz: ad478ac354cfd4aa7732aa6bc9921cf2f9f544e716e6a2e3d8b1f4788b4aff3f0a0274348f4b41c10098a22ac70c789598cfb2ca7fa557c34892090946d9e83f

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 12.0.0 / 2021-11-28
+
+* [BUGFIX] Fix disable_fallback behavior ([#241](https://github.com/enriclluelles/route_translator/issues/241))
+* [ENHANCEMENT] Update development dependencies
+
+## 11.0.1 / 2021-11-15
+
+* [ENHANCEMENT] Require MFA to publish gems
+* [ENHANCEMENT] Update development dependencies
+
+## 11.0.0 / 2021-09-26
+
+* [FEATURE] Drop Ruby 2.4 support
+* [FEATURE] Drop Rails 5.0 and 5.1 support
+* [ENHANCEMENT] Update development dependencies
+
+## 10.0.0 / 2021-01-16
+
+* [BUGFIX] Verify host path consistency by default ([#91](https://github.com/enriclluelles/route_translator/issues/91), [#171](https://github.com/enriclluelles/route_translator/issues/171))
+* [FEATURE] Remove the option to verify host path consistency
+* [ENHANCEMENT] Avoid duplicate routes when using host_locales ([#87](https://github.com/enriclluelles/route_translator/issues/87), [#171](https://github.com/enriclluelles/route_translator/issues/171))
+* [ENHANCEMENT] Test against Ruby 3.0.0
+* [ENHANCEMENT] Update development dependencies
+
 ## 9.0.0 / 2020-11-07
 
 * [ENHANCEMENT] Check for `empty?` instead of `any?` on available_locales array

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], 2020 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], 2021 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,8 +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)
+[![Build Status](https://github.com/enriclluelles/route_translator/actions/workflows/ruby.yml/badge.svg)](https://github.com/enriclluelles/route_translator/actions)
 [![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)
 
@@ -10,7 +9,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.x
+Right now it works with Rails 5.2 and Rails 6.x
 
 
 
@@ -281,7 +280,6 @@ end
 | `host_locales` | Sets `I18n.locale` based on `request.host`. Useful for apps accepting requests from more than one domain. See below for more details | `{}` |
 | `locale_param_key` | The param key used to set the locale to the newly generated routes | `:locale` |
 | `locale_segment_proc` | The locale segment of the url will by default be `locale.to_s.downcase`. You can supply your own mechanism via a Proc that takes `locale` as an argument, e.g. `->(locale) { locale.to_s.upcase }` | `false` |
-| `verify_host_path_consistency` | Forces a matching of the host associated locale with the translated path locale as part of the route definition. By default, if you use different hosts to translate your application, all translated paths will work on all hosts | `false` |
 
 
 ### Host-based Locale
@@ -313,13 +311,13 @@ RouteTranslator.config.host_locales = { 'russia.*' => :ru, '*.com'    => :en } #
 RouteTranslator.config.host_locales = { '*.com'    => :en, 'russia.*' => :ru } # 'russia.com' will have locale :en
 ```
 
-If `host_locales` option is set, the following options will be forced (even if you set to true):
+If `host_locales` option is set, the following options will be forced:
 
 ```ruby
 @config.force_locale                        = false
 @config.generate_unlocalized_routes         = false
 @config.generate_unnamed_unlocalized_routes = false
-@config.hide_locale                         = false
+@config.hide_locale                         = true
 ```
 
 This is to avoid odd behaviour brought about by route conflicts and because `host_locales` forces and hides the host-locale dynamically.

data/lib/route_translator/extensions/mapper.rb

@@ -38,7 +38,7 @@ module ActionDispatch
         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)
+        @set.add_localized_route(mapping, as, anchor, @scope, path, controller, default_action, to, via, formatted, options_constraints, options)
       end
       # rubocop:enable Lint/UnderscorePrefixedVariableName, Metrics/PerceivedComplexity
 

data/lib/route_translator/extensions/route_set.rb

@@ -5,20 +5,20 @@ require 'action_dispatch'
 module ActionDispatch
   module Routing
     class RouteSet
-      def add_localized_route(mapping, path_ast, name, anchor, scope, path, controller, default_action, to, via, formatted, options_constraints, options)
+      def add_localized_route(mapping, name, anchor, scope, path, controller, default_action, to, via, formatted, options_constraints, options)
         route = RouteTranslator::Route.new(self, path, name, options_constraints, options, mapping)
 
         RouteTranslator::Translator.translations_for(route) do |locale, translated_name, translated_path, translated_options_constraints, translated_options|
           translated_path_ast = ::ActionDispatch::Journey::Parser.parse(translated_path)
           translated_mapping  = translate_mapping(locale, self, translated_options, translated_path_ast, scope, controller, default_action, to, formatted, via, translated_options_constraints, anchor)
 
-          add_route_to_set translated_mapping, translated_path_ast, translated_name, anchor
+          add_route translated_mapping, translated_name
         end
 
         if RouteTranslator.config.generate_unnamed_unlocalized_routes
-          add_route_to_set mapping, path_ast, nil, anchor
+          add_route mapping, nil
         elsif RouteTranslator.config.generate_unlocalized_routes
-          add_route_to_set mapping, path_ast, name, anchor
+          add_route mapping, name
         end
       end
 
@@ -33,20 +33,12 @@ module ActionDispatch
           options:     scope[:options] ? scope[:options].merge(translated_options) : translated_options
         }
 
-        if RouteTranslator.config.verify_host_path_consistency
-          scope_params[:blocks].push RouteTranslator::HostPathConsistencyLambdas.for_locale(locale)
+        if RouteTranslator.config.host_locales.present?
+          scope_params[:blocks].push RouteTranslator::Host.lambdas_for_locale(locale)
         end
 
         ::ActionDispatch::Routing::Mapper::Mapping.build scope_params, route_set, translated_path_ast, controller, default_action, to, via, formatted, translated_options_constraints, anchor, translated_options
       end
-
-      def add_route_to_set(mapping, path_ast, name, anchor)
-        if method(:add_route).arity == 4
-          add_route mapping, path_ast, name, anchor
-        else
-          add_route mapping, name
-        end
-      end
     end
   end
 end

data/lib/route_translator/host.rb

@@ -5,20 +5,16 @@ module RouteTranslator
     class << self
       private
 
+      def lambdas
+        @lambdas ||= {}
+      end
+
       def regex_for(host_string)
         escaped = Regexp.escape(host_string).gsub('\*', '.*?').gsub('\.', '\.?')
         Regexp.new("^#{escaped}$", Regexp::IGNORECASE)
       end
     end
 
-    def native_locale?(locale)
-      locale.to_s.include?('native_')
-    end
-
-    def native_locales
-      config.host_locales.values.map { |locale| :"native_#{locale}" }
-    end
-
     module_function
 
     def locale_from_host(host)
@@ -28,5 +24,9 @@ module RouteTranslator
       locales &= I18n.available_locales
       locales.first&.to_sym
     end
+
+    def lambdas_for_locale(locale)
+      lambdas[locale] ||= ->(req) { locale == RouteTranslator::Host.locale_from_host(req.host) }
+    end
   end
 end

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

@@ -9,7 +9,7 @@ module RouteTranslator
 
           def fallback_options(str, locale)
             if RouteTranslator.config.disable_fallback && locale.to_s != I18n.default_locale.to_s
-              { scope: :routes, fallback: true }
+              { scope: :routes, fallback: false }
             else
               { scope: :routes, default: str }
             end
@@ -25,15 +25,14 @@ module RouteTranslator
             opts    = { locale: locale, scope: scope }
 
             if I18n.t(str, **opts.merge(exception_handler: handler)).is_a?(I18n::MissingTranslation)
-              I18n.t str, **opts.merge(fallback_options(str, locale))
+              I18n.t! str, **opts.merge(fallback_options(str, locale))
             else
               I18n.t str, **opts
             end
           end
 
           def translate_string(str, locale, scope)
-            sanitized_locale = RouteTranslator::LocaleSanitizer.sanitize(locale)
-            translated_resource = translate_resource(str, sanitized_locale, scope)
+            translated_resource = translate_resource(str, locale.to_s, scope)
 
             Addressable::URI.normalize_component translated_resource
           end

data/lib/route_translator/translator/path.rb

@@ -9,8 +9,7 @@ module RouteTranslator
         private
 
         def display_locale?(locale)
-          !RouteTranslator.config.hide_locale && !RouteTranslator.native_locale?(locale) &&
-            (!default_locale?(locale) || config_requires_locale?)
+          !RouteTranslator.config.hide_locale && (!default_locale?(locale) || config_requires_locale?)
         end
 
         def config_requires_locale?

data/lib/route_translator/translator.rb

@@ -10,8 +10,10 @@ module RouteTranslator
       private
 
       def locale_from_args(args)
-        args_hash = args.detect { |arg| arg.is_a?(Hash) }
-        args_hash[:locale] if RouteTranslator.config.host_locales.present? && args_hash
+        return if RouteTranslator.config.host_locales.blank?
+
+        args_hash = args.find { |arg| arg.is_a?(Hash) }
+        args_hash&.fetch(:locale, nil)
       end
 
       def translate_name(name, locale, named_routes_names)
@@ -26,7 +28,7 @@ module RouteTranslator
         translated_options = options.dup
 
         if translated_options.exclude?(RouteTranslator.locale_param_key)
-          translated_options[RouteTranslator.locale_param_key] = RouteTranslator::LocaleSanitizer.sanitize(locale)
+          translated_options[RouteTranslator.locale_param_key] = locale.to_s
         end
 
         translated_options
@@ -53,7 +55,6 @@ module RouteTranslator
 
     def available_locales
       locales = RouteTranslator.available_locales
-      locales.concat(RouteTranslator.native_locales) if RouteTranslator.native_locales.present?
       # Make sure the default locale is translated in last place to avoid
       # problems with wildcards when default locale is omitted in paths. The
       # default routes will catch all paths like wildcard if it is translated first.
@@ -82,8 +83,6 @@ module RouteTranslator
 
       locale = if args_locale
                  args_locale.to_s.underscore
-               elsif kaller.respond_to?("#{old_name}_native_#{current_locale_name}_#{suffix}")
-                 "native_#{current_locale_name}"
                elsif kaller.respond_to?("#{old_name}_#{current_locale_name}_#{suffix}")
                  current_locale_name
                else

data/lib/route_translator/version.rb

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

data/lib/route_translator.rb

@@ -6,8 +6,6 @@ require 'addressable/uri'
 require 'route_translator/extensions'
 require 'route_translator/translator'
 require 'route_translator/host'
-require 'route_translator/host_path_consistency_lambdas'
-require 'route_translator/locale_sanitizer'
 
 module RouteTranslator
   extend RouteTranslator::Host
@@ -23,8 +21,7 @@ module RouteTranslator
     hide_locale:                         false,
     host_locales:                        {},
     locale_param_key:                    :locale,
-    locale_segment_proc:                 false,
-    verify_host_path_consistency:        false
+    locale_segment_proc:                 false
   }.freeze
 
   Configuration = Struct.new(*DEFAULT_CONFIGURATION.keys)
@@ -36,7 +33,7 @@ module RouteTranslator
       @config.force_locale                        = false
       @config.generate_unlocalized_routes         = false
       @config.generate_unnamed_unlocalized_routes = false
-      @config.hide_locale                         = false
+      @config.hide_locale                         = true
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: route_translator
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 12.0.0
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-07 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -18,40 +18,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,20 +100,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '12'
-- !ruby/object:Gem::Dependency
-  name: coveralls_reborn
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.18.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -134,20 +120,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -163,67 +149,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 0.18.5
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.18.5
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rails
+  name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        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.20'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.18.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.20'
+        version: 0.8.0
 description: Translates the Rails routes of your application into the languages defined
   in your locale files
 email:
@@ -243,8 +201,6 @@ files:
 - 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
 - lib/route_translator/route.rb
 - lib/route_translator/translator.rb
 - lib/route_translator/translator/path.rb
@@ -255,6 +211,7 @@ homepage: https://github.com/enriclluelles/route_translator
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   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
@@ -266,14 +223,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Translate your Rails routes in a simple manner

data/lib/route_translator/host_path_consistency_lambdas.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module RouteTranslator
-  module HostPathConsistencyLambdas
-    class << self
-      private
-
-      def lambdas
-        @lambdas ||= {}
-      end
-    end
-
-    module_function
-
-    def for_locale(locale)
-      sanitized_locale = RouteTranslator::LocaleSanitizer.sanitize(locale)
-
-      lambdas[sanitized_locale] ||= ->(req) { sanitized_locale == RouteTranslator::Host.locale_from_host(req.host).to_s }
-    end
-  end
-end

data/lib/route_translator/locale_sanitizer.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module RouteTranslator
-  module LocaleSanitizer
-    module_function
-
-    def sanitize(locale)
-      locale.to_s.gsub('native_', '')
-    end
-  end
-end