evt-collection 2.4.4.0 → 2.4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 699f42d6306d91f0390b798ca859f6d68ee1df6eb6641dc78dfef84f2db0006b
-  data.tar.gz: 3d3c3853ae0b9e7a96d537e6406f4e4c780c6e62e03813c420d657b111e8e62b
+  metadata.gz: c3c0236190e801658ae9b8caa4a44afecfd165c210d217babfa19fb7a5c6e5bb
+  data.tar.gz: 802cdca0655f52a893d0dda1b7f104b1e033f8d7995a31da2476a4670a417caa
 SHA512:
-  metadata.gz: '0697d5d3bdc8b40f263b68907d7b75ac7ceaf1f236bed99fb9c4b44424b8aafd51d8d2df695748676a62f7e281f9525b60f0cc18d19e4dc5a03f4615fed8c54e'
-  data.tar.gz: 9a959a04cc0421afaea92c179ac087411855438792906bfccd632fa5084908478abd6e075dfc2edffdbea3ddcaae9c510126f7771b264708c4aca391ca474095
+  metadata.gz: b1e114ebb8e32ca1a94ecbec0784df572e6a06bcf19bfd7cc04cd57e6efa6e4d421dbb41d48c763a9355f721a57dfd23cea8ffc8540b703ee715026a4787f001
+  data.tar.gz: 55e475ec4fda87a9c239e3dce4b47bd77a88b3cb39a8208378c9d1b8538ce949a5e604877ea09b96290eb916a1ec980870c2f113779ec95684926027200125a0

data/lib/collection/array.rb

@@ -2,12 +2,13 @@ module Collection
   class Array
     include Collection
 
-    def content
-      @content ||= ::Array.new
+    def items
+      @items ||= ::Array.new
     end
+    alias :content :items
 
     def last
-      content.last
+      items.last
     end
 
     def length

data/lib/collection/collection.rb

@@ -15,47 +15,55 @@ module Collection
       raise ArgumentError, "#{val.inspect} must be a #{type_parameter.name}"
     end
 
-    content << val
+    items << val
 
     self
   end
   alias :<< :add
 
   def each(&action)
-    content.each(&action)
+    items.each(&action)
   end
 
   def empty?
-    content.empty?
+    items.empty?
   end
 
   def clear
-    content.clear
+    items.clear
     self
   end
 
   def ==(other)
-    other.class == self.class && other.type_parameter == self.type_parameter && other.content == self.content
+    other.class == self.class && other.type_parameter == self.type_parameter && other.items == self.items
   end
   alias :eql? :==
 
-  def self.Set(items)
+  def self.Set(items, &implementation)
     items = Kernel::Array(items)
 
     raise ArgumentError, "Collection can't be empty" if items.empty?
 
     type_parameter = items[0].class
 
-    Set[type_parameter].build(items)
+    cls = Set[type_parameter, &implementation]
+
+    collection = cls.build(items)
+
+    collection
   end
 
-  def self.Array(items)
+  def self.Array(items, &implementation)
     items = Kernel::Array(items)
 
     raise ArgumentError, "Collection can't be empty" if items.empty?
 
     type_parameter = items[0].class
 
-    Array[type_parameter].build(items)
+    cls = Array[type_parameter, &implementation]
+
+    collection = cls.build(items)
+
+    collection
   end
 end

data/lib/collection/controls/array.rb

@@ -2,18 +2,30 @@ module Collection
   module Controls
     module Array
       def self.example
-        [Member.new, Member.new]
+        [member_class.new, member_class.new]
       end
 
-      class Member
+      def self.member_class
+        Class.example
       end
 
-      module Anomaly
-        def self.example
-          [Array::Member.new, Member.new]
+      module RandomMemberClass
+        def self.example(homogeneous_classes: nil)
+          homogeneous_classes ||= false
+
+          if homogeneous_classes
+            cls_1 = member_class
+            cls_2 = cls_1
+          else
+            cls_1 = member_class
+            cls_2 = member_class
+          end
+
+          [cls_1.new, cls_2.new]
         end
 
-        class Member
+        def self.member_class
+          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

data/lib/collection/set.rb

@@ -2,12 +2,13 @@ module Collection
   class Set
     include Collection
 
-    def content
-      @content ||= ::Set.new
+    def items
+      @items ||= ::Set.new
     end
+    alias :content :items
 
     def last
-      content.to_a.last
+      items.to_a.last
     end
 
     def length

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-collection
 version: !ruby/object:Gem::Version
-  version: 2.4.4.0
+  version: 2.4.4.2
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-23 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,8 +57,8 @@ 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
+summary: Type-checked set and array
 test_files: []

data/lib/collection/controls/member.rb

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