uinit-structure 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c8c42aab899fa0b64aa674b8096c9b1ed6be23e39643fd63d06f168876a18cd
-  data.tar.gz: 3499d5ba022a96ab76bf9aca62313787388271343caa2dbf5760997a972ebcc9
+  metadata.gz: 0503a10252f0c6e44bb61a6853d5bc59380dc0b6568e50778d14ba28b0ad0616
+  data.tar.gz: b3235c878479a28a98d09859bddafbf011f92596c29c59a67f2862e638bb8a44
 SHA512:
-  metadata.gz: ca55bfc366a4b15b90c6306f7b5b724988e341ade9f2feaa38aa58c86335e4a89b214ce014e19af4e73d3d768c06a202f8a7e98345a011e8ac503c56f95a367b
-  data.tar.gz: 5c15f70a14a1b8ba09ab08302322e5bdb37c634110dfae0b27d77039ce13cd630d6a61ab1c5efb82e8e8ad6a8b9d86f8efbee83f64ea54e7103f53df9be31064
+  metadata.gz: 710a40c77b700bbd2a6a41a3dab9a6144677687f67fa255ac7b8afcdb44a024fb7439e729bc985e2b199f65ac6e8537862ef504669485d05e741e553ad25cf64
+  data.tar.gz: 1638b06baa9a4929e9bdca10b26056469ec8ad2edcee5e7af21d367cd27834a9986aa4b97dd5329ec73ab3e2628b027e8816505308c5e7e6b892231731724f92

data/README.md

@@ -1,3 +1,10 @@
 # Uinit::Structure
 
-Typed structure
+Typed structure
+
+# TODO 
+- Predicate: don't use ActiveSupport
+  https://apidock.com/rails/Object/blank%3F
+  `respond_to?(:empty?) ? !!empty? : !self`
+
+  

data/lib/uinit/structure/attribute_builder.rb

@@ -3,11 +3,18 @@
 module Uinit
   module Structure
     class AttributeBuilder
-      def initialize(attribute = nil)
-        @attribute = attribute || Attribute.new
+      def initialize(defaults, attribute = nil)
+        self.attribute = attribute || Attribute.new
+        self.defaults = defaults
+
+        return if attribute
+
+        defaults.each do |(name, value)|
+          self.attribute.send(:"#{name}=", value)
+        end
       end
 
-      attr_accessor :attribute
+      attr_accessor :attribute, :defaults
 
       def attr(name, type = nil, default = Attribute::UNDEFINED, &)
         return build_mutliple(name, type, default, &) if name.is_a?(Array)
@@ -103,7 +110,7 @@ module Uinit
 
       def build_mutliple(name, type, default, &)
         name.map do |nm|
-          builder = AttributeBuilder.new(attribute.clone)
+          builder = AttributeBuilder.new(defaults, attribute.clone)
           builder.attr(nm, type, default, &)
         end
       end

data/lib/uinit/structure/attribute_context.rb

@@ -15,29 +15,39 @@ module Uinit
 
       memo def attributes = []
 
+      def defaults(**defaults)
+        self.attribute_defaults = defaults
+      end
+
       def private(att_or_get_set = nil, *)
         return att_or_getset.private(:get, :set) if att_or_get_set.is_a?(AttributeBuilder)
 
-        builder = AttributeBuilder.new.private(*[att_or_get_set, *].compact)
+        builder = build_attribute_builder.private(*[att_or_get_set, *].compact)
         attributes << builder.attribute
 
         builder
       end
 
       def attr(...)
-        push_attribute(AttributeBuilder.new.attr(...))
+        push_attribute(build_attribute_builder.attr(...))
       end
 
       def abstract(...)
-        push_attribute(AttributeBuilder.new.abstract(...))
+        push_attribute(build_attribute_builder.abstract(...))
       end
 
       def using(attribute_builder)
-        push_attribute(AttributeBuilder.new(attribute_builder.attribute))
+        push_attribute(build_attribute_builder(attribute_builder.attribute))
       end
 
       private
 
+      attr_accessor :attribute_defaults
+
+      def build_attribute_builder(attribute = nil)
+        AttributeBuilder.new(attribute_defaults || {}, attribute)
+      end
+
       def push_attribute(builder)
         if builder.is_a?(Array)
           attributes.push(*builder.map(&:attribute))

data/lib/uinit/structure/compilers/as_json.rb

@@ -87,7 +87,7 @@ module Uinit
 
         def compile_json_proc(name)
           <<~RUBY
-            _structure_schema.#{name}.as_json.call(json, self.#{name}, :#{name})
+            get_structure_schema.#{name}.as_json.call(json, self.#{name}, :#{name})
           RUBY
         end
       end

data/lib/uinit/structure/compilers/attribute.rb

@@ -86,7 +86,6 @@ module Uinit
           compile_optional_check(<<~RUBY)
             unless value.is_a?(#{lookup(:struct)})
               unless value.is_a?(Hash)
-                binding.pry
                 raise AttributeError.new(#{lookup}, "no implicit conversion of \#{ value.class } into Hash")
               end
 
@@ -181,7 +180,7 @@ module Uinit
         end
 
         def lookup(att = nil)
-          "_structure_schema.#{attribute.name}#{att ? ".#{att}" : ''}"
+          "get_structure_schema.#{attribute.name}#{att ? ".#{att}" : ''}"
         end
       end
       # rubocop:enable Metrics/ClassLength

data/lib/uinit/structure/compilers/constructor.rb

@@ -75,7 +75,7 @@ module Uinit
 
         def compile_default_attribute(name, attribute)
           <<~RUBY
-            self.#{name} = _structure_schema.#{name}.default#{attribute.default.is_a?(Proc) ? '.call' : ''}
+            self.#{name} = get_structure_schema.#{name}.default#{attribute.default.is_a?(Proc) ? '.call' : ''}
           RUBY
         end
       end

data/lib/uinit/structure/version.rb

@@ -2,6 +2,6 @@
 
 module Uinit
   module Structure
-    VERSION = '0.1.0'
+    VERSION = '0.1.2'
   end
 end

data/lib/uinit/structure.rb

@@ -2,6 +2,8 @@
 
 require 'zeitwerk'
 
+require 'active_support'
+
 require 'uinit/type'
 require 'uinit/memoizable'
 
@@ -14,17 +16,16 @@ end
 
 module Uinit
   module Structure
+    extend ActiveSupport::Concern
     include Memoizable
 
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
     class Schema; end
 
-    module ClassMethods
+    class_methods do
       include Memoizable
 
+      attr_reader :attributes
+
       memo def structure_schema
         if respond_to?(:superclass) && superclass.respond_to?(:structure_schema)
           return Class.new(superclass.structure_schema.class).new
@@ -42,7 +43,9 @@ module Uinit
       end
 
       def struct(&)
-        AttributeContext.scope(&).each do |attribute|
+        attributes = AttributeContext.scope(&)
+
+        attributes.each do |attribute|
           raise NameError, 'Attribute must have a name' unless attribute.name
 
           structure_schema.class.define_method(attribute.name) { attribute }
@@ -51,11 +54,20 @@ module Uinit
 
         Compilers::Constructor.compile(structure_module, structure_schema)
         Compilers::AsJson.compile(structure_module, structure_schema)
+
+        sup_attributes = superclass < Structure ? superclass.attributes.dup : {}
+
+        self.attributes = attributes.each_with_object(sup_attributes) do |attribute, hsh|
+          hsh[attribute.name] = attribute
+        end
       end
-    end
 
-    private
+      private
+
+      attr_writer :attributes
+    end
 
-    memo def _structure_schema = self.class.structure_schema
+    memo def get_structure_schema = self.class.structure_schema
+    memo def get_attributes = self.class.attributes
   end
 end

data/uinit-structure.gemspec

@@ -26,13 +26,10 @@ Gem::Specification.new do |spec|
   spec.metadata['changelog_uri'] = 'https://github.com/Kimoja/uinit-structure/blob/main/CHANGELOG.md'
   spec.metadata['bug_tracker_uri'] = 'https://github.com/Kimoja/uinit-structure/issues'
 
-  spec.add_runtime_dependency 'zeitwerk', '~> 2.6'
-
+  spec.add_dependency 'activesupport', '~> 7.1.3'
   spec.add_dependency 'uinit-memoizable', '~> 0.1.0'
   spec.add_dependency 'uinit-type', '~> 0.1.0'
+  spec.add_dependency 'zeitwerk', '~> 2.6'
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: uinit-structure
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Kimoja
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-08 00:00:00.000000000 Z
+date: 2024-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: uinit-memoizable
   requirement: !ruby/object:Gem::Requirement
@@ -53,47 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '2.6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 description: Typed structure
 email:
 - joakim.carrilho@cheerz.com
@@ -110,7 +82,6 @@ files:
 - lib/uinit/structure/attribute_context.rb
 - lib/uinit/structure/attribute_error.rb
 - lib/uinit/structure/attribute_type_error.rb
-- lib/uinit/structure/compilers.rb
 - lib/uinit/structure/compilers/as_json.rb
 - lib/uinit/structure/compilers/attribute.rb
 - lib/uinit/structure/compilers/base.rb

data/lib/uinit/structure/compilers.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module Uinit
-  module Structure
-    module Compilers
-    end
-  end
-end