nxt_schema 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09685f892e03e96e13235c9f5d98c78ddbacd8118a47062c3a4417530cd2a3b0'
-  data.tar.gz: ec1b647208395d39dc5f61639dcfdfa1ea65caadfa9cd9011414ed9a5a5d9430
+  metadata.gz: cad6184f1a5fa47bc5991c5b6b31885d2afc9878e45b1e07a66752f3c7083c73
+  data.tar.gz: 8ad13387193ae20005ace29aae75f62ffe251ceaf43209abd85c2b8df6d832eb
 SHA512:
-  metadata.gz: 56489e75d59dc6f21f8237fcebc14236113c2e14cb47adb986989f819d0937353b1dd37763b522737923e3a87966eda2bf339f42055383fc8d174d536f1d32e5
-  data.tar.gz: 1f595737e27ff2c874c807b2339eee3781799a64cac27bd3724642898db6200ec60279edd72b50f100d3a52ff4f8ef155e97392b8738186258d8fd93dbdd65b0
+  metadata.gz: 5e2d1ba3e0543713e04ba8432b55482fb8e73684b6bcc7b5040e7a9b2d24ddbd07b512bb9fecd0aa2e543da924de4e13195325a72c5b84bab93b540aa5a590b6
+  data.tar.gz: 85f3476e6de7ae21ae578f0c3ac0c6f40b367016d092937d0d107f97a0580e2caaf9b1500d2f11a522597633cfc56b42f427964e8326744abafdf77f18b8a5d4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nxt_schema (0.1.0)
+    nxt_schema (0.1.1)
       activesupport
       dry-types
       nxt_registry
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.1)
+    activesupport (6.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -18,7 +18,7 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    dry-configurable (0.11.2)
+    dry-configurable (0.11.5)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
       dry-equalizer (~> 0.2)
@@ -33,7 +33,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-types (1.3.1)
+    dry-types (1.4.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)
@@ -47,7 +47,7 @@ GEM
       hirb (>= 0.6.0)
     method_source (0.9.2)
     minitest (5.14.0)
-    nxt_registry (0.1.4)
+    nxt_registry (0.1.5)
       activesupport
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -69,7 +69,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -29,6 +29,13 @@ schema = NxtSchema.root(:company) do
     requires(:street, :String)
     requires(:street_number, :Integer)
   end
+
+  # Use nodes to create an array of typed nodes
+  # The following simple means an array of strings 
+  nodes(:products) do
+    node(:product, :String)
+  end
+
     
   nodes(:employees) do
     hash(:employee) do
@@ -367,8 +374,13 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
-# TODO:    
+### TODO:    
 
+- Conditionally required keys:
+    required bool => required
+    required conditionally => condition applies => required
+    required conditionally => condition does not apply => not allowed 
+    
 - Explain the difference between array nodes and typed array nodes
 - Should we translate coercion errors as well?
 - Test the different scenarios of merging schemas array, hash, ...

data/lib/nxt_schema/error_messages/en.yaml

@@ -1,6 +1,6 @@
 en:
-  required_key_missing: "Required key :%{key} is missing in %{target}"
-  additional_keys_detected: "Additional keys %{keys} not allowed in %{target}"
+  required_key_missing: "Required key :%{key} is missing"
+  additional_keys_detected: "Additional keys %{keys} not allowed"
   attribute: "%{attribute} has invalid %{attribute_name} attribute of %{value}"
   equality: "%{actual} does not equal %{expected}"
   excludes: "%{value} cannot contain %{target}"
@@ -13,3 +13,4 @@ en:
   less_than_or_equal: "%{value} must be less than or equal to %{threshold}"
   pattern: "%{value} must match pattern %{pattern}"
   query: "%{value}.%{query} was %{actual} and must be true"
+  emptiness: "%{value} cannot not be empty"

data/lib/nxt_schema/node/base.rb

@@ -84,19 +84,17 @@ module NxtSchema
         self
       end
 
-      def optional(optional_value, &block)
+      def optional(optional_value = nil, &block)
         raise ArgumentError, 'Optional nodes can only exist within schemas' unless parent.is_a?(NxtSchema::Node::Schema)
 
-        options.merge!(optional: optional_value)
-        evaluate_block(block) if block_given?
+        options.merge!(optional: optional_value || block)
         self
       end
 
-      def presence(presence_value, &block)
+      def presence(presence_value = nil, &block)
         raise ArgumentError, 'Present nodes can only exist within schemas' unless parent.is_a?(NxtSchema::Node::Schema)
 
-        options.merge!(presence: presence_value)
-        evaluate_block(block) if block_given?
+        options.merge!(presence: presence_value || block)
         self
       end
 

data/lib/nxt_schema/node/collection.rb

@@ -26,6 +26,11 @@ module NxtSchema
 
             current_node_store = {}
 
+            # if value.empty?
+            #   message = ErrorMessages.resolve(locale, :emptiness, value: value)
+            #   add_error(message)
+            # end
+
             value.each_with_index do |item, index|
               item_schema_errors = schema_errors[index] ||= { schema_errors_key => [] }
               validation_errors[index] ||= { schema_errors_key => [] }
@@ -36,7 +41,6 @@ module NxtSchema
                 current_node.apply(item, parent_node: self, context: context)
                 value_store[index] = current_node.value
 
-                # TODO: Extract method here
                 unless current_node.schema_errors?
                   current_node_store.each do |node_name, node|
                     node.schema_errors = { }

data/lib/nxt_schema/version.rb

@@ -1,3 +1,3 @@
 module NxtSchema
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/nxt_schema.rb

@@ -1,5 +1,4 @@
 require "nxt_schema/version"
-require "pry"
 require "active_support/all"
 require 'dry-types'
 require 'nxt_registry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nxt_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andreas Robecke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport