evt-collection 2.4.4.1 → 2.4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1382787f77f9cf877782c6d299d737df126dac69ed3d793001d10001e1a0bd75
-  data.tar.gz: b491cf4e131f9bd9645fc6d39ca76979e116847c5e1dba08a2f083d3beb693f4
+  metadata.gz: c3c0236190e801658ae9b8caa4a44afecfd165c210d217babfa19fb7a5c6e5bb
+  data.tar.gz: 802cdca0655f52a893d0dda1b7f104b1e033f8d7995a31da2476a4670a417caa
 SHA512:
-  metadata.gz: 34cffee6f74c1f7cc3bfa17a4bd251f7ccd9629af5d541b7810fd510b7440f9a3e8fc26181dd0706ba87a1df7903cc992454af180cb328c35ca9af32fa568923
-  data.tar.gz: 67148c48ec1ee9e771bbb225c9ae67eaf0ad441df61695ad57fea8abd65f6403778fe0267276f3fdeffb0f1ff0c65a209d1c49a759cfc05ea98f68adf8144c81
+  metadata.gz: b1e114ebb8e32ca1a94ecbec0784df572e6a06bcf19bfd7cc04cd57e6efa6e4d421dbb41d48c763a9355f721a57dfd23cea8ffc8540b703ee715026a4787f001
+  data.tar.gz: 55e475ec4fda87a9c239e3dce4b47bd77a88b3cb39a8208378c9d1b8538ce949a5e604877ea09b96290eb916a1ec980870c2f113779ec95684926027200125a0

data/lib/collection/controls/array.rb

@@ -6,27 +6,26 @@ module Collection
       end
 
       def self.member_class
-        Member::Class.example
+        Class.example
       end
 
       module RandomMemberClass
-        def self.example
-          cls = member_class
-          [cls.new, cls.new]
-        end
+        def self.example(homogeneous_classes: nil)
+          homogeneous_classes ||= false
 
-        def self.member_class
-          Member::Class.random
-        end
-      end
+          if homogeneous_classes
+            cls_1 = member_class
+            cls_2 = cls_1
+          else
+            cls_1 = member_class
+            cls_2 = member_class
+          end
 
-      module Anomaly
-        def self.example
-          [member_class.new, member_class.new]
+          [cls_1.new, cls_2.new]
         end
 
         def self.member_class
-          Member::Class.random
+          Class::Random.example
         end
       end
     end

data/lib/collection/controls/class.rb

@@ -0,0 +1,37 @@
+module Collection
+  module Controls
+    module Class
+      def self.example
+        Example
+      end
+
+      Example = ::Class.new
+
+      module Random
+        def self.example(root: nil)
+          root ||= false
+
+          class_name = "Class#{SecureRandom.hex(2).upcase}"
+
+          namespace = namespace(root)
+
+          namespace.const_set(class_name, ::Class.new)
+        end
+
+        def self.namespace(root)
+          if root
+            Object
+          else
+            Collection::Controls::Class
+          end
+        end
+      end
+
+      module Root
+        def self.example
+          Random.example(root: true)
+        end
+      end
+    end
+  end
+end

data/lib/collection/controls.rb

@@ -1,2 +1,2 @@
-require 'collection/controls/member'
+require 'collection/controls/class'
 require 'collection/controls/array'

data/lib/collection/generic.rb

@@ -3,15 +3,11 @@ module Collection
     def [](type_parameter, &implementation)
       type_parameter_name = constant_name(type_parameter)
 
-      cls = nil
-      unless self.const_defined?(type_parameter_name, false)
-        cls = define_class(type_parameter, &implementation)
-        set_collection_constant(type_parameter, cls)
+      if implementation.nil? && self.const_defined?(type_parameter_name, false)
+        return const_get(type_parameter_name)
       else
-        cls = const_get(type_parameter_name)
+        return define_class(type_parameter, &implementation)
       end
-
-      cls
     end
 
     def define_class(type_parameter, &implementation)
@@ -37,23 +33,29 @@ module Collection
         cls.class_exec(&implementation)
       end
 
-      set_collection_constant(type_parameter, cls)
+      randomize = !implementation.nil?
+      set_collection_constant(type_parameter, cls, randomize)
 
       cls
     end
 
-    def constant_name(constant)
-      constant.name.gsub('::', '_')
-    end
+    def set_collection_constant(constant, cls, randomize=nil)
+      randomize ||= false
 
-    def set_collection_constant(constant, cls)
-      class_name = constant_name(constant)
+      constant_name = constant_name(constant)
 
-      unless self.const_defined?(class_name, false)
-        self.const_set(class_name, cls)
+      if randomize
+        suffix = SecureRandom.hex.upcase
+        constant_name = "#{constant_name}_#{suffix}"
       end
 
-      class_name
+      self.const_set(constant_name, cls)
+
+      constant_name
+    end
+
+    def constant_name(constant)
+      constant.name.gsub('::', '_')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-collection
 version: !ruby/object:Gem::Version
-  version: 2.4.4.1
+  version: 2.4.4.2
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-24 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test_bench
@@ -35,7 +35,7 @@ files:
 - lib/collection/collection.rb
 - lib/collection/controls.rb
 - lib/collection/controls/array.rb
-- lib/collection/controls/member.rb
+- lib/collection/controls/class.rb
 - lib/collection/generic.rb
 - lib/collection/set.rb
 homepage: https://github.com/eventide-project/collection
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Type-checked set and array

data/lib/collection/controls/member.rb

@@ -1,29 +0,0 @@
-module Collection
-  module Controls
-    module Member
-      def self.example
-        Class.example.new
-      end
-
-      module Root
-        def self.example
-          Class.random
-        end
-      end
-
-      module Class
-        def self.example
-          Member
-        end
-
-        def self.random
-          class_name = "Class#{SecureRandom.hex(2).upcase}"
-          Object.const_set(class_name, ::Class.new)
-        end
-
-        class Member
-        end
-      end
-    end
-  end
-end