activerecord-cipherstash-pg-adapter 0.7.4 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3143ffac51d8f2da78746d887737441c5e1364e0bf8a5104f8edf56d09bc41af
-  data.tar.gz: 126f55dd18ef7350432acbf5110878ff6caa123f3b7b4a0f1fba84562ce47c16
+  metadata.gz: d3f6569db99eeff40bdc38fbd51f393a68978550ba6a88e076abe88178a6460f
+  data.tar.gz: 4df3a9c690bfdab57c6f145976635bbf1f0115f26280a837096416e5a39cf715
 SHA512:
-  metadata.gz: f059e01b4e65b1d327779bb2cef342a48ab1d342c20c3f15511bd5ba497ccba1fdbf2852e89152a6c7d7653e4a5d2637a3f1c8b704694405dcd07c4c35c55375
-  data.tar.gz: ae96560bba84b8ab7c90d111eaa4a6888a749deb2f1502576dc5757268e3d405ddc3194fe1a5ff2c933cb679933255825ac49d69334c6e1c757e5c7dd6e666f8
+  metadata.gz: f3351800d72a4bb087cf4502c4238b93bdb80f1b18b16d309d5203ce15f7499cdb61a2de0f39049db55f1adc36639692ecb52f7c82f40ff76a318c10dbf366b3
+  data.tar.gz: d0d596f49a41c6438369981d65355332f8bbdc9df960b911aedd50244487a16b99e121b08f5b8c4b5524f739a9db6dfcd126f02c6fcae4c8949da3e6217fb676

data/CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [0.7.5] - 2023-05-22
+
+### Changed
+
+- Bump version of cipherstash-pg to 1.0.0.beta.7.
+
 ## [0.7.4] - 2023-05-17
 
 ### 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.6"
+  spec.add_dependency "cipherstash-pg", ">= 1.0.0.beta.7"
 end

data/lib/active_record/connection_adapters/6.1/cipherstash_pg/oid/point.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module ActiveRecord
-  Point = Struct.new(:x, :y)
-
   module ConnectionAdapters
     module CipherStashPG
+      Point = Struct.new(:x, :y)
+
       module OID # :nodoc:
         class Point < Type::Value # :nodoc:
           include ActiveModel::Type::Helpers::Mutable
@@ -31,10 +31,9 @@ module ActiveRecord
           end
 
           def serialize(value)
-            case value
-            when ActiveRecord::Point
+            if quacks_like_a_point?(value)
               "(#{number_for_point(value.x)},#{number_for_point(value.y)})"
-            when ::Array
+            elsif ::Array == value
               serialize(build_point(*value))
             else
               super
@@ -42,7 +41,7 @@ module ActiveRecord
           end
 
           def type_cast_for_schema(value)
-            if ActiveRecord::Point === value
+            if quacks_like_a_point?(value)
               [value.x, value.y]
             else
               super
@@ -55,7 +54,11 @@ module ActiveRecord
             end
 
             def build_point(x, y)
-              ActiveRecord::Point.new(Float(x), Float(y))
+              CipherStashPG::Point.new(Float(x), Float(y))
+            end
+
+            def quacks_like_a_point?(value)
+              value.respond_to(:x) && value.respond_to(:y)
             end
         end
       end

data/lib/active_record/connection_adapters/7.0/cipherstash_pg/oid/point.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
 module ActiveRecord
-  Point = Struct.new(:x, :y)
-
   module ConnectionAdapters
     module CipherStashPG
+      Point = Struct.new(:x, :y)
       module OID # :nodoc:
         class Point < Type::Value # :nodoc:
           include ActiveModel::Type::Helpers::Mutable
@@ -31,10 +30,9 @@ module ActiveRecord
           end
 
           def serialize(value)
-            case value
-            when ActiveRecord::Point
+            if quacks_like_a_point(value)
               "(#{number_for_point(value.x)},#{number_for_point(value.y)})"
-            when ::Array
+            elsif ::Array === value
               serialize(build_point(*value))
             else
               super
@@ -42,7 +40,7 @@ module ActiveRecord
           end
 
           def type_cast_for_schema(value)
-            if ActiveRecord::Point === value
+            if quacks_like_a_point?(value)
               [value.x, value.y]
             else
               super
@@ -55,7 +53,11 @@ module ActiveRecord
             end
 
             def build_point(x, y)
-              ActiveRecord::Point.new(Float(x), Float(y))
+              CipherStashPG::Point.new(Float(x), Float(y))
+            end
+
+            def quacks_like_a_point?(value)
+              value.respond_to(:x) && value.respond_to(:y)
             end
         end
       end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecord
-  CIPHERSTASH_PG_ADAPTER_VERSION = "0.7.4"
+  CIPHERSTASH_PG_ADAPTER_VERSION = "0.7.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cipherstash-pg-adapter
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.6
 platform: ruby
 authors:
 - Robin Howard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-05-24 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.6
+        version: 1.0.0.beta.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.6
+        version: 1.0.0.beta.7
 description: CipherStash PostgreSQL adapter for ActiveRecord.
 email:
 - robin@cipherstash.com