route_translator 4.2.2 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fed95d7d2bb5c6760f755a65866d1bb712af7493
-  data.tar.gz: a68d7427215b389db7a8f7b327df93559808c26e
+  metadata.gz: 0245ec3dc888fe4075acdc5b7f75a83abc484315
+  data.tar.gz: 830fe48ec660d44d6f41611addc896c917fc6e05
 SHA512:
-  metadata.gz: c75f272a76d785a14832ff9512f70fcb7e9ee9f8865705f3f47c30cd1e068c60dbf23f903ce10a22865c5de95d78ca7f72c50ec54b331602eefc8b61b154e853
-  data.tar.gz: 5d625add24e8f730a10bc0122641c1b1c874e4c776477daaf6feb0e0ccf3cb81749de3f4dad568e28c81358cb9e592c0993de5aed216096322b551d687a78441
+  metadata.gz: a3887741389738e173cd52b317bc81f463c42c640ae255d4f85e48dcb4fccf17ee06baa6543a265a9d35dbe9848fffb24fdd97d4f7e7ac3854a465e678f16db3
+  data.tar.gz: 0411af88304f09a2005960c0d24699d50a8e2a5a24b1b55895336ca0ef09790082749bd7aacbeca46e059d6515e74fe3a37dc390fc5a95c9e2374688f7b25356

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.2.3 (2016-01-15)
+
+* Minor tweaks
+
 ## 4.2.2 (2015-12-16)
 
 * Fix: native path generation with host_locale (#95)

data/lib/route_translator.rb

@@ -7,7 +7,7 @@ require File.expand_path('../route_translator/host', __FILE__)
 module RouteTranslator
   extend RouteTranslator::Host
 
-  TRANSLATABLE_SEGMENT = /^([-_a-zA-Z0-9]+)(\()?/.freeze
+  TRANSLATABLE_SEGMENT = /^([-_a-zA-Z0-9]+)(\()?/
 
   Configuration = Struct.new(:force_locale, :hide_locale,
                              :generate_unlocalized_routes, :locale_param_key,

data/lib/route_translator/extensions/mapper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'action_dispatch'
 
 module ActionDispatch
@@ -9,46 +10,31 @@ module ActionDispatch
         @localized = false
       end
 
-      if instance_methods.map(&:to_s).include?('add_route'.freeze)
-        def add_route(action, options) # :nodoc:
-          path = path_for_action(action, options.delete(:path))
+      def add_route(action, options) # :nodoc:
+        path = path_for_action(action, options.delete(:path))
 
-          if action.to_s =~ %r{^[\w\/]+$}.freeze
-            options[:action] ||= action unless action.to_s.include?('/'.freeze)
-          else
-            action = nil
-          end
-
-          if !options.fetch(:as, true)
-            options.delete(:as)
-          else
-            options[:as] = name_for_action(options[:as], action)
-          end
+        if action.to_s =~ %r{^[\w\/]+$}
+          options[:action] ||= action unless action.to_s.include?('/'.freeze)
+        else
+          action = nil
+        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
+        if !options.fetch(:as, true)
+          options.delete(:as)
+        else
+          options[:as] = name_for_action(options[:as], action)
+        end
 
-          if @localized
-            @set.add_localized_route(*mapping.to_route)
-          else
-            @set.add_route(*mapping.to_route)
-          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
-      else
-        module Base
-          def match(path, options = nil)
-            mapping = Mapping.new(@set, @scope, path, options || {})
-            app, conditions, requirements, defaults, as, anchor = mapping.to_route
-            if @localized
-              @set.add_localized_route(app, conditions, requirements, defaults, as, anchor)
-            else
-              @set.add_route(app, conditions, requirements, defaults, as, anchor)
-            end
-            self
-          end
+
+        if @localized
+          @set.add_localized_route(*mapping.to_route)
+        else
+          @set.add_route(*mapping.to_route)
         end
       end
     end

data/lib/route_translator/extensions/route_set.rb

@@ -7,6 +7,12 @@ module ActionDispatch
         RouteTranslator::Translator.translations_for(app, conditions, requirements, defaults, as, anchor, self) do |*translated_args|
           add_route(*translated_args)
         end
+
+        if RouteTranslator.config.generate_unnamed_unlocalized_routes
+          add_route app, conditions, requirements, defaults, nil, anchor
+        elsif RouteTranslator.config.generate_unlocalized_routes
+          add_route app, conditions, requirements, defaults, as, anchor
+        end
       end
     end
   end

data/lib/route_translator/translator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module RouteTranslator
   module Translator
     # Add standard route helpers for default locale e.g.
@@ -58,15 +59,8 @@ module RouteTranslator
         new_route_name = nil if new_route_name && route_set.named_routes.routes[new_route_name.to_sym] # TODO: Investigate this :(
         block.call(app, new_conditions, new_requirements, new_defaults, new_route_name, anchor)
       end
-      if RouteTranslator.config.generate_unnamed_unlocalized_routes
-        block.call(app, conditions, requirements, defaults, nil, anchor)
-      elsif RouteTranslator.config.generate_unlocalized_routes
-        block.call(app, conditions, requirements, defaults, route_name, anchor)
-      end
     end
 
-    private
-
     def self.available_locales
       available_locales = config_locales || I18n.available_locales.dup
       available_locales.push(*RouteTranslator.native_locales) if RouteTranslator.native_locales.present?
@@ -134,7 +128,7 @@ module RouteTranslator
     end
 
     def self.translate_string(str, locale)
-      locale = "#{locale}".gsub('native_', '')
+      locale = locale.to_s.gsub('native_', '')
       opts = { scope: :routes, locale: locale }
       if RouteTranslator.config.disable_fallback && locale.to_s != I18n.default_locale.to_s
         opts[:fallback] = true
@@ -146,7 +140,7 @@ module RouteTranslator
     end
 
     def self.locale_param_present?(path)
-      !(path.split('/').detect { |segment| segment.to_s == ":#{RouteTranslator.locale_param_key}" }.nil?)
+      !path.split('/').detect { |segment| segment.to_s == ":#{RouteTranslator.locale_param_key}" }.nil?
     end
 
     def self.host_locales_option?

data/lib/route_translator/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module RouteTranslator
-  VERSION = '4.2.2'
+  VERSION = '4.2.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: route_translator
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.2.3
 platform: ruby
 authors:
 - Raul Murciano
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -125,14 +125,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: 0.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: 0.36.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Translate your Rails routes in a simple manner