smart_container 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 929c6fcba625ebb836b753d4563082ea2d0aa793abbf840ed97fe6f209a0c7b0
-  data.tar.gz: b9cf58d9fc718aff98847e74f986b86da7984c3537f5258a37a2c67f9af611e8
+  metadata.gz: 83dabfca5288c9506f90616e0e361839e9f57e5becb033337b194369e37b2b3e
+  data.tar.gz: 49692a8df8837154e72374079a4f1c37a423a58da4fa26f61cae0ac5075aa49d
 SHA512:
-  metadata.gz: 93e6062a36edf2f06d37132dc53b55c87f5f0aac277eafec6a17572ff60f73e0c164ed4fae53ee5333c10556e605e8d4c9c29b935406f7a9dceb0280e7bfa4df
-  data.tar.gz: a653c4ded2e96d9fe4f42292eabe0467ad1cfe3a2633aa3bd4f77506d69f65c0a32703ecffb6875eb5d3de9d3e34592fdebc95c50417257c5a864273b9ae116c
+  metadata.gz: 99bb75dae1cda18661d918c3e3db4672f958baf892f26a007dd8cdf34d8b841c31fbdbf00d5db06f4641bbcf980b0dc02ec2cc60a6bf73c96bbb7914c2c8bf03
+  data.tar.gz: eed818ffd4c20aaddd8b0dd3335ff49f0e1d824f1f319517805a30b0753c802e237487e9343684e5802fc8a5decadde7e2382badd9a8261a7d3c51d694531e4b

data/CHANGELOG.md

@@ -1,10 +1,14 @@
 # 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 (to reduce thread locks when it is not necessary);
+  context switching during method resolving inside RubyVM (reduced thread lock acquire count);
 - Development progress:
   - Minimal ruby version - **2.5**;
   - Updated development dependencies;

data/Gemfile.lock

@@ -19,38 +19,25 @@ GEM
       rubocop-rake (= 0.6.0)
       rubocop-rspec (= 2.13.2)
     ast (2.4.2)
-    backport (1.2.0)
-    benchmark (0.2.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    e2mmap (0.1.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
     json (2.6.2)
-    kramdown (2.4.0)
-      rexml
-    kramdown-parser-gfm (1.1.0)
-      kramdown (~> 2.0)
     method_source (1.0.0)
     minitest (5.16.3)
-    nokogiri (1.13.8-arm64-darwin)
-      racc (~> 1.4)
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.6.0)
     rack (3.0.0)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.6.0)
-    reverse_markdown (2.1.1)
-      nokogiri
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -96,32 +83,13 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     smart_engine (0.17.0)
-    solargraph (0.47.2)
-      backport (~> 1.2)
-      benchmark
-      bundler (>= 1.17.2)
-      diff-lcs (~> 1.4)
-      e2mmap
-      jaro_winkler (~> 1.5)
-      kramdown (~> 2.3)
-      kramdown-parser-gfm (~> 1.1)
-      parser (~> 3.0)
-      reverse_markdown (>= 1.0.5, < 3)
-      rubocop (>= 0.52)
-      thor (~> 1.0)
-      tilt (~> 2.0)
-      yard (~> 0.9, >= 0.9.24)
-    thor (1.2.1)
-    tilt (2.0.11)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
-    webrick (1.7.0)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
 
 PLATFORMS
   arm64-darwin-21
+  x86_64-darwin-20
 
 DEPENDENCIES
   armitage-rubocop (~> 1.36)
@@ -131,7 +99,6 @@ DEPENDENCIES
   rspec (~> 3.11)
   simplecov (~> 0.21)
   smart_container!
-  solargraph (~> 0.47)
 
 BUNDLED WITH
    2.3.23

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/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/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/version.rb

@@ -6,7 +6,7 @@ module SmartCore
     #
     # @api public
     # @since 0.1.0
-    # @version 0.10.0
-    VERSION = '0.10.0'
+    # @version 0.11.0
+    VERSION = '0.11.0'
   end
 end

data/smart_container.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'smart_engine', '~> 0.17'
 
-  spec.add_development_dependency 'solargraph',       '~> 0.47'
   spec.add_development_dependency 'bundler',          '~> 2.3'
   spec.add_development_dependency 'rake',             '~> 13.0'
   spec.add_development_dependency 'rspec',            '~> 3.11'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_container
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Rustam Ibragimov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_engine
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
-- !ruby/object:Gem::Dependency
-  name: solargraph
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.47'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.47'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -200,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: IoC/DI Container