lib/secret_env.rb in secret_env-0.1.0 vs lib/secret_env.rb in secret_env-0.2.0

@@ -1,26 +1,16 @@
-require "secret_env/version"
+require 'secret_env/version'
+require 'secret_env/storage'
 require 'yaml'
 
 module SecretEnv
   SECRETS_FILE = 'config/secret_env.yml'
 
   def self.load(env: 'development')
     config = YAML.load_file(SECRETS_FILE).fetch(env)
 
-    storage = if config['storage']
-                case config['storage'].fetch('type')
-                when 'plain'
-                  Storage::Plain.new
-                when 'credstash'
-                  Storage::CredStash.new
-                else
-                  raise "Unknown storage type: #{config['storage']['type']}"
-                end
-              else
-                Storage::Plain.new
-              end
+    storage = Storage.setup(config['storage'])
 
     Array(config.fetch('env')).each do |key, raw_value|
       record = Record.new(key: key, raw_value: raw_value, storage: storage)
       ENV[record.key] = record.value
     end
@@ -41,30 +31,11 @@
       while part = scanner.scan_until(/#\{(.*?)\}/)
         secret_key = scanner.matched[2..-2] # Extract "secret" from "\#{secret}"
         secret = @storage.retrieve(secret_key)
         parts << part.gsub(scanner.matched, secret)
       end
+      parts << scanner.rest
       parts.join
-    end
-  end
-
-  module Storage
-    class Base
-      def retrieve(secret_key)
-        raise NotImplemedError
-      end
-    end
-
-    class Plain < Base
-      def retrieve(secret_key)
-        "#\{#{secret_key}\}"
-      end
-    end
-
-    class CredStash < Base
-      def retrieve(secret_key)
-        ::CredStash.get(secret_key)
-      end
     end
   end
 end
 
 require 'secret_env/rails' if defined?(Rails)