attr_keyring 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf52bc4c9faa76f061e0023bf8bf21cfe9de59a5ff1ce608392b388957be85db
-  data.tar.gz: 3b5e4145a2704b00b5784b49fd949172e66629499d0eccaaf5f237b8a1828b70
+  metadata.gz: b0a2294de1107eb98157861c1fd9dc4fca1d6c9aa7926838fd461a23965888c8
+  data.tar.gz: 62d4023dfc004823610c281ad5cdc1ac9bdc04d753152fc21b334f0fa99db170
 SHA512:
-  metadata.gz: bf408bfc13aa86d353d345c47a08a40d04113408f3a7d20c9a7ba0e6cc347c12b5adf533fe0c250764cc0df330b283a96ee2a6db4cacff7ce61b20c07614772d
-  data.tar.gz: 4a38d54dbf79ad34a9b9a54bbdbc655382e4ab128209ec4f73fbcb62df46b0040519a47c394dffabc4b567e5c852a89c91ee6bfe5d35c8ed4b10dfbe1943b270
+  metadata.gz: 9eb8b45d47089caf95ea24d4b3ac1783f0b7dfbda7f1d40f7c178ea03c17cf9a69e1c23df69c073e35b3d27aa0f9bb4c561dfd6f1ea2711f43311b75b7ee0629
+  data.tar.gz: 04bed2be91c97585d3cf64730feab4e8eabea97d52b89e562e1130cdd5676f04c2a85468b93762b4a5b061643475a6063a5c959ade817514be9deb42e0b22ef1

data/.rubocop.yml

@@ -1,73 +1,19 @@
+---
+inherit_gem:
+  rubocop-fnando: .rubocop.yml
+
 AllCops:
-  TargetRubyVersion: 2.5
-  Include:
-    - '**/*.gemspec'
-    - '**/*.podspec'
-    - '**/*.jbuilder'
-    - '**/*.rake'
-    - '**/*.opal'
-    - '**/config.ru'
-    - '**/Gemfile'
-    - '**/Rakefile'
-    - '**/Capfile'
-    - '**/Guardfile'
-    - '**/Podfile'
-    - '**/Thorfile'
-    - '**/Vagrantfile'
-    - '**/Berksfile'
-    - '**/Cheffile'
-    - '**/Vagabondfile'
+  TargetRubyVersion: 2.6
 
-Style/Documentation:
+Metrics/AbcSize:
   Enabled: false
 
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-Layout/SpaceInsideBlockBraces:
-  EnforcedStyle: space
-  EnforcedStyleForEmptyBraces: space
-  SpaceBeforeBlockParameters: false
-
-Layout/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-  EnforcedStyleForEmptyBraces: no_space
-
-Layout/FirstArrayElementLineBreak:
-  Enabled: true
-
-Layout/FirstHashElementLineBreak:
-  Enabled: true
-
-Style/SymbolArray:
-  Enabled: true
-
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%':  '[]'
-    '%i': '[]'
-    '%q': '[]'
-    '%Q': '[]'
-    '%r': '{}'
-    '%s': '[]'
-    '%w': '[]'
-    '%W': '[]'
-    '%x': '[]'
-
 Metrics/LineLength:
-  Enabled: false
+  Exclude:
+    - test/**/*
 
-Style/EmptyMethod:
-  EnforcedStyle: expanded
-
-Style/FrozenStringLiteralComment:
+Metrics/MethodLength:
   Enabled: false
 
-Style/AccessModifierDeclarations:
-  EnforcedStyle: inline
-
-Style/Alias:
-  EnforcedStyle: prefer_alias_method
-
-Style/TrailingUnderscoreVariable:
+Metrics/ClassLength:
   Enabled: false

data/.travis.yml

@@ -1,17 +1,25 @@
+---
+
 language: ruby
 cache: bundler
 sudo: false
 notifications:
   email: false
 rvm:
-- 2.5.3
+  - 2.6.5
+  - 2.5.7
+services:
+  - postgresql
+gemfiles:
+  - gemfiles/6_0.gemfile
+  - gemfiles/5_2.gemfile
 before_script:
-- createdb test
-- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-- chmod +x ./cc-test-reporter
-- "./cc-test-reporter before-build"
+  - createdb test
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - "./cc-test-reporter before-build"
 after_script:
-- "./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"
+  - "./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"
 env:
   global:
     secure: c0y7opFgX78UQL0dVq2gciMr3Ca4y4Aw4cSbQMnUwGecwuzOPUhjV98yy4b6EpQ0bLVbVcSPtx/PCVV750nxJPQsz9tWS0yGxQPBXuh2w0AX+ErYJVYaF6+hTjovEiHB86Q9g8YCD29CIMLZs2yeUrB+ORJWQcuAn8fw475Zskk8d8BWqR8CDdonFKlwS0Bx6rOqkyVy0JiNbOM4+trV/RzrNC+dc1geqOo45ceTYiGzkkMU1XANjNhzl/v0DYtCWLF/Dj1s8da96btqU6msZDfsBM73zKWtu0KJMnzqa8Ba4Tjc39kd2ro6Zb22cELBdXOFBvNCAEjbmZIaJ2OC45fES1OGZnB66SjAScdVdxKy2jOWjlFvrRiHu3Zrbl5tFTEaJ/PMHueQn4AzneK1wU2kzjq5iCwBZtMp/iJtCvz0V6qBt77qJe65YuENhcj26cDMqQkhKd0QBTWNs8r02KY3HFKcprgM+2TXxVSvfDu2cbiMInvc3K+uFNnEbu/1piTyStKWGd64WHixV6CEFpHxLU04IUNB62mSvUZtZ6V782X9kawoRyUg6lWvXmnGUUvczdJdpSR5/3gVXOWHireYy/qA6Zqoup27PPoaNgnKCa/fWvN/aJDvrGJb9OWpiK8DGi6T35V5gtDF+vd8mVzyPnYJznlWLgA5m7FSzLg=

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 

data/attr_keyring.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "./lib/attr_keyring/version"
 
 Gem::Specification.new do |spec|
@@ -12,9 +14,12 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added
+  # into git.
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`
+      .split("\x0")
+      .reject {|f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
@@ -29,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-meta"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-fnando"
   spec.add_development_dependency "sequel"
   spec.add_development_dependency "simplecov"
 end

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "attr_keyring"

data/examples/active_record_sample.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/inline"
 require "stringio"
 

data/examples/keyring_sample.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/inline"
 
 gemfile do

data/examples/sequel_sample.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/inline"
 require "stringio"
 

data/gemfiles/5_2.gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+gemspec path: ".."
+gem "activerecord", "~> 5.2.0"

data/gemfiles/6_0.gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+gemspec path: ".."
+gem "activerecord", "~> 6.0.0"

data/lib/attr_keyring.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AttrKeyring
   require "attr_keyring/version"
   require "keyring"
@@ -73,33 +75,48 @@ module AttrKeyring
       value = value.to_s
 
       previous_keyring_id = public_send(self.class.keyring_column_name)
-      encrypted_value, keyring_id, digest = self.class.keyring.encrypt(value, previous_keyring_id)
+      encrypted_value, keyring_id, digest =
+        self.class.keyring.encrypt(value, previous_keyring_id)
 
       public_send("#{self.class.keyring_column_name}=", keyring_id)
       public_send("encrypted_#{attribute}=", encrypted_value)
-      public_send("#{attribute}_digest=", digest) if respond_to?("#{attribute}_digest=")
+
+      return unless respond_to?("#{attribute}_digest=")
+
+      public_send("#{attribute}_digest=", digest)
     end
 
     private def attr_decrypt_column(attribute)
       cache_name = :"@#{attribute}"
-      return instance_variable_get(cache_name) if instance_variable_defined?(cache_name)
+      if instance_variable_defined?(cache_name)
+        return instance_variable_get(cache_name)
+      end
 
       encrypted_value = public_send("encrypted_#{attribute}")
+
       return unless encrypted_value
 
-      decrypted_value = self.class.keyring.decrypt(encrypted_value, public_send(self.class.keyring_column_name))
+      decrypted_value = self.class.keyring.decrypt(
+        encrypted_value,
+        public_send(self.class.keyring_column_name)
+      )
 
       instance_variable_set(cache_name, decrypted_value)
     end
 
     private def clear_decrypted_column_cache(attribute)
       cache_name = :"@#{attribute}"
-      remove_instance_variable(cache_name) if instance_variable_defined?(cache_name)
+
+      return unless instance_variable_defined?(cache_name)
+
+      remove_instance_variable(cache_name)
     end
 
     private def reset_encrypted_column(attribute)
       public_send("encrypted_#{attribute}=", nil)
-      public_send("#{attribute}_digest=", nil) if respond_to?("#{attribute}_digest=")
+      if respond_to?("#{attribute}_digest=")
+        public_send("#{attribute}_digest=", nil)
+      end
       nil
     end
 
@@ -113,7 +130,9 @@ module AttrKeyring
         encrypted_value, _, digest = self.class.keyring.encrypt(value)
 
         public_send("encrypted_#{attribute}=", encrypted_value)
-        public_send("#{attribute}_digest=", digest) if respond_to?("#{attribute}_digest")
+        if respond_to?("#{attribute}_digest")
+          public_send("#{attribute}_digest=", digest)
+        end
       end
 
       public_send("#{self.class.keyring_column_name}=", keyring_id)

data/lib/attr_keyring/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record"
 
 module AttrKeyring

data/lib/attr_keyring/sequel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "sequel"
 
 module AttrKeyring

data/lib/attr_keyring/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AttrKeyring
-  VERSION = "0.5.2".freeze
+  VERSION = "0.5.3"
 end

data/lib/keyring.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Keyring
   require "openssl"
   require "base64"

data/lib/keyring/encryptor/aes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Keyring
   module Encryptor
     module AES
@@ -35,7 +37,9 @@ module Keyring
 
           expected_hmac = hmac_digest(key.signing_key, encrypted_payload)
 
-          raise InvalidAuthentication, "Expected HMAC to be #{Base64.strict_encode64(expected_hmac)}; got #{Base64.strict_encode64(hmac)} instead" unless verify_signature(expected_hmac, hmac)
+          unless verify_signature(expected_hmac, hmac)
+            raise InvalidAuthentication, "Expected HMAC to be #{Base64.strict_encode64(expected_hmac)}; got #{Base64.strict_encode64(hmac)} instead" # rubocop:disable Metrics/LineLength
+          end
 
           cipher.iv = iv
           cipher.key = key.encryption_key

data/lib/keyring/key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Keyring
   class Key
     attr_reader :id, :signing_key, :encryption_key
@@ -11,13 +13,15 @@ module Keyring
     def to_s
       "#<Keyring::Key id=#{id.inspect}>"
     end
-    alias_method :inspect, :to_s
+    alias inspect to_s
 
     private def parse_key(key)
       expected_key_size = @key_size * 2
       secret = decode_key(key, expected_key_size)
 
-      raise InvalidSecret, "Secret must be #{expected_key_size} bytes, instead got #{secret.bytesize}" unless secret.bytesize == expected_key_size
+      unless secret.bytesize == expected_key_size
+        raise InvalidSecret, "Secret must be #{expected_key_size} bytes, instead got #{secret.bytesize}" # rubocop:disable Metrics/LineLength
+      end
 
       signing_key = secret[0...@key_size]
       encryption_key = secret[@key_size..-1]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attr_keyring
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-20 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-fnando
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +201,8 @@ files:
 - examples/active_record_sample.rb
 - examples/keyring_sample.rb
 - examples/sequel_sample.rb
+- gemfiles/5_2.gemfile
+- gemfiles/6_0.gemfile
 - lib/attr_keyring.rb
 - lib/attr_keyring/active_record.rb
 - lib/attr_keyring/sequel.rb