easy_params 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38358431f3a00f55f6a46aaa72941c1cbe0fe5f81d6a2fd898a019e09c2cf069
-  data.tar.gz: 218c09133f6cc7220545fe2fbdf34deefc8a6ab4941d6ef9e729d264f6ecca93
+  metadata.gz: 6c3709594b8141aa9bc0d851a2f1eabcf40b7528637ad3d055c76e3ad7db1ac8
+  data.tar.gz: da9839e5b6f8242fe05ad074868fb23a3181840b723333b7fa66f9717efca4d7
 SHA512:
-  metadata.gz: 8674d76046f76b6ce08e0e1a7c2a1d8c12f55bf549b4ea580fcfcf1b6a5b50cda6caa6621b684fd94a41a8bad3a25044de5ea2b8b2f68e7496e6dec00e86d3ea
-  data.tar.gz: 268b513fff84704447102ee24f1cfef76e271c73a7ab7379eef1fc1093307c69d462d0679eb387d85bc90031e588d399b53ba2c233c94829e335efe4abf7eee6
+  metadata.gz: 784db4e629c9800db787546346c9dd555ec277f578ecebfa9d59d5d76bb0532612d04a9e711b0f76a5040c9257673bf9e2c97ca85cb47bb1addeb67b7549310d
+  data.tar.gz: 20ced440392006961a46feab7eea99b2a71dc752dbf4f04559041f5fb9f7aa861524faec9d50cab56b3c13ca29dff7ec9dd192012289ed84061485a7ad1f094a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    easy_params (0.3.1)
+    easy_params (0.4.1)
       activemodel (>= 3.2, < 8)
       dry-struct (~> 1.4)
       dry-types (~> 1.5)
@@ -9,46 +9,55 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.6)
-      activesupport (= 7.0.6)
-    activesupport (7.0.6)
+    activemodel (7.1.2)
+      activesupport (= 7.1.2)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.5)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     diff-lcs (1.4.4)
     docile (1.3.5)
-    dry-configurable (0.14.0)
+    drb (2.2.0)
+      ruby2_keywords
+    dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.6)
-    dry-container (0.9.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
+    dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-    dry-core (0.7.1)
-      concurrent-ruby (~> 1.0)
-    dry-inflector (0.3.0)
-    dry-logic (1.2.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-struct (1.4.0)
-      dry-core (~> 0.5, >= 0.5)
-      dry-types (~> 1.5)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-struct (1.6.0)
+      dry-core (~> 1.0, < 2)
+      dry-types (>= 1.7, < 2)
       ice_nine (~> 0.11)
-    dry-types (1.5.1)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.2)
+      bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.6.3)
     method_source (1.0.0)
-    minitest (5.18.1)
+    minitest (5.21.1)
+    mutex_m (0.2.0)
     parallel (1.23.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)
@@ -89,6 +98,7 @@ GEM
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -98,6 +108,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby

data/lib/easy_params/base.rb

@@ -11,14 +11,48 @@ module EasyParams
       'EasyParams::Base'
     end
 
-    %w[Integer Decimal Float Bool String Array Date DateTime Time Struct StructDSL].each do |type|
-      send(:define_singleton_method, type.underscore) { EasyParams::Types.const_get(type) }
-    end
-
     validate do
       validate_nested
     end
 
+    # %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, 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, optional: nil, **validations, &block)
+      validates param_name, **validations if validations.any?
+      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, 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, 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
+
     private
 
     def validate_nested

data/lib/easy_params/types.rb

@@ -2,19 +2,18 @@
 
 module EasyParams
   module Types
-    Struct    = EasyParams::Base.meta(omittable: true)
-    StructDSL = ::Class.new(EasyParams::Base).extend(EasyParams::DSL).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['strict.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([])
-    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, StructDSL].freeze
-    ARRAY_OF_STRUCTS_TYPES_LIST = [Array.of(Struct), Array.of(StructDSL)].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.3.1'
+  VERSION = '0.4.1'
 end

data/lib/easy_params.rb

@@ -4,7 +4,6 @@ require 'dry-struct'
 require 'dry-types'
 require 'active_model'
 require 'easy_params/base'
-require 'easy_params/dsl'
 require 'easy_params/types'
 require 'easy_params/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_params
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrii Baran
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2024-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -82,7 +82,6 @@ files:
 - easy_params.gemspec
 - lib/easy_params.rb
 - lib/easy_params/base.rb
-- lib/easy_params/dsl.rb
 - lib/easy_params/types.rb
 - lib/easy_params/version.rb
 homepage: https://github.com/andriy-baran/easy_params

data/lib/easy_params/dsl.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module EasyParams
-  # Makes definition more compact
-  # Do not use if your attributes have name like
-  # integer, decimal, float, bool, string, array, date, datetime, time, struct
-  module DSL
-    def each(&block)
-      array.of(struct_dsl, &block)
-    end
-
-    def has(&block)
-      struct_dsl(&block)
-    end
-
-    def method_missing(method_name, *args, &block)
-      public_send(:attribute, method_name, *args, &block)
-    end
-
-    def respond_to_missing?(*)
-      true
-    end
-  end
-end