nxt_schema 0.1.0 → 1.0.2

data/lib/nxt_schema/template/leaf.rb

@@ -0,0 +1,13 @@
+module NxtSchema
+  module Template
+    class Leaf < Template::Base
+      def initialize(name:, type: :String, parent_node:, **options, &block)
+        super
+      end
+
+      def leaf?
+        true
+      end
+    end
+  end
+end

data/lib/nxt_schema/template/maybe_evaluator.rb

@@ -0,0 +1,28 @@
+module NxtSchema
+  module Template
+    class MaybeEvaluator
+      def initialize(value:)
+        @value = value
+      end
+
+      def call(target = nil, *args)
+        evaluator = evaluator(target, *args)
+
+        if evaluator.value?
+          # When a value was given we check if this equals to the input
+          evaluator.call == target
+        else
+          evaluator.call
+        end
+      end
+
+      private
+
+      def evaluator(target, *args)
+        Callable.new(value, target, *args)
+      end
+
+      attr_reader :value
+    end
+  end
+end

data/lib/nxt_schema/template/on_evaluator.rb

@@ -0,0 +1,25 @@
+module NxtSchema
+  module Template
+    class OnEvaluator
+      def initialize(condition:, value:)
+        @condition = condition
+        @value = value
+      end
+
+      def call(target = nil, *args, &block)
+        return unless condition_applies?(target, *args)
+
+        result = Callable.new(value, target, *args).call
+        block.yield(result)
+      end
+
+      private
+
+      def condition_applies?(target, *args)
+        Callable.new(condition, target, *args).call
+      end
+
+      attr_reader :condition, :value
+    end
+  end
+end

data/lib/nxt_schema/template/schema.rb

@@ -0,0 +1,22 @@
+module NxtSchema
+  module Template
+    class Schema < Template::Base
+      include HasSubNodes
+
+      DEFAULT_TYPE = NxtSchema::Types::Strict::Hash
+
+      def initialize(name:, type: DEFAULT_TYPE, parent_node:, **options, &block)
+        super
+        ensure_sub_nodes_present
+      end
+
+      def optional(name, node_or_type_of_node, **options, &block)
+        node(name, node_or_type_of_node, **options.merge(optional: true), &block)
+      end
+
+      def omnipresent(name, node_or_type_of_node, **options, &block)
+        node(name, node_or_type_of_node, **options.merge(omnipresent: true), &block)
+      end
+    end
+  end
+end

data/lib/nxt_schema/template/sub_nodes.rb

@@ -0,0 +1,22 @@
+module NxtSchema
+  module Template
+    class SubNodes < ::Hash
+      def initialize
+        super
+        transform_keys { |k| k.to_sym }
+      end
+
+      def add(node)
+        node_name = node.name
+        ensure_node_name_free(node_name)
+        self[node_name] = node
+      end
+
+      def ensure_node_name_free(name)
+        return unless key?(name)
+
+        raise KeyError, "Node with name '#{name}' already exists! Node names must be unique!"
+      end
+    end
+  end
+end

data/lib/nxt_schema/template/type_resolver.rb

@@ -0,0 +1,39 @@
+module NxtSchema
+  module Template
+    class TypeResolver
+      def resolve(type_system, type)
+        @resolve ||= {}
+        @resolve[type] ||= begin
+          if type.is_a?(Symbol)
+            resolve_type_from_symbol(type, type_system)
+          elsif type.respond_to?(:call)
+            type
+          else
+            raise_type_not_resolvable_error(type)
+          end
+        rescue NxtRegistry::Errors::KeyNotRegisteredError => error
+          raise_type_not_resolvable_error(type)
+        end
+      end
+
+      private
+
+      def resolve_type_from_symbol(type, type_system)
+        classified_type = type.to_s.classify
+
+        return type_system.const_get(classified_type) if type_defined_in_type_system?(type, type_system)
+        return NxtSchema::Types::Nominal.const_get(classified_type) if type_defined_in_type_system?(type, NxtSchema::Types::Nominal)
+
+        NxtSchema::Types.registry(:types).resolve!(type)
+      end
+
+      def type_defined_in_type_system?(type, type_system)
+        type_system.constants.include?(type)
+      end
+
+      def raise_type_not_resolvable_error(type)
+        raise ArgumentError, "Can't resolve type: #{type}"
+      end
+    end
+  end
+end

data/lib/nxt_schema/template/type_system_resolver.rb

@@ -0,0 +1,22 @@
+module NxtSchema
+  module Template
+    class TypeSystemResolver
+      include NxtInit
+      attr_init :node
+
+      delegate_missing_to :node
+
+      def call
+        type_system = options.fetch(:type_system) { parent_node&.type_system }
+
+        if type_system.is_a?(Module)
+          type_system
+        elsif type_system.is_a?(Symbol) || type_system.is_a?(String)
+          "NxtSchema::Types::#{type_system.to_s.classify}".constantize
+        else
+          NxtSchema::Types
+        end
+      end
+    end
+  end
+end

data/lib/nxt_schema/types.rb

@@ -1,10 +1,13 @@
 module NxtSchema
   module Types
     include Dry.Types()
+    extend NxtRegistry
 
-    StrippedString = Strict::String.constructor(->(string) { string&.strip })
-    StrippedNonBlankString = StrippedString.constrained(min_size: 1)
-    Enums = -> (*values) { Strict::String.enum(*values) } # Use as NxtSchema::Types::Enums[*ROLES]
-    SymbolizedEnums = -> (*values) { Coercible::Symbol.enum(*values) } # Use as NxtSchema::Types::SymboleEnums[*ROLES]
+    registry(:types, call: false) do
+      register(:StrippedString, Strict::String.constructor(->(string) { string&.strip }))
+      register(:LengthyStrippedString, resolve!(:StrippedString).constrained(min_size: 1))
+      register(:Enum, -> (*values) { Strict::String.enum(*values) })
+      register(:SymbolizedEnum, -> (*values) { Coercible::Symbol.enum(*values) })
+    end
   end
 end

data/lib/nxt_schema/undefined.rb

@@ -1,7 +1,9 @@
 module NxtSchema
   class Undefined
     def inspect
-      'undefined'
+      self.class.name
     end
+
+    alias to_s inspect
   end
-end
+end

data/lib/nxt_schema/validators/{equality.rb → equal_to.rb}

@@ -5,7 +5,7 @@ module NxtSchema
         @expectation = expectation
       end
 
-      register_as :equality, :eql
+      register_as :equal_to, :eql
       attr_reader :expectation
 
       # Query for equality validator(:equality, 3)
@@ -13,7 +13,7 @@ module NxtSchema
 
       def build
         lambda do |node, value|
-          expected_value = expectation.respond_to?(:call) ? Callable.new(expectation).call(node, value) : expectation
+          expected_value = Callable.new(expectation, nil, value).call
 
           if value == expected_value
             true

data/lib/nxt_schema/validators/error_messages.rb

@@ -0,0 +1,42 @@
+module NxtSchema
+  module Validators
+    class ErrorMessages
+      class << self
+        def values
+          @values ||= {}
+        end
+
+        def values=(value)
+          @values = value
+        end
+
+        def load(paths = files)
+          Array(paths).each do |path|
+            new_values = YAML.load(ERB.new(File.read(path)).result).with_indifferent_access
+            self.values = values.deep_merge!(new_values)
+          end
+        end
+
+        def resolve(locale, key, **options)
+          message = begin
+            values.fetch(locale).fetch(key)
+          rescue KeyError
+            raise "Could not resolve error message for #{locale}->#{key}"
+          end
+
+          message % options
+        end
+
+        def files
+          @files ||= begin
+            files = Dir.entries(File.expand_path('../error_messages/', __FILE__)).map do |filename|
+              File.expand_path("../error_messages/#{filename}", __FILE__)
+            end
+
+            files.select { |f| !File.directory? f }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/nxt_schema/{error_messages → validators/error_messages}/en.yaml

@@ -1,15 +1,16 @@
 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}"
+  equal_to: "%{actual} does not equal %{expected}"
   excludes: "%{value} cannot contain %{target}"
   includes: "%{value} must include %{target}"
-  excluded: "%{value} must be excluded in %{target}"
-  included: "%{value} must be included in %{target}"
+  excluded_in: "%{value} must be excluded in %{target}"
+  included_in: "%{value} must be included in %{target}"
   greater_than: "%{value} must be greater than %{threshold}"
   greater_than_or_equal: "%{value} must be greater than or equal to %{threshold}"
   less_than: "%{value} must be less than %{threshold}"
   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/validators/{excluded.rb → excluded_in.rb}

@@ -5,7 +5,7 @@ module NxtSchema
         @target = target
       end
 
-      register_as :excluded
+      register_as :excluded_in
       attr_reader :target
 
       def build

data/lib/nxt_schema/validators/{included.rb → included_in.rb}

@@ -5,7 +5,7 @@ module NxtSchema
         @target = target
       end
 
-      register_as :included
+      register_as :included_in
       attr_reader :target
 
       def build

data/lib/nxt_schema/validators/includes.rb

@@ -13,7 +13,7 @@ module NxtSchema
           if value.include?(target)
             true
           else
-            message = translate_error(node.locale, value: value, target: target)
+            message = translate_error(coerced?.locale, value: value, target: target)
             node.add_error(message)
           end
         end

data/lib/nxt_schema/validators/optional_node.rb

@@ -13,12 +13,17 @@ module NxtSchema
         lambda do |node, value|
           args = [node, value]
 
-          if conditional.call(*args.take(conditional.arity))
-            true
-          else
-            message = ErrorMessages.resolve(node.locale, :required_key_missing, key: missing_key, target: node.value)
-            node.add_error(message)
-          end
+          return if conditional.call(*args.take(conditional.arity))
+          return if node.send(:keys).include?(missing_key.to_sym)
+
+          message = ErrorMessages.resolve(
+            node.locale,
+            :required_key_missing,
+            key: missing_key,
+            target: node.input
+          )
+
+          node.add_error(message)
         end
       end
     end

data/lib/nxt_schema/validators/registry.rb

@@ -1,11 +1,5 @@
 module NxtSchema
   module Validators
-    class Registry
-      extend NxtRegistry
-
-      VALIDATORS = registry :validators, call: false do
-
-      end
-    end
+    REGISTRY = NxtRegistry::Registry.new(call: false)
   end
 end

data/lib/nxt_schema/{node → validators}/validate_with_proxy.rb

@@ -1,5 +1,5 @@
 module NxtSchema
-  module Node
+  module Validator
     class ValidateWithProxy
       def initialize(node)
         @node = node
@@ -33,8 +33,8 @@ module NxtSchema
       attr_reader :aggregated_errors
 
       def validator(key, *args)
-        validator = node.validator(key, *args)
-        validator.call(self, node.value)
+        validator = node.node.send(:validator, key, *args)
+        validator.call(self, node.input)
       end
     end
   end

data/lib/nxt_schema/validators/validator.rb

@@ -3,14 +3,14 @@ module NxtSchema
     class Validator
       def self.register_as(*keys)
         keys.each do |key|
-          NxtSchema::Validators::Registry::VALIDATORS.register(key, self)
+          NxtSchema::Validators::REGISTRY.register(key, self)
         end
 
         define_method('key') { @key ||= keys.first }
       end
 
       def translate_error(locale, **options)
-        NxtSchema::ErrorMessages.resolve(locale, key, **options)
+        NxtSchema::Validators::ErrorMessages.resolve(locale, key, **options)
       end
     end
   end

data/lib/nxt_schema/version.rb

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

data/nxt_schema.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "dry-types"
   spec.add_dependency "nxt_registry"
+  spec.add_dependency "nxt_init"
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nxt_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Andreas Robecke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2021-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nxt_init
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +145,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -141,37 +156,44 @@ files:
 - bin/setup
 - lib/nxt_schema.rb
 - lib/nxt_schema/callable.rb
-- lib/nxt_schema/callable_or_value.rb
 - lib/nxt_schema/dsl.rb
-- lib/nxt_schema/error_messages.rb
-- lib/nxt_schema/error_messages/en.yaml
-- lib/nxt_schema/errors.rb
-- lib/nxt_schema/errors/error.rb
-- lib/nxt_schema/errors/invalid_options_error.rb
-- lib/nxt_schema/errors/schema_not_applied_error.rb
+- lib/nxt_schema/error.rb
+- lib/nxt_schema/errors/coercion_error.rb
+- lib/nxt_schema/errors/invalid.rb
+- lib/nxt_schema/errors/invalid_options.rb
 - lib/nxt_schema/node.rb
+- lib/nxt_schema/node/any_of.rb
 - lib/nxt_schema/node/base.rb
 - lib/nxt_schema/node/collection.rb
-- lib/nxt_schema/node/constructor.rb
-- lib/nxt_schema/node/default_value_evaluator.rb
-- lib/nxt_schema/node/error.rb
-- lib/nxt_schema/node/has_subnodes.rb
+- lib/nxt_schema/node/error_store.rb
+- lib/nxt_schema/node/errors/schema_error.rb
+- lib/nxt_schema/node/errors/validation_error.rb
 - lib/nxt_schema/node/leaf.rb
-- lib/nxt_schema/node/maybe_evaluator.rb
 - lib/nxt_schema/node/schema.rb
-- lib/nxt_schema/node/template_store.rb
-- lib/nxt_schema/node/type_resolver.rb
-- lib/nxt_schema/node/validate_with_proxy.rb
 - lib/nxt_schema/registry.rb
+- lib/nxt_schema/registry/proxy.rb
+- lib/nxt_schema/template/any_of.rb
+- lib/nxt_schema/template/base.rb
+- lib/nxt_schema/template/collection.rb
+- lib/nxt_schema/template/has_sub_nodes.rb
+- lib/nxt_schema/template/leaf.rb
+- lib/nxt_schema/template/maybe_evaluator.rb
+- lib/nxt_schema/template/on_evaluator.rb
+- lib/nxt_schema/template/schema.rb
+- lib/nxt_schema/template/sub_nodes.rb
+- lib/nxt_schema/template/type_resolver.rb
+- lib/nxt_schema/template/type_system_resolver.rb
 - lib/nxt_schema/types.rb
 - lib/nxt_schema/undefined.rb
 - lib/nxt_schema/validators/attribute.rb
-- lib/nxt_schema/validators/equality.rb
-- lib/nxt_schema/validators/excluded.rb
+- lib/nxt_schema/validators/equal_to.rb
+- lib/nxt_schema/validators/error_messages.rb
+- lib/nxt_schema/validators/error_messages/en.yaml
+- lib/nxt_schema/validators/excluded_in.rb
 - lib/nxt_schema/validators/excludes.rb
 - lib/nxt_schema/validators/greater_than.rb
 - lib/nxt_schema/validators/greater_than_or_equal.rb
-- lib/nxt_schema/validators/included.rb
+- lib/nxt_schema/validators/included_in.rb
 - lib/nxt_schema/validators/includes.rb
 - lib/nxt_schema/validators/less_than.rb
 - lib/nxt_schema/validators/less_than_or_equal.rb
@@ -179,6 +201,7 @@ files:
 - lib/nxt_schema/validators/pattern.rb
 - lib/nxt_schema/validators/query.rb
 - lib/nxt_schema/validators/registry.rb
+- lib/nxt_schema/validators/validate_with_proxy.rb
 - lib/nxt_schema/validators/validator.rb
 - lib/nxt_schema/version.rb
 - nxt_schema.gemspec
@@ -204,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Write a short summary, because RubyGems requires one.