activerecord-cipherstash-pg-adapter 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a76ecda67534aee78fe658b78c5ba3f7834f59c229b7391d75fd736d7aa4e23
-  data.tar.gz: 13284339b37ab578d8ce181a9c291bb4826f556caedbac55f9cc2b9cb1fb3084
+  metadata.gz: 3b22c3a2c87a993eaf0833dd013954e25925e6675cec8ff40798ad4ee932db0e
+  data.tar.gz: fc7ed2b4e78b808d1e0618a4d2db0897dd053ff022115037f46035bbd2afa8e4
 SHA512:
-  metadata.gz: 9644a5705b513fa4356f193995fc5b462acac8d66fba7c02031a51e3a0ad2e864865d84f561ea70ec0582129815a38920b3e557c1a29753597c86f0346c6d5df
-  data.tar.gz: cc240e5e9b255e4075cfc9ea13c40cf9b5715b8cd1b4a82f4dff8b98ae9112999413afaff9a10984947a2629d334868d95888e36b5ff3ea29fb82d5f29344ee4
+  metadata.gz: 077cb9e80c55e8ec7f8677e273cdab265ac32eae95270cdbed7f6805591f793bb7482d51b288029dc8365b5f52d58405f7c69606464351ef3d014e582bbd6c18
+  data.tar.gz: c4da8c6e9f12e0fa96c4a5c32a78bdc3f3028d27e189062971c5db4e0730bbe823690cd4ed80f332c5f335bd5294003e43d4e054f29ba38d5d3ce4db2dc147e6

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## [Unreleased]
 
+## [0.6.1] - 2023-04-26
+
+### Fixed
+
+- Removed Rails as a hard dependency
+
+## [0.6.0] - 2023-04-20
+
+### Changed
+
+- Updated the adapter name constant to be the same as the ActiveRecord PostgreSQL adapter.
+
+### Fixed
+
+- Logic around Rails credentials taking precedence over local env vars.
+
 ## [0.5.0] - 2023-04-19
 
 ### Added

data/lib/active_record/connection_adapters/6.1/postgres_cipherstash_adapter.rb

@@ -53,7 +53,7 @@ module ActiveRecord
 
   module ConnectionAdapters
     class CipherStashPGAdapter < AbstractAdapter
-      ADAPTER_NAME = "CipherStash PostgreSQL"
+      ADAPTER_NAME = "PostgreSQL"
 
       class << self
         def new_client(conn_params)

data/lib/active_record/connection_adapters/7.0/postgres_cipherstash_adapter.rb

@@ -54,7 +54,7 @@ module ActiveRecord
 
   module ConnectionAdapters
     class CipherStashPGAdapter < AbstractAdapter
-      ADAPTER_NAME = "CipherStash PostgreSQL"
+      ADAPTER_NAME = "PostgreSQL"
 
       class << self
         def new_client(conn_params)

data/lib/active_record/connection_adapters/cipherstash_pg/railtie.rb

@@ -0,0 +1,40 @@
+require 'rails'
+
+module ActiveRecord
+  module ConnectionAdapters
+    module CipherStashPG
+      class Railtie < ::Rails::Railtie
+        rake_tasks do
+          load "cipherstash_tasks.rake"
+        end
+
+        initializer "postgres_cipherstash_adapter.configure" do
+          if defined?(Rails.application.credentials)
+            cs_credentials = Rails.application.credentials.try(:cipherstash)
+
+            client_id = cs_credentials&.fetch(:client_id, nil)
+            client_key = cs_credentials&.fetch(:client_key, nil)
+            workspace_id = cs_credentials&.fetch(:workspace_id, nil)
+            client_access_key = cs_credentials&.fetch(:client_access_key, nil)
+
+            unless client_id.nil?
+              ENV["CS_CLIENT_ID"] = client_id
+            end
+
+            unless client_key.nil?
+              ENV["CS_CLIENT_KEY"] = client_key
+            end
+
+            unless workspace_id.nil?
+              ENV["CS_WORKSPACE_ID"] = workspace_id
+            end
+
+            unless client_access_key.nil?
+              ENV["CS_CLIENT_ACCESS_KEY"] = client_access_key
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/postgres_cipherstash_adapter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 #
 # Why the funky filename
-# (lib/active_record/connection_adapters/cipherstash_pg_adapter.rb)
+# (lib/active_record/connection_adapters/postgres_cipherstash_adapter.rb)
 # that doesn't match the gem structure? It's to hook into Rails.
 #
 # See this chunk from:
@@ -31,13 +31,12 @@
 
 require "cipherstash-pg"
 
-case Rails::VERSION::MAJOR
+case ActiveRecord::VERSION::MAJOR
 when 7
   require "active_record/connection_adapters/7.0/postgres_cipherstash_adapter"
 when 6
   require "active_record/connection_adapters/6.1/postgres_cipherstash_adapter"
 else
-  STDERR.puts "CipherStash only supports Rails versions 6.x and 7.x"
+  STDERR.puts "CipherStash only supports ActiveRecord versions 6.x and 7.x"
   exit 1
 end
-

data/lib/activerecord-cipherstash-pg-adapter.rb

@@ -3,26 +3,11 @@ require "active_record"
 
 require "active_record/connection_adapters/cipherstash_pg/database_extensions"
 require "active_record/connection_adapters/cipherstash_pg/database_tasks"
+require "active_record/connection_adapters/cipherstash_pg/railtie" if defined?(Rails::Railtie)
 
 module ActiveRecord
   module ConnectionAdapters
     module CipherStashPG
-      class Railtie < ::Rails::Railtie
-        rake_tasks do
-          load "cipherstash_tasks.rake"
-        end
-
-        initializer "postgres_cipherstash_adapter.configure" do
-          if defined?(Rails.application.credentials)
-            cs_credentials = Rails.application.credentials.try(:cipherstash)
-            ENV["CS_CLIENT_ID"] = cs_credentials&.fetch(:client_id, nil)
-            ENV["CS_CLIENT_KEY"] = cs_credentials&.fetch(:client_key, nil)
-            ENV["CS_WORKSPACE_ID"] = cs_credentials&.fetch(:workspace_id, nil)
-            ENV["CS_CLIENT_ACCESS_KEY"] = cs_credentials&.fetch(:client_access_key, nil)
-          end
-        end
-      end
-
       # Method to install CipherStash custom ORE types
       def self.install
         CipherStashPG::DatabaseExtensions.install

data/lib/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecord
-  CIPHERSTASH_PG_ADAPTER_VERSION = "0.5.0"
+  CIPHERSTASH_PG_ADAPTER_VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cipherstash-pg-adapter
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Robin Howard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2023-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -138,6 +138,7 @@ files:
 - lib/active_record/connection_adapters/cipherstash_column_mapper.rb
 - lib/active_record/connection_adapters/cipherstash_pg/database_extensions.rb
 - lib/active_record/connection_adapters/cipherstash_pg/database_tasks.rb
+- lib/active_record/connection_adapters/cipherstash_pg/railtie.rb
 - lib/active_record/connection_adapters/postgres_cipherstash_adapter.rb
 - lib/activerecord-cipherstash-pg-adapter.rb
 - lib/cipherstash_tasks.rake