Merge branch 'main' into keyword-field-options

Author: tylerhunt

.github/workflows/auto-assign-author.yaml

@@ -6,6 +6,6 @@ jobs:
   assign-author:
     runs-on: ubuntu-latest
     steps:
-      - uses: toshimaru/auto-author-assign@16f0022cf3d7970c106d8d1105f75a1165edb516 # v2.1.1
+      - uses: toshimaru/auto-author-assign@4d585cc37690897bd9015942ed6e766aa7cdb97f # v3.0.1
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/codeql.yaml

@@ -22,14 +22,14 @@ jobs:
         language: ['ruby']
     steps:
       - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v3
+        uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v3
         with:
           languages: ${{ matrix.language }}
       - name: Autobuild
-        uses: github/codeql-action/autobuild@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v3
+        uses: github/codeql-action/autobuild@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v3
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v3
+        uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v3
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/release.yaml

@@ -12,20 +12,20 @@ jobs:
     outputs:
       changed: ${{ steps.check.outputs.any_changed }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
       - name: Check if version has been updated
         id: check
-        uses: tj-actions/changed-files@70069877f29101175ed2b055d210fe8b1d54d7d7 # v44
+        uses: tj-actions/changed-files@3c4bc6fa0ca4718d438e0a4bd3ea81fbb0e6e2be # v44
         with:
           files: lib/blueprinter/version.rb
   release:
     runs-on: ubuntu-latest
     needs: version-check
     if: ${{ github.event_name == 'workflow_dispatch' || needs.version-check.outputs.changed == 'true' }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
       - name: Set up Ruby
-        uses: ruby/setup-ruby@d697be2f83c6234b20877c3b5eac7a7f342f0d0c # v1
+        uses: ruby/setup-ruby@675dd7ba1b06c8786a1480d89c384f5620a42647 # v1
         with:
           ruby-version: 3.2
           bundler-cache: true

.github/workflows/test.yaml

@@ -14,9 +14,9 @@ jobs:
         ruby: ['3.1', '3.2', '3.3']
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
       - name: Set up Ruby ${{ matrix.ruby }}
-        uses: ruby/setup-ruby@d697be2f83c6234b20877c3b5eac7a7f342f0d0c # v1
+        uses: ruby/setup-ruby@675dd7ba1b06c8786a1480d89c384f5620a42647 # v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true

lib/blueprinter/extractors/block_extractor.rb

@@ -6,7 +6,31 @@ module Blueprinter
   # @api private
   class BlockExtractor < Extractor
     def extract(_field_name, object, local_options, options = {})
-      options[:block].call(object, **local_options)
+      block = options[:block]
+
+      # Symbol#to_proc creates procs with signature [[:req], [:rest]]
+      # These procs forward ALL arguments to the method, which causes
+      # issues when we call block.call(object, local_options) because
+      # it becomes object.method_name(local_options), and most methods
+      # don't accept extra arguments.
+      #
+      # For Symbol#to_proc, we only pass the object.
+      # For regular blocks, we pass both object and local_options.
+      if symbol_to_proc?(block)
+        block.call(object)
+      else
+        block.call(object, **local_options)
+      end
+    end
+
+    private
+
+    def symbol_to_proc?(block)
+      # Symbol#to_proc has a characteristic signature:
+      # - Parameters: [[:req], [:rest]] (one required + rest args)
+      # - This is different from regular blocks which typically have
+      #   optional parameters like [[:opt, :obj], [:opt, :options]]
+      block.parameters == [[:req], [:rest]]
     end
   end
 end

spec/integrations/base_spec.rb

@@ -55,6 +55,63 @@
       end
     end
 
+    context 'when using Symbol#to_proc syntax' do
+      let(:obj) { object_with_attributes }
+
+      context 'with field using &:method_name' do
+        let(:blueprint) do
+          Class.new(Blueprinter::Base) do
+            identifier :id
+            field :name, &:first_name
+            field :job_position, &:position
+          end
+        end
+
+        it 'renders the field by calling the method on the object' do
+          result = JSON.parse(blueprint.render(obj))
+          expect(result['id']).to eq(1)
+          expect(result['name']).to eq('Meg')
+          expect(result['job_position']).to eq('Manager')
+        end
+      end
+
+      context 'with identifier using &:method_name' do
+        let(:blueprint) do
+          Class.new(Blueprinter::Base) do
+            identifier :user_id, &:id
+            field :first_name
+          end
+        end
+
+        it 'renders the identifier using Symbol#to_proc' do
+          expect(blueprint.render(obj)).to eq('{"user_id":1,"first_name":"Meg"}')
+        end
+      end
+
+      context 'when mixing Symbol#to_proc and regular blocks' do
+        let(:blueprint) do
+          Class.new(Blueprinter::Base) do
+            identifier :id
+            field :name, &:first_name
+            field :full_name do |obj|
+              "#{obj.first_name} #{obj.last_name}"
+            end
+            field :info do |obj, options|
+              "#{obj.position} (options: #{options.inspect})"
+            end
+          end
+        end
+
+        it 'handles both block types correctly' do
+          result = JSON.parse(blueprint.render(obj))
+          expect(result['id']).to eq(1)
+          expect(result['name']).to eq('Meg')
+          expect(result['full_name']).to eq('Meg Ryan')
+          expect(result['info']).to include('Manager')
+        end
+      end
+    end
+
     context 'Outside Rails project' do
       context 'Given passed object has dot notation accessible attributes' do
         let(:obj) { object_with_attributes }