active_enquo 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b740bd6f520103011cd211cfa06784c088de442c675b39a6730a3bd03b45b6fe
-  data.tar.gz: 3511374723b0718079b71dd0f2641c5306de18cf3d1108714dcf43776ab56d4f
+  metadata.gz: 9c0103ba2927e84bdc1c6fda73e7103ffe090316fac200d7d429a95e4f4632f0
+  data.tar.gz: 11d5f5d66a753fe18f79f198c7b243d9fa3b194929c6e2e63c6f4a93ce25ed06
 SHA512:
-  metadata.gz: aade149dd6f25589426c2b5f7a642ce1d86d52a30ac68479a5a704886a8bb9a642cb90fa37d9639fcde0e296fc5eec22d4696ee1d221d4215c61644dc431d385
-  data.tar.gz: efecd652bfea10fd4cd0563c1c4dfacddccb3cd6c0d5aa45d6578cbecf3229a5b33ea14fa2000f5021fd69d82ebe19b2fb3d1ddeff3d05845154c0c3a8a6e4f3
+  metadata.gz: 693f14e986cca46c810505664833cd4e211c170cd287d43fbbb429ba7a5ef0e830404d71597a314e97cdde4fe911edf14066f9af446510ce82c05b3e73507c6d
+  data.tar.gz: afba7f08679b1b45f6484f9a3bf1b870fc2a824edec9b8b33483f40b7661c940f55d8135992885011d25a4c57d6c02ecb5f069ebde0bed0d59daec85d6ad301d

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.3"
+	s.add_runtime_dependency "enquo-core", "~> 0.6"
 	s.add_runtime_dependency "activerecord", ">= 6"
 
 	s.add_development_dependency "bundler"

data/lib/active_enquo.rb

@@ -1,7 +1,9 @@
 require "active_record/connection_adapters/postgresql_adapter"
 require "active_support/lazy_load_hooks"
 
+require "date"
 require "enquo"
+require "time"
 
 module ActiveEnquo
 	def self.root_key=(k)
@@ -85,6 +87,8 @@ module ActiveEnquo
 		module ConnectionAdapter
 			def initialize_type_map(m = type_map)
 				m.register_type "enquo_bigint", ActiveEnquo::Type::Bigint.new
+				m.register_type "enquo_date", ActiveEnquo::Type::Date.new
+				m.register_type "enquo_text", ActiveEnquo::Type::Text.new
 
 				super
 			end
@@ -105,6 +109,47 @@ module ActiveEnquo
 				field.decrypt_i64(value, context)
 			end
 		end
+
+		class Date < Type
+			def type
+				:enquo_date
+			end
+
+			def encrypt(value, context, field, safety: true, no_query: false)
+				value = cast_to_date(value)
+				field.encrypt_date(value, context, safety: safety, no_query: no_query)
+			end
+
+			def decrypt(value, context, field)
+				field.decrypt_date(value, context)
+			end
+
+			private
+
+			def cast_to_date(value)
+				if Date === value
+					value
+				elsif value.respond_to?(:to_date)
+					value.to_date
+				else
+					Time.parse(value.to_s).to_date
+				end
+			end
+		end
+
+		class Text < Type
+			def type
+				:enquo_text
+			end
+
+			def encrypt(value, context, field, safety: true, no_query: false)
+				field.encrypt_text(value, context, safety: safety, no_query: no_query)
+			end
+
+			def decrypt(value, context, field)
+				field.decrypt_text(value, context)
+			end
+		end
 	end
 end
 
@@ -116,5 +161,7 @@ ActiveSupport.on_load(:active_record) do
 
 	unless ActiveRecord::VERSION::MAJOR == 7
 		::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:enquo_bigint] = {}
+		::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:enquo_date] = {}
+		::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:enquo_text] = {}
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_enquo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-10-07 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.3'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement