serega 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac327fb1d98a08b76fcdfdc68166265bea134f298892f0a2f9b1a25c7d1e6063
-  data.tar.gz: 9843b54690c3ab5e4c4ad0c651e5e7629915eb502a0913520cec9153e6ebfa9f
+  metadata.gz: a0677ac2e319673d37e712b840c9485abf9ec2cd578a66d0a4d667e6134b4b3e
+  data.tar.gz: 7711764ae779bd31ed3c203fff925279ca19c9c74acb94cc58e4a4a302da35a9
 SHA512:
-  metadata.gz: 7260b7ff2a939f93510565e50a19e6ad3c4fe6899c8ddb927938714bf422d0faedab7e62c638f18e98af13b6f9403cd30d4d72088dd6209f083ad4338f4d64da
-  data.tar.gz: b54726235c873c143fc3458837f1ecce05ffa26229d37e6b7420b304b8f1bff3bdde9e4a73fcd91c0e19664918cd2080d708e105398d4d30f15e6b440a7d737f
+  metadata.gz: e5f26401f3388020f8051543f19a03f223b424d55d9ce91a6c11c0ad7646e398d68d746227746297f5fb9dc387c7adaa84f6fdaa2d0829b8f2d3e13b516c28ec
+  data.tar.gz: 0fbb40978adcaa91756bd59f6ed70b5a905eb25f0b6e60d2bb22f85bd4e9f7c4a51f37c987d035cc761bb0cab52f400472718ea992b576c89a39d582267c6b9a

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.3

data/lib/serega/attribute.rb

@@ -33,11 +33,11 @@ class Serega
       # @param block [Proc] Proc that receives object and context and finds attribute value
       #
       def initialize(name:, opts: {}, block: nil)
-        check(name, opts, block)
+        self.class.serializer_class::CheckAttributeParams.new(name, opts, block).validate
 
         @name = name.to_sym
         @opts = Utils::EnumDeepDup.call(opts)
-        @block = opts[:value] || block
+        @block = block
       end
 
       # @return [Symbol] Object method name to will be used to get attribute value unless block provided
@@ -77,7 +77,7 @@ class Serega
       def value_block
         return @value_block if instance_variable_defined?(:@value_block)
 
-        @value_block = block || keyword_block
+        @value_block = block || opts[:value] || const_block || keyword_block
       end
 
       #
@@ -112,16 +112,17 @@ class Serega
 
       private
 
+      def const_block
+        return unless opts.key?(:const)
+
+        const = opts[:const]
+        proc { const }
+      end
+
       def keyword_block
         key_method_name = key
         proc { |object| object.public_send(key_method_name) }
       end
-
-      def check(name, opts, block)
-        CheckName.call(name)
-        CheckOpts.call(opts, self.class.serializer_class.config[:attribute_keys])
-        CheckBlock.call(opts, block)
-      end
     end
 
     extend Serega::Helpers::SerializerClassHelper

data/lib/serega/plugins/activerecord_preloads/activerecord_preloads.rb

@@ -37,7 +37,7 @@ class Serega
         # Override original #to_h method
         # @see Serega#to_h
         #
-        def to_h(object, **opts)
+        def to_h(object, *)
           object = add_preloads(object)
           super
         end

data/lib/serega/plugins/hide_nil/hide_nil.rb

@@ -22,7 +22,7 @@ class Serega
       #
       def self.load_plugin(serializer_class, **_opts)
         serializer_class::Attribute.include(AttributeMethods)
-        serializer_class::Attribute::CheckOpts.extend(CheckOptsClassMethods)
+        serializer_class::CheckAttributeParams.include(CheckAttributeParamsInstanceMethods)
         serializer_class::ConvertItem.extend(ConvertItemClassMethods)
       end
 
@@ -37,10 +37,10 @@ class Serega
         end
       end
 
-      module CheckOptsClassMethods
+      module CheckAttributeParamsInstanceMethods
         private
 
-        def check_each_opt(opts)
+        def check_opts
           super
           CheckOptHideNil.call(opts)
         end

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

@@ -23,7 +23,7 @@ class Serega
         serializer_class.include(InstanceMethods)
         serializer_class::Attribute.include(AttributeMethods)
 
-        serializer_class::Attribute::CheckOpts.extend(CheckOptsClassMethods)
+        serializer_class::CheckAttributeParams.include(CheckAttributeParamsInstanceMethods)
 
         require_relative "./lib/enum_deep_freeze"
         require_relative "./lib/format_user_preloads"
@@ -85,10 +85,10 @@ class Serega
         end
       end
 
-      module CheckOptsClassMethods
+      module CheckAttributeParamsInstanceMethods
         private
 
-        def check_each_opt(opts)
+        def check_opts
           super
           CheckOptPreloadPath.call(opts)
         end

data/lib/serega/validations/attribute/check_block.rb

@@ -1,79 +1,49 @@
 # frozen_string_literal: true
 
 class Serega
-  class Attribute
-    class CheckBlock
-      class << self
-        #
-        # Checks :value option or a block provided with attribute
-        # Must have up to two arguments - object and context.
-        # It should not have any *rest or **key arguments
-        #
-        # @example without arguments
-        #   attribute(:email) { CONSTANT_EMAIL }
-        #
-        # @example with one argument
-        #   attribute(:email) { |obj| obj.confirmed_email }
-        #
-        # @example with two arguments
-        #   attribute(:email) { |obj, context| context['is_current'] ? obj.email : nil }
-        #
-        # @param opts [Proc] Attribute opts, we will check :value option
-        # @param block [Proc] Block that returns serialized attribute value
-        #
-        # @raise [Error] Error that block has invalid arguments
-        #
-        # @return [void]
-        #
-        def call(opts, block)
-          check_both_provided(opts, block)
+  module Validations
+    module Attribute
+      class CheckBlock
+        class << self
+          #
+          # Checks :value option or a block provided with attribute
+          # Must have up to two arguments - object and context.
+          # It should not have any *rest or **key arguments
+          #
+          # @example without arguments
+          #   attribute(:email) { CONSTANT_EMAIL }
+          #
+          # @example with one argument
+          #   attribute(:email) { |obj| obj.confirmed_email }
+          #
+          # @example with two arguments
+          #   attribute(:email) { |obj, context| context['is_current'] ? obj.email : nil }
+          #
+          # @param opts [Proc] Attribute opts, we will check :value option
+          # @param block [Proc] Block that returns serialized attribute value
+          #
+          # @raise [Error] Error that block has invalid arguments
+          #
+          # @return [void]
+          #
+          def call(block)
+            return unless block
 
-          if block
             check_block(block)
-          elsif opts.key?(:value)
-            check_value(opts[:value])
           end
-        end
-
-        private
-
-        def check_both_provided(opts, block)
-          if opts.key?(:value) && block
-            raise Error, both_error
-          end
-        end
-
-        def check_block(block)
-          params = block.parameters
-          return if (params.count <= 2) && params.all? { |par| par[0] == :opt }
-
-          raise Error, block_error
-        end
 
-        def check_value(value)
-          raise Error, value_error unless value.is_a?(Proc)
+          private
 
-          params = value.parameters
+          def check_block(block)
+            params = block.parameters
+            return if (params.count <= 2) && params.all? { |par| par[0] == :opt }
 
-          if value.lambda?
-            return if (params.count == 2) && params.all? { |par| par[0] == :req }
-          elsif (params.count <= 2) && params.all? { |par| par[0] == :opt }
-            return
+            raise Error, block_error
           end
 
-          raise Error, value_error
-        end
-
-        def block_error
-          "Block can have maximum two regular parameters (no **keyword or *array args)"
-        end
-
-        def value_error
-          "Option :value must be a Proc that is able to accept two parameters (no **keyword or *array args)"
-        end
-
-        def both_error
-          "Block and a :value option can not be provided together"
+          def block_error
+            "Block can have maximum two regular parameters (no **keyword or *array args)"
+          end
         end
       end
     end

data/lib/serega/validations/attribute/check_name.rb

@@ -1,43 +1,45 @@
 # frozen_string_literal: true
 
 class Serega
-  class Attribute
-    class CheckName
-      FORMAT_ONE_CHAR = /\A[a-zA-Z0-9]\z/
-      FORMAT_MANY_CHARS = /\A[a-zA-Z0-9][a-zA-Z0-9_-]*?[a-zA-Z0-9]\z/ # allow '-' and '_' in the middle
-
-      private_constant :FORMAT_ONE_CHAR, :FORMAT_MANY_CHARS
-
-      class << self
-        #
-        # Checks allowed characters.
-        # Globally allowed characters: "a-z", "A-Z", "0-9".
-        # Minus and low line "-", "_" also allowed except as the first or last character.
-        #
-        # @param name [String, Symbol] Attribute name
-        #
-        # @raise [Error] when name has invalid format
-        # @return [void]
-        #
-        def call(name)
-          name = name.to_s
-
-          valid =
-            case name.size
-            when 0 then false
-            when 1 then name.match?(FORMAT_ONE_CHAR)
-            else name.match?(FORMAT_MANY_CHARS)
-            end
-
-          return if valid
-
-          raise Error, message(name)
-        end
-
-        private
-
-        def message(name)
-          %(Invalid attribute name = #{name.inspect}. Globally allowed characters: "a-z", "A-Z", "0-9". Minus and low line "-", "_" also allowed except as the first or last character)
+  module Validations
+    module Attribute
+      class CheckName
+        FORMAT_ONE_CHAR = /\A[a-zA-Z0-9]\z/
+        FORMAT_MANY_CHARS = /\A[a-zA-Z0-9][a-zA-Z0-9_-]*?[a-zA-Z0-9]\z/ # allow '-' and '_' in the middle
+
+        private_constant :FORMAT_ONE_CHAR, :FORMAT_MANY_CHARS
+
+        class << self
+          #
+          # Checks allowed characters.
+          # Globally allowed characters: "a-z", "A-Z", "0-9".
+          # Minus and low line "-", "_" also allowed except as the first or last character.
+          #
+          # @param name [String, Symbol] Attribute name
+          #
+          # @raise [Error] when name has invalid format
+          # @return [void]
+          #
+          def call(name)
+            name = name.to_s
+
+            valid =
+              case name.size
+              when 0 then false
+              when 1 then name.match?(FORMAT_ONE_CHAR)
+              else name.match?(FORMAT_MANY_CHARS)
+              end
+
+            return if valid
+
+            raise Error, message(name)
+          end
+
+          private
+
+          def message(name)
+            %(Invalid attribute name = #{name.inspect}. Globally allowed characters: "a-z", "A-Z", "0-9". Minus and low line "-", "_" also allowed except as the first or last character)
+          end
         end
       end
     end

data/lib/serega/validations/attribute/check_opt_const.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class Serega
+  module Validations
+    module Attribute
+      class CheckOptConst
+        #
+        # Checks attribute :const option
+        #
+        # @param opts [Hash] Attribute options
+        #
+        # @raise [Error] Attribute validation error
+        #
+        # @return [void]
+        #
+        class << self
+          def call(opts, block = nil)
+            return unless opts.key?(:const)
+
+            check_usage_with_other_params(opts, block)
+          end
+
+          private
+
+          def check_usage_with_other_params(opts, block)
+            raise Error, "Option :const can not be used together with option :key" if opts.key?(:key)
+            raise Error, "Option :const can not be used together with option :value" if opts.key?(:value)
+            raise Error, "Option :const can not be used together with block" if block
+          end
+        end
+      end
+    end
+  end
+end

data/lib/serega/validations/attribute/check_opt_hide.rb

@@ -1,19 +1,21 @@
 # frozen_string_literal: true
 
 class Serega
-  class Attribute
-    class CheckOptHide
-      #
-      # Checks attribute :hide option
-      #
-      # @param opts [Hash] Attribute options
-      #
-      # @raise [Error] Error that option has invalid value
-      #
-      # @return [void]
-      #
-      def self.call(opts)
-        CheckOptIsBool.call(opts, :hide)
+  module Validations
+    module Attribute
+      class CheckOptHide
+        #
+        # Checks attribute :hide option
+        #
+        # @param opts [Hash] Attribute options
+        #
+        # @raise [Error] Error that option has invalid value
+        #
+        # @return [void]
+        #
+        def self.call(opts)
+          Utils::CheckOptIsBool.call(opts, :hide)
+        end
       end
     end
   end

data/lib/serega/validations/attribute/check_opt_key.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class Serega
+  module Validations
+    module Attribute
+      class CheckOptKey
+        #
+        # Checks attribute :key option
+        #
+        # @param opts [Hash] Attribute options
+        #
+        # @raise [Error] Error that option has invalid value
+        #
+        # @return [void]
+        #
+        class << self
+          def call(opts, block = nil)
+            return unless opts.key?(:key)
+
+            check_usage_with_other_params(opts, block)
+            Utils::CheckOptIsStringOrSymbol.call(opts, :key)
+          end
+
+          private
+
+          def check_usage_with_other_params(opts, block)
+            raise Error, "Option :key can not be used together with option :const" if opts.key?(:const)
+            raise Error, "Option :key can not be used together with option :value" if opts.key?(:value)
+            raise Error, "Option :key can not be used together with block" if block
+          end
+        end
+      end
+    end
+  end
+end

data/lib/serega/validations/attribute/check_opt_many.rb

@@ -1,19 +1,21 @@
 # frozen_string_literal: true
 
 class Serega
-  class Attribute
-    class CheckOptMany
-      #
-      # Checks attribute :many option
-      #
-      # @param opts [Hash] Attribute options
-      #
-      # @raise [Error] Error that option has invalid value
-      #
-      # @return [void]
-      #
-      def self.call(opts)
-        CheckOptIsBool.call(opts, :many)
+  module Validations
+    module Attribute
+      class CheckOptMany
+        #
+        # Checks attribute :many option
+        #
+        # @param opts [Hash] Attribute options
+        #
+        # @raise [Error] Error that option has invalid value
+        #
+        # @return [void]
+        #
+        def self.call(opts)
+          Utils::CheckOptIsBool.call(opts, :many)
+        end
       end
     end
   end

data/lib/serega/validations/attribute/check_opt_serializer.rb

@@ -1,34 +1,36 @@
 # frozen_string_literal: true
 
 class Serega
-  class Attribute
-    class CheckOptSerializer
-      class << self
-        #
-        # Checks attribute :serializer option
-        #
-        # @param opts [Hash] Attribute options
-        #
-        # @raise [Error] Error that option has invalid value
-        #
-        # @return [void]
-        #
-        def call(opts)
-          return unless opts.key?(:serializer)
+  module Validations
+    module Attribute
+      class CheckOptSerializer
+        class << self
+          #
+          # Checks attribute :serializer option
+          #
+          # @param opts [Hash] Attribute options
+          #
+          # @raise [Error] Error that option has invalid value
+          #
+          # @return [void]
+          #
+          def call(opts)
+            return unless opts.key?(:serializer)
 
-          value = opts[:serializer]
-          return if valid_serializer?(value)
+            value = opts[:serializer]
+            return if valid_serializer?(value)
 
-          raise Error, "Invalid option :serializer => #{value.inspect}." \
-            " Can be a Serega subclass, a String or a Proc without arguments"
-        end
+            raise Error, "Invalid option :serializer => #{value.inspect}." \
+              " Can be a Serega subclass, a String or a Proc without arguments"
+          end
 
-        private
+          private
 
-        def valid_serializer?(value)
-          value.is_a?(String) ||
-            (value.is_a?(Proc) && (value.parameters.count == 0)) ||
-            (value.is_a?(Class) && (value < Serega))
+          def valid_serializer?(value)
+            value.is_a?(String) ||
+              (value.is_a?(Proc) && (value.parameters.count == 0)) ||
+              (value.is_a?(Class) && (value < Serega))
+          end
         end
       end
     end

data/lib/serega/validations/attribute/check_opt_value.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class Serega
+  module Validations
+    module Attribute
+      class CheckOptValue
+        #
+        # Checks attribute :value option
+        #
+        # @param opts [Hash] Attribute options
+        #
+        # @raise [Error] Error that option has invalid value
+        #
+        # @return [void]
+        #
+        class << self
+          def call(opts, block = nil)
+            return unless opts.key?(:value)
+
+            check_usage_with_other_params(opts, block)
+            check_proc(opts[:value])
+          end
+
+          private
+
+          def check_usage_with_other_params(opts, block)
+            raise Error, "Option :value can not be used together with option :key" if opts.key?(:key)
+            raise Error, "Option :value can not be used together with option :const" if opts.key?(:const)
+            raise Error, "Option :value can not be used together with block" if block
+          end
+
+          def check_proc(value)
+            raise Error, value_error unless value.is_a?(Proc)
+
+            params = value.parameters
+
+            if value.lambda?
+              return if (params.count == 2) && params.all? { |par| par[0] == :req }
+            elsif (params.count <= 2) && params.all? { |par| par[0] == :opt }
+              return
+            end
+
+            raise Error, value_error
+          end
+
+          def value_error
+            "Option :value must be a Proc that is able to accept two parameters (no **keyword or *array args)"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/serega/validations/check_attribute_params.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+class Serega
+  module Validations
+    class CheckAttributeParams
+      module InstanceMethods
+        attr_reader :name, :opts, :block
+
+        def initialize(name, opts, block)
+          @name = name
+          @opts = opts
+          @block = block
+        end
+
+        def validate
+          check_name
+          check_opts
+          check_block
+        end
+
+        private
+
+        def check_name
+          Attribute::CheckName.call(name)
+        end
+
+        def check_opts
+          Utils::CheckAllowedKeys.call(opts, allowed_opts_keys)
+
+          Attribute::CheckOptConst.call(opts, block)
+          Attribute::CheckOptHide.call(opts)
+          Attribute::CheckOptKey.call(opts, block)
+          Attribute::CheckOptMany.call(opts)
+          Attribute::CheckOptSerializer.call(opts)
+          Attribute::CheckOptValue.call(opts, block)
+        end
+
+        def check_block
+          Attribute::CheckBlock.call(block)
+        end
+
+        def allowed_opts_keys
+          self.class.serializer_class.config[:attribute_keys]
+        end
+      end
+
+      include InstanceMethods
+      extend Serega::Helpers::SerializerClassHelper
+    end
+  end
+end

data/lib/serega/validations/check_initiate_params.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class Serega
+  module Validations
+    class CheckInitiateParams
+      module ClassMethods
+        def call(opts)
+          check_opts(opts)
+        end
+
+        private
+
+        def check_opts(opts)
+          Utils::CheckAllowedKeys.call(opts, allowed_opts_keys)
+        end
+
+        def allowed_opts_keys
+          serializer_class.config[:initiate_keys]
+        end
+      end
+
+      extend ClassMethods
+      extend Serega::Helpers::SerializerClassHelper
+    end
+  end
+end

data/lib/serega/validations/check_serialize_params.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class Serega
+  module Validations
+    class CheckSerializeParams
+      module ClassMethods
+        def call(opts)
+          check_opts(opts)
+        end
+
+        private
+
+        def check_opts(opts)
+          Utils::CheckAllowedKeys.call(opts, allowed_opts_keys)
+
+          Utils::CheckOptIsHash.call(opts, :context)
+          Utils::CheckOptIsBool.call(opts, :many)
+        end
+
+        def allowed_opts_keys
+          serializer_class.config[:serialize_keys]
+        end
+      end
+
+      extend ClassMethods
+      extend Serega::Helpers::SerializerClassHelper
+    end
+  end
+end

data/lib/serega/validations/utils/check_allowed_keys.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Serega
+  module Validations
+    module Utils
+      class CheckAllowedKeys
+        def self.call(opts, allowed_keys)
+          opts.each_key do |key|
+            next if allowed_keys.include?(key)
+
+            raise Error, "Invalid option #{key.inspect}. Allowed options are: #{allowed_keys.map(&:inspect).join(", ")}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/serega/validations/utils/check_opt_is_bool.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Serega
+  module Validations
+    module Utils
+      class CheckOptIsBool
+        def self.call(opts, key)
+          return unless opts.key?(key)
+
+          value = opts[key]
+          return if value.equal?(true) || value.equal?(false)
+
+          raise Error, "Invalid option #{key.inspect} => #{value.inspect}. Must have a boolean value"
+        end
+      end
+    end
+  end
+end

data/lib/serega/validations/utils/check_opt_is_hash.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Serega
+  module Validations
+    module Utils
+      class CheckOptIsHash
+        def self.call(opts, key)
+          return unless opts.key?(key)
+
+          value = opts[key]
+          return if value.is_a?(Hash)
+
+          raise Error, "Invalid option #{key.inspect} => #{value.inspect}. Must have a Hash value"
+        end
+      end
+    end
+  end
+end

data/lib/serega/validations/utils/check_opt_is_string_or_symbol.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Serega
+  module Validations
+    module Utils
+      class CheckOptIsStringOrSymbol
+        def self.call(opts, key)
+          return unless opts.key?(key)
+
+          value = opts[key]
+          return if value.is_a?(String) || value.is_a?(Symbol)
+
+          raise Error, "Invalid option #{key.inspect} => #{value.inspect}. Must be a String or a Symbol"
+        end
+      end
+    end
+  end
+end

data/lib/serega.rb

@@ -21,16 +21,21 @@ require_relative "serega/utils/to_json"
 require_relative "serega/utils/as_json"
 
 require_relative "serega/attribute"
-require_relative "serega/validations/check_allowed_keys"
-require_relative "serega/validations/check_opt_is_bool"
-require_relative "serega/validations/check_opt_is_hash"
+require_relative "serega/validations/utils/check_allowed_keys"
+require_relative "serega/validations/utils/check_opt_is_bool"
+require_relative "serega/validations/utils/check_opt_is_hash"
+require_relative "serega/validations/utils/check_opt_is_string_or_symbol"
 require_relative "serega/validations/attribute/check_block"
 require_relative "serega/validations/attribute/check_name"
+require_relative "serega/validations/attribute/check_opt_const"
 require_relative "serega/validations/attribute/check_opt_hide"
-require_relative "serega/validations/attribute/check_opt_method"
+require_relative "serega/validations/attribute/check_opt_key"
 require_relative "serega/validations/attribute/check_opt_many"
 require_relative "serega/validations/attribute/check_opt_serializer"
-require_relative "serega/validations/attribute/check_opts"
+require_relative "serega/validations/attribute/check_opt_value"
+require_relative "serega/validations/check_attribute_params"
+require_relative "serega/validations/check_initiate_params"
+require_relative "serega/validations/check_serialize_params"
 
 require_relative "serega/config"
 require_relative "serega/convert"
@@ -43,13 +48,25 @@ class Serega
     {
       plugins: [],
       initiate_keys: %i[only with except],
-      attribute_keys: %i[key value serializer many hide],
+      attribute_keys: %i[key value serializer many hide const],
       serialize_keys: %i[context many],
       max_cached_map_per_serializer_count: 50,
       to_json: ->(data) { Utils::ToJSON.call(data) }
     }
   )
 
+  check_attribute_params_class = Class.new(Validations::CheckAttributeParams)
+  check_attribute_params_class.serializer_class = self
+  const_set(:CheckAttributeParams, check_attribute_params_class)
+
+  check_initiate_params_class = Class.new(Validations::CheckInitiateParams)
+  check_initiate_params_class.serializer_class = self
+  const_set(:CheckInitiateParams, check_initiate_params_class)
+
+  check_serialize_params_class = Class.new(Validations::CheckSerializeParams)
+  check_serialize_params_class.serializer_class = self
+  const_set(:CheckSerializeParams, check_serialize_params_class)
+
   # Core serializer class methods
   module ClassMethods
     # @return [Config] current serializer config
@@ -77,6 +94,18 @@ class Serega
       convert_item_class.serializer_class = subclass
       subclass.const_set(:ConvertItem, convert_item_class)
 
+      check_attribute_params_class = Class.new(self::CheckAttributeParams)
+      check_attribute_params_class.serializer_class = subclass
+      subclass.const_set(:CheckAttributeParams, check_attribute_params_class)
+
+      check_initiate_params_class = Class.new(self::CheckInitiateParams)
+      check_initiate_params_class.serializer_class = subclass
+      subclass.const_set(:CheckInitiateParams, check_initiate_params_class)
+
+      check_serialize_params_class = Class.new(self::CheckSerializeParams)
+      check_serialize_params_class.serializer_class = subclass
+      subclass.const_set(:CheckSerializeParams, check_serialize_params_class)
+
       # Assign same attributes
       attributes.each_value do |attr|
         subclass.attribute(attr.name, **attr.opts, &attr.block)
@@ -167,11 +196,15 @@ class Serega
       attribute(name, serializer: serializer, **opts, &block)
     end
 
-    def to_h(object, opts = FROZEN_EMPTY_HASH)
+    def call(object, opts = FROZEN_EMPTY_HASH)
       initiate_keys = config[:initiate_keys]
       new(opts.slice(*initiate_keys)).to_h(object, opts.except(*initiate_keys))
     end
 
+    def to_h(object, opts = FROZEN_EMPTY_HASH)
+      call(object, opts)
+    end
+
     def to_json(object, opts = FROZEN_EMPTY_HASH)
       initiate_keys = config[:initiate_keys]
       new(opts.slice(*initiate_keys)).to_json(object, opts.except(*initiate_keys))
@@ -197,7 +230,7 @@ class Serega
     # @param with [Array, Hash, String, Symbol] Attributes (usually hidden) to serialize additionally
     #
     def initialize(opts = FROZEN_EMPTY_HASH)
-      CheckAllowedKeys.call(opts, self.class.config[:initiate_keys])
+      self.class::CheckInitiateParams.call(opts)
       opts = prepare_modifiers(opts) if opts && (opts != FROZEN_EMPTY_HASH)
       @opts = opts
     end
@@ -210,15 +243,18 @@ class Serega
     #
     # @return [Hash] Serialization result
     #
-    def to_h(object, opts = {})
-      CheckAllowedKeys.call(opts, self.class.config[:serialize_keys])
-      CheckOptIsHash.call(opts, :context)
-      CheckOptIsBool.call(opts, :many)
+    def call(object, opts = {})
+      self.class::CheckSerializeParams.call(opts)
       opts[:context] ||= {}
 
       self.class::Convert.call(object, **opts, map: map)
     end
 
+    # @see #call
+    def to_h(object, opts = {})
+      call(object, opts)
+    end
+
     #
     # Serializes provided object to json
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serega
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Andrey Glushkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-07-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -56,14 +56,19 @@ files:
 - lib/serega/utils/to_json.rb
 - lib/serega/validations/attribute/check_block.rb
 - lib/serega/validations/attribute/check_name.rb
+- lib/serega/validations/attribute/check_opt_const.rb
 - lib/serega/validations/attribute/check_opt_hide.rb
+- lib/serega/validations/attribute/check_opt_key.rb
 - lib/serega/validations/attribute/check_opt_many.rb
-- lib/serega/validations/attribute/check_opt_method.rb
 - lib/serega/validations/attribute/check_opt_serializer.rb
-- lib/serega/validations/attribute/check_opts.rb
-- lib/serega/validations/check_allowed_keys.rb
-- lib/serega/validations/check_opt_is_bool.rb
-- lib/serega/validations/check_opt_is_hash.rb
+- lib/serega/validations/attribute/check_opt_value.rb
+- lib/serega/validations/check_attribute_params.rb
+- lib/serega/validations/check_initiate_params.rb
+- lib/serega/validations/check_serialize_params.rb
+- lib/serega/validations/utils/check_allowed_keys.rb
+- lib/serega/validations/utils/check_opt_is_bool.rb
+- lib/serega/validations/utils/check_opt_is_hash.rb
+- lib/serega/validations/utils/check_opt_is_string_or_symbol.rb
 - lib/serega/version.rb
 homepage: https://github.com/aglushkov/serega
 licenses:

data/lib/serega/validations/attribute/check_opt_method.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-class Serega
-  class Attribute
-    class CheckOptMethod
-      #
-      # Checks attribute :method option
-      #
-      # @param opts [Hash] Attribute options
-      #
-      # @raise [Error] Error that option has invalid value
-      #
-      # @return [void]
-      #
-      def self.call(opts)
-        return unless opts.key?(:method)
-
-        value = opts[:method]
-        return if value.is_a?(String) || value.is_a?(Symbol)
-
-        raise Error, "Invalid option :method => #{value.inspect}. Must be a String or a Symbol"
-      end
-    end
-  end
-end

data/lib/serega/validations/attribute/check_opts.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-class Serega
-  class Attribute
-    class CheckOpts
-      module ClassMethods
-        #
-        # Validates attribute options
-        # Checks used options are allowed and then checks options values.
-        #
-        # @param opts [Hash] Attribute options
-        # @param attribute_keys [Array<Symbol>] Allowed options keys
-        #
-        # @raise [Error] when attribute has invalid options
-        #
-        # @return [void]
-        #
-        def call(opts, attribute_keys)
-          CheckAllowedKeys.call(opts, attribute_keys)
-          check_each_opt(opts)
-        end
-
-        private
-
-        def check_each_opt(opts)
-          CheckOptHide.call(opts)
-          CheckOptMethod.call(opts)
-          CheckOptMany.call(opts)
-          CheckOptSerializer.call(opts)
-        end
-      end
-
-      extend ClassMethods
-    end
-  end
-end

data/lib/serega/validations/check_allowed_keys.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-class Serega
-  class CheckAllowedKeys
-    def self.call(opts, allowed_keys)
-      opts.each_key do |key|
-        next if allowed_keys.include?(key)
-
-        raise Error, "Invalid option #{key.inspect}. Allowed options are: #{allowed_keys.map(&:inspect).join(", ")}"
-      end
-    end
-  end
-end

data/lib/serega/validations/check_opt_is_bool.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-class Serega
-  class CheckOptIsBool
-    def self.call(opts, key)
-      return unless opts.key?(key)
-
-      value = opts[key]
-      return if value.equal?(true) || value.equal?(false)
-
-      raise Error, "Invalid option #{key.inspect} => #{value.inspect}. Must have a boolean value"
-    end
-  end
-end

data/lib/serega/validations/check_opt_is_hash.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-class Serega
-  class CheckOptIsHash
-    def self.call(opts, key)
-      return unless opts.key?(key)
-
-      value = opts[key]
-      return if value.is_a?(Hash)
-
-      raise Error, "Invalid option #{key.inspect} => #{value.inspect}. Must have a Hash value"
-    end
-  end
-end