alba 2.4.1 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e90abb8ddc9adbf7cdedd0b534cf3e769c05e186ad263c112a17878790c39816
-  data.tar.gz: aa619e40729249353356776866dcd72007490dc02319b1aa8613038c0f8439bc
+  metadata.gz: 1d24d6ad9ef1b576685afb22e3f3c2033555afa358516204b42a31b11080d52b
+  data.tar.gz: 20cc1cb31b6cdfbb73ec87421d828ad274e4863e9156e0d22acb71d99ff0388b
 SHA512:
-  metadata.gz: ffeca32af2fb742376ec3a73bdc5056c8f75e3203c56da9b70c2e451ff7320b5fb7918338c11103d94392079a4d7df4bb63c65e04d66d612ff9864d2696713ff
-  data.tar.gz: 6e6d944da2bccc6942e699c34dac9d19a21bcfed99f7da9bb5300416ce241f0ad273e1790c06fa3346617459f688783546171708397e613c4b6558fbccf21a8e
+  metadata.gz: fbc694ec856084b9e008a9996b38aa52ae138cfc136c414002cdf375764501fc7ab37a1b72e433f743cddffa394e963e51070014954c273e7b02d8dfa894582a
+  data.tar.gz: 4dc0354d7b318a7f087bdcf4c9d32d5a6a2d956c5aea4783cdefbb587ab4e502b3f6d6e1becda772065978f64b9c463b69f7a41a8e1cab2f00e56ad1305f4036

data/CHANGELOG.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.4.3] 2024-10-31
+
+### Fixed
+
+- Resource method is those explicitly defined only [27996a04598c57943e184ee34224a2cee9bf2e9d]
+
+## [2.4.2] 2023-10-11
+
+### Fixed
+
+- Multithread bug
+
 ## [2.4.1] 2023-08-02
 
 #### Fixed

data/lib/alba/association.rb

@@ -8,7 +8,7 @@ module Alba
       attr_reader :const_cache
     end
 
-    attr_reader :object, :name
+    attr_reader :name
 
     # @param name [Symbol, String] name of the method to fetch association
     # @param condition [Proc, nil] a proc filtering data
@@ -36,16 +36,16 @@ module Alba
     # @return [Hash]
     def to_h(target, within: nil, params: {})
       params = params.merge(@params)
-      @object = target.__send__(@name)
-      @object = @condition.call(object, params, target) if @condition
-      return if @object.nil?
+      object = target.__send__(@name)
+      object = @condition.call(object, params, target) if @condition
+      return if object.nil?
 
       if @resource.is_a?(Proc)
-        return to_h_with_each_resource(within, params) if @object.is_a?(Enumerable)
+        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).to_h
       else
-        to_h_with_constantize_resource(within, params)
+        to_h_with_constantize_resource(object, within, params)
       end
     end
 
@@ -56,6 +56,7 @@ module Alba
       when Class
         resource
       when Symbol, String
+        Object.const_get(resource)
         self.class.const_cache.fetch(resource) do
           self.class.const_cache[resource] = Object.const_get(resource)
         end
@@ -76,13 +77,13 @@ module Alba
                   end
     end
 
-    def to_h_with_each_resource(within, params)
-      @object.map do |item|
+    def to_h_with_each_resource(object, within, params)
+      object.map do |item|
         @resource.call(item).new(item, within: within, params: params).to_h
       end
     end
 
-    def to_h_with_constantize_resource(within, params)
+    def to_h_with_constantize_resource(object, within, params)
       @resource = constantize(@resource)
       @resource.new(object, params: params, within: within).to_h
     end

data/lib/alba/conditional_attribute.rb

@@ -1,5 +1,6 @@
 require_relative 'association'
 require_relative 'constants'
+require 'ostruct'
 
 module Alba
   # Represents attribute with `if` option
@@ -23,7 +24,7 @@ module Alba
       fetched_attribute = yield(@body)
       return fetched_attribute unless with_two_arity_proc_condition
 
-      return Alba::REMOVE_KEY unless resource.instance_exec(object, attribute_from_association_body_or(fetched_attribute), &@condition)
+      return Alba::REMOVE_KEY unless resource.instance_exec(object, objectize(fetched_attribute), &@condition)
 
       fetched_attribute
     end
@@ -48,8 +49,18 @@ module Alba
       @condition.is_a?(Proc) && @condition.arity >= 2
     end
 
-    def attribute_from_association_body_or(fetched_attribute)
-      @body.is_a?(Alba::Association) ? @body.object : fetched_attribute
+    # OpenStruct is used as a simple solution for converting Hash or Array of Hash into an object
+    # Using OpenStruct is not good in general, but in this case there's no other solution
+    def objectize(fetched_attribute)
+      return fetched_attribute unless @body.is_a?(Alba::Association)
+
+      if fetched_attribute.is_a?(Array)
+        fetched_attribute.map do |hash|
+          OpenStruct.new(hash)
+        end
+      else
+        OpenStruct.new(fetched_attribute)
+      end
     end
   end
 end

data/lib/alba/resource.rb

@@ -11,7 +11,7 @@ module Alba
   module Resource
     # @!parse include InstanceMethods
     # @!parse extend ClassMethods
-    DSLS = {_attributes: {}, _key: nil, _key_for_collection: nil, _meta: nil, _transform_type: :none, _transforming_root_key: false, _key_transformation_cascade: true, _on_error: nil, _on_nil: nil, _layout: nil, _collection_key: nil, _helper: nil}.freeze # rubocop:disable Layout/LineLength
+    DSLS = {_attributes: {}, _key: nil, _key_for_collection: nil, _meta: nil, _transform_type: :none, _transforming_root_key: false, _key_transformation_cascade: true, _on_error: nil, _on_nil: nil, _layout: nil, _collection_key: nil, _helper: nil, _resource_methods: []}.freeze # rubocop:disable Layout/LineLength
     private_constant :DSLS
 
     WITHIN_DEFAULT = Object.new.freeze
@@ -277,9 +277,15 @@ module Alba
       end
 
       def _fetch_attribute_from_resource_first(obj, attribute)
-        __send__(attribute, obj)
-      rescue NoMethodError
-        obj.__send__(attribute)
+        if @_resource_methods.include?(attribute)
+          begin
+            __send__(attribute, obj)
+          rescue NoMethodError
+            obj.__send__(attribute)
+          end
+        else
+          obj.__send__(attribute)
+        end
       end
 
       def nil_handler
@@ -314,6 +320,12 @@ module Alba
     module ClassMethods
       attr_reader(*DSLS.keys)
 
+      # This `method_added` is used for defining "resource methods"
+      def method_added(method_name)
+        _resource_methods << method_name.to_sym unless method_name.to_sym == :_setup
+        super
+      end
+
       # @private
       def inherited(subclass)
         super

data/lib/alba/version.rb

@@ -1,3 +1,3 @@
 module Alba
-  VERSION = '2.4.1'.freeze
+  VERSION = '2.4.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alba
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.3
 platform: ruby
 authors:
 - OKURA Masafumi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies: []
 description: Alba is the fastest JSON serializer for Ruby. It focuses on performance,
   flexibility and usability.
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Alba is the fastest JSON serializer for Ruby.