Switch Token over to use RABXColumn and test that changes to the col behave as expected

2 files changed, 48 insertions, 23 deletions

diff --git a/perllib/FixMyStreet/DB/Result/Token.pm b/perllib/FixMyStreet/DB/Result/Token.pm
index 028300842..5525fe7a5 100644
--- a/perllib/FixMyStreet/DB/Result/Token.pm
+++ b/perllib/FixMyStreet/DB/Result/Token.pm
@@ -34,8 +34,6 @@ __PACKAGE__->set_primary_key("scope", "token");
 # use mySociety::DBHandle qw(dbh);
 
 use mySociety::AuthToken;
-use IO::String;
-use RABX;
 
 =head1 NAME
 
@@ -54,26 +52,9 @@ ms_current_timestamp.
 
 =cut
 
-__PACKAGE__->filter_column(
-    data => {
-        filter_from_storage => sub {
-            my $self = shift;
-            my $ser  = shift;
-            return undef unless defined $ser;
-            utf8::encode($ser) if utf8::is_utf8($ser);
-            my $h = new IO::String($ser);
-            return RABX::wire_rd($h);
-        },
-        filter_to_storage => sub {
-            my $self = shift;
-            my $data = shift;
-            my $ser  = '';
-            my $h    = new IO::String($ser);
-            RABX::wire_wr( $data, $h );
-            return $ser;
-        },
-    }
-);
+__PACKAGE__->load_components("+FixMyStreet::DB::RABXColumn");
+__PACKAGE__->rabx_column('data');
+
 
 sub new {
     my ( $class, $attrs ) = @_;
diff --git a/t/app/model/token.t b/t/app/model/token.t
index 12945975e..637477fa3 100644
--- a/t/app/model/token.t
+++ b/t/app/model/token.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 45;
+use Test::More;
 
 use FixMyStreet;
 use FixMyStreet::App;
@@ -94,3 +94,47 @@ foreach my $test_data_name ( sort keys %tests ) {
       undef, "token gone with m::AT";
 
 }
+
+
+
+# Test that the inflation and deflation works as expected
+{
+    my $token =
+      $token_rs->create( { scope => 'testing', data => {} } );
+    END { $token->delete() };
+
+    # Add in temporary check to test that the data is updated as expected.
+    is_deeply($token->data, {}, "data is empty");
+
+    # store something in it
+    $token->update({ data => { foo => 'bar' } });
+    $token->discard_changes();
+    is_deeply($token->data, { foo => 'bar' }, "data has content");
+
+    # change the hash stored
+    $token->update({ data => { baz => 'bundy' } });
+    $token->discard_changes();
+    is_deeply($token->data, { baz => 'bundy' }, "data has new content");
+
+    # change the hashref in place
+    {
+        my $data = $token->data;
+        $data->{baz} = 'new';
+        $token->data( $data );
+        $token->update();
+        $token->discard_changes();
+        is_deeply($token->data, { baz => 'new' }, "data has been updated");
+    }
+
+    # change the hashref in place
+    {
+        my $data = $token->data;
+        $data->{baz} = 'new';
+        $token->update({ data => $data });
+        $token->discard_changes();
+        is_deeply($token->data, { baz => 'new' }, "data has been updated");
+    }
+
+}
+
+done_testing();