activerecord-cipherstash-pg-adapter 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 662a206227829df410fe299405dd9b1fff2d62b879998fb8f29f59bcc88d8baa
-  data.tar.gz: 638a5f17b08d880a3ac7fd671905f6d3a42f95d0bdcd0bcd3564422435ae6b9b
+  metadata.gz: 2464ccf8853d5fac612feff56e44a80350e43f4ceb4ccb4d6831b856ce87842f
+  data.tar.gz: 858f184136267da3fd58b95d4b552a7114125fdcc0150091d5924ec49fbdc45b
 SHA512:
-  metadata.gz: 39fecf791d8bee80a099b108c84284c8bc8a1d748089256152eb35858df3b8d5150394bb19f5f13ea6c76b2d50c1dab033afd37d13ba4b4e54281c279c374d09
-  data.tar.gz: 8f34eeaa73a3f58c23ac15655d11f76e79073768ca096c0722dee1ca56ac64974e09d460739867a6d2982e2c8c1c5028ae44719330905145978d1b004220efb7
+  metadata.gz: 104094be27bbfd09eb84fe20bd7180791f761bbdef98c4cf25949090fde53b36cf417f354ca6edc495936bc9ef49b91e22bfb0068c5ba2f2d19a38bdfa7975f4
+  data.tar.gz: 718f13031ead2fe4b1a24067fab2707acfca52cebb8504f871c8ca2df184ae8f4c22bcd29828d3c2e992a4ffcf0b043257779514872ed276a08f5a9c6401b15c

data/CHANGELOG.md

@@ -6,6 +6,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [0.7.3] - 2023-05-11
+
+### Changed
+
+- Exit out of the migration rake task if the CipherStash adapter is not being used.
+- Bump version of cipherstash-pg to 1.0.0.beta.5.
+
+## [0.7.2] - 2023-05-02
+
+### Fixed
+
+- Fix more module names in ActiveRecord v6 adapter (`CipherstashPG` -> `CiphStashPG`).
+
 ## [0.7.1] - 2023-05-02
 
 ### Changed

data/activerecord-cipherstash-pg-adapter.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
 
   # Runtime dependencies here; dev+test go in Gemfile.
   spec.add_dependency "activerecord", ">= 6.0.0", "< 8.0.0"
-  spec.add_dependency "cipherstash-pg", ">= 1.0.0.beta.4"
+  spec.add_dependency "cipherstash-pg", ">= 1.0.0.beta.5"
 end

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

@@ -924,7 +924,7 @@ module ActiveRecord
 
           @type_map_for_results = ::CipherStashPG::TypeMapByOid.new
           @type_map_for_results.default_type_map = map
-          @type_map_for_results.add_coder(::CipherstashPG::TextDecoder::Bytea.new(oid: 17, name: "bytea"))
+          @type_map_for_results.add_coder(::CipherStashPG::TextDecoder::Bytea.new(oid: 17, name: "bytea"))
           @type_map_for_results.add_coder(MoneyDecoder.new(oid: 790, name: "money"))
 
           # extract timestamp decoder for use in update_typemap_for_default_timezone
@@ -937,7 +937,7 @@ module ActiveRecord
           coder_class.new(oid: row["oid"].to_i, name: row["typname"])
         end
 
-        class MoneyDecoder < ::CipherstashPG::SimpleDecoder # :nodoc:
+        class MoneyDecoder < ::CipherStashPG::SimpleDecoder # :nodoc:
           TYPE = OID::Money.new
 
           def decode(value, tuple = nil, field = nil)

data/lib/cipherstash_tasks.rake

@@ -4,6 +4,17 @@ 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|
+    logger = Logger.new(STDOUT)
+
+    config = ActiveRecord::Base.connection_db_config
+    adapter = config.configuration_hash[:adapter]
+
+    unless adapter == "postgres_cipherstash"
+      logger.warn "This application is using the '#{adapter}' database adapter\n\n"
+
+      abort "To use this rake task, please update the database adapter to 'postgres_cipherstash'\n\n\n\n"
+    end
+
     model_name = args[:model_name]
     batch_size = args[:batch_size] || 1000
 
@@ -13,10 +24,9 @@ namespace :cipherstash do
     model = Object.const_get(model_name) # raises NameError on failure
 
     unless model < ActiveRecord::Base
-      abort "Not an ActiveRecord model: #{model_name}" 
+      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)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecord
-  CIPHERSTASH_PG_ADAPTER_VERSION = "0.7.1"
+  CIPHERSTASH_PG_ADAPTER_VERSION = "0.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cipherstash-pg-adapter
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Robin Howard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: 1.0.0.beta.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: 1.0.0.beta.5
 description: CipherStash PostgreSQL adapter for ActiveRecord.
 email:
 - robin@cipherstash.com