grape-entity 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea6cd1ab20b3f5c6e99438ee72c716cc28dde080ce2dc89490427bf3b7431212
-  data.tar.gz: 0e5ec30218c864e84984114a39fd3acc5bb980db637ba75c1c7572491ce5695b
+  metadata.gz: 629fcce5dd878171471587ff40412484bdf2dad7207260e640178cad5de5906d
+  data.tar.gz: 6ffde278282ef2538348ebbb64e2f81ec212c5afb049b05245ab124e9a61d5b8
 SHA512:
-  metadata.gz: 7263a1369fc11a5e3290a6106175615c5d7e845b9d79456e0103c0ff28fd3da43d787d8386e67eedb96bbd00fc5ab023e42fabbeabb6bbc0214db454cbbdce67
-  data.tar.gz: 9fd6c031d4dcbc89404174e25712feabb75e0b3d6c2a529784e15cbeee5f30c0c3561f46ce3e98c6b1abcd8a8ccb0d2b1ea699f117759f2ab359f1a96f075fbc
+  metadata.gz: ac996bcc2636195158354945aafbba70a619aa104537e2dfb7ec1a55b00bc572be9569926c0b7973fa56be4d6a38618ff93699f987525120c283cb546cb5d12a
+  data.tar.gz: 933701a08a1c20e521615a0dea7e4cab08787ce20efe4f33dbb383e704cbf3c37ac2bd652f64d0435521a70ec716b00d0a9f5b28bf46fdd0891c6e796553a00c

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 1.1.0 (2026-06-05)
+
+#### Features
+
+* [#404](https://github.com/ruby-grape/grape-entity/pull/404): Drop `MultiJson` dependency, use `Hash#to_json` for ActiveSupport-aware serialization - [@numbata](https://github.com/numbata).
+
+#### Fixes
+
+* [#406](https://github.com/ruby-grape/grape-entity/pull/406): Handle symbol-to-proc wrappers (`&:method_name`) where the method uses `delegate` or `method_missing`, and let unknown methods raise a native `NoMethodError` - [@marcrohloff](https://github.com/marcrohloff).
+
+
 ### 1.0.4 (2026-04-17)
 
 #### Fixes
@@ -5,6 +16,7 @@
 * [#405](https://github.com/ruby-grape/grape-entity/pull/405): Fix `Time` serialization regression by reverting #385 and restoring `MultiJson.dump` - [@numbata](https://github.com/numbata).
 * [#402](https://github.com/ruby-grape/grape-entity/pull/402): Remove `Json::ParseError` assignment - [@olivier-thatch](https://github.com/olivier-thatch).
 
+
 ### 1.0.3 (2026-04-15)
 
 #### Features

data/lib/grape_entity/entity.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'multi_json'
-
 module Grape
   # An Entity is a lightweight structure that allows you to easily
   # represent data from your application in a consistent and abstracted
@@ -293,7 +291,7 @@ module Grape
     end
 
     # This allows you to declare a Proc in which exposures can be formatted with.
-    # It take a block with an arity of 1 which is passed as the value of the exposed attribute.
+    # It takes a block with a single argument which is passed as the value of the exposed attribute.
     #
     # @param name [Symbol] the name of the formatter
     # @param block [Proc] the block that will interpret the exposed attribute
@@ -536,26 +534,53 @@ module Grape
     end
 
     def ensure_block_arity!(block)
-      # MRI currently always includes "( &:foo )" for symbol-to-proc wrappers.
-      # If this format changes in a new Ruby version, this logic must be updated.
-      origin_method_name = block.to_s.scan(/(?<=\(&:)[^)]+(?=\))/).first&.to_sym
-      return unless origin_method_name
-
-      unless object.respond_to?(origin_method_name, true)
-        raise ArgumentError, <<~MSG
-          Cannot use `&:#{origin_method_name}` because that method is not defined in the object.
-        MSG
-      end
+      # Strict anchor to match MRI Proc#to_s format for symbol-to-proc: #<Proc:0x0...(&:method_name) (lambda)>
+      match = block.to_s.match(/\A#<Proc:(?:0x)?\h+\(&:(?<name>.+)\) \(lambda\)>\z/)
+      return unless match # Unrecognized format -> bail safe rather than misidentify
+
+      origin_method_name = match[:name].to_sym
+      required_positional_arg_count, required_keyword_arg_count, variadic_positional =
+        arity_requirement_for(origin_method_name)
+      return unless required_positional_arg_count
 
-      arity = object.method(origin_method_name).arity
-      return if arity.zero?
+      required_arguments =
+        required_arguments_summary(required_positional_arg_count, required_keyword_arg_count, variadic_positional)
 
       raise ArgumentError, <<~MSG
-        Cannot use `&:#{origin_method_name}` because that method expects #{arity} argument#{'s' if arity != 1}.
-        Symbol‐to‐proc shorthand only works for zero‐argument methods.
+        Cannot use `&:#{origin_method_name}` because that method expects #{required_arguments}.
+        Symbol-to-proc shorthand only works for methods that can be called with no arguments.
       MSG
     end
 
+    def arity_requirement_for(method_name)
+      origin_method = object.method(method_name)
+      parameters = origin_method.parameters
+
+      required_positional_arg_count = parameters.count { |type, _| type == :req }
+      required_keyword_arg_count = parameters.count { |type, _| type == :keyreq }
+      return nil if required_positional_arg_count.zero? && required_keyword_arg_count.zero?
+
+      [required_positional_arg_count, required_keyword_arg_count, parameters.any? { |type, _| type == :rest }]
+    rescue NameError
+      # Delegation wrappers and method_missing proxies may not expose a Method; let Ruby raise natively at call time.
+      nil
+    end
+
+    def required_arguments_summary(required_positional_arg_count, required_keyword_arg_count, variadic_positional)
+      parts = []
+      unless required_positional_arg_count.zero?
+        suffix = required_positional_arg_count == 1 ? 'argument' : 'arguments'
+        suffix += ' or more' if variadic_positional
+        parts << "#{required_positional_arg_count} #{suffix}"
+      end
+      unless required_keyword_arg_count.zero?
+        suffix = required_keyword_arg_count == 1 ? 'keyword argument' : 'keyword arguments'
+        parts << "#{required_keyword_arg_count} #{suffix}"
+      end
+
+      parts.join(' and ')
+    end
+
     def symbol_to_proc_wrapper?(block)
       params = block.parameters
 
@@ -594,7 +619,7 @@ module Grape
 
     def to_json(options = {})
       options = options.to_h if options&.respond_to?(:to_h)
-      MultiJson.dump(serializable_hash(options))
+      serializable_hash(options).to_json
     end
 
     def to_xml(options = {})

data/lib/grape_entity/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrapeEntity
-  VERSION = '1.0.4'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-entity
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - LeFnord
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-17 00:00:00.000000000 Z
+date: 2026-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,20 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Extracted from Grape, A Ruby framework for rapid API development with
   great conventions.
 email:
@@ -83,9 +69,9 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby-grape/grape-entity
   bug_tracker_uri: https://github.com/ruby-grape/grape-entity/issues
-  changelog_uri: https://github.com/ruby-grape/grape-entity/blob/v1.0.4/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/grape-entity/1.0.4
-  source_code_uri: https://github.com/ruby-grape/grape-entity/tree/v1.0.4
+  changelog_uri: https://github.com/ruby-grape/grape-entity/blob/v1.1.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/grape-entity/1.1.0
+  source_code_uri: https://github.com/ruby-grape/grape-entity/tree/v1.1.0
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []