route_translator 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba50272fd47e4a93ea47418a84de0cf5489eaee4
-  data.tar.gz: 0b4458fa81aea378ecb5fe39c50b655d7c637a97
+  metadata.gz: 05ad52625a32748551a12b0e27d2e5015b79d3f8
+  data.tar.gz: dd8bf10e6a132f9d06eca06b472d90de6315179e
 SHA512:
-  metadata.gz: e082a7feb66e67415ac691ce77939cf3a9f8f90aa5199ca285837c7d1fe9ad6d1f8ee40bbf659206ade3aa2e72cb224ba2c4de3a9e3b12f00fd8fff1faf08c66
-  data.tar.gz: cb761bd633952e302c7a76223f96992c2f9caee66a0babbf7fc56b0a7e0508686df7ddc28dd71174b86487fe2d52032ff871972a4b3f14cb07f28af80b6db65b
+  metadata.gz: ba81dea5c5b94d54ae225e6d103061313c254c7e217ea3daf486472edcf2842c7b329d86c66980626baf5eeecf102b6bf1157273b30a187b7abb5332c495fbe9
+  data.tar.gz: 0c912b8081f3a80b856318b0f3e3f1887ba5547f2cd89f9fa4c25cb95240fe743afe1355fe4e9dc31b0614886ce9094e9cc1753f38816aa51f75c00773988ef6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.4.0 (2016-07-01)
+
+* Support custom locale path segments, i.e. /uk/en/widgets
+* Using AS::Concern instead of monkey patching ActionController
+* Update development dependencies
+
 ## 4.3.0 (2016-03-03)
 
 * Refactor translator module

data/README.md

@@ -20,7 +20,6 @@ Right now it works with all the different flavours of rails 3-4 (3.2, 4.0, 4.1,
 
     ```ruby
     MyApp::Application.routes.draw do
-
       namespace :admin do
         resources :cars
       end
@@ -60,7 +59,6 @@ Right now it works with all the different flavours of rails 3-4 (3.2, 4.0, 4.1,
 
     ```ruby
     MyApp::Application.routes.draw do
-
       namespace :admin do
         resources :cars
       end
@@ -181,6 +179,9 @@ end
   Useful when one uses this with a locale route constraint, so non-ES routes can 404 on a Spanish website.
 * **available_locales**
   Use this to limit the locales for which URLs should be generated for. Accepts an array of strings or symbols.
+* **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 }`
 
 
 ### Host-based Locale
@@ -197,12 +198,12 @@ Here are a few examples of possible mappings:
 
 ```ruby
 RouteTranslator.config.host_locales =
-{                                # Matches:
-  '*.es'                 => :es, # TLD:         ['domain.es', 'subdomain.domain.es', 'www.long.string.of.subdomains.es'] etc.
-  'ru.wikipedia.*'       => :ru, # Subdomain:   ['ru.wikipedia.org', 'ru.wikipedia.net', 'ru.wikipedia.com'] etc.
-  '*.subdomain.domain.*' => :ru, # Mixture:     ['subdomain.domain.org', 'www.subdomain.domain.net'] etc.
-  'news.bbc.co.uk'       => :en, # Exact match: ['news.bbc.co.uk'] only
-}
+  {                                # Matches:
+    '*.es'                 => :es, # TLD:         ['domain.es', 'subdomain.domain.es', 'www.long.string.of.subdomains.es'] etc.
+    'ru.wikipedia.*'       => :ru, # Subdomain:   ['ru.wikipedia.org', 'ru.wikipedia.net', 'ru.wikipedia.com'] etc.
+    '*.subdomain.domain.*' => :ru, # Mixture:     ['subdomain.domain.org', 'www.subdomain.domain.net'] etc.
+    'news.bbc.co.uk'       => :en, # Exact match: ['news.bbc.co.uk'] only
+  }
 ```
 
 In the case of a host matching more than once, the order in which the matchers are defined will be taken into account, like so:
@@ -229,7 +230,7 @@ Testing your controllers with routes-translator is easy, just add a locale param
 ```ruby
 describe 'GET index' do
   it 'should respond with success' do
-    get :index, { locale: 'fr' }
+    get :index, locale: 'fr'
 
     expect(response).to be_success
   end

data/lib/route_translator.rb

@@ -12,7 +12,7 @@ module RouteTranslator
   Configuration = Struct.new(:force_locale, :hide_locale,
                              :generate_unlocalized_routes, :locale_param_key,
                              :generate_unnamed_unlocalized_routes, :available_locales,
-                             :host_locales, :disable_fallback)
+                             :host_locales, :disable_fallback, :locale_segment_proc)
 
   class << self
     private
@@ -37,6 +37,7 @@ module RouteTranslator
     @config.host_locales                        ||= ActiveSupport::OrderedHash.new
     @config.available_locales                   ||= []
     @config.disable_fallback                    ||= false
+    @config.locale_segment_proc                 ||= nil
     yield @config if block
     resolve_host_locale_config_conflicts unless @config.host_locales.empty?
     @config

data/lib/route_translator/extensions/action_controller.rb

@@ -1,8 +1,15 @@
 require 'action_controller'
+require 'active_support/concern'
 
-module ActionController
-  class Base
-    around_filter :set_locale_from_url
+module RouteTranslator
+  module Controller
+    extend ActiveSupport::Concern
+
+    included do
+      around_filter :set_locale_from_url
+    end
+
+    private
 
     def set_locale_from_url
       tmp_default_locale = RouteTranslator::Host.locale_from_host(request.host)
@@ -25,13 +32,19 @@ module ActionController
     end
   end
 
-  class TestCase
+  module TestCase
+    extend ActiveSupport::Concern
     include ActionController::UrlFor
 
-    delegate :env, :request, to: :@controller
+    included do
+      delegate :env, :request, to: :@controller
+    end
 
     def _routes
       @routes
     end
   end
 end
+
+ActionController::Base.send :include, RouteTranslator::Controller
+ActionController::TestCase.send :include, RouteTranslator::TestCase

data/lib/route_translator/translator.rb

@@ -10,7 +10,7 @@ module RouteTranslator
 
       def available_locales
         locales = RouteTranslator.available_locales
-        locales.push(*RouteTranslator.native_locales) if RouteTranslator.native_locales.present?
+        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.

data/lib/route_translator/translator/path.rb

@@ -23,6 +23,16 @@ module RouteTranslator
         def locale_param_present?(path)
           path.split('/').include? ":#{RouteTranslator.locale_param_key}"
         end
+
+        def locale_segment(locale)
+          if RouteTranslator.config.locale_segment_proc
+            locale_segment_proc = RouteTranslator.config.locale_segment_proc
+
+            locale_segment_proc.to_proc.call(locale)
+          else
+            locale.to_s.downcase
+          end
+        end
       end
 
       module_function
@@ -37,7 +47,7 @@ module RouteTranslator
         translated_segments.reject!(&:empty?)
 
         if display_locale?(locale) && !locale_param_present?(new_path)
-          translated_segments.unshift(locale.to_s.downcase)
+          translated_segments.unshift(locale_segment(locale))
         end
 
         joined_segments = translated_segments.join('/')

data/lib/route_translator/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module RouteTranslator
-  VERSION = '4.3.0'.freeze
+  VERSION = '4.4.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: route_translator
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,20 +120,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.41.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.41.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +164,9 @@ dependencies:
         version: 0.11.2
 description: Translates the Rails routes of your application into the languages defined
   in your locale files
-email: tagliala.dev@gmail.com enric@lluell.es
+email:
+- tagliala.dev@gmail.com
+- enric@lluell.es
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -189,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Translate your Rails routes in a simple manner