alba 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14523f0f31f5993205b02095c3e6a8115ef83728961cf720dde4d9599be3168a
-  data.tar.gz: 9a2de9344c9b7bf95daa07e0d61339a08285f0cdadf9b694b58f73e7b0773970
+  metadata.gz: 9179eabfb7cd37ad4403470b3c83229f7dc558085d8946d84302473f8076694c
+  data.tar.gz: cb7092762e4881c13171447cc2dc4a6ec2ceb077bd6527a154d5dac6d3369967
 SHA512:
-  metadata.gz: e7f8062cca1bbccbe4d4e871fd5ad2ab42a5b25acc0d2b9edd3e8247af021edaca981988eeb8428675c8bdc8bcbc14fa5ee45d90d524ca76987ab469fc2a6203
-  data.tar.gz: ea0cd1598c2ef8f76e740309ff925b8c26ef60bef6174755b23549d3fd9a98aefeab26bb6d47b73c92c9b92d84125717b157369f25ba2d3631532bec522a9765
+  metadata.gz: 8baf63e1b739731f221c6a76bb452d730c703fe848853f26f91219357001832599196902e98f2266fa04631873e3bd791dca46c7898c3f16fc2909acf1a74a10
+  data.tar.gz: '0872f1ca1d1a263f8d7dff94ed1e965d88e9ec423213d0b631c3bf155ddaabc5905da4d3b74344950ede8a238761777100abb42749e378beba55f3796cf85dda'

data/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.7.1] 2025-05-27
+
+### Fixed
+
+- `select` now works with `trait` and `nested_attribute` [#436](https://github.com/okuramasafumi/alba/pull/436)
+
 ## [3.7.0] 2025-05-08
 
 ### Added

data/lib/alba/association.rb

@@ -47,8 +47,7 @@ module Alba
     # @return [Hash]
     def to_h(target, within: nil, params: {})
       params = params.merge(@params)
-      object = target.is_a?(Hash) ? target.fetch(@name) : target.__send__(@name)
-      object = @condition.call(object, params, target) if @condition
+      object = object_from(target, params)
       return if object.nil?
 
       if @resource.is_a?(Proc)
@@ -62,6 +61,12 @@ module Alba
 
     private
 
+    def object_from(target, params)
+      o = target.is_a?(Hash) ? target.fetch(@name) : target.__send__(@name)
+      o = @condition.call(o, params, target) if @condition
+      o
+    end
+
     def constantize(resource)
       case resource
       when Class

data/lib/alba/nested_attribute.rb

@@ -17,12 +17,13 @@ module Alba
     # @param object [Object] the object being serialized
     # @param params [Hash] params Hash inherited from Resource
     # @param within [Object, nil, false, true] determines what associations to be serialized. If not set, it serializes all associations.
+    # @param select [Method] select method object from its origin
     # @return [Hash] hash serialized from running the class body in the object
-    def value(object:, params:, within:)
+    def value(object:, params:, within:, select: nil)
       resource_class = Alba.resource_class
       resource_class.transform_keys(@key_transformation)
       resource_class.class_eval(&@block)
-      resource_class.new(object, params: params, within: within).serializable_hash
+      resource_class.new(object, params: params, within: within, select: select).serializable_hash
     end
   end
 end

data/lib/alba/resource.rb

@@ -47,11 +47,15 @@ module Alba
       # @param params [Hash] user-given Hash for arbitrary data
       # @param within [Object, nil, false, true] determines what associations to be serialized. If not set, it serializes all associations.
       # @param with_traits [Symbol, Array<Symbol>, nil] specified traits
-      def initialize(object, params: {}, within: WITHIN_DEFAULT, with_traits: nil)
+      # @param select [Method] select method object used with `nested_attribute` and `trait`
+      def initialize(object, params: {}, within: WITHIN_DEFAULT, with_traits: nil, select: nil)
         @object = object
         @params = params
         @within = within
         @with_traits = with_traits
+        # select override to share the same method with `trait` and `nested_attribute`
+        # Trait and NestedAttribute generates anonymous class so it checks if it's anonymous class to prevent accidental overriding
+        self.class.define_method(:select, &select) if select && self.class.name.nil?
         _setup
       end
 
@@ -117,7 +121,7 @@ module Alba
 
           resource_class = Alba.resource_class
           resource_class.class_eval(&body)
-          h.merge!(resource_class.new(obj, params: params, within: @within).serializable_hash)
+          h.merge!(resource_class.new(obj, params: params, within: @within, select: method(:select)).serializable_hash)
         end
         h
       end
@@ -249,16 +253,18 @@ module Alba
         key = transform_key(key)
         value = fetch_attribute(obj, key, attribute)
         # When `select` is not overridden, skip calling it for better performance
-        unless @_select_arity.nil?
-          # `select` can be overridden with both 2 and 3 parameters
-          # Here we check the arity and build arguments accordingly
-          args = @_select_arity == 3 ? [key, value, attribute] : [key, value]
-          return unless select(*args)
-        end
+        return if !@_select_arity.nil? && !do_select(key, value, attribute)
 
         hash[key] = value unless Alba::REMOVE_KEY == value # rubocop:disable Style/YodaCondition
       end
 
+      def do_select(key, value, attribute)
+        # `select` can be overridden with both 2 and 3 parameters
+        # Here we check the arity and build arguments accordingly
+        args = @_select_arity == 3 ? [key, value, attribute] : [key, value]
+        select(*args)
+      end
+
       def handle_error(error, obj, key, attribute, hash)
         case (on_error = @_on_error || :raise)
         when :raise, nil then raise(error)
@@ -286,7 +292,7 @@ module Alba
                 when Proc then instance_exec(obj, &attribute)
                 when Alba::Association then yield_if_within(attribute.name.to_sym) { |within| attribute.to_h(obj, params: params, within: within) }
                 when TypedAttribute then attribute.value { |attr| fetch_attribute(obj, key, attr) }
-                when NestedAttribute then attribute.value(object: obj, params: params, within: @within)
+                when NestedAttribute then attribute.value(object: obj, params: params, within: @within, select: method(:select))
                 when ConditionalAttribute then attribute.with_passing_condition(resource: self, object: obj) { |attr| fetch_attribute(obj, key, attr) }
                   # :nocov:
                 else raise ::Alba::Error, "Unsupported type of attribute: #{attribute.class}"

data/lib/alba/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Alba
-  VERSION = '3.7.0'
+  VERSION = '3.7.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: alba
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - OKURA Masafumi
 bindir: exe
 cert_chain: []
-date: 2025-05-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Alba is the fastest JSON serializer for Ruby. It focuses on performance,
   flexibility and usability.