serega 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad827e730d35f4e1805b7a0c59e8a8eeec87a91bb426ada370ea4a632516f40c
-  data.tar.gz: 681deb3a954453740ac3256614684601aeb18027423352ca05cc62c82ff37784
+  metadata.gz: 7f1f7a73c9b59105be934686739f94fcdd90bad6b18101669336e57bd7303f98
+  data.tar.gz: 5506044c823665604fe6329774cbedc699d02c5ecaea7096750a5ee7c16bffcc
 SHA512:
-  metadata.gz: 6f279fecc4038a162b33d97001fa993758eb4d687c0a7b83f9555f20781e3ece12b1381ba9765993cf5a4d7a31a5dee66f29d3279e1198a6ddf6b6d19b977682
-  data.tar.gz: c1ed8f5f7e06ff2df08f2f5fb8ee587d062e3197399475c55d1383ab0fcb6c4c8f5224363ef202ecccdab063964a9e5cf98581ecdacfa5ac5caafa02277c93c6
+  metadata.gz: c21d5b4f1b5eaca35a65459e8e344daf711615bf27baae3fd9db85fb554ac227d487636257878b8a0df757c5b1ac8e63a0d640f8fda5fff402d88cf40e5ac1c8
+  data.tar.gz: c519aa2e0446495ed3791ea3bfdb356e34cfba4821648421b69371f77fd87e1c6704436457ca1fd2bc7b4d58d4db189d1eb9650e85511a4988f5a066c4e302a9

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/serega/plugins/formatters/formatters.rb

@@ -25,7 +25,15 @@ class Serega
           formatter = opts[:format]
           return original_block unless formatter
 
-          @value_block = formatted_block(formatter, original_block)
+          new_value_block = formatted_block(formatter, original_block)
+
+          # Detect formatted :const value in advance
+          if opts.key?(:const)
+            const_value = new_value_block.call
+            new_value_block = proc { const_value }
+          end
+
+          @value_block = new_value_block
         end
 
         private

data/lib/serega/plugins/preloads/preloads.rb

@@ -35,7 +35,10 @@ class Serega
       def self.after_load_plugin(serializer_class, **opts)
         config = serializer_class.config
         config[:attribute_keys] += [:preload, :preload_path]
-        config[:preloads] = {auto_preload_relations: opts.fetch(:auto_preload_relations, true)}
+        config[:preloads] = {
+          auto_preload_attributes_with_serializer: opts.fetch(:auto_preload_attributes_with_serializer, false),
+          auto_hide_attributes_with_preload: opts.fetch(:auto_hide_attributes_with_preload, false)
+        }
       end
 
       # Adds #preloads instance method
@@ -60,14 +63,28 @@ class Serega
           @preloads_path = get_preloads_path
         end
 
+        def hide
+          res = super
+          return res unless res.nil?
+
+          auto_hide_attribute_with_preloads? || nil
+        end
+
         private
 
+        def auto_hide_attribute_with_preloads?
+          return @auto_hide_attribute_with_preloads if defined?(@auto_hide_attribute_with_preloads)
+
+          auto = self.class.serializer_class.config[:preloads][:auto_hide_attributes_with_preload]
+          @auto_hide_attribute_with_preloads = auto && !preloads.nil? && (preloads != false) && (preloads != {})
+        end
+
         def get_preloads
           preloads_provided = opts.key?(:preload)
           preloads =
             if preloads_provided
               opts[:preload]
-            elsif relation? && self.class.serializer_class.config[:preloads][:auto_preload_relations]
+            elsif relation? && self.class.serializer_class.config[:preloads][:auto_preload_attributes_with_serializer]
               key
             end
 

data/lib/serega/plugins/validate_modifiers/validate.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 class Serega
+  class AttributeNotExist < Error
+  end
+
   module Plugins
     module ValidateModifiers
       class Validate
@@ -29,14 +32,14 @@ class Serega
           def raise_error(name, prev_names)
             field_name = field_name(name, prev_names)
 
-            raise Serega::Error, "Attribute #{field_name} not exists"
+            raise Serega::AttributeNotExist, "Attribute #{field_name} not exists"
           end
 
           def raise_nested_error(name, prev_names, nested_fields)
             field_name = field_name(name, prev_names)
             first_nested = nested_fields.keys.first
 
-            raise Serega::Error, "Attribute #{field_name} is not a relation to add '#{first_nested}' attribute"
+            raise Serega::AttributeNotExist, "Attribute #{field_name} has no :serializer option specified to add nested '#{first_nested}' attribute"
           end
 
           def field_name(name, prev_names)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serega
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Andrey Glushkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-25 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: