chamber 2.10.2 → 2.11.0

data/lib/chamber/types/secured.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'active_support/json'
 require 'chamber'
 
-# rubocop:disable Lint/HandleExceptions, Style/EmptyLinesAroundModuleBody
+# rubocop:disable Lint/HandleExceptions, Layout/EmptyLinesAroundModuleBody
 module  Chamber
 
 begin
@@ -20,14 +22,14 @@ end
 
 module  Types
 class   Secured < CHAMBER_TYPE_VALUE_SUPERCLASS
-  attr_accessor :decryption_key,
-                :encryption_key
+  attr_accessor :decryption_keys,
+                :encryption_keys
 
   def initialize(options = {})
-    self.encryption_key = options.fetch(:encryption_key,
-                                        Chamber.configuration.encryption_key)
-    self.decryption_key = options.fetch(:decryption_key,
-                                        Chamber.configuration.decryption_key)
+    self.encryption_keys = options.fetch(:encryption_keys,
+                                         Chamber.configuration.encryption_keys)
+    self.decryption_keys = options.fetch(:decryption_keys,
+                                         Chamber.configuration.decryption_keys)
   end
 
   def type
@@ -54,8 +56,8 @@ class   Secured < CHAMBER_TYPE_VALUE_SUPERCLASS
     return if value.nil?
 
     Chamber.decrypt(value,
-                    decryption_key: decryption_key,
-                    encryption_key: encryption_key)
+                    decryption_keys: decryption_keys,
+                    encryption_keys: encryption_keys)
   end
   alias type_cast_from_database deserialize
 
@@ -64,8 +66,8 @@ class   Secured < CHAMBER_TYPE_VALUE_SUPERCLASS
 
     ::ActiveSupport::JSON.encode(
       Chamber.encrypt(value,
-                      decryption_key: decryption_key,
-                      encryption_key: encryption_key),
+                      decryption_keys: decryption_keys,
+                      encryption_keys: encryption_keys),
     )
   end
   alias type_cast_for_database serialize
@@ -76,4 +78,4 @@ class   Secured < CHAMBER_TYPE_VALUE_SUPERCLASS
 end
 end
 end
-# rubocop:enable Lint/HandleExceptions, Style/EmptyLinesAroundModuleBody
+# rubocop:enable Lint/HandleExceptions, Layout/EmptyLinesAroundModuleBody

data/lib/chamber/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Chamber
-  VERSION = '2.10.2'.freeze
+  VERSION = '2.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chamber
 version: !ruby/object:Gem::Version
-  version: 2.10.2
+  version: 2.11.0
 platform: ruby
 authors:
 - thekompanee
@@ -15,26 +15,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDrjCCApagAwIBAgIBATANBgkqhkiG9w0BAQUFADBOMRowGAYDVQQDDBFhY2Nv
   dW50c19ydWJ5Z2VtczEbMBkGCgmSJomT8ixkARkWC3RoZWtvbXBhbmVlMRMwEQYK
-  CZImiZPyLGQBGRYDY29tMB4XDTE3MDgwMjIyNTYzMVoXDTE4MDgwMjIyNTYzMVow
+  CZImiZPyLGQBGRYDY29tMB4XDTE3MTIzMTIzMzUwNloXDTE4MTIzMTIzMzUwNlow
   TjEaMBgGA1UEAwwRYWNjb3VudHNfcnVieWdlbXMxGzAZBgoJkiaJk/IsZAEZFgt0
   aGVrb21wYW5lZTETMBEGCgmSJomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEB
-  BQADggEPADCCAQoCggEBAMc4QXE2KJeQa7s4KChv4ZAfRhflgunXNocdi2rDNCTv
-  wLkjoNxDCSkKj8C95dSZVwMy92DqdIbC7ppVTfApXbRxB7BoeY7fWf0EmOQUZ2aa
-  FS7QR1OrSVkxZ0rJ6B90ANl8DATLbg/xlw5vxiI/OMva5qt1W2Lmwy6Rl+R6Fr2W
-  z90rabN3hQE6J8UItT06QENBWtkypCAjb3fZ513/lw/BvM3vJjZ4/J/dLLHsbmqw
-  k6WCuasYf2+Fv7O3/ffdVqKtudf4/Y9B1vVEYIaxoxtsm1UHvVWm+RphyXgsSLe7
-  UjoAVW+m0wft3rsmuV1BC9mpUztNATGqYLrpPcoN66cCAwEAAaOBljCBkzAJBgNV
-  HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUxAKay6wGYqob8tw4Nr2GP31+
-  NckwLAYDVR0RBCUwI4EhYWNjb3VudHMrcnVieWdlbXNAdGhla29tcGFuZWUuY29t
+  BQADggEPADCCAQoCggEBAO4TFnvU5R1rchKsNvNEiZUlOTuMtuE+OvMW4aOk3tIP
+  JpczhDnRSLpbkpVvsuwfT9PgLjnAuan4oLB0eQVaOAgATFbmAfMsfU0gGtSWlczx
+  6vZjQqyGsW3P1abgGquLVubj409FMxfV18JUZlEmvCE1y9bM61gZ3oHTFPvBDoyX
+  3g9or9nenIa5jcJZd4C3ujW8yOxD+UskgAp+iZI2mIRtt2cJVg2/dnFAgqqp7Xy4
+  c4OHZ6hqp2UcvhzuEdUJ6yRA8+Gn3jPOD+uXgUG84FfmU++NVoZyz+r0Nwa+De0H
+  IObr8jftfL0PGdR8t1K61g12dZwGmpYTzmoJ1C+yS2ECAwEAAaOBljCBkzAJBgNV
+  HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUxmSoxOGENcFagbIbl/CikHCU
+  hyMwLAYDVR0RBCUwI4EhYWNjb3VudHMrcnVieWdlbXNAdGhla29tcGFuZWUuY29t
   MCwGA1UdEgQlMCOBIWFjY291bnRzK3J1YnlnZW1zQHRoZWtvbXBhbmVlLmNvbTAN
-  BgkqhkiG9w0BAQUFAAOCAQEAekAixhDiCyu4LvqVIEfNkb9DSCsNUQOCgwX2ppj5
-  dfOq0yEABaMNGs5QJZUGXwXI5PHfSrsh8yNXUvofB9A5CE/M7z1nqifAYyjBhQse
-  trwZaMUUjIkPVYBCBHnIIRV5r3nQaJRJSBejcJ9rZBiPB+Fy8pumpxTQ4iD28bVh
-  z3hlqH0da2pJJ8dJpGka9VS5RJMljl4CmPGfp0xBhaP8SiQ0ROudY2hl41CxoM4u
-  D+octMUn1lW1R5TY2r8c6lPvU4otU+9/N9CQP/qPfjpfdjndm4AT9WOElnbqouuF
-  CI6ZwNuD9jNYJxrNrpdkOUZVPEr6PoPdArhjNQevWG3zbg==
+  BgkqhkiG9w0BAQUFAAOCAQEAoiXGZB5aUV/31MOlrY6Jmfk/4+kIBcgrOCMCi3Nn
+  58fZ/LJDmxs+C3zdW0wHxYf06r3ZcHTulhk1suztLCWyUxyOkGj4IW+LXPRGP66o
+  6qcofBVFh7GXatsgbj87f7a8/opXaeQHqC2X18sCTwOCcO5PjtFrXK7A3v1u2yRj
+  rEe6qyTkY77mRgG3f/feAizAvYYkPxOngUwN8rpfKpU5iESS4UUaxIi3AGJHgTw2
+  etYUO0DlNY/qYfSfExrgt0W5dZeT09V++WPlYauHw/EZtAB0AsJwVdtIscq0HSvX
+  yH9AFp3KIe0v70EXzao/94n+XoDULrHEhqGMo34iS+37ZA==
   -----END CERTIFICATE-----
-date: 2017-12-30 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -70,14 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rspectacular
   requirement: !ruby/object:Gem::Requirement
@@ -93,33 +93,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.46'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
 description: Chamber lets you source your Settings from an arbitrary number of YAML
   files and provides a simple mechanism for overriding settings from the ENV, which
   is friendly to how Heroku addons work.
@@ -153,15 +153,12 @@ files:
 - lib/chamber/commands/travis/secure.rb
 - lib/chamber/configuration.rb
 - lib/chamber/context_resolver.rb
-- lib/chamber/decryption_key.rb
 - lib/chamber/encryption_methods/none.rb
 - lib/chamber/encryption_methods/public_key.rb
 - lib/chamber/encryption_methods/ssl.rb
-- lib/chamber/environmentable.rb
 - lib/chamber/errors/decryption_failure.rb
 - lib/chamber/file.rb
 - lib/chamber/file_set.rb
-- lib/chamber/filters/boolean_conversion_filter.rb
 - lib/chamber/filters/decryption_filter.rb
 - lib/chamber/filters/encryption_filter.rb
 - lib/chamber/filters/environment_filter.rb
@@ -171,6 +168,10 @@ files:
 - lib/chamber/filters/secure_filter.rb
 - lib/chamber/filters/translate_secure_keys_filter.rb
 - lib/chamber/instance.rb
+- lib/chamber/key_pair.rb
+- lib/chamber/keys/base.rb
+- lib/chamber/keys/decryption.rb
+- lib/chamber/keys/encryption.rb
 - lib/chamber/namespace_set.rb
 - lib/chamber/rails.rb
 - lib/chamber/rails/railtie.rb

data/lib/chamber/decryption_key.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-require 'stringio'
-
-module  Chamber
-class   DecryptionKey
-  def initialize(options = {})
-    self.rootpath = options[:rootpath]
-    self.filename = options[:filename] || ''
-  end
-
-  def resolve
-    if filename.readable?
-      filename.read
-    elsif in_environment_variable?
-      environment_variable
-    end
-  end
-
-  def self.resolve(*args)
-    new(*args).resolve
-  end
-
-  protected
-
-  attr_accessor :filename,
-                :rootpath
-
-  def filename=(other)
-    other_file = Pathname.new(other)
-
-    @filename = if other_file.readable?
-                  other_file
-                else
-                  default_file
-                end
-  end
-
-  private
-
-  def in_environment_variable?
-    ENV['CHAMBER_KEY']
-  end
-
-  def environment_variable
-    ENV['CHAMBER_KEY']
-  end
-
-  def default_file
-    Pathname.new(rootpath + '.chamber.pem')
-  end
-end
-end

data/lib/chamber/environmentable.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-require 'hashie/mash'
-
-module  Chamber
-module  Environmentable
-  SECURE_KEY_TOKEN = /\A_secure_/
-
-  def with_environment(settings, parent_keys, hash_block, value_block)
-    environment_hash = Hashie::Mash.new
-
-    settings.each_pair do |key, value|
-      environment_key  = key.to_s.gsub(SECURE_KEY_TOKEN, '')
-      environment_keys = parent_keys.dup.push(environment_key)
-
-      if value.respond_to? :each_pair
-        environment_hash.merge!(hash_block.call(key, value, environment_keys))
-      else
-        environment_key = environment_keys.join('_').upcase
-
-        environment_hash.merge!(value_block.call(key, value, environment_key))
-      end
-    end
-
-    environment_hash
-  end
-end
-end

data/lib/chamber/filters/boolean_conversion_filter.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-module  Chamber
-module  Filters
-class   BooleanConversionFilter
-  def initialize(options = {})
-    self.data = options.fetch(:data).dup
-  end
-
-  def self.execute(options = {})
-    new(options).__send__(:execute)
-  end
-
-  protected
-
-  attr_accessor :data
-
-  # rubocop:disable Metrics/BlockNesting
-  def execute(settings = data)
-    settings.each_pair do |key, value|
-      if value.respond_to? :each_pair
-        execute(value)
-      else
-        settings[key] = if value.is_a? String
-                          case value
-                          when 'false', 'f', 'no'
-                            false
-                          when 'true', 't', 'yes'
-                            true
-                          else
-                            value
-                          end
-                        else
-                          value
-                        end
-      end
-    end
-  end
-  # rubocop:enable Metrics/BlockNesting
-end
-end
-end