active_enquo 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d538e223b9e7485c4b08cf8ac38f2cc6a08f5d3c3b72426167606fdc7a5fdf5
-  data.tar.gz: 33e80addf4beb8bbe8f5328cbfd093cb70264ec2804d148026cbdabbd36cd1b8
+  metadata.gz: 49718410bbe14df7336b1fea307ee9657b3f30e9285a81402a97e783fd68f7b1
+  data.tar.gz: d4686e5fc488f9f5769ae412077e802249017c6f6b0de6639a5652c141392582
 SHA512:
-  metadata.gz: af6a5e20a215234ce3bce1656a7e02e94f536bf1a3c8d674732d7d49cd8ab5265fe4c306ea730cfe60bba707df5436cf9048d9ce8b85f021fc92639835a0424d
-  data.tar.gz: e9f6b9d0f5f5f5fb5b6fdecd8ba7fdcadf5b7be0c363787d78a2a989bb753b506d9d914122041614aad4cb3032803d6f5075ec02019a81457104471decd4fec7
+  metadata.gz: 65f06c88ba27143f51ed8c791f5e9e6948fa9a65a1bf7c53ec03131ea736a383569c3e9144cca5269dd6b27ce90132b3219fde1f547846145d5d291e72faffaf
+  data.tar.gz: 7b4d316abfb7a49268c1a063f60173307ab7175e2ee1ac3c49e45409ae3f8e2f8b854334455c2b3ae55625a312ef968aa648a452f9ab04b272d4572c6b8b7db0

data/active_enquo.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
 
 	s.required_ruby_version = ">= 2.7.0"
 
-	s.add_runtime_dependency "enquo-core", "~> 0.7"
+	s.add_runtime_dependency "enquo-core", "~> 0.8"
 	s.add_runtime_dependency "activerecord", ">= 6"
 
 	s.add_development_dependency "bundler"

data/lib/active_enquo.rb

@@ -125,8 +125,8 @@ module ActiveEnquo
 
 					t = self.attribute_types[attr_name.to_s]
 					if t.is_a?(::ActiveEnquo::Type)
-						relation = self.arel_table.name
-						field = ::ActiveEnquo.root.field(relation, attr_name)
+						relation = self.arel_table.name.to_s
+						field = ::ActiveEnquo.root.field(relation, attr_name.to_s)
 						if meta_id.nil?
 							t.encrypt(value, "", field, enable_reduced_security_operations: true)
 						else
@@ -140,8 +140,8 @@ module ActiveEnquo
 				def unenquo(attr_name, value, ctx)
 					t = self.attribute_types[attr_name.to_s]
 					if t.is_a?(::ActiveEnquo::Type)
-						relation = self.arel_table.name
-						field = ::ActiveEnquo.root.field(relation, attr_name)
+						relation = self.arel_table.name.to_s
+						field = ::ActiveEnquo.root.field(relation, attr_name.to_s)
 						begin
 							t.decrypt(value, ctx, field)
 						rescue Enquo::Error
@@ -270,7 +270,7 @@ module ActiveEnquo
 				if value.nil? || value.is_a?(::ActiveRecord::StatementCache::Substitute)
 					value
 				else
-					field.encrypt_boolean(value, context, safety: enable_reduced_security_operations ? :unsafe : true, no_query: no_query)
+					field.encrypt_boolean(value, context, unsafe: enable_reduced_security_operations, no_query: no_query)
 				end
 			end
 
@@ -288,7 +288,7 @@ module ActiveEnquo
 				if value.nil? || value.is_a?(::ActiveRecord::StatementCache::Substitute)
 					value
 				else
-					field.encrypt_i64(value, context, safety: enable_reduced_security_operations ? :unsafe : true, no_query: no_query)
+					field.encrypt_i64(value, context, unsafe: enable_reduced_security_operations, no_query: no_query)
 				end
 			end
 
@@ -307,7 +307,7 @@ module ActiveEnquo
 				if value.nil?
 					value
 				else
-					field.encrypt_date(value, context, safety: enable_reduced_security_operations ? :unsafe : true, no_query: no_query)
+					field.encrypt_date(value, context, unsafe: enable_reduced_security_operations, no_query: no_query)
 				end
 			end
 
@@ -343,7 +343,15 @@ module ActiveEnquo
 				if value.nil? || value.is_a?(::ActiveRecord::StatementCache::Substitute)
 					value
 				else
-					field.encrypt_text(value.respond_to?(:encode) ? value.encode("UTF-8") : value, context, safety: enable_reduced_security_operations ? :unsafe : true, no_query: no_query, order_prefix_length: enable_ordering ? 8 : nil)
+					opts = {
+						unsafe: enable_reduced_security_operations,
+						no_query: no_query,
+					}
+					if enable_ordering
+						opts[:order_prefix_length] = 8
+					end
+
+					field.encrypt_text(value.respond_to?(:encode) ? value.encode("UTF-8") : value, context, **opts)
 				end
 			end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_enquo
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enquo-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement