active_record-pgcrypto 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdfae8c2a06a75d5c690b69ee646b664b72f136d857ef11983a53585f71c6072
-  data.tar.gz: 2bb21a130b23a38d76241096256e0f674da1aa6314c3a71ccc4d52df8a4f2927
+  metadata.gz: 68b93cced1e27c13c2bf95d0731a0f7998ce35b6d481c2b38235cd407697e601
+  data.tar.gz: b4e89c6612d5d67661fb4ef896c468c8ba46c2ab4e5ab7aed29c178fe7a65633
 SHA512:
-  metadata.gz: 6b53df98419e5a7d87edb67d3408a53285bfdf7d5dfeb2b07b1538631e72ee76e916940b0283f436b40df0a446e74724a4d5485636710f851931e7dcdc3b4409
-  data.tar.gz: d683c6fab000b48b466e31eaf5d8c20d1978aea0c43c1d3921ccaaa1c1799905c8f3061a4ab7fd956522143fcea1271c2a70e3a986906721ccfcf0abae7da866
+  metadata.gz: f135dffa6f20c0623f0fb7dd2804651f5d930eb75958b5a1b69e7ab520a12326aebe35ac2cfdb3a31f52d3057d8d91457402b75ccb548d91f9c8bccd0512049e
+  data.tar.gz: 9010ddbc616b30098531785d76e5429cf704755edaf49d0313becde5560dcd3e1ebebbea49725e0f372e1f65eac6e9a1f49f00a2117aaf6b658180445f6e2295

data/.github/main.workflow

@@ -1,8 +1,9 @@
 workflow "Docs/Tests" {
   on = "push"
   resolves = [
-    "Builds the Docker image",
-    "Runs the linters and tests"
+    "Runs the linters and tests (Rails 4)",
+    "Runs the linters and tests (Rails 5)",
+    "Runs the linters and tests (Rails 6)"
   ]
 }
 
@@ -11,8 +12,20 @@ action "Builds the Docker image" {
   args = "build -f Dockerfile -t active_record-pgcrypto/ci:$GITHUB_SHA ."
 }
 
-action "Runs the linters and tests" {
+action "Runs the linters and tests (Rails 4)" {
   uses = "actions/docker/cli@master"
   needs = ["Builds the Docker image"]
-  args = "run active_record-pgcrypto/ci:$GITHUB_SHA"
+  args = "run -e RAILS_VERSION='~> 4' active_record-pgcrypto/ci:$GITHUB_SHA"
+}
+
+action "Runs the linters and tests (Rails 5)" {
+  uses = "actions/docker/cli@master"
+  needs = ["Builds the Docker image"]
+  args = "run -e RAILS_VERSION='~> 5' active_record-pgcrypto/ci:$GITHUB_SHA"
+}
+
+action "Runs the linters and tests (Rails 6)" {
+  uses = "actions/docker/cli@master"
+  needs = ["Builds the Docker image"]
+  args = "run -e RAILS_VERSION='~> 6.0.0.rc1' active_record-pgcrypto/ci:$GITHUB_SHA"
 }

data/Dockerfile

@@ -14,4 +14,4 @@ ENV DATABASE_URL=postgresql://postgres@localhost/postgres?pool=5
 
 ENTRYPOINT []
 
-CMD ["sh", "-c", "(nohup /docker-entrypoint.sh postgres > /dev/null &) && sleep 3 && bundle exec rake"]
+CMD ["sh", "-c", "(nohup /docker-entrypoint.sh postgres > /dev/null &) && sleep 3 && bundle install && bundle exec rake"]

data/active_record-pgcrypto.gemspec

@@ -21,9 +21,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord', ENV['RAILS_VERSION']
 
+  pg_version = '< 1' if ENV['RAILS_VERSION'].to_s.split(' ').last.to_i == 4
+
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'ffaker'
-  spec.add_development_dependency 'pg'
+  spec.add_development_dependency 'pg', pg_version
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop-performance'

data/lib/active_record/pgcrypto.rb

@@ -1,5 +1,6 @@
-require 'active_record/pgcrypto/version'
+require 'active_support'
 require 'active_record/log_subscriber'
+require 'active_record/pgcrypto/version'
 require 'active_record/pgcrypto/symmetric_coder'
 require 'active_record/pgcrypto/log_subscriber'
 
@@ -10,7 +11,7 @@ module ActiveRecord
     #
     # @return [NilClass]
     def self.enable_log_subscriber!
-      ActiveRecord::LogSubscriber.prepend(ActiveRecord::PGCrypto::LogSubscriber)
+      ::ActiveRecord::LogSubscriber.prepend(LogSubscriber)
     end
   end
 end

data/lib/active_record/pgcrypto/symmetric_coder.rb

@@ -2,17 +2,15 @@ module ActiveRecord
   module PGCrypto
     # PGCrypto symmetric encryption/decryption coder for attribute serialization
     module SymmetricCoder
-      mattr_accessor :pgcrypto_key, default: ENV['PGCRYPTO_SYM_KEY']
-      mattr_accessor(
-        :pgcrypto_options,
-        default: (
-          ENV['PGCRYPTO_SYM_OPTIONS'] || 'cipher-algo=aes256, unicode-mode=1'
-        )
-      )
-      mattr_accessor(
-        :pgcrypto_encoding,
-        default: Encoding.find(ENV['PGCRYPTO_ENCODING'] || 'utf-8')
-      )
+      mattr_accessor :pgcrypto_key do
+        ENV['PGCRYPTO_SYM_KEY']
+      end
+      mattr_accessor :pgcrypto_options do
+        ENV['PGCRYPTO_SYM_OPTIONS'] || 'cipher-algo=aes256, unicode-mode=1'
+      end
+      mattr_accessor :pgcrypto_encoding do
+        Encoding.find(ENV['PGCRYPTO_ENCODING'] || 'utf-8')
+      end
 
       # Decrypts the requested value
       #
@@ -73,8 +71,13 @@ module ActiveRecord
       #
       # @return [String] the first returned value
       def self.arel_query(arel_nodes)
-        query = Arel::SelectManager.new(nil).project(arel_nodes).to_sql
+        sel_manager = Arel::SelectManager.new(nil)
+
+        if ::ActiveRecord::VERSION::MAJOR == 4
+          sel_manager = Arel::SelectManager.new(::ActiveRecord::Base)
+        end
 
+        query = sel_manager.project(arel_nodes).to_sql
         ::ActiveRecord::Base.connection.select_value(query)
       end
 

data/lib/active_record/pgcrypto/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module PGCrypto
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.2.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record-pgcrypto
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Stas SUȘCOV