l43_base 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80a1f55728d1bde85d95be0c9a6578ebc5c48741224cdbef3f3ea3cee4208140
-  data.tar.gz: 900b22d8c1623ace5f39e0d4e31f9913140dcdda3f26f62abd30eb095ccffe5d
+  metadata.gz: 9675c29f54a7aea812466a54b533acbb1c224e9f4904514f3e81c5bf7cdfca5a
+  data.tar.gz: 5f27143f5677c6e95b548875c36c4a2197568b09e9df0d5d6fd8feda1e2cef77
 SHA512:
-  metadata.gz: '035865b356f7c7ab01611faafffae4bebca2581a9b5769540fd2db4e518d2542af07798cee6ace287a7f2e2ba36d892ecc4f4c9a1e3e2e09515820165a2d73e1'
-  data.tar.gz: 610e0f965e14ac7ca81e9ee53f6e560a8fd836c9b15fd6ed6a4205c3e9f54d3ac0eb7856f1366e304c0e6d17d4d93545bd64fecd3352899dc8d13bb113c7260d
+  metadata.gz: aad4d74bdb3344c40128a9e110c4d08c8ebc411c8739d1ccab4b016fd30922eb4748b9fe709d4d89dd8486d4d005ad471d7a96df8699c6c50d340c175d4c6fea
+  data.tar.gz: 7ca068e33271f04610a6fb9492938f737389b1aae080e2f2bd5fe4e70e41039ae57bdbf3565049533104403f563b5e053fabceeed4b36f477d9a05fa4021d10d

data/lib/l43/base/data_class/attribute.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module L43
+  module Base
+    module DataClass
+      class Attribute
+        attr_reader :default, :init, :name, :required
+
+        private
+        def initialize(name:, required:, default:, &init)
+          @name = name
+          @required = required
+          @default = default
+          @init = init
+        end
+          
+      end
+    end
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/l43/base/data_class/data_class_maker.rb

@@ -1,23 +1,57 @@
 # frozen_string_literal: true
 
 require_relative './data_class_class'
+require_relative './attribute'
 module L43
   module Base
     module DataClass
       class DataClassMaker
 
-        attr_reader :block_name, :klass
+        attr_reader :block_name, :block_required, :defaulted, :klass
+
+        def defattr(name, required: false, default: Undefined, &init)
+          raise ArgumentError, "must not redefine attribute #{name}" if attributes[name]
+          attributes.update(name => Attribute.new(name:, required:, default:, &init))
+          self
+        end
 
         def define(*required, **defaulted, &blk)
+          add_required_attributes(required)
+          add_defaulted_attributes(defaulted)
           @klass = Class.new(DataClassClass)
-          define_klass(required:, defaulted:)
+          define_klass
           klass.module_eval(&blk) if blk
           klass.freeze
         end
 
+        def attributes =  @__attributes__ ||= {}
+
+        def defaults 
+          @__defaults__ ||= attributes
+            .values
+            .reject { it.default == Undefined }
+            .map { [it.name, it.default] }
+            .to_h
+        end
+
+        def required_att_names =  @__required_att_names__ ||= attributes.values.select(&:required).map(&:name)
+
         private
-        def initialize(block_name: nil)
+        def initialize(block_name: nil, block_required: false)
           @block_name = block_name
+          @block_required = block_required
+        end
+
+        def add_defaulted_attributes(defaulted)
+          defaulted.each do |name, default|
+            defattr(name, default:)
+          end
+        end
+
+        def add_required_attributes(required)
+          required.each do
+            defattr(it, required: true)
+          end
         end
 
         def define_accessors(names:)
@@ -26,12 +60,9 @@ module L43
           }
         end
 
-        def define_klass(required:, defaulted:)
-          delta = required.intersection(defaulted.keys)
-          raise ArgumentError, "incoherant attribute definition, arg must not be required and defaulted, violating args: #{delta.inspect}" unless delta.empty?
-
-          init_instance(block_name:, required:, defaulted:)
-          names = required + defaulted.keys
+        def define_klass
+          init_instance
+          names = attributes.keys 
           names = names << block_name if block_name
           define_update(names:)
           define_accessors(names:)
@@ -63,24 +94,28 @@ module L43
           end
         end
 
-        def init_instance(block_name:, required:, defaulted:)
+        def init_instance
+          data = self
           klass.define_method :initialize do |**kwds, &blk|
-            if block_name
+            raise ArgumentError, "block argument required" if data.block_required && !blk
+            if data.block_name
               if blk
                 b = -> { instance_exec(&blk) }
-                instance_variable_set("@#{block_name}", b)
+                instance_variable_set("@#{data.block_name}", b)
               end
             else
               raise ArgumentError, "block argument not supported" if blk
             end
             
-            missing = required - kwds.keys
+            missing = data.required_att_names - kwds.keys
             raise ArgumentError, "missing required keyword parameters: #{missing.inspect}" unless missing.empty?
-            spurious = kwds.keys - required - defaulted.keys
+            spurious = kwds.keys - data.attributes.keys
             raise ArgumentError, "spurious keyword parameters: #{spurious.inspect}" unless spurious.empty?
 
-            values = defaulted.merge(kwds)
+            values = data.defaults.merge(kwds)
             values.each do |key, value|
+              init = data.attributes.fetch(key).init
+              value = init ? init.(value) : value
               instance_variable_set("@#{key}", value)
             end
 

data/lib/l43/base/data_class.rb

@@ -5,6 +5,10 @@ module L43
   module Base
     module DataClass extend self
 
+      def defattr(name, required: false, default: Undefined, &init)
+        DataClassMaker.new.defattr(name, required:, default:, &init)
+      end
+
       def define(*a, **k, &b) 
         DataClassMaker.new.define(*a, **k, &b)
       end
@@ -13,6 +17,10 @@ module L43
         DataClassMaker.new(block_name:)
       end
 
+      def with_block!(block_name)
+        DataClassMaker.new(block_name:, block_required: true)
+      end
+
     end
   end
 end

data/lib/l43/base/version.rb

@@ -2,7 +2,7 @@
 
 module L43
   module Base
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/l43/base.rb

@@ -4,6 +4,8 @@ require_relative 'r'
 module L43
   require_all __FILE__
   module Base
+    Undefined = Object.new.freeze
+
     def DataClass(*a, **k, &b) = DataClass.define(*a, **k, &b)
   end
 end

data/lib/l43/r.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module L43
-    def self.require_all(file, descend: false)
-      dir = file.sub(/\.[^.]*\z/, '')
-      wc = descend ? '/**/*.rb' : '/*.rb'
-      Dir.glob(File.join(dir, wc)).each { require it }
-    end
+  def self.require_all(file, descend: false)
+    dir = file.sub(/\.[^.]*\z/, '')
+    wc = descend ? '/**/*.rb' : '/*.rb'
+    Dir.glob(File.join(dir, wc)).each { require it }
+  end
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: l43_base
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Robert Dober
@@ -33,6 +33,7 @@ extra_rdoc_files: []
 files:
 - lib/l43/base.rb
 - lib/l43/base/data_class.rb
+- lib/l43/base/data_class/attribute.rb
 - lib/l43/base/data_class/data_class_class.rb
 - lib/l43/base/data_class/data_class_maker.rb
 - lib/l43/base/version.rb