route_translator 5.0.5 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3b566e8efb88b086812e1308e50a25a665b5b1a
-  data.tar.gz: 43ba2e28fd4e1b24b3451c54e8aae47ad4961693
+  metadata.gz: 2e5491f7135951007ef950f929f41ce035e327e5
+  data.tar.gz: c92a06d7f82220a625e9efca1efce38630429759
 SHA512:
-  metadata.gz: 5588fc472c0c4b192b7610e8a31091fbdaa93c9ba57749e8e281d10744537f52f3a24a8e913837bb83ad2f3230cf8c950ba0e709977da332204376b050cd2bec
-  data.tar.gz: fe53b0f81af8176c9f1cf53d07b869b0a18da4d3bbe09a29f7868faedcd3416e2999557b9b2b95a17dca1ad48f5632b5e59704050cb2bc60d40ef46bde6f3bf3
+  metadata.gz: 0a67bc52ece0fa4a69c7d4b5ccb0407b92104f53182fb0e87a5a143f9fb2c9753772ae763ae1e9f49e756214c91da93f769845022cba850fe2be50dae5f749e2
+  data.tar.gz: c06d96a8c9a72f6dab4b6258ee0062f774ca31a4bc24cedab06ba8346ff5afc61e697ac62915b7ab33e6015478753b0d1532ddeeee5cb4c020fb0394cbc70965

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 5.0.6 (2017-01-17)
+
+* Test against Ruby 2.4.0
+* Update copyright in LICENSE
+* Improve Translator method
+* Minor improvements
+
 ## 5.0.5 (2016-12-15)
 
 * Fix generated prefix to localized one (#123)

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

@@ -89,34 +89,42 @@ Right now it works with Rails 5.0
 4.  Your routes are translated! Here's the output of your `rake routes` now:
 
     ```
+            Prefix Verb   URI Pattern                     Controller#Action
         admin_cars GET    /admin/cars(.:format)           admin/cars#index
                    POST   /admin/cars(.:format)           admin/cars#create
      new_admin_car GET    /admin/cars/new(.:format)       admin/cars#new
     edit_admin_car GET    /admin/cars/:id/edit(.:format)  admin/cars#edit
          admin_car GET    /admin/cars/:id(.:format)       admin/cars#show
+                   PATCH  /admin/cars/:id(.:format)       admin/cars#update
                    PUT    /admin/cars/:id(.:format)       admin/cars#update
                    DELETE /admin/cars/:id(.:format)       admin/cars#destroy
-           cars_en GET    /cars(.:format)                 cars#index {:locale=>"en"}
-           cars_es GET    /es/coches(.:format)            cars#index {:locale=>"es"}
            cars_fr GET    /fr/voitures(.:format)          cars#index {:locale=>"fr"}
-                   POST   /cars(.:format)                 cars#create {:locale=>"en"}
-                   POST   /es/coches(.:format)            cars#create {:locale=>"es"}
+           cars_es GET    /es/coches(.:format)            cars#index {:locale=>"es"}
+           cars_en GET    /cars(.:format)                 cars#index {:locale=>"en"}
                    POST   /fr/voitures(.:format)          cars#create {:locale=>"fr"}
-        new_car_en GET    /cars/new(.:format)             cars#new {:locale=>"en"}
-        new_car_es GET    /es/coches/nuevo(.:format)      cars#new {:locale=>"es"}
+                   POST   /es/coches(.:format)            cars#create {:locale=>"es"}
+                   POST   /cars(.:format)                 cars#create {:locale=>"en"}
         new_car_fr GET    /fr/voitures/nouveau(.:format)  cars#new {:locale=>"fr"}
-       edit_car_en GET    /cars/:id/edit(.:format)        cars#edit {:locale=>"en"}
-       edit_car_es GET    /es/coches/:id/edit(.:format)   cars#edit {:locale=>"es"}
+        new_car_es GET    /es/coches/nuevo(.:format)      cars#new {:locale=>"es"}
+        new_car_en GET    /cars/new(.:format)             cars#new {:locale=>"en"}
        edit_car_fr GET    /fr/voitures/:id/edit(.:format) cars#edit {:locale=>"fr"}
-            car_en GET    /cars/:id(.:format)             cars#show {:locale=>"en"}
-            car_es GET    /es/coches/:id(.:format)        cars#show {:locale=>"es"}
+       edit_car_es GET    /es/coches/:id/edit(.:format)   cars#edit {:locale=>"es"}
+       edit_car_en GET    /cars/:id/edit(.:format)        cars#edit {:locale=>"en"}
             car_fr GET    /fr/voitures/:id(.:format)      cars#show {:locale=>"fr"}
-                   PUT    /cars/:id(.:format)             cars#update {:locale=>"en"}
-                   PUT    /es/coches/:id(.:format)        cars#update {:locale=>"es"}
+            car_es GET    /es/coches/:id(.:format)        cars#show {:locale=>"es"}
+            car_en GET    /cars/:id(.:format)             cars#show {:locale=>"en"}
+                   PATCH  /fr/voitures/:id(.:format)      cars#update {:locale=>"fr"}
+                   PATCH  /es/coches/:id(.:format)        cars#update {:locale=>"es"}
+                   PATCH  /cars/:id(.:format)             cars#update {:locale=>"en"}
                    PUT    /fr/voitures/:id(.:format)      cars#update {:locale=>"fr"}
-                   DELETE /cars/:id(.:format)             cars#destroy {:locale=>"en"}
-                   DELETE /es/coches/:id(.:format)        cars#destroy {:locale=>"es"}
+                   PUT    /es/coches/:id(.:format)        cars#update {:locale=>"es"}
+                   PUT    /cars/:id(.:format)             cars#update {:locale=>"en"}
                    DELETE /fr/voitures/:id(.:format)      cars#destroy {:locale=>"fr"}
+                   DELETE /es/coches/:id(.:format)        cars#destroy {:locale=>"es"}
+                   DELETE /cars/:id(.:format)             cars#destroy {:locale=>"en"}
+        pricing_fr GET    /fr/prix(.:format)              home#pricing {:locale=>"fr"}
+        pricing_es GET    /es/precios(.:format)           home#pricing {:locale=>"es"}
+        pricing_en GET    /pricing(.:format)              home#pricing {:locale=>"en"}
     ```
 
     Note that only the routes inside a `localized` block are translated.
@@ -135,6 +143,101 @@ Right now it works with Rails 5.0
     ```
 
 
+### Namespaces
+
+You can translate a namespace route by either its `name` or `path` option:
+
+1.  Wrap the namespaces that you want to translate inside a `localized` block:
+
+    ```ruby
+    Rails.application.routes.draw do
+      localized do
+        namespace :admin do
+          resources :cars, only: :index
+        end
+
+        namespace :sold_cars, path: :sold do
+          resources :cars, only: :index
+        end
+      end
+    end
+    ```
+
+    And add the translations to your locale files, for example:
+
+    ```yml
+    es:
+      routes:
+        admin: administrador
+        cars: coches
+        new: nuevo
+        pricing: precios
+        sold: vendidos
+    fr:
+      routes:
+        admin: administrateur
+        cars: voitures
+        new: nouveau
+        pricing: prix
+        sold: vendues
+    ```
+
+4.  Your namespaces are translated! Here's the output of your `rake routes` now:
+
+    ```
+               Prefix Verb URI Pattern                           Controller#Action
+        admin_cars_fr GET  /fr/administrateur/voitures(.:format) admin/cars#index {:locale=>"fr"}
+        admin_cars_es GET  /es/administrador/coches(.:format)    admin/cars#index {:locale=>"es"}
+        admin_cars_en GET  /admin/cars(.:format)                 admin/cars#index {:locale=>"en"}
+    sold_cars_cars_fr GET  /fr/vendues/voitures(.:format)        sold_cars/cars#index {:locale=>"fr"}
+    sold_cars_cars_es GET  /es/vendidos/coches(.:format)         sold_cars/cars#index {:locale=>"es"}
+    sold_cars_cars_en GET  /sold/cars(.:format)                  sold_cars/cars#index {:locale=>"en"}
+    ```
+
+
+### Inflections
+
+At the moment inflections are not supported, but you can use the following workaround:
+
+```ruby
+localized do
+  resources :categories, path_names: { new: 'new_category' }
+end
+```
+
+```yml
+en:
+  routes:
+    category: category
+    new_category: new
+
+es:
+  routes:
+    category: categoria
+    new_category: nueva
+```
+
+```
+          Prefix Verb   URI Pattern                       Controller#Action
+   categories_es GET    /es/categorias(.:format)          categories#index {:locale=>"es"}
+   categories_en GET    /categories(.:format)             categories#index {:locale=>"en"}
+                 POST   /es/categorias(.:format)          categories#create {:locale=>"es"}
+                 POST   /categories(.:format)             categories#create {:locale=>"en"}
+ new_category_es GET    /es/categorias/nueva(.:format)    categories#new {:locale=>"es"}
+ new_category_en GET    /categories/new(.:format)         categories#new {:locale=>"en"}
+edit_category_es GET    /es/categorias/:id/edit(.:format) categories#edit {:locale=>"es"}
+edit_category_en GET    /categories/:id/edit(.:format)    categories#edit {:locale=>"en"}
+     category_es GET    /es/categorias/:id(.:format)      categories#show {:locale=>"es"}
+     category_en GET    /categories/:id(.:format)         categories#show {:locale=>"en"}
+                 PATCH  /es/categorias/:id(.:format)      categories#update {:locale=>"es"}
+                 PATCH  /categories/:id(.:format)         categories#update {:locale=>"en"}
+                 PUT    /es/categorias/:id(.:format)      categories#update {:locale=>"es"}
+                 PUT    /categories/:id(.:format)         categories#update {:locale=>"en"}
+                 DELETE /es/categorias/:id(.:format)      categories#destroy {:locale=>"es"}
+                 DELETE /categories/:id(.:format)         categories#destroy {:locale=>"en"}
+```
+
+
 
 ## Configuration
 
@@ -148,7 +251,6 @@ end
 ```
 
 
-
 ### Available Configurations
 
 * **force_locale**
@@ -224,7 +326,9 @@ If `host_locales` option is set, the following options will be forced (even if y
 
 This is to avoid odd behaviour brought about by route conflicts and because `host_locales` forces and hides the host-locale dynamically.
 
-### Testing
+
+
+## Testing
 Testing your controllers with routes-translator is easy, just add a locale parameter for your localized routes. Otherwise, an ActionController::UrlGenerationError will raise.
 
 ```ruby
@@ -237,6 +341,8 @@ describe 'GET index' do
 end
 ```
 
+
+
 ## Contributing
 
 Please read through our [contributing guidelines](CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.

data/lib/route_translator.rb

@@ -9,19 +9,19 @@ module RouteTranslator
 
   TRANSLATABLE_SEGMENT = /^([-_a-zA-Z0-9]+)(\()?/
 
-  Configuration = Struct.new(:force_locale, :hide_locale,
-                             :generate_unlocalized_routes, :locale_param_key,
-                             :generate_unnamed_unlocalized_routes, :available_locales,
-                             :host_locales, :disable_fallback, :locale_segment_proc)
+  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)
 
   class << self
     private
 
     def resolve_host_locale_config_conflicts
-      @config.generate_unlocalized_routes         = false
-      @config.generate_unnamed_unlocalized_routes = false
       @config.force_locale                        = false
       @config.hide_locale                         = false
+      @config.generate_unlocalized_routes         = false
+      @config.generate_unnamed_unlocalized_routes = false
     end
   end
 
@@ -29,22 +29,21 @@ module RouteTranslator
 
   def config(&block)
     @config                                     ||= Configuration.new
+    @config.available_locales                   ||= []
+    @config.disable_fallback                    ||= false
     @config.force_locale                        ||= false
     @config.hide_locale                         ||= false
+    @config.host_locales                        ||= ActiveSupport::OrderedHash.new
     @config.generate_unlocalized_routes         ||= false
-    @config.locale_param_key                    ||= :locale
     @config.generate_unnamed_unlocalized_routes ||= false
-    @config.host_locales                        ||= ActiveSupport::OrderedHash.new
-    @config.available_locales                   ||= []
-    @config.disable_fallback                    ||= false
+    @config.locale_param_key                    ||= :locale
     @config.locale_segment_proc                 ||= nil
+
     yield @config if block
+
     resolve_host_locale_config_conflicts unless @config.host_locales.empty?
-    @config
-  end
 
-  def locale_param_key
-    config.locale_param_key
+    @config
   end
 
   def available_locales
@@ -56,4 +55,8 @@ module RouteTranslator
       I18n.available_locales.dup
     end
   end
+
+  def locale_param_key
+    config.locale_param_key
+  end
 end

data/lib/route_translator/extensions/mapper.rb

@@ -37,7 +37,6 @@ 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)
       end
       # rubocop:enable Lint/UnderscorePrefixedVariableName

data/lib/route_translator/translator.rb

@@ -13,13 +13,36 @@ module RouteTranslator
       end
 
       def translate_name(name, locale, named_routes_names)
-        return unless name.present?
+        return if name.blank?
         translated_name = "#{name}_#{locale.to_s.underscore}"
-        if named_routes_names.include?(translated_name.to_sym)
-          nil
-        else
-          translated_name
+
+        translated_name if named_routes_names.exclude?(translated_name.to_sym)
+      end
+
+      def translate_options(options, locale)
+        translated_options = options.dup
+
+        if translated_options.exclude?(RouteTranslator.locale_param_key)
+          translated_options[RouteTranslator.locale_param_key] = locale.to_s.gsub('native_', '')
         end
+
+        translated_options
+      end
+
+      def translate_options_constraints(options_constraints, locale)
+        translated_options_constraints = options_constraints.dup
+
+        if translated_options_constraints.respond_to?(:[]=)
+          translated_options_constraints[RouteTranslator.locale_param_key] = locale.to_s
+        end
+
+        translated_options_constraints
+      end
+
+      def translate_path(path, locale)
+        RouteTranslator::Translator::Path.translate(path, locale)
+      rescue I18n::MissingTranslationData => e
+        raise e unless RouteTranslator.config.disable_fallback
       end
     end
 
@@ -39,23 +62,12 @@ module RouteTranslator
       RouteTranslator::Translator::RouteHelpers.add name, route_set.named_routes
 
       available_locales.each do |locale|
-        begin
-          translated_path = RouteTranslator::Translator::Path.translate(path, locale)
-        rescue I18n::MissingTranslationData => e
-          raise e unless RouteTranslator.config.disable_fallback
-          next
-        end
-
-        translated_options_constraints = options_constraints.dup
-        translated_options             = options.dup
-
-        if translated_options_constraints.respond_to?(:[]=)
-          translated_options_constraints[RouteTranslator.locale_param_key] = locale.to_s
-        end
-
-        translated_options[RouteTranslator.locale_param_key] = locale.to_s.gsub('native_', '') unless translated_options.include?(RouteTranslator.locale_param_key)
+        translated_path = translate_path(path, locale)
+        next unless translated_path
 
-        translated_name = translate_name(name, locale, route_set.named_routes.names)
+        translated_name                = translate_name(name, locale, route_set.named_routes.names)
+        translated_options_constraints = translate_options_constraints(options_constraints, locale)
+        translated_options             = translate_options(options, locale)
 
         yield translated_name, translated_path, translated_options_constraints, translated_options
       end

data/lib/route_translator/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: route_translator
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 5.0.6
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -10,48 +10,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.17
+        version: 0.8.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.17
+        version: 0.8.18
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -118,22 +106,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -154,14 +136,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.47.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.47.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -219,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Translate your Rails routes in a simple manner