grape-path-helpers 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66a92790c192b884c021f5f6aa77544060f9386d036cfde63954b77b0930da2b
-  data.tar.gz: 9eb7630323cbd4adea877cf93c3c3061a14a4c14ec110a9ddf26dfe8e31b6387
+  metadata.gz: 8734d9daeae94b2a878f9fc18e9c178546e3228132df7ed03a0b3e1ab4de9a2c
+  data.tar.gz: 7151c3498b0957a40be8fdf9751aea18a62628c01379a5861116c5f855910c60
 SHA512:
-  metadata.gz: fc02941d380ee7316267feedd073e02c95f542a0dcbaad3ef55e97290e761f4bb29b7de80eb4156d34eefc36344f7f336a30abcfe82b6ede0d05cf05aa2bea4e
-  data.tar.gz: c157b188857534b828f19a7ad28eaeeff9c004f23946ef4e3aeab30352e02460b5d200d527a68dcd43fe477d187ea555d3e58e8e7bcef9e95dd90887b65f1ee6
+  metadata.gz: 0fecfaaab23602b4cc8f50a4a9356e228d69909b36f799000bce239798e443f35cb3aa0d2367d9980a0e58c41dd4f5671c501dab08a6fb94bfffb5148652d200
+  data.tar.gz: a6c4dd8fb3cd7bb33a96687a94ac0e96733af8ecfe5096f781b32139c3518b96295763405086d05389f54adf66bf96bd4940352cf322c5135158f274f0420c11

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.6.2
+
+* [Improve performance of route matching](https://gitlab.com/gitlab-org/grape-path-helpers/-/merge_requests/33)
+
 ## 1.6.1
 
 * [Use ruby2_keywords to fix 2.7 warning](https://gitlab.com/gitlab-org/grape-path-helpers/-/merge_requests/31)

data/Gemfile.lock

@@ -1,40 +1,39 @@
 PATH
   remote: .
   specs:
-    grape-path-helpers (1.4.0)
+    grape-path-helpers (1.6.2)
       activesupport
       grape (~> 1.3)
       rake (> 12)
+      ruby2_keywords (~> 0.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ast (2.4.0)
     builder (3.2.4)
     coderay (1.1.2)
     concurrent-ruby (1.1.7)
     diff-lcs (1.3)
-    dry-configurable (0.11.6)
+    dry-configurable (0.12.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
+    dry-core (0.5.0)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
-    dry-logic (1.0.8)
+    dry-logic (1.1.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5)
     dry-types (1.4.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
@@ -42,17 +41,17 @@ GEM
       dry-equalizer (~> 0.3)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    grape (1.5.0)
+    grape (1.5.1)
       activesupport
       builder
       dry-types (>= 1.1)
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-    i18n (1.8.5)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     method_source (0.9.0)
-    minitest (5.14.2)
+    minitest (5.14.3)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     mustermann-grape (1.0.1)
@@ -68,7 +67,7 @@ GEM
     rack-accept (0.4.5)
       rack (>= 0.4)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.3)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -91,11 +90,10 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
     ruby2_keywords (0.0.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (1.3.3)
-    zeitwerk (2.4.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -107,4 +105,4 @@ DEPENDENCIES
   rubocop (~> 0.56)
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

data/lib/grape-path-helpers/decorated_route.rb

@@ -147,10 +147,10 @@ module GrapePathHelpers
     def uses_segments_in_path_helper?(segments)
       segments = segments.reject { |x| special_keys.include?(x) }
 
-      if required_helper_segments.empty? && segments.any?
+      if helper_arguments.empty? && segments.any?
         false
       else
-        required_helper_segments.all? { |x| segments.include?(x) }
+        helper_arguments.all? { |x| segments.include?(x) }
       end
     end
 

data/lib/grape-path-helpers/named_route_matcher.rb

@@ -8,8 +8,14 @@ module GrapePathHelpers
 
       segments = args.first || {}
 
+      # rubocop:disable Metrics/LineLength
+      raise ArgumentError, 'Helper options must be a hash' unless segments.is_a?(Hash)
+      # rubocop:enable Metrics/LineLength
+
+      requested_segments = segments.keys.map(&:to_s)
+
       route = Grape::API::Instance.decorated_routes.detect do |r|
-        route_match?(r, method_id, segments)
+        route_match?(r, method_id, requested_segments)
       end
 
       if route
@@ -30,12 +36,9 @@ module GrapePathHelpers
       super
     end
 
-    def route_match?(route, method_name, segments)
+    def route_match?(route, method_name, requested_segments)
       return false unless route.respond_to?(method_name)
-      # rubocop:disable Metrics/LineLength
-      raise ArgumentError, 'Helper options must be a hash' unless segments.is_a?(Hash)
-      # rubocop:enable Metrics/LineLength
-      requested_segments = segments.keys.map(&:to_s)
+
       route.uses_segments_in_path_helper?(requested_segments)
     end
   end

data/lib/grape-path-helpers/version.rb

@@ -1,4 +1,4 @@
 # Gem version
 module GrapePathHelpers
-  VERSION = '1.6.1'.freeze
+  VERSION = '1.6.2'.freeze
 end

data/spec/grape_path_helpers/named_route_matcher_spec.rb

@@ -55,6 +55,14 @@ describe GrapePathHelpers::NamedRouteMatcher do
 
       helper_class.test_method_path
     end
+
+    context 'when segments is not a hash' do
+      it 'raises an ArgumentError' do
+        expect do
+          helper_class.test_method_path(1234)
+        end.to raise_error(ArgumentError)
+      end
+    end
   end
 
   describe '#route_match?' do
@@ -63,14 +71,6 @@ describe GrapePathHelpers::NamedRouteMatcher do
       let(:method_name) { :api_v1_ping_path }
       let(:segments) { {} }
 
-      context 'when segments is not a hash' do
-        it 'raises an ArgumentError' do
-          expect do
-            route_match?(route, method_name, 1234)
-          end.to raise_error(ArgumentError)
-        end
-      end
-
       it 'returns true' do
         is_match = route_match?(route, method_name, segments)
         expect(is_match).to eq(true)
@@ -106,7 +106,7 @@ describe GrapePathHelpers::NamedRouteMatcher do
         context 'when route requires the requested segments' do
           let(:route) { show_route }
           let(:method_name) { :api_v1_cats_path }
-          let(:segments) { { id: 1 } }
+          let(:segments) { { 'id' => 1 } }
 
           it 'returns true' do
             is_match = route_match?(route, method_name, segments)
@@ -115,7 +115,7 @@ describe GrapePathHelpers::NamedRouteMatcher do
         end
 
         context 'when route does not require the requested segments' do
-          let(:segments) { { some_option: 'some value' } }
+          let(:segments) { { 'some_option' => 'some value' } }
 
           it 'returns false' do
             is_match = route_match?(route, method_name, segments)
@@ -125,7 +125,7 @@ describe GrapePathHelpers::NamedRouteMatcher do
       end
 
       context 'when segments contains unexpected options' do
-        let(:segments) { { some_option: 'some value' } }
+        let(:segments) { { 'some_option' => 'some value' } }
 
         it 'returns false' do
           is_match = route_match?(route, method_name, segments)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-path-helpers
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Drew Blessing
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport