global 1.1.0 → 2.0.0

data/lib/global/configuration.rb

@@ -22,6 +22,13 @@ module Global
       hash.select { |key, _| keys.include?(key) }
     end
 
+    def get_configuration_value(key)
+      return nil unless key?(key)
+
+      value = hash[key]
+      value.is_a?(Hash) ? Global::Configuration.new(value) : value
+    end
+
     private
 
     def filtered_keys_list(options)
@@ -30,6 +37,7 @@ module Global
 
       return hash.keys if options[:only] == :all
       return [] if options[:except] == :all
+
       []
     end
 
@@ -43,8 +51,7 @@ module Global
     def method_missing(method, *args, &block)
       method = normalize_key_by_method(method)
       if key?(method)
-        value = hash[method]
-        value.is_a?(Hash) ? Global::Configuration.new(value) : value
+        get_configuration_value(method)
       else
         super
       end

data/lib/global/version.rb

@@ -2,6 +2,6 @@
 
 module Global
 
-  VERSION = '1.1.0'
+  VERSION = '2.0.0'
 
 end

data/spec/global/backend/aws_parameter_store_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'aws-sdk-ssm'
+require 'global/backend/aws_parameter_store'
+
+RSpec.describe Global::Backend::AwsParameterStore do
+  let(:client) do
+    Aws::SSM::Client.new(stub_responses: true)
+  end
+  subject do
+    described_class.new(prefix: '/testapp/', client: client)
+  end
+
+  it 'reads parameters from the parameter store' do
+    client.stub_responses(
+      :get_parameters_by_path,
+      [
+        lambda { |req_context|
+          expect(req_context.params[:next_token]).to be_nil
+          {
+            parameters: [
+              { name: '/testapp/foo', value: 'foo-value' },
+              { name: '/testapp/bar/baz', value: 'baz-value' }
+            ],
+            next_token: 'next-token'
+          }
+        },
+        lambda { |req_context|
+          expect(req_context.params[:next_token]).to eq('next-token')
+          {
+            parameters: [
+              { name: '/testapp/bar/qux', value: 'qux-value' }
+            ],
+            next_token: nil
+          }
+        }
+      ]
+    )
+    expect(subject.load).to eq(
+      foo: 'foo-value',
+      bar: {
+        baz: 'baz-value',
+        qux: 'qux-value'
+      }
+    )
+  end
+end

data/spec/global/backend/gcp_secret_manager_spec.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'google/cloud/secret_manager'
+require 'global/backend/gcp_secret_manager'
+
+RSpec.describe Global::Backend::GcpSecretManager do
+  let(:client) { double }
+
+  subject do
+    described_class.new(prefix: 'prod-myapp-', client: client, project_id: 'example')
+  end
+
+  before do
+    @match_item = double
+    allow(@match_item).to receive(:name).and_return('prod-myapp-example-test_key')
+
+    @secret_data = double
+    allow(@secret_data).to receive_message_chain(:payload, :data).and_return('secret value')
+
+    @not_match_item = double
+    allow(@not_match_item).to receive(:name).and_return('different_key')
+
+    @list = double
+    allow(@list).to receive(:next_page_token).and_return('')
+    allow(@list).to receive(:each).and_yield(@match_item).and_yield(@not_match_item)
+
+    allow(client).to receive(:project_path).and_return('projects/example')
+    allow(client).to receive(:secret_version_path)
+      .with(project: 'example', secret: 'prod-myapp-example-test_key', secret_version: 'latest')
+      .and_return('some_key_path')
+    allow(client).to receive(:access_secret_version).with(name: 'some_key_path').and_return(@secret_data)
+    allow(client).to receive(:list_secrets).and_return(@list)
+  end
+
+  it 'reads parameters from the secret manager' do
+    expect(subject.load).to eq({ example: { test_key: 'secret value' }})
+  end
+end

data/spec/global_spec.rb

@@ -4,34 +4,10 @@ require 'spec_helper'
 
 RSpec.describe Global do
 
+  let(:config_path) { File.join(Dir.pwd, 'spec/files') }
   before(:each) do
     described_class.configure do |config|
-      config.environment = 'test'
-      config.config_directory = File.join(Dir.pwd, 'spec/files')
-    end
-  end
-
-  describe '.environment' do
-    subject { described_class.environment }
-
-    it { is_expected.to eq('test') }
-
-    context 'when undefined' do
-      before { described_class.environment = nil }
-
-      it { expect { subject }.to raise_error('environment should be defined') }
-    end
-  end
-
-  describe '.config_directory' do
-    subject { described_class.config_directory }
-
-    it { is_expected.to eq(File.join(Dir.pwd, 'spec/files')) }
-
-    context 'when undefined' do
-      before { described_class.config_directory = nil }
-
-      it { expect { subject }.to raise_error('config_directory should be defined') }
+      config.backend :filesystem, path: config_path, environment: 'test'
     end
   end
 
@@ -51,10 +27,9 @@ RSpec.describe Global do
     end
 
     context 'when load from file' do
-      before { described_class.config_directory = File.join(Dir.pwd, 'spec/files/rspec_config') }
+      let(:config_path) { File.join(Dir.pwd, 'spec/files/rspec_config') }
 
       describe '#rspec_config' do
-        subject { super().rspec_config }
         describe '#to_hash' do
           subject { super().to_hash }
           it { is_expected.to eq('default_value' => 'default value', 'test_value' => 'test value') }
@@ -88,12 +63,8 @@ RSpec.describe Global do
 
     before do
       described_class.configuration
-      described_class.environment = 'development'
-    end
-
-    after do
-      described_class.environment = 'test'
-      described_class.reload!
+      described_class.instance_variable_set('@backends', [])
+      described_class.backend :filesystem, path: config_path, environment: 'development'
     end
 
     it { is_expected.to be_instance_of(Global::Configuration) }
@@ -141,5 +112,4 @@ RSpec.describe Global do
     end
 
   end
-
 end

data/spec/merge_backends_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Global do
+  describe 'merging backends' do
+    it 'merges data from two backends together' do
+      backend_alpha = double('backend_alpha')
+      allow(backend_alpha).to receive(:load).and_return(foo: 'foo', bar: 'bar-alpha')
+      described_class.backend backend_alpha
+
+      backend_beta = double('backend_beta')
+      allow(backend_beta).to receive(:load).and_return('bar' => 'bar-beta', 'baz' => 'baz')
+      described_class.backend backend_beta
+
+      expect(described_class.configuration.to_hash).to eq(
+        'foo' => 'foo',
+        'bar' => 'bar-beta',
+        'baz' => 'baz'
+      )
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'global'
 require 'simplecov'
-require 'support/javascript_helper'
 
 SimpleCov.start do
   add_filter '/spec/'
@@ -39,5 +38,9 @@ RSpec.configure do |config|
   config.filter_run :focus
 
   config.order = 'random'
-  config.include JavascriptHelper
+
+  config.before do
+    Global.remove_instance_variable(:@backends) if Global.instance_variable_defined?(:@backends)
+    Global.remove_instance_variable(:@configuration) if Global.instance_variable_defined?(:@configuration)
+  end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: global
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Railsware LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-ssm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: google-cloud-secret_manager
+  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
@@ -44,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.1
-- !ruby/object:Gem::Dependency
-  name: therubyracer
-  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: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -94,9 +108,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-description: Simple way to load your configs from yaml
+description: Simple way to load your configs from yaml/aws/gcp
 email: contact@railsware.com
-executables: []
+executables:
+- console
 extensions: []
 extra_rdoc_files: []
 files:
@@ -105,16 +120,19 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
+- CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/assets/javascripts/global-js.js.erb
+- bin/console
 - global.gemspec
 - lib/global.rb
+- lib/global/backend/aws_parameter_store.rb
+- lib/global/backend/filesystem.rb
+- lib/global/backend/gcp_secret_manager.rb
 - lib/global/base.rb
 - lib/global/configuration.rb
-- lib/global/engine.rb
 - lib/global/version.rb
 - spec/files/aws.test.yml
 - spec/files/aws.yml
@@ -122,11 +140,12 @@ files:
 - spec/files/nested_config.yml
 - spec/files/rspec/config.yml
 - spec/files/rspec_config.yml
+- spec/global/backend/aws_parameter_store_spec.rb
+- spec/global/backend/gcp_secret_manager_spec.rb
 - spec/global/configuration_spec.rb
-- spec/global/global_js_spec.rb
 - spec/global_spec.rb
+- spec/merge_backends_spec.rb
 - spec/spec_helper.rb
-- spec/support/javascript_helper.rb
 homepage: https://github.com/railsware/global
 licenses:
 - MIT
@@ -146,11 +165,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: global
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Simple way to load your configs from yaml
+summary: Simple way to load your configs from yaml/aws/gcp
 test_files:
 - spec/files/aws.test.yml
 - spec/files/aws.yml
@@ -158,8 +176,9 @@ test_files:
 - spec/files/nested_config.yml
 - spec/files/rspec/config.yml
 - spec/files/rspec_config.yml
+- spec/global/backend/aws_parameter_store_spec.rb
+- spec/global/backend/gcp_secret_manager_spec.rb
 - spec/global/configuration_spec.rb
-- spec/global/global_js_spec.rb
 - spec/global_spec.rb
+- spec/merge_backends_spec.rb
 - spec/spec_helper.rb
-- spec/support/javascript_helper.rb

data/app/assets/javascripts/global-js.js.erb

@@ -1,2 +0,0 @@
-<%# encoding: UTF-8 %>
-<%= Global.generate_js %>

data/lib/global/engine.rb

@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-
-module Global
-
-  class SprocketsExtension
-
-    GLOBAL_JS_ASSET = 'global-js'
-
-    def initialize(filename)
-      @filename = filename
-      @source   = yield
-    end
-
-    def render(context, _empty_hash_wtf)
-      self.class.run(@filename, @source, context)
-    end
-
-    def self.run(_filename, source, context)
-      if GLOBAL_JS_ASSET == context.logical_path
-        configs = Dir.glob("#{Global.config_directory}#{File::SEPARATOR}*.yml")
-        configs.map { |config| context.depend_on(config) }
-      end
-      source
-    end
-
-    def self.call(input)
-      filename = input[:filename]
-      source   = input[:data]
-      context  = input[:environment].context_class.new(input)
-
-      result = run(filename, source, context)
-      context.metadata.merge(data: result)
-    end
-
-  end
-
-  class Engine < ::Rails::Engine
-
-    require 'sprockets/version'
-    v2                = Gem::Dependency.new('', ' ~> 2')
-    vgte3             = Gem::Dependency.new('', ' >= 3')
-    sprockets_version = Gem::Version.new(::Sprockets::VERSION).release
-    initializer_args  = case sprockets_version
-                        when ->(v) { v2.match?('', v) }
-                          { after: 'sprockets.environment' }
-                        when ->(v) { vgte3.match?('', v) }
-                          { after: :engines_blank_point, before: :finisher_hook }
-                        else
-                          raise StandardError.new("Sprockets version #{sprockets_version} is not supported")
-                        end
-
-    is_running_rails = defined?(Rails) && Rails.respond_to?(:version)
-    is_running_rails32 = is_running_rails && Rails.version.match(/3\.2/)
-
-    initializer 'global-js.dependent_on_configs', initializer_args do
-      case sprockets_version
-      when ->(v) { v2.match?('', v) },
-              ->(v) { vgte3.match?('', v) }
-
-        # It seems rails 3.2 is not working if
-        # `Rails.application.config.assets.configure` is used for
-        # registering preprocessor
-        if is_running_rails32
-          Rails.application.assets.register_preprocessor(
-            'application/javascript',
-            SprocketsExtension
-          )
-        elsif Rails.application.config.respond_to?(:assets)
-          # Other rails version, assumed newer
-          Rails.application.config.assets.configure do |config|
-            config.register_preprocessor(
-              'application/javascript',
-              SprocketsExtension
-            )
-          end
-        end
-      else
-        raise StandardError.new("Sprockets version #{sprockets_version} is not supported")
-      end
-    end
-
-  end
-
-end