alba 3.7.3 → 3.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c80fd2a93a15e978c608d4eb9fbe3abaab0f724674d84a3a177134df4664aa3e
-  data.tar.gz: 56b10e5d327f0dbffb3c9d1e82da6a97d318161e22e975c605784e03e184648f
+  metadata.gz: 19dd24ca7012ad65ea2c69fbd5f7fe9e0fe8931ac2a04320a74292d9d033943d
+  data.tar.gz: 95595afe6847cbaa2dde39d5d287d5d6ce82ec28182a3c12153d437dd140147e
 SHA512:
-  metadata.gz: 2f53bf99dd9170696fc1b5860661b76cb6b2a3ca3803a6ddcced7e4c34ff38fe3d88fd3c6ac7f7b4cd2f6524d53fc6195039d6d6209bfcef770aabfe59d13ea0
-  data.tar.gz: fb028b2759d7892711baca807889a14d8bb11084d3d9fec2f3b6efd6e0cd199ee42f7ceb814e805fcf3ae9a4dccacedb3c6f810b951b500aaff24eb13bff5bbc
+  metadata.gz: a0ff2aa000c80343b9bd02d0cbbe8789477aa4adf1a357fac87600c0b7821f992eec1986848ce97b81c678bb5e4ecbadfa50a076eb0a015caa9fbf7a814492db
+  data.tar.gz: 676be0a714bf6b5325b0e6412fcce1abac2f1d517b48dde00bdc4d8ca4ce5fa10838d735cede7f893dee8291001ef8331841160a7374a02da267d87859066ff6

data/CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## 3.7.4 2025-07-24
+
+### Fixed
+
+- Fix trait instance method access [#452](https://github.com/okuramasafumi/alba/pull/452)
+  - Thank you, @ether-moon
+
 ## [3.7.3] 2025-06-28
 
 ### Fixed

data/README.md

@@ -432,6 +432,8 @@ UserResource.new(user).serialize
 # => '{"id":1,"articles":[{"title":"Hello World!"},{"title":"Super nice"}]}'
 ```
 
+#### Inline associations
+
 You can define associations inline if you don't need a class for association.
 
 ```ruby
@@ -461,6 +463,8 @@ class AnotherUserResource
 end
 ```
 
+#### Filtering associations
+
 You can "filter" association using second proc argument. This proc takes association object, `params` and initial object.
 
 This feature is useful when you want to modify association, such as adding `includes` or `order` to ActiveRecord relations.
@@ -519,6 +523,8 @@ UserResource.new(user, params: {filter: :even?}).serialize
 # => '{"id":1,"articles":[{"title":"Super nice"}]}'
 ```
 
+#### Changing a key
+
 You can change a key for association with `key` option.
 
 ```ruby
@@ -535,6 +541,8 @@ UserResource.new(user).serialize
 # => '{"id":1,"my_articles":[{"title":"Hello World!"}]}'
 ```
 
+#### Determining a resource for the association
+
 You can omit the resource option if you enable Alba's [inference](#inference-configuration) feature.
 
 ```ruby

data/lib/alba/conditional_attribute.rb

@@ -23,7 +23,7 @@ module Alba
       return Alba::REMOVE_KEY unless condition_passes?(resource, object)
 
       fetched_attribute = yield(@body)
-      return fetched_attribute unless with_two_arity_proc_condition
+      return fetched_attribute unless with_two_arity_proc_condition?
 
       return Alba::REMOVE_KEY unless resource.instance_exec(object, second_object(object), &@condition)
 
@@ -46,7 +46,7 @@ module Alba
       end
     end
 
-    def with_two_arity_proc_condition
+    def with_two_arity_proc_condition?
       @condition.is_a?(Proc) && @condition.arity >= 2
     end
 

data/lib/alba/resource.rb

@@ -113,18 +113,15 @@ module Alba
       private
 
       def hash_from_traits(obj)
-        h = {}
-        return h if @with_traits.nil?
+        return {} if @with_traits.nil?
 
-        Array(@with_traits).each do |trait|
+        Array(@with_traits).each_with_object({}) do |trait, hash|
           body = @_traits.fetch(trait) { raise Alba::Error, "Trait not found: #{trait}" }
-
-          resource_class = Alba.resource_class
+          resource_class = Class.new(self.class)
           resource_class.class_eval(&body)
           resource_class.transform_keys(@_transform_type) unless @_transform_type == :none
-          h.merge!(resource_class.new(obj, params: params, within: @within, select: method(:select)).serializable_hash)
+          hash.merge!(resource_class.new(obj, params: params, within: @within, select: method(:select)).serializable_hash)
         end
-        h
       end
 
       def deprecated_serializable_hash
@@ -273,7 +270,7 @@ module Alba
         when :ignore then nil
         when Proc
           key, value = on_error.call(error, obj, key, attribute, self.class)
-          hash[key] = value
+          hash[key] = value unless Alba::REMOVE_KEY == key # rubocop:disable Style/YodaCondition
         else
           # :nocov:
           raise Alba::Error, 'Impossible path'

data/lib/alba/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alba
 version: !ruby/object:Gem::Version
-  version: 3.7.3
+  version: 3.7.4
 platform: ruby
 authors:
 - OKURA Masafumi