evt-collection 1.1.0.6 → 2.4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7709eba53ae59d0111d893d9195b1fdf55bbebd29dcc74103f00707809b79c1
-  data.tar.gz: 9f9b5f172c0109abda13bf7544916db3d8031fbe19a7d04d33322b16e0f07dd2
+  metadata.gz: 6b9873a9d37bf4b855172f564e19e47a9605e944a0b843f304183d3b8426dbf2
+  data.tar.gz: e0aec9f5c363c823fb726140a4bdc6398c47887967b3602e0665993606f84ee6
 SHA512:
-  metadata.gz: 1c18eb19d1b98c917cf02e6a0a271a6221bf5e60e77d05d1ffe6aadf8288f57c2fc5207bcb41f501b24077219ed38cf2756060fe257c4415519f00e2e2d08caf
-  data.tar.gz: 8a2820ab543bbdf5f01c9ca08366331192591c223af6e9c3e6f22e8e507efd631f85619cf91f743b5bfd2264b3908afc1d2bfbfb74c5e83db9c8dbe6f0da0490
+  metadata.gz: 3b524d393b8d526b4d38f60c1a2d11d48b9e136123289251eac790235c4d0b1eff2b1b17b5425618e544c89e53efa1d9212d237235a8de7b1479b007ef7270d3
+  data.tar.gz: ed544b2dcefb07112a0879937ae1e399319a0b092ba1e0d7849506de00c3bcc4657bc6aca9c0d7a329b63ba6eee4e03de52f5078340c9cfee0e62f05d8480329

data/lib/collection.rb

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

data/lib/collection/array.rb

@@ -0,0 +1,9 @@
+module Collection
+  class Array
+    include Collection
+
+    def content
+      @content ||= ::Array.new
+    end
+  end
+end

data/lib/collection/collection.rb

@@ -1,10 +1,46 @@
 module Collection
-  def self.[](type_parameter)
-    Set[type_parameter]
+  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 << 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)
+    items = Kernel::Array(items)
 
     raise ArgumentError, "Collection can't be empty" if items.empty?
 
@@ -13,9 +49,25 @@ module Collection
     set = Set[type_parameter].new
 
     items.each do |member|
-      set.add member
+      set.add(member)
     end
 
     set
   end
+
+  def self.Array(items)
+    items = Kernel::Array(items)
+
+    raise ArgumentError, "Collection can't be empty" if items.empty?
+
+    type_parameter = items[0].class
+
+    array = Array[type_parameter].new
+
+    items.each do |member|
+      array.add(member)
+    end
+
+    array
+  end
 end

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,100 +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 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
-    alias :count :length
+    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: 1.1.0.6
+  version: 2.4.1.0
 platform: ruby
 authors:
 - The Eventide Project
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test_bench
@@ -31,16 +31,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/collection.rb
+- lib/collection/array.rb
 - lib/collection/collection.rb
 - 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:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -55,8 +57,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Type-checked set
 test_files: []