easy_params 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a23a79fb06b0d9c02b836dc314e420f1339b20473d740f4427a6f1a9e740efe
-  data.tar.gz: e1ddbee8e7b5aa08fb3e9f1f2dc925ecc179a8f95ac3276e2aeb839f7e3cbe9d
+  metadata.gz: 6c3709594b8141aa9bc0d851a2f1eabcf40b7528637ad3d055c76e3ad7db1ac8
+  data.tar.gz: da9839e5b6f8242fe05ad074868fb23a3181840b723333b7fa66f9717efca4d7
 SHA512:
-  metadata.gz: 9a9968cc2201493bd774562cc9590d47537b870238ac5b64b33167c9b084feb14c067b6b4ee9a36f54abdff18a198c8d99474b8dc531fab45ebbffd61ae08c11
-  data.tar.gz: 11d7e883cc4a229c14b9323e94f8372e2f38d2c238e883884c2fe733bab4918be6ad62c13da09621fbb0e8b5b85405d7d2d9cb8197abc3cbf0d762b6657c2a7d
+  metadata.gz: 784db4e629c9800db787546346c9dd555ec277f578ecebfa9d59d5d76bb0532612d04a9e711b0f76a5040c9257673bf9e2c97ca85cb47bb1addeb67b7549310d
+  data.tar.gz: 20ced440392006961a46feab7eea99b2a71dc752dbf4f04559041f5fb9f7aa861524faec9d50cab56b3c13ca29dff7ec9dd192012289ed84061485a7ad1f094a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    easy_params (0.4.0)
+    easy_params (0.4.1)
       activemodel (>= 3.2, < 8)
       dry-struct (~> 1.4)
       dry-types (~> 1.5)
@@ -56,7 +56,7 @@ GEM
     ice_nine (0.11.2)
     json (2.6.3)
     method_source (1.0.0)
-    minitest (5.20.0)
+    minitest (5.21.1)
     mutex_m (0.2.0)
     parallel (1.23.0)
     parser (3.2.2.3)

data/lib/easy_params/base.rb

@@ -17,45 +17,42 @@ module EasyParams
 
     # %w[Integer Decimal Float Bool String Date DateTime Time Array Struct StructDSL].each do |type|
     %w[Integer Decimal Float Bool String Date DateTime Time].each do |type_name|
-      send(:define_singleton_method, type_name.underscore) do |param_name, default: nil, normalize: nil, **validations|
+      send(:define_singleton_method,
+           type_name.underscore) do |param_name, default: nil, normalize: nil, optional: nil, **validations|
         type = EasyParams::Types.const_get(type_name)
         type = type.default(default) if default
+        type = type.meta(omittable: true) if optional
         type = type.constructor { |value| value == Dry::Types::Undefined ? value : normalize.call(value) } if normalize
         validates param_name, **validations if validations.any?
         public_send(:attribute, param_name, type)
       end
     end
 
-    def self.each(param_name, normalize: nil, **validations, &block)
+    def self.each(param_name, normalize: nil, optional: nil, **validations, &block)
       validates param_name, **validations if validations.any?
-      type = EasyParams::Types::Each
+      type = EasyParams::Types::Array.of(EasyParams::Types::Struct)
+      type = type.meta(omittable: true) if optional
       type = type.constructor { |value| value == Dry::Types::Undefined ? value : normalize.call(value) } if normalize
       public_send(:attribute, param_name, type, &block)
     end
 
-    def self.has(param_name, normalize: nil, **validations, &block)
+    def self.has(param_name, normalize: nil, optional: nil, **validations, &block)
       validates param_name, **validations if validations.any?
       type = EasyParams::Types::Struct
+      type = type.meta(omittable: true) if optional
       type = type.constructor { |value| value == Dry::Types::Undefined ? value : normalize.call(value) } if normalize
       public_send(:attribute, param_name, type, &block)
     end
 
-    def self.array(param_name, of:, normalize: nil, **validations, &block)
+    def self.array(param_name, of:, normalize: nil, optional: nil, **validations, &block)
       validates param_name, **validations if validations.any?
       of_type = EasyParams::Types.const_get(of.to_s.camelcase)
       type = EasyParams::Types::Array
+      type = type.meta(omittable: true) if optional
       type = type.constructor { |value| value == Dry::Types::Undefined ? value : normalize.call(value) } if normalize
       public_send(:attribute, param_name, type.of(of_type), &block)
     end
 
-    def self.param(method_name, type_name, of: nil, default: nil, **validations, &block)
-      type = EasyParams::Types.const_get(type_name.to_s.camelcase)
-      type = type.default(default) if default
-      type = type.of(EasyParams::Types.const_get(of.to_s.camelcase)) if of && type_name != :each
-      validates method_name, **validations if validations.any?
-      public_send(:attribute, method_name, type, &block)
-    end
-
     private
 
     def validate_nested

data/lib/easy_params/types.rb

@@ -2,20 +2,18 @@
 
 module EasyParams
   module Types
-    Struct    = EasyParams::Base.meta(omittable: true)
-    Has       = EasyParams::Base.meta(omittable: true)
-    Integer   = Dry::Types['params.integer'].optional.meta(omittable: true).default(nil)
-    Decimal   = Dry::Types['params.decimal'].optional.meta(omittable: true).default(nil)
-    Float     = Dry::Types['params.float'].optional.meta(omittable: true).default(nil)
-    Bool      = Dry::Types['params.bool'].optional.meta(omittable: true).default(nil)
-    String    = Dry::Types['string'].optional.meta(omittable: true).default(nil)
-    Array     = Dry::Types['array'].meta(omittable: true).default([])
-    Each      = Dry::Types['array'].of(Struct).meta(omittable: true).default([])
-    Date      = Dry::Types['params.date'].optional.meta(omittable: true).default(nil)
-    DateTime  = Dry::Types['params.date_time'].optional.meta(omittable: true).default(nil)
-    Time      = Dry::Types['params.time'].optional.meta(omittable: true).default(nil)
+    Struct    = EasyParams::Base
+    Integer   = Dry::Types['params.integer'].optional.default(nil)
+    Decimal   = Dry::Types['params.decimal'].optional.default(nil)
+    Float     = Dry::Types['params.float'].optional.default(nil)
+    Bool      = Dry::Types['params.bool'].optional.default(nil)
+    String    = Dry::Types['coercible.string'].optional.default(nil)
+    Array     = Dry::Types['array'].default([].freeze)
+    Date      = Dry::Types['params.date'].optional.default(nil)
+    DateTime  = Dry::Types['params.date_time'].optional.default(nil)
+    Time      = Dry::Types['params.time'].optional.default(nil)
 
-    STRUCT_TYPES_LIST = [Struct, Has].freeze
-    ARRAY_OF_STRUCTS_TYPES_LIST = [Array.of(Struct), Each].freeze
+    STRUCT_TYPES_LIST = [Struct].freeze
+    ARRAY_OF_STRUCTS_TYPES_LIST = [Array.of(Struct)].freeze
   end
 end

data/lib/easy_params/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_params
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrii Baran
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2024-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel