sukima 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0f853475790323284d4fe5b10a7cacf89dc188d8475cbc8b71362f9a91f29b9
-  data.tar.gz: 9e02cc197ee1e5c2a544c9523d2d07cf4f8c7e0ff33864853a13acfd8d486e90
+  metadata.gz: d3a1f4531a794d22f40e97a2040a3ceb06c81071a7ed2313c13fa2eec8a6a66b
+  data.tar.gz: d0f61856e6a1b96f90a0e31d48365eb8ee93da9bda90be604d98404741438a4d
 SHA512:
-  metadata.gz: ca640d8347b57db0df371ae7138167930f9368cedbff5669f6e05e180f07a1a84f478d4e1d76c123aa41718b5ed92a6ae7fd9777968185a07c50a7d904f5350c
-  data.tar.gz: b561b6fbfde7f97c07af05c918596f61fcb148f5ed569a7e6304a64753ad850d1a770d0b570e2cb7e9637d19bcaccf082a43235334f5fefcb2d47414f9510fad
+  metadata.gz: 7995b0ac51c9af4183e7430969d8274d5e31ab181eb911efc36aa2fb072a77ad9156b9b80eee46fb7d55bf75cdc54ee39aac372688ab7d683afed1ef0a686ac9
+  data.tar.gz: a2fe41957351e0e1ee95b31a8de3343d8df2db2108db7a54f74f46815287a297dfabb7a060cafd222da562ad4aa21c1e06c7f88968a3fcbf39779d2754eb5811

data/lib/sukima/constraints.rb

@@ -1,40 +1,21 @@
 # frozen_string_literal: true
 
 class Sukima
-  class Constraints
-    @registrations = {}
-
+  module Constraints
     class << self
-      attr_reader :registrations
-
-      def const_added(const_name)
-        constrant_name = const_name.to_s
-        constrant_name.gsub!(/(?<=[[:lower:]])(?=[[:upper:]])/, '_')
-        constrant_name.downcase!
-        @registrations[constrant_name.to_sym] = const_get(const_name).new
+      def type(type, value)
+        "should be #{type}" unless value.is_a?(type)
       end
-    end
 
-    class Type
-      def call(type, value)
-        "should be #{type}" unless value.nil? || value.is_a?(type)
-      end
-    end
-
-    class In
-      def call(range, value)
+      def in(range, value)
         "should be in #{range}" unless range.include?(value)
       end
-    end
 
-    class Format
-      def call(pattern, value)
+      def format(pattern, value)
         "should match #{pattern.source}" unless value.is_a?(String) && pattern.match?(value)
       end
-    end
 
-    class Length
-      def call(args, value)
+      def length(args, value)
         case args
         when Integer
           "should have length of #{args}" unless value.respond_to?(:length) && value.length == args
@@ -42,10 +23,8 @@ class Sukima
           "should have length in #{args}" unless value.respond_to?(:length) && args.include?(value.length)
         end
       end
-    end
 
-    class Nonnil
-      def call(_, value)
+      def nonnil(_, value)
         'should not be nil' if value.nil?
       end
     end

data/lib/sukima/dsl.rb

@@ -7,8 +7,8 @@ class Sukima
       @error_field = error_field
     end
 
-    def field(name, *args, **, &)
-      schema = args.first.is_a?(Sukima) ? args.shift : Sukima.new(*args, **, &)
+    def field(name, schema = nil, **, &)
+      schema = Sukima.new(**, &) if schema.nil?
       if @value.key?(name)
         result = schema.validate(@value[name])
         @error_field[name] = result unless result.valid?
@@ -17,8 +17,8 @@ class Sukima
       end
     end
 
-    def items(*args, **, &)
-      schema = args.first.is_a?(Sukima) ? args.shift : Sukima.new(*args, **, &)
+    def items(schema = nil, **, &)
+      schema = Sukima.new(**, &) if schema.nil?
       @value.each_with_index do |item, index|
         result = schema.validate(item)
         @error_field[index] = result unless result.valid?

data/lib/sukima/error_field.rb

@@ -17,12 +17,8 @@ class Sukima
       @children[name] = value
     end
 
-    def dig(*)
-      @children.dig(*)
-    end
-
     def valid?
-      return false if @errors.any?
+      return false unless @errors.empty?
 
       @children.each_value { return false unless _1.valid? }
       true
@@ -30,9 +26,9 @@ class Sukima
 
     def messages(path = [])
       prefix = path.empty? ? '' : "#{path.join('.')} "
-      result = @errors.dup.map! { "#{prefix}#{_1}" }
-      @children.map do |name, error_field|
-        result.concat(error_field.messages([*path, name]))
+      result = @errors.map { "#{prefix}#{_1}" }
+      @children.each do |name, error_field|
+        result.concat(error_field.messages(path + [name]))
       end
       result
     end

data/lib/sukima.rb

@@ -14,13 +14,16 @@ class Sukima
 
   def validate(value)
     error_field = ErrorField.new
+    return error_field if !@constraints[:nonnil] && value.nil?
+
     @constraints.each do |key, args|
       next if key == :required
 
-      message = Constraints.registrations[key].call(args, value)
+      message = Constraints.send(key, args, value)
       error_field.errors << message if message
     end
-    Dsl.new(value, error_field).instance_exec(value, &@block) if @block
+
+    Dsl.new(value, error_field).instance_exec(value, &@block) if @block && value.is_a?(@constraints[:type])
     error_field
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sukima
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Weihang Jian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,8 +66,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.64'
-description: Sukima is a lightweight data validation library for Ruby written in only
-  100+ lines of code. It provides a simple and flexible way to define constraints
+description: Sukima is a lightweight data schema validation library for Ruby written
+  in only ~100 lines of code. It provides a simple and flexible way to define constraints
   for data and validate it.
 email: tonytonyjan@gmail.com
 executables: []
@@ -101,5 +101,5 @@ requirements: []
 rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
-summary: Lightweight data validation library for Ruby.
+summary: Lightweight data schema validation library for Ruby.
 test_files: []