u-struct 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0765309623bfa9eb720102c66cd30f5ba785bdada60af711f19a03a51a7027bd'
-  data.tar.gz: 216dd4920427d682c9e797e5ec0a8631486b5d8c0613391440bd0f94f2778824
+  metadata.gz: ed0c19c23a4cbdd7282390be2590b7b9ae8b025badd32ffbaae9adf128d79667
+  data.tar.gz: b18729b71798828d9ba517f635e3b2b8e6baff640724b0837bac66be14e72ed8
 SHA512:
-  metadata.gz: ed911103da03769ac8014a618d713b313e20a19a65074ac1a737f2d4cd1717dbdf521d0f7693665d840bdbff145e518afe3e7ef875b1eef55d2555e198bf8d62
-  data.tar.gz: 683f94804b10f3ff03ed3f6ecbf4ff40c889dacf8dfd964496e8807974f96cbb611399fa21d95d73881a9c20d4dd0296975528cafc59dfbb20128471149c398a
+  metadata.gz: '0519e4b525fb8e62021c8ec5e518f503c6f14d865f48942c9dd145864f08ca2c3cbfb5c65fae703c3f91c3730ffd04881890d950c335ecc14789cdb28f24a541'
+  data.tar.gz: c0068d5051527141d7d1bfd59de4cd5e7b026abbbb5abe2d0a9b45b0a74de674e51bda16d483400f1cdeb9284a7bdb6093ba5989d8eb940e4a431e70bed12ee7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.10.0] - 2021-12-15
+
+- To-do
+
 ## [0.9.0] - 2021-12-14
 
 - To-do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    u-struct (0.9.0)
+    u-struct (0.10.0)
 
 GEM
   remote: https://rubygems.org/

data/examples/rgb/color.rb

@@ -2,16 +2,6 @@
 
 module RGB
   Color = Micro::Struct.with(:readonly, :to_ary).new(:red, :green, :blue) do
-    def to_a
-      super.map(&:value)
-    end
-
-    def to_hex
-      "##{red}#{green}#{blue}"
-    end
-  end
-
-  module Color
     def self.new(r:, g:, b:)
       __new__(
         red:   Number.new(r, label: 'r'),
@@ -19,5 +9,13 @@ module RGB
         blue:  Number.new(b, label: 'b')
       )
     end
+
+    def to_a
+      super.map(&:value)
+    end
+
+    def to_hex
+      "##{red}#{green}#{blue}"
+    end
   end
 end

data/examples/rgb/number.rb

@@ -2,12 +2,6 @@
 
 module RGB
   Number = Micro::Struct.with(:readonly).new(:value) do
-    def to_s
-      value.to_s(16)
-    end
-  end
-
-  module Number
     Input = Kind.object(name: 'Integer(>= 0 and <= 255)') do |value|
       value.is_a?(::Integer) && value >= 0 && value <= 255
     end
@@ -15,5 +9,9 @@ module RGB
     def self.new(value, label:)
       __new__(value: Input[value, label: label])
     end
+
+    def to_s
+      value.to_s(16)
+    end
   end
 end

data/examples/rgb_1.rb

@@ -10,23 +10,21 @@ gemfile do
 end
 
 RGBColor = Micro::Struct.with(:readonly, :to_ary).new(:red, :green, :blue) do
-  def to_hex
-    "##{red.to_s(16)}#{green.to_s(16)}#{blue.to_s(16)}"
-  end
-end
-
-module RGBColor
-  ColorNumber = Kind.object(name: 'Integer(>= 0 and <= 255)') do |value|
+  Number = Kind.object(name: 'Integer(>= 0 and <= 255)') do |value|
     value.is_a?(::Integer) && value >= 0 && value <= 255
   end
 
   def self.new(r:, g:, b:)
     __new__(
-      red:   ColorNumber[r, label: 'r'],
-      green: ColorNumber[g, label: 'g'],
-      blue:  ColorNumber[b, label: 'b']
+      red:   Number[r, label: 'r'],
+      green: Number[g, label: 'g'],
+      blue:  Number[b, label: 'b']
     )
   end
+
+  def to_hex
+    "##{red.to_s(16)}#{green.to_s(16)}#{blue.to_s(16)}"
+  end
 end
 
 rgb_color = RGBColor.new(r: 1, g: 1, b: 255)

data/examples/rgb_2.rb

@@ -10,12 +10,6 @@ gemfile do
 end
 
 RGBNumber = Micro::Struct.with(:readonly).new(:value) do
-  def to_s
-    value.to_s(16)
-  end
-end
-
-module RGBNumber
   Input = Kind.object(name: 'Integer(>= 0 and <= 255)') do |value|
     value.is_a?(::Integer) && value >= 0 && value <= 255
   end
@@ -23,19 +17,13 @@ module RGBNumber
   def self.new(value, label:)
     __new__(value: Input[value, label: label])
   end
-end
-
-RGBColor = Micro::Struct.with(:readonly, :to_ary).new(:red, :green, :blue) do
-  def to_a
-    [red.value, green.value, blue.value]
-  end
 
-  def to_hex
-    "##{red}#{green}#{blue}"
+  def to_s
+    value.to_s(16)
   end
 end
 
-module RGBColor
+RGBColor = Micro::Struct.with(:readonly, :to_ary).new(:red, :green, :blue) do
   def self.new(r:, g:, b:)
     __new__(
       red:   RGBNumber.new(r, label: 'r'),
@@ -43,6 +31,14 @@ module RGBColor
       blue:  RGBNumber.new(b, label: 'b')
     )
   end
+
+  def to_a
+    [red.value, green.value, blue.value]
+  end
+
+  def to_hex
+    "##{red}#{green}#{blue}"
+  end
 end
 
 rgb_color = RGBColor.new(r: 1, g: 1, b: 255)

data/lib/micro/struct/factory/create_struct.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+class Micro::Struct::Factory
+  module CreateStruct
+    extend self
+
+    def with(required_members, optional_members, features, &block)
+      struct = ::Struct.new(*(required_members + optional_members))
+
+      def_initialize(struct, required_members, optional_members)
+      def_to_ary(struct) if features[:to_ary]
+      def_to_hash(struct) if features[:to_hash]
+      def_to_proc(struct) if features[:to_proc]
+      def_readonly(struct) if features[:readonly]
+      def_instance_copy(struct) if features[:instance_copy]
+
+      struct.class_eval(&block) if block
+
+      struct
+    end
+
+    private
+
+      def def_initialize(struct, required_members, optional_members)
+        required = "#{required_members.join(':, ')}#{':' unless required_members.empty?}"
+        optional = "#{optional_members.join(': nil, ')}#{': nil' unless optional_members.empty?}"
+
+        keywords_arguments = [required, optional].reject(&:empty?).join(', ')
+        positional_arguments = (required_members + optional_members).join(', ')
+
+        # The .new() method will require all required keyword arguments.
+        # We are doing this because the Struct constructor keyword init option treats everything as optional.
+        #
+        struct.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+          class << self
+            undef_method :new
+
+            def new(#{keywords_arguments})                        # def new(a:, b:, c: nil) do
+              instance = allocate                                 #   instance = allocate
+              instance.send(:initialize, #{positional_arguments}) #   instance.send(:initialize, a, b, c)
+              instance                                            #   instance
+            end                                                   # end
+
+            alias __new__ new
+          end
+        RUBY
+      end
+
+      def def_to_ary(struct)
+        struct.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+          def to_ary
+            to_a
+          end
+        RUBY
+      end
+
+      def def_to_hash(struct)
+        struct.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+          def to_hash
+            to_h
+          end
+        RUBY
+      end
+
+      def def_readonly(struct)
+        struct.send(:private, *struct.members.map { |member| "#{member}=" })
+      end
+
+      def def_instance_copy(struct)
+        struct.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+          def with(**members)
+            self.class.new(**to_h.merge(members))
+          end
+        RUBY
+      end
+
+      def def_to_proc(struct)
+        struct.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+          def self.to_proc
+            ->(hash) { new(**hash) }
+          end
+        RUBY
+      end
+  end
+
+  private_constant :CreateStruct
+end

data/lib/micro/struct/{creator.rb → factory.rb}

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 module Micro::Struct
-  class Creator
-    require_relative 'creator/create_module'
-    require_relative 'creator/create_struct'
+  class Factory
+    require_relative 'factory/create_struct'
 
     def initialize(features)
       @features = Features.require(features)
@@ -17,13 +16,9 @@ module Micro::Struct
       optional_members = NormalizeMemberNames[optional]
       required_members = NormalizeMemberNames[members] + NormalizeMemberNames[required]
 
-      container = CreateModule.with(required_members, optional_members, @features)
-      struct = CreateStruct.with(required_members, optional_members, @features, &block)
-
-      container.const_set(:Struct, struct)
-      struct.const_set(:Container, container)
+      CreateStruct.with(required_members, optional_members, @features, &block)
     end
   end
 
-  private_constant :Creator
+  private_constant :Factory
 end

data/lib/micro/struct/version.rb

@@ -2,6 +2,6 @@
 
 module Micro
   module Struct
-    VERSION = '0.9.0'
+    VERSION = '0.10.0'
   end
 end

data/lib/micro/struct.rb

@@ -2,7 +2,7 @@
 
 require_relative 'struct/version'
 require_relative 'struct/features'
-require_relative 'struct/creator'
+require_relative 'struct/factory'
 require_relative 'struct/normalize_names'
 
 module Micro
@@ -62,7 +62,7 @@ module Micro
     end
 
     def self.with(*features)
-      Creator.new(features)
+      Factory.new(features)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u-struct
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Rodrigo Serradura
@@ -63,9 +63,8 @@ files:
 - examples/rgb_2.rb
 - examples/rgb_3.rb
 - lib/micro/struct.rb
-- lib/micro/struct/creator.rb
-- lib/micro/struct/creator/create_module.rb
-- lib/micro/struct/creator/create_struct.rb
+- lib/micro/struct/factory.rb
+- lib/micro/struct/factory/create_struct.rb
 - lib/micro/struct/features.rb
 - lib/micro/struct/normalize_names.rb
 - lib/micro/struct/version.rb

data/lib/micro/struct/creator/create_module.rb

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-class Micro::Struct::Creator
-  module CreateModule
-    extend self
-
-    def with(required_members, optional_members, features)
-      container = Module.new
-
-      def_initialize(container, required_members, optional_members)
-      def_triple_eq(container)
-      def_members(container)
-      def_to_proc(container) if features[:to_proc]
-
-      container
-    end
-
-    private
-
-      def def_initialize(container, required_members, optional_members)
-        required = "#{required_members.join(':, ')}#{':' unless required_members.empty?}"
-        optional = "#{optional_members.join(': nil, ')}#{': nil' unless optional_members.empty?}"
-
-        method_arguments = [required, optional].reject(&:empty?).join(', ')
-        struct_arguments = (required_members + optional_members).join(', ')
-
-        # The .new() method will require all required keyword arguments.
-        # We are doing this because the Struct constructor keyword init option treats everything as optional.
-        #
-        container.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          def self.__new__(#{method_arguments})    # def self.__new__(a:, b:) do
-            Struct.send(:new, #{struct_arguments}) #   Struct.send(:new, a, b)
-          end                                      # end
-
-          class << self
-            alias new __new__
-          end
-        RUBY
-      end
-
-      def def_triple_eq(container)
-        container.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          def self.===(other)
-            Struct === other
-          end
-        RUBY
-      end
-
-      def def_members(container)
-        container.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          def self.members
-            Struct.members
-          end
-        RUBY
-      end
-
-      def def_to_proc(container)
-        container.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          def self.to_proc
-            ->(hash) { new(**hash) }
-          end
-        RUBY
-      end
-  end
-
-  private_constant :CreateModule
-end

data/lib/micro/struct/creator/create_struct.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-class Micro::Struct::Creator
-  module CreateStruct
-    extend self
-
-    def with(required_members, optional_members, features, &block)
-      struct = ::Struct.new(*(required_members + optional_members), &block)
-      struct.send(:private_class_method, :new)
-
-      def_to_ary(struct) if features[:to_ary]
-      def_to_hash(struct) if features[:to_hash]
-      def_readonly(struct) if features[:readonly]
-      def_instance_copy(struct) if features[:instance_copy]
-
-      struct
-    end
-
-    private
-
-      def def_to_ary(struct)
-        struct.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          def to_ary
-            to_a
-          end
-        RUBY
-      end
-
-      def def_to_hash(struct)
-        struct.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          def to_hash
-            to_h
-          end
-        RUBY
-      end
-
-      def def_readonly(struct)
-        struct.send(:private, *struct.members.map { |member| "#{member}=" })
-      end
-
-      def def_instance_copy(struct)
-        struct.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          def with(**members)
-            self.class.const_get(:Container, false).new(**to_h.merge(members))
-          end
-        RUBY
-      end
-  end
-
-  private_constant :CreateStruct
-end