eventhub-processor2 1.16.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2739edbb95a3f9601733c2bde861c8e3503521614fe40f2a0610d4a25c00e92
-  data.tar.gz: fe134c8b0a783a72bce0cf9c8cad969ee6c924d0de2a531306d6c78390aa2a40
+  metadata.gz: f49a2553cee453b3b36d486fe4bbdc45dc7d7dedc7a6c2eaf7697961290e0762
+  data.tar.gz: b69f9e536f9290beb54ad50c5396638dae35fda7ad97da78ffa5bc7d020691d7
 SHA512:
-  metadata.gz: fcd107c5823805cf7031c0609d3a8ca2a1dd53e48886477c8ebd3640ad4b59c2b094b8268307510d90d3149e05d7b9b9755dcce1841b5a79dac319c05544b482
-  data.tar.gz: 2af45eadf2bd6491a6ad2bc59f519ce2045cab9753848b2f45a5f94f3e9848eae7234d9ecd82faae4adcac66e1aa7e2d591633c970c7ed0a66d60fb7e815824d
+  metadata.gz: fd309c8fc8b8e7d55783b4c44d61e271270de0a5d15c66648e8bc23ad4860ac6ac7f554b0d338ca4c586b78114c4a89ee10fb91442536087d52607e5a3d3d009
+  data.tar.gz: 5dfcae4c381eba2933a85c6bb1cb61f1b467fab06e253b07071fcd240f8f5a57f1886efc3c3fd9f915b09e4d88e3651e1e8e81c4aab9f83a3b883224ff169bdd

data/.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
         ruby-version: ${{ matrix.ruby }}
         bundler: latest
         bundler-cache: true
-        cache-version: 3
+        cache-version: 4
 
     - name: Setup RabbitMQ
       run: |

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.2.0

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog of EventHub::Processor2
 
+## 1.18.0 / 2023-01-30
+
+* Update dependencies
+
+## 1.17.0 / 2022-12-21
+
+* Ability to load and merge more config file based on a name or a pattern
+* Update dependencies
+
 ## 1.16.0 / 2022-12-18
 
 * Updated gem dependencies

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eventhub-processor2 (1.16.0)
+    eventhub-processor2 (1.18.0)
       bunny (~> 2.20)
       celluloid (~> 0.18)
       eventhub-components (~> 0.2)
@@ -12,7 +12,7 @@ GEM
   specs:
     amq-protocol (2.3.2)
     ast (2.4.2)
-    bunny (2.20.0)
+    bunny (2.20.3)
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
     celluloid (0.18.0)
@@ -27,12 +27,12 @@ GEM
     logstash-logger (0.26.1)
       logstash-event (~> 1.2)
     parallel (1.22.1)
-    parser (3.1.3.0)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
     rbtree (0.4.6)
-    regexp_parser (2.6.1)
+    regexp_parser (2.6.2)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -40,31 +40,31 @@ GEM
       rspec-mocks (~> 3.12.0)
     rspec-core (3.12.0)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.1)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.1)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.39.0)
+    rubocop (1.42.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.15.1)
+    rubocop-performance (1.15.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
     set (1.0.3)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -73,12 +73,12 @@ GEM
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)
-    standard (1.19.1)
+    standard (1.22.1)
       language_server-protocol (~> 3.17.0.2)
-      rubocop (= 1.39.0)
-      rubocop-performance (= 1.15.1)
+      rubocop (= 1.42.0)
+      rubocop-performance (= 1.15.2)
     timers (4.3.5)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
     uuidtools (2.2.0)
 
 PLATFORMS
@@ -93,7 +93,7 @@ DEPENDENCIES
   rake (~> 13.0)
   rspec (~> 3.11)
   simplecov (~> 0.21)
-  standard (~> 1.17)
+  standard (~> 1.20)
 
 BUNDLED WITH
    2.3.26

data/README.md

@@ -181,6 +181,46 @@ Processor2 symbolizes keys and sub-keys from configuration files automatically.
   database['name']['subname']   # => "value"
 ```
 
+Version 1.17 and newer allows you to load and merge more configuration files programmatically. It is expected that load! is called once (implicit during class initialization) and then load_more! zero, one, or multiple times. All additional files loaded with load_more! are hash deep merged into one configuration structure. Exceptions while loading of files will be catched and shown as warnings.
+```ruby
+  # specify a file
+  EventHub::Configuration.load_more!(pattern: "config/another_config.json")
+
+  # specify glob patterns to load multiple files
+  EventHub::Configuration.load_more!(pattern: "config/processes/**/*.json")
+  EventHub::Configuration.load_more!(pattern: "config/templates/**/*.json")
+```
+If you have conflicting hashes, the previous settings will be overwritten.
+
+1st file loaded
+```json
+  {
+    "test": {
+      "a": "a_value",
+      "b": "b_value"
+    }
+  }
+```
+2nd file loaded
+```json
+  {
+    "test": {
+      "b": "another_value"
+    }
+  }
+```
+
+Final configuration result
+```json
+  {
+    "test": {
+      "a": "a_value",
+      "b": "another_value"
+    }
+  }
+
+```
+
 ## Development
 
 ```

data/eventhub-processor2.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.11"
   spec.add_development_dependency "simplecov", "~> 0.21"
-  spec.add_development_dependency "standard", "~> 1.17"
+  spec.add_development_dependency "standard", "~> 1.20"
 end

data/lib/eventhub/configuration.rb

@@ -79,6 +79,24 @@ module EventHub
       deep_merge!(@config_data, new_data)
     end
 
+    # load and merge more configuration files
+    def load_more!(args = {})
+      return unless args[:pattern]
+
+      Dir.glob(args[:pattern]).each do |name|
+        next if File.directory?(name)
+
+        begin
+          EventHub.logger.info("About to load file [#{name}]...")
+          new_data = JSON.parse(File.read(name), symbolize_names: true)
+          new_data = new_data[@environment.to_sym]
+          deep_merge!(@config_data, new_data)
+        rescue => e
+          EventHub.logger.warn("Exception while loading file [#{name}]: #{e}")
+        end
+      end
+    end
+
     # Deep merging of hashes
     # deep_merge by Stefan Rusterholz, see http://www.ruby-forum.com/topic/142809
     def deep_merge!(target, data)

data/lib/eventhub/version.rb

@@ -1,3 +1,3 @@
 module EventHub
-  VERSION = "1.16.0".freeze
+  VERSION = "1.18.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventhub-processor2
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Steiner, Thomas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.20'
 description: Next generation gem to build ruby based eventhub processor
 email:
 - thomas.steiner@ikey.ch
@@ -148,6 +148,7 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
+- ".tool-versions"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock