alba 3.7.2 → 3.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9bfe7db8f59dd13c0e93f69e1145d9d4fd6fd399b3ac03af5f3aaa4cab967e4
-  data.tar.gz: f71ed1a8fc48d3f11db60cb08f1b3d38714732f5082092240485432a0f255c22
+  metadata.gz: 19dd24ca7012ad65ea2c69fbd5f7fe9e0fe8931ac2a04320a74292d9d033943d
+  data.tar.gz: 95595afe6847cbaa2dde39d5d287d5d6ce82ec28182a3c12153d437dd140147e
 SHA512:
-  metadata.gz: bf4d087dfde7c29caa9ffd7316c7bf1e877c5dc84e89495cf50e68bfd4956daa86e60d57f8bd63dea27d4ad1216f29eea572e5ed6b2d388ace3bcf4f79264968
-  data.tar.gz: 31826991dc9ce74b265bd450de0991e9c93c7903df30da3d1d6542c3f3a931b54abfa74e78c75d59d39fa97a0bef083d070c40b9b8157f28cefaa6bd24e7a3da
+  metadata.gz: a0ff2aa000c80343b9bd02d0cbbe8789477aa4adf1a357fac87600c0b7821f992eec1986848ce97b81c678bb5e4ecbadfa50a076eb0a015caa9fbf7a814492db
+  data.tar.gz: 676be0a714bf6b5325b0e6412fcce1abac2f1d517b48dde00bdc4d8ca4ce5fa10838d735cede7f893dee8291001ef8331841160a7374a02da267d87859066ff6

data/CHANGELOG.md

@@ -6,6 +6,20 @@ 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
+
+- Enable to apply traits for associations [Issue #444](https://github.com/okuramasafumi/alba/issues/444)
+  - Thank you for reporting, @rainerborene
+
 ## [3.7.2] 2025-06-08
 
 ### 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/association.rb

@@ -16,15 +16,17 @@ module Alba
     # @param condition [Proc, nil] a proc filtering data
     # @param resource [Class<Alba::Resource>, Proc, String, Symbol, nil]
     #   a resource class for the association, a proc returning a resource class or a name of the resource
+    # @param with_traits [Symbol, Array<Symbol>, nil] specified traits
     # @param params [Hash] params override for the association
     # @param nesting [String] a namespace where source class is inferred with
     # @param key_transformation [Symbol] key transformation type
     # @param helper [Module] helper module to include
     # @param block [Block] used to define resource when resource arg is absent
-    def initialize(name:, condition: nil, resource: nil, params: {}, nesting: nil, key_transformation: :none, helper: nil, &block)
+    def initialize(name:, condition: nil, resource: nil, with_traits: nil, params: {}, nesting: nil, key_transformation: :none, helper: nil, &block)
       @name = name
       @condition = condition
       @resource = resource
+      @with_traits = with_traits
       @params = params
       return if @resource
 
@@ -53,7 +55,7 @@ module Alba
       if @resource.is_a?(Proc)
         return to_h_with_each_resource(object, within, params) if object.is_a?(Enumerable)
 
-        @resource.call(object).new(object, within: within, params: params).to_h
+        @resource.call(object).new(object, within: within, params: params, with_traits: @with_traits).to_h
       else
         to_h_with_constantize_resource(object, within, params)
       end
@@ -100,13 +102,13 @@ module Alba
 
     def to_h_with_each_resource(object, within, params)
       object.map do |item|
-        @resource.call(item).new(item, within: within, params: params).to_h
+        @resource.call(item).new(item, within: within, params: params, with_traits: @with_traits).to_h
       end
     end
 
     def to_h_with_constantize_resource(object, within, params)
       @resource = constantize(@resource)
-      @resource.new(object, params: params, within: within).to_h
+      @resource.new(object, params: params, within: within, with_traits: @with_traits).to_h
     end
   end
 end

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'
@@ -433,17 +430,20 @@ module Alba
       # @param resource [Class<Alba::Resource>, String, Proc, nil] representing resource for this association
       # @param serializer [Class<Alba::Resource>, String, Proc, nil] alias for `resource`
       # @param key [String, Symbol, nil] used as key when given
+      # @param with_traits [Symbol, Array<Symbol>, nil] specified traits
       # @param params [Hash] params override for the association
       # @param options [Hash<Symbol, Proc>]
       # @option options [Proc] if a condition to decide if this association should be serialized
       # @param block [Block]
       # @return [void]
       # @see Alba::Association#initialize
-      def association(name, condition = nil, resource: nil, serializer: nil, key: nil, params: {}, **options, &block)
+      def association(name, condition = nil, resource: nil, serializer: nil, key: nil, with_traits: nil, params: {}, **options, &block)
         resource ||= serializer
         transformation = @_key_transformation_cascade ? @_transform_type : :none
         assoc = Association.new(
-          name: name, condition: condition, resource: resource, params: params, nesting: nesting, key_transformation: transformation, helper: @_helper, &block
+          name: name, condition: condition, resource: resource, with_traits: with_traits,
+          params: params, nesting: nesting, key_transformation: transformation, helper: @_helper,
+          &block
         )
         @_attributes[key&.to_sym || name.to_sym] = options[:if] ? ConditionalAttribute.new(body: assoc, condition: options[:if]) : assoc
       end

data/lib/alba/version.rb

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

metadata

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