easy_params 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c59e34205e7543bb5d58358d8e93b92ff911cacac58b4dbd55069b1398d10691
-  data.tar.gz: 7ba6653bb5b7ecd3e10d3e23be396f9482b0cf336f8807d5cc09a8d9fa1b9750
+  metadata.gz: a707b8082dc9c58012a4b8f93c93d2c8543b3ee85d96f64d972b9a074b3bed29
+  data.tar.gz: 2d0a8eeea15d0418f91c4fb48e128d1f965db24773a81a9ac4f23d6c2b01500e
 SHA512:
-  metadata.gz: 6b6b302946b9eb92cbcedf61a6eae529030154ec251ce4a98928d0cd31cffb069e43ad2fd98f4768ca208ea1f7f65e5cf0be89fa16bce1d3fd7f2c02d8d837c1
-  data.tar.gz: ee6bdb5edaf5a37230c631036936a3dc8a520aa0ed5a344ad69cdf03ff9d77d817f2c346d0b8a27ca0a421f6c25f16a80190262ead23877af6a7a4f7a706a8ad
+  metadata.gz: 941a6c062c86638aa540eba6ac2fc697ba9177b7521c344bed4ae71b88747b5419c1c8b15cf44da9d5dea5098bf6a6de910125173bdfa75cb4838f353f28caec
+  data.tar.gz: 7a07ba572c6fe6890368b7b1b0458cf934ee07953e4bd84a60728945c5f852d2a8206fe0e6cf83b70be343dda5683927b9e29d49292cb8181461ffa567611cb9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    easy_params (0.6.0)
+    easy_params (0.6.1)
       activemodel (>= 3.2)
 
 GEM

data/lib/easy_params/base.rb

@@ -30,16 +30,24 @@ module EasyParams
         @schema ||= {}
       end
 
-      def each(param_name, default: nil, normalize: nil, **validations, &block)
+      def each(param_name, definition = nil, default: nil, normalize: nil, **validations, &block)
         validates param_name, **validations if validations.any?
-        type = EasyParams::Types::Each.with_type(&block)
+        if definition && !(definition < EasyParams::Base)
+          raise ArgumentError, "definition for attribute #{param_name.inspect} must be a subclass of EasyParams::Base"
+        end
+
+        type = EasyParams::Types::Each.with_type(definition, &block)
         type = customize_type(type, default, &normalize)
         attribute(param_name, type)
       end
 
-      def has(param_name, default: nil, normalize: nil, **validations, &block)
+      def has(param_name, definition = nil, default: nil, normalize: nil, **validations, &block)
         validates param_name, **validations if validations.any?
-        type = Class.new(EasyParams::Types::Struct.class).tap { |c| c.class_eval(&block) }.new
+        if definition && !(definition < EasyParams::Base)
+          raise ArgumentError, "definition for attribute #{param_name.inspect} must be a subclass of EasyParams::Base"
+        end
+
+        type = (definition || Class.new(EasyParams::Base).tap { |c| c.class_eval(&block) }).new
         type = customize_type(type, default, &normalize)
         attribute(param_name, type)
       end
@@ -83,7 +91,7 @@ module EasyParams
         result[key] = case value
                       when EasyParams::Types::StructsCollection
                         value.map(&:to_h)
-                      when EasyParams::Types::Struct.class
+                      when EasyParams::Base
                         value.to_h
                       else
                         value

data/lib/easy_params/types/collection.rb

@@ -26,10 +26,6 @@ module EasyParams
         self.class.new(@title, @default, block, of: @of_type, &@coerce_proc)
       end
 
-      def self.optional
-        self.class.new(@title, @default, @normalize_proc, of: @of_type, &@coerce_proc)
-      end
-
       def default(value)
         self.class.new(@title, value, @normalize_proc, of: @of_type, &@coerce_proc)
       end
@@ -41,8 +37,8 @@ module EasyParams
 
     # base interface for array of structs type
     class StructsCollection < Collection
-      def with_type(&block)
-        of_type = Class.new(EasyParams::Types::Struct.class).tap { |c| c.class_eval(&block) }.new
+      def with_type(definition = nil, &block)
+        of_type = (definition || Class.new(EasyParams::Base).tap { |c| c.class_eval(&block) }).new
         self.class.new(@title, @default, @normalize_proc, of: of_type)
       end
     end

data/lib/easy_params/types.rb

@@ -9,7 +9,7 @@ module EasyParams
         { '0' => false, 'f' => false, 'false' => false, 'False' => false, 'FALSE' => false, 'F' => false }
       ).freeze
 
-    Struct    = Class.new(EasyParams::Base).new
+    Struct    = EasyParams::Base.new
     Array     = Collection.new(:array)
     Each      = StructsCollection.new(:array_of_structs)
     Integer   = Generic.new(:integer, &:to_i)

data/lib/easy_params/validation.rb

@@ -10,7 +10,7 @@ module EasyParams
         case value
         when EasyParams::Types::StructsCollection
           value.each(&:valid?)
-        when EasyParams::Types::Struct.class
+        when EasyParams::Base
           value.valid?
         end
       end
@@ -24,7 +24,7 @@ module EasyParams
           value.each.with_index do |element, i|
             aggregate_nested_errors[attr_name, element, "[#{i}]", error_key_prefix]
           end
-        when EasyParams::Types::Struct.class
+        when EasyParams::Base
           handle_nested_errors(value, error_key_prefix, attr_name, array_index)
         end
       end

data/lib/easy_params/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EasyParams
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_params
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Andrii Baran