leml 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46bbf2d07767519d46ba6703eafd96d53f62d2b1
-  data.tar.gz: aae9577b0141efd89bae3941661651215cd36301
+  metadata.gz: 913c8d2ba0a5f32857a5bb0b466d6db9e7ef5f82
+  data.tar.gz: 7f51e64db3ed5f14319285c7e326cb897540b45e
 SHA512:
-  metadata.gz: 051bedfc7a01849ba35887d8d072df544b5a3805911d4ecd520eb7d5d6ed28f44905cace01715ec0e24d92a32435986733d6f007d7adafe6068262211d998b61
-  data.tar.gz: 0b615426e6ba6d7283148a761df4b00fdfdc9038ad041026814afd4c7918fd09d3d0bdb464e60345f7a5d2b9391b1b7bb83464102bb8cf5590978467e6ba0d9e
+  metadata.gz: f996e75582e56862e5fb12e866f3859fe40ce5b21d548bc158aaca3c79a5313032a84e8e11b1935e3113a716d35cdaf3e74c3155ade90f24677207969bedd095
+  data.tar.gz: 26a42abf97b4c94ae195a36dad613414e978b0e1830b7e3497321be0b829862e0bb0b4ad3a7e3680bbaca7d456d828de4257ac367af45593af2000dbf26588b1

data/lib/leml/core.rb

@@ -67,10 +67,11 @@ module Leml
       raise NoLemlKeyError if @key.blank?
       @encryptor = ActiveSupport::MessageEncryptor.new(@key, cipher: 'aes-256-cbc')
       @secrets = YAML.load_file(SECRETS)
+      @previous_key_hash = {}
     end
 
     def merge_secrets
-      return unless @key.present? && File.exists?(SECRETS)
+      return unless @key.present? && File.exist?(SECRETS)
       Rails.application.secrets.merge!(decrypt(@secrets)[Rails.env].deep_symbolize_keys) if @secrets
     end
 
@@ -91,32 +92,36 @@ module Leml
 
     private
 
-    def encrypt(raw_secret_hash)
+    def encrypt(raw_secret_hash, key_prefix = '')
       raw_secret_hash.map do |key, value|
+        key_prefix = "#{key_prefix}_#{key}"
         [
           key,
-          value.kind_of?(Hash) ? encrypt(value) : encrypt_value(value)
+          value.kind_of?(Hash) ? encrypt(value, key_prefix) : encrypt_value(value, key_prefix)
         ]
       end.to_h
     end
 
-    def decrypt(secret_hash)
+    def decrypt(secret_hash, key_prefix = '')
       secret_hash.map do |key, value|
+        key_prefix = "#{key_prefix}_#{key}"
         [
           key,
-          value.kind_of?(Hash) ? decrypt(value) : decrypt_value(value)
+          value.kind_of?(Hash) ? decrypt(value, key_prefix) : decrypt_value(value, key_prefix)
         ]
       end.to_h
     end
 
-    def encrypt_value(value)
-      @encryptor.encrypt_and_sign(value)
+    def encrypt_value(value, key_hash)
+      @previous_key_hash.dig(key_hash, :raw) == value ? @previous_key_hash.dig(key_hash, :encrypted) : @encryptor.encrypt_and_sign(value)
     rescue ActiveSupport::MessageVerifier::InvalidSignature
       raise InvalidLemlKey
     end
 
-    def decrypt_value(value)
-      @encryptor.decrypt_and_verify(value)
+    def decrypt_value(value, key_hash)
+      raw_value = @encryptor.decrypt_and_verify(value)
+      @previous_key_hash[key_hash] = {raw: raw_value, encrypted: value}
+      raw_value
     rescue ActiveSupport::MessageVerifier::InvalidSignature
       raise InvalidLemlKey
     end
@@ -129,8 +134,8 @@ module Leml
 
     def create_decrypted_tmp_file(dir)
       file = File.join(dir, 'tmp_leml.yml')
-      File.open(file, 'w') do |file|
-        file.puts(decrypt(@secrets).to_yaml) if @secrets
+      File.open(file, 'w') do |fd|
+        fd.puts(decrypt(@secrets).to_yaml) if @secrets
       end
       file
     end

data/lib/leml/railtie.rb

@@ -2,10 +2,12 @@ require 'rails/railtie'
 
 module Leml
   class Railtie < Rails::Railtie
-    initializer 'leml.merge_secrets' do
-      config.before_initialize do
-        require 'leml/core'
-        Leml::Core.new.merge_secrets
+    unless ARGV.include? 'leml:init'
+      initializer 'leml.merge_secrets' do
+        config.before_initialize do
+          require 'leml/core'
+          Leml::Core.new.merge_secrets
+        end
       end
     end
 

data/lib/leml/version.rb

@@ -1,3 +1,3 @@
 module Leml
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leml
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - onunu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails