From 997e3656330f47c3ebadd39e2754b6f86df387e7 Mon Sep 17 00:00:00 2001
From: Dylan Lloyd <dylan@dylansserver.com>
Date: Mon, 6 Aug 2012 13:36:46 -0400
Subject: [PATCH] expanded IsValid trigger

---
 lib/DDG/Goodie/IsValid/JSON.pm | 5 ++---
 lib/DDG/Goodie/IsValid/XML.pm  | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/DDG/Goodie/IsValid/JSON.pm b/lib/DDG/Goodie/IsValid/JSON.pm
index 8cc448403..f6247e3ab 100644
--- a/lib/DDG/Goodie/IsValid/JSON.pm
+++ b/lib/DDG/Goodie/IsValid/JSON.pm
@@ -15,14 +15,13 @@ zci is_cached   => 1;
 triggers any => 'json';
 
 handle remainder => sub {
-	return unless $_ =~ /valid\s*(.*)$/;
+	return unless s/ ?(is )?valid\?? ?//gi;
 
 	my ($result, $error) = try {
-		from_json($1);
+		from_json $_;
 		return 'valid!';
 	} catch {
 		$_ =~ /^(.* at character offset \d+ .*) at/;
-
 		return ('invalid: ', $1);
 	};
 
diff --git a/lib/DDG/Goodie/IsValid/XML.pm b/lib/DDG/Goodie/IsValid/XML.pm
index a59f77709..845e2a299 100644
--- a/lib/DDG/Goodie/IsValid/XML.pm
+++ b/lib/DDG/Goodie/IsValid/XML.pm
@@ -15,10 +15,10 @@ zci is_cached   => 1;
 triggers any => 'xml';
 
 handle remainder => sub {
-	return unless $_ =~ /valid\s*(.*)$/;
+	return unless s/ ?(is )?valid\?? ?//gi;
 
 	my ($result, $error) = try {
-		XMLin($1);
+		XMLin $_;
 		return 'valid!';
 	} catch {
 		$_ =~ /^\n(.* at line \d+, column \d+, byte \d+) at/;