grape 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ea97a4725e49023d0d321920359d449d1a97ac1ea796bf8393f680d512799c7
-  data.tar.gz: 2f36ea240c2f987ec11479522a6a4f3113f3fb296903baa749305ba60e07ad44
+  metadata.gz: 024e352cc91ca60c4f0750b852ce4fba0dc574b33d647ef10958b4db12fc7090
+  data.tar.gz: d9fb3be3da671011a1bed81d5f986a1688d411903bcf550c9d6ea83c7dcb6e0f
 SHA512:
-  metadata.gz: 9b09628eb40cf9fe5f08e01b3391d3a7abca14b24c8bdda9fb6b52d326c97c2edc7ceb05ba8a27826d6f6d902867d5cad1e031884a466b59677e893df81b52e1
-  data.tar.gz: e1c916b0be5480c0f6cff795eefde716f6056a3f6cc28eb97235cb3c79b503e0028b69286447fb47d3850936a411863166bb8f09dc1de4f21a56b48b439b2572
+  metadata.gz: 6172f2a8d7567edcbebb7289d5e41bed65f66ffa9309dd37b03b57cf199bc84945cdfd241df84e6a92ecf28f9099b18b9fe08516470b38721cb256fce5de8a34
+  data.tar.gz: d5ce8b9292bc9e596a955ac0c748cb2c278daf68246192556a1ee91e726026bdced1586ea4b73818727ff3fd2b0f32df57f3674d7a5f585703cd91c7630f5b71

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+### 2.1.2 (2024-06-28)
+
+#### Fixes
+
+* [#2459](https://github.com/ruby-grape/grape/pull/2459): Autocorrect cops - [@ericproulx](https://github.com/ericproulx).
+* [#3458](https://github.com/ruby-grape/grape/pull/2458): Remove unused Grape::Util::Accept::Header - [@ericproulx](https://github.com/ericproulx).
+* [#2463](https://github.com/ruby-grape/grape/pull/2463): Fix error message indices - [@ericproulx](https://github.com/ericproulx).
+
+### 2.1.1 (2024-06-22)
+
+#### Features
+
+* [#2450](https://github.com/ruby-grape/grape/pull/2450): Update RuboCop to 1.64.1 - [@ericproulx](https://github.com/ericproulx).
+
+#### Fixes
+
+* [#2453](https://github.com/ruby-grape/grape/pull/2453): Fix context in rescue_from - [@ericproulx](https://github.com/ericproulx).
+* [#2455](https://github.com/ruby-grape/grape/pull/2455): Fix default response headers to work with Rack 3 - [@ericproulx](https://github.com/ericproulx).
+
 ### 2.1.0 (2024/06/15)
 
 #### Features

data/README.md

@@ -157,7 +157,7 @@ Grape is a REST-like API framework for Ruby. It's designed to run on Rack or com
 
 ## Stable Release
 
-You're reading the documentation for the stable release of Grape, **2.1.0**.
+You're reading the documentation for the stable release of Grape, **2.1.2**.
 Please read [UPGRADING](UPGRADING.md) when upgrading from a previous version.
 
 ## Project Resources

data/lib/grape/api/instance.rb

@@ -46,7 +46,7 @@ module Grape
         # Parses the API's definition and compiles it into an instance of
         # Grape::API.
         def compile
-          @instance ||= new
+          @instance ||= new # rubocop:disable Naming/MemoizedInstanceVariableName
         end
 
         # Wipe the compiled API so we can recompile after changes were made.

data/lib/grape/api.rb

@@ -32,7 +32,7 @@ module Grape
       def inherited(api)
         super
 
-        api.initial_setup(Grape::API == self ? Grape::API::Instance : @base_instance)
+        api.initial_setup(self == Grape::API ? Grape::API::Instance : @base_instance)
         api.override_all_methods!
       end
 
@@ -108,7 +108,7 @@ module Grape
       end
 
       def respond_to?(method, include_private = false)
-        super(method, include_private) || base_instance.respond_to?(method, include_private)
+        super || base_instance.respond_to?(method, include_private)
       end
 
       def respond_to_missing?(method, include_private = false)

data/lib/grape/dsl/inside_route.rb

@@ -461,6 +461,10 @@ module Grape
       def http_version
         env['HTTP_VERSION'] || env[Rack::SERVER_PROTOCOL]
       end
+
+      def context
+        self
+      end
     end
   end
 end

data/lib/grape/dsl/parameters.rb

@@ -231,7 +231,7 @@ module Grape
 
       alias group requires
 
-      class EmptyOptionalValue; end
+      class EmptyOptionalValue; end # rubocop:disable Lint/EmptyClass
 
       def map_params(params, element, is_array = false)
         if params.is_a?(Array)

data/lib/grape/endpoint.rb

@@ -231,8 +231,8 @@ module Grape
       options[:app].endpoints if options[:app].respond_to?(:endpoints)
     end
 
-    def equals?(e)
-      (options == e.options) && (inheritable_setting.to_hash == e.inheritable_setting.to_hash)
+    def equals?(endpoint)
+      (options == endpoint.options) && (inheritable_setting.to_hash == endpoint.inheritable_setting.to_hash)
     end
 
     protected

data/lib/grape/exceptions/validation_errors.rb

@@ -4,7 +4,7 @@ module Grape
   module Exceptions
     class ValidationErrors < Grape::Exceptions::Base
       ERRORS_FORMAT_KEY = 'grape.errors.format'
-      DEFAULT_ERRORS_FORMAT = '%{attributes} %{message}'
+      DEFAULT_ERRORS_FORMAT = '%<attributes>s %<message>s'
 
       include Enumerable
 

data/lib/grape/middleware/base.rb

@@ -74,7 +74,7 @@ module Grape
       end
 
       def mime_types
-        @mime_type ||= content_types.each_pair.with_object({}) do |(k, v), types_without_params|
+        @mime_types ||= content_types.each_pair.with_object({}) do |(k, v), types_without_params|
           types_without_params[v.split(';').first] = k
         end
       end

data/lib/grape/middleware/error.rb

@@ -74,8 +74,8 @@ module Grape
         rack_response(status, headers, format_message(message, backtrace, original_exception))
       end
 
-      def default_rescue_handler(e)
-        error_response(message: e.message, backtrace: e.backtrace, original_exception: e)
+      def default_rescue_handler(exception)
+        error_response(message: exception.message, backtrace: exception.backtrace, original_exception: exception)
       end
 
       def rescue_handler_for_base_only_class(klass)

data/lib/grape/middleware/stack.rb

@@ -57,8 +57,8 @@ module Grape
         middlewares.last
       end
 
-      def [](i)
-        middlewares[i]
+      def [](index)
+        middlewares[index]
       end
 
       def insert(index, *args, &block)

data/lib/grape/router.rb

@@ -138,7 +138,8 @@ module Grape
     end
 
     def default_response
-      [404, { Grape::Http::Headers::X_CASCADE => 'pass' }, ['404 Not Found']]
+      headers = Grape::Util::Header.new.merge(Grape::Http::Headers::X_CASCADE => 'pass')
+      [404, headers, ['404 Not Found']]
     end
 
     def match?(input, method)

data/lib/grape/validations/attributes_iterator.rb

@@ -21,6 +21,7 @@ module Grape
       private
 
       def do_each(params_to_process, parent_indicies = [], &block)
+        @scope.reset_index # gets updated depending on the size of params_to_process
         params_to_process.each_with_index do |resource_params, index|
           # when we get arrays of arrays it means that target element located inside array
           # we need this because we want to know parent arrays indicies

data/lib/grape/validations/params_scope.rb

@@ -93,9 +93,7 @@ module Grape
 
       def meets_dependency?(params, request_params)
         return true unless @dependent_on
-
         return false if @parent.present? && !@parent.meets_dependency?(@parent.params(request_params), request_params)
-
         return params.any? { |param| meets_dependency?(param, request_params) } if params.is_a?(Array)
 
         meets_hash_dependency?(params)
@@ -103,7 +101,6 @@ module Grape
 
       def attr_meets_dependency?(params)
         return true unless @dependent_on
-
         return false if @parent.present? && !@parent.attr_meets_dependency?(params)
 
         meets_hash_dependency?(params)
@@ -169,6 +166,10 @@ module Grape
         !@optional
       end
 
+      def reset_index
+        @index = nil
+      end
+
       protected
 
       # Adds a parameter declaration to our list of validations.
@@ -297,12 +298,7 @@ module Grape
       #   `optional` invocation that opened this scope.
       # @yield parameter scope
       def new_group_scope(attrs, &block)
-        self.class.new(
-          api: @api,
-          parent: self,
-          group: attrs.first,
-          &block
-        )
+        self.class.new(api: @api, parent: self, group: attrs.first, &block)
       end
 
       # Pushes declared params to parent or settings

data/lib/grape/validations/validators/exactly_one_of_validator.rb

@@ -7,7 +7,7 @@ module Grape
         def validate_params!(params)
           keys = keys_in_common(params)
           return if keys.length == 1
-          raise Grape::Exceptions::Validation.new(params: all_keys, message: message(:exactly_one)) if keys.length.zero?
+          raise Grape::Exceptions::Validation.new(params: all_keys, message: message(:exactly_one)) if keys.empty?
 
           raise Grape::Exceptions::Validation.new(params: keys, message: message(:mutual_exclusion))
         end

data/lib/grape/version.rb

@@ -2,5 +2,5 @@
 
 module Grape
   # The current version of Grape.
-  VERSION = '2.1.0'
+  VERSION = '2.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-15 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -189,7 +189,6 @@ files:
 - lib/grape/serve_stream/sendfile_response.rb
 - lib/grape/serve_stream/stream_response.rb
 - lib/grape/types/invalid_value.rb
-- lib/grape/util/accept/header.rb
 - lib/grape/util/accept_header_handler.rb
 - lib/grape/util/base_inheritable.rb
 - lib/grape/util/cache.rb
@@ -252,9 +251,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/ruby-grape/grape/issues
-  changelog_uri: https://github.com/ruby-grape/grape/blob/v2.1.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/grape/2.1.0
-  source_code_uri: https://github.com/ruby-grape/grape/tree/v2.1.0
+  changelog_uri: https://github.com/ruby-grape/grape/blob/v2.1.2/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/grape/2.1.2
+  source_code_uri: https://github.com/ruby-grape/grape/tree/v2.1.2
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -270,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.5.13
 signing_key:
 specification_version: 4
 summary: A simple Ruby framework for building REST-like APIs.

data/lib/grape/util/accept/header.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Grape
-  module Util
-    module Accept
-      module Header
-        ALLOWED_CHARACTERS = %r{^([a-z*]+)/([a-z0-9*&\^\-_#{$ERROR_INFO}.+]+)(?:;([a-z0-9=;]+))?$}.freeze
-        class << self
-          # Corrected version of https://github.com/mjackson/rack-accept/blob/master/lib/rack/accept/header.rb#L40-L44
-          def parse_media_type(media_type)
-            # see http://tools.ietf.org/html/rfc6838#section-4.2 for allowed characters in media type names
-            m = media_type&.match(ALLOWED_CHARACTERS)
-            m ? [m[1], m[2], m[3] || ''] : []
-          end
-        end
-      end
-    end
-  end
-end