smart_container 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a45cc16a5fa97c52b28570a75115e21765f771b58e43fc1a0bd90d39b3c8abe
-  data.tar.gz: e956a3ceaa496e4c7e023ac6310b93bc05525959f48619f0c31126d9097f7e83
+  metadata.gz: 83dabfca5288c9506f90616e0e361839e9f57e5becb033337b194369e37b2b3e
+  data.tar.gz: 49692a8df8837154e72374079a4f1c37a423a58da4fa26f61cae0ac5075aa49d
 SHA512:
-  metadata.gz: d4d619d75a98601444c55ff7a278169e6b0937f0356ff19f8fcd41ba9c72d9f25c8ec0a077a90b87d77469605e542a5e5081aec5d9b0bf0c1718019902ad8166
-  data.tar.gz: cb220b711e67c661f7338ff6d49f82048df73861cadc0c1fdc981739d7c64ffec03953d397176c1d9e4e64321cdae078ca624fcb6ac51a8ccb92f4473b92fe83
+  metadata.gz: 99bb75dae1cda18661d918c3e3db4672f958baf892f26a007dd8cdf34d8b841c31fbdbf00d5db06f4641bbcf980b0dc02ec2cc60a6bf73c96bbb7914c2c8bf03
+  data.tar.gz: eed818ffd4c20aaddd8b0dd3335ff49f0e1d824f1f319517805a30b0753c802e237487e9343684e5802fc8a5decadde7e2382badd9a8261a7d3c51d694531e4b

data/.rubocop.yml

@@ -5,7 +5,7 @@ inherit_gem:
     - lib/rubocop.rspec.yml
 
 AllCops:
-  TargetRubyVersion: 3.0.0
+  TargetRubyVersion: 3.1
   NewCops: enable
   Include:
     - lib/**/*.rb

data/CHANGELOG.md

@@ -1,14 +1,28 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.11.0] - 2022-10-14
+### Fixed
+- Unreachable `SmartCore::Container::ArbitraryLock` (rewritten with `SmartCore::Engine::ReadWriteLock`);
+
+## [0.10.0] - 2022-10-14
+### Changed
+- Simple `Mutex`-based locks was replaced with `SmartCore::Engine::ReadWriteLock` in order to decrease
+  context switching during method resolving inside RubyVM (reduced thread lock acquire count);
+- Development progress:
+  - Minimal ruby version - **2.5**;
+  - Updated development dependencies;
+  - Updated `smart_engine` dependency (`~> 0.11` -> `~> 0.17`);
+
+
 ## [0.9.0] - 2020-01-17
 ### Added
-- Support for *Ruby@3*;
+- Support for **Ruby@3**;
 - Updated development dependencies;
 
 ### Changed
 - No more TravisCI (todo: migrate to Github Actions);
-- Minimal `smart_engine` version: *0.11.0* (in order to support *Ruby@3*);
+- Minimal `smart_engine` version: **0.11.0** (in order to support **Ruby@3**);
 
 ## [0.8.1] - 2020-07-09
 ### Changed

data/Gemfile.lock

@@ -1,104 +1,104 @@
 PATH
   remote: .
   specs:
-    smart_container (0.9.0)
-      smart_engine (~> 0.11)
+    smart_container (0.10.0)
+      smart_engine (~> 0.17)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.1)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    armitage-rubocop (1.7.0.1)
-      rubocop (= 1.7.0)
-      rubocop-performance (= 1.9.1)
-      rubocop-rails (= 2.9.1)
-      rubocop-rake (= 0.5.1)
-      rubocop-rspec (= 2.1.0)
-    ast (2.4.1)
+    armitage-rubocop (1.36.0)
+      rubocop (= 1.36.0)
+      rubocop-performance (= 1.15.0)
+      rubocop-rails (= 2.16.1)
+      rubocop-rake (= 0.6.0)
+      rubocop-rspec (= 2.13.2)
+    ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
-    diff-lcs (1.4.4)
-    docile (1.3.5)
-    i18n (1.8.7)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    json (2.6.2)
     method_source (1.0.0)
-    minitest (5.14.3)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    minitest (5.16.3)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (2.2.3)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rack (3.0.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.6.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
-    rubocop (1.7.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.1)
+    rubocop (1.36.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.9.1)
-      rubocop (>= 0.90.0, < 2.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.15.0)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.9.1)
+    rubocop-rails (2.16.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.1.0)
+      rubocop (>= 1.33.0, < 2.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.13.2)
+      rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
-    smart_engine (0.11.0)
-    tzinfo (2.0.4)
+    simplecov_json_formatter (0.1.4)
+    smart_engine (0.17.0)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-darwin-20
 
 DEPENDENCIES
-  armitage-rubocop (~> 1.7)
-  bundler (~> 2.2)
-  pry (~> 0.13)
+  armitage-rubocop (~> 1.36)
+  bundler (~> 2.3)
+  pry (~> 0.14)
   rake (~> 13.0)
-  rspec (~> 3.10)
+  rspec (~> 3.11)
   simplecov (~> 0.21)
   smart_container!
 
 BUNDLED WITH
-   2.2.3
+   2.3.23

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Rustam Ibragimov
+Copyright (c) 2020-2021 Rustam Ibragimov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,6 +1,14 @@
-# SmartCore::Container · [![Gem Version](https://badge.fury.io/rb/smart_container.svg)](https://badge.fury.io/rb/smart_container)
+# SmartCore::Container &middot; <a target="_blank" href="https://github.com/Cado-Labs"><img src="https://github.com/Cado-Labs/cado-labs-logos/raw/main/cado_labs_badge.svg" alt="Supported by Cado Labs" style="max-width: 100%; height: 20px"></a> &middot; [![Gem Version](https://badge.fury.io/rb/smart_container.png)](https://badge.fury.io/rb/smart_container)
 
-Thread-safe semanticaly-defined IoC/DI Container.
+Thread-safe semanticaly-defined IoC/DI Container with a developer-friendly DSL and API.
+
+---
+
+<p>
+  <a href="https://github.com/Cado-Labs">
+    <img src="https://github.com/Cado-Labs/cado-labs-logos/blob/main/cado_labs_supporting.svg" alt="Supported by Cado Labs" />
+  </a>
+</p>
 
 ---
 
@@ -370,6 +378,12 @@ end
 
 Released under MIT License.
 
+## Supporting
+
+<a href="https://github.com/Cado-Labs">
+  <img src="https://github.com/Cado-Labs/cado-labs-logos/blob/main/cado_labs_logo.png" alt="Supported by Cado Labs" />
+</a>
+
 ## Authors
 
 [Rustam Ibragimov](https://github.com/0exp)

data/lib/smart_core/container/definition_dsl/command_set.rb

@@ -2,6 +2,7 @@
 
 # @api private
 # @since 0.1.0
+# @version 0.11.0
 class SmartCore::Container::DefinitionDSL::CommandSet
   # @since 0.1.0
   include Enumerable
@@ -16,9 +17,10 @@ class SmartCore::Container::DefinitionDSL::CommandSet
   #
   # @api private
   # @since 0.1.0
+  # @version 0.11.0
   def initialize
     @commands = []
-    @access_lock = SmartCore::Container::ArbitraryLock.new
+    @lock = SmartCore::Engine::ReadWriteLock.new
   end
 
   # @param [SmartCore::Container::DefinitionDSL::Commands::Base]
@@ -26,8 +28,9 @@ class SmartCore::Container::DefinitionDSL::CommandSet
   #
   # @api private
   # @since 0.1.0
+  # @version 0.11.0
   def add_command(command)
-    thread_safe { commands << command }
+    @lock.write_sync { commands << command }
   end
   alias_method :<<, :add_command
 
@@ -36,8 +39,9 @@ class SmartCore::Container::DefinitionDSL::CommandSet
   #
   # @api private
   # @since 0.1.0
+  # @version 0.11.0
   def each(&block)
-    thread_safe { block_given? ? commands.each(&block) : commands.each }
+    @lock.read_sync { block_given? ? commands.each(&block) : commands.each }
   end
 
   # @param command_set [SmartCore::Container::DefinitionDSL::CommandSet]
@@ -48,8 +52,9 @@ class SmartCore::Container::DefinitionDSL::CommandSet
   #
   # @api private
   # @since 0.1.0
+  # @version 0.11.0
   def concat(command_set, &concat_condition)
-    thread_safe do
+    @lock.read_sync do
       if block_given?
         command_set.dup.each { |command| (commands << command) if yield(command) }
       else
@@ -64,8 +69,9 @@ class SmartCore::Container::DefinitionDSL::CommandSet
   #
   # @api private
   # @since 0.1.0
+  # @version 0.11.0
   def dup
-    thread_safe do
+    @lock.read_sync do
       self.class.new.tap do |duplicate|
         commands.each do |command|
           duplicate.add_command(command.dup)
@@ -82,6 +88,6 @@ class SmartCore::Container::DefinitionDSL::CommandSet
   # @api private
   # @since 0.1.0
   def thread_safe(&block)
-    @access_lock.thread_safe(&block)
+    @lock.thread_safe(&block)
   end
 end

data/lib/smart_core/container/definition_dsl.rb

@@ -17,7 +17,7 @@ class SmartCore::Container
       def included(base_klass)
         base_klass.instance_variable_set(:@__container_definition_commands__, CommandSet.new)
         base_klass.instance_variable_set(:@__container_instantiation_commands__, CommandSet.new)
-        base_klass.instance_variable_set(:@__container_definition_lock__, ArbitraryLock.new)
+        base_klass.instance_variable_set(:@__container_definition_lock__, SmartCore::Engine::ReadWriteLock.new)
         base_klass.singleton_class.send(:attr_reader, :__container_definition_commands__)
         base_klass.singleton_class.send(:attr_reader, :__container_instantiation_commands__)
         base_klass.extend(ClassMethods)
@@ -36,7 +36,7 @@ class SmartCore::Container
       def inherited(child_klass)
         child_klass.instance_variable_set(:@__container_definition_commands__, CommandSet.new)
         child_klass.instance_variable_set(:@__container_instantiation_commands__, CommandSet.new)
-        child_klass.instance_variable_set(:@__container_definition_lock__, ArbitraryLock.new)
+        child_klass.instance_variable_set(:@__container_definition_lock__, SmartCore::Engine::ReadWriteLock.new)
         SmartCore::Container::DefinitionDSL::Inheritance.inherit(base: self, child: child_klass)
         child_klass.singleton_class.prepend(ClassInheritance)
         super
@@ -53,7 +53,7 @@ class SmartCore::Container
       # @api public
       # @since 0.1.0
       def namespace(namespace_name, &dependencies_definition)
-        @__container_definition_lock__.thread_safe do
+        @__container_definition_lock__.write_sync do
           DependencyCompatability::Definition.prevent_dependency_overlap!(self, namespace_name)
 
           __container_definition_commands__ << Commands::Definition::Namespace.new(
@@ -75,7 +75,7 @@ class SmartCore::Container
         memoize: SmartCore::Container::Registry::DEFAULT_MEMOIZATION_BEHAVIOR,
         &dependency_definition
       )
-        @__container_definition_lock__.thread_safe do
+        @__container_definition_lock__.write_sync do
           DependencyCompatability::Definition.prevent_namespace_overlap!(self, dependency_name)
 
           __container_definition_commands__ << Commands::Definition::Register.new(
@@ -90,7 +90,7 @@ class SmartCore::Container
       # @api public
       # @since 0.1.0
       def compose(container_klass)
-        @__container_definition_lock__.thread_safe do
+        @__container_definition_lock__.write_sync do
           __container_definition_commands__ << Commands::Definition::Compose.new(
             container_klass
           )
@@ -106,7 +106,7 @@ class SmartCore::Container
       # @api public
       # @since 0.1.0
       def freeze_state!
-        @__container_definition_lock__.thread_safe do
+        @__container_definition_lock__.write_sync do
           __container_instantiation_commands__ << Commands::Instantiation::FreezeState.new
         end
       end

data/lib/smart_core/container/dependency_compatability/definition.rb

@@ -13,7 +13,6 @@ module SmartCore::Container::DependencyCompatability::Definition
     #
     # @api private
     # @since 0.1.0
-    # rubocop:disable Lint/EmptyBlock
     def potential_namespace_overlap?(container_klass, dependency_name)
       anonymous_container = Class.new(container_klass).new
       anonymous_container.register(dependency_name, &(proc {}))
@@ -21,7 +20,6 @@ module SmartCore::Container::DependencyCompatability::Definition
     rescue SmartCore::Container::DependencyOverNamespaceOverlapError
       true
     end
-    # rubocop:enable Lint/EmptyBlock
 
     # @param container_klass [Class<SmartCore::Container>]
     # @param namespace_name [String, Symbol]
@@ -29,7 +27,6 @@ module SmartCore::Container::DependencyCompatability::Definition
     #
     # @api private
     # @since 0.1.0
-    # rubocop:disable Lint/EmptyBlock
     def potential_dependency_overlap?(container_klass, namespace_name)
       anonymous_container = Class.new(container_klass).new
       anonymous_container.namespace(namespace_name, &(proc {}))
@@ -37,6 +34,5 @@ module SmartCore::Container::DependencyCompatability::Definition
     rescue SmartCore::Container::NamespaceOverDependencyOverlapError
       true
     end
-    # rubocop:enable Lint/EmptyBlock
   end
 end

data/lib/smart_core/container/dependency_watcher.rb

@@ -2,6 +2,7 @@
 
 # @api private
 # @since 0.8.0
+# @version 0.11.0
 class SmartCore::Container::DependencyWatcher
   require_relative 'dependency_watcher/observer'
 
@@ -10,10 +11,11 @@ class SmartCore::Container::DependencyWatcher
   #
   # @api private
   # @since 0.8.0
+  # @version 0.11.0
   def initialize(container)
     @container = container
     @observers = Hash.new { |h, k| h[k] = [] }
-    @access_lock = SmartCore::Container::ArbitraryLock.new
+    @lock = SmartCore::Engine::ReadWriteLock.new
   end
 
   # @param entity_path [String, Symbol]
@@ -21,8 +23,9 @@ class SmartCore::Container::DependencyWatcher
   #
   # @api private
   # @since 0.8.0
+  # @version 0.11.0
   def notify(entity_path)
-    thread_safe { notify_listeners(entity_path) }
+    @lock.read_sync { notify_listeners(entity_path) }
   end
 
   # @param entity_path [String, Symbol]
@@ -31,8 +34,9 @@ class SmartCore::Container::DependencyWatcher
   #
   # @api private
   # @since 0.8.0
+  # @version 0.11.0
   def watch(entity_path, &observer) # TODO: support for pattern-based pathes
-    thread_safe { listen(entity_path, observer) }
+    @lock.write_sync { listen(entity_path, observer) }
   end
 
   # @param observer [SmartCore::Container::DependencyWatcher::Observer]
@@ -40,8 +44,9 @@ class SmartCore::Container::DependencyWatcher
   #
   # @api private
   # @since 0.8.0
+  # @version 0.11.0
   def unwatch(observer)
-    thread_safe { remove_listener(observer) }
+    @lock.write_sync { remove_listener(observer) }
   end
 
   # @param entity_path [String, Symbol, NilClass]
@@ -49,8 +54,9 @@ class SmartCore::Container::DependencyWatcher
   #
   # @api private
   # @since 0.8.0
+  # @version 0.11.0
   def clear_listeners(entity_path = nil) # TODO: support for pattern-based pathes
-    thread_safe { remove_listeners(entity_path) }
+    @lock.write_sync { remove_listeners(entity_path) }
   end
 
   private
@@ -139,13 +145,4 @@ class SmartCore::Container::DependencyWatcher
   def indifferently_accessable_path(entity_path)
     SmartCore::Container::KeyGuard.indifferently_accessable_key(entity_path)
   end
-
-  # @param block [Block]
-  # @return [Any]
-  #
-  # @api private
-  # @since 0.8.0
-  def thread_safe(&block)
-    @access_lock.thread_safe(&block)
-  end
 end

data/lib/smart_core/container/entities/memoized_dependency.rb

@@ -3,6 +3,7 @@
 module SmartCore::Container::Entities
   # @api private
   # @since 0.2.0
+  # @version 0.10.0
   class MemoizedDependency < Dependency
     # @param dependency_name [String]
     # @param dependency_definition [Proc]
@@ -10,9 +11,10 @@ module SmartCore::Container::Entities
     #
     # @api private
     # @since 0.2.0
+    # @version 0.10.0
     def initialize(dependency_name, dependency_definition)
       super(dependency_name, dependency_definition)
-      @lock = SmartCore::Container::ArbitraryLock.new
+      @lock = SmartCore::Engine::ReadWriteLock.new
     end
 
     # @param host_container [SmartCore::Container, NilClass]
@@ -22,7 +24,7 @@ module SmartCore::Container::Entities
     # @since 0.2.0
     # @version 0.8.1
     def reveal(host_container = SmartCore::Container::NO_HOST_CONTAINER)
-      @lock.thread_safe do
+      @lock.read_sync do
         unless instance_variable_defined?(:@revealed_dependency)
           @revealed_dependency = dependency_definition.call
         else

data/lib/smart_core/container/entities/namespace.rb

@@ -2,6 +2,7 @@
 
 # @api private
 # @since 0.1.0
+# @version 0.10.0
 class SmartCore::Container::Entities::Namespace < SmartCore::Container::Entities::Base
   # @return [String]
   #
@@ -21,13 +22,13 @@ class SmartCore::Container::Entities::Namespace < SmartCore::Container::Entities
   #
   # @api private
   # @since 0.1.0
-  # @version 0.8.1
+  # @version 0.10.0
   def initialize(namespace_name, host_container = SmartCore::Container::NO_HOST_CONTAINER)
     super(namespace_name)
     @container_klass = Class.new(SmartCore::Container)
     @container_instance = nil
     @host_container = host_container
-    @lock = SmartCore::Container::ArbitraryLock.new
+    @lock = SmartCore::Engine::ReadWriteLock.new
   end
 
   # @param runtime_host_container [SmartCore::Container, NilClass]
@@ -35,26 +36,26 @@ class SmartCore::Container::Entities::Namespace < SmartCore::Container::Entities
   #
   # @api private
   # @since 0.1.0
-  # @version 0.8.1
+  # @version 0.10.0
   def reveal(runtime_host_container = SmartCore::Container::NO_HOST_CONTAINER)
-    thread_safe { container_instance(runtime_host_container) }
+    @lock.read_sync { container_instance(runtime_host_container) }
   end
 
   # @param dependencies_definition [Proc]
   # @return [void]
   #
   # @api private
-  # @since 0.1.0
+  # @since 0.10.0
   def append_definitions(dependencies_definition)
-    thread_safe { container_klass.instance_eval(&dependencies_definition) }
+    @lock.write_sync { container_klass.instance_eval(&dependencies_definition) }
   end
 
   # @return [void]
   #
   # @api private
-  # @since 0.1.0
+  # @since 0.10.0
   def freeze!
-    thread_safe { container_instance.freeze! }
+    @lock.write_sync { container_instance.freeze! }
   end
 
   private
@@ -78,13 +79,4 @@ class SmartCore::Container::Entities::Namespace < SmartCore::Container::Entities
       host_path: @host_container && namespace_name
     )
   end
-
-  # @param block [Block]
-  # @return [Any]
-  #
-  # @api private
-  # @since 0.1.0
-  def thread_safe(&block)
-    @lock.thread_safe(&block)
-  end
 end

data/lib/smart_core/container/mixin.rb

@@ -2,6 +2,7 @@
 
 # @api public
 # @since 0.1.0
+# @version 0.11.0
 module SmartCore::Container::Mixin
   class << self
     # @param base_klass [Class]
@@ -9,9 +10,10 @@ module SmartCore::Container::Mixin
     #
     # @api private
     # @since 0.1.0
+    # @version 0.11.0
     def included(base_klass)
       # rubocop:disable Layout/LineLength
-      base_klass.instance_variable_set(:@__smart_core_container_access_lock__, SmartCore::Container::ArbitraryLock.new)
+      base_klass.instance_variable_set(:@__smart_core_container_access_lock__, SmartCore::Engine::ReadWriteLock.new)
       base_klass.instance_variable_set(:@__smart_core_container_klass__, Class.new(SmartCore::Container))
       base_klass.instance_variable_set(:@__smart_core_container__, nil)
       # rubocop:enable Layout/LineLength
@@ -24,17 +26,19 @@ module SmartCore::Container::Mixin
 
   # @api private
   # @since 0.1.0
+  # @version 0.11.0
   module ClassInheritance
     # @param child_klass [CLass]
     # @return [void]
     #
     # @api private
     # @since 0.1.0
+    # @version 0.11.0
     def inherited(child_klass)
       inherited_container_klass = Class.new(@__smart_core_container_klass__)
 
       # rubocop:disable Layout/LineLength
-      child_klass.instance_variable_set(:@__smart_core_container_access_lock__, SmartCore::Container::ArbitraryLock.new)
+      child_klass.instance_variable_set(:@__smart_core_container_access_lock__, SmartCore::Engine::ReadWriteLock.new)
       child_klass.instance_variable_set(:@__smart_core_container_klass__, inherited_container_klass)
       child_klass.instance_variable_set(:@__smart_core_container__, nil)
       # rubocop:enable Layout/LineLength
@@ -44,6 +48,7 @@ module SmartCore::Container::Mixin
 
   # @api private
   # @since 0.1.0
+  # @version 0.11.0
   module ClassMethods
     # @param freeze_state [Boolean]
     # @param block [Proc]
@@ -51,8 +56,9 @@ module SmartCore::Container::Mixin
     #
     # @api public
     # @since 0.1.0
+    # @version 0.11.0
     def dependencies(freeze_state: false, &block)
-      @__smart_core_container_access_lock__.thread_safe do
+      @__smart_core_container_access_lock__.write_sync do
         @__smart_core_container_klass__.instance_eval(&block) if block_given?
         @__smart_core_container_klass__.instance_eval { freeze_state! } if freeze_state
       end
@@ -62,8 +68,9 @@ module SmartCore::Container::Mixin
     #
     # @api public
     # @since 0.1.0
+    # @version 0.11.0
     def container
-      @__smart_core_container_access_lock__.thread_safe do
+      @__smart_core_container_access_lock__.read_sync do
         @__smart_core_container__ ||= @__smart_core_container_klass__.new
       end
     end

data/lib/smart_core/container/registry.rb

@@ -2,6 +2,7 @@
 
 # @api private
 # @since 0.1.0
+# @version 0.10.0
 # rubocop:disable Metrics/ClassLength
 class SmartCore::Container::Registry
   # @since 0.1.0
@@ -35,9 +36,10 @@ class SmartCore::Container::Registry
   #
   # @api private
   # @since 0.1.0
+  # @version 0.10.0
   def initialize
     @registry = {}
-    @access_lock = SmartCore::Container::ArbitraryLock.new
+    @lock = SmartCore::Engine::ReadWriteLock.new
   end
 
   # @param entity_path [String, Symbol]
@@ -45,8 +47,9 @@ class SmartCore::Container::Registry
   #
   # @api private
   # @since 0.1.0
+  # @version 0.10.0
   def resolve(entity_path)
-    thread_safe { fetch_entity(entity_path) }
+    @lock.read_sync { fetch_entity(entity_path) }
   end
 
   # @param name [String, Symbol]
@@ -56,9 +59,9 @@ class SmartCore::Container::Registry
   #
   # @api private
   # @since 0.1.0
-  # @version 0.3.0
+  # @version 0.10.0
   def register_dependency(name, memoize: DEFAULT_MEMOIZATION_BEHAVIOR, &dependency_definition)
-    thread_safe { add_dependency(name, dependency_definition, memoize) }
+    @lock.write_sync { add_dependency(name, dependency_definition, memoize) }
   end
 
   # @param name [String, Symbol]
@@ -68,29 +71,31 @@ class SmartCore::Container::Registry
   #
   # @api private
   # @since 0.1.0
-  # @version 0.8.1
+  # @version 0.10.0
   def register_namespace(
     name,
     host_container = SmartCore::Container::NO_HOST_CONTAINER,
     &dependencies_definition
   )
-    thread_safe { add_namespace(name, host_container, dependencies_definition) }
+    @lock.write_sync { add_namespace(name, host_container, dependencies_definition) }
   end
 
   # @return [void]
   #
   # @api private
   # @since 0.1.0
+  # @version 0.10.0
   def freeze!
-    thread_safe { freeze_state! }
+    @lock.write_sync { freeze_state! }
   end
 
   # @return [Boolean]
   #
   # @api private
   # @since 0.1.0
+  # @version 0.10.0
   def frozen?
-    thread_safe { state_frozen? }
+    @lock.read_sync { state_frozen? }
   end
 
   # @param block [Block]
@@ -98,8 +103,9 @@ class SmartCore::Container::Registry
   #
   # @api private
   # @since 0.1.0
+  # @version 0.10.0
   def each(&block)
-    thread_safe { enumerate(&block) }
+    @lock.read_sync { enumerate(&block) }
   end
 
   # @param root_dependency_name [NilClass, String]
@@ -109,12 +115,13 @@ class SmartCore::Container::Registry
   #
   # @api private
   # @since 0.4.0
+  # @version 0.10.0
   def each_dependency(
     root_dependency_name = nil,
     yield_all: DEFAULT_ITERATION_YIELD_BEHAVIOUR,
     &block
   )
-    thread_safe { iterate(root_dependency_name, yield_all: yield_all, &block) }
+    @lock.read_sync { iterate(root_dependency_name, yield_all: yield_all, &block) }
   end
 
   # @option all_variants [Boolean]
@@ -122,28 +129,24 @@ class SmartCore::Container::Registry
   #
   # @api private
   # @since 0.4.0
+  # @version 0.10.0
   def keys(all_variants: DEFAULT_KEY_EXTRACTION_BEHAVIOUR)
-    thread_safe { extract_keys(all_variants: all_variants) }
+    @lock.read_sync { extract_keys(all_variants: all_variants) }
   end
 
   # @return [Hash<String|Symbol,SmartCore::Container::Entities::Base|Any>]
   #
   # @api private
   # @since 0.1.0
+  # @version 0.10.0
   def hash_tree(resolve_dependencies: false)
-    thread_safe { build_hash_tree(resolve_dependencies: resolve_dependencies) }
+    @lock.read_sync { build_hash_tree(resolve_dependencies: resolve_dependencies) }
   end
   alias_method :to_h, :hash_tree
   alias_method :to_hash, :hash_tree
 
   private
 
-  # @return [Mutex]
-  #
-  # @api private
-  # @since 0.1.0
-  attr_reader :lock
-
   # @return [Boolean]
   #
   # @api private
@@ -238,7 +241,6 @@ class SmartCore::Container::Registry
   # @api private
   # @since 0.1.0
   # @version 0.8.1
-  # rubocop:disable Lint/EmptyBlock
   def add_namespace(namespace_name, host_container, dependencies_definition)
     if state_frozen?
       raise(SmartCore::Container::FrozenRegistryError, 'Can not modify frozen registry!')
@@ -256,7 +258,6 @@ class SmartCore::Container::Registry
     end
     namespace_entity.tap { namespace_entity.append_definitions(dependencies_definition) }
   end
-  # rubocop:enable Lint/EmptyBlock
 
   # @param root_dependency_name [String, NilClass]
   # @param block [Block]
@@ -274,8 +275,8 @@ class SmartCore::Container::Registry
         final_dependency_name =
           if root_dependency_name
             "#{root_dependency_name}" \
-            "#{SmartCore::Container::DependencyResolver::PATH_PART_SEPARATOR}" \
-            "#{dependency_name}"
+              "#{SmartCore::Container::DependencyResolver::PATH_PART_SEPARATOR}" \
+              "#{dependency_name}"
           else
             dependency_name
           end
@@ -342,14 +343,5 @@ class SmartCore::Container::Registry
       self, namespace_name
     )
   end
-
-  # @param block [Proc]
-  # @return [Any]
-  #
-  # @api private
-  # @since 0.1.0
-  def thread_safe(&block)
-    @access_lock.thread_safe(&block)
-  end
 end
 # rubocop:enable Metrics/ClassLength

data/lib/smart_core/container/version.rb

@@ -2,9 +2,11 @@
 
 module SmartCore
   class Container # rubocop:disable Style/StaticClass
+    # @return [String]
+    #
     # @api public
     # @since 0.1.0
-    # @version 0.9.0
-    VERSION = '0.9.0'
+    # @version 0.11.0
+    VERSION = '0.11.0'
   end
 end

data/lib/smart_core/container.rb

@@ -7,10 +7,10 @@ require 'smart_core'
 module SmartCore
   # @api public
   # @since 0.1.0
+  # @version 0.10.0
   class Container # rubocop:disable Metrics/ClassLength
     require_relative 'container/version'
     require_relative 'container/errors'
-    require_relative 'container/arbitrary_lock'
     require_relative 'container/key_guard'
     require_relative 'container/entities'
     require_relative 'container/definition_dsl'
@@ -82,13 +82,13 @@ module SmartCore
     #
     # @api public
     # @since 0.1.0
-    # @version 0.8.1
+    # @version 0.10.0
     def initialize(host_container: NO_HOST_CONTAINER, host_path: NO_HOST_PATH)
       @host = SmartCore::Container::Host.build(host_container, host_path)
       build_registry!
       @watcher = SmartCore::Container::DependencyWatcher.new(self)
       @host_path = host_path
-      @access_lock = ArbitraryLock.new
+      @lock = SmartCore::Engine::ReadWriteLock.new
     end
 
     # @param dependency_name [String, Symbol]
@@ -97,13 +97,14 @@ module SmartCore
     #
     # @api public
     # @sicne 0.1.0
-    # @version 0.8.0
+    # @version 0.10.0
     def register(
       dependency_name,
       memoize: SmartCore::Container::Registry::DEFAULT_MEMOIZATION_BEHAVIOR,
       &dependency_definition
     )
-      thread_safe do
+
+      @lock.write_sync do
         registry.register_dependency(dependency_name, memoize: memoize, &dependency_definition)
         watcher.notify(dependency_name)
       end
@@ -115,9 +116,9 @@ module SmartCore
     #
     # @api public
     # @since 0.1.0
-    # @version 0.8.0
+    # @version 0.10.0
     def namespace(namespace_name, &dependencies_definition)
-      thread_safe do
+      @lock.write_sync do
         registry.register_namespace(namespace_name, self, &dependencies_definition)
         watcher.notify(namespace_name)
       end
@@ -128,9 +129,9 @@ module SmartCore
     #
     # @api public
     # @since 0.1.0
-    # @version 0.1.0
+    # @version 0.10.0
     def resolve(dependency_path)
-      thread_safe { DependencyResolver.resolve(self, dependency_path) }
+      @lock.read_sync { DependencyResolver.resolve(self, dependency_path) }
     end
     alias_method :[], :resolve
 
@@ -139,32 +140,36 @@ module SmartCore
     #
     # @api public
     # @since 0.1.0
+    # @version 0.10.0
     def fetch(dependency_path)
-      thread_safe { DependencyResolver.fetch(self, dependency_path) }
+      @lock.read_sync { DependencyResolver.fetch(self, dependency_path) }
     end
 
     # @return [void]
     #
     # @api public
     # @since 0.1.0
+    # @version 0.10.0
     def freeze!
-      thread_safe { registry.freeze! }
+      @lock.write_sync { registry.freeze! }
     end
 
     # @return [Boolean]
     #
     # @api public
     # @since 0.1.0
+    # @version 0.10.0
     def frozen?
-      thread_safe { registry.frozen? }
+      @lock.read_sync { registry.frozen? }
     end
 
     # @return [void]
     #
     # @api public
     # @since 0.1.0
+    # @version 0.10.0
     def reload!
-      thread_safe { build_registry! }
+      @lock.write_sync { build_registry! }
     end
 
     # @option all_variants [Boolean]
@@ -172,8 +177,9 @@ module SmartCore
     #
     # @api public
     # @since 0.4.0
+    # @version 0.10.0
     def keys(all_variants: SmartCore::Container::Registry::DEFAULT_KEY_EXTRACTION_BEHAVIOUR)
-      thread_safe { registry.keys(all_variants: all_variants) }
+      @lock.read_sync { registry.keys(all_variants: all_variants) }
     end
 
     # @param key [String, Symbol]
@@ -181,8 +187,9 @@ module SmartCore
     #
     # @api public
     # @since 0.5.0
+    # @version 0.10.0
     def key?(key)
-      thread_safe { DependencyResolver.key?(self, key) }
+      @lock.read_sync { DependencyResolver.key?(self, key) }
     end
 
     # @param namespace_path [String, Symbol]
@@ -190,8 +197,9 @@ module SmartCore
     #
     # @api public
     # @since 0.5.0
+    # @version 0.10.0
     def namespace?(namespace_path)
-      thread_safe { DependencyResolver.namespace?(self, namespace_path) }
+      @lock.read_sync { DependencyResolver.namespace?(self, namespace_path) }
     end
 
     # @param dependency_path [String, Symbol]
@@ -200,8 +208,9 @@ module SmartCore
     #
     # @api public
     # @since 0.5.0
+    # @version 0.10.0
     def dependency?(dependency_path, memoized: nil)
-      thread_safe { DependencyResolver.dependency?(self, dependency_path, memoized: memoized) }
+      @lock.read_sync { DependencyResolver.dependency?(self, dependency_path, memoized: memoized) }
     end
 
     # @option yield_all [Boolean]
@@ -213,11 +222,12 @@ module SmartCore
     #
     # @api public
     # @since 0.4.0
+    # @version 0.10.0
     def each_dependency(
       yield_all: SmartCore::Container::Registry::DEFAULT_ITERATION_YIELD_BEHAVIOUR,
       &block
     )
-      thread_safe { registry.each_dependency(yield_all: yield_all, &block) }
+      @lock.read_sync { registry.each_dependency(yield_all: yield_all, &block) }
     end
     alias_method :each, :each_dependency
     alias_method :each_pair, :each_dependency
@@ -227,8 +237,9 @@ module SmartCore
     #
     # @api public
     # @since 0.1.0
+    # @version 0.10.0
     def hash_tree(resolve_dependencies: false)
-      thread_safe { registry.hash_tree(resolve_dependencies: resolve_dependencies) }
+      @lock.read_sync { registry.hash_tree(resolve_dependencies: resolve_dependencies) }
     end
     alias_method :to_h, :hash_tree
     alias_method :to_hash, :hash_tree
@@ -242,8 +253,9 @@ module SmartCore
     #
     # @api public
     # @since 0.8.0
+    # @version 0.10.0
     def observe(entity_path, &observer) # TODO: support for pattern-based pathes
-      thread_safe { watcher.watch(entity_path, &observer) }
+      @lock.write_sync { watcher.watch(entity_path, &observer) }
     end
     alias_method :subscribe, :observe
 
@@ -252,8 +264,9 @@ module SmartCore
     #
     # @api public
     # @since 0.8.0
+    # @version 0.10.0
     def unobserve(observer)
-      thread_safe { watcher.unwatch(observer) }
+      @lock.write_sync { watcher.unwatch(observer) }
     end
     alias_method :unsubscribe, :unobserve
 
@@ -262,8 +275,9 @@ module SmartCore
     #
     # @api public
     # @since 0.8.0
+    # @version 0.10.0
     def clear_observers(entity_path = nil) # TODO: support for pattern-based pathes
-      thread_safe { watcher.clear_listeners(entity_path) }
+      @lock.write_sync { watcher.clear_listeners(entity_path) }
     end
     alias_method :clear_listeners, :clear_observers
 
@@ -277,14 +291,5 @@ module SmartCore
     def build_registry!
       @registry = RegistryBuilder.build(self)
     end
-
-    # @param block [Block]
-    # @return [Any]
-    #
-    # @api private
-    # @since 0.1.0
-    def thread_safe(&block)
-      @access_lock.thread_safe(&block)
-    end
   end
 end

data/smart_container.gemspec

@@ -3,7 +3,7 @@
 require_relative 'lib/smart_core/container/version'
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.4.10')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5')
 
   spec.name    = 'smart_container'
   spec.version = SmartCore::Container::VERSION
@@ -27,12 +27,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'smart_engine', '~> 0.11'
+  spec.add_dependency 'smart_engine', '~> 0.17'
 
-  spec.add_development_dependency 'bundler',          '~> 2.2'
+  spec.add_development_dependency 'bundler',          '~> 2.3'
   spec.add_development_dependency 'rake',             '~> 13.0'
-  spec.add_development_dependency 'rspec',            '~> 3.10'
-  spec.add_development_dependency 'armitage-rubocop', '~> 1.7'
+  spec.add_development_dependency 'rspec',            '~> 3.11'
+  spec.add_development_dependency 'armitage-rubocop', '~> 1.36'
   spec.add_development_dependency 'simplecov',        '~> 0.21'
-  spec.add_development_dependency 'pry',              '~> 0.13'
+  spec.add_development_dependency 'pry',              '~> 0.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_container
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Rustam Ibragimov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-17 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_engine
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: armitage-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.36'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.36'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
 description: Thread-safe semanticaly-defined IoC/DI Container
 email:
 - iamdaiver@gmail.com
@@ -128,7 +128,6 @@ files:
 - bin/console
 - bin/setup
 - lib/smart_core/container.rb
-- lib/smart_core/container/arbitrary_lock.rb
 - lib/smart_core/container/definition_dsl.rb
 - lib/smart_core/container/definition_dsl/command_set.rb
 - lib/smart_core/container/definition_dsl/commands.rb
@@ -180,14 +179,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.10
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: IoC/DI Container

data/lib/smart_core/container/arbitrary_lock.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-# @api private
-# @since 0.1.0
-class SmartCore::Container::ArbitraryLock
-  # @return [void]
-  #
-  # @api private
-  # @since 0.1.0
-  def initialize
-    @lock = Mutex.new
-  end
-
-  # @param block [Proc]
-  # @return [Any]
-  #
-  # @api private
-  # @since 0.1.0
-  def thread_safe(&block)
-    @lock.owned? ? yield : @lock.synchronize(&block)
-  end
-end