kangaru 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db7c4419e9f9d9661c4d12498fcb5450cde2f209958f0bb7249a39dec4a93b54
-  data.tar.gz: 43b3237bf249c4c4a3ef59eddbd4328a7b03a0084d9c69296557bab93d0b1492
+  metadata.gz: 9007bb0fb5d483fe6fb13697b94ec895958b93c5db157e82e4e7178e04278137
+  data.tar.gz: ff23e3595c129e04ae6391269570060929ecc73409d3e024eef14374c7d5957e
 SHA512:
-  metadata.gz: c2c5dff9c5ecd0a4401261203f6c89d5837b7824dae3e88d8dd1ad7683f7ae9b65200892d81f4d20d181acca253c5b4dab9b48c24dae32c069dd3ddcea8fd5d9
-  data.tar.gz: 6b1c7bbef5ef7a08437b5bd33b7fcfa8d2106bd29b52f8df7e56a228caff297fd22df609b96d8a6828390d6bc503bf4105fab52064efb1b4e146866e81a30162
+  metadata.gz: c3eb823da88e761346f49eff461333b79fe63768eb5093be6b6842e911eb9a4feab588755c7bceed9fc16d74118cc25cadf715b7f7dea829b47441c48843b86a
+  data.tar.gz: b1e203b218b378f571568e2730cd199ff8bc785929ec7eb1d8f42de3b34ce1f486fff4323607d95593bf7e2ae000db0b26a0eb0d6cd8d198464e122073b581b9

data/.rubocop.yml

@@ -65,6 +65,7 @@ RSpec/ExpectChange:
 RSpec/FilePath:
   Exclude:
     - spec/kangaru/components/**/*.rb
+    - spec/kangaru/concerns/**/*.rb
 RSpec/LetSetup:
   Enabled: false
 RSpec/MultipleMemoizedHelpers:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kangaru (0.2.0)
+    kangaru (0.2.2)
       colorize (~> 1.1)
       erb (~> 4.0)
       sequel (~> 5.72)

data/lib/kangaru/application.rb

@@ -24,11 +24,8 @@ module Kangaru
       @router ||= Router.new(namespace:)
     end
 
-    # If called with no env, the config will be applied regardless of current
-    # env. If multiple configure calls matching the current env are made, the
-    # most recent calls will overwrite older changes.
-    def configure(env = nil, &block)
-      block.call(config) if current_env?(env)
+    def configure(&block)
+      block.call(config)
     end
 
     def configured?
@@ -62,13 +59,6 @@ module Kangaru
 
     private
 
-    # Returns true if nil as this is represents all envs.
-    def current_env?(env)
-      return true if env.nil?
-
-      Kangaru.env?(env)
-    end
-
     def autoloader
       @autoloader ||= Zeitwerk::Loader.new.tap do |loader|
         loader.inflector = Zeitwerk::GemInflector.new(paths.source.to_s)

data/lib/kangaru/concern.rb

@@ -0,0 +1,31 @@
+module Kangaru
+  module Concern
+    def append_features(base)
+      super
+      evaluate_concern_blocks!(base)
+    end
+
+    def class_methods(&)
+      if const_defined?(:ClassMethods)
+        const_get(:ClassMethods)
+      else
+        const_set(:ClassMethods, Module.new)
+      end.module_eval(&)
+    end
+
+    def included(base = nil, &block)
+      super base if base
+      return if block.nil?
+
+      @included = block
+    end
+
+    private
+
+    def evaluate_concern_blocks!(base)
+      base.extend(const_get(:ClassMethods)) if const_defined?(:ClassMethods)
+
+      base.class_eval(&@included) if instance_variable_defined?(:@included)
+    end
+  end
+end

data/lib/kangaru/concerns/attributable.rb

@@ -0,0 +1,33 @@
+module Kangaru
+  module Attributable
+    extend Concern
+
+    class_methods do
+      def attributes
+        instance_methods.grep(/\w=$/).map do |attribute|
+          attribute.to_s.delete_suffix("=").to_sym
+        end
+      end
+
+      def set_default(**attributes)
+        defaults.merge!(**attributes)
+      end
+
+      def defaults
+        @defaults ||= {}
+      end
+    end
+
+    def initialize(**attributes)
+      attributes = self.class.defaults.merge(**attributes)
+
+      merge!(**attributes)
+    end
+
+    def merge!(**attributes)
+      attributes.slice(*self.class.attributes).each do |attr, value|
+        instance_variable_set(:"@#{attr}", value)
+      end
+    end
+  end
+end

data/lib/kangaru/concerns/configurable.rb

@@ -1,23 +1,21 @@
 module Kangaru
-  module Concerns
-    module Configurable
-      extend Concern
+  module Configurable
+    extend Concern
 
-      using Patches::Inflections
+    using Patches::Inflections
 
-      class_methods do
-        def configurator_key
-          (name || raise("class name not set"))
-            .gsub(/^.*::/, "")
-            .to_snakecase
-            .to_sym
-        end
+    class_methods do
+      def configurator_key
+        (name || raise("class name not set"))
+          .gsub(/^.*::/, "")
+          .to_snakecase
+          .to_sym
       end
+    end
 
-      def config
-        Kangaru.application!.config[self.class.configurator_key] ||
-          raise("inferred configurator not set by application")
-      end
+    def config
+      Kangaru.application!.config[self.class.configurator_key] ||
+        raise("inferred configurator not set by application")
     end
   end
 end

data/lib/kangaru/concerns/validatable.rb

@@ -1,46 +1,36 @@
 module Kangaru
-  module Concerns
-    module Validatable
-      extend Concern
-
-      class_methods do
-        def validation_rules
-          @validation_rules ||= {}
-        end
-
-        def validates(attribute, **validations)
-          validation_rules[attribute] ||= {}
-          validation_rules[attribute].merge!(**validations)
-        end
-      end
+  module Validatable
+    extend Concern
 
-      def errors
-        @errors ||= []
+    class_methods do
+      def validation_rules
+        @validation_rules ||= {}
       end
 
-      def validate
-        self.class.validation_rules.each do |attribute, validations|
-          validator = validator_for(attribute)
+      def validates(attribute, **validations)
+        validation_rules[attribute] ||= {}
+        validation_rules[attribute].merge!(**validations)
+      end
+    end
 
-          validations.each do |validator_name, params|
-            params = {} if params == true
+    def errors
+      @errors ||= []
+    end
 
-            validator.validate(validator_name, **params)
-          end
-        end
-      end
+    def validate
+      model_validator.validate!(**self.class.validation_rules)
+    end
 
-      def valid?
-        validate
+    def valid?
+      validate
 
-        errors.empty?
-      end
+      errors.empty?
+    end
 
-      private
+    private
 
-      def validator_for(attribute)
-        Validation::AttributeValidator.new(model: self, attribute:)
-      end
+    def model_validator
+      @model_validator ||= Validation::ModelValidator.new(model: self)
     end
   end
 end

data/lib/kangaru/configurator.rb

@@ -1,7 +1,7 @@
 module Kangaru
   class Configurator
-    include Concerns::AttributesConcern
-    include Concerns::Validatable
+    include Attributable
+    include Validatable
 
     using Patches::Inflections
 

data/lib/kangaru/database.rb

@@ -2,7 +2,7 @@ module Kangaru
   class Database
     extend Forwardable
 
-    include Concerns::AttributesConcern
+    include Attributable
 
     PLUGINS = %i[
       enum

data/lib/kangaru/initialiser.rb

@@ -6,7 +6,7 @@ module Kangaru
       Kangaru.application = Application.new(source:, namespace:)
       Kangaru.eager_load(Initialisers)
 
-      namespace.extend InjectedMethods
+      namespace.extend Interface
     end
   end
 end

data/lib/kangaru/{injected_methods.rb → interface.rb}

@@ -1,5 +1,5 @@
 module Kangaru
-  module InjectedMethods
+  module Interface
     def run!(*argv)
       Kangaru.application!.run!(*argv)
     end
@@ -8,11 +8,15 @@ module Kangaru
       Kangaru.application!.config
     end
 
-    def configure(env = nil, &)
-      Kangaru.application!.configure(env, &)
+    def configure(env: nil, &)
+      return unless env_applies?(env)
+
+      Kangaru.application!.configure(&)
     end
 
-    def import_config_from!(path)
+    def config_path(path, env: nil)
+      return unless env_applies?(env)
+
       Kangaru.application!.config_path = path
     end
 
@@ -23,5 +27,13 @@ module Kangaru
     def database
       Kangaru.application!.database
     end
+
+    private
+
+    def env_applies?(env)
+      return true if env.nil?
+
+      Kangaru.env?(env)
+    end
   end
 end

data/lib/kangaru/model.rb

@@ -1,6 +1,6 @@
 module Kangaru
   Model = Class.new(Sequel::Model) do
-    include Concerns::Validatable
+    include Validatable
   end
 
   Model.def_Model(self)

data/lib/kangaru/patches/inflections.rb

@@ -2,8 +2,10 @@ module Kangaru
   module Patches
     module Inflections
       refine String do
-        def to_class_name
-          Inflectors::ClassInflector.inflect(self)
+        def to_class_name(suffix: nil)
+          class_name = Inflectors::ClassInflector.inflect(self)
+
+          [class_name, suffix.to_s.capitalize].compact.join
         end
 
         def to_constant_name

data/lib/kangaru/request.rb

@@ -2,7 +2,7 @@ module Kangaru
   class Request
     using Patches::Inflections
 
-    include Concerns::Configurable
+    include Configurable
 
     DEFAULT_CONTROLLER = "DefaultController".freeze
 
@@ -18,7 +18,7 @@ module Kangaru
     def controller
       return default_controller if path_parser.controller.nil?
 
-      path_parser.controller&.to_class_name&.concat(Controller::SUFFIX) || raise
+      path_parser.controller&.to_class_name(suffix: Controller::SUFFIX) || raise
     end
 
     def action

data/lib/kangaru/validation/attribute_validator.rb

@@ -10,22 +10,18 @@ module Kangaru
         @attribute = attribute
       end
 
-      def validate(validator, **params)
-        load_validator(validator:, params:).validate
-      end
-
-      private
+      def validate!(**validations)
+        validations.each do |validator, params|
+          params = {} if params == true
 
-      def validator_name(validator)
-        "#{validator.to_s.to_class_name}Validator"
+          load_validator(validator:, **params).validate
+        end
       end
 
-      def load_validator(validator:, params:)
-        name = validator_name(validator)
-
-        raise "#{name} is not defined" unless Validators.const_defined?(name)
+      private
 
-        Validators.const_get(name).new(model:, attribute:, params:)
+      def load_validator(validator:, **params)
+        Validators.get(validator).new(model:, attribute:, **params)
       end
     end
   end

data/lib/kangaru/validation/error.rb

@@ -3,15 +3,11 @@ module Kangaru
     class Error
       using Patches::Inflections
 
-      MESSAGES = {
-        blank: "can't be blank"
-      }.freeze
+      attr_reader :attribute, :message
 
-      attr_reader :attribute, :type
-
-      def initialize(attribute:, type:)
+      def initialize(attribute:, message:)
         @attribute = attribute
-        @type = type
+        @message = message
       end
 
       def full_message
@@ -23,10 +19,6 @@ module Kangaru
       def human_attribute
         attribute.to_s.to_humanised
       end
-
-      def message
-        MESSAGES[type] || raise("invalid message type")
-      end
     end
   end
 end

data/lib/kangaru/validation/model_validator.rb

@@ -0,0 +1,27 @@
+module Kangaru
+  module Validation
+    class ModelValidator
+      attr_reader :model
+
+      def initialize(model:)
+        @model = model
+      end
+
+      def validate!(**rules)
+        rules.each do |attribute, validations|
+          validate_attribute!(attribute, validations)
+        end
+      end
+
+      private
+
+      def validate_attribute!(attribute, validations)
+        load_attribute_validator(attribute).validate!(**validations)
+      end
+
+      def load_attribute_validator(attribute)
+        AttributeValidator.new(model:, attribute:)
+      end
+    end
+  end
+end

data/lib/kangaru/validator.rb

@@ -0,0 +1,20 @@
+module Kangaru
+  class Validator
+    attr_reader :model, :attribute, :params, :value
+
+    def initialize(model:, attribute:, **params)
+      @model = model
+      @attribute = attribute
+      @params = params
+      @value = model.public_send(attribute)
+    end
+
+    def validate
+      raise NotImplementedError
+    end
+
+    def add_error!(message)
+      model.errors << Validation::Error.new(attribute:, message:)
+    end
+  end
+end

data/lib/kangaru/validators/required_validator.rb

@@ -1,10 +1,12 @@
 module Kangaru
   module Validators
     class RequiredValidator < Validator
+      MESSAGE = "can't be blank".freeze
+
       def validate
         return unless value_missing?
 
-        add_error!(:blank)
+        add_error!(MESSAGE)
       end
 
       private

data/lib/kangaru/validators.rb

@@ -0,0 +1,29 @@
+module Kangaru
+  module Validators
+    using Patches::Inflections
+
+    def self.get(name)
+      class_name = name.to_s.to_class_name(suffix: :validator)
+
+      from_kangaru(class_name) || from_application(class_name) ||
+        raise("#{class_name} is not defined")
+    end
+
+    def self.from_kangaru(class_name)
+      return unless const_defined?(class_name)
+
+      const_get(class_name)
+    end
+
+    def self.from_application(class_name)
+      namespace = Kangaru.application&.const_get(:Validators)
+
+      return unless namespace&.const_defined?(class_name)
+
+      namespace.const_get(class_name)
+    end
+
+    private_class_method :from_kangaru
+    private_class_method :from_application
+  end
+end

data/lib/kangaru/version.rb

@@ -1,3 +1,3 @@
 module Kangaru
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.2".freeze
 end

data/lib/kangaru.rb

@@ -11,7 +11,8 @@ require "yaml"
 
 module Kangaru
   COLLAPSED_DIRS = [
-    "#{__dir__}/kangaru/components"
+    "#{__dir__}/kangaru/components",
+    "#{__dir__}/kangaru/concerns"
   ].freeze
 
   DEFAULT_ENV = :runtime

data/sig/kangaru/application.rbs

@@ -16,7 +16,7 @@ module Kangaru
 
     def initialize: (source: String, namespace: Module) -> void
 
-    def configure: (?Symbol?) { (Config) -> void } -> void
+    def configure: { (Config) -> void } -> void
 
     def configured?: -> bool
 
@@ -34,8 +34,6 @@ module Kangaru
 
     @configured: bool
 
-    def current_env?: (Symbol?) -> bool
-
     attr_reader autoloader: Zeitwerk::Loader
 
     def validate_config!: -> void

data/sig/kangaru/concern.rbs

@@ -0,0 +1,13 @@
+module Kangaru
+  module Concern : Module
+    @included: untyped
+
+    def append_features: (untyped) -> void
+
+    def class_methods: { [self: singleton(Class)] -> void } -> void
+
+    def included: (?untyped?) ?{ -> void } -> void
+
+    def evaluate_concern_blocks!: (untyped) -> void
+  end
+end

data/sig/kangaru/concerns/attributable.rbs

@@ -0,0 +1,25 @@
+module Kangaru
+  module Attributable
+    extend Concern
+
+    module ClassMethods
+      def attributes: -> Array[Symbol]
+
+      def defaults: -> Hash[Symbol, untyped]
+
+      def set_default: (**untyped) -> void
+
+      @defaults: Hash[Symbol, untyped]
+    end
+
+    extend ClassMethods
+
+    attr_reader defaults: Hash[Symbol, untyped]
+
+    def instance_methods: -> Array[Symbol]
+
+    def initialize: (**untyped) -> void
+
+    def merge!: (**untyped) -> void
+  end
+end

data/sig/kangaru/concerns/configurable.rbs

@@ -1,15 +1,13 @@
 module Kangaru
-  module Concerns
-    module Configurable
-      extend Concern
-      extend ClassMethods
+  module Configurable
+    extend Concern
+    extend ClassMethods
 
-      module ClassMethods
-        def configurator_key: -> Symbol
-      end
-
-      def name: -> String
-      def config: -> untyped
+    module ClassMethods
+      def configurator_key: -> Symbol
     end
+
+    def name: -> String
+    def config: -> untyped
   end
 end

data/sig/kangaru/concerns/validatable.rbs

@@ -1,28 +1,26 @@
 module Kangaru
-  module Concerns
-    module Validatable
-      type validations = Hash[Symbol, Hash[Symbol, untyped]]
+  module Validatable
+    type validations = Hash[Symbol, Hash[Symbol, untyped]]
 
-      extend Concern
-      extend ClassMethods
+    extend Concern
+    extend ClassMethods
 
-      attr_reader validation_rules: validations
+    attr_reader validation_rules: validations
 
-      module ClassMethods
-        attr_reader validation_rules: validations
+    module ClassMethods
+      attr_reader validation_rules: validations
 
-        def validates: (Symbol, **untyped) -> void
-      end
+      def validates: (Symbol, **untyped) -> void
+    end
 
-      attr_reader errors: Array[Validation::Error]
+    attr_reader errors: Array[Validation::Error]
 
-      def validate: -> void
+    def validate: -> void
 
-      def valid?: -> bool
+    def valid?: -> bool
 
-      private
+    private
 
-      def validator_for: (Symbol) -> Validation::AttributeValidator
-    end
+    attr_reader model_validator: Validation::ModelValidator
   end
 end

data/sig/kangaru/configurator.rbs

@@ -1,10 +1,10 @@
 module Kangaru
   class Configurator
-    include Concerns::AttributesConcern
-    extend  Concerns::AttributesConcern::ClassMethods
+    include Attributable
+    extend  Attributable::ClassMethods
 
-    include Concerns::Validatable
-    extend  Concerns::Validatable::ClassMethods
+    include Validatable
+    extend  Validatable::ClassMethods
 
     def self.key: -> Symbol
 

data/sig/kangaru/database.rbs

@@ -2,8 +2,8 @@ module Kangaru
   class Database
     extend Forwardable
 
-    include Concerns::AttributesConcern
-    extend  Concerns::AttributesConcern::ClassMethods
+    include Attributable
+    extend  Attributable::ClassMethods
 
     PLUGINS: Array[Symbol]
 

data/sig/kangaru/initialiser.rbs

@@ -1,9 +1,5 @@
 module Kangaru
   module Initialiser
-    module InjectedMethods
-      include Kangaru::_ApplicationMethods
-    end
-
     def self.extended: (Module) -> void
   end
 end

data/sig/kangaru/interface.rbs

@@ -0,0 +1,21 @@
+module Kangaru
+  module Interface
+    type env = Symbol?
+
+    def run!: (*String) -> void
+
+    def config: -> Config
+
+    def configure: (?env: env) { (Config) -> void } -> void
+
+    def apply_config!: -> void
+
+    def config_path: (String, ?env: env) -> void
+
+    def database: -> Database?
+
+    private
+
+    def env_applies?: (Symbol?) -> bool
+  end
+end

data/sig/kangaru/model.rbs

@@ -8,8 +8,8 @@ module Kangaru
   end
 
   class Model < Sequel::Model
-    include Concerns::Validatable
-    extend  Concerns::Validatable::ClassMethods
+    include Validatable
+    extend  Validatable::ClassMethods
 
     def self.enum: (Symbol, **Integer) -> void
   end

data/sig/kangaru/patches/inflections.rbs

@@ -2,7 +2,7 @@ module Kangaru
   module Patches
     module Inflections : String
       class ::String
-        def to_class_name: -> String
+        def to_class_name: (?suffix: String? | Symbol?) -> String
 
         def to_constant_name: -> String
 

data/sig/kangaru/request.rbs

@@ -1,6 +1,6 @@
 module Kangaru
   class Request
-    include Concerns::Configurable
+    include Configurable
 
     DEFAULT_CONTROLLER: String
 

data/sig/kangaru/validation/attribute_validator.rbs

@@ -1,21 +1,19 @@
 module Kangaru
   module Validation
     class AttributeValidator
+      type validations = Hash[Symbol, rule]
+      type rule = bool | Hash[Symbol, untyped]
+
       attr_reader model: untyped
       attr_reader attribute: Symbol
 
       def initialize: (model: untyped, attribute: Symbol) -> void
 
-      def validate: (Symbol, **untyped) -> void
+      def validate!: (**untyped) -> void
 
       private
 
-      def validator_name: (Symbol) -> String
-
-      def load_validator: (
-        validator: Symbol,
-        params: Hash[Symbol, untyped]
-      ) -> Validators::Validator
+      def load_validator: (validator: Symbol, **untyped) -> Validator
     end
   end
 end

data/sig/kangaru/validation/error.rbs

@@ -1,20 +1,16 @@
 module Kangaru
   module Validation
     class Error
-      MESSAGES: Hash[Symbol, String]
-
       attr_reader attribute: Symbol
-      attr_reader type: Symbol
+      attr_reader message: String
 
-      def initialize: (attribute: Symbol, type: Symbol) -> void
+      def initialize: (attribute: Symbol, message: String) -> void
 
       def full_message: -> String
 
       private
 
       def human_attribute: -> String
-
-      def message: -> String
     end
   end
 end

data/sig/kangaru/validation/model_validator.rbs

@@ -0,0 +1,19 @@
+module Kangaru
+  module Validation
+    class ModelValidator
+      type rules = Hash[Symbol, AttributeValidator::validations]
+
+      attr_reader model: untyped
+
+      def initialize: (model: untyped) -> void
+
+      def validate!: (**rules) -> void
+
+      private
+
+      def validate_attribute!: (Symbol, AttributeValidator::validations) -> void
+
+      def load_attribute_validator: (Symbol) -> AttributeValidator
+    end
+  end
+end

data/sig/kangaru/validator.rbs

@@ -0,0 +1,14 @@
+module Kangaru
+  class Validator
+    attr_reader model: untyped
+    attr_reader attribute: Symbol
+    attr_reader params: Hash[Symbol, untyped]
+    attr_reader value: untyped
+
+    def initialize: (model: untyped, attribute: Symbol, **untyped) -> void
+
+    def validate: -> void
+
+    def add_error!: (String) -> void
+  end
+end

data/sig/kangaru/validators/required_validator.rbs

@@ -1,6 +1,8 @@
 module Kangaru
   module Validators
     class RequiredValidator < Validator
+      MESSAGE: String
+
       private
 
       def value_missing?: -> bool

data/sig/kangaru/validators.rbs

@@ -0,0 +1,11 @@
+module Kangaru
+  module Validators
+    def self.get: (String | Symbol) -> singleton(Validator)
+
+    private
+
+    def self.from_kangaru: (String | Symbol) -> singleton(Validator)?
+
+    def self.from_application: (String | Symbol) -> singleton(Validator)?
+  end
+end

data/sig/kangaru.rbs

@@ -21,9 +21,4 @@ module Kangaru
 
     def test?: -> bool
   end
-
-  # Included in target applications that extend Kangaru::Initialiser.
-  interface _ApplicationMethods
-    include InjectedMethods::_InjectedMethods
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kangaru
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Chris Welham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-12 00:00:00.000000000 Z
+date: 2023-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -102,8 +102,8 @@ files:
 - lib/kangaru/application.rb
 - lib/kangaru/argument_parser.rb
 - lib/kangaru/components/component.rb
-- lib/kangaru/concerns/attributes_concern.rb
-- lib/kangaru/concerns/concern.rb
+- lib/kangaru/concern.rb
+- lib/kangaru/concerns/attributable.rb
 - lib/kangaru/concerns/configurable.rb
 - lib/kangaru/concerns/validatable.rb
 - lib/kangaru/config.rb
@@ -127,7 +127,7 @@ files:
 - lib/kangaru/initialisers/rspec.rb
 - lib/kangaru/initialisers/rspec/kangaru_helper.rb
 - lib/kangaru/initialisers/rspec/request_helper.rb
-- lib/kangaru/injected_methods.rb
+- lib/kangaru/interface.rb
 - lib/kangaru/model.rb
 - lib/kangaru/patches/constantise.rb
 - lib/kangaru/patches/inflections.rb
@@ -141,8 +141,10 @@ files:
 - lib/kangaru/router.rb
 - lib/kangaru/validation/attribute_validator.rb
 - lib/kangaru/validation/error.rb
+- lib/kangaru/validation/model_validator.rb
+- lib/kangaru/validator.rb
+- lib/kangaru/validators.rb
 - lib/kangaru/validators/required_validator.rb
-- lib/kangaru/validators/validator.rb
 - lib/kangaru/version.rb
 - rbs_collection.lock.yaml
 - rbs_collection.yaml
@@ -151,8 +153,8 @@ files:
 - sig/kangaru/application.rbs
 - sig/kangaru/argument_parser.rbs
 - sig/kangaru/components/component.rbs
-- sig/kangaru/concerns/attributes_concern.rbs
-- sig/kangaru/concerns/concern.rbs
+- sig/kangaru/concern.rbs
+- sig/kangaru/concerns/attributable.rbs
 - sig/kangaru/concerns/configurable.rbs
 - sig/kangaru/concerns/validatable.rbs
 - sig/kangaru/config.rbs
@@ -174,7 +176,7 @@ files:
 - sig/kangaru/inflectors/tokeniser.rbs
 - sig/kangaru/initialiser.rbs
 - sig/kangaru/initialisers/rspec.rbs
-- sig/kangaru/injected_methods.rbs
+- sig/kangaru/interface.rbs
 - sig/kangaru/model.rbs
 - sig/kangaru/patches/constantise.rbs
 - sig/kangaru/patches/inflections.rbs
@@ -188,8 +190,10 @@ files:
 - sig/kangaru/router.rbs
 - sig/kangaru/validation/attribute_validator.rbs
 - sig/kangaru/validation/error.rbs
+- sig/kangaru/validation/model_validator.rbs
+- sig/kangaru/validator.rbs
+- sig/kangaru/validators.rbs
 - sig/kangaru/validators/required_validator.rbs
-- sig/kangaru/validators/validator.rbs
 homepage: https://github.com/apexatoll/kangaru
 licenses:
 - MIT

data/lib/kangaru/concerns/attributes_concern.rb

@@ -1,35 +0,0 @@
-module Kangaru
-  module Concerns
-    module AttributesConcern
-      extend Concern
-
-      class_methods do
-        def attributes
-          instance_methods.grep(/\w=$/).map do |attribute|
-            attribute.to_s.delete_suffix("=").to_sym
-          end
-        end
-
-        def set_default(**attributes)
-          defaults.merge!(**attributes)
-        end
-
-        def defaults
-          @defaults ||= {}
-        end
-      end
-
-      def initialize(**attributes)
-        attributes = self.class.defaults.merge(**attributes)
-
-        merge!(**attributes)
-      end
-
-      def merge!(**attributes)
-        attributes.slice(*self.class.attributes).each do |attr, value|
-          instance_variable_set(:"@#{attr}", value)
-        end
-      end
-    end
-  end
-end

data/lib/kangaru/concerns/concern.rb

@@ -1,33 +0,0 @@
-module Kangaru
-  module Concerns
-    module Concern
-      def append_features(base)
-        super
-        evaluate_concern_blocks!(base)
-      end
-
-      def class_methods(&)
-        if const_defined?(:ClassMethods)
-          const_get(:ClassMethods)
-        else
-          const_set(:ClassMethods, Module.new)
-        end.module_eval(&)
-      end
-
-      def included(base = nil, &block)
-        super base if base
-        return if block.nil?
-
-        @included = block
-      end
-
-      private
-
-      def evaluate_concern_blocks!(base)
-        base.extend(const_get(:ClassMethods)) if const_defined?(:ClassMethods)
-
-        base.class_eval(&@included) if instance_variable_defined?(:@included)
-      end
-    end
-  end
-end

data/lib/kangaru/validators/validator.rb

@@ -1,22 +0,0 @@
-module Kangaru
-  module Validators
-    class Validator
-      attr_reader :model, :attribute, :params, :value
-
-      def initialize(model:, attribute:, params:)
-        @model = model
-        @attribute = attribute
-        @params = params
-        @value = model.public_send(attribute)
-      end
-
-      def validate
-        raise NotImplementedError
-      end
-
-      def add_error!(type)
-        model.errors << Validation::Error.new(attribute:, type:)
-      end
-    end
-  end
-end

data/sig/kangaru/concerns/attributes_concern.rbs

@@ -1,27 +0,0 @@
-module Kangaru
-  module Concerns
-    module AttributesConcern
-      extend Concern
-
-      module ClassMethods
-        def attributes: -> Array[Symbol]
-
-        def defaults: -> Hash[Symbol, untyped]
-
-        def set_default: (**untyped) -> void
-
-        @defaults: Hash[Symbol, untyped]
-      end
-
-      extend ClassMethods
-
-      attr_reader defaults: Hash[Symbol, untyped]
-
-      def instance_methods: -> Array[Symbol]
-
-      def initialize: (**untyped) -> void
-
-      def merge!: (**untyped) -> void
-    end
-  end
-end

data/sig/kangaru/concerns/concern.rbs

@@ -1,15 +0,0 @@
-module Kangaru
-  module Concerns
-    module Concern : Module
-      @included: untyped
-
-      def append_features: (untyped) -> void
-
-      def class_methods: { [self: singleton(Class)] -> void } -> void
-
-      def included: (?untyped?) ?{ -> void } -> void
-
-      def evaluate_concern_blocks!: (untyped) -> void
-    end
-  end
-end

data/sig/kangaru/injected_methods.rbs

@@ -1,19 +0,0 @@
-module Kangaru
-  module InjectedMethods
-    interface _InjectedMethods
-      def run!: (*String) -> void
-
-      def config: -> Config
-
-      def configure: (?Symbol?) { (Config) -> void } -> void
-
-      def apply_config!: -> void
-
-      def import_config_from!: (String) -> void
-
-      def database: -> Database?
-    end
-
-    include _InjectedMethods
-  end
-end

data/sig/kangaru/validators/validator.rbs

@@ -1,20 +0,0 @@
-module Kangaru
-  module Validators
-    class Validator
-      attr_reader model: untyped
-      attr_reader attribute: Symbol
-      attr_reader params: Hash[Symbol, untyped]
-      attr_reader value: untyped
-
-      def initialize: (
-        model: untyped,
-        attribute: Symbol,
-        params: Hash[Symbol, untyped]
-      ) -> void
-
-      def validate: -> void
-
-      def add_error!: (Symbol) -> void
-    end
-  end
-end