diffcrypt 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9a07ad0aa1385421550a40093fe6e724337f7697e71f7af081a7011daa05a8c
-  data.tar.gz: 40406c43e1a8ef7396577e70d62e3bee026db6500563e56aadf113b95203069d
+  metadata.gz: edd41bfcd4f86767e1d8b98d4c161c38983962e273a6e5b486c0f6465f159d80
+  data.tar.gz: fecb2bda4f1f7cbd53fea2fd333f723bd3c1ac9e8c206930c6783795a6260d10
 SHA512:
-  metadata.gz: b3f03e909e4b49740dfd7e6e8e4bdab3a39decca30556149e4645f2071156b9632e3a54827f33fc6fcac7a419443eb066bf8fca249eca98219a9be5989ef3840
-  data.tar.gz: 001bf874603205e1421a0a99ac8d2c14e15b187495505adb1141f84108b0270d159f58c703c730fea6d69a974b1c8e32b2268437a93b590a9adf8d851f854a37
+  metadata.gz: 7fe1aedc3eec0f98370479a8a813e15a9458213e70d49345ae90234cead04e47b880a602af54ff8d43a1a6e4d54e7bef4a2955eb3f88fde68762bb08de16a555
+  data.tar.gz: 6a020043e24b13d22414de6f810bde69bb578adc0041d34e33c8f3d220d68903ed8b3726bc7302138fbdc00ebfe8c2e7a59bca4e776519a3d898fc4cd4d51845

data/.circleci/config.yml

@@ -0,0 +1,11 @@
+version: 2.1
+
+jobs:
+  build:
+    docker:
+      - image: circleci/ruby:2.6.6
+    steps:
+      - checkout
+      - run: bundle install
+      - run: bundle exec rake test
+      - run: bundle exec rubocop

data/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  rebase-strategy: auto
+  schedule:
+    interval: daily

data/.rubocop.yml

@@ -9,6 +9,8 @@ Style/Documentation:
 Metrics/MethodLength:
   Exclude:
     - test/**/*_test.rb
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: consistent_comma
 
 Layout/LineLength:
   Exclude:

data/README.md

@@ -45,7 +45,7 @@ config = YAML.safe_load(encryptor.decrypt(yaml))
 ### Rails
 
 Currently there is not native support for rails, but ActiveSupport can be monkeypatched to override
-the build in encrypter.
+the built in encrypter.
 
 ```ruby
 require 'diffcrypt/rails/encrypted_configuration'

data/lib/diffcrypt/encryptor.rb

@@ -24,7 +24,7 @@ module Diffcrypt
     # @param [String] contents The raw YAML string to be encrypted
     def decrypt(contents)
       yaml = YAML.safe_load contents
-      decrypted = decrypt_hash yaml
+      decrypted = decrypt_hash yaml['data']
       YAML.dump decrypted
     end
 
@@ -43,11 +43,24 @@ module Diffcrypt
 
     # @param [String] contents The raw YAML string to be encrypted
     # @param [String, nil] original_encrypted_contents The original (encrypted) content to determine which keys have changed
+    # @return [String]
     def encrypt(contents, original_encrypted_contents = nil)
+      data = encrypt_data contents, original_encrypted_contents
+      YAML.dump(
+        'client' => "diffcrypt-#{Diffcrypt::VERSION}",
+        'cipher' => CIPHER,
+        'checksum' => Digest::MD5.hexdigest(Marshal.dump(data)),
+        'data' => data,
+      )
+    end
+
+    # @param [String] contents The raw YAML string to be encrypted
+    # @param [String, nil] original_encrypted_contents The original (encrypted) content to determine which keys have changed
+    # @return [Hash] Encrypted hash containing the data
+    def encrypt_data(contents, original_encrypted_contents = nil)
       yaml = YAML.safe_load contents
-      original_yaml = original_encrypted_contents ? YAML.safe_load(original_encrypted_contents) : nil
-      encrypted = encrypt_values yaml, original_yaml
-      YAML.dump encrypted
+      original_yaml = original_encrypted_contents ? YAML.safe_load(original_encrypted_contents)['data'] : nil
+      encrypt_values yaml, original_yaml
     end
 
     # @param [String] value Plain text string that needs encrypting
@@ -66,7 +79,7 @@ module Diffcrypt
         data[key] = if value.is_a?(Hash) || value.is_a?(Array)
                       encrypt_values(value, original_encrypted_value)
                     else
-                      original_decrypted_value = original_data ? decrypt_string(original_encrypted_value) : nil
+                      original_decrypted_value = original_encrypted_value ? decrypt_string(original_encrypted_value) : nil
                       key_changed = original_decrypted_value.nil? || original_decrypted_value != value
                       key_changed ? encrypt_string(value) : original_encrypted_value
                     end

data/lib/diffcrypt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Diffcrypt
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffcrypt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Marc Qualie
@@ -32,9 +32,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.6
-before_install: gem install bundler -v 2.1.4