route_translator 5.10.0 → 6.0.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 85d65dba9c99328f55ebc7cb0f8f7bd0f7583ad5ffd56c73d21d6347799e982f
-  data.tar.gz: 3f3a658b242e9e420f9d6b988c1a84dcc79c9b94d0abef9bb6202539b41da978
+SHA1:
+  metadata.gz: c4171b2df923521e8166337add614fba7f3a38a7
+  data.tar.gz: c4f3b540804c81c9095f6dd51591f155fd94e0bd
 SHA512:
-  metadata.gz: d614520abeb9dfb64b673dabeb195f9c15d0ee8c1468b149cda62111a6a35bdd1126e14f9ad38e1967c9321074393489106bed8cccac90404674ab0fbbf0d75b
-  data.tar.gz: c93966fbc3900a66f683636ace6df7557aff0c7c5ca7cd765260dc7998e1d3f5ef07018abc8fe629a90dcb2b4310f9a769ccc2988d3dd645847873e6b2a7a8e9
+  metadata.gz: 3fdbdb4ebd133bec7ce149bfba1fffdf2260be4c8b16c2fbe2d3578966d19db1ad57e11e34dc79ba26c78edd87ed9c7148a0ed4b84621c3dd06588716a939551
+  data.tar.gz: 9b7276425620c712608a4c249566271a81f1796c1cfe04b4a0d706e09de215d9f9d23b94ac7c2461b065103b26630214b6813dbc73e01bd58b86022f29918805

data/CHANGELOG.md

@@ -1,69 +1,10 @@
 # Changelog
 
-## 5.10.0 / 2019-04-25
+## 6.0.0.alpha1 / 2017-07-23
 
-* [FEATURE] Add Rails 6.0 compatibility
-* [ENHANCEMENT] Test against latest Ruby versions
-
-## 5.9.0 / 2019-03-14
-
-* [FEATURE] Add Rails 6.0.0.beta3 compatibility
-* [ENHANCEMENT] Test against latest Ruby versions
-
-## 5.8.0 / 2019-03-02
-
-* [FEATURE] Add Rails 6.0.0.beta2 compatibility
-* [ENHANCEMENT] Update development dependencies
-
-## 5.7.1 / 2019-02-03
-
-* [ENHANCEMENT] Test against Ruby 2.6.1
-* [ENHANCEMENT] Update development dependencies
-
-## 5.7.0 / 2019-01-19
-
-* [FEATURE] Add Rails 6.0.0.beta1 compatibility
-* [ENHANCEMENT] Test against latest Ruby versions
-* [ENHANCEMENT] Update development dependencies
-
-## 5.6.4 / 2018-10-03
-
-* [ENHANCEMENT] Update development dependencies
-
-## 5.6.3 / 2018-06-07
-
-* [ENHANCEMENT] Update development dependencies
-
-## 5.6.2 / 2018-04-10
-
-* [ENHANCEMENT] Test against Rails 5.2
-
-## 5.6.1 / 2018-04-09
-
-* [BUGFIX] Fix overriding ActionController::Live ([#183](https://github.com/enriclluelles/route_translator/pull/183))
-* [ENHANCEMENT] Update development dependencies
-* [ENHANCEMENT] Test against latest Ruby versions
-
-## 5.6.0 / 2018-02-05
-
-* [FEATURE] Add Rails 5.2 compatibility
-* [ENHANCEMENT] Test against latest Ruby versions
-* [ENHANCEMENT] Update development dependencies
-
-## 5.5.3 / 2018-01-12
-
-* [BUGFIX] Fix regression with translations containing spaces ([#181](https://github.com/enriclluelles/route_translator/issues/181))
-* [ENHANCEMENT] Update development dependencies
-
-## 5.5.2 / 2017-12-27
-
-* [BUGFIX] Fix regression with translations containing slashes ([#179](https://github.com/enriclluelles/route_translator/pull/179))
-* [ENHANCEMENT] Test against latest Ruby versions
-* [ENHANCEMENT] Update development dependencies
-
-## 5.5.1 / 2017-11-14
-
-* [BUGFIX] Change spec to reflect Rails 5.1.3 change in url generation ([#172](https://github.com/enriclluelles/route_translator/issues/172))
+* [BUGFIX] Verify host path consistency by default (#91)
+* [FEATURE] Remove the option to verify host path consistency
+* [ENHANCEMENT] Avoid duplicate routes when using host_locales (#87)
 * [ENHANCEMENT] Update development dependencies
 
 ## 5.5.0 / 2017-06-29

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], 2017 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

@@ -2,14 +2,15 @@
 
 [![Gem Version](https://badge.fury.io/rb/route_translator.svg)](http://badge.fury.io/rb/route_translator)
 [![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)
+[![Dependency Status](https://gemnasium.com/badges/github.com/enriclluelles/route_translator.svg)](https://gemnasium.com/github.com/enriclluelles/route_translator)
+[![Code Climate](https://codeclimate.com/github/enriclluelles/route_translator/badges/gpa.svg)](https://codeclimate.com/github/enriclluelles/route_translator)
 [![Coverage Status](https://coveralls.io/repos/github/enriclluelles/route_translator/badge.svg?branch=master)](https://coveralls.io/github/enriclluelles/route_translator?branch=master)
 
 RouteTranslator is a gem to allow you to manage the translations of your app routes with a simple dictionary format.
 
 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 and Rails 6.0.0.beta1
+Right now it works with Rails 5.0/5.1
 
 
 
@@ -283,10 +284,6 @@ end
 * **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. `config.locale_segment_proc = ->(locale) { locale.to_s.upcase }`
-* **verify_host_path_consistency**
-  By default, if you use different hosts to translate your application, all translated paths will work on all hosts. Set this option to `true` to force
-  a matching of the host associated locale with the translated path locale as part of the route definition.
-  Defaults to `false`.
 
 ### Host-based Locale
 
@@ -317,13 +314,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.hide_locale                         = true
+@config.force_locale                        = false
 @config.generate_unlocalized_routes         = false
 @config.generate_unnamed_unlocalized_routes = false
-@config.force_locale                        = false
-@config.hide_locale                         = false
 ```
 
 This is to avoid odd behaviour brought about by route conflicts and because `host_locales` forces and hides the host-locale dynamically.
@@ -361,19 +358,6 @@ people_products_favourites_es GET  /people/products/fans(.:format)       people/
 The gem will lookup translations under `controllers` scope first and then lookup translations under `routes` scope.
 
 
-### Change locale parameter position in the path
-
-If you need complex routing as `/:country/:locale/path/to/some/pages`, you can specify the position of your locale parameter in the following way:
-
-```rb
-scope ':country/:locale' do
-  localized do
-    root to: 'content#homepage'
-  end
-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.

data/lib/route_translator.rb

@@ -5,25 +5,23 @@ require 'active_support'
 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
 
-  TRANSLATABLE_SEGMENT = /^([-_a-zA-Z0-9]+)(\()?/.freeze
+  TRANSLATABLE_SEGMENT = /^([-_a-zA-Z0-9]+)(\()?/
 
   Configuration = Struct.new(:available_locales, :disable_fallback, :force_locale,
                              :hide_locale, :host_locales, :generate_unlocalized_routes,
                              :generate_unnamed_unlocalized_routes, :locale_param_key,
-                             :locale_segment_proc, :verify_host_path_consistency)
+                             :locale_segment_proc)
 
   class << self
     private
 
     def resolve_host_locale_config_conflicts
       @config.force_locale                        = false
-      @config.hide_locale                         = false
+      @config.hide_locale                         = true
       @config.generate_unlocalized_routes         = false
       @config.generate_unnamed_unlocalized_routes = false
     end
@@ -42,11 +40,10 @@ module RouteTranslator
     @config.generate_unnamed_unlocalized_routes ||= false
     @config.locale_param_key                    ||= :locale
     @config.locale_segment_proc                 ||= nil
-    @config.verify_host_path_consistency        ||= false
 
     yield @config if block
 
-    resolve_host_locale_config_conflicts unless @config.host_locales.empty?
+    resolve_host_locale_config_conflicts if @config.host_locales.present?
 
     @config
   end

data/lib/route_translator/extensions/action_controller.rb

@@ -42,5 +42,5 @@ end
 
 ActiveSupport.on_load(:action_controller) do
   ActionController::Base.send :include, RouteTranslator::Controller
-  ActionController::TestCase.send :include, RouteTranslator::TestCase if ENV['RAILS_ENV'] == 'test'
+  ActionController::TestCase.send :include, RouteTranslator::TestCase
 end

data/lib/route_translator/extensions/route_set.rb

@@ -32,8 +32,8 @@ module ActionDispatch
 
         blocks = scope[:blocks] ? scope[:blocks].dup : []
 
-        if RouteTranslator.config.verify_host_path_consistency
-          blocks.push RouteTranslator::HostPathConsistencyLambdas.for_locale(locale)
+        if RouteTranslator.config.host_locales.present?
+          blocks.push RouteTranslator::Host.lambdas_for_locale(locale)
         end
 
         ::ActionDispatch::Routing::Mapper::Mapping.new(route_set, translated_path_ast, defaults, controller, default_action, scope[:module], to, formatted, scope_constraints, blocks, via, translated_options_constraints, anchor, options)

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.match(/native_/).present?
-    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 || I18n.default_locale).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.rb

@@ -16,7 +16,6 @@ module RouteTranslator
 
       def translate_name(name, locale, named_routes_names)
         return if name.blank?
-
         translated_name = "#{name}_#{locale.to_s.underscore}"
 
         translated_name if named_routes_names.exclude?(translated_name.to_sym)
@@ -26,7 +25,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 +52,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 +80,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/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/path/segment.rb

@@ -32,8 +32,7 @@ module RouteTranslator
           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)
 
             URI.escape translated_resource
           end

data/lib/route_translator/translator/route_helpers.rb

@@ -9,7 +9,6 @@ module RouteTranslator
         def add_helpers_to_test_cases(helper_container)
           %w[ActionController ActionMailer ActionView].each do |klass_name|
             next unless Module.const_defined?(klass_name)
-
             klass_name.constantize::TestCase.__send__(:include, helper_container)
           end
         end
@@ -35,7 +34,7 @@ module RouteTranslator
             __send__(Translator.route_name_for(args, old_name, suffix, self), *args)
           end
 
-          add_helpers_to_test_cases(helper_container) if ENV['RAILS_ENV'] == 'test'
+          add_helpers_to_test_cases(helper_container)
         end
       end
     end

data/lib/route_translator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RouteTranslator
-  VERSION = '5.10.0'.freeze
+  VERSION = '6.0.0.alpha1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: route_translator
 version: !ruby/object:Gem::Version
-  version: 5.10.0
+  version: 6.0.0.alpha1
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -10,10 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2017-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -21,7 +21,7 @@ dependencies:
         version: 5.0.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,9 +31,9 @@ dependencies:
         version: 5.0.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -41,7 +41,7 @@ dependencies:
         version: 5.0.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: 5.0.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -70,50 +70,44 @@ dependencies:
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
-  name: coveralls_reborn
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.8.21
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.8.21
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +117,7 @@ dependencies:
         version: 5.0.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -133,49 +127,49 @@ dependencies:
         version: 5.0.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.14.1
 description: Translates the Rails routes of your application into the languages defined
   in your locale files
 email:
@@ -194,8 +188,6 @@ files:
 - lib/route_translator/extensions/mapper.rb
 - lib/route_translator/extensions/route_set.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
@@ -217,11 +209,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.12
 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