route_translator 4.4.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47e6b119bdebda6361df7598755063a84fa4c479
-  data.tar.gz: ea59bc43ae8626a318c3a768f39cf5e51cda19ae
+  metadata.gz: 94d116b8b22e3189dfca53c189008da9fca4248b
+  data.tar.gz: 9009629caf2f295110ddf69e6bced39dfecf44f0
 SHA512:
-  metadata.gz: 49d5166033a4b88019aa91325ca7b7953368e4235e942fb2f00f6c15227b7695863e4534237b46c3c59fb382f7db3dd56a21533bfce87e92d41ca7293da30792
-  data.tar.gz: 5fd05b592d73575cf6bf0e7229fe74ad8c56eb01d3f868a1b6d86cb13f852affbdfd067ada71a0e5a1a22f75f1cf15bdc94b733d542650d3179486d52ed1ce37
+  metadata.gz: 320cbcabb052d70e508b013e8c7c9624e1fff5e3d42ea31db10446f8f684a332af55f38ccecf671b380b0dc6dc1f06f9cb5731acca93068cfbd32930425ce10c
+  data.tar.gz: 2bf6d5b205e6a61864fcaf21bc8204570333c5e6f7ebd3ec03d53f327784e617ac9e05aebe40861d476eec203f8ce2f489250ff4a37d3d7a565bcdaf78c3744d

data/CHANGELOG.md

@@ -1,9 +1,8 @@
 # Changelog
 
-## 4.4.1 (2016-07-15)
+## 5.0.0 (2016-07-01)
 
-* Add private keyword in Segment module
-* Update development dependencies
+* Rails 5 compatibility
 
 ## 4.4.0 (2016-07-01)
 

data/README.md

@@ -1,16 +1,16 @@
 # RouteTranslator
 
 [![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=4-stable)](https://travis-ci.org/enriclluelles/route_translator)
+[![Build Status](https://travis-ci.org/enriclluelles/route_translator.svg?branch=master)](https://travis-ci.org/enriclluelles/route_translator)
 [![Dependency Status](https://gemnasium.com/enriclluelles/route_translator.svg)](https://gemnasium.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=4-stable)](https://coveralls.io/github/enriclluelles/route_translator?branch=4-stable)
+[![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 all the different flavours of rails 3-4 (3.2, 4.0, 4.1, 4.2).
+Right now it works with Rails 5.0
 
 
 
@@ -19,7 +19,7 @@ Right now it works with all the different flavours of rails 3-4 (3.2, 4.0, 4.1,
 1.  If you have this `routes.rb` file originally:
 
     ```ruby
-    MyApp::Application.routes.draw do
+    Rails.application.routes.draw do
       namespace :admin do
         resources :cars
       end
@@ -58,7 +58,7 @@ Right now it works with all the different flavours of rails 3-4 (3.2, 4.0, 4.1,
 3.  Wrap the groups of routes that you want to translate inside a `localized` block:
 
     ```ruby
-    MyApp::Application.routes.draw do
+    Rails.application.routes.draw do
       namespace :admin do
         resources :cars
       end
@@ -131,7 +131,7 @@ Right now it works with all the different flavours of rails 3-4 (3.2, 4.0, 4.1,
     To disable it add this to your controller:
 
     ```ruby
-    skip_around_filter :set_locale_from_url
+    skip_around_action :set_locale_from_url
     ```
 
 

data/lib/route_translator/extensions/action_controller.rb

@@ -46,5 +46,7 @@ module RouteTranslator
   end
 end
 
-ActionController::Base.send :include, RouteTranslator::Controller
-ActionController::TestCase.send :include, RouteTranslator::TestCase
+ActiveSupport.on_load(:action_controller) do
+  ActionController::Base.send :include, RouteTranslator::Controller
+  ActionController::TestCase.send :include, RouteTranslator::TestCase
+end

data/lib/route_translator/extensions/mapper.rb

@@ -10,31 +10,35 @@ module ActionDispatch
         @localized = false
       end
 
-      def add_route(action, options) # :nodoc:
-        path = path_for_action(action, options.delete(:path))
+      def add_route(action, controller, options, original_path, to, via, formatted, anchor, options_constraints) # :nodoc:
+        path = path_for_action(action, original_path)
+        raise ArgumentError, 'path is required' if path.blank?
 
-        if action.to_s =~ %r{^[\w\/]+$}
-          options[:action] ||= action unless action.to_s.include?('/'.freeze)
+        action = action.to_s
+
+        default_action = options.delete(:action) || @scope[:action]
+
+        if action =~ %r{^[\w\-\/]+$}
+          default_action ||= action.tr('-', '_') unless action.include?('/')
         else
           action = nil
         end
 
-        if !options.fetch(:as, true)
-          options.delete(:as)
-        else
-          options[:as] = name_for_action(options[:as], action)
-        end
+        as = if !options.fetch(:as, true) # if it's set to nil or false
+               options.delete(:as)
+             else
+               name_for_action(options.delete(:as), action)
+             end
 
-        begin
-          mapping = Mapping.new(@set, @scope, path, options)
-        rescue ArgumentError
-          mapping = Mapping.build(@scope, @set, URI.parser.escape(path), options.delete(:as), options)
-        end
+        path = Mapping.normalize_path URI.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)
 
         if @localized
-          @set.add_localized_route(*mapping.to_route)
+          @set.add_localized_route(mapping, ast, as, anchor, @scope, path, controller, default_action, to, via, formatted, options_constraints, options)
         else
-          @set.add_route(*mapping.to_route)
+          @set.add_route(mapping, ast, as, anchor)
         end
       end
     end

data/lib/route_translator/extensions/route_set.rb

@@ -3,15 +3,18 @@ require 'action_dispatch'
 module ActionDispatch
   module Routing
     class RouteSet
-      def add_localized_route(app, conditions = {}, requirements = {}, defaults = {}, as = nil, anchor = true)
-        RouteTranslator::Translator.translations_for(app, conditions, requirements, defaults, as, anchor, self) do |*translated_args|
-          add_route(*translated_args)
+      def add_localized_route(mapping, path_ast, name, anchor, scope, path, controller, default_action, to, via, formatted, options_constraints, options)
+        RouteTranslator::Translator.translations_for(self, path, name, options_constraints, options) do |translated_name, translated_path, translated_options_constraints, translated_options|
+          translated_path_ast = ::ActionDispatch::Journey::Parser.parse(translated_path)
+          translated_mapping  = ::ActionDispatch::Routing::Mapper::Mapping.build(scope, self, translated_path_ast, controller, default_action, to, via, formatted, translated_options_constraints, anchor, translated_options)
+
+          add_route translated_mapping, translated_path_ast, translated_name, anchor
         end
 
         if RouteTranslator.config.generate_unnamed_unlocalized_routes
-          add_route app, conditions, requirements, defaults, nil, anchor
+          add_route mapping, path_ast, nil, anchor
         elsif RouteTranslator.config.generate_unlocalized_routes
-          add_route app, conditions, requirements, defaults, as, anchor
+          add_route mapping, path_ast, name, anchor
         end
       end
     end

data/lib/route_translator/translator.rb

@@ -31,40 +31,30 @@ module RouteTranslator
           translated_name
         end
       end
-
-      def translate_conditions(conditions, translated_path)
-        translated_conditions = conditions.dup
-
-        translated_conditions[:path_info] = translated_path
-        translated_conditions[:parsed_path_info] = ActionDispatch::Journey::Parser.new.parse(translated_conditions[:path_info]) if conditions[:parsed_path_info]
-
-        if translated_conditions[:required_defaults] && !translated_conditions[:required_defaults].include?(RouteTranslator.locale_param_key)
-          translated_conditions[:required_defaults] << RouteTranslator.locale_param_key
-        end
-
-        translated_conditions
-      end
     end
 
     module_function
 
-    def translations_for(app, conditions, requirements, defaults, route_name, anchor, route_set)
-      RouteTranslator::Translator::RouteHelpers.add route_name, route_set.named_routes
+    def translations_for(route_set, path, name, options_constraints, options)
+      RouteTranslator::Translator::RouteHelpers.add name, route_set.named_routes
 
       available_locales.each do |locale|
         begin
-          translated_path = RouteTranslator::Translator::Path.translate(conditions[:path_info], locale)
+          translated_path = RouteTranslator::Translator::Path.translate(path, locale)
         rescue I18n::MissingTranslationData => e
           raise e unless RouteTranslator.config.disable_fallback
           next
         end
 
-        new_conditions = translate_conditions(conditions, translated_path)
+        translated_options_constraints = options_constraints.dup
+        translated_options             = options.dup
+
+        translated_options_constraints[RouteTranslator.locale_param_key] = locale.to_s
+        translated_options[RouteTranslator.locale_param_key]             = locale.to_s.gsub('native_', '') unless translated_options.include?(RouteTranslator.locale_param_key)
+
+        translated_name = translate_name(name, locale, route_set.named_routes.names)
 
-        new_defaults = defaults.merge(RouteTranslator.locale_param_key => locale.to_s.gsub('native_', ''))
-        new_requirements = requirements.merge(RouteTranslator.locale_param_key => locale.to_s)
-        new_route_name = translate_name(route_name, locale, route_set.named_routes.routes)
-        yield app, new_conditions, new_requirements, new_defaults, new_route_name, anchor
+        yield translated_name, translated_path, translated_options_constraints, translated_options
       end
     end
 

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

@@ -3,8 +3,6 @@ module RouteTranslator
     module Path
       module Segment
         class << self
-          private
-
           def translate_string(str, locale)
             locale = locale.to_s.gsub('native_', '')
             opts = { scope: :routes, locale: locale }

data/lib/route_translator/translator/route_helpers.rb

@@ -20,22 +20,10 @@ module RouteTranslator
       #   I18n.locale = :fr
       #   people_path -> people_fr_path
       def add(old_name, named_route_collection)
-        if named_route_collection.respond_to?(:url_helpers_module)
-          url_helpers_module = named_route_collection.url_helpers_module
-          path_helpers_module = named_route_collection.path_helpers_module
-          url_helpers_list = named_route_collection.helper_names
-          path_helpers_list = named_route_collection.helper_names
-        else
-          url_helpers_module = named_route_collection.module
-          path_helpers_module = named_route_collection.module
-          url_helpers_list = named_route_collection.helpers
-          path_helpers_list = named_route_collection.helpers
-        end
+        helper_list = named_route_collection.helper_names
 
-        [
-          ['path', path_helpers_module, path_helpers_list],
-          ['url', url_helpers_module, url_helpers_list]
-        ].each do |suffix, helper_container, helper_list|
+        %w(path url).each do |suffix|
+          helper_container = named_route_collection.send(:"#{suffix}_helpers_module")
           new_helper_name = "#{old_name}_#{suffix}"
 
           helper_list.push(new_helper_name.to_sym) unless helper_list.include?(new_helper_name.to_sym)

data/lib/route_translator/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: route_translator
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -18,40 +18,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.14
+        version: 0.8.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.14
+        version: 0.8.13
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -106,20 +120,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -140,28 +154,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.2
+        version: 0.41.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.2
+        version: 0.41.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.11.2
 description: Translates the Rails routes of your application into the languages defined
   in your locale files
 email: