nxt_registry 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14c7e9fb583ad7e0962ad09933c359dd60d3d13e1dd701cc4d4b971ed408ed08
-  data.tar.gz: 879f214a0ce868bcf28fae668d7572ee2c680785749970b74bb2702074a02715
+  metadata.gz: 9d8d5b1247dfc045e077ccf9d79cf3ea010c9c56434133f8210f3b77af439d0d
+  data.tar.gz: 9bd0fc656681a64856f6f21996914ebdeca063ea7cd5585746c29840c4f9694e
 SHA512:
-  metadata.gz: ed961d75f5531d6cdf38ce49c72b7d06aaa836b32114b3e5df9508ea4250d099d0e559a78fae9bdd90093d312e00060d0c418994dd8ec2184557743e740ab0f9
-  data.tar.gz: 31e1e1ad67e6d59f1f95bd7b31a12f357333ea9542c51eaf5d4ff7bfabcc7542edf2a61033944f89447d13a8f23667a9a38c97cabab18d493c59e619f764353b
+  metadata.gz: c136e4279f1fe2907e43ff24f96a28bdec6cf3b095842831c6a1834b468d174e138a370ede137cd318f879c23579c5664a93c5820e7409b6985d4829f7905f30
+  data.tar.gz: 2793ac826854219b0e5017e84264ce3908b28c1c9148cddef1dd37dc70b761445ab07d7bd7185f5f2cd58a220cdc1bcb065f6fe49e359a1716922db85fe4532f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.3.9 2021-03-10
+
+- Synchronize access with Mutex
+- Add key_resolver
+- Fix: Inherit options set through accessors
+
 # v0.3.5 2020-12-23
 
 - Allow to inherit options in nested registries

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    nxt_registry (0.3.8)
+    nxt_registry (0.3.9)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.1)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -16,11 +16,11 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    i18n (1.8.8)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    minitest (5.14.3)
-    pry (0.13.1)
+    minitest (5.14.4)
+    pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rake (12.3.3)

data/README.md

@@ -2,8 +2,7 @@
 
 # NxtRegistry
 
-`NxtRegistry` is a simple implementation of the container pattern. It allows you to register and resolve values in nested 
-structures.
+`NxtRegistry` is a simple container that allows you to register and resolve values in nested structures.
 
 ## Installation
 
@@ -258,19 +257,21 @@ registry.resolve(:one)
 # => 2020-01-02 23:56:18 +0100
 ```
 
-### Resolver
+### Resolve callbacks
 
-You can register a resolver block if you want to lay hands on your values after they have been resolved. 
-A resolver can be anything that implements `:call` to which the value is passed.  
+You can hook into the before and after resolver callbacks in case you need to lay hands on your values
+before and / or after resolving. A callback can be anything that implements `:call` to which the value is passed.  
 
 ```ruby
 registry :example do
-  resolver ->(value) { value * 2 }
-  register(:one, 1)
+  key_resolver ->(key) { key.strip }
+  resolver ->(value) { value.upcase }
+  
+  register(:input, 'output')
 end
 
-registry.resolve(:one)
-# => 2
+registry.resolve('  input   ')
+# => 'OUTPUT'
 ```
 
 ### Transform keys

data/lib/nxt_registry/registry.rb

@@ -11,11 +11,12 @@ module NxtRegistry
       @configured = false
       @patterns = []
       @config = config
+      @mutex = Mutex.new
 
       configure(&config)
     end
 
-    attr_reader :name
+    attr_reader :name, :mutex
     attr_accessor :configured
 
     def level(name, **options, &config)
@@ -186,51 +187,53 @@ module NxtRegistry
     end
 
     def __register(key, value, raise_on_key_already_registered: true)
-      key = if key.is_a?(Regexp)
-        patterns << key
-        key
-      else
-        transformed_key(key)
-      end
+      mutex.synchronize do
+        key = if key.is_a?(Regexp)
+          patterns << key
+          key
+        else
+          transformed_key(key)
+        end
 
-      raise ArgumentError, "Not allowed to register values in a registry that contains nested registries" unless is_leaf
-      raise KeyError, "Keys are restricted to #{allowed_keys}" if key_not_allowed?(key)
+        raise ArgumentError, "Not allowed to register values in a registry that contains nested registries" unless is_leaf
+        raise KeyError, "Keys are restricted to #{allowed_keys}" if key_not_allowed?(key)
 
-      on_key_already_registered && on_key_already_registered.call(key) if store[key] && raise_on_key_already_registered
+        on_key_already_registered && on_key_already_registered.call(key) if store[key] && raise_on_key_already_registered
 
-      store[key] = value
+        store[key] = value
+      end
     end
 
     def __resolve(key, raise_on_key_not_registered: true)
-      key = transformed_key(key)
+      mutex.synchronize do
+        key = transformed_key(key)
 
-      value = if is_leaf?
-        if store.key?(key)
-          store.fetch(key)
-        elsif (pattern = matching_pattern(key))
-          store.fetch(pattern)
-        else
-          if is_a_blank?(default)
-            return unless raise_on_key_not_registered
+        value = if is_leaf?
+          resolved_key = key_resolver.call(key)
 
-            on_key_not_registered && on_key_not_registered.call(key)
+          if store.key?(resolved_key)
+            store.fetch(resolved_key)
+          elsif (pattern = matching_pattern(resolved_key))
+            store.fetch(pattern)
           else
-            value = resolve_default(key)
-            return value unless memoize
+            if is_a_blank?(default)
+              return unless raise_on_key_not_registered
 
-            store[key] ||= value
+              on_key_not_registered && on_key_not_registered.call(key)
+            else
+              value = resolve_default(key)
+              return value unless memoize
+
+              store[key] ||= value
+            end
           end
+        else
+          store[key] ||= default.call
         end
-      else
-        store[key] ||= default.call
-      end
 
-      value = call_or_value(value, key)
+        value = call_or_value(value, key)
 
-      if resolver
         resolver.call(value)
-      else
-        value
       end
     end
 
@@ -293,7 +296,8 @@ module NxtRegistry
       @default = options.fetch(:default) { Blank.new }
       @memoize = options.fetch(:memoize) { true }
       @call = options.fetch(:call) { true }
-      @resolver = options.fetch(:resolver, false)
+      @resolver = options.fetch(:resolver, ->(val) { val })
+      @key_resolver = options.fetch(:key_resolver, ->(val) { val })
       @transform_keys = options.fetch(:transform_keys) { ->(key) { key.is_a?(Regexp) ? key : key.to_s } }
       @accessor = options.fetch(:accessor) { name }
 
@@ -302,18 +306,20 @@ module NxtRegistry
     end
 
     def define_accessors
-      %w[default memoize call resolver transform_keys on_key_already_registered on_key_not_registered].each do |attribute|
+      %w[default memoize call resolver key_resolver transform_keys on_key_already_registered on_key_not_registered].each do |attribute|
         define_singleton_method attribute do |value = Blank.new, &block|
           value = block if block
 
           if is_a_blank?(value)
             instance_variable_get("@#{attribute}")
           else
+            options[attribute.to_sym] ||= value
             instance_variable_set("@#{attribute}", value)
           end
         end
 
         define_singleton_method "#{attribute}=" do |value|
+          options[attribute.to_sym] ||= value
           instance_variable_set("@#{attribute}", value)
         end
       end
@@ -371,6 +377,7 @@ module NxtRegistry
     def initialize_copy(original)
       super
 
+      @mutex = Mutex.new
       containers = %i[store options]
       variables = %i[patterns required_keys allowed_keys namespace on_key_already_registered on_key_not_registered]
 

data/lib/nxt_registry/version.rb

@@ -1,3 +1,3 @@
 module NxtRegistry
-  VERSION = '0.3.8'
+  VERSION = '0.3.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nxt_registry
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Andreas Robecke
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport