uinit-structure 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c15895eb9482a3f6f4da9fd7e32cf7faa7b00e8dcc313a88526a1be679532eb2
-  data.tar.gz: 4fb76f7c50604b5f1cbd2ff0d245f1586b4e30376f15db6c685e8bea9f427e27
+  metadata.gz: 3931923313a282612e428ab5de5c935a7cc949dde0e3ba3e2a5d0af52480974e
+  data.tar.gz: 7adabb1c170af08c1cc5ba9eec5ceb4efab1fd3c4fce899d491e7fd9226bda20
 SHA512:
-  metadata.gz: 786b0bd30d8855c54271a5a5260459182a5c25a9fe878be6dcc6676822e372eb655980c86a545c5343f736906dc084d9ba11e52ddeee397c4459d65d47aac8e0
-  data.tar.gz: 950e1d19b84cdb1101285190c574feb1015fb3b7e9852b6da26bc65e9229272cbc51bbca20f5e2450b51ed72d84ef0ea2cc8bb61410e92cb49822197dd16e096
+  metadata.gz: 3797d78ad3a31326fd5d50e1019ff53f0126a312c6978461471b354db1182c9c547a085601be1612d57e23d3e35bcda87cdfb0c4ef3fd32da1489ccc18809414
+  data.tar.gz: 491603d0e62cf0901df9adfdae267437557055f628702a9c73786a2a330b0468c74299b66b0b0cfa1154479e64320be7cdf066cdfc607457722e0ddeab0824ad

data/lib/uinit/structure/attribute.rb

@@ -91,9 +91,11 @@ module Uinit
       end
 
       def optional?
-        @default != UNDEFINED
+        defined?(@optional) ? @optional : @default != UNDEFINED
       end
 
+      attr_writer :optional
+
       def init=(val)
         raise ArgumentError, 'init must be a boolean' unless [true, false].include?(val)
 

data/lib/uinit/structure/attribute_builder.rb

@@ -70,12 +70,18 @@ module Uinit
         self
       end
 
-      def optional(val)
+      def optional(val = true)
         attribute.optional = val
 
         self
       end
 
+      def required
+        attribute.optional = false
+
+        self
+      end
+
       def init(val)
         attribute.init = val
 

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

@@ -87,7 +87,7 @@ module Uinit
 
         def compile_json_proc(name)
           <<~RUBY
-            get_structure_schema.#{name}.as_json.call(json, self.#{name}, :#{name})
+            __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)
-          "get_structure_schema.#{attribute.name}#{att ? ".#{att}" : ''}"
+          "__structure_schema.#{attribute.name}#{att ? ".#{att}" : ''}"
         end
       end
       # rubocop:enable Metrics/ClassLength

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

@@ -30,9 +30,7 @@ module Uinit
           end
 
           <<~RUBY
-            begin
-              super(hsh)
-            end
+            super(hsh)
           RUBY
         end
 
@@ -75,7 +73,7 @@ module Uinit
 
         def compile_default_attribute(name, attribute)
           <<~RUBY
-            self.#{name} = get_structure_schema.#{name}.default#{attribute.default.is_a?(Proc) ? '.call' : ''}
+            self.#{name} = __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.3'
+    VERSION = '0.1.5'
   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 = AttributeScope.new(self).scope(&).attributes
+        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,14 +61,16 @@ 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
-    memo def get_attributes = self.class.attributes
+    memo def __structure_schema = self.class.structure_schema
+    memo def __attributes = self.class.attributes
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uinit-structure
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Kimoja
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-29 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport