activerecord-cipherstash-pg-adapter 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6262922b580ca02288fe1dbf4a3b21bf985f6fb8c9fd5ac7e6703d20db749c81
-  data.tar.gz: be8c972a4fd10bfbb6a35aae3b8b1c9a02f23fd78d25ef29d0ca9d14d5881c0b
+  metadata.gz: d3f6569db99eeff40bdc38fbd51f393a68978550ba6a88e076abe88178a6460f
+  data.tar.gz: 4df3a9c690bfdab57c6f145976635bbf1f0115f26280a837096416e5a39cf715
 SHA512:
-  metadata.gz: 535dde7f708d635cfc0173a8e3330c6fbdeb14b2f574521b81604c759869c58386bd78390860a9b3d2229341b7bd70b3409198b6848ccf6a68b490737b8ccc7e
-  data.tar.gz: 95697d9ef5f7276138049648f329cec41761d59be3bf97f520b7d3e0947d5b30cdfb35c138db36956a0e65a461b7e59bfa8aa66455f433e6a68cfe265758ea76
+  metadata.gz: f3351800d72a4bb087cf4502c4238b93bdb80f1b18b16d309d5203ce15f7499cdb61a2de0f39049db55f1adc36639692ecb52f7c82f40ff76a318c10dbf366b3
+  data.tar.gz: d0d596f49a41c6438369981d65355332f8bbdc9df960b911aedd50244487a16b99e121b08f5b8c4b5524f739a9db6dfcd126f02c6fcae4c8949da3e6217fb676

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.5"
+  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.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Robin Howard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord