uinit-structure 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0503a10252f0c6e44bb61a6853d5bc59380dc0b6568e50778d14ba28b0ad0616
-  data.tar.gz: b3235c878479a28a98d09859bddafbf011f92596c29c59a67f2862e638bb8a44
+  metadata.gz: 8cb370826705dbff7a6e5655c6d53e5b42dd58a2c5adfa25187b97532fb28ac8
+  data.tar.gz: e3e335c203daf426838917777d9205092c6ba6a574d057524c62583ac106c121
 SHA512:
-  metadata.gz: 710a40c77b700bbd2a6a41a3dab9a6144677687f67fa255ac7b8afcdb44a024fb7439e729bc985e2b199f65ac6e8537862ef504669485d05e741e553ad25cf64
-  data.tar.gz: 1638b06baa9a4929e9bdca10b26056469ec8ad2edcee5e7af21d367cd27834a9986aa4b97dd5329ec73ab3e2628b027e8816505308c5e7e6b892231731724f92
+  metadata.gz: 4fd715aab45e5660901e17d31a59b4a7d9f9f280490904103ab14a37f92886852bcd57575835f9c5e75962f9a0d4f9aae43f093095b1455aea791b1c9650aba1
+  data.tar.gz: ca550ec25381be0da16da74b2c807b5b48365d58aff1e8da0c571d00c2f507220f1ec2e3126bcf25410f2b91141e2b511094739bfd37c2d05aaae169824e45fe

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/version.rb

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

data/lib/uinit/structure.rb

@@ -24,7 +24,7 @@ module Uinit
     class_methods do
       include Memoizable
 
-      attr_reader :attributes
+      attr_reader :attributes, :attributes_scope
 
       memo def structure_schema
         if respond_to?(:superclass) && superclass.respond_to?(:structure_schema)
@@ -43,7 +43,8 @@ module Uinit
       end
 
       def struct(&)
-        attributes = AttributeContext.scope(&)
+        self.attributes_scope = AttributeScope.new(self)
+        attributes = attributes_scope.scope(&).attributes
 
         attributes.each do |attribute|
           raise NameError, 'Attribute must have a name' unless attribute.name
@@ -60,11 +61,13 @@ module Uinit
         self.attributes = attributes.each_with_object(sup_attributes) do |attribute, hsh|
           hsh[attribute.name] = attribute
         end
+
+        self.attributes_scope = nil
       end
 
       private
 
-      attr_writer :attributes
+      attr_writer :attributes, :attributes_scope
     end
 
     memo def get_structure_schema = self.class.structure_schema

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uinit-structure
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 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: activesupport
@@ -81,6 +81,7 @@ 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/as_json.rb
 - lib/uinit/structure/compilers/attribute.rb