serega 0.33.0 → 0.33.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cd7b294e87a2a489db28dc4b77e46a7a359cf667908350a15e74d919a340305
-  data.tar.gz: e273e63a8a9248b44da6fbd4d71be4fc5be3a01308e42fa8222cec76a94a23e6
+  metadata.gz: 94fe2e370dea04c0bedcb7bed7f7f3b6f9ad9ff49a4c39367429929b5bc68e7e
+  data.tar.gz: 65cbab835785d14d8c17aba1ba6eff21b8abb9689eba2e4f15e28d68ee60cea9
 SHA512:
-  metadata.gz: 94418c706174af2493fa63da4982a732fdaf5841d1664404f20f142d8e4bf798297375d6dc7d082a470a85eea18defa53975076e7778c468ef5f6faa5c8b8f59
-  data.tar.gz: 7b896b64920aa07a6ba01e4e03967e75cf67a21590978b226e018344e9f116ce0d579289b45eb7a1670989f5fc51591d33546c0f8c9a2dc28ba1fc4ca6120176
+  metadata.gz: 9600ce857e2f2fd0836da34cec422eda2472e945a9c3fd94d4e4c9de7fb95e3ddb147b5ac59dc3c575695787fcb9634b9c1fc7cc512590b2da17e6ec492e9271
+  data.tar.gz: 7fa17d2686eb63a64b38cd7fea6a006de17497425a77f17a8619d112de8ca7b361549bcc5c0b03fd06c2bf842aec04f366d3aa5c63ae3b40b5e794b666a3a327

data/README.md

@@ -2,8 +2,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/serega.svg)](https://badge.fury.io/rb/serega)
 [![GitHub Actions](https://github.com/aglushkov/serega/actions/workflows/main.yml/badge.svg?event=push)](https://github.com/aglushkov/serega/actions/workflows/main.yml)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/f10c0659e16e25e49faa/test_coverage)](https://codeclimate.com/github/aglushkov/serega/test_coverage)
-[![Maintainability](https://api.codeclimate.com/v1/badges/f10c0659e16e25e49faa/maintainability)](https://codeclimate.com/github/aglushkov/serega/maintainability)
 
 The Serega Ruby Serializer provides easy and powerful DSL to describe your
 objects and serialize them to Hash or JSON.
@@ -366,8 +364,8 @@ Custom loaders can be provided directly using the `:use` option with any callabl
 ```ruby
 class UserSerializer < Serega
   # Define named loaders
-  batch_loader :facebook_likes, FacebookLikesLoader
-  batch_loader :twitter_likes, TwitterLikesLoader
+  batch :facebook_likes, FacebookLikesLoader
+  batch :twitter_likes, TwitterLikesLoader
 
   # Summarize likes
   attribute :likes_count,

data/VERSION

@@ -1 +1 @@
-0.33.0
+0.33.1

data/lib/serega/attribute_normalizer.rb

@@ -191,22 +191,18 @@ class Serega
       def prepare_const_block
         return unless init_opts.key?(:const)
 
-        const = init_opts[:const]
-        proc { const }
+        AttributeValueResolvers::ConstResolver.get(init_opts[:const])
       end
 
       def prepare_keyword_block
-        key_method_name = method_name
-        proc do |object|
-          object.public_send(key_method_name)
-        end
+        AttributeValueResolvers::KeywordResolver.get(method_name)
       end
 
       def prepare_batch_loader_block
         batch_opt = init_opts[:batch]
         return unless batch_opt
 
-        SeregaBatch::AutoResolverFactory.get(self.class.serializer_class, name, batch_opt)
+        AttributeValueResolvers::BatchResolver.get(self.class.serializer_class, name, batch_opt)
       end
 
       def prepare_batch_loaders
@@ -238,16 +234,7 @@ class Serega
         delegate_to = delegate[:to]
 
         allow_nil = delegate.fetch(:allow_nil) { config.delegate_default_allow_nil }
-
-        if allow_nil
-          proc do |object|
-            object.public_send(delegate_to)&.public_send(key_method_name)
-          end
-        else
-          proc do |object|
-            object.public_send(delegate_to).public_send(key_method_name)
-          end
-        end
+        AttributeValueResolvers::DelegateResolver.get(delegate_to, key_method_name, allow_nil)
       end
 
       # Prepares preloads

data/lib/serega/{batch/auto_resolver_factory.rb → attribute_value_resolvers/batch.rb}

@@ -1,17 +1,20 @@
 # frozen_string_literal: true
 
 class Serega
-  module SeregaBatch
+  #
+  # Attribute value resolvers
+  #
+  module AttributeValueResolvers
     #
-    # Factory generates callable object that should be able to take
-    # batch loaded results, current object, and find attribute value for this
-    # object
+    # Builds value resolver class for attributes with :batch option
     #
-    class AutoResolverFactory
+    class BatchResolver
       #
       # Generates callable block to find attribute value when attribute with :batch
       # option has no block or manual :value option.
       #
+      # In other cases we should never get here as attribute value/block option must be manually defined.
+      #
       # It handles this cases:
       # - `attribute :foo, batch: true`
       # - `attribute :foo, batch: FooLoader`
@@ -19,8 +22,6 @@ class Serega
       # - `attribute :foo, batch: { use: FooLoader, id: foo_id }`
       # - `attribute :foo, batch: { use: :foo_loader, id: foo_id }`
       #
-      # In other cases we should never call tis method here.
-      #
       def self.get(serializer_class, attribute_name, batch_opt)
         default_method = serializer_class.config.batch_id_option
 
@@ -43,7 +44,22 @@ class Serega
           end
         end
 
-        AutoResolver.new(batch_name, batch_id_method)
+        Batch.new(batch_name, batch_id_method)
+      end
+    end
+
+    #
+    # Builds value resolver class for attributes with :batch option
+    #
+    class Batch
+      def initialize(loader_name, id_method)
+        @loader_name = loader_name
+        @id_method = id_method
+      end
+
+      # Finds object attribute value from hash of batch_loaded values
+      def call(obj, batches:)
+        batches.fetch(@loader_name)[obj.public_send(@id_method)]
       end
     end
   end

data/lib/serega/attribute_value_resolvers/const.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+class Serega
+  #
+  # Attribute value resolvers
+  #
+  module AttributeValueResolvers
+    #
+    # Builds value resolver class for attributes with :const option
+    #
+    class ConstResolver
+      #
+      # Creates resolver that returns constant value
+      #
+      # @param const_value [Object] constant value to return
+      # @return [Const] resolver instance
+      #
+      def self.get(const_value)
+        Const.new(const_value)
+      end
+    end
+
+    #
+    # Value resolver class for attributes with :const option
+    #
+    class Const
+      def initialize(const_value)
+        @const_value = const_value
+      end
+
+      #
+      # Returns the constant value
+      #
+      # @return [Object] the constant value
+      #
+      def call
+        @const_value
+      end
+    end
+  end
+end

data/lib/serega/attribute_value_resolvers/delegate.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+class Serega
+  #
+  # Attribute value resolvers
+  #
+  module AttributeValueResolvers
+    #
+    # Builds value resolver class for attributes with :delegate option
+    #
+    class DelegateResolver
+      #
+      # Creates resolver that delegates method call to another object
+      #
+      # @param delegate_to [Symbol] method to call on object to get delegated object
+      # @param method_name [Symbol] method to call on delegated object
+      # @param allow_nil [Boolean] whether to use safe navigation when delegated object is nil
+      # @return [Delegate, DelegateAllowNil] resolver instance
+      #
+      def self.get(delegate_to, method_name, allow_nil)
+        allow_nil ? DelegateAllowNil.new(delegate_to, method_name) : Delegate.new(delegate_to, method_name)
+      end
+    end
+
+    #
+    # Value resolver class for attributes with :delegate (with :allow_nil) option
+    #
+    class DelegateAllowNil
+      def initialize(delegate_to, method_name)
+        @delegate_to = delegate_to
+        @method_name = method_name
+      end
+
+      #
+      # Delegates method call to another object with safe navigation
+      #
+      # @param object [Object] the object to delegate from
+      # @return [Object, nil] result of delegated method call or nil if delegated object is nil
+      #
+      def call(object)
+        object.public_send(delegate_to)&.public_send(method_name)
+      end
+
+      private
+
+      attr_reader :delegate_to, :method_name
+    end
+
+    #
+    # Value resolver class for attributes with :delegate (without :allow_nil) option
+    #
+    class Delegate
+      def initialize(delegate_to, method_name)
+        @delegate_to = delegate_to
+        @method_name = method_name
+      end
+
+      #
+      # Delegates method call to another object
+      #
+      # @param object [Object] the object to delegate from
+      # @return [Object] result of delegated method call
+      #
+      def call(object)
+        object.public_send(@delegate_to).public_send(@method_name)
+      end
+    end
+  end
+end

data/lib/serega/attribute_value_resolvers/keyword.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class Serega
+  #
+  # Attribute value resolvers
+  #
+  module AttributeValueResolvers
+    #
+    # Builds value resolver class for attributes with :keyword option
+    #
+    class KeywordResolver
+      #
+      # Creates resolver that calls method on object
+      #
+      # @param keyword [Symbol] method name to call on object
+      # @return [Keyword] resolver instance
+      #
+      def self.get(keyword)
+        Keyword.new(keyword)
+      end
+    end
+
+    #
+    # Value resolver class for attributes with :keyword option
+    #
+    class Keyword
+      def initialize(keyword)
+        @keyword = keyword
+      end
+
+      #
+      # Calls the keyword method on the object
+      #
+      # @param object [Object] the object to call method on
+      # @return [Object] result of method call
+      #
+      def call(object)
+        object.public_send(@keyword)
+      end
+    end
+  end
+end

data/lib/serega/batch/attribute_loader.rb

@@ -13,7 +13,7 @@ class Serega
         def initialize(point)
           @point = point
           @objects = []
-          @serialized_object_attachers = {}
+          @serialized_object_attachers = []
         end
 
         # Stores object with attacher to find and attach attribute values in batch later.
@@ -22,7 +22,7 @@ class Serega
         # @return [void]
         def store(object, attacher)
           objects << object
-          serialized_object_attachers[object] = attacher
+          serialized_object_attachers << [object, attacher]
         end
 
         # Loads serialized values for all stored objects for current attribute

data/lib/serega/plugins/if/if.rb

@@ -128,12 +128,31 @@ class Serega
 
         def prepare_if_option(if_option)
           return unless if_option
-          return proc { |val| val.public_send(if_option) } if if_option.is_a?(Symbol)
+          return KeywordConditionResolver.new(if_option) if if_option.is_a?(Symbol)
 
           if_option
         end
       end
 
+      #
+      # Resolves keyword-based conditions for if/unless options
+      #
+      class KeywordConditionResolver
+        def initialize(keyword)
+          @keyword = keyword
+        end
+
+        #
+        # Calls the keyword method on the object
+        #
+        # @param object [Object] the object to call method on
+        # @return [Object] result of method call
+        #
+        def call(object)
+          object.public_send(@keyword)
+        end
+      end
+
       #
       # SeregaAttribute additional/patched instance methods
       #

data/lib/serega.rb

@@ -23,12 +23,14 @@ require_relative "serega/utils/preload_paths"
 require_relative "serega/utils/preloads_constructor"
 require_relative "serega/utils/symbol_name"
 require_relative "serega/utils/to_hash"
+require_relative "serega/attribute_value_resolvers/batch"
+require_relative "serega/attribute_value_resolvers/const"
+require_relative "serega/attribute_value_resolvers/delegate"
+require_relative "serega/attribute_value_resolvers/keyword"
 require_relative "serega/attribute"
 require_relative "serega/attribute_normalizer"
 require_relative "serega/batch/attribute_loader"
 require_relative "serega/batch/attribute_loaders"
-require_relative "serega/batch/auto_resolver"
-require_relative "serega/batch/auto_resolver_factory"
 require_relative "serega/batch/loader"
 require_relative "serega/validations/utils/check_allowed_keys"
 require_relative "serega/validations/utils/check_opt_is_bool"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serega
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.33.1
 platform: ruby
 authors:
 - Andrey Glushkov
@@ -29,10 +29,12 @@ files:
 - lib/serega.rb
 - lib/serega/attribute.rb
 - lib/serega/attribute_normalizer.rb
+- lib/serega/attribute_value_resolvers/batch.rb
+- lib/serega/attribute_value_resolvers/const.rb
+- lib/serega/attribute_value_resolvers/delegate.rb
+- lib/serega/attribute_value_resolvers/keyword.rb
 - lib/serega/batch/attribute_loader.rb
 - lib/serega/batch/attribute_loaders.rb
-- lib/serega/batch/auto_resolver.rb
-- lib/serega/batch/auto_resolver_factory.rb
 - lib/serega/batch/loader.rb
 - lib/serega/config.rb
 - lib/serega/errors.rb
@@ -119,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: JSON Serializer
 test_files: []

data/lib/serega/batch/auto_resolver.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-class Serega
-  module SeregaBatch
-    #
-    # Automatically generated resolver for batch_loader
-    #
-    class AutoResolver
-      attr_reader :loader_name
-      attr_reader :id_method
-
-      def initialize(loader_name, id_method)
-        @loader_name = loader_name
-        @id_method = id_method
-      end
-
-      # Finds object attribute value from hash of batch_loaded values for all
-      # serialized objects
-      def call(obj, batches:)
-        batches.fetch(loader_name)[obj.public_send(id_method)]
-      end
-    end
-  end
-end