toolcase 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c95b47f26273821d56bed57d92d27a73feebc80774dcc9b32c3f3d34f4b636f6
-  data.tar.gz: 64e59a350c95aa60ab8ba59486563a586494ae8df12a983a021514e1a03167fa
+  metadata.gz: 38fd1d4c41d5004980f75591681b837525521f2e568c33eae57053aa8905706d
+  data.tar.gz: 5d429619ea3dc02504c7b3cfbd2c43937fa8102c053a077dd18b8ce411832d80
 SHA512:
-  metadata.gz: c2f3f9ef874e3eb43c81a1dbc0ebd67c3f3b2c757b58e0a498b8cd45aecbb530d039c09a0ef67cf18d5fbeb7958cc8e2d6853b389660c0f3f803ebec18818fb8
-  data.tar.gz: 6787e2f3616321b212ba9f49aadc3280609a06cf0bb464b360ca36af23d470d0f02c367d4ca1b3f26bd45b720044ec07c1d43866bf411c27148a1a780bd50777
+  metadata.gz: fbe251672369dd5f4c3f1b4d71442df24eaeb1346f438ec4ed614e71c3f82664bdc1214d8f006e74689c8359c9da59f387a6d3afeec5277d9592b2fce22ccace
+  data.tar.gz: fc748d1c3bf72798dbeb573518a07031f1627c547436facf49ea1ecae44899914a9c7801e0fcef67dd3e4317379b2a649c8329240d6f7f52772b12e2b94b1278

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,91 +25,74 @@ 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
-      tagged_elements.keys.reject { |key| key == :nil }
+      container.values.flat_map { |_, tags| tags.to_a }.uniq
     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)
+      container.values.select do |_, tags|
+        tag.nil? || tags.include?(tag)
+      end.map(&:first)
     end
 
-    def tagged_elements
-      @tagged_elements ||= Hash.new { |hash, key| hash[key] = [] }
-    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.4.0"
+  VERSION = "1.0.0"
 end

metadata

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