evt-collection 2.3.0.0 → 2.4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41b5abd8c9b23084b29c701eaad95f9b175a5b0dfeec6bb7a5298c7f90ef48d9
-  data.tar.gz: a5978352d642af44dca0c31b96c1a91dd7b44c225381a3be1fbdb99f7c3ffcba
+  metadata.gz: 922a2fa4912c4f8a3778994ed975dfc184bb728343159529dc299c3352888f13
+  data.tar.gz: d3c07b56ef57547eaf553ff34e28735b73a2188a6d69ccae64994ee8a5c42cb2
 SHA512:
-  metadata.gz: 61b55f4b39f901858ee8f623ce105bfebd49093aa9495e39fc1851d096f29b8422d6c730e19d95b8f122f0a0b77d346362cfc79c08ab6b4f0fd86c9d5ef26848
-  data.tar.gz: 902731c7fa012e623ff11424db7b38de0e97ff09b2fca2d4f979d2a90916cd0e933bb25de3a235a2b6c544799d66c6d5b0c66415aed2aa66fda8cd94e03bf6e2
+  metadata.gz: 7a40a6bca7e341f5d29bee4210fe5be181d8c5dac9bdc64e2e3b14936fce0ff86684cfc802e4c7eb5d701b261214085b9daab9f40934140fcf8ee11882a17944
+  data.tar.gz: 3c37fcc99ed713c70f7d14051acaebe4c4fa9da7ed63d49554097a0c5e0a5b577b225d32df7dd2ea5eca2c906dbafe60200c4c48b356b5dc4fe6d6d1f8db6a08

data/lib/collection.rb

@@ -1,4 +1,5 @@
 require 'set'
 
-require 'collection/set'
+require 'collection/generic'
 require 'collection/collection'
+require 'collection/set'

data/lib/collection/collection.rb

@@ -1,4 +1,44 @@
 module Collection
+  def self.included(cls)
+    cls.include Enumerable
+    cls.extend Generic
+  end
+
+  attr_reader :type_parameter
+
+  def initialize(type_parameter)
+    @type_parameter = type_parameter
+  end
+
+  def add(val)
+    if not val.is_a?(type_parameter)
+      raise ArgumentError, "#{val.inspect} must be a #{type_parameter.name}"
+    end
+
+    content.add(val)
+
+    self
+  end
+  alias :<< :add
+
+  def each(&action)
+    content.each(&action)
+  end
+
+  def empty?
+    content.empty?
+  end
+
+  def clear
+    content.clear
+    self
+  end
+
+  def ==(other)
+    other.class == self.class && other.type_parameter == self.type_parameter && other.content == self.content
+  end
+  alias :eql? :==
+
   def self.Set(items)
     items = Array(items)
 

data/lib/collection/generic.rb

@@ -0,0 +1,45 @@
+module Collection
+  module Generic
+    def [](type_parameter)
+      type_parameter_name = constant_name(type_parameter)
+
+      cls = nil
+      unless self.const_defined?(type_parameter_name, false)
+        cls = define_class(type_parameter)
+        set_collection_constant(type_parameter, cls)
+      else
+        cls = const_get(type_parameter_name)
+      end
+
+      cls
+    end
+
+    def define_class(type_parameter)
+      cls = Class.new(self) do
+        def initialize; end
+
+        define_method :type_parameter do
+          type_parameter
+        end
+      end
+
+      set_collection_constant(type_parameter, cls)
+
+      cls
+    end
+
+    def constant_name(constant)
+      constant.name.gsub('::', '_')
+    end
+
+    def set_collection_constant(constant, cls)
+      class_name = constant_name(constant)
+
+      unless self.const_defined?(class_name, false)
+        self.const_set(class_name, cls)
+      end
+
+      class_name
+    end
+  end
+end

data/lib/collection/set.rb

@@ -1,110 +1,6 @@
 module Collection
   class Set
-    include Enumerable
-
-    attr_reader :type_parameter
-
-    def initialize(type_parameter)
-      @type_parameter = type_parameter
-    end
-
-    def self.[](type_parameter)
-      type_parameter_name = constant_name(type_parameter)
-
-      cls = nil
-      unless self.const_defined?(type_parameter_name, false)
-        cls = define_class(type_parameter)
-        set_collection_constant(type_parameter, cls)
-      else
-        cls = const_get(type_parameter_name)
-      end
-
-      cls
-    end
-
-    def self.define_class(type_parameter)
-      cls = Class.new(self) do
-        def initialize; end
-
-        define_method :type_parameter do
-          type_parameter
-        end
-      end
-
-      set_collection_constant(type_parameter, cls)
-
-      cls
-    end
-
-    def self.constant_name(constant)
-      constant.name.gsub('::', '_')
-    end
-
-    def self.set_collection_constant(constant, cls)
-      class_name = constant_name(constant)
-
-      unless self.const_defined?(class_name, false)
-        self.const_set(class_name, cls)
-      end
-
-      class_name
-    end
-
-    def ==(other)
-      other.class == self.class && other.type_parameter == self.type_parameter && other.content == self.content
-    end
-    alias :eql? :==
-
-    def add(val)
-      vals = Array(val)
-
-      vals.each do |val|
-        raise ArgumentError, "#{val.inspect} must be a #{type_parameter.name}" unless val.is_a? type_parameter
-        content.add(val)
-      end
-
-      self
-    end
-    alias :<< :add
-
-    def entry?(val=nil, &predicate)
-      if !block_given?
-        predicate = lambda { |m| m == val }
-      end
-
-      entries(&predicate).length > 0
-    end
-
-    def entries(&predicate)
-      content.select(&predicate)
-    end
-
-    def entry(&predicate)
-      content.find(&predicate)
-    end
-
-    def each(&action)
-      content.each(&action)
-    end
-
-    def entries?
-      !content.empty?
-    end
-
-    def empty?
-      content.empty?
-    end
-
-    def length
-      content.length
-    end
-    alias :size :length
-
-    def clear
-      content.clear
-
-      self
-    end
+    include Collection
 
     def content
       @content ||= ::Set.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-collection
 version: !ruby/object:Gem::Version
-  version: 2.3.0.0
+  version: 2.4.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test_bench
@@ -35,6 +35,7 @@ files:
 - lib/collection/controls.rb
 - lib/collection/controls/array.rb
 - lib/collection/controls/member.rb
+- lib/collection/generic.rb
 - lib/collection/set.rb
 homepage: https://github.com/eventide-project/collection
 licenses: