attr_keyring 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89af9cded4db3be4acd36e986f936b489bce666f5c35f458206c2816f0b1e28a
-  data.tar.gz: 0fbf99ba85dff08dde797e3f8f01d7c5c6492d7c253cc3b81dabcf3e87a51a3d
+  metadata.gz: 2fdee29d790a2b8e6f3dedbe485e3f01eafc6ff1c076e6845aac1b321f3b9e18
+  data.tar.gz: afc222122dd43e545173656e9c93f7a8f39e1fdf51d403ce857d3796cbedcc50
 SHA512:
-  metadata.gz: 0e6225927feb4f6bff64778f978516a9dbdf23f141fd0e2df478f039c12ec948c63f71e0103571ec811385289e02400da2c21fdb7264e7756a46e2bc387048d1
-  data.tar.gz: 1ef79f040ddb7f720b8cfbb7d8239aea7e6a1ea68f8fb637ae965baa0e7c421d942ffe6c3b5aa9b0fbf688615d42aabf43e047e1c12a681e0d27be14f6e07e79
+  metadata.gz: cf8a11057e8802e993ade45fea165daafd6d8d1c6a6719bef14c42391e9f6879b407fa4735c1f97374daa76b4942effc6264d4d431347938b7c6599bebd25cdd
+  data.tar.gz: 1c7b23f681512d0bca2ad00d1f4650dc0c84d7b048c5b129ddbd94fe972f42d076a0d22c9c2cdfdeefb573ece82f298a3c8e9e2567deb50481322ed1023355e7

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.lock

data/lib/attr_keyring/active_record.rb

@@ -17,11 +17,13 @@ module AttrKeyring
       target.prepend(
         Module.new do
           def reload(options = nil)
-            super
+            instance = super
 
             self.class.encrypted_attributes.each do |attribute|
               clear_decrypted_column_cache(attribute)
             end
+
+            instance
           end
         end
       )

data/lib/attr_keyring/version.rb

@@ -1,3 +1,3 @@
 module AttrKeyring
-  VERSION = "0.5.0".freeze
+  VERSION = "0.5.1".freeze
 end

data/lib/keyring/key.rb

@@ -5,26 +5,17 @@ module Keyring
     def initialize(id, key, key_size)
       @id = Integer(id)
       @key_size = key_size
-      @encryption_key, @signing_key = parse(key)
+      @encryption_key, @signing_key = parse_key(key)
     end
 
     def to_s
-      "#<AttrKeyring::Key id=#{id.inspect}>"
+      "#<Keyring::Key id=#{id.inspect}>"
     end
     alias_method :inspect, :to_s
 
-    private def parse(key)
+    private def parse_key(key)
       expected_key_size = @key_size * 2
-
-      secret = if key.bytesize == expected_key_size
-                 key
-               else
-                 begin
-                   Base64.strict_decode64(key)
-                 rescue ArgumentError
-                   Base64.decode64(key)
-                 end
-               end
+      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
 
@@ -33,5 +24,17 @@ module Keyring
 
       [encryption_key, signing_key]
     end
+
+    private def decode_key(key, key_size)
+      if key.bytesize == key_size
+        key
+      else
+        begin
+          Base64.strict_decode64(key)
+        rescue ArgumentError
+          Base64.decode64(key)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attr_keyring
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-24 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -176,7 +176,6 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -214,8 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Simple encryption-at-rest plugin for ActiveRecord.

data/Gemfile.lock

@@ -1,101 +0,0 @@
-PATH
-  remote: .
-  specs:
-    attr_keyring (0.5.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
-      arel (>= 9.0)
-    activesupport (5.2.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    ast (2.4.0)
-    attr_vault (2.1.1)
-      pg (>= 0.18)
-      sequel (>= 4.13, < 6.0)
-    awesome_print (1.8.0)
-    byebug (10.0.2)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.4)
-    docile (1.3.1)
-    i18n (1.2.0)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.1)
-    json (2.1.0)
-    metaclass (0.0.4)
-    method_source (0.9.2)
-    minitest (5.11.3)
-    minitest-utils (0.4.4)
-      minitest
-    mocha (1.7.0)
-      metaclass (~> 0.0.1)
-    parallel (1.12.1)
-    parser (2.5.3.0)
-      ast (~> 2.4.0)
-    pg (1.1.3)
-    powerpack (0.1.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    pry-meta (0.0.10)
-      awesome_print
-      pry
-      pry-byebug
-      pry-remote
-    pry-remote (0.1.8)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    rainbow (3.0.0)
-    rake (12.3.2)
-    rubocop (0.61.1)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    ruby-progressbar (1.10.0)
-    sequel (5.15.0)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    slop (3.6.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.4.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  attr_keyring!
-  attr_vault
-  bundler
-  minitest-utils
-  mocha
-  pg
-  pry-meta
-  rake
-  rubocop
-  sequel
-  simplecov
-
-BUNDLED WITH
-   1.17.1