alba 3.3.1 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38b89f99bfe18cf66179ed46c6fdcb5cb25f3d34b8f709fcb9c9de634f7a129b
-  data.tar.gz: b117d86ab11bb7a0b1abe8e2089ae869c8864fd37b066ea544d0ac51ad5082db
+  metadata.gz: d3168959e9726c35e28faf0f027dd78010b4b0cf5ead0564b8fa8a7f32e5bf84
+  data.tar.gz: b9cab46abe11f69ef40ef15d3cc673a279a6f1ab12ab8a8b908250a8462f65e8
 SHA512:
-  metadata.gz: b62b63a9a7a4b1d85ba180941752a49d4bec97529794f328092b0bb7bc325daa683f5392a703d277f2c4e0b66e6af13b956706ecef6bfc729695aeff0c43e4d0
-  data.tar.gz: 3336d2097e5e4c78b690c6b3c178fdcef2db47271e1b929c1aeb246fb832632b69c26923abaf5e5e8df1e165d62495da85adce3e66aa8c404b103e65b1a82df1
+  metadata.gz: 8d5b3c0513e7f706d484fdc19c8423fc6261bd7b670eee46009b0cf15b9b47f8bdfc14041937a57f15e75c679ad3073fa84ecaf1bcc782ab0615fdebd141a6cc
+  data.tar.gz: 017b40ee4d711a50bcd2c74719a0a4a27b4965058cfb8f37382765a84b7400fc78af754fb98b0d4aeb7ba5c935656b3d61687e9c0784a09a047269fbd2e7356f

data/CHANGELOG.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.3.3] 2024-11-09
+
+### Fixed
+
+- TypedAttribute now respects prefer_resource_method! [#391](https://github.com/okuramasafumi/alba/pull/391)
+
+## [3.3.2] 2024-10-30
+
+### Fixed
+
+- Rails integration with `ActionController::API`
+
 ## [3.3.1] 2024-10-17
 
 ### Fixed

data/Gemfile

@@ -11,7 +11,7 @@ gem 'ffaker', require: false # For testing
 gem 'minitest', '~> 5.14' # For test
 gem 'railties', require: false # For Rails integration testing
 gem 'rake', '~> 13.0' # For test and automation
-gem 'rubocop', '~> 1.66.1', require: false # For lint
+gem 'rubocop', '~> 1.68.0', require: false # For lint
 gem 'rubocop-gem_dev', '>= 0.3.0', require: false # For lint
 gem 'rubocop-md', '~> 1.0', require: false # For lint
 gem 'rubocop-minitest', '~> 0.36.0', require: false # For lint

data/lib/alba/railtie.rb

@@ -7,11 +7,11 @@ module Alba
       Alba.inflector = :active_support
 
       ActiveSupport.on_load(:action_controller) do
-        ActionController::Base.define_method(:serialize) do |obj, with: nil, &block|
+        define_method(:serialize) do |obj, with: nil, &block|
           with.nil? ? Alba.resource_with(obj, &block) : with.new(obj)
         end
 
-        ActionController::Base.define_method(:render_serialized_json) do |obj, with: nil, &block|
+        define_method(:render_serialized_json) do |obj, with: nil, &block|
           json = with.nil? ? Alba.resource_with(obj, &block) : with.new(obj)
           render json: json
         end

data/lib/alba/resource.rb

@@ -239,12 +239,12 @@ module Alba
         Alba.transform_key(key, transform_type: @_transform_type)
       end
 
-      def fetch_attribute(obj, key, attribute) # rubocop:disable Metrics/CyclomaticComplexity
+      def fetch_attribute(obj, key, attribute) # rubocop:disable Metrics
         value = case attribute
                 when Symbol then fetch_attribute_from_object_and_resource(obj, attribute)
                 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(obj)
+                when TypedAttribute then attribute.value { |attr| fetch_attribute(obj, key, attr) }
                 when NestedAttribute then attribute.value(object: obj, params: params, within: @within)
                 when ConditionalAttribute then attribute.with_passing_condition(resource: self, object: obj) { |attr| fetch_attribute(obj, key, attr) }
                   # :nocov:

data/lib/alba/typed_attribute.rb

@@ -18,10 +18,9 @@ module Alba
               end
     end
 
-    # @param object [Object] target to check and convert type with
     # @return [String, Integer, Boolean] type-checked or type-converted object
-    def value(object)
-      v = object.__send__(@name)
+    def value
+      v = yield(@name)
       result = @type.check(v)
       result ? v : @type.convert(v)
     rescue TypeError

data/lib/alba/version.rb

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

data/lib/alba.rb

@@ -261,7 +261,7 @@ module Alba
       inflector
     end
 
-    def register_default_types # rubocop:disable Mertics/AbcSize
+    def register_default_types # rubocop:disable Metrics/AbcSize
       [String, :String].each do |t|
         register_type(t, check: ->(obj) { obj.is_a?(String) }, converter: lambda(&:to_s))
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: alba
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.3
 platform: ruby
 authors:
 - OKURA Masafumi
 bindir: exe
 cert_chain: []
-date: 2024-10-17 00:00:00.000000000 Z
+date: 2024-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ostruct