grape-path-helpers 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8734d9daeae94b2a878f9fc18e9c178546e3228132df7ed03a0b3e1ab4de9a2c
-  data.tar.gz: 7151c3498b0957a40be8fdf9751aea18a62628c01379a5861116c5f855910c60
+  metadata.gz: 2bc6c862d4ba4b9cedabaafaf461382721dd87e45cc7796ff13d9a7c643d1d46
+  data.tar.gz: d1198670aad0447e4b50821a19e460daced596a51de2ddc0155fd6adea5146aa
 SHA512:
-  metadata.gz: 0fecfaaab23602b4cc8f50a4a9356e228d69909b36f799000bce239798e443f35cb3aa0d2367d9980a0e58c41dd4f5671c501dab08a6fb94bfffb5148652d200
-  data.tar.gz: a6c4dd8fb3cd7bb33a96687a94ac0e96733af8ecfe5096f781b32139c3518b96295763405086d05389f54adf66bf96bd4940352cf322c5135158f274f0420c11
+  metadata.gz: 729437ba35e3b8d4e2133dc96d11c9b5eca8a40965099acee11c7795f0514248bf7d45a824bc13cfceeb02e31fff0057f1a8ead11bc9e2f6d629af1b17910ed3
+  data.tar.gz: 520a330a0d892189dc2bd4862a717b41423f7c98794082592a961fdddbdee4342b1dbad0a94a9a4a98dbee2fa05c58bdc4c6ff398cddfbd74ad206622fb09fce

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.6.3
+
+* [Fix route matcher when method ends in path and arg isn't a Hash](https://gitlab.com/gitlab-org/grape-path-helpers/-/merge_requests/35)
+
 ## 1.6.2
 
 * [Improve performance of route matching](https://gitlab.com/gitlab-org/grape-path-helpers/-/merge_requests/33)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grape-path-helpers (1.6.2)
+    grape-path-helpers (1.6.3)
       activesupport
       grape (~> 1.3)
       rake (> 12)
@@ -10,7 +10,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.1)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -19,9 +19,9 @@ GEM
     ast (2.4.0)
     builder (3.2.4)
     coderay (1.1.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.3)
-    dry-configurable (0.12.0)
+    dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)
@@ -29,29 +29,27 @@ GEM
       dry-configurable (~> 0.1, >= 0.1.3)
     dry-core (0.5.0)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
-    dry-logic (1.1.0)
+    dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
-    dry-types (1.4.0)
+    dry-types (1.5.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    grape (1.5.1)
+    grape (1.5.3)
       activesupport
       builder
       dry-types (>= 1.1)
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-    i18n (1.8.7)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     method_source (0.9.0)
-    minitest (5.14.3)
+    minitest (5.14.4)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     mustermann-grape (1.0.1)
@@ -89,7 +87,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
-    ruby2_keywords (0.0.2)
+    ruby2_keywords (0.0.4)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.3.3)

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

@@ -8,9 +8,7 @@ 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
+      return super unless segments.is_a?(Hash)
 
       requested_segments = segments.keys.map(&:to_s)
 

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

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

data/spec/grape_path_helpers/named_route_matcher_spec.rb

@@ -50,17 +50,24 @@ describe GrapePathHelpers::NamedRouteMatcher do
         .to eq([:test_method, [:arg1], { kwarg1: :kwarg1 }])
     end
 
-    it 'search for the route if the method ends with path' do
-      expect(Grape::API::Instance).to receive(:decorated_routes).and_call_original # rubocop:disable Metrics/LineLength
+    context 'when method ends with path' do
+      it 'returns super method_missing if first arg is not a hash' do
+        expect(Grape::API::Instance).not_to receive(:decorated_routes)
 
-      helper_class.test_method_path
-    end
+        expect(helper_class.test_method_path(:arg1, kwarg1: :kwarg1))
+          .to eq([:test_method_path, [:arg1], { kwarg1: :kwarg1 }])
+      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)
+      it 'search for the route if there are no args' do
+        expect(Grape::API::Instance).to receive(:decorated_routes).and_call_original # rubocop:disable Metrics/LineLength
+
+        helper_class.test_method_path
+      end
+
+      it 'search for the route if the first arg is a hash' do
+        expect(Grape::API::Instance).to receive(:decorated_routes).and_call_original # rubocop:disable Metrics/LineLength
+
+        helper_class.test_method_path(id: 5)
       end
     end
   end
@@ -190,14 +197,6 @@ describe GrapePathHelpers::NamedRouteMatcher do
         path = api_v1_ping_path
         expect(path).to eq('/api/v1/ping.json')
       end
-
-      context 'when argument to the helper is not a hash' do
-        it 'raises an ArgumentError' do
-          expect do
-            api_v1_ping_path(1234)
-          end.to raise_error(ArgumentError)
-        end
-      end
     end
 
     context 'when method name does not match a Grape::Route path helper name' do

metadata

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