canister 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d114b43d3e9ee866a97c45b52153345d9ce2008360f4510ff6852276a74ed8a
-  data.tar.gz: 66fffaf9a4c45c7980c038e8142365eac794ea93d8e7b1627749e3a9e4c77f00
+  metadata.gz: 3d7d51a566030dbb120d909f6014bcea5248e0583ec03f9573a91282b43f8539
+  data.tar.gz: 06d8977666740bc732c54a658447f57929f130c59f9d6bda955211baa8bca8b7
 SHA512:
-  metadata.gz: 2a5908fdc9d394850275fcdb1f30f24e6d6dbb5e088cddf74965bacc562191d15c0eec3367b98218b6daa911d564d2f74ce019f29639223ab0e572e3903ffd25
-  data.tar.gz: 580c0a3e95ada241f4f8d4d56f14eb5557ee29073810c33b0e7ed42d695ee1ef9aad85e51fde8c5f577ba3f8efde7ba62766104409539e16a8f2bb2503552971
+  metadata.gz: b5d1623be13a5ba5d1116f6a343492795f49bbeffabf2a5b8230e102f149ddb32103f9dbe8849b5fe2a2a3e92ace5dd0ec69c62ba95e1a3d2c515bd9266bf240
+  data.tar.gz: ae25e1920021cdbf4a0741db85b31625227b2503f92d52d94d820c8a05c01dd59c2e7a89430e3944c1c1186a2e25fd953e7267cf2f8e34d1162842b8513fe4cb

data/.rubocop.yml

@@ -1,22 +1,37 @@
+require:
+  - rubocop-performance
+  - rubocop-rspec
 inherit_from: .rubocop_todo.yml
 
 AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.3
   Exclude:
+    - '.bundle/**/*'
+    - 'vendor/bundle/**/*'
     - '*.gemspec'
+    - 'spec/fixtures/**/*'
 
 Naming/FileName:
   ExpectMatchingDefinition: true
   Exclude:
     - 'bin/**/*'
+    - 'lib/core_extensions/**/*'
     - 'spec/**/*'
     - 'lib/*/version.rb'
 
+RSpec/FilePath:
+  Exclude:
+    - 'spec/**/*.rb' # rubocop error
+
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
 
+# Enabling this cop can break rescue statements in ruby <= 2.4
+Style/RedundantBegin:
+  Enabled: false
+
 # We disable this cop because we want to use Pathname#/
 # and this cop is not configurable at all.
 Layout/SpaceAroundOperators:
@@ -30,7 +45,7 @@ Style/Alias:
   EnforcedStyle: prefer_alias_method
 
 Metrics/LineLength:
-  Max: 100
+  Max: 90
   AllowHeredoc: true
   AllowURI: true
   URISchemes:
@@ -39,15 +54,16 @@ Metrics/LineLength:
 
 Metrics/BlockLength:
   Exclude:
+    - 'spec/support/**/*.rb'
     - 'spec/**/*_spec.rb'
 
 Layout/ElseAlignment:
   Enabled: false
 
-Layout/FirstParameterIndentation:
+Layout/IndentFirstArgument:
   EnforcedStyle: consistent
 
-Layout/AlignParameters:
+Layout/AlignArguments:
   EnforcedStyle: with_fixed_indentation
 
 Layout/CaseIndentation:
@@ -59,6 +75,10 @@ Layout/ClosingParenthesisIndentation:
 Style/ClassAndModuleChildren:
   EnforcedStyle: nested
 
+Metrics/ModuleLength:
+  Exclude:
+    - 'spec/**/*_spec.rb'
+
 Style/CommentAnnotation:
   Enabled: false
 
@@ -84,10 +104,10 @@ Style/GuardClause:
 Style/IfUnlessModifier:
   Enabled: false
 
-Layout/IndentArray:
+Layout/IndentFirstArrayElement:
   EnforcedStyle: consistent
 
-Layout/IndentHash:
+Layout/IndentFirstHashElement:
   EnforcedStyle: consistent
 
 Layout/AlignHash:
@@ -126,14 +146,13 @@ Layout/SpaceInsideBlockBraces:
 Style/SymbolArray:
   EnforcedStyle: brackets
 
-Lint/BlockAlignment:
+Layout/BlockAlignment:
   EnforcedStyleAlignWith: start_of_block
-  #EnforcedStyleAlignWith: start_of_line
 
-Lint/EndAlignment:
+Layout/EndAlignment:
   EnforcedStyleAlignWith: start_of_line
 
-Lint/DefEndAlignment:
+Layout/DefEndAlignment:
   EnforcedStyleAlignWith: def
 
 Performance/RedundantMerge:
@@ -142,3 +161,63 @@ Performance/RedundantMerge:
 Style/WordArray:
   EnforcedStyle: brackets
 
+Style/RescueModifier:
+  Exclude:
+    - 'spec/**/*_spec.rb'
+
+# This cop just adds extra work when you want to write an integration test,
+# or test something like a jbuilder view.
+RSpec/DescribeClass:
+  Enabled: false
+
+# Using let! is fine, and can be easier to manage than a before block.
+RSpec/LetSetup:
+  Enabled: false
+
+RSpec/BeEql:
+  Enabled: false
+
+RSpec/ExampleWithoutDescription:
+  EnforcedStyle: single_line_only
+
+RSpec/HookArgument:
+  EnforcedStyle: each
+
+RSpec/ImplicitSubject:
+  EnforcedStyle: disallow
+
+RSpec/LeadingSubject:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: true
+  Max: 3
+
+# Change this as needed.
+RSpec/NestedGroups:
+  Max: 3
+
+RSpec/VerifiedDoubles:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Max: 10
+
+RSpec/MessageSpies:
+  EnforcedStyle: receive
+
+RSpec/EmptyExampleGroup:
+  CustomIncludeMethods:
+    - it_allows
+    - it_disallows
+
+RSpec/ContextWording:
+  Prefixes:
+    - as
+    - when
+    - with
+    - without
+
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - 'spec/**/*.rb'

data/.travis.yml

@@ -11,20 +11,12 @@ branches:
     - master
     - develop
 
-env:
-  global:
-    - CC_TEST_REPORTER_ID=65e5bfcf0bfc99d25884678a632843ef1c294493b2581c2cf72b1cebfdc9d9fb
-
 before_install: gem install bundler
 
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-
 script:
     - bundle exec rspec --order=random
 
-after_script:
-    - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT || true
-
+matrix:
+  include:
+    - rvm: ruby-head
+      script: bundle exec rubocop

data/README.md

@@ -1,8 +1,8 @@
 # Canister
 
 [![Build Status](https://travis-ci.org/mlibrary/canister.svg?branch=master)](https://travis-ci.org/mlibrary/canister)
-[![Maintainability](https://api.codeclimate.com/v1/badges/1768a558bf69d2f40681/maintainability)](https://codeclimate.com/github/mlibrary/canister/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/1768a558bf69d2f40681/test_coverage)](https://codeclimate.com/github/mlibrary/canister/test_coverage)
+[![Coverage Status](https://coveralls.io/repos/github/mlibrary/canister/badge.svg?branch=master)](https://coveralls.io/github/mlibrary/canister?branch=master)
+[![API Docs](https://img.shields.io/badge/API_docs-rubydoc.info-blue.svg)](https://www.rubydoc.info/github/mlibrary/canister)
 
 ## Summary
 
@@ -82,10 +82,11 @@ Standard rules apply.
 
 ## Compatibility
 
-* ruby 2.3.x
-* ruby 2.4.x
-* ruby 2.5.x
-* ruby 2.6.x
+Canister has been tested on the following:
+
+* ruby >= 2.3.x
+* ruby >= 3.x
+* jruby 9.4.2.0 (3.1.0)
 
 As Canister does not rely on any specific runtime environment other than
 the ruby core, it is compatible with every ruby library and framework.

data/canister.gemspec

@@ -26,8 +26,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler"
+  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "rubocop-performance"
+  spec.add_development_dependency "rubocop-rspec"
 end

data/lib/canister/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Canister
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/lib/canister.rb

@@ -15,6 +15,7 @@ class Canister
     @dependents = Hash.new do |hash, key|
       hash[key] = []
     end
+    @mutex = Mutex.new
     yield self if block_given?
   end
 
@@ -34,6 +35,14 @@ class Canister
     handles?(method) || super(method, include_all)
   end
 
+  def synchronize(&block)
+    if @mutex.owned?
+      yield
+    else
+      @mutex.synchronize(&block)
+    end
+  end
+
   # Register a value to a key by passing a block. Note that
   # the value will be that returned by the block. If the key
   # has been registered before, the old registration is
@@ -43,8 +52,11 @@ class Canister
   # @yield self [Container] Yields this container.
   # @return the value defined in the block
   def register(key, &block)
-    invalidate(key) if registered?(key)
-    registry[key.to_sym] = block
+    key = key.to_sym
+    synchronize do
+      invalidate(key) if registered?(key)
+      registry[key] = block
+    end
     self
   end
 
@@ -52,10 +64,14 @@ class Canister
   # the key. This value is memoized.
   # @param key [Symbol]
   def resolve(key)
-    add_dependent(key)
-    stack << key
-    value = resolved[key.to_sym] ||= registry[key.to_sym].call(self)
-    stack.pop
+    key = key.to_sym
+    value = nil
+    synchronize do
+      add_dependent(key)
+      stack << key
+      value = resolved[key] ||= registry[key].call(self)
+      stack.pop
+    end
     value
   end
   alias_method :[], :resolve
@@ -74,23 +90,25 @@ class Canister
 
   def add_dependent(key)
     unless stack.empty?
-      dependents[key.to_sym] << stack.last
+      dependents[key] << stack.last
     end
   end
 
   def registered?(key)
-    registry.key?(key.to_sym)
+    registry.key?(key)
   end
 
   def unresolve(key)
-    resolved.delete(key.to_sym)
+    resolved.delete(key)
   end
 
   def invalidate(key, first = true)
     unresolve(key)
-    dependents[key.to_sym]
+    dependents[key]
       .each {|child| invalidate(child, false) }
-    dependents.delete(key.to_sym) if first
+    if first
+      dependents.delete(key)
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canister
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Bryan Hockey
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2023-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -106,7 +134,7 @@ homepage: https://github.com/mlibrary/canister
 licenses:
 - Revised BSD
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,8 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A simple IoC container for ruby.
 test_files: []