From f386a82a60dc9d975fe73a51d3da0ab6b6549e5e Mon Sep 17 00:00:00 2001
From: Joel Azemar <joel.azemar@gmail.com>
Date: Thu, 7 Dec 2023 09:29:50 +0100
Subject: [PATCH 1/2] Move unpack to deserialize

---
 lib/mysql-binuuid/type.rb | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/lib/mysql-binuuid/type.rb b/lib/mysql-binuuid/type.rb
index 8273fa6..3e21fdd 100644
--- a/lib/mysql-binuuid/type.rb
+++ b/lib/mysql-binuuid/type.rb
@@ -9,19 +9,9 @@ def type
     # Invoked when a value that is returned from the database needs to be
     # displayed into something readable again.
     def cast(value)
-      if value.is_a?(MySQLBinUUID::Type::Data)
-        # It could be a Data object, in which case we should add dashes to the
-        # string value from there.
-        add_dashes(value.to_s)
-      elsif value.is_a?(String) && value.encoding == Encoding::ASCII_8BIT && strip_dashes(value).length != 32
-        # We cannot unpack something that looks like a UUID, with or without
-        # dashes. Not entirely sure why ActiveRecord does a weird combination of
-        # cast and serialize before anything needs to be saved..
-        undashed_uuid = value.unpack1('H*')
-        add_dashes(undashed_uuid.to_s)
-      else
-        super
-      end
+      return unless value
+
+      super(add_dashes(value.to_s)) # super will encode the value as binary (Encoding::BINARY)
     end
 
     # Invoked when the provided value needs to be serialized before storing
@@ -40,6 +30,24 @@ def serialize(value)
       Data.new(undashed_uuid)
     end
 
+    # Converts a value from database input to the appropriate ruby type. The
+    # return value of this method will be returned from
+    # ActiveRecord::AttributeMethods::Read#read_attribute. The default
+    # implementation just calls Value#cast.
+    #
+    # +value+ The raw input, as provided from the database.
+    def deserialize(value)
+      return unless value
+
+      # If the value is a binary data, convert it to a hex string, and call cast(value)
+      if value.is_a?(String) && value.encoding == Encoding::ASCII_8BIT
+        super(value.unpack1("H*"))
+      else
+        super # foward to cast(value)
+      end
+      super
+    end
+
     # We're inheriting from the Binary type since ActiveRecord in that case
     # will get the hex value. All we need to do to provide the hex value of the
     # UUID, is to return the UUID without dashes. And because this inherits

From b9025237b7ca80345eb178b7176f0f2642c4cce0 Mon Sep 17 00:00:00 2001
From: Joel Azemar <joel.azemar@gmail.com>
Date: Thu, 7 Dec 2023 09:34:25 +0100
Subject: [PATCH 2/2] Fix typo

---
 lib/mysql-binuuid/type.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/mysql-binuuid/type.rb b/lib/mysql-binuuid/type.rb
index 3e21fdd..d3eb739 100644
--- a/lib/mysql-binuuid/type.rb
+++ b/lib/mysql-binuuid/type.rb
@@ -45,7 +45,6 @@ def deserialize(value)
       else
         super # foward to cast(value)
       end
-      super
     end
 
     # We're inheriting from the Binary type since ActiveRecord in that case