route_translator 7.0.1 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2f33ffee939f6a410cc991d1e6937123d096263461dee1ff8c1f2d9d0ab4286
-  data.tar.gz: f23abb52df341f50327dcca5e357b1d48fdebf1520218c3f152998c9eeedede0
+  metadata.gz: ccd0d757f83bdef655cbbd42b82a1e4c819298a2e6fde735f8082b197fcc9e5a
+  data.tar.gz: 438c1495fa784da92180d44616e0c568d302cf67cc487c1867ad9a01759ff87f
 SHA512:
-  metadata.gz: 529f1d1621286b84c0e47a532a6f17ff4efd901153b2086f13ebf3f4c18462d65470f91ac78d9180601f8af38ed754eecab3869c56b8f2bd39ba90b9341cc83b
-  data.tar.gz: 145661421d0bc78601484d1e0c41fb525306814fa97057e2eeb41fce0a24f7399a42dd4e8361a8e58001468eb0a257472227bd461a9283bdb3510082d9594c07
+  metadata.gz: a722c1b6ee1a5c51ba8d5bf038304a54d727c2126e2e3386261577fb554d8886aea76e66704dbe9eb84d17a493261df3389991ffd011ee30023392374f3be2c7
+  data.tar.gz: ba31fe5c99c9c6999def680b75814357355a7538735048019d2ca982c699cb3bb67234675cfd56ea536d6584bfb46c223b1402fc7610690ea7d882b33831a524

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 7.1.0 / 2019-12-26
+
+* [ENHANCEMENT] Use Addressable gem for URI parsing
+* [ENHANCEMENT] Fix Ruby 2.7 deprecations
+* [ENHANCEMENT] Update dependencies
+
 ## 7.0.1 / 2019-10-14
 
 * [BUGFIX] Fix missing dup on blocks ([#203](https://github.com/enriclluelles/route_translator/pull/203))

data/lib/route_translator.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support'
+require 'addressable/uri'
 
 require 'route_translator/extensions'
 require 'route_translator/translator'

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

@@ -24,10 +24,10 @@ module RouteTranslator
             handler = proc { |exception| exception }
             opts    = { locale: locale, scope: scope }
 
-            if I18n.translate(str, opts.merge(exception_handler: handler)).is_a?(I18n::MissingTranslation)
-              I18n.translate(str, opts.merge(fallback_options(str, locale)))
+            if I18n.translate(str, **opts.merge(exception_handler: handler)).is_a?(I18n::MissingTranslation)
+              I18n.translate str, **opts.merge(fallback_options(str, locale))
             else
-              I18n.translate(str, opts)
+              I18n.translate str, **opts
             end
           end
 
@@ -35,7 +35,7 @@ module RouteTranslator
             sanitized_locale = RouteTranslator::LocaleSanitizer.sanitize(locale)
             translated_resource = translate_resource(str, sanitized_locale, scope)
 
-            URI.escape translated_resource
+            Addressable::URI.normalize_component translated_resource
           end
         end
 
@@ -56,7 +56,7 @@ module RouteTranslator
             return "#{named_param}-#{translate(hyphenized, locale, scope)}" if hyphenized
           end
 
-          return segment if segment.starts_with?('(') || segment.starts_with?('*') || segment.include?(':')
+          return segment if segment.starts_with?('(', '*') || segment.include?(':')
 
           appended_part = segment.slice!(/(\()$/)
           str = translatable_segment(segment)

data/lib/route_translator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RouteTranslator
-  VERSION = '7.0.1'
+  VERSION = '7.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: route_translator
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.1.0
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-14 00:00:00.000000000 Z
+date: 2019-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -52,6 +52,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -92,28 +106,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.12'
+        version: '5.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.12'
+        version: '5.13'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -154,14 +168,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.75.1
+        version: 0.78.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.75.1
+        version: 0.78.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -182,14 +196,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Translate your Rails routes in a simple manner