Renamespace concerns

.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:

lib/kangaru.rb

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

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

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

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

lib/kangaru/concerns/validatable.rb

@@ -1,46 +1,44 @@
 module Kangaru
-  module Concerns
-    module Validatable
-      extend Concern
+  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
+    class_methods do
+      def validation_rules
+        @validation_rules ||= {}
       end
 
-      def errors
-        @errors ||= []
+      def validates(attribute, **validations)
+        validation_rules[attribute] ||= {}
+        validation_rules[attribute].merge!(**validations)
       end
+    end
+
+    def errors
+      @errors ||= []
+    end
 
-      def validate
-        self.class.validation_rules.each do |attribute, validations|
-          validator = validator_for(attribute)
+    def validate
+      self.class.validation_rules.each do |attribute, validations|
+        validator = validator_for(attribute)
 
-          validations.each do |validator_name, params|
-            params = {} if params == true
+        validations.each do |validator_name, params|
+          params = {} if params == true
 
-            validator.validate(validator_name, **params)
-          end
+          validator.validate(validator_name, **params)
         end
       end
+    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 validator_for(attribute)
+      Validation::AttributeValidator.new(model: self, attribute:)
     end
   end
 end

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
 

lib/kangaru/database.rb

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

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)

lib/kangaru/request.rb

@@ -2,7 +2,7 @@ module Kangaru
   class Request
     using Patches::Inflections
 
-    include Concerns::Configurable
+    include Configurable
 
     DEFAULT_CONTROLLER = "DefaultController".freeze
 

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

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