Add localizer; use JSON::MaybeXS; avoid EOL-check for tests

Changes

@@ -2,6 +2,8 @@ Revision history for Perl module Mojo::WebSocketProxy
 
 {{$NEXT}}
     Add warning with transaction details failure, if available.
+    Add optional localization callback
+    Use 'Mojo::JSON' instead of 3rd-party JSON-handling modules
     Don't bother removing args from req storage after SanityCheckFailed.
 
 0.07      2017-08-29 03:04:42 UTC 2017

cpanfile

@@ -2,8 +2,6 @@ requires 'Class::Method::Modifiers';
 requires 'Data::UUID';
 requires 'Future';
 requires 'Guard';
-requires 'JSON';
-requires 'JSON::XS';
 requires 'MojoX::JSON::RPC';
 requires 'Mojolicious';
 requires 'Scalar::Util';

dist.ini

@@ -44,6 +44,8 @@ perltidyrc = t/rc/.perltidyrc
 [Test::Compile]
 [Test::Synopsis]
 [Test::EOL]
+finder = :InstallModules
+finder = :ExecFiles
 [Test::Version]
 [Test::Pod::LinkCheck]
 [PodCoverageTests]

lib/Mojo/WebSocketProxy/CallingEngine.pm

@@ -3,9 +3,9 @@ package Mojo::WebSocketProxy::CallingEngine;
 use strict;
 use warnings;
 
+use Mojo::JSON qw(encode_json);
 use MojoX::JSON::RPC::Client;
 use Guard;
-use JSON;
 
 ## VERSION
 

lib/Mojo/WebSocketProxy/Dispatcher.pm

@@ -4,13 +4,13 @@ use strict;
 use warnings;
 
 use Mojo::Base 'Mojolicious::Controller';
+use Mojo::JSON qw(encode_json);
 use Mojo::WebSocketProxy::Parser;
 use Mojo::WebSocketProxy::Config;
 use Mojo::WebSocketProxy::CallingEngine;
 
 use Class::Method::Modifiers;
 
-use Mojo::JSON qw(encode_json);
 use Future::Utils qw/fmap/;
 use Scalar::Util qw(blessed);
 use Variable::Disposition qw(dispose retain retain_future);

lib/Mojolicious/Plugin/WebSocketProxy.pm

@@ -14,6 +14,8 @@ sub register {
 
     die 'No base path found!' unless $config->{base_path};
 
+    my $localizer = $config->{localizer} || sub { $_[1] };
+
     my $url_setter;
     $url_setter = delete $config->{url} if $config->{url} and ref($config->{url}) eq 'CODE';
     $app->helper(
@@ -24,12 +26,11 @@ sub register {
         });
     $app->helper(
         wsp_error => sub {
-            shift; # $c
-            my ($msg_type, $code, $message, $details) = @_;
+            my ($c, $msg_type, $code, $message, $details) = @_;
 
             my $error = {
                 code    => $code,
-                message => $message
+                message => $localizer->($c, $message),
             };
             $error->{details} = $details if ref($details) eq 'HASH' && keys %$details;
 
@@ -84,6 +85,10 @@ Mojolicious::Plugin::WebSocketProxy
         my $self = shift;
         $self->plugin(
             'web_socket_proxy' => {
+                localizer => sub {
+                    my ($c, $error) = @_;
+                    return $translate_somehow->($error) // $error;
+                },
                 actions => [
                     ['json_key', {some_param => 'some_value'}]
                 ],

t/05_basic.t

@@ -3,8 +3,6 @@
 use strict;
 use warnings;
 
-use JSON;
-
 # Mojolicious app for testing
 package WebsocketProxy;
 
@@ -48,6 +46,7 @@ use Test::More;
 use Test::Mojo;
 use Test::MockModule;
 use Test::MockObject;
+use Mojo::JSON qw(decode_json encode_json);
 
 # Mocking RPC client to catch RPC calls
 my ($url, $call_params, $fake_rpc_response, $fake_rpc_client, $rpc_client_mock, $rpc_response);

t/10-before_forward.t

@@ -4,7 +4,7 @@ use warnings;
 use t::TestWSP qw/test_wsp/;
 use Test::More;
 use Test::Mojo;
-use JSON::XS;
+use Mojo::JSON qw(decode_json encode_json);
 use Mojo::IOLoop;
 use Future;
 

t/11-timeout.t

@@ -6,7 +6,7 @@ local $ENV{MOJO_WEBSOCKETPROXY_TIMEOUT} = 1;
 use t::TestWSP qw/test_wsp/;
 use Test::More;
 use Test::Mojo;
-use JSON::XS;
+use Mojo::JSON qw(decode_json encode_json);
 use Mojo::IOLoop;
 use Future;
 

t/12-before_send_api_response.t

@@ -4,7 +4,7 @@ use warnings;
 use t::TestWSP qw/test_wsp/;
 use Test::More;
 use Test::Mojo;
-use JSON::XS;
+use Mojo::JSON qw(decode_json encode_json);
 use Mojo::IOLoop;
 use Future;
 

t/13-action-not-found.t

@@ -4,7 +4,7 @@ use warnings;
 use t::TestWSP qw/test_wsp/;
 use Test::More;
 use Test::Mojo;
-use JSON::XS;
+use Mojo::JSON qw(decode_json encode_json);
 use Mojo::IOLoop;
 use Future;
 

t/14-bad-request.t

@@ -4,7 +4,7 @@ use warnings;
 use t::TestWSP qw/test_wsp/;
 use Test::More;
 use Test::Mojo;
-use JSON::XS;
+use Mojo::JSON qw(decode_json encode_json);
 use Mojo::IOLoop;
 use Future;
 

t/15-simple-success.t

@@ -4,7 +4,7 @@ use warnings;
 use t::TestWSP qw/test_wsp/;
 use Test::More;
 use Test::Mojo;
-use JSON::XS;
+use Mojo::JSON qw(decode_json encode_json);
 use Mojo::IOLoop;
 use Future;
 

t/16-auth-error-sample.t

@@ -4,7 +4,7 @@ use warnings;
 use t::TestWSP qw/test_wsp/;
 use Test::More;
 use Test::Mojo;
-use JSON::XS;
+use Mojo::JSON qw(decode_json encode_json);
 use Mojo::IOLoop;
 use Future;
 

t/17-instead_of_forward.t

@@ -4,7 +4,7 @@ use warnings;
 use t::TestWSP qw/test_wsp/;
 use Test::More;
 use Test::Mojo;
-use JSON::XS;
+use Mojo::JSON qw(decode_json encode_json);
 use Mojo::IOLoop;
 use Future;
 

t/18-per-action_before-forward.t

@@ -4,7 +4,7 @@ use warnings;
 use t::TestWSP qw/test_wsp/;
 use Test::More;
 use Test::Mojo;
-use JSON::XS;
+use Mojo::JSON qw(decode_json encode_json);
 use Mojo::IOLoop;
 use Future;
 

t/19-rpc_response_cb.t

@@ -4,7 +4,7 @@ use warnings;
 use t::TestWSP qw/test_wsp/;
 use Test::More;
 use Test::Mojo;
-use JSON::XS;
+use Mojo::JSON qw(decode_json encode_json);
 use Mojo::IOLoop;
 use Future;
 

t/20-after_got_rpc_response.t

@@ -4,7 +4,7 @@ use warnings;
 use t::TestWSP qw/test_wsp/;
 use Test::More;
 use Test::Mojo;
-use JSON::XS;
+use Mojo::JSON qw(decode_json encode_json);
 use Mojo::IOLoop;
 use Future;
 

t/21-mojo-stash.t

@@ -4,7 +4,7 @@ use warnings;
 use t::TestWSP qw/test_wsp/;
 use Test::More;
 use Test::Mojo;
-use JSON::XS;
+use Mojo::JSON qw(decode_json encode_json);
 use Mojo::IOLoop;
 use Future;
 

t/22-override-response.t

@@ -4,7 +4,7 @@ use warnings;
 use t::TestWSP qw/test_wsp/;
 use Test::More;
 use Test::Mojo;
-use JSON::XS;
+use Mojo::JSON qw(decode_json encode_json);
 use Mojo::IOLoop;
 use Future;
 

t/23-binary-frame.t

@@ -4,7 +4,7 @@ use warnings;
 use t::TestWSP qw/test_wsp/;
 use Test::More;
 use Test::Mojo;
-use JSON::XS;
+use Mojo::JSON qw(decode_json encode_json);
 use Mojo::IOLoop;
 use Future;
 use Path::Tiny;

t/24-localize.t

@@ -0,0 +1,41 @@
+use strict;
+use warnings;
+
+use t::TestWSP qw/test_wsp/;
+use Test::More;
+use Test::Mojo;
+use Mojo::JSON qw(decode_json encode_json);
+use Mojo::IOLoop;
+use Future;
+
+package t::FrontEnd {
+    use base 'Mojolicious';
+    # does not matter
+    sub startup {
+         my $self = shift;
+         $self->helper('l' => sub {
+            my ($c, $message) = @_;
+            return "[localized] : $message";
+         });
+         $self->plugin(
+             'web_socket_proxy' => {
+                localizer => sub { shift->l(shift) },
+                actions => [
+                    ['success', {stash_params => [qw/lang/]}],
+                ],
+                base_path => '/api',
+                url => $ENV{T_TestWSP_RPC_URL} // die("T_TestWSP_RPC_URL is not defined"),
+             }
+         );
+    }
+};
+
+test_wsp {
+    my ($t) = @_;
+    $t->websocket_ok('/api' => {});
+    $t->send_ok({json => 'invalid', lang => 'ru'})->message_ok;
+    is decode_json($t->message->[1])->{error}->{code}, 'BadRequest';
+    is decode_json($t->message->[1])->{error}->{message}, '[localized] : The application sent an invalid request.';
+} 't::FrontEnd';
+
+done_testing;

t/SampleRPC.pm

@@ -5,7 +5,7 @@ use warnings;
 
 use MojoX::JSON::RPC::Service;
 use Mojo::Base 'Mojolicious';
-use JSON::XS;
+use Mojo::JSON qw(decode_json encode_json);
 
 sub startup {
     my $self = shift;