route_translator 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 082c2e8186923d0e715cc9540942a23fc09a9f85
-  data.tar.gz: 41803873b2329a079d55cc1cc3251402f7c0dfc1
+  metadata.gz: b3b566e8efb88b086812e1308e50a25a665b5b1a
+  data.tar.gz: 43ba2e28fd4e1b24b3451c54e8aae47ad4961693
 SHA512:
-  metadata.gz: 7b78458687cdaba7cd60f658f5973319f1cb05240db25be435446bdcba0a198d0555fc44f1da5bbe334c97ca8c5a9050a690339ddcad88c7a44c03778e02c3d1
-  data.tar.gz: 5d0a9e7baec151c0bcfe7cd26b3ef166d8e5bb18c22e63d931f13f5adb0ebc7c433551cbddd7b9965821de58970c92b7922e9834b4fdb540e5036dc727ad72a9
+  metadata.gz: 5588fc472c0c4b192b7610e8a31091fbdaa93c9ba57749e8e281d10744537f52f3a24a8e913837bb83ad2f3230cf8c950ba0e709977da332204376b050cd2bec
+  data.tar.gz: fe53b0f81af8176c9f1cf53d07b869b0a18da4d3bbe09a29f7868faedcd3416e2999557b9b2b95a17dca1ad48f5632b5e59704050cb2bc60d40ef46bde6f3bf3

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 5.0.5 (2016-12-15)
+
+* Fix generated prefix to localized one (#123)
+* Improve Mapper's monkey patch
+
 ## 5.0.4 (2016-11-11)
 
 * Retain value of options_constraints if callable

data/lib/route_translator/extensions/mapper.rb

@@ -10,8 +10,11 @@ module ActionDispatch
         @localized = false
       end
 
-      def add_route(action, controller, options, original_path, to, via, formatted, anchor, options_constraints) # :nodoc:
-        path = path_for_action(action, original_path)
+      # rubocop:disable Lint/UnderscorePrefixedVariableName
+      def add_route(action, controller, options, _path, to, via, formatted, anchor, options_constraints) # :nodoc:
+        return super unless @localized
+
+        path = path_for_action(action, _path)
         raise ArgumentError, 'path is required' if path.blank?
 
         action = action.to_s
@@ -35,10 +38,17 @@ module ActionDispatch
 
         mapping = Mapping.build(@scope, @set, ast, controller, default_action, to, via, formatted, options_constraints, anchor, options)
 
-        if @localized
-          @set.add_localized_route(mapping, ast, as, anchor, @scope, path, controller, default_action, to, via, formatted, options_constraints, options)
-        else
-          @set.add_route(mapping, ast, as, anchor)
+        @set.add_localized_route(mapping, ast, as, anchor, @scope, path, controller, default_action, to, via, formatted, options_constraints, options)
+      end
+      # rubocop:enable Lint/UnderscorePrefixedVariableName
+
+      private
+
+      def define_generate_prefix(app, name)
+        return super unless @localized
+
+        RouteTranslator::Translator.available_locales.each do |locale|
+          super(app, "#{name}_#{locale.to_s.underscore}")
         end
       end
     end

data/lib/route_translator/translator.rb

@@ -8,16 +8,6 @@ module RouteTranslator
     class << self
       private
 
-      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.
-        locales.delete I18n.default_locale
-        locales.push I18n.default_locale
-      end
-
       def host_locales_option?
         RouteTranslator.config.host_locales.present?
       end
@@ -35,6 +25,16 @@ module RouteTranslator
 
     module_function
 
+    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.
+      locales.delete I18n.default_locale
+      locales.push I18n.default_locale
+    end
+
     def translations_for(route_set, path, name, options_constraints, options)
       RouteTranslator::Translator::RouteHelpers.add name, route_set.named_routes
 

data/lib/route_translator/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: route_translator
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.15
+        version: 0.8.17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.15
+        version: 0.8.17
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -140,28 +140,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.45.0
+        version: 0.46.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.45.0
+        version: 0.46.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Translate your Rails routes in a simple manner