toolcase 0.3.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f099f2193339ea7d0f31bb988a30b282133bc4e4b0310e63b4a7c7467ed282b2
-  data.tar.gz: 47299ea8eca5e21633d93df94928b85dd6236c0434eb7baf094944e42930a8cc
+  metadata.gz: 59b70826e002497b7a94fafe6eb333de5189f8fa52ef1c4385aa84570d5e0e49
+  data.tar.gz: 9de36cee21aff4d68056a133feeae117e81568348e18ba34f2cc0f7b4cdcb795
 SHA512:
-  metadata.gz: 511d82c8b0fe08718bdd95f8acb8ca5fbe5a4f91ec927d5c9fd90a95ef2997536642c422675cd599306d6d5c00cf086275bcdf08aa124bebd5dd34e4e376e49e
-  data.tar.gz: 322680fd34075024744fc159978c18af956da80b37fbc00304eadb41c0ef7d171f5fac247e85034b00b92a1abfce8f3274090d4028fb3a4cc2cec92de325a964
+  metadata.gz: cf999c92c9abb3afe882b8963130bbcf106c9205ba3175c4a43709074444a2b5ae9486a7ccca2dbb4a97c966842dcfe25d109cec40f18fe7b2dfec24bad27523
+  data.tar.gz: f6825afe59b5ed39aae2d16f02a8d7fb4690bf66ec64884e496e6b9a0c1bac56a670e85f85a5f62b7f6e037ca5f846f8242ca59259d31e7cd3270c76d4f496bc

data/lib/toolcase/registry.rb

@@ -1,21 +1,22 @@
 # frozen_string_literal: true
 
+require 'set'
+require 'securerandom'
+
 module Toolcase
   # Registry mixin. Allows to convert a class into a registrable container.
   # It can then be used to register strategies/handlers and use the class as an abstract factory.
   module Registry
-    def register(object = nil, id: nil, tag: :nil, &block)
+    def register(object = nil, id: default_id, tags: EMPTY, &block)
+      return if container.key?(id)
+
       element = nil
       element = object unless object.nil?
       element = block if block_given?
 
-      return if element.nil? || include?(element)
-
-      elements << element
-      tagged_elements[tag] << element
-      identifiers[id] = element unless id.nil?
+      tags = tags.is_a?(Array) ? tags : [tags]
 
-      element
+      container[id] = [element, Set.new(tags)]
     end
 
     def default(object = nil)
@@ -24,87 +25,80 @@ module Toolcase
     end
 
     def [](id)
-      identifiers.fetch(id, default)
+      container.key?(id) ? container[id].first : default
     end
 
     def find_by(tag = nil, &block)
-      container(tag).find(-> { default }, &block)
+      subset(tag).find(-> { default }, &block)
     end
 
     def include?(object, tag = nil)
-      container(tag).include?(object)
+      subset(tag).include?(object)
     end
 
     def size(tag = nil)
-      container(tag).size
+      subset(tag).size
     end
 
-    def replace(old_object_or_id, new_object)
-      resolve_object_or_id(old_object_or_id) do |id, element|
-        identifiers[id] = new_object unless id.nil?
-        elements[elements.index(element)] = new_object
-
-        tagged_list = find_in_tagged(element)
-        tagged_list[tagged_list.index(element)] = new_object unless tagged_list.nil?
+    def replace(old, new_object)
+      object_or_id(old) do |id|
+        old_tuple = container[id]
+        container[id] = [new_object, old_tuple.last]
       end
     end
 
-    def remove(object_or_id)
-      resolve_object_or_id(object_or_id) do |id, element|
-        identifiers.delete(id)
-        elements.delete(element)
-        find_in_tagged(element)&.delete(element)
+    def remove(value_or_id)
+      object_or_id(value_or_id) do |id|
+        container.delete(id)
       end
     end
 
     def clear(tag = nil)
-      registries(tag).each { |object| remove(object) }
+      subset(tag).each { |object| remove(object) }
     end
 
     def inherited(child)
       super
-      child.elements.concat(registries)
-      child.tagged_elements.merge!(tagged_elements)
-      child.identifiers.merge!(identifiers)
+      child.container.merge!(container)
       child.default(default)
     end
 
     def registries(tag = nil)
-      container(tag).clone.freeze
+      subset(tag)
+    end
+
+    def tags
+      container.values.flat_map { |_, tags| tags.to_a }.uniq
+    end
+
+    def identifiers(tag = nil)
+      entries_by_tag(tag).keys
     end
 
     protected
 
     EMPTY = [].freeze
 
-    def elements
-      @elements ||= []
+    def container
+      @container ||= {}
     end
 
-    def resolve_object_or_id(obj_or_id)
-      id = identifiers.key?(obj_or_id) ? obj_or_id : identifiers.find { |_, value| value == obj_or_id }&.first
-      element = id.nil? ? obj_or_id : identifiers[id]
-      return unless include?(element)
-
-      yield(id, element)
+    def subset(tag)
+      entries_by_tag(tag).values.map(&:first)
     end
 
-    def tagged_elements
-      @tagged_elements ||= Hash.new { |hash, key| hash[key] = [] }
+    def entries_by_tag(tag)
+      container.select { |_, (_, tags)| tag.nil? || tags.include?(tag) }
     end
 
-    def find_in_tagged(element)
-      tagged_elements.find { |_, list| list.include?(element) }&.last
-    end
+    def object_or_id(obj_or_id)
+      id = container.key?(obj_or_id) ? obj_or_id : container.find { |_, (value, _)| value == obj_or_id }&.first
 
-    def identifiers
-      @identifiers ||= {}
+      yield(id) unless id.nil?
     end
 
-    def container(tag)
-      return elements if tag.nil?
-
-      tagged_elements.key?(tag) ? tagged_elements[tag] : EMPTY
+    def default_id
+      SecureRandom.uuid
     end
   end
 end

data/lib/toolcase/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Toolcase
-  VERSION = "0.3.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toolcase
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.1.0
 platform: ruby
 authors:
 - enchf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug