use same JSON module as API

metacpan · Jun 12, 2016 · 5025497 · 5025497
1 parent 2071c8d
commit 5025497
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 22 deletions.
diff --git a/cpanfile b/cpanfile
@@ -19,6 +19,7 @@ requires 'Catalyst::View::TT::Alloy';
 requires 'CatalystX::RoleApplicator';
 requires 'Config::General';
 requires 'Config::JFDI';
+requires 'Cpanel::JSON::XS';
 requires 'Data::Dumper';
 requires 'Data::Pageset';
 requires 'Data::Printer', '0.38';
@@ -45,7 +46,6 @@ requires 'Hash::AsObject';
 requires 'Hash::Merge';
 requires 'Importer';
 requires 'JavaScript::Minifier::XS';
-requires 'JSON::MaybeXS', '1.002000';
 requires 'List::AllUtils';
 requires 'List::MoreUtils';
 requires 'List::Util';

diff --git a/cpanfile.snapshot b/cpanfile.snapshot
@@ -910,6 +910,13 @@ DISTRIBUTIONS
       Module::Build 0.38
       URI::Escape 0
       perl 5.008001
+  Cpanel-JSON-XS-3.0216
+    pathname: R/RU/RURBAN/Cpanel-JSON-XS-3.0216.tar.gz
+    provides:
+      Cpanel::JSON::XS 3.0216
+    requirements:
+      ExtUtils::MakeMaker 0
+      Pod::Text 2.08
   Data-Dump-1.23
     pathname: G/GA/GAAS/Data-Dump-1.23.tar.gz
     provides:
@@ -2288,6 +2295,7 @@ DISTRIBUTIONS
       JSON::MaybeXS 1.003005
     requirements:
       Carp 0
+      Cpanel::JSON::XS 2.3310
       ExtUtils::CBuilder 0.27
       ExtUtils::MakeMaker 0
       File::Spec 0

diff --git a/lib/MetaCPAN/Web/Controller/Account.pm b/lib/MetaCPAN/Web/Controller/Account.pm
@@ -2,8 +2,7 @@ package MetaCPAN::Web::Controller::Account;
 
 use Moose;
 use List::MoreUtils qw(pairwise);
-use DateTime      ();
-use JSON::MaybeXS ();
+use DateTime ();
 
 BEGIN { extends 'MetaCPAN::Web::Controller' }
 

diff --git a/lib/MetaCPAN/Web/Controller/Search/AutoComplete.pm b/lib/MetaCPAN/Web/Controller/Search/AutoComplete.pm
@@ -1,7 +1,7 @@
 package MetaCPAN::Web::Controller::Search::AutoComplete;
 
 use Moose;
-use JSON::MaybeXS ();
+use Cpanel::JSON::XS ();
 
 use Importer 'MetaCPAN::Web::Elasticsearch::Adapter' =>
     qw/ single_valued_arrayref_to_scalar /;
@@ -17,7 +17,7 @@ sub index : Path : Args(0) {
     my $data  = $model->autocomplete($query)->recv;
     $c->res->content_type('application/json');
     $c->res->body(
-        JSON::MaybeXS::encode_json(
+        Cpanel::JSON::XS::encode_json(
             single_valued_arrayref_to_scalar( $data->{results} )
         )
     );

diff --git a/lib/MetaCPAN/Web/Model/API.pm b/lib/MetaCPAN/Web/Model/API.pm
@@ -8,7 +8,7 @@ use namespace::autoclean;
 use AnyEvent::Curl::Multi;
 use Encode        ();
 use HTTP::Request ();
-use JSON::MaybeXS;
+use Cpanel::JSON::XS qw( decode_json encode_json );
 use MetaCPAN::Web::Types qw( Uri );
 use MooseX::ClassAttribute;
 use Try::Tiny qw( catch try );

diff --git a/lib/MetaCPAN/Web/Role/Request.pm b/lib/MetaCPAN/Web/Role/Request.pm
@@ -3,7 +3,7 @@ package MetaCPAN::Web::Role::Request;
 use utf8;
 use Moose::Role;
 use Plack::Session;
-use JSON::MaybeXS ();
+use Cpanel::JSON::XS ();
 use MetaCPAN::Web::Types qw( PositiveInt );
 use Try::Tiny;
 
@@ -33,7 +33,8 @@ sub get_page_size {
 sub json_param {
     my ( $self, $name ) = @_;
     return try {
-        JSON::MaybeXS->new->relaxed->utf8( $self->params_are_decoded ? 0 : 1 )
+        Cpanel::JSON::XS->new->relaxed->utf8(
+            $self->params_are_decoded ? 0 : 1 )
             ->decode( $self->params->{$name} );
     }
     catch {

diff --git a/lib/MetaCPAN/Web/View/HTML.pm b/lib/MetaCPAN/Web/View/HTML.pm
@@ -5,8 +5,8 @@ extends 'Catalyst::View::TT::Alloy';
 
 use Digest::MD5 qw(md5_hex);
 use Digest::SHA1;
-use List::Util ();
-use JSON::MaybeXS;
+use List::Util       ();
+use Cpanel::JSON::XS ();
 use Gravatar::URL;
 use Regexp::Common qw(time);
 use Template::Plugin::DateTime;
@@ -91,7 +91,7 @@ Template::Alloy->define_vmethod(
     pretty_json => sub {
 
     # Use utf8(0) because Catatlyst expects our view to be a character string.
-        JSON::MaybeXS->new->utf8(0)->pretty->encode(shift);
+        Cpanel::JSON::XS->new->utf8(0)->pretty->encode(shift);
     }
 );
 
@@ -139,7 +139,7 @@ Template::Alloy->define_vmethod(
 Template::Alloy->define_vmethod(
     'array',
     json => sub {
-        JSON::MaybeXS::encode_json(shift);
+        Cpanel::JSON::XS::encode_json(shift);
     }
 );
 

diff --git a/lib/MetaCPAN/Web/View/JSON.pm b/lib/MetaCPAN/Web/View/JSON.pm
@@ -1,13 +1,13 @@
 package MetaCPAN::Web::View::JSON;
 
 use Moose;
-use JSON::MaybeXS ();
+use Cpanel::JSON::XS ();
 
 extends 'Catalyst::View::JSON';
 
 sub encode_json {
     my ( $self, $c, $data ) = @_;
-    JSON::MaybeXS->new->utf8->encode($data);
+    Cpanel::JSON::XS->new->utf8->encode($data);
 }
 
 # Catalyst::View::JSON is not a Moose.

diff --git a/lib/Plack/Middleware/Session/Cookie/MetaCPAN.pm b/lib/Plack/Middleware/Session/Cookie/MetaCPAN.pm
@@ -4,10 +4,10 @@ use parent qw(Plack::Middleware::Session::Cookie);
 
 use Plack::Util;
 use MIME::Base64;
-use JSON::MaybeXS;
+use Cpanel::JSON::XS ();
 use Try::Tiny;
 
-my $json = JSON::MaybeXS->new( canonical => 1 );
+my $json = Cpanel::JSON::XS->new->canonical(1);
 
 sub prepare_app {
     my $self = shift;
@@ -16,7 +16,8 @@ sub prepare_app {
         sub {
             # Pass $_[0] since the json subs may have a ($) protoype.
             # Pass '' to base64 for a blank separator (instead of newlines).
-            MIME::Base64::encode( JSON::MaybeXS::encode_json( $_[0] ), q[] );
+            MIME::Base64::encode( Cpanel::JSON::XS::encode_json( $_[0] ),
+                q[] );
         }
     ) unless $self->serializer;
 
@@ -27,7 +28,8 @@ sub prepare_app {
 
             # Use try/catch so JSON doesn't barf if the cookie is bad.
             try {
-                JSON::MaybeXS::decode_json( MIME::Base64::decode($cookie) );
+                Cpanel::JSON::XS::decode_json(
+                    MIME::Base64::decode($cookie) );
             }
 
             # No session.

diff --git a/t/controller/search/autocomplete.t b/t/controller/search/autocomplete.t
@@ -4,7 +4,7 @@ use utf8;
 use Encode qw(encode is_utf8);
 use Test::More;
 use MetaCPAN::Web::Test;
-use JSON::MaybeXS;
+use Cpanel::JSON::XS qw( decode_json );
 
 my @tests = (
     [ moose      => 'Moose' ],

diff --git a/t/lib/MetaCPAN/Web/Controller/Test.pm b/t/lib/MetaCPAN/Web/Controller/Test.pm
@@ -1,11 +1,13 @@
 package MetaCPAN::Web::Controller::Test;
 
 use Moose;
+use Cpanel::JSON::XS;
+
 BEGIN { extends 'MetaCPAN::Web::Controller' }
 
 sub _json_body {
     my ( $self, $c ) = @_;
-    JSON::MaybeXS->new->utf8->decode(
+    Cpanel::JSON::XS->new->utf8->decode(
         do { local $/; $c->req->body->getline }
     );
 }

diff --git a/t/model/release.t b/t/model/release.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Test::More;
-use JSON::MaybeXS;
+use Cpanel::JSON::XS qw( decode_json );
 use MetaCPAN::Web;
 
 use Importer 'MetaCPAN::Web::Elasticsearch::Adapter' =>

diff --git a/t/view/json.t b/t/view/json.t
@@ -4,7 +4,7 @@ use lib 't/lib';
 use Test::More;
 use HTTP::Request::Common 'POST';
 use MetaCPAN::Web::Test;
-use JSON::MaybeXS;
+use Cpanel::JSON::XS qw( decode_json );
 
 sub post_json {
     POST(