Merge pull request #21 from somiaj/api-tweaks

Change JSON to Mojo::JSON, don't force static, use to_string.

Author: drdrew42

lib/WeBWorK/FormatRenderedProblem.pm

@@ -10,8 +10,7 @@ package WeBWorK::FormatRenderedProblem;
 use strict;
 use warnings;
 
-use JSON;
-# use Digest::SHA qw(sha1_base64);
+use Mojo::JSON qw(encode_json);
 use Mojo::Util qw(xml_escape);
 use Mojo::DOM;
 use Mojo::URL;
@@ -88,9 +87,7 @@ sub formatRenderedProblem {
 	);
 
 	# Get the requested format. (outputFormat or outputformat)
-	# override to static mode if showCorrectAnswers has been set
-	my $formatName = $inputs_ref->{showCorrectAnswers}
-		&& !$inputs_ref->{isInstructor} ? 'static' : ($inputs_ref->{outputFormat} || 'default');
+	my $formatName = $inputs_ref->{outputFormat} || 'default';
 
 	# Add JS files requested by problems via ADD_JS_FILE() in the PG file.
 	my @extra_js_files;
@@ -203,7 +200,7 @@ sub formatRenderedProblem {
 		$output->{third_party_js}  = \@third_party_js;
 
 		# Convert to JSON and render.
-		return $c->render(data => JSON->new->utf8(1)->encode($output));
+		return $c->render(data => encode_json($output));
 	}
 
 	# Setup and render the appropriate template in the templates/RPCRenderFormats folder depending on the outputformat.

lib/WeBWorK/RenderProblem.pm

@@ -8,8 +8,8 @@ use Time::HiRes qw/time/;
 use Proc::ProcessTable;
 use Date::Format;
 
-use JSON::XS;
-use Crypt::JWT qw( encode_jwt );
+use Mojo::JSON  qw( encode_json );
+use Crypt::JWT  qw( encode_jwt );
 use Digest::MD5 qw( md5_hex );
 
 use lib "$ENV{PG_ROOT}/lib";
@@ -42,7 +42,7 @@ die "You must first create an output file at $path_to_log_file with permissions
 sub UNIVERSAL::TO_JSON {
 	my ($self) = shift;
 
-	use Storable qw(dclone);
+	use Storable              qw(dclone);
 	use Data::Structure::Util qw(unbless);
 
 	my $clone = unbless(dclone($self));
@@ -97,8 +97,7 @@ sub process_pg_file {
 	$return_object->{tags} = WeBWorK::Utils::Tags->new($inputs_ref->{sourceFilePath}, $problem->source)
 		if ($inputs_ref->{includeTags});
 
-	my $coder = JSON::XS->new->ascii->pretty->allow_unknown->convert_blessed;
-	my $json  = $coder->encode($return_object);
+	my $json = encode_json($return_object);
 	return $json;
 }
 

lib/WeBWorK/Utils.pm

@@ -4,7 +4,7 @@ use base qw(Exporter);
 use strict;
 use warnings;
 
-use JSON;
+use Mojo::JSON qw(decode_json);
 
 our @EXPORT_OK = qw(
 	wwRound
@@ -35,7 +35,7 @@ sub readJSON {
 	my $data = <$fh>;
 	close $fh;
 
-	return JSON->new->decode($data);
+	return decode_json($data);
 }
 
 sub getThirdPartyAssetURL {
@@ -49,7 +49,7 @@ sub getThirdPartyAssetURL {
 					. substr($dependencies->{$_}, 1) . '/'
 					. ($1 =~ s/(?:\.min)?\.(js|css)$/.min.$1/gr);
 			} else {
-				return Mojo::URL->new("${baseURL}$file")->query(version => $dependencies->{$_} =~ s/#/@/gr);
+				return Mojo::URL->new("${baseURL}$file")->query(version => $dependencies->{$_} =~ s/#/@/gr)->to_string;
 			}
 		}
 	}
@@ -99,15 +99,10 @@ sub getAssetURL {
 	# If so, then either serve it from a CDN if requested, or serve it directly with the library version
 	# appended as a URL parameter.
 	if ($file =~ /^node_modules/) {
-		my $wwFile = getThirdPartyAssetURL(
-			$file, $thirdPartyWWDependencies,
-			'',
-			0
-		);
+		my $wwFile = getThirdPartyAssetURL($file, $thirdPartyWWDependencies, '', 0);
 		return $wwFile if $wwFile;
 
-		my $pgFile =
-			getThirdPartyAssetURL($file, $thirdPartyPGDependencies, 'pg_files/', 1);
+		my $pgFile = getThirdPartyAssetURL($file, $thirdPartyPGDependencies, 'pg_files/', 1);
 		return $pgFile if $pgFile;
 	}
 
@@ -117,7 +112,7 @@ sub getAssetURL {
 		($language =~ /^(he|ar)/ && $file !~ /node_modules/ && $file =~ /\.css$/)
 		? $file =~ s/\.css$/.rtl.css/r
 		: undef;
-	
+
 	# First check to see if this is a file in the webwork htdocs location with a rtl variant.
 	return "$staticWWAssets->{$rtlfile}"
 		if defined $rtlfile && defined $staticWWAssets->{$rtlfile};