infusible 3.3.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02a5684919e16bf773ea7da4a873180f2275319fd2f7a8883fd152e59914c321
-  data.tar.gz: 458f977111e74f2b78a58a5c313a1b149d26f315ef300bf9c3a508c99cd5826d
+  metadata.gz: bc25967c984d1fa86abba7a1319a91da40f62e2eec3a904ef93dee7e60a54dfc
+  data.tar.gz: a086e0fd8e9ec8d644e10fbec3f30e6465666358b6f4c190010a8c3ed5105246
 SHA512:
-  metadata.gz: 44e5c3621603e874c207aab7dbd69a48b790e8e8159551b98876cfb313194df30483e45a3b7d094d6f3aad4a2c96dc297ee2cf4136ca71c21c2d0e49c240ad73
-  data.tar.gz: 8c35c9a2da3865a6537283d922eed96659ea82fd6ba8705a1a3f788066175f4517c7a595ead341bd305fd52fc62bc2877c3848bc462367e0f43395277f7bd01a
+  metadata.gz: 58e0efa11b9c780f8d018c178cbb5e1f0ac1c56cc4b9b2919b3e79f4949fbc0833304c00f4284895b4f9212b62577bbbdc6f029fb5dfb2c503eb0740320c65c5
+  data.tar.gz: f38b08ea1b7a418e1c0c3afc853e1b8fdd184a8880d7699f4320f234bb10c03f0e5e8ed59330f5f4af1ac747d0c3bdbbe01e9282bb3f7ee09aebcd36fd114288

checksums.yaml.gz.sig

@@ -1,3 +1 @@
-K�Ya�b��]փ���{�e5͘���j.,ԑO��W���vr��yA�(�(��	��Y�A��$�&隐b�_��K����#~Nt	�;�gۺ]� ���b<��J����
-���kg��i`u�lP��g��阷{N��]+%)A�[:����a|���~�;���!K���P弇s��>p�.��6���L����m�}�`&1�`
-%�=
+$@��F����l��i����ܔ3ǓڶdX��]��H�ߜ���o����4��Ǫ��^֥$J��JaX$-��:D�t���r�(�;&��j�>O6��##g���M0�b[�f}���JO�	�
�S�uD⹀nE����/��'I���e��k��7�*2_��9Գ�n�!���k��Kb9��J�In;����zj���J�C)n�1h�L�~�O�-�9����i�	�N:�I�UidO� #{���א�ݼ�\z�E�'�Q%CߙpMpu^�Nڶ�fo#�r<K�"LI���Y�R�r�

data/README.adoc

@@ -3,18 +3,18 @@
 :figure-caption!:
 
 :dependency_injection_containers_link: link:https://alchemists.io/articles/dependency_injection_containers[Dependency Injection Containers]
-:dry-container_link: link:https://dry-rb.org/gems/dry-container[Dry Container]
+:containable_link: link:https://alchemists.io/projects/containable[Containable]
 :http_link: link:https://github.com/httprb/http[HTTP]
 
 = Infusible
 
 Automatically injects dependencies within your object via the _Dependency Inversion Principle_ -- the _D_ in _SOLID_ design -- and is a powerful way to compose complex architectures from small objects which leverage the _Single Responsibility Principle_ -- the _S_ in _SOLID_ design.
 
-When coupled with {dependency_injection_containers_link}, as provided by the {dry-container_link} gem, Infusible completes the second half of the _Dependency Inversion Principle_. Here's a quick example of Infusible in action:
+When coupled with {dependency_injection_containers_link}, as provided by the {containable_link} gem, Infusible completes the second half of the _Dependency Inversion Principle_. Here's a quick example of Infusible in action:
 
 [source,ruby]
 ----
-Import = Infusible.with({a: 1, b: 2, c: 3})
+Import = Infusible[a: 1, b: 2, c: 3]
 
 class Demo
   include Import[:a, :b, :c]
@@ -87,19 +87,20 @@ Let's walk through each staring by defining a container of dependencies.
 
 ==== Containers
 
-A container provides a common object for which you can group related dependencies for injection and reuse. {dry-container_link} is recommended for defining your dependencies but a primitive `Hash` or any object which responds to the `#[]` message works too.
+A container provides a common object for which you can group related dependencies for injection and reuse. {containable_link} is recommended for defining your dependencies but a primitive `Hash` or any object which responds to the `#[]` message works too.
 
-For documentation purposes, the {dry-container_link} gem will be used. The following creates a simple container where you might want to use the {http_link} gem to make HTTP requests and log information using Ruby's native logger.
+For documentation purposes, the {containable_link} gem will be used. The following creates a simple container where you might want to use the {http_link} gem to make HTTP requests and log information using Ruby's native logger.
 
 [source,ruby]
 ----
+require "containable"
 require "http"
 require "logger"
 
 module Container
-  extend Dry::Container::Mixin
+  extend Containable
 
-  register(:http) { HTTP }
+  register :http, HTTP
   register(:logger) { Logger.new STDOUT }
 end
 ----
@@ -112,7 +113,7 @@ Once your container is defined, you'll want to define the corresponding injector
 ----
 require "infusible"
 
-Import = Infusible.with Container
+Import = Infusible[Container]
 ----
 
 ==== Dependencies
@@ -304,14 +305,14 @@ There is no `+#private+` method since `#[]` does this for you and is _recommende
 [source,ruby]
 ----
 module Container
-  extend Dry::Container::Mixin
+  extend Containable
 
-  register(:one) { "One" }
-  register(:two) { "Two" }
-  register(:three) { "Three" }
+  register :one, "One"
+  register :two, "Two"
+  register :three, "Three"
 end
 
-Import = Infusible.with Container
+Import = Infusible[Container]
 
 class Demo
   include Import.public(:one)
@@ -328,25 +329,25 @@ demo.three  # NoMethodError: private method.
 
 ==== Infused Keys
 
-You have access to the keys of all infused dependencies via the _private_ `infused_keys` method which can be powerful in metaprogramming situations. For example, consider the following, which calls all injected dependencies since they have the same Object API (i.e. `#call`):
+You have access to the keys of all dependencies via the _private_ `#infused_keys` method which is powerful in metaprogramming situations. For example, consider the following which calls all injected dependencies since they have the same Object API (i.e. `#call`):
 
 Example:
 
 [source,ruby]
 ----
 module Container
-  extend Dry::Container::Mixin
+  extend Containable
 
-  register(:one, proc { puts "One" }, call: false)
-  register(:two, proc { puts "Two" }, call: false)
+  register :one, "One"
+  register :two, "Two"
 end
 
-Import = Infusible.with Container
+Import = Infusible[Container]
 
 class Demo
   include Import[:one, :two]
 
-  def call = infused_keys.each { |key| __send__(key).call }
+  def call = infused_keys.each { |key| puts __send__(key) }
 end
 
 Demo.new.call
@@ -356,27 +357,25 @@ Demo.new.call
 
 As you can see, with the _private_ `#infused_keys` attribute reader, we are able to iterate through each infused key and send the `#call` message to each injected dependency.
 
-Since `#infused_keys` is a private attribute reader, this means the infused keys are private to each instance. This includes all ancestors when using inheritance as each super class in the hierarchy will have it's own unique array of infused keys depending on what was injected for that object.
+Since `#infused_keys` is a private attribute reader, this means the infused keys are private to each instance. This includes all ancestors when using inheritance as each parent class in the hierarchy will have it's own unique array of infused jk depending on what was injected for that object.
 
 All infused keys are frozen by default.
 
 === Tests
 
-As you architect your implementation, you'll want to test your injected dependencies. You might want to stub, mock, or spy on them as well. Test support is built-in for you by only requiring the stub refinement as provided by this gem. For demonstration purposes, I'll assume you are using RSpec but you can adapt for whatever testing framework you are using.
-
-Let's say you have the following implementation that combines both {dry-container_link} (or a primitive `Hash` would work too) and this gem:
+As you architect your implementation, you'll want to test your injected dependencies. You might want to stub, mock, or spy on them as well. Test support is primarily provided via the {containable_link} gem. Example:
 
 [source,ruby]
 ----
 # Our container with a single dependency.
 module Container
-  extend Dry::Container::Mixin
+  extend Containable
 
-  register(:kernel) { Kernel }
+  register :kernel, Kernel
 end
 
 # Our import which defines our container for potential injection.
-Import = Infusible.with Container
+Import = Infusible[Container]
 
 # Our action class which injects our kernel dependency from our container.
 class Action
@@ -390,21 +389,14 @@ With our implementation defined, we can test as follows:
 
 [source,ruby]
 ----
-# Required: You must require Dry Container and Infusible stubbing for testing purposes.
-require "dry/container/stub"
-require "infusible/stub"
-
 RSpec.describe Action do
-  # Required: You must refine Infusible to leverage stubbing of your dependencies.
-  using Infusible::Stub
-
   subject(:action) { Action.new }
 
   let(:kernel) { class_spy Kernel }
 
-  # Required: You must define what dependencies you want to stub and unstub before and after a test.
-  before { Import.stub kernel: }
-  after { Import.unstub :kernel }
+  before { Container.stub! kernel: }
+
+  after { Container.restore }
 
   describe "#call" do
     it "prints message" do
@@ -422,16 +414,12 @@ While the above works great for a single spec, over time you'll want to reduce d
 [source,ruby]
 ----
 # spec/support/shared_contexts/application_container.rb
-require "dry/container/stub"
-require "infusible/stub"
-
 RSpec.shared_context "with application dependencies" do
-  using Infusible::Stub
-
   let(:kernel) { class_spy Kernel }
 
-  before { Import.stub kernel: }
-  after { Import.unstub :kernel }
+  before { Container.stub! kernel: }
+
+  after { Container.restore }
 end
 ----
 
@@ -452,20 +440,7 @@ RSpec.describe Action do
 end
 ----
 
-A shared context allows you to reuse it across multiple specs by including it as needed.
-
-In both spec examples -- so far -- you'll notice only RSpec `before` and `after` blocks are used. You can use an `around` block too. Example:
-
-[source,ruby]
-----
-around do |example|
-  Import.stub_with kernel: FakeKernel do
-    example.run
-  end
-end
-----
-
-⚠️ I mention `around` block support last because the caveat is that you can't use an `around` block with any RSpec test double since link:https://github.com/rspec/rspec-mocks/issues/1283[RSpec can't guarantee proper cleanup]. This is why the RSpec `before` and `after` blocks were used to guarantee proper setup and teardown. That said, you can use _fakes_ or any object you own which _isn't_ a RSpec test double but provides the Object API you need for testing purposes.
+A shared context allows for reuse across multiple specs by including it as needed.
 
 == Development
 
@@ -524,7 +499,7 @@ Your constructor, initializer, and instance variables are all there. Only you do
 
 === Style Guide
 
-When using this gem, along with a container like {dry-container_link}, make sure to adhere to the following guidelines:
+When using this gem, along with a container like {containable_link}, make sure to adhere to the following guidelines:
 
 * Use containers to group related dependencies that make logical sense for the namespace you are working in and avoid using containers as a junk drawer for throwing random objects in.
 * Use containers that don't have a lot of registered dependencies. If you register too many dependencies, that means your objects are too complex and need to be simplified further.

data/infusible.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "infusible"
-  spec.version = "3.3.0"
+  spec.version = "3.5.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://alchemists.io/projects/infusible"
@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = "~> 3.3"
   spec.add_dependency "marameters", "~> 3.0"
-  spec.add_dependency "zeitwerk", "~> 2.6"
 
   spec.extra_rdoc_files = Dir["README*", "LICENSE*"]
   spec.files = Dir["*.gemspec", "lib/**/*"]

data/lib/infusible/constructor.rb

@@ -6,15 +6,16 @@ module Infusible
   # Provides the automatic and complete resolution of all injected dependencies.
   # :reek:TooManyInstanceVariables
   class Constructor < Module
-    def self.define_instance_variables target, names, keywords
+    def self.define_instance_variables target, keys, keywords
       unless target.instance_variable_defined? :@infused_keys
-        target.instance_variable_set :@infused_keys, names
+        target.instance_variable_set :@infused_names, keys
+        target.instance_variable_set :@infused_keys, keys
       end
 
-      names.each do |name|
-        next unless keywords.key?(name) || !target.instance_variable_defined?(:"@#{name}")
+      keys.each do |key|
+        next unless keywords.key?(key) || !target.instance_variable_defined?(:"@#{key}")
 
-        target.instance_variable_set :"@#{name}", keywords[name]
+        target.instance_variable_set :"@#{key}", keywords[key]
       end
     end
 
@@ -76,34 +77,41 @@ module Infusible
     end
 
     def define_initialize_with_positionals super_parameters, variablizer
-      instance_module.module_exec dependencies.names, variablizer do |names, definer|
+      instance_module.module_exec dependencies.keys, variablizer do |keys, definer|
         define_method :initialize do |*positionals, **keywords, &block|
-          definer.call self, names, keywords
+          definer.call self, keys, keywords
 
           if super_parameters.only_single_splats?
             super(*positionals, **keywords, &block)
           else
-            super(*positionals, **super_parameters.keyword_slice(keywords, keys: names), &block)
+            super(*positionals, **super_parameters.keyword_slice(keywords, keys:), &block)
           end
         end
       end
     end
 
     def define_initialize_with_keywords super_parameters, variablizer
-      instance_module.module_exec dependencies.names, variablizer do |names, definer|
+      instance_module.module_exec dependencies.keys, variablizer do |keys, definer|
         define_method :initialize do |**keywords, &block|
-          definer.call self, names, keywords
-          super(**super_parameters.keyword_slice(keywords, keys: names), &block)
+          definer.call self, keys, keywords
+          super(**super_parameters.keyword_slice(keywords, keys:), &block)
         end
       end
     end
 
     def define_readers
-      methods = dependencies.names.map { |name| ":#{name}" }
+      methods = dependencies.keys.map { |key| ":#{key}" }
       computed_scope = METHOD_SCOPES.include?(scope) ? scope : :private
 
       instance_module.module_eval <<-READERS, __FILE__, __LINE__ + 1
         attr_reader :infused_keys
+
+        def infused_names
+          warn "`Inusible#infused_names` is deprecated, use `#infused_keys` instead.",
+               category: :deprecated
+          @infused_names
+        end
+
         #{computed_scope} attr_reader #{methods.join ", "}
       READERS
     end

data/lib/infusible/dependency_map.rb

@@ -3,9 +3,9 @@
 module Infusible
   # Sanitizes and resolves dependencies for use.
   class DependencyMap
-    PATTERNS = {name: /([a-z_][a-zA-Z_0-9]*)$/, valid: /^[\w.]+$/}.freeze
+    PATTERNS = {key: /([a-z_][a-zA-Z_0-9]*)$/, valid: /^[\w.]+$/}.freeze
 
-    attr_reader :names
+    attr_reader :keys
 
     def initialize *configuration, patterns: PATTERNS
       @patterns = patterns
@@ -13,10 +13,10 @@ module Infusible
 
       aliases = configuration.last.is_a?(Hash) ? configuration.pop : {}
 
-      configuration.each { |identifier| add to_name(identifier), identifier }
-      aliases.each { |name, identifier| add name, identifier }
+      configuration.each { |identifier| add to_key(identifier), identifier }
+      aliases.each { |key, identifier| add key, identifier }
 
-      @names = collection.keys.freeze
+      @keys = collection.keys.freeze
     end
 
     def to_h = collection
@@ -25,20 +25,20 @@ module Infusible
 
     attr_reader :patterns, :collection
 
-    def to_name identifier
-      name = identifier[patterns.fetch(:name)]
+    def to_key identifier
+      key = identifier[patterns.fetch(:key)]
 
-      return name if name && name.match?(patterns.fetch(:valid))
+      return key if key && key.match?(patterns.fetch(:valid))
 
       fail(Errors::InvalidDependency.new(identifier:))
     end
 
-    def add name, identifier
-      name = name.to_sym
+    def add key, identifier
+      key = key.to_sym
 
-      return collection[name] = identifier unless collection.key? name
+      return collection[key] = identifier unless collection.key? key
 
-      fail Errors::DuplicateDependency.new name:, identifier:
+      fail Errors::DuplicateDependency.new key:, identifier:
     end
   end
 end

data/lib/infusible/errors/duplicate_dependency.rb

@@ -4,8 +4,8 @@ module Infusible
   module Errors
     # Prevents duplicate dependencies from being injected.
     class DuplicateDependency < StandardError
-      def initialize name:, identifier:
-        super "Remove #{identifier.inspect} since it's a duplicate of #{name.inspect}."
+      def initialize key:, identifier:
+        super "Remove #{identifier.inspect} since it's a duplicate of #{key.inspect}."
       end
     end
   end

data/lib/infusible/stub.rb

@@ -7,14 +7,27 @@ module Infusible
   module Stub
     refine Actuator do
       def stub_with(pairs, &)
+        warn "`#{self.class}##{__method__}` is deprecated, use the Containable gem instead.",
+             category: :deprecated
+
         return unless block_given?
 
         container.is_a?(Hash) ? stub_hash_with(pairs, &) : stub_container_with(pairs, &)
       end
 
-      def stub(pairs) = container.is_a?(Hash) ? stub_hash(pairs) : stub_container(pairs)
+      def stub pairs
+        warn "`#{self.class}##{__method__}` is deprecated, use the Containable gem instead",
+             category: :deprecated
+
+        container.is_a?(Hash) ? stub_hash(pairs) : stub_container(pairs)
+      end
 
-      def unstub(*keys) = container.is_a?(Hash) ? unstub_hash(*keys) : unstub_container(*keys)
+      def unstub(*keys)
+        warn "`#{self.class}##{__method__}` is deprecated, use the Containable gem instead",
+             category: :deprecated
+
+        container.is_a?(Hash) ? unstub_hash(*keys) : unstub_container(*keys)
+      end
 
       private
 

data/lib/infusible.rb

@@ -1,21 +1,19 @@
 # frozen_string_literal: true
 
-require "zeitwerk"
-
-Zeitwerk::Loader.new.then do |loader|
-  loader.tag = File.basename __FILE__, ".rb"
-  loader.ignore "#{__dir__}/infusible/stub"
-  loader.push_dir __dir__
-  loader.setup
-end
+require "infusible/actuator"
+require "infusible/constructor"
+require "infusible/dependency_map"
+require "infusible/errors/duplicate_dependency"
+require "infusible/errors/invalid_dependency"
 
 # Main namespace.
 module Infusible
   METHOD_SCOPES = %i[public protected private].freeze
 
-  def self.loader registry = Zeitwerk::Registry
-    @loader ||= registry.loaders.find { |loader| loader.tag == File.basename(__FILE__, ".rb") }
-  end
+  def self.[](container) = Actuator.new container
 
-  def self.with(container) = Actuator.new container
+  def self.with container
+    warn "`Infusible.#{__method__}` is deprecated, use `.[]` instead.", category: :deprecated
+    Actuator.new container
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infusible
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -35,7 +35,7 @@ cert_chain:
   3n5C8/6Zh9DYTkpcwPSuIfAga6wf4nXc9m6JAw8AuMLaiWN/r/2s4zJsUHYERJEu
   gZGm4JqtuSg8pYjPeIJxS960owq+SfuC+jxqmRA54BisFCv/0VOJi7tiJVY=
   -----END CERTIFICATE-----
-date: 2024-03-03 00:00:00.000000000 Z
+date: 2024-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: marameters
@@ -51,20 +51,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: zeitwerk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
 description:
 email:
 - brooke@alchemists.io
@@ -110,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: An automated dependency manager and injector.