grape-entity 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0f0e5dbd15616782e392614348386ade34ec6c0a2ab27c75603fc654adf068e
-  data.tar.gz: d412d26ef311e83c489aacbc84d6e8f7caabcae3c0d43dc22120d135d184aa00
+  metadata.gz: 629fcce5dd878171471587ff40412484bdf2dad7207260e640178cad5de5906d
+  data.tar.gz: 6ffde278282ef2538348ebbb64e2f81ec212c5afb049b05245ab124e9a61d5b8
 SHA512:
-  metadata.gz: fd34cb1b90bb0353ea4097cab79027cb77cdb9c44dd2ad3fa73595d01e29395e94233165ad6d049380e0200aef3bec792ea5f22ecb3bb94ecf4e72e9a22fcc45
-  data.tar.gz: afa32b651692da1cc7dc604181360166f3799ae66b17901d93c5ba90b17f98b5d038ec2c4cd08f62a83e5d548c9cce18f5664518c2170f4dc31307d48339146e
+  metadata.gz: ac996bcc2636195158354945aafbba70a619aa104537e2dfb7ec1a55b00bc572be9569926c0b7973fa56be4d6a38618ff93699f987525120c283cb546cb5d12a
+  data.tar.gz: 933701a08a1c20e521615a0dea7e4cab08787ce20efe4f33dbb383e704cbf3c37ac2bd652f64d0435521a70ec716b00d0a9f5b28bf46fdd0891c6e796553a00c

data/CHANGELOG.md

@@ -1,27 +1,58 @@
-### Next
+### 1.1.0 (2026-06-05)
 
 #### Features
 
-* Your contribution here.
+* [#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
 
-* Your contribution here.
+* [#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.1 (2024-04-10)
+### 1.0.4 (2026-04-17)
+
+#### Fixes
+
+* [#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
+
+* [#400](https://github.com/ruby-grape/grape-entity/pull/400): Switch to danger-pr-comment for PR checks - [@numbata](https://github.com/numbata).
+* [#397](https://github.com/ruby-grape/grape-entity/pull/397): Reduce gem size by excluding test files - [@yuri-zubov](https://github.com/yuri-zubov).
+* [#401](https://github.com/ruby-grape/grape-entity/pull/401): Modernize gemspec: add metadata, use Dir glob, require MFA - [@numbata](https://github.com/numbata).
+
+#### Fixes
+
+* [#399](https://github.com/ruby-grape/grape-entity/pull/399): Fix `ArgumentError` for single-argument lambdas in `expose` blocks and `if:` conditions - [@numbata](https://github.com/numbata).
+
+
+### 1.0.2 (2026-04-13)
+
+#### Fixes
+
+* [#394](https://github.com/ruby-grape/grape-entity/pull/394): Add `Entity.[]` for Grape >= 3.2 param type compatibility - [@numbata](https://github.com/numbata).
+* [#388](https://github.com/ruby-grape/grape-entity/pull/388): Drop ruby-head from test matrix - [@numbata](https://github.com/numbata).
+* [#389](https://github.com/ruby-grape/grape-entity/pull/389): Block arity detection (breaking change) - [@numbata](https://github.com/numbata).
+* [#385](https://github.com/ruby-grape/grape-entity/pull/385): Drop multijson dependency - [@ericproulx](https://github.com/ericproulx).
+* [#384](https://github.com/ruby-grape/grape-entity/pull/384): Fix `inspect` to correctly handle `nil` values - [@fcce](https://github.com/fcce).
+
+
+### 1.0.1 (2024-04-10)
 
 #### Fixes
 
 * [#381](https://github.com/ruby-grape/grape-entity/pull/381): Fix `expose_nil: false` when using a block - [@magni-](https://github.com/magni-).
 
 
-### ### 1.0.0 (2023-02-16)
+### 1.0.0 (2023-02-16)
 
 #### Fixes
 
-**Breaking change:**
-* [#352](https://github.com/ruby-grape/grape-entity/pull/369): Remove `FetchableObject` behavior. - [@danielvdao](https://github.com/danielvdao).
+* [#369](https://github.com/ruby-grape/grape-entity/pull/369): Remove `FetchableObject` behavior (breaking change) - [@danielvdao](https://github.com/danielvdao).
 * [#371](https://github.com/ruby-grape/grape-entity/pull/371): Allow default exposed value to be `false` or any empty data - [@norydev](https://github.com/norydev).
 
 
@@ -29,8 +60,8 @@
 
 #### Fixes
 
-* [#366](https://github.com/ruby-grape/grape-entity/pull/366): Don't suppress regular ArgumentError exceptions - [splattael](https://github.com/splattael).
-* [#363](https://github.com/ruby-grape/grape-entity/pull/338): Fix typo - [@OuYangJinTing](https://github.com/OuYangJinTing).
+* [#366](https://github.com/ruby-grape/grape-entity/pull/366): Don't suppress regular ArgumentError exceptions - [@splattael](https://github.com/splattael).
+* [#363](https://github.com/ruby-grape/grape-entity/pull/363): Fix typo - [@OuYangJinTing](https://github.com/OuYangJinTing).
 * [#361](https://github.com/ruby-grape/grape-entity/pull/361): Require 'active_support/core_ext' - [@pravi](https://github.com/pravi).
 
 

data/README.md

@@ -33,6 +33,7 @@
     - [Using Entities](#using-entities)
     - [Entity Organization](#entity-organization)
     - [Caveats](#caveats)
+    - [Preloading Associations](#preloading-associations)
   - [Installation](#installation)
   - [Testing with Entities](#testing-with-entities)
   - [Project Resources](#project-resources)
@@ -674,6 +675,10 @@ end
 
 Also note that an `ArgumentError` is raised when unknown options are passed to either `expose` or `with_options`.
 
+### Preloading Associations
+
+Use [Grape::Entity::Preloader](https://github.com/OuYangJinTing/grape-entity-preloader) to preload associations and callbacks and avoid N+1 operations.
+
 ## Installation
 
 Add this line to your application's Gemfile:

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
@@ -129,6 +127,12 @@ module Grape
       def delegation_opts
         @delegation_opts ||= { hash_access: hash_access }
       end
+
+      # Satisfies the respond_to?(:[]) check in Grape::DryTypes (>= 3.2)
+      # so Entity subclasses can be used as param types.
+      def [](val)
+        val
+      end
     end
 
     @formatters = {}
@@ -287,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
@@ -472,8 +476,13 @@ module Grape
 
     # Prevent default serialization of :options or :delegator.
     def inspect
-      fields = serializable_hash.map { |k, v| "#{k}=#{v}" }
-      "#<#{self.class.name}:#{object_id} #{fields.join(' ')}>"
+      object = serializable_hash
+      if object.nil?
+        "#<#{self.class.name}:#{object_id} nil>"
+      else
+        fields = object.map { |k, v| "#{k}=#{v}" }
+        "#<#{self.class.name}:#{object_id} #{fields.join(' ')}>"
+      end
     end
 
     def initialize(object, options = {})
@@ -514,19 +523,71 @@ module Grape
     end
 
     def exec_with_object(options, &block)
-      if block.parameters.count == 1
+      if symbol_to_proc_wrapper?(block)
+        ensure_block_arity!(block)
+        instance_exec(object, &block)
+      elsif block.arity == 1
         instance_exec(object, &block)
       else
         instance_exec(object, options, &block)
       end
-    rescue StandardError => e
-      # it handles: https://github.com/ruby/ruby/blob/v3_0_0_preview1/NEWS.md#language-changes point 3, Proc
-      # accounting for expose :foo, &:bar
-      if e.is_a?(ArgumentError) && block.parameters == [[:req], [:rest]]
-        raise Grape::Entity::Deprecated.new e.message, 'in ruby 3.0'
+    end
+
+    def ensure_block_arity!(block)
+      # 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
+
+      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 #{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
 
-      raise e
+      parts.join(' and ')
+    end
+
+    def symbol_to_proc_wrapper?(block)
+      params = block.parameters
+
+      return false unless block.lambda? && block.source_location.nil?
+      return false unless params.size >= 2
+
+      params[0].first == :req && params[1].first == :rest
     end
 
     def exec_with_attribute(attribute, &block)
@@ -558,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.1'
+  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.1
+  version: 1.1.0
 platform: ruby
 authors:
 - LeFnord
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-10 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.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.2
 description: Extracted from Grape, A Ruby framework for rapid API development with
   great conventions.
 email:
@@ -48,26 +34,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".github/dependabot.yml"
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".yardopts"
 - CHANGELOG.md
-- CONTRIBUTING.md
-- Dangerfile
-- Gemfile
-- Guardfile
 - LICENSE
 - README.md
-- RELEASING.md
-- Rakefile
-- UPGRADING.md
-- bench/serializing.rb
-- grape-entity.gemspec
 - lib/grape-entity.rb
 - lib/grape_entity.rb
 - lib/grape_entity/condition.rb
@@ -94,17 +63,16 @@ files:
 - lib/grape_entity/exposure/represent_exposure.rb
 - lib/grape_entity/options.rb
 - lib/grape_entity/version.rb
-- spec/grape_entity/entity_spec.rb
-- spec/grape_entity/exposure/nesting_exposure/nested_exposures_spec.rb
-- spec/grape_entity/exposure/represent_exposure_spec.rb
-- spec/grape_entity/exposure_spec.rb
-- spec/grape_entity/hash_spec.rb
-- spec/grape_entity/options_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/ruby-grape/grape-entity
 licenses:
 - MIT
-metadata: {}
+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.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: []
 require_paths:
@@ -120,15 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A simple facade for managing the relationship between your model and API.
-test_files:
-- spec/grape_entity/entity_spec.rb
-- spec/grape_entity/exposure/nesting_exposure/nested_exposures_spec.rb
-- spec/grape_entity/exposure/represent_exposure_spec.rb
-- spec/grape_entity/exposure_spec.rb
-- spec/grape_entity/hash_spec.rb
-- spec/grape_entity/options_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci

data/.github/dependabot.yml

@@ -1,20 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "bundler" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "weekly"
-      day: "friday"
-    assignees:
-      - "LeFnord"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: weekly
-    assignees:
-     - "LeFnord"

data/.github/workflows/ci.yml

@@ -1,41 +0,0 @@
-name: Ruby
-
-on:
-  push:
-    branches:
-      - '*'
-  pull_request:
-    branches:
-      - '*'
-
-permissions:
-  contents: read
-
-jobs:
-  rubocop:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.0'
-          bundler-cache: true
-      - name: Run rubocop
-        run: bundle exec rubocop --parallel --format progress
-
-  rspec:
-    runs-on: ubuntu-latest
-    needs: ['rubocop']
-    strategy:
-      matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3', 'head']
-    steps:
-    - name: Check out branch
-      uses: actions/checkout@v4
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true
-    - name: Run rspec rest of the suite
-      run: bundle exec rspec

data/.gitignore

@@ -1,43 +0,0 @@
-## MAC OS
-.DS_Store
-.com.apple.timemachine.supported
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## REDCAR
-.redcar
-
-## VIM
-*.swp
-*.swo
-
-## RUBYMINE
-.idea
-
-## PROJECT::GENERAL
-coverage
-doc
-pkg
-.rvmrc
-.bundle
-.yardoc/*
-dist
-Gemfile.lock
-tmp
-coverage/
-.byebug_history
-.ruby-version
-.ruby-gemset
-
-## Rubinius
-.rbx
-
-## PROJECT::SPECIFIC
-.project

data/.rspec

@@ -1,3 +0,0 @@
---color
---profile
---format documentation

data/.rubocop.yml

@@ -1,89 +0,0 @@
-inherit_from: .rubocop_todo.yml
-
-AllCops:
-  Exclude:
-    - vendor/**/*
-    - example/**/*
-  NewCops: enable
-  TargetRubyVersion: 3.0
-  SuggestExtensions: false
-
-#  Layout stuff
-#
-Layout/EmptyLinesAroundArguments:
-  Enabled: false
-
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-
-Layout/FirstHashElementIndentation:
-  EnforcedStyle: consistent
-
-Layout/LineLength:
-  Max: 120
-  Exclude:
-    - spec/**/*
-
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-
-#  Lint stuff
-#
-Lint/ConstantDefinitionInBlock:
-  Enabled: true
-  Exclude:
-    - spec/**/*
-
-#  Metrics stuff
-#
-Metrics/AbcSize:
-  Max: 25
-  AllowedMethods:
-    # from lib/grape_entity/exposure/nesting_exposure.rb
-    - 'normalized_exposures'
-
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*
-
-Metrics/CyclomaticComplexity:
-  Max: 13
-
-Metrics/ClassLength:
-  Max: 300
-
-Metrics/MethodLength:
-  Max: 26
-  Exclude:
-    - spec/**/*
-
-Metrics/PerceivedComplexity:
-  Max: 11
-  AllowedMethods:
-    # from lib/grape_entity/entity.rb
-    - 'expose'
-    - 'merge_options'
-    # from lib/grape_entity/exposure/nesting_exposure.rb
-    - 'normalized_exposures'
-
-#  Naming stuff
-#
-
-Naming:
-  Enabled: false
-
-#  Style stuff
-#
-Style/Documentation:
-  Enabled: false
-
-Style/HashSyntax:
-  Enabled: false
-
-Style/OptionalBooleanParameter:
-  AllowedMethods:
-    # from lib/grape_entity/condition/base.rb
-    - 'initialize'
-    # form lib/grape_entity/entity.rb
-    - 'entity_class'
-    - 'present_collection'

data/.rubocop_todo.yml

@@ -1,50 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2022-07-26 21:29:59 UTC using RuboCop version 1.32.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Include.
-# Include: **/*.gemspec
-Gemspec/DeprecatedAttributeAssignment:
-  Exclude:
-    - 'grape-entity.gemspec'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Include.
-# Include: **/*.gemspec
-Gemspec/RequireMFA:
-  Exclude:
-    - 'grape-entity.gemspec'
-
-# Offense count: 1
-# Configuration parameters: Include.
-# Include: **/*.gemspec
-Gemspec/RequiredRubyVersion:
-  Exclude:
-    - 'grape-entity.gemspec'
-
-# Offense count: 6
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Lint/BooleanSymbol:
-  Exclude:
-    - 'spec/grape_entity/exposure_spec.rb'
-
-# Offense count: 15
-Style/OpenStructUse:
-  Exclude:
-    - 'lib/grape_entity/delegator.rb'
-    - 'spec/grape_entity/entity_spec.rb'
-
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowMethodsWithArguments, IgnoredMethods, AllowComments.
-# IgnoredMethods: respond_to, define_method
-Style/SymbolProc:
-  Exclude:
-    - 'spec/grape_entity/entity_spec.rb'

data/.yardopts

@@ -1,2 +0,0 @@
---markup-provider=redcarpet
---markup=markdown