activerecord-cipherstash-pg-adapter 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f49b439e9bfe2874fc67bf0f4064ba66a3659a9e67b207e156ddb2b3cf8c5bb2
-  data.tar.gz: 02347f9e3efe1f15da8dd6c11e8745c424d7dd9f65b493640ea57f41370dd7b3
+  metadata.gz: 3b22c3a2c87a993eaf0833dd013954e25925e6675cec8ff40798ad4ee932db0e
+  data.tar.gz: fc7ed2b4e78b808d1e0618a4d2db0897dd053ff022115037f46035bbd2afa8e4
 SHA512:
-  metadata.gz: 703fb309bb186e2350856b0f5fabae1e373685e13552afb53cfb04fb2630866f271cbbf2efebe305e9a06bc5f62dbc3808379d2037286e4af42a9052bae8185a
-  data.tar.gz: 5885728f591239c6f6893dbd9f2b19bb75976bd01237fedb24a9fcf42804ce78315b5da1831af0cf35961ea6210c072fc28c520bfbc703157cd163dc369a9c60
+  metadata.gz: 077cb9e80c55e8ec7f8677e273cdab265ac32eae95270cdbed7f6805591f793bb7482d51b288029dc8365b5f52d58405f7c69606464351ef3d014e582bbd6c18
+  data.tar.gz: c4da8c6e9f12e0fa96c4a5c32a78bdc3f3028d27e189062971c5db4e0730bbe823690cd4ed80f332c5f335bd5294003e43d4e054f29ba38d5d3ce4db2dc147e6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.6.1] - 2023-04-26
+
+### Fixed
+
+- Removed Rails as a hard dependency
+
 ## [0.6.0] - 2023-04-20
 
 ### Changed

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

@@ -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,43 +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)
-
-            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
-
       # 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.6.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.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Robin Howard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-20 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