evt-collection 1.2.0.0 → 2.4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a63d383cd2684aba2976b1fc2599dc87085b54168e2be64dd2b4d04adde690bb
-  data.tar.gz: 12d1fc56025b87b0d3837234e782867533ff624c362ed0ff74b9c4462e076dd3
+  metadata.gz: 0da4d6ada538145f5de05dbe96dcdf01556f60582f58011a4b0139c421a1db51
+  data.tar.gz: 8b844dcb8daccc43d829d4a83224818bfd7deff5be41d4ad242544aa7fac14a7
 SHA512:
-  metadata.gz: ef99b4d0e58d2cb741b213655556596f61305468269a4d5420c845ed632a75d032a5b6f7f327d222f04f44965e3c67fd28b347a2a3b8f90997583e12620c33f9
-  data.tar.gz: adf3412d3c003f5f53d5bf53cea9c0aca2ec61dcf5f30dcae428163609f81b5fd3012c8ce250f4f642ca689a879fb9e9166f16f1f062806e00fc222e07ce8fa6
+  metadata.gz: d372356ebd516436d3503adabdad726522622afdc0e18ef5afb78d18579aff6315e80debbcf3acc5c85bd6a2ecc49e7c650fe1a1c2e936aaf4e981b7d1406bd3
+  data.tar.gz: 555f07ebc9e85db79a26e8eaafb9452e78a9964b3a64681a6ff0f84b358695330180193a2a65d3f66b5af46e4aa48506c471f703c108b8cec81c27a52f5d553b

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,18 @@
+module Collection
+  class Array
+    include Collection
+
+    def content
+      @content ||= ::Array.new
+    end
+
+    def last
+      content.last
+    end
+
+    def length
+      count
+    end
+    alias :size :length
+  end
+end

data/lib/collection/collection.rb

@@ -1,6 +1,46 @@
 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 << 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?
 
@@ -9,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,103 +1,18 @@
 module Collection
   class Set
-    include Enumerable
+    include Collection
 
-    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?
+    def content
+      @content ||= ::Set.new
     end
 
-    def empty?
-      content.empty?
+    def last
+      content.to_a.last
     end
 
     def length
-      content.length
+      count
     end
     alias :size :length
-    alias :count :length
-
-    def content
-      @content ||= ::Set.new
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-collection
 version: !ruby/object:Gem::Version
-  version: 1.2.0.0
+  version: 2.4.2.0
 platform: ruby
 authors:
 - The Eventide Project
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2021-04-05 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: []