grape-path-helpers 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0bb904ceffcf1cf4e877c5f97558f9d44883675269b20f6b8b76e74ba030fb0
-  data.tar.gz: ddf94c3bc25ef08377160f78298ae9905b6b83099cfaacec4e50202723582e5c
+  metadata.gz: 40792c146fc9c26dd609bc8dd99adce92b010820e3c2ca9644144f3493dd06ec
+  data.tar.gz: aed680f63272f1e61467787e0d374bb8a8145b61979c18b5c61e332763472cd5
 SHA512:
-  metadata.gz: ded4e9c49e798b3127ca4169b269c09a68890c498d079d6bca2a9ca06532b0bacb2f09615b82f04646fc988a4bfcfa995623c9e93e5ec7a6e52e4df69698cf07
-  data.tar.gz: 93eaa299b50943cd6d8bcfd72f48f97da3d89ac557cabab44f6976297e275bb6fc2cf684ec6b9aa36fa8774980097c825a22978e19a86294a9944edac61b3559
+  metadata.gz: ff06e53d14f8d46a398cc14754fbc61e7e1a1e28179aa83a27bbca47698c117daaf064f62d3e03e1a385112fea2c0dd076b102e64e4c2f1ffa3c4d4fae7d3279
+  data.tar.gz: 82fde6483c7ad996189c59ab9c79969495e642fb0274d9e209228b6633e6c6c731066a4bf24effa6e00e990f3fc82b94eca8084b469f64aad15e8f9a5f486728

data/.gitlab-ci.yml

@@ -1,9 +1,9 @@
-image: "ruby:2.7-alpine"
+image: "ruby:3.0-alpine"
 
 cache:
   paths:
     - vendor/ruby
-  key: ruby-2.7
+  key: ruby-3.0
 
 before_script:
   - apk add --update git

data/.rubocop.yml

@@ -8,3 +8,7 @@ Metrics/MethodLength:
 
 Style/FileName:
  Enabled: false
+
+# Removed in newer versions of Rubocop
+Lint/SplatKeywordArguments:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.6.0
+
+* [Extract kwargs to fix 2.7 warnings](https://gitlab.com/gitlab-org/grape-path-helpers/-/merge_requests/29)
+
 ## 1.5.0
 
 * [Relax rake dependency](https://gitlab.com/gitlab-org/grape-path-helpers/-/merge_requests/27)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grape-path-helpers (1.5.0)
+    grape-path-helpers (1.6.0)
       activesupport
       grape (~> 1.3)
       rake (> 12)
@@ -9,32 +9,30 @@ PATH
 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 +40,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 +66,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 +89,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 +104,4 @@ DEPENDENCIES
   rubocop (~> 0.56)
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

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

@@ -3,20 +3,28 @@ module GrapePathHelpers
   # to unknown methods will look for a route with a matching
   # helper function name
   module NamedRouteMatcher
-    def method_missing(method_id, *arguments)
+    def method_missing(method_id, *args, **kwargs)
       return super unless method_id.to_s =~ /_path$/
 
+      success, result = call_path_method(method_id, *args, **kwargs)
+
+      if success
+        result
+      else
+        super
+      end
+    end
+
+    def call_path_method(method_id, *arguments)
       segments = arguments.first || {}
 
       route = Grape::API::Instance.decorated_routes.detect do |r|
         route_match?(r, method_id, segments)
       end
 
-      if route
-        route.send(method_id, *arguments)
-      else
-        super
-      end
+      return false unless route
+
+      [true, route.send(method_id, *arguments)]
     end
 
     def respond_to_missing?(method_name, _include_private = false)

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

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

data/spec/grape_path_helpers/named_route_matcher_spec.rb

@@ -30,8 +30,8 @@ describe GrapePathHelpers::NamedRouteMatcher do
     fake_class = Class.new do
       prepend GrapePathHelpers::NamedRouteMatcher
 
-      def method_missing(_method_id, *_args)
-        'whatever' || super
+      def method_missing(method_id, *args, **kwargs)
+        [method_id, args, kwargs] || super
       end
 
       def respond_to_missing?(_method_name, _include_private = false)
@@ -46,7 +46,8 @@ describe GrapePathHelpers::NamedRouteMatcher do
     it 'returns super method_missing if the method does not end with path' do
       expect(Grape::API::Instance).not_to receive(:decorated_routes)
 
-      helper_class.test_method
+      expect(helper_class.test_method(:arg1, kwarg1: :kwarg1))
+        .to eq([:test_method, [:arg1], { kwarg1: :kwarg1 }])
     end
 
     it 'search for the route if the method ends with path' do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: grape-path-helpers
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Drew Blessing
 - Harper Henn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-07 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -131,7 +131,7 @@ homepage: https://gitlab.com/gitlab-org/grape-path-helpers
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,8 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Route path helpers for Grape
 test_files: []