nuclear_secrets 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dd76875fe74fffcbc470049619b65182ea50625
-  data.tar.gz: 11c2e408eaa6de7be7ee6b2a15036ccab19334fd
+  metadata.gz: e6a75e07cb6e5b5b88c35d71f944fdbfaea49706
+  data.tar.gz: faee6c06220273a8e383b50cf2fdeaa5efb31b73
 SHA512:
-  metadata.gz: 53c101780a0d2b3d3e1a12aa982b7a47abe13b00bdfd5a5de88461d3ab13397b899d853ea6e0fea7fee91b9c1dec8043fc363b0c7293f30b578bfb8020472bc7
-  data.tar.gz: 0ee7fead105f4bee046a2b637cd0698034fccc9912cdbe8a3738a1c703bf49726f0a7b3abc23d747f17dc68ae3682c028f1f88422e8121085f229ddad78c52bf
+  metadata.gz: f3ca62d9a313ba5ca99cc0d835d8759edc041db754b36499cf1c6956e02b59465fafbb311d2261094b4e4665d59449b0152bed18d8b3491d8485adceb5931b4e
+  data.tar.gz: 909a8bb35d5c566b7835092791347d9492242af5ff93d5466f2ece66080844d63bcadeca331b82e0a56f607749607e675d610bbb862304a5f746af987dd470a1

data/lib/nuclear_secrets.rb

@@ -51,15 +51,17 @@ module NuclearSecrets
             [
               build_secret_tuple(secrets, required_secrets, key),
             ],
-          )
+          ) if @settings[:raise_on_extra_secrets] == true
         end
-      end
+      end.compact
     end
 
     def check_assertions(secrets, assertions)
       secrets.to_a.zip(assertions).select do |pair|
-        result = pair.last.call(pair.first[1])
-        if !result
+        result = if pair.last.present?
+                   pair.last.call(pair.first[1])
+                 end
+        if !result && @settings[:raise_on_extra_secrets] == true
           pair.first[0]
         else
           false
@@ -70,8 +72,15 @@ module NuclearSecrets
       end
     end
 
-    def check_secrets(secrets)
+    def handle_extra_keys(extra_keys, extra_pairs)
+      raise ExtraSecretsError.new(extra_pairs) unless extra_keys.empty?
+    rescue ExtraSecretsError => e
       logger = Logger.new(STDOUT)
+      logger.warn e.message
+      raise e if @settings[:raise_on_extra_secrets] == true
+    end
+
+    def check_secrets(secrets)
       init_settings
       raise NuclearSecrets::RequiredSecretsListMissing if required_secrets.nil?
       req_keys = required_secrets.keys
@@ -83,14 +92,11 @@ module NuclearSecrets
       missing_pairs = build_pairs(missing_keys, secrets)
       extra_pairs = build_pairs(extra_keys, secrets)
       raise SecretsMissingError.new(missing_pairs) unless missing_keys.empty?
-      raise ExtraSecretsError.new(extra_pairs) unless extra_keys.empty?
+      handle_extra_keys(extra_keys, extra_pairs)
 
       assertions = build_assertions(secrets, existing_keys)
       error_pairs = check_assertions(secrets, assertions)
       raise MismatchedSecretType.new(error_pairs) if !error_pairs.empty?
-    rescue ExtraSecretsError => e
-      logger.warn e.message
-      raise e if @settings[:raise_on_extra_secrets] == true
     end
   end
 end

data/lib/nuclear_secrets/version.rb

@@ -1,3 +1,3 @@
 module NuclearSecrets
-  VERSION = "1.0.4".freeze
+  VERSION = "1.0.5".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nuclear_secrets
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Atomic Jolt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails