loadable_config 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33c373a5e0f4a214006136bab94ad6c340569d39243d42239aa6d585666b5504
-  data.tar.gz: 346a2170ef3e5c8c8c675ee63e725d775fe6b58918f37fb5cc90b720277cf7f9
+  metadata.gz: 9c974e84d16ca1f1e101cdec3f960c9ddda833f662aed89801c62bf5a1242a42
+  data.tar.gz: 947f347ea37ed0a39d95d2efce098e885ecbd1617a5bc21ada7fddc1582bf30c
 SHA512:
-  metadata.gz: 2a7a4699f631c1929510007fb0bb2f57aedbe8b9dd948f2646fada1e5e1ab9ccad49fe33b5b801450658e667acf308c481e5222cb3c80ab7396c4f99ec4ad972
-  data.tar.gz: 444ed617779485ad69f4667c4be6d6781e57b304d1e7d24b9860c3f324d3f8fbc40f46f265d428bf131689228d1a8ea9c6d95240a5c9a26b648a93bad394af5a
+  metadata.gz: e40f35dee22f84221bcf392d4cc8c0333ea8367418402bbd8fdf31be47c2729ab8d2a5434e348b47ce3084bfbeb232974763108a1bfbb7fc8030a45d7dd3de70
+  data.tar.gz: 49c65edd385e9c30aaaa3ab7d4b5e40b62fa48f13959a535905ce5acc245060b1aba65425aad517b12f4d46aec3fb5332a66b7377d1e0e12881cbb9ea5ff3a0e

data/.github/workflows/gem-push.yml

@@ -0,0 +1,31 @@
+name: Publish Ruby Gem
+
+on:
+  push:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby 2.7
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/.github/workflows/test.yml

@@ -0,0 +1,42 @@
+name: Run Tests
+
+on:
+  pull_request:
+    branches: "**"
+
+permissions:
+  contents: read
+  checks: write
+  pull-requests: write
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rspec --profile 10 --format RspecJunitFormatter --out test_results/rspec.xml --format progress
+    - name: Upload result
+      uses: actions/upload-artifact@v3
+      if: always()
+      with:
+        name: rspec_${{ matrix.ruby-version }}.xml
+        path: test_results/rspec.xml
+    - name: Test Report
+      uses: dorny/test-reporter@v1
+      if: always()
+      with:
+        name: Rspec Tests - ${{ matrix.ruby-version }}
+        path: test_results/rspec.xml
+        reporter: java-junit

data/lib/loadable_config/options.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class LoadableConfig::Options
-  attr_reader :config_path_prefix, :environment_key, :preprocessor
+  attr_reader :config_path_prefix, :environment_key, :preprocessor, :overlay_function
 
   def initialize
     # Prefix for configuration file paths. Must be a valid directory, for
@@ -18,6 +18,11 @@ class LoadableConfig::Options
     # If set, uses the provided block to preprocess the configuration file
     # before YAML parsing.
     @preprocessor        = nil
+
+    # If set, calls the provided block with the configuration class after
+    # parsing to obtain a configuration overlay. If a value is returned, it is
+    # deep_merged into the application.
+    @overlay_function    = nil
   end
 
   def config_path_prefix=(val)
@@ -35,4 +40,8 @@ class LoadableConfig::Options
   def preprocess(&block)
     @preprocessor = block
   end
+
+  def overlay(&block)
+    @overlay_function = block
+  end
 end

data/lib/loadable_config/version.rb

@@ -1,3 +1,3 @@
 class LoadableConfig
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/lib/loadable_config.rb

@@ -103,6 +103,11 @@ class LoadableConfig
       end
     end
 
+    if (overlay_function = LoadableConfig._configuration.overlay_function)
+      overlay_data = overlay_function.call(self.class)
+      config = _deep_merge(config, overlay_data) if overlay_data
+    end
+
     unless config
       raise RuntimeError.new("Configuration file missing config for #{self.class.name}.")
     end
@@ -142,4 +147,14 @@ class LoadableConfig
       'additionalProperties' => false,
     )
   end
+
+  def _deep_merge(a_hash, b_hash)
+    a_hash.merge(b_hash) do |_key, a_val, b_val|
+      if a_val.is_a?(Hash) && b_val.is_a?(Hash)
+        _deep_merge(a_val, b_val)
+      else
+        b_val
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loadable_config
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -73,7 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".github/workflows/gem-push.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -106,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Simple declarative configuration files

data/.circleci/config.yml

@@ -1,102 +0,0 @@
-version: 2.1
-
-executors:
-  ruby:
-    parameters:
-      ruby-version:
-        type: string
-        default: "2.6"
-      gemfile:
-        type: string
-        default: "Gemfile"
-    docker:
-      - image: cimg/ruby:<< parameters.ruby-version >>
-        environment:
-          BUNDLE_JOBS: 3
-          BUNDLE_RETRY: 3
-          BUNDLE_PATH: vendor/bundle
-          RAILS_ENV: test
-          BUNDLE_GEMFILE: << parameters.gemfile >>
-
-jobs:
-  test:
-    parameters:
-      ruby-version:
-        type: string
-    executor:
-      name: ruby
-      ruby-version: << parameters.ruby-version >>
-    parallelism: 1
-    steps:
-      - checkout
-
-      - run:
-          # Remove the non-appraisal gemfile for safety: we never want to use it.
-          name: Prepare bundler
-          command: bundle -v
-
-      - run:
-          name: Compute a gemfile lock
-          command: bundle lock && cp "${BUNDLE_GEMFILE}.lock" /tmp/gem-lock
-
-      - restore_cache:
-          keys:
-            - loadable_config-<< parameters.ruby-version >>-{{ checksum "/tmp/gem-lock" }}
-            - loadable_config-
-
-      - run:
-          name: Bundle Install
-          command: bundle check || bundle install
-
-      - save_cache:
-          key: loadable_config-<< parameters.ruby-version >>-{{ checksum "/tmp/gem-lock" }}
-          paths:
-            - vendor/bundle
-
-      - run:
-          name: Run rspec
-          command: bundle exec rspec --profile 10 --format RspecJunitFormatter --out test_results/rspec.xml --format progress
-
-      - store_test_results:
-          path: test_results
-
-  publish:
-    executor: ruby
-    steps:
-       - checkout
-       - run:
-           name: Setup Rubygems
-           command: |
-             mkdir ~/.gem &&
-             echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials &&
-             chmod 0600 ~/.gem/credentials
-       - run:
-           name: Publish to Rubygems
-           command: |
-             gem build loadable_config.gemspec
-             gem push loadable_config-*.gem
-
-
-workflows:
-  version: 2.1
-  build:
-    jobs:
-      - test:
-          name: 'ruby 2.7'
-          ruby-version: "2.7"
-      - test:
-          name: 'ruby 3.0'
-          ruby-version: "3.0"
-      - test:
-          name: 'ruby 3.1'
-          ruby-version: "3.1"
-      - publish:
-          requires:
-            - 'ruby 2.7'
-            - 'ruby 3.0'
-            - 'ruby 3.1'
-          filters:
-            branches:
-              only: master
-            tags:
-              ignore: /.*/