activerecord-cipherstash-pg-adapter 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69d44a3c595b29d45352dc10d9db85aa5b9ebf81fec8c661ab8232af34c1571f
-  data.tar.gz: ddfafb6aadc8acd590ec8eabcf0e1073de6a632fbb8a74df72052cbd4da23b4d
+  metadata.gz: 17eaea76f767bfda72f26bd7c9d89a4e8e0333dfc19be95a5390cbb8b0cbfc44
+  data.tar.gz: 379044af26990eb20e563e9aaa0bf727fcb5e70ac63ec89afa86e648d8882d3c
 SHA512:
-  metadata.gz: f349ce508471576f31638a39b37e3b46762c910cecd41f813422e7738386f5f86b6b3096a65799ac7541221866395ef885c7595d1422960546d25bb6e0145116
-  data.tar.gz: 70a747c73fef86e50ba4ca96e4ba088c1ca5c9b13b26819b7d56cb7dbecf3a9318388faf953a8e9a14f1b383e95e79dd24feac0dbd2589ce60d11cf541d3673f
+  metadata.gz: b25b5b4ef6ad537cb9ec045458553566b743b9739b3c0c863d41d28dc78316e9f557904c55d6145789bcf85b7bb15c9d42f5a81cb8b411471f4516274763e37d
+  data.tar.gz: be6d02946c7e8df400dc68d13bc614fd28a3787dea5b9317e8d4e86773097f2a22f7ced6dd5ca3b6fe58f8bfb8fdd041f64fbc0453bae3e9ad2bc89d87a2ffa2

data/README.md

@@ -10,6 +10,8 @@ Add this line to your application's Gemfile:
 gem 'activerecord-cipherstash-pg-adapter'
 ```
 
+Remove `gem 'pg'` from your Gemfile.
+
 In `database.yml`, use the following adapter setting:
 
 ```yaml

data/lib/active_record/connection_adapters/cipherstash_pg/cipherstash_tasks.rake

@@ -0,0 +1,34 @@
+require "active_record"
+require "logger"
+
+namespace :cipherstash do
+  desc "Re-saves a model to migrate it when its config is set to encrypted-duplicate."
+  task :migrate, [:model_name, :batch_size] => "db:load_config" do |_task, args|
+    model_name = args[:model_name]
+    batch_size = args[:batch_size] || 1000
+
+    if model_name.nil?
+      abort "Please provide a model name, eg. rake cipherstash:migrate[User]"
+    end
+    model = Object.const_get(model_name) # raises NameError on failure
+
+    unless model < ActiveRecord::Base
+      abort "Not an ActiveRecord model: #{model_name}" 
+    end
+
+    logger = Logger.new(STDOUT)
+    logger.info "Migrating #{model_name} in batches of #{batch_size}."
+
+    primary_keys = Array(model.primary_key)
+    model.find_each(:batch_size => batch_size) do |record|
+      id_info = primary_keys.map { |key| record.public_send(key) }.join(", ")
+      logger.info "Processing record with ID #{id_info} ..."
+
+      record.update_columns(
+        record.attributes.filter { |attr| !attr.starts_with?("__") }
+      )
+    end
+
+    logger.info "Done."
+  end
+end

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

@@ -1,3 +1,5 @@
+require 'logger'
+
 module ActiveRecord
   module ConnectionAdapters
     module CipherStashPG
@@ -23,7 +25,7 @@ module ActiveRecord
         end
 
         private_class_method def self.logger
-          @logger ||= Rails.logger
+          @logger ||= Logger.new(STDOUT)
         end
       end
     end

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

@@ -1,5 +1,4 @@
 require "active_record/base"
-
 require "active_record/tasks/postgresql_database_tasks"
 
 module ActiveRecord
@@ -12,4 +11,7 @@ module ActiveRecord
   end
 end
 
-ActiveRecord::Tasks::DatabaseTasks.register_task(/cipherstash_pg/, ActiveRecord::ConnectionAdapters::CipherStashPG::DatabaseTasks)
+ActiveRecord::Tasks::DatabaseTasks.register_task(
+  /postgres_cipherstash/,
+  ActiveRecord::ConnectionAdapters::CipherStashPG::DatabaseTasks
+)

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

@@ -1,33 +1,27 @@
 require "active_support"
 require "active_record"
 
-if defined?(ActiveSupport.on_load)
-  ActiveSupport.on_load(:active_record) do
-    require "active_record/connection_adapters/cipherstash_pg/database_extensions"
+require "active_record/connection_adapters/cipherstash_pg/database_extensions"
+require "active_record/connection_adapters/cipherstash_pg/database_tasks"
 
-    # rubocop:disable Lint/ConstantDefinitionInBlock
-    module ActiveRecord
-      module ConnectionAdapters
-        module CipherStashPG
-          class Railtie < ::Rails::Railtie
-            rake_tasks do
-              load "active_record/connection_adapters/cipherstash_pg/database_tasks.rb"
-            end
-          end
+module ActiveRecord
+  module ConnectionAdapters
+    module CipherStashPG
+      class Railtie < ::Rails::Railtie
+        rake_tasks do
+          load "active_record/connection_adapters/cipherstash_pg/cipherstash_tasks.rake"
+        end
+      end
 
-          # Method to install CipherStash custom ORE types
-          def self.install
-            CipherStashPG::DatabaseExtensions.install
-          end
+      # Method to install CipherStash custom ORE types
+      def self.install
+        CipherStashPG::DatabaseExtensions.install
+      end
 
-          # Method to uninstall CipherStash custom ORE types
-          def self.uninstall
-            CipherStashPG::DatabaseExtensions.uninstall
-          end
-        end
+      # Method to uninstall CipherStash custom ORE types
+      def self.uninstall
+        CipherStashPG::DatabaseExtensions.uninstall
       end
     end
-    # rubocop:enable Lint/ConstantDefinitionInBlock
-
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecord
-  CIPHERSTASH_PG_ADAPTER_VERSION = "0.1.0"
+  CIPHERSTASH_PG_ADAPTER_VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cipherstash-pg-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Robin Howard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -53,6 +53,7 @@ files:
 - README.md
 - Rakefile
 - activerecord-cipherstash-pg-adapter.gemspec
+- lib/active_record/connection_adapters/cipherstash_pg/cipherstash_tasks.rake
 - lib/active_record/connection_adapters/cipherstash_pg/column.rb
 - lib/active_record/connection_adapters/cipherstash_pg/database_extensions.rb
 - lib/active_record/connection_adapters/cipherstash_pg/database_statements.rb