attr_encrypted_pgcrypto 1.3.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 210d81f6746ac4a1f168f8d5230709cf21976ff4
-  data.tar.gz: 8f3c7225ef44347a5414381fb24ce82d552944b7
+  metadata.gz: 4aa881515a4fafd5699515cf843f1c3f925fdc91
+  data.tar.gz: f8c489b58ea6a9f7a80940f45908889d01dab5e6
 SHA512:
-  metadata.gz: 603aa245234796ac4e6d9c49ee53801efa90ff9f2b99b6717bb01d6053ee7311c995ffb8a5fd95177e018985595a4758cbaa3b9192eee53956faad38ebb779c0
-  data.tar.gz: fd93ea4d826e59313e7e00247ba876e5bb6fdac894f94ce26b2309497df7256b1ac6dd3a574d4f2298230dab2423e72b12dbc8c81b001d929299e83e1f7e15ff
+  metadata.gz: 383dedbc4b9285b92412e878a5553771c732ca990a20471e934a93da567ca912e5aec6764643d1fda49aa19a32ae30eaa6c2b82e904fe20180e37a861e7b5900
+  data.tar.gz: 59a51f1a8c11f455f40aa9dbeee6c440841f3d565dcaa2843a3c9f0e42149629f6c2e3e7e13f9838901b6bef7a925270619f061b907c6ea965a07659fad82fee

data/Gemfile.lock

@@ -1,58 +1,67 @@
 PATH
   remote: .
   specs:
-    attr_encrypted_pgcrypto (1.2.1)
+    attr_encrypted_pgcrypto (1.3.1)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
-      attr_encrypted (~> 1.2)
+      attr_encrypted (>= 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.16)
-      activesupport (= 3.2.16)
-      builder (~> 3.0.0)
-    activerecord (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.16)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
-    attr_encrypted (1.3.1)
-      encryptor (>= 1.3.0)
-    builder (3.0.4)
-    coderay (1.0.8)
-    diff-lcs (1.2.5)
-    encryptor (1.3.0)
-    i18n (0.6.9)
-    method_source (0.8.1)
-    multi_json (1.8.2)
-    pg (0.14.1)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
-    rake (10.1.1)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
-    slop (3.3.3)
-    tzinfo (0.3.38)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activesupport (6.0.3.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    attr_encrypted (3.1.0)
+      encryptor (~> 3.0.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.6)
+    diff-lcs (1.4.4)
+    encryptor (3.0.0)
+    i18n (1.8.3)
+      concurrent-ruby (~> 1.0)
+    method_source (1.0.0)
+    minitest (5.14.1)
+    pg (1.2.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    zeitwerk (2.3.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   attr_encrypted_pgcrypto!
-  pg (~> 0.14)
+  pg (~> 1.2.3)
   pry
   rake
-  rspec (~> 2.14)
+  rspec (~> 3.9.0)
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -74,10 +74,10 @@ Setup spec/database.yml and run `rake benchmark` to test the results on your own
 
 Tested against:
 
-- MRI Ruby 1.9.3
-- Rails 3.2.11
-- attr_encrypted 1.2.1
-- PostgreSQL 9.1
+- MRI Ruby 2.7
+- Rails 6
+- attr_encrypted 3.1.0
+- PostgreSQL 11.8
 
 ## Credits
 

data/app_container_name

@@ -0,0 +1 @@
+attr_encrypted_pgcrypto

data/attr_encrypted_pgcrypto.gemspec

@@ -17,12 +17,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency 'attr_encrypted',         '~> 1.2'
+  gem.add_runtime_dependency 'attr_encrypted',         '>= 1.2'
   gem.add_runtime_dependency 'activerecord',           '>= 3.0'
   gem.add_runtime_dependency 'activesupport',          '>= 3.0'
 
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec', '~> 2.14'
-  gem.add_development_dependency 'pg',    '~> 0.14'
+  gem.add_development_dependency 'rspec', '~> 3.9.0'
+  gem.add_development_dependency 'pg',    '~> 1.2.3'
 end

data/docker-compose.yml

@@ -0,0 +1,15 @@
+version: '2'
+services:
+    ruby:
+        build:
+            context: .
+            dockerfile: docker/Dockerfile
+        volumes:
+            - .:/app:rw
+        container_name: attr_encrypted_pgcrypto
+
+    postgres:
+        image: postgres:11.8
+        ports:
+            - 5432:5432
+        env_file: ./docker/database-config

data/docker/Dockerfile

@@ -0,0 +1,14 @@
+FROM ruby:2.7.1
+
+# Install Ubuntu Dependencies
+RUN apt-get update && apt-get install -y postgresql-client
+
+ENV BUNDLER_VERSION='2.1.4'
+RUN gem install bundler -v '2.1.4'
+
+COPY docker/startup /usr/local/bin/startup
+RUN chmod 755 /usr/local/bin/startup
+
+WORKDIR /app
+
+CMD "/usr/local/bin/startup"

data/docker/database-config

@@ -0,0 +1,2 @@
+POSTGRES_PASSWORD=docker
+POSTGRES_USER=docker

data/docker/startup

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cd /app
+bundle install
+
+tail -f /dev/null

data/lib/attr_encrypted_pgcrypto/log_subscriber/postgres_pgp.rb

@@ -1,31 +1,20 @@
 require 'active_record'
 require 'active_record/log_subscriber'
-require 'active_support/concern'
-require 'active_support/lazy_load_hooks'
 
 module AttrEncryptedPgcrypto
   module LogSubscriber
     module PostgresPgp
-      extend ActiveSupport::Concern
-
-      included do
-        alias_method_chain :sql, :postgres_pgp
-      end
-
-      # Public: Prevents sensitive data from being logged
-      def sql_with_postgres_pgp(event)
+      def sql(event)
         filter = /(pgp_sym_(encrypt|decrypt))\(((.|\n)*?)\)/i
 
         event.payload[:sql] = event.payload[:sql].gsub(filter) do |_|
           "#{$1}([FILTERED])"
         end
 
-        sql_without_postgres_pgp(event)
+        super
       end
     end
   end
 end
 
-ActiveSupport.on_load :attr_encrypted_pgcrypto_posgres_pgp_log do
-  ActiveRecord::LogSubscriber.send :include, AttrEncryptedPgcrypto::LogSubscriber::PostgresPgp
-end
+ActiveRecord::LogSubscriber.send(:prepend, AttrEncryptedPgcrypto::LogSubscriber::PostgresPgp)

data/lib/attr_encrypted_pgcrypto/version.rb

@@ -1,3 +1,3 @@
 module AttrEncryptedPgcrypto
-  VERSION = "1.3.1"
+  VERSION = "3.1.0"
 end

data/spec/default.database.yml

@@ -1,8 +1,9 @@
 postgres:
   adapter: postgresql
+  host: postgres
   encoding: utf8
   reconnect: false
-  database: attr_encrytped_pgcrypto
+  database: docker
   pool: 5
-  username: postgres
-  password:
+  username: docker
+  password: docker

data/spec/log_subscriber/postgres_pgp_spec.rb

@@ -15,8 +15,8 @@ module AttrEncryptedPgcrypto::LogSubscriber
     end
 
     it "filters pgp functions" do
-      expect(subject).to receive(:sql_without_postgres_pgp) do |event|
-        event.payload[:sql].should == output_query
+      expect(subject).to receive(:sql) do |event|
+        expect(event.payload[:sql]).to eq(output_query)
       end
 
       subject.sql(ActiveSupport::Notifications::Event.new(:sql, 1, 1, 1, { sql: output_query }))

data/spec/spec_helper.rb

@@ -11,7 +11,6 @@ Dir[SPEC_ROOT.join('support/*.rb')].each{|f| require f }
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
@@ -21,15 +20,6 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 
-  # When setting boolean tags/metadata, allow an array shorthand instead of hash
-  #
-  # Example
-  #
-  #     it "wants my attention", :focus do
-  #
-  # https://www.relishapp.com/rspec/rspec-core/docs/metadata/user-defined-metadata
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-
   # https://www.relishapp.com/rspec/rspec-core/docs/filtering/run-all-when-everything-filtered
   config.run_all_when_everything_filtered = true
 end

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: attr_encrypted_pgcrypto
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Gabe Martin-Dempesy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_encrypted
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   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: rake
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 1.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 1.2.3
 description: A pgcrypto based Encryptor implementation for attr_encrypted
 email:
 - gabe@mudbugmedia.com
@@ -115,15 +115,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- app_container_name
 - attr_encrypted_pgcrypto.gemspec
+- docker-compose.yml
+- docker/Dockerfile
+- docker/database-config
+- docker/startup
 - lib/attr_encrypted_pgcrypto.rb
 - lib/attr_encrypted_pgcrypto/encryptor.rb
 - lib/attr_encrypted_pgcrypto/log_subscriber/postgres_pgp.rb
@@ -142,17 +147,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A pgcrypto based Encryptor implementation for attr_encrypted
@@ -162,4 +167,3 @@ test_files:
 - spec/log_subscriber/postgres_pgp_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
-has_rdoc: