uinit-structure 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7a743c0abc2104544f146a736c252aa06fd453bc6efbc6b24badbcd637a4e19
-  data.tar.gz: 296f8f382e991c6ea709732ae344d654d96a063855296f16c180514e4085c3a1
+  metadata.gz: c15895eb9482a3f6f4da9fd7e32cf7faa7b00e8dcc313a88526a1be679532eb2
+  data.tar.gz: 4fb76f7c50604b5f1cbd2ff0d245f1586b4e30376f15db6c685e8bea9f427e27
 SHA512:
-  metadata.gz: 07a92cf903e3528bd04e476d0df7351e2d4987d1184a77ea43d7c4eabc4439ba9a06a2919ec201bb3cddc314f279f5cda09b7b25893c3b06d7713c0e07c22841
-  data.tar.gz: 3ee54c822deef14f1632acb740d5ef1c686cf99e49c12dcec94377915036688b570ba94d1c3a1b1946dc176e3b1ee74e9d9a149f634cdfaf596541289e338ac9
+  metadata.gz: 786b0bd30d8855c54271a5a5260459182a5c25a9fe878be6dcc6676822e372eb655980c86a545c5343f736906dc084d9ba11e52ddeee397c4459d65d47aac8e0
+  data.tar.gz: 950e1d19b84cdb1101285190c574feb1015fb3b7e9852b6da26bc65e9229272cbc51bbca20f5e2450b51ed72d84ef0ea2cc8bb61410e92cb49822197dd16e096

data/lib/uinit/structure/attribute_context.rb

@@ -6,13 +6,6 @@ module Uinit
       include Memoizable
       include Type::Context
 
-      def self.scope(&)
-        context = Class.new { include AttributeContext }.new
-        context.instance_eval(&)
-
-        context.attributes
-      end
-
       memo def attributes = []
 
       def defaults(**defaults)

data/lib/uinit/structure/attribute_scope.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Uinit
+  module Structure
+    class AttributeScope
+      include AttributeContext
+
+      def initialize(context)
+        self.context = context
+      end
+
+      def scope(&scope)
+        instance_eval(&scope) if scope
+
+        self
+      end
+
+      def method_missing(name, ...)
+        context.send(name, ...)
+      end
+
+      private
+
+      attr_accessor :context
+    end
+  end
+end

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

@@ -180,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.1'
+    VERSION = '0.1.3'
   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 = AttributeScope.new(self).scope(&).attributes
+
+        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.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Kimoja
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-21 00:00:00.000000000 Z
+date: 2024-09-29 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
@@ -109,8 +81,8 @@ files:
 - lib/uinit/structure/attribute_builder.rb
 - lib/uinit/structure/attribute_context.rb
 - lib/uinit/structure/attribute_error.rb
+- lib/uinit/structure/attribute_scope.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