[libcatalyst-modules-perl] 01/01: replace bundled Catalyst-View-JSON with a dependency on libcatalyst-view-json-perl

Damyan Ivanov dmn at moszumanska.debian.org
Wed May 14 13:21:52 UTC 2014


This is an automated email from the git hooks/post-receive script.

dmn pushed a commit to branch master
in repository libcatalyst-modules-perl.

commit 32fc824f7ce46d2c270c368a5d6ec60205857b45
Author: Damyan Ivanov <dmn at debian.org>
Date:   Wed May 14 13:21:33 2014 +0000

    replace bundled Catalyst-View-JSON with a dependency on libcatalyst-view-json-perl
---
 bundle/02/Catalyst-View-JSON                       |   1 -
 debian/control                                     |   1 +
 debian/copyright                                   |  13 -
 sources/Catalyst-View-JSON/Changes                 | 127 ----
 sources/Catalyst-View-JSON/MANIFEST                |  24 -
 sources/Catalyst-View-JSON/META.yml                |  30 -
 sources/Catalyst-View-JSON/Makefile.PL             |  15 -
 sources/Catalyst-View-JSON/inc/Module/Install.pm   | 470 --------------
 .../Catalyst-View-JSON/inc/Module/Install/Base.pm  |  83 ---
 .../Catalyst-View-JSON/inc/Module/Install/Can.pm   |  81 ---
 .../Catalyst-View-JSON/inc/Module/Install/Fetch.pm |  93 ---
 .../inc/Module/Install/Makefile.pm                 | 415 ------------
 .../inc/Module/Install/Metadata.pm                 | 715 ---------------------
 .../inc/Module/Install/Repository.pm               |  88 ---
 .../Catalyst-View-JSON/inc/Module/Install/Win32.pm |  64 --
 .../inc/Module/Install/WriteAll.pm                 |  63 --
 .../lib/Catalyst/Helper/View/JSON.pm               |  78 ---
 .../Catalyst-View-JSON/lib/Catalyst/View/JSON.pm   | 434 -------------
 sources/Catalyst-View-JSON/t/00_compile.t          |   4 -
 sources/Catalyst-View-JSON/t/01_server.t           | 160 -----
 sources/Catalyst-View-JSON/t/lib/TestApp.pm        |  28 -
 .../t/lib/TestApp/Controller/Root.pm               |  58 --
 .../Catalyst-View-JSON/t/lib/TestApp/View/JSON.pm  |   4 -
 .../Catalyst-View-JSON/t/lib/TestApp/View/JSON2.pm |  10 -
 sources/Catalyst-View-JSON/t/lib/TestAppUnicode.pm |  19 -
 .../t/lib/TestAppUnicode/Controller/Root.pm        |  16 -
 .../t/lib/TestAppUnicode/View/JSON.pm              |   4 -
 27 files changed, 1 insertion(+), 3097 deletions(-)

diff --git a/bundle/02/Catalyst-View-JSON b/bundle/02/Catalyst-View-JSON
deleted file mode 120000
index f65513d..0000000
--- a/bundle/02/Catalyst-View-JSON
+++ /dev/null
@@ -1 +0,0 @@
-../../sources/Catalyst-View-JSON
\ No newline at end of file
diff --git a/debian/control b/debian/control
index 1c8ccf5..c5ab5f2 100644
--- a/debian/control
+++ b/debian/control
@@ -117,6 +117,7 @@ Depends: ${misc:Depends},
          libcatalyst-plugin-session-store-file-perl,
          libcatalyst-plugin-stacktrace-perl,
          libcatalyst-plugin-stactic-simple-perl,
+         libcatalyst-view-json-perl,
          libcatalyst-view-tt-perl,
          libcatalystx-component-traits-perl,
          libcgi-formbuilder-perl,
diff --git a/debian/copyright b/debian/copyright
index 22ff407..a8312f6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,19 +9,6 @@ Copyright: 2005-2006, Florian Ragwitz <rafl at debian.org>
  2010-2013, gregor herrmann <gregoa at debian.org>
 License: Artistic or GPL-1+
 
-Files: sources/Catalyst-View-JSON
-Copyright: 2009, Tatsuhiko Miyagawa <miyagawa at bulknews.net>
-X-Upstream-Maintainers: Tatsuhiko Miyagawa <miyagawa at bulknews.net>
-License: Artistic or GPL-1+
-X-Comment: Catalyst::View::JSON does not contain copyright information and would not
- normally be redistributable. However, the provided rationale from the upstream
- author on his web site was:
- "All of my modules available at http://search.cpan.org/~miyagawa/ with the
- statement "AUTHOR: Tatsuhiko Miyagawa" are, unless otherwise noted,
- Copyright (c) Tatsuhiiko Miyagawa.
- The exact year comes from the CPAN upload date."
- This text is from http://bulknews.net/debian.txt (miyagawa's web site)
-
 Files: sources/Catalyst-View-Mason
 Copyright: 2005-2009, Andres Kievsky <ank at cpan.org>
  2005-2009, Sebastian Riedel <sri at cpan.org>
diff --git a/sources/Catalyst-View-JSON/Changes b/sources/Catalyst-View-JSON/Changes
deleted file mode 100644
index c7a1e10..0000000
--- a/sources/Catalyst-View-JSON/Changes
+++ /dev/null
@@ -1,127 +0,0 @@
-Revision history for Perl extension Catalyst::View::JSON
-
-0.33  Tue Apr 12 12:20:22 PDT 2011
-        - Fixed local_request monkey patching to support Catalyst >= 5.89
-
-0.32  Tue Jan  4 10:03:05 PST 2011
-        - remove Opera special casing (omega)
-
-0.31  Wed Sep 15 15:14:33 PDT 2010
-        - Chrome doesn't like UTF-8 BOM (Larry Leszczynski)
-
-0.30  Tue Apr 13 01:14:07 CEST 2010
-        - Fix test application to call $c->forward('View::JSON') rather than
-          (the incorrect) $c->forward('MyApp::View::JSON')
-        - Fix documentation to match the above change
-        - Turn off the regex fallback behavior in the test applications on
-          newer Catalyst versions to ensure tests are correctly forwarding.
-        - Move actions out of the test application classes into controller
-          classes to avoid deprecation warnings on newer Catalyst releases.
-        - 0.29 had unintended commits accidentally pulled from ap/master. Reverted
-
-0.28  Wed Mar 10 11:19:35 JST 2010
-        - No code changes. Fixed packaging, added YAML dep for testing
-
-0.27  Tue Feb 23 18:09:02 PST 2010
-        - Added repository info to META.yml to satisfy people
-
-0.26  Mon Aug 24 16:11:37 PDT 2009
-        - Work around not to expose Catalyst specific stash variables (Chris Prather)
-
-0.25  Sat Apr 18 19:09:46 CST 2009
-        - Use MRO::Compat instead of NEXT. (Florian Ragwitz)
-
-0.24  Mon Mar  3 01:42:30 PST 2008
-        - removed t/02_ut8.t since it doesn't do anything useful
-
-0.23  Fri Feb 22 14:35:28 PST 2008
-        - Implemented and documented how to override JSON encoder in
-          your view class by implementing encode_json() method.
-
-0.22  Wed Jan  9 14:29:20 PST 2008
-        - Updated the test to work with JSON 2.x and now unbundle JSON.pm in inc/
-          (Thanks to Daniel Westermann-Clark)
-
-0.21  Thu Oct 18 13:53:47 PDT 2007
-        - Update JSON::Any dependency to 1.11
-          (Thanks to typester and perigrin)
-
-0.20  Wed Aug 29 03:23:27 PDT 2007
-        - Fixed POD config 'V::JSON' to 'View::JSON'
-          (Thanks to Matt S Trout)
-
-0.19  Fri Aug  3 15:32:04 PDT 2007
-        - Store JSON::Any object into json_dumper to prevent other
-          modules to change JSON::Any backend like WWW::Facebook::API does.
-          (Thanks to J.Shirley)
-
-0.18  Mon Apr 30 21:08:06 PDT 2007
-        - Make 'JSON' as a default driver to make it backward compatible
-          (Thanks to Andy Hobbs)
-
-0.17  Wed Apr 25 16:04:44 PDT 2007
-        - Switch to Module::Install
-        - include JSON.pm in inc/ for testing.
-          (Thanks to Matt S Trout)
-
-0.16  Tue Apr 17 20:11:38 PDT 2007
-        - Added JSON::Any dependency
-
-0.15  Fri Apr 13 19:25:04 PDT 2007
-        - Switch to use JSON::Any to abstract JSON drivers imlementations
-          (Thanks to Florian Ragwitz for the patch)
-
-0.14  Wed Dec 20 17:20:26 PST 2006
-        - Oops, no_x_json_header in 0.13 was broken
-
-0.13  Wed Dec 20 17:12:32 PST 2006
-        - Added UTF-8 BOM if the User-Agent is Safari and encoding is utf-8 (Jun Kuriyama)
-        - Added 'no_x_json_header' option to disable auto-setting X-JSON for Prototype.js
-          (Jun Kuriyama)
-        - Documented json_driver config
-
-0.12  Thu Oct 26 17:37:58 JST 2006
-        - Support X-JSON for Prototype.js (John Wang)
-        - Updated interoperability doc (John Wang)
-
-0.11  Mon Jul 31 16:21:14 JST 2006
-        - Fix validator so 'json_driver' should just work (Thanks to typester)
-
-0.10  Sun Jul 30 23:46:43 JST 2006
-        - Updated document (Thanks to John Wang)
-        - Switch Content-Type to application/json the standard other than Opera
-        - Mention Encode::UCS::JavaScript in POD
-
-0.09  Thu Apr 20 22:16:19 JST 2006
-        - Added Helper class (Thanks to Komatsu)
-
-0.08  Tue Jan 10 13:31:39 UTC 2006
-        - Added Opera hack (Content-Type: applcation/x-javascript)
-          (Thanks to kazeburo)
-
-0.07  Tue Jan 10 13:00:19 UTC 2006
-        - Now able to use JSON::Syck as a converter by passing
-          json_driver as 'JSON::Syck'
-
-0.06  Tue Jan 10 09:04:34 UTC 2006
-        - Oops, 0.05 was broken. Fixed encode() problem and added test
-          cases for them.
-
-0.05  Tue Jan 10 08:51:02 UTC 2006
-        - Added encoding option (default utf-8) to tackle with Safari
-          multibytes problem. Content-Type is now text/javascript (no +json)
-          (Thanks to kazeburo)
-
-0.04  Sun Jan  8 17:06:56 UTC 2006
-        - Added scalar support to expose_hash and updated the
-          document.
-
-0.03  Sun Jan  8 16:36:36 UTC 2006
-        - Added sanitization of callback function names to avoid XSS
-          thingy.
-
-0.02  Wed Jan  4 10:41:28 UTC 2006
-        - Include the tests file on distribution
-
-0.01  Wed Jan  4 09:27:33 2006
-	- original version
diff --git a/sources/Catalyst-View-JSON/MANIFEST b/sources/Catalyst-View-JSON/MANIFEST
deleted file mode 100644
index d667af2..0000000
--- a/sources/Catalyst-View-JSON/MANIFEST
+++ /dev/null
@@ -1,24 +0,0 @@
-Changes
-inc/Module/Install.pm
-inc/Module/Install/Base.pm
-inc/Module/Install/Can.pm
-inc/Module/Install/Fetch.pm
-inc/Module/Install/Makefile.pm
-inc/Module/Install/Metadata.pm
-inc/Module/Install/Repository.pm
-inc/Module/Install/Win32.pm
-inc/Module/Install/WriteAll.pm
-lib/Catalyst/Helper/View/JSON.pm
-lib/Catalyst/View/JSON.pm
-Makefile.PL
-MANIFEST			This list of files
-META.yml
-t/00_compile.t
-t/01_server.t
-t/lib/TestApp.pm
-t/lib/TestApp/Controller/Root.pm
-t/lib/TestApp/View/JSON.pm
-t/lib/TestApp/View/JSON2.pm
-t/lib/TestAppUnicode.pm
-t/lib/TestAppUnicode/Controller/Root.pm
-t/lib/TestAppUnicode/View/JSON.pm
diff --git a/sources/Catalyst-View-JSON/META.yml b/sources/Catalyst-View-JSON/META.yml
deleted file mode 100644
index 7e342c5..0000000
--- a/sources/Catalyst-View-JSON/META.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-abstract: 'JSON view for your data'
-author:
-  - 'Tatsuhiko Miyagawa <miyagawa at bulknews.net>'
-build_requires:
-  ExtUtils::MakeMaker: 6.42
-  Test::More: 0
-  YAML: 0
-configure_requires:
-  ExtUtils::MakeMaker: 6.42
-distribution_type: module
-generated_by: 'Module::Install version 1.00'
-license: perl
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: 1.4
-name: Catalyst-View-JSON
-no_index:
-  directory:
-    - inc
-    - t
-requires:
-  Catalyst: 5.6
-  JSON::Any: 1.15
-  MRO::Compat: 0
-  perl: 5.8.1
-resources:
-  license: http://dev.perl.org/licenses/
-  repository: git://github.com/miyagawa/catalyst-view-json.git
-version: 0.33
diff --git a/sources/Catalyst-View-JSON/Makefile.PL b/sources/Catalyst-View-JSON/Makefile.PL
deleted file mode 100644
index 0ee8b3e..0000000
--- a/sources/Catalyst-View-JSON/Makefile.PL
+++ /dev/null
@@ -1,15 +0,0 @@
-use inc::Module::Install;
-use Module::Install::Repository;
-
-name 'Catalyst-View-JSON';
-all_from 'lib/Catalyst/View/JSON.pm';
-
-build_requires 'Test::More';
-
-requires 'JSON::Any', 1.15;
-requires 'Catalyst', 5.60;
-requires 'MRO::Compat';
-test_requires 'YAML';
-
-auto_set_repository;
-WriteAll;
diff --git a/sources/Catalyst-View-JSON/inc/Module/Install.pm b/sources/Catalyst-View-JSON/inc/Module/Install.pm
deleted file mode 100644
index 8ee839d..0000000
--- a/sources/Catalyst-View-JSON/inc/Module/Install.pm
+++ /dev/null
@@ -1,470 +0,0 @@
-#line 1
-package Module::Install;
-
-# For any maintainers:
-# The load order for Module::Install is a bit magic.
-# It goes something like this...
-#
-# IF ( host has Module::Install installed, creating author mode ) {
-#     1. Makefile.PL calls "use inc::Module::Install"
-#     2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install
-#     3. The installed version of inc::Module::Install loads
-#     4. inc::Module::Install calls "require Module::Install"
-#     5. The ./inc/ version of Module::Install loads
-# } ELSE {
-#     1. Makefile.PL calls "use inc::Module::Install"
-#     2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install
-#     3. The ./inc/ version of Module::Install loads
-# }
-
-use 5.005;
-use strict 'vars';
-use Cwd        ();
-use File::Find ();
-use File::Path ();
-
-use vars qw{$VERSION $MAIN};
-BEGIN {
-	# All Module::Install core packages now require synchronised versions.
-	# This will be used to ensure we don't accidentally load old or
-	# different versions of modules.
-	# This is not enforced yet, but will be some time in the next few
-	# releases once we can make sure it won't clash with custom
-	# Module::Install extensions.
-	$VERSION = '1.00';
-
-	# Storage for the pseudo-singleton
-	$MAIN    = undef;
-
-	*inc::Module::Install::VERSION = *VERSION;
-	@inc::Module::Install::ISA     = __PACKAGE__;
-
-}
-
-sub import {
-	my $class = shift;
-	my $self  = $class->new(@_);
-	my $who   = $self->_caller;
-
-	#-------------------------------------------------------------
-	# all of the following checks should be included in import(),
-	# to allow "eval 'require Module::Install; 1' to test
-	# installation of Module::Install. (RT #51267)
-	#-------------------------------------------------------------
-
-	# Whether or not inc::Module::Install is actually loaded, the
-	# $INC{inc/Module/Install.pm} is what will still get set as long as
-	# the caller loaded module this in the documented manner.
-	# If not set, the caller may NOT have loaded the bundled version, and thus
-	# they may not have a MI version that works with the Makefile.PL. This would
-	# result in false errors or unexpected behaviour. And we don't want that.
-	my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm';
-	unless ( $INC{$file} ) { die <<"END_DIE" }
-
-Please invoke ${\__PACKAGE__} with:
-
-	use inc::${\__PACKAGE__};
-
-not:
-
-	use ${\__PACKAGE__};
-
-END_DIE
-
-	# This reportedly fixes a rare Win32 UTC file time issue, but
-	# as this is a non-cross-platform XS module not in the core,
-	# we shouldn't really depend on it. See RT #24194 for detail.
-	# (Also, this module only supports Perl 5.6 and above).
-	eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006;
-
-	# If the script that is loading Module::Install is from the future,
-	# then make will detect this and cause it to re-run over and over
-	# again. This is bad. Rather than taking action to touch it (which
-	# is unreliable on some platforms and requires write permissions)
-	# for now we should catch this and refuse to run.
-	if ( -f $0 ) {
-		my $s = (stat($0))[9];
-
-		# If the modification time is only slightly in the future,
-		# sleep briefly to remove the problem.
-		my $a = $s - time;
-		if ( $a > 0 and $a < 5 ) { sleep 5 }
-
-		# Too far in the future, throw an error.
-		my $t = time;
-		if ( $s > $t ) { die <<"END_DIE" }
-
-Your installer $0 has a modification time in the future ($s > $t).
-
-This is known to create infinite loops in make.
-
-Please correct this, then run $0 again.
-
-END_DIE
-	}
-
-
-	# Build.PL was formerly supported, but no longer is due to excessive
-	# difficulty in implementing every single feature twice.
-	if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
-
-Module::Install no longer supports Build.PL.
-
-It was impossible to maintain duel backends, and has been deprecated.
-
-Please remove all Build.PL files and only use the Makefile.PL installer.
-
-END_DIE
-
-	#-------------------------------------------------------------
-
-	# To save some more typing in Module::Install installers, every...
-	# use inc::Module::Install
-	# ...also acts as an implicit use strict.
-	$^H |= strict::bits(qw(refs subs vars));
-
-	#-------------------------------------------------------------
-
-	unless ( -f $self->{file} ) {
-		foreach my $key (keys %INC) {
-			delete $INC{$key} if $key =~ /Module\/Install/;
-		}
-
-		local $^W;
-		require "$self->{path}/$self->{dispatch}.pm";
-		File::Path::mkpath("$self->{prefix}/$self->{author}");
-		$self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self );
-		$self->{admin}->init;
-		@_ = ($class, _self => $self);
-		goto &{"$self->{name}::import"};
-	}
-
-	local $^W;
-	*{"${who}::AUTOLOAD"} = $self->autoload;
-	$self->preload;
-
-	# Unregister loader and worker packages so subdirs can use them again
-	delete $INC{'inc/Module/Install.pm'};
-	delete $INC{'Module/Install.pm'};
-
-	# Save to the singleton
-	$MAIN = $self;
-
-	return 1;
-}
-
-sub autoload {
-	my $self = shift;
-	my $who  = $self->_caller;
-	my $cwd  = Cwd::cwd();
-	my $sym  = "${who}::AUTOLOAD";
-	$sym->{$cwd} = sub {
-		my $pwd = Cwd::cwd();
-		if ( my $code = $sym->{$pwd} ) {
-			# Delegate back to parent dirs
-			goto &$code unless $cwd eq $pwd;
-		}
-		unless ($$sym =~ s/([^:]+)$//) {
-			# XXX: it looks like we can't retrieve the missing function
-			# via $$sym (usually $main::AUTOLOAD) in this case.
-			# I'm still wondering if we should slurp Makefile.PL to
-			# get some context or not ...
-			my ($package, $file, $line) = caller;
-			die <<"EOT";
-Unknown function is found at $file line $line.
-Execution of $file aborted due to runtime errors.
-
-If you're a contributor to a project, you may need to install
-some Module::Install extensions from CPAN (or other repository).
-If you're a user of a module, please contact the author.
-EOT
-		}
-		my $method = $1;
-		if ( uc($method) eq $method ) {
-			# Do nothing
-			return;
-		} elsif ( $method =~ /^_/ and $self->can($method) ) {
-			# Dispatch to the root M:I class
-			return $self->$method(@_);
-		}
-
-		# Dispatch to the appropriate plugin
-		unshift @_, ( $self, $1 );
-		goto &{$self->can('call')};
-	};
-}
-
-sub preload {
-	my $self = shift;
-	unless ( $self->{extensions} ) {
-		$self->load_extensions(
-			"$self->{prefix}/$self->{path}", $self
-		);
-	}
-
-	my @exts = @{$self->{extensions}};
-	unless ( @exts ) {
-		@exts = $self->{admin}->load_all_extensions;
-	}
-
-	my %seen;
-	foreach my $obj ( @exts ) {
-		while (my ($method, $glob) = each %{ref($obj) . '::'}) {
-			next unless $obj->can($method);
-			next if $method =~ /^_/;
-			next if $method eq uc($method);
-			$seen{$method}++;
-		}
-	}
-
-	my $who = $self->_caller;
-	foreach my $name ( sort keys %seen ) {
-		local $^W;
-		*{"${who}::$name"} = sub {
-			${"${who}::AUTOLOAD"} = "${who}::$name";
-			goto &{"${who}::AUTOLOAD"};
-		};
-	}
-}
-
-sub new {
-	my ($class, %args) = @_;
-
-	delete $INC{'FindBin.pm'};
-	{
-		# to suppress the redefine warning
-		local $SIG{__WARN__} = sub {};
-		require FindBin;
-	}
-
-	# ignore the prefix on extension modules built from top level.
-	my $base_path = Cwd::abs_path($FindBin::Bin);
-	unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) {
-		delete $args{prefix};
-	}
-	return $args{_self} if $args{_self};
-
-	$args{dispatch} ||= 'Admin';
-	$args{prefix}   ||= 'inc';
-	$args{author}   ||= ($^O eq 'VMS' ? '_author' : '.author');
-	$args{bundle}   ||= 'inc/BUNDLES';
-	$args{base}     ||= $base_path;
-	$class =~ s/^\Q$args{prefix}\E:://;
-	$args{name}     ||= $class;
-	$args{version}  ||= $class->VERSION;
-	unless ( $args{path} ) {
-		$args{path}  = $args{name};
-		$args{path}  =~ s!::!/!g;
-	}
-	$args{file}     ||= "$args{base}/$args{prefix}/$args{path}.pm";
-	$args{wrote}      = 0;
-
-	bless( \%args, $class );
-}
-
-sub call {
-	my ($self, $method) = @_;
-	my $obj = $self->load($method) or return;
-        splice(@_, 0, 2, $obj);
-	goto &{$obj->can($method)};
-}
-
-sub load {
-	my ($self, $method) = @_;
-
-	$self->load_extensions(
-		"$self->{prefix}/$self->{path}", $self
-	) unless $self->{extensions};
-
-	foreach my $obj (@{$self->{extensions}}) {
-		return $obj if $obj->can($method);
-	}
-
-	my $admin = $self->{admin} or die <<"END_DIE";
-The '$method' method does not exist in the '$self->{prefix}' path!
-Please remove the '$self->{prefix}' directory and run $0 again to load it.
-END_DIE
-
-	my $obj = $admin->load($method, 1);
-	push @{$self->{extensions}}, $obj;
-
-	$obj;
-}
-
-sub load_extensions {
-	my ($self, $path, $top) = @_;
-
-	my $should_reload = 0;
-	unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
-		unshift @INC, $self->{prefix};
-		$should_reload = 1;
-	}
-
-	foreach my $rv ( $self->find_extensions($path) ) {
-		my ($file, $pkg) = @{$rv};
-		next if $self->{pathnames}{$pkg};
-
-		local $@;
-		my $new = eval { local $^W; require $file; $pkg->can('new') };
-		unless ( $new ) {
-			warn $@ if $@;
-			next;
-		}
-		$self->{pathnames}{$pkg} =
-			$should_reload ? delete $INC{$file} : $INC{$file};
-		push @{$self->{extensions}}, &{$new}($pkg, _top => $top );
-	}
-
-	$self->{extensions} ||= [];
-}
-
-sub find_extensions {
-	my ($self, $path) = @_;
-
-	my @found;
-	File::Find::find( sub {
-		my $file = $File::Find::name;
-		return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is;
-		my $subpath = $1;
-		return if lc($subpath) eq lc($self->{dispatch});
-
-		$file = "$self->{path}/$subpath.pm";
-		my $pkg = "$self->{name}::$subpath";
-		$pkg =~ s!/!::!g;
-
-		# If we have a mixed-case package name, assume case has been preserved
-		# correctly.  Otherwise, root through the file to locate the case-preserved
-		# version of the package name.
-		if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) {
-			my $content = Module::Install::_read($subpath . '.pm');
-			my $in_pod  = 0;
-			foreach ( split //, $content ) {
-				$in_pod = 1 if /^=\w/;
-				$in_pod = 0 if /^=cut/;
-				next if ($in_pod || /^=cut/);  # skip pod text
-				next if /^\s*#/;               # and comments
-				if ( m/^\s*package\s+($pkg)\s*;/i ) {
-					$pkg = $1;
-					last;
-				}
-			}
-		}
-
-		push @found, [ $file, $pkg ];
-	}, $path ) if -d $path;
-
-	@found;
-}
-
-
-
-
-
-#####################################################################
-# Common Utility Functions
-
-sub _caller {
-	my $depth = 0;
-	my $call  = caller($depth);
-	while ( $call eq __PACKAGE__ ) {
-		$depth++;
-		$call = caller($depth);
-	}
-	return $call;
-}
-
-# Done in evals to avoid confusing Perl::MinimumVersion
-eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
-sub _read {
-	local *FH;
-	open( FH, '<', $_[0] ) or die "open($_[0]): $!";
-	my $string = do { local $/; <FH> };
-	close FH or die "close($_[0]): $!";
-	return $string;
-}
-END_NEW
-sub _read {
-	local *FH;
-	open( FH, "< $_[0]"  ) or die "open($_[0]): $!";
-	my $string = do { local $/; <FH> };
-	close FH or die "close($_[0]): $!";
-	return $string;
-}
-END_OLD
-
-sub _readperl {
-	my $string = Module::Install::_read($_[0]);
-	$string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg;
-	$string =~ s/(\n)\n*__(?:DATA|END)__\b.*\z/$1/s;
-	$string =~ s/\n\n=\w+.+?\n\n=cut\b.+?\n+/\n\n/sg;
-	return $string;
-}
-
-sub _readpod {
-	my $string = Module::Install::_read($_[0]);
-	$string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg;
-	return $string if $_[0] =~ /\.pod\z/;
-	$string =~ s/(^|\n=cut\b.+?\n+)[^=\s].+?\n(\n=\w+|\z)/$1$2/sg;
-	$string =~ s/\n*=pod\b[^\n]*\n+/\n\n/sg;
-	$string =~ s/\n*=cut\b[^\n]*\n+/\n\n/sg;
-	$string =~ s/^\n+//s;
-	return $string;
-}
-
-# Done in evals to avoid confusing Perl::MinimumVersion
-eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
-sub _write {
-	local *FH;
-	open( FH, '>', $_[0] ) or die "open($_[0]): $!";
-	foreach ( 1 .. $#_ ) {
-		print FH $_[$_] or die "print($_[0]): $!";
-	}
-	close FH or die "close($_[0]): $!";
-}
-END_NEW
-sub _write {
-	local *FH;
-	open( FH, "> $_[0]"  ) or die "open($_[0]): $!";
-	foreach ( 1 .. $#_ ) {
-		print FH $_[$_] or die "print($_[0]): $!";
-	}
-	close FH or die "close($_[0]): $!";
-}
-END_OLD
-
-# _version is for processing module versions (eg, 1.03_05) not
-# Perl versions (eg, 5.8.1).
-sub _version ($) {
-	my $s = shift || 0;
-	my $d =()= $s =~ /(\.)/g;
-	if ( $d >= 2 ) {
-		# Normalise multipart versions
-		$s =~ s/(\.)(\d{1,3})/sprintf("$1%03d",$2)/eg;
-	}
-	$s =~ s/^(\d+)\.?//;
-	my $l = $1 || 0;
-	my @v = map {
-		$_ . '0' x (3 - length $_)
-	} $s =~ /(\d{1,3})\D?/g;
-	$l = $l . '.' . join '', @v if @v;
-	return $l + 0;
-}
-
-sub _cmp ($$) {
-	_version($_[0]) <=> _version($_[1]);
-}
-
-# Cloned from Params::Util::_CLASS
-sub _CLASS ($) {
-	(
-		defined $_[0]
-		and
-		! ref $_[0]
-		and
-		$_[0] =~ m/^[^\W\d]\w*(?:::\w+)*\z/s
-	) ? $_[0] : undef;
-}
-
-1;
-
-# Copyright 2008 - 2010 Adam Kennedy.
diff --git a/sources/Catalyst-View-JSON/inc/Module/Install/Base.pm b/sources/Catalyst-View-JSON/inc/Module/Install/Base.pm
deleted file mode 100644
index b55bda3..0000000
--- a/sources/Catalyst-View-JSON/inc/Module/Install/Base.pm
+++ /dev/null
@@ -1,83 +0,0 @@
-#line 1
-package Module::Install::Base;
-
-use strict 'vars';
-use vars qw{$VERSION};
-BEGIN {
-	$VERSION = '1.00';
-}
-
-# Suspend handler for "redefined" warnings
-BEGIN {
-	my $w = $SIG{__WARN__};
-	$SIG{__WARN__} = sub { $w };
-}
-
-#line 42
-
-sub new {
-	my $class = shift;
-	unless ( defined &{"${class}::call"} ) {
-		*{"${class}::call"} = sub { shift->_top->call(@_) };
-	}
-	unless ( defined &{"${class}::load"} ) {
-		*{"${class}::load"} = sub { shift->_top->load(@_) };
-	}
-	bless { @_ }, $class;
-}
-
-#line 61
-
-sub AUTOLOAD {
-	local $@;
-	my $func = eval { shift->_top->autoload } or return;
-	goto &$func;
-}
-
-#line 75
-
-sub _top {
-	$_[0]->{_top};
-}
-
-#line 90
-
-sub admin {
-	$_[0]->_top->{admin}
-	or
-	Module::Install::Base::FakeAdmin->new;
-}
-
-#line 106
-
-sub is_admin {
-	! $_[0]->admin->isa('Module::Install::Base::FakeAdmin');
-}
-
-sub DESTROY {}
-
-package Module::Install::Base::FakeAdmin;
-
-use vars qw{$VERSION};
-BEGIN {
-	$VERSION = $Module::Install::Base::VERSION;
-}
-
-my $fake;
-
-sub new {
-	$fake ||= bless(\@_, $_[0]);
-}
-
-sub AUTOLOAD {}
-
-sub DESTROY {}
-
-# Restore warning handler
-BEGIN {
-	$SIG{__WARN__} = $SIG{__WARN__}->();
-}
-
-1;
-
-#line 159
diff --git a/sources/Catalyst-View-JSON/inc/Module/Install/Can.pm b/sources/Catalyst-View-JSON/inc/Module/Install/Can.pm
deleted file mode 100644
index 71ccc27..0000000
--- a/sources/Catalyst-View-JSON/inc/Module/Install/Can.pm
+++ /dev/null
@@ -1,81 +0,0 @@
-#line 1
-package Module::Install::Can;
-
-use strict;
-use Config                ();
-use File::Spec            ();
-use ExtUtils::MakeMaker   ();
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '1.00';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-# check if we can load some module
-### Upgrade this to not have to load the module if possible
-sub can_use {
-	my ($self, $mod, $ver) = @_;
-	$mod =~ s{::|\\}{/}g;
-	$mod .= '.pm' unless $mod =~ /\.pm$/i;
-
-	my $pkg = $mod;
-	$pkg =~ s{/}{::}g;
-	$pkg =~ s{\.pm$}{}i;
-
-	local $@;
-	eval { require $mod; $pkg->VERSION($ver || 0); 1 };
-}
-
-# check if we can run some command
-sub can_run {
-	my ($self, $cmd) = @_;
-
-	my $_cmd = $cmd;
-	return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
-
-	for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
-		next if $dir eq '';
-		my $abs = File::Spec->catfile($dir, $_[1]);
-		return $abs if (-x $abs or $abs = MM->maybe_command($abs));
-	}
-
-	return;
-}
-
-# can we locate a (the) C compiler
-sub can_cc {
-	my $self   = shift;
-	my @chunks = split(/ /, $Config::Config{cc}) or return;
-
-	# $Config{cc} may contain args; try to find out the program part
-	while (@chunks) {
-		return $self->can_run("@chunks") || (pop(@chunks), next);
-	}
-
-	return;
-}
-
-# Fix Cygwin bug on maybe_command();
-if ( $^O eq 'cygwin' ) {
-	require ExtUtils::MM_Cygwin;
-	require ExtUtils::MM_Win32;
-	if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
-		*ExtUtils::MM_Cygwin::maybe_command = sub {
-			my ($self, $file) = @_;
-			if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
-				ExtUtils::MM_Win32->maybe_command($file);
-			} else {
-				ExtUtils::MM_Unix->maybe_command($file);
-			}
-		}
-	}
-}
-
-1;
-
-__END__
-
-#line 156
diff --git a/sources/Catalyst-View-JSON/inc/Module/Install/Fetch.pm b/sources/Catalyst-View-JSON/inc/Module/Install/Fetch.pm
deleted file mode 100644
index ec1f106..0000000
--- a/sources/Catalyst-View-JSON/inc/Module/Install/Fetch.pm
+++ /dev/null
@@ -1,93 +0,0 @@
-#line 1
-package Module::Install::Fetch;
-
-use strict;
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '1.00';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-sub get_file {
-    my ($self, %args) = @_;
-    my ($scheme, $host, $path, $file) =
-        $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
-
-    if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) {
-        $args{url} = $args{ftp_url}
-            or (warn("LWP support unavailable!\n"), return);
-        ($scheme, $host, $path, $file) =
-            $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
-    }
-
-    $|++;
-    print "Fetching '$file' from $host... ";
-
-    unless (eval { require Socket; Socket::inet_aton($host) }) {
-        warn "'$host' resolve failed!\n";
-        return;
-    }
-
-    return unless $scheme eq 'ftp' or $scheme eq 'http';
-
-    require Cwd;
-    my $dir = Cwd::getcwd();
-    chdir $args{local_dir} or return if exists $args{local_dir};
-
-    if (eval { require LWP::Simple; 1 }) {
-        LWP::Simple::mirror($args{url}, $file);
-    }
-    elsif (eval { require Net::FTP; 1 }) { eval {
-        # use Net::FTP to get past firewall
-        my $ftp = Net::FTP->new($host, Passive => 1, Timeout => 600);
-        $ftp->login("anonymous", 'anonymous at example.com');
-        $ftp->cwd($path);
-        $ftp->binary;
-        $ftp->get($file) or (warn("$!\n"), return);
-        $ftp->quit;
-    } }
-    elsif (my $ftp = $self->can_run('ftp')) { eval {
-        # no Net::FTP, fallback to ftp.exe
-        require FileHandle;
-        my $fh = FileHandle->new;
-
-        local $SIG{CHLD} = 'IGNORE';
-        unless ($fh->open("|$ftp -n")) {
-            warn "Couldn't open ftp: $!\n";
-            chdir $dir; return;
-        }
-
-        my @dialog = split(/\n/, <<"END_FTP");
-open $host
-user anonymous anonymous\@example.com
-cd $path
-binary
-get $file $file
-quit
-END_FTP
-        foreach (@dialog) { $fh->print("$_\n") }
-        $fh->close;
-    } }
-    else {
-        warn "No working 'ftp' program available!\n";
-        chdir $dir; return;
-    }
-
-    unless (-f $file) {
-        warn "Fetching failed: $@\n";
-        chdir $dir; return;
-    }
-
-    return if exists $args{size} and -s $file != $args{size};
-    system($args{run}) if exists $args{run};
-    unlink($file) if $args{remove};
-
-    print(((!exists $args{check_for} or -e $args{check_for})
-        ? "done!" : "failed! ($!)"), "\n");
-    chdir $dir; return !$?;
-}
-
-1;
diff --git a/sources/Catalyst-View-JSON/inc/Module/Install/Makefile.pm b/sources/Catalyst-View-JSON/inc/Module/Install/Makefile.pm
deleted file mode 100644
index 5dfd0e9..0000000
--- a/sources/Catalyst-View-JSON/inc/Module/Install/Makefile.pm
+++ /dev/null
@@ -1,415 +0,0 @@
-#line 1
-package Module::Install::Makefile;
-
-use strict 'vars';
-use ExtUtils::MakeMaker   ();
-use Module::Install::Base ();
-use Fcntl qw/:flock :seek/;
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '1.00';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-sub Makefile { $_[0] }
-
-my %seen = ();
-
-sub prompt {
-	shift;
-
-	# Infinite loop protection
-	my @c = caller();
-	if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) {
-		die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])";
-	}
-
-	# In automated testing or non-interactive session, always use defaults
-	if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) {
-		local $ENV{PERL_MM_USE_DEFAULT} = 1;
-		goto &ExtUtils::MakeMaker::prompt;
-	} else {
-		goto &ExtUtils::MakeMaker::prompt;
-	}
-}
-
-# Store a cleaned up version of the MakeMaker version,
-# since we need to behave differently in a variety of
-# ways based on the MM version.
-my $makemaker = eval $ExtUtils::MakeMaker::VERSION;
-
-# If we are passed a param, do a "newer than" comparison.
-# Otherwise, just return the MakeMaker version.
-sub makemaker {
-	( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0
-}
-
-# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified
-# as we only need to know here whether the attribute is an array
-# or a hash or something else (which may or may not be appendable).
-my %makemaker_argtype = (
- C                  => 'ARRAY',
- CONFIG             => 'ARRAY',
-# CONFIGURE          => 'CODE', # ignore
- DIR                => 'ARRAY',
- DL_FUNCS           => 'HASH',
- DL_VARS            => 'ARRAY',
- EXCLUDE_EXT        => 'ARRAY',
- EXE_FILES          => 'ARRAY',
- FUNCLIST           => 'ARRAY',
- H                  => 'ARRAY',
- IMPORTS            => 'HASH',
- INCLUDE_EXT        => 'ARRAY',
- LIBS               => 'ARRAY', # ignore ''
- MAN1PODS           => 'HASH',
- MAN3PODS           => 'HASH',
- META_ADD           => 'HASH',
- META_MERGE         => 'HASH',
- PL_FILES           => 'HASH',
- PM                 => 'HASH',
- PMLIBDIRS          => 'ARRAY',
- PMLIBPARENTDIRS    => 'ARRAY',
- PREREQ_PM          => 'HASH',
- CONFIGURE_REQUIRES => 'HASH',
- SKIP               => 'ARRAY',
- TYPEMAPS           => 'ARRAY',
- XS                 => 'HASH',
-# VERSION            => ['version',''],  # ignore
-# _KEEP_AFTER_FLUSH  => '',
-
- clean      => 'HASH',
- depend     => 'HASH',
- dist       => 'HASH',
- dynamic_lib=> 'HASH',
- linkext    => 'HASH',
- macro      => 'HASH',
- postamble  => 'HASH',
- realclean  => 'HASH',
- test       => 'HASH',
- tool_autosplit => 'HASH',
-
- # special cases where you can use makemaker_append
- CCFLAGS   => 'APPENDABLE',
- DEFINE    => 'APPENDABLE',
- INC       => 'APPENDABLE',
- LDDLFLAGS => 'APPENDABLE',
- LDFROM    => 'APPENDABLE',
-);
-
-sub makemaker_args {
-	my ($self, %new_args) = @_;
-	my $args = ( $self->{makemaker_args} ||= {} );
-	foreach my $key (keys %new_args) {
-		if ($makemaker_argtype{$key}) {
-			if ($makemaker_argtype{$key} eq 'ARRAY') {
-				$args->{$key} = [] unless defined $args->{$key};
-				unless (ref $args->{$key} eq 'ARRAY') {
-					$args->{$key} = [$args->{$key}]
-				}
-				push @{$args->{$key}},
-					ref $new_args{$key} eq 'ARRAY'
-						? @{$new_args{$key}}
-						: $new_args{$key};
-			}
-			elsif ($makemaker_argtype{$key} eq 'HASH') {
-				$args->{$key} = {} unless defined $args->{$key};
-				foreach my $skey (keys %{ $new_args{$key} }) {
-					$args->{$key}{$skey} = $new_args{$key}{$skey};
-				}
-			}
-			elsif ($makemaker_argtype{$key} eq 'APPENDABLE') {
-				$self->makemaker_append($key => $new_args{$key});
-			}
-		}
-		else {
-			if (defined $args->{$key}) {
-				warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n};
-			}
-			$args->{$key} = $new_args{$key};
-		}
-	}
-	return $args;
-}
-
-# For mm args that take multiple space-seperated args,
-# append an argument to the current list.
-sub makemaker_append {
-	my $self = shift;
-	my $name = shift;
-	my $args = $self->makemaker_args;
-	$args->{$name} = defined $args->{$name}
-		? join( ' ', $args->{$name}, @_ )
-		: join( ' ', @_ );
-}
-
-sub build_subdirs {
-	my $self    = shift;
-	my $subdirs = $self->makemaker_args->{DIR} ||= [];
-	for my $subdir (@_) {
-		push @$subdirs, $subdir;
-	}
-}
-
-sub clean_files {
-	my $self  = shift;
-	my $clean = $self->makemaker_args->{clean} ||= {};
-	  %$clean = (
-		%$clean,
-		FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_),
-	);
-}
-
-sub realclean_files {
-	my $self      = shift;
-	my $realclean = $self->makemaker_args->{realclean} ||= {};
-	  %$realclean = (
-		%$realclean,
-		FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_),
-	);
-}
-
-sub libs {
-	my $self = shift;
-	my $libs = ref $_[0] ? shift : [ shift ];
-	$self->makemaker_args( LIBS => $libs );
-}
-
-sub inc {
-	my $self = shift;
-	$self->makemaker_args( INC => shift );
-}
-
-sub _wanted_t {
-}
-
-sub tests_recursive {
-	my $self = shift;
-	my $dir = shift || 't';
-	unless ( -d $dir ) {
-		die "tests_recursive dir '$dir' does not exist";
-	}
-	my %tests = map { $_ => 1 } split / /, ($self->tests || '');
-	require File::Find;
-	File::Find::find(
-        sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 },
-        $dir
-    );
-	$self->tests( join ' ', sort keys %tests );
-}
-
-sub write {
-	my $self = shift;
-	die "&Makefile->write() takes no arguments\n" if @_;
-
-	# Check the current Perl version
-	my $perl_version = $self->perl_version;
-	if ( $perl_version ) {
-		eval "use $perl_version; 1"
-			or die "ERROR: perl: Version $] is installed, "
-			. "but we need version >= $perl_version";
-	}
-
-	# Make sure we have a new enough MakeMaker
-	require ExtUtils::MakeMaker;
-
-	if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
-		# MakeMaker can complain about module versions that include
-		# an underscore, even though its own version may contain one!
-		# Hence the funny regexp to get rid of it.  See RT #35800
-		# for details.
-		my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
-		$self->build_requires(     'ExtUtils::MakeMaker' => $v );
-		$self->configure_requires( 'ExtUtils::MakeMaker' => $v );
-	} else {
-		# Allow legacy-compatibility with 5.005 by depending on the
-		# most recent EU:MM that supported 5.005.
-		$self->build_requires(     'ExtUtils::MakeMaker' => 6.42 );
-		$self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
-	}
-
-	# Generate the MakeMaker params
-	my $args = $self->makemaker_args;
-	$args->{DISTNAME} = $self->name;
-	$args->{NAME}     = $self->module_name || $self->name;
-	$args->{NAME}     =~ s/-/::/g;
-	$args->{VERSION}  = $self->version or die <<'EOT';
-ERROR: Can't determine distribution version. Please specify it
-explicitly via 'version' in Makefile.PL, or set a valid $VERSION
-in a module, and provide its file path via 'version_from' (or
-'all_from' if you prefer) in Makefile.PL.
-EOT
-
-	$DB::single = 1;
-	if ( $self->tests ) {
-		my @tests = split ' ', $self->tests;
-		my %seen;
-		$args->{test} = {
-			TESTS => (join ' ', grep {!$seen{$_}++} @tests),
-		};
-    } elsif ( $Module::Install::ExtraTests::use_extratests ) {
-        # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness.
-        # So, just ignore our xt tests here.
-	} elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) {
-		$args->{test} = {
-			TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ),
-		};
-	}
-	if ( $] >= 5.005 ) {
-		$args->{ABSTRACT} = $self->abstract;
-		$args->{AUTHOR}   = join ', ', @{$self->author || []};
-	}
-	if ( $self->makemaker(6.10) ) {
-		$args->{NO_META}   = 1;
-		#$args->{NO_MYMETA} = 1;
-	}
-	if ( $self->makemaker(6.17) and $self->sign ) {
-		$args->{SIGN} = 1;
-	}
-	unless ( $self->is_admin ) {
-		delete $args->{SIGN};
-	}
-	if ( $self->makemaker(6.31) and $self->license ) {
-		$args->{LICENSE} = $self->license;
-	}
-
-	my $prereq = ($args->{PREREQ_PM} ||= {});
-	%$prereq = ( %$prereq,
-		map { @$_ } # flatten [module => version]
-		map { @$_ }
-		grep $_,
-		($self->requires)
-	);
-
-	# Remove any reference to perl, PREREQ_PM doesn't support it
-	delete $args->{PREREQ_PM}->{perl};
-
-	# Merge both kinds of requires into BUILD_REQUIRES
-	my $build_prereq = ($args->{BUILD_REQUIRES} ||= {});
-	%$build_prereq = ( %$build_prereq,
-		map { @$_ } # flatten [module => version]
-		map { @$_ }
-		grep $_,
-		($self->configure_requires, $self->build_requires)
-	);
-
-	# Remove any reference to perl, BUILD_REQUIRES doesn't support it
-	delete $args->{BUILD_REQUIRES}->{perl};
-
-	# Delete bundled dists from prereq_pm, add it to Makefile DIR
-	my $subdirs = ($args->{DIR} || []);
-	if ($self->bundles) {
-		my %processed;
-		foreach my $bundle (@{ $self->bundles }) {
-			my ($mod_name, $dist_dir) = @$bundle;
-			delete $prereq->{$mod_name};
-			$dist_dir = File::Basename::basename($dist_dir); # dir for building this module
-			if (not exists $processed{$dist_dir}) {
-				if (-d $dist_dir) {
-					# List as sub-directory to be processed by make
-					push @$subdirs, $dist_dir;
-				}
-				# Else do nothing: the module is already present on the system
-				$processed{$dist_dir} = undef;
-			}
-		}
-	}
-
-	unless ( $self->makemaker('6.55_03') ) {
-		%$prereq = (%$prereq,%$build_prereq);
-		delete $args->{BUILD_REQUIRES};
-	}
-
-	if ( my $perl_version = $self->perl_version ) {
-		eval "use $perl_version; 1"
-			or die "ERROR: perl: Version $] is installed, "
-			. "but we need version >= $perl_version";
-
-		if ( $self->makemaker(6.48) ) {
-			$args->{MIN_PERL_VERSION} = $perl_version;
-		}
-	}
-
-	if ($self->installdirs) {
-		warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS};
-		$args->{INSTALLDIRS} = $self->installdirs;
-	}
-
-	my %args = map {
-		( $_ => $args->{$_} ) } grep {defined($args->{$_} )
-	} keys %$args;
-
-	my $user_preop = delete $args{dist}->{PREOP};
-	if ( my $preop = $self->admin->preop($user_preop) ) {
-		foreach my $key ( keys %$preop ) {
-			$args{dist}->{$key} = $preop->{$key};
-		}
-	}
-
-	my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
-	$self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile');
-}
-
-sub fix_up_makefile {
-	my $self          = shift;
-	my $makefile_name = shift;
-	my $top_class     = ref($self->_top) || '';
-	my $top_version   = $self->_top->VERSION || '';
-
-	my $preamble = $self->preamble
-		? "# Preamble by $top_class $top_version\n"
-			. $self->preamble
-		: '';
-	my $postamble = "# Postamble by $top_class $top_version\n"
-		. ($self->postamble || '');
-
-	local *MAKEFILE;
-	open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
-	eval { flock MAKEFILE, LOCK_EX };
-	my $makefile = do { local $/; <MAKEFILE> };
-
-	$makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
-	$makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
-	$makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g;
-	$makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
-	$makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
-
-	# Module::Install will never be used to build the Core Perl
-	# Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks
-	# PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist
-	$makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
-	#$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
-
-	# Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
-	$makefile =~ s/(\"?)-I\$\(PERL_LIB\)\1//g;
-
-	# XXX - This is currently unused; not sure if it breaks other MM-users
-	# $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
-
-	seek MAKEFILE, 0, SEEK_SET;
-	truncate MAKEFILE, 0;
-	print MAKEFILE  "$preamble$makefile$postamble" or die $!;
-	close MAKEFILE  or die $!;
-
-	1;
-}
-
-sub preamble {
-	my ($self, $text) = @_;
-	$self->{preamble} = $text . $self->{preamble} if defined $text;
-	$self->{preamble};
-}
-
-sub postamble {
-	my ($self, $text) = @_;
-	$self->{postamble} ||= $self->admin->postamble;
-	$self->{postamble} .= $text if defined $text;
-	$self->{postamble}
-}
-
-1;
-
-__END__
-
-#line 541
diff --git a/sources/Catalyst-View-JSON/inc/Module/Install/Metadata.pm b/sources/Catalyst-View-JSON/inc/Module/Install/Metadata.pm
deleted file mode 100644
index cfe45b3..0000000
--- a/sources/Catalyst-View-JSON/inc/Module/Install/Metadata.pm
+++ /dev/null
@@ -1,715 +0,0 @@
-#line 1
-package Module::Install::Metadata;
-
-use strict 'vars';
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '1.00';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-my @boolean_keys = qw{
-	sign
-};
-
-my @scalar_keys = qw{
-	name
-	module_name
-	abstract
-	version
-	distribution_type
-	tests
-	installdirs
-};
-
-my @tuple_keys = qw{
-	configure_requires
-	build_requires
-	requires
-	recommends
-	bundles
-	resources
-};
-
-my @resource_keys = qw{
-	homepage
-	bugtracker
-	repository
-};
-
-my @array_keys = qw{
-	keywords
-	author
-};
-
-*authors = \&author;
-
-sub Meta              { shift          }
-sub Meta_BooleanKeys  { @boolean_keys  }
-sub Meta_ScalarKeys   { @scalar_keys   }
-sub Meta_TupleKeys    { @tuple_keys    }
-sub Meta_ResourceKeys { @resource_keys }
-sub Meta_ArrayKeys    { @array_keys    }
-
-foreach my $key ( @boolean_keys ) {
-	*$key = sub {
-		my $self = shift;
-		if ( defined wantarray and not @_ ) {
-			return $self->{values}->{$key};
-		}
-		$self->{values}->{$key} = ( @_ ? $_[0] : 1 );
-		return $self;
-	};
-}
-
-foreach my $key ( @scalar_keys ) {
-	*$key = sub {
-		my $self = shift;
-		return $self->{values}->{$key} if defined wantarray and !@_;
-		$self->{values}->{$key} = shift;
-		return $self;
-	};
-}
-
-foreach my $key ( @array_keys ) {
-	*$key = sub {
-		my $self = shift;
-		return $self->{values}->{$key} if defined wantarray and !@_;
-		$self->{values}->{$key} ||= [];
-		push @{$self->{values}->{$key}}, @_;
-		return $self;
-	};
-}
-
-foreach my $key ( @resource_keys ) {
-	*$key = sub {
-		my $self = shift;
-		unless ( @_ ) {
-			return () unless $self->{values}->{resources};
-			return map  { $_->[1] }
-			       grep { $_->[0] eq $key }
-			       @{ $self->{values}->{resources} };
-		}
-		return $self->{values}->{resources}->{$key} unless @_;
-		my $uri = shift or die(
-			"Did not provide a value to $key()"
-		);
-		$self->resources( $key => $uri );
-		return 1;
-	};
-}
-
-foreach my $key ( grep { $_ ne "resources" } @tuple_keys) {
-	*$key = sub {
-		my $self = shift;
-		return $self->{values}->{$key} unless @_;
-		my @added;
-		while ( @_ ) {
-			my $module  = shift or last;
-			my $version = shift || 0;
-			push @added, [ $module, $version ];
-		}
-		push @{ $self->{values}->{$key} }, @added;
-		return map {@$_} @added;
-	};
-}
-
-# Resource handling
-my %lc_resource = map { $_ => 1 } qw{
-	homepage
-	license
-	bugtracker
-	repository
-};
-
-sub resources {
-	my $self = shift;
-	while ( @_ ) {
-		my $name  = shift or last;
-		my $value = shift or next;
-		if ( $name eq lc $name and ! $lc_resource{$name} ) {
-			die("Unsupported reserved lowercase resource '$name'");
-		}
-		$self->{values}->{resources} ||= [];
-		push @{ $self->{values}->{resources} }, [ $name, $value ];
-	}
-	$self->{values}->{resources};
-}
-
-# Aliases for build_requires that will have alternative
-# meanings in some future version of META.yml.
-sub test_requires     { shift->build_requires(@_) }
-sub install_requires  { shift->build_requires(@_) }
-
-# Aliases for installdirs options
-sub install_as_core   { $_[0]->installdirs('perl')   }
-sub install_as_cpan   { $_[0]->installdirs('site')   }
-sub install_as_site   { $_[0]->installdirs('site')   }
-sub install_as_vendor { $_[0]->installdirs('vendor') }
-
-sub dynamic_config {
-	my $self = shift;
-	unless ( @_ ) {
-		warn "You MUST provide an explicit true/false value to dynamic_config\n";
-		return $self;
-	}
-	$self->{values}->{dynamic_config} = $_[0] ? 1 : 0;
-	return 1;
-}
-
-sub perl_version {
-	my $self = shift;
-	return $self->{values}->{perl_version} unless @_;
-	my $version = shift or die(
-		"Did not provide a value to perl_version()"
-	);
-
-	# Normalize the version
-	$version = $self->_perl_version($version);
-
-	# We don't support the reall old versions
-	unless ( $version >= 5.005 ) {
-		die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
-	}
-
-	$self->{values}->{perl_version} = $version;
-}
-
-sub all_from {
-	my ( $self, $file ) = @_;
-
-	unless ( defined($file) ) {
-		my $name = $self->name or die(
-			"all_from called with no args without setting name() first"
-		);
-		$file = join('/', 'lib', split(/-/, $name)) . '.pm';
-		$file =~ s{.*/}{} unless -e $file;
-		unless ( -e $file ) {
-			die("all_from cannot find $file from $name");
-		}
-	}
-	unless ( -f $file ) {
-		die("The path '$file' does not exist, or is not a file");
-	}
-
-	$self->{values}{all_from} = $file;
-
-	# Some methods pull from POD instead of code.
-	# If there is a matching .pod, use that instead
-	my $pod = $file;
-	$pod =~ s/\.pm$/.pod/i;
-	$pod = $file unless -e $pod;
-
-	# Pull the different values
-	$self->name_from($file)         unless $self->name;
-	$self->version_from($file)      unless $self->version;
-	$self->perl_version_from($file) unless $self->perl_version;
-	$self->author_from($pod)        unless @{$self->author || []};
-	$self->license_from($pod)       unless $self->license;
-	$self->abstract_from($pod)      unless $self->abstract;
-
-	return 1;
-}
-
-sub provides {
-	my $self     = shift;
-	my $provides = ( $self->{values}->{provides} ||= {} );
-	%$provides = (%$provides, @_) if @_;
-	return $provides;
-}
-
-sub auto_provides {
-	my $self = shift;
-	return $self unless $self->is_admin;
-	unless (-e 'MANIFEST') {
-		warn "Cannot deduce auto_provides without a MANIFEST, skipping\n";
-		return $self;
-	}
-	# Avoid spurious warnings as we are not checking manifest here.
-	local $SIG{__WARN__} = sub {1};
-	require ExtUtils::Manifest;
-	local *ExtUtils::Manifest::manicheck = sub { return };
-
-	require Module::Build;
-	my $build = Module::Build->new(
-		dist_name    => $self->name,
-		dist_version => $self->version,
-		license      => $self->license,
-	);
-	$self->provides( %{ $build->find_dist_packages || {} } );
-}
-
-sub feature {
-	my $self     = shift;
-	my $name     = shift;
-	my $features = ( $self->{values}->{features} ||= [] );
-	my $mods;
-
-	if ( @_ == 1 and ref( $_[0] ) ) {
-		# The user used ->feature like ->features by passing in the second
-		# argument as a reference.  Accomodate for that.
-		$mods = $_[0];
-	} else {
-		$mods = \@_;
-	}
-
-	my $count = 0;
-	push @$features, (
-		$name => [
-			map {
-				ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_
-			} @$mods
-		]
-	);
-
-	return @$features;
-}
-
-sub features {
-	my $self = shift;
-	while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) {
-		$self->feature( $name, @$mods );
-	}
-	return $self->{values}->{features}
-		? @{ $self->{values}->{features} }
-		: ();
-}
-
-sub no_index {
-	my $self = shift;
-	my $type = shift;
-	push @{ $self->{values}->{no_index}->{$type} }, @_ if $type;
-	return $self->{values}->{no_index};
-}
-
-sub read {
-	my $self = shift;
-	$self->include_deps( 'YAML::Tiny', 0 );
-
-	require YAML::Tiny;
-	my $data = YAML::Tiny::LoadFile('META.yml');
-
-	# Call methods explicitly in case user has already set some values.
-	while ( my ( $key, $value ) = each %$data ) {
-		next unless $self->can($key);
-		if ( ref $value eq 'HASH' ) {
-			while ( my ( $module, $version ) = each %$value ) {
-				$self->can($key)->($self, $module => $version );
-			}
-		} else {
-			$self->can($key)->($self, $value);
-		}
-	}
-	return $self;
-}
-
-sub write {
-	my $self = shift;
-	return $self unless $self->is_admin;
-	$self->admin->write_meta;
-	return $self;
-}
-
-sub version_from {
-	require ExtUtils::MM_Unix;
-	my ( $self, $file ) = @_;
-	$self->version( ExtUtils::MM_Unix->parse_version($file) );
-
-	# for version integrity check
-	$self->makemaker_args( VERSION_FROM => $file );
-}
-
-sub abstract_from {
-	require ExtUtils::MM_Unix;
-	my ( $self, $file ) = @_;
-	$self->abstract(
-		bless(
-			{ DISTNAME => $self->name },
-			'ExtUtils::MM_Unix'
-		)->parse_abstract($file)
-	);
-}
-
-# Add both distribution and module name
-sub name_from {
-	my ($self, $file) = @_;
-	if (
-		Module::Install::_read($file) =~ m/
-		^ \s*
-		package \s*
-		([\w:]+)
-		\s* ;
-		/ixms
-	) {
-		my ($name, $module_name) = ($1, $1);
-		$name =~ s{::}{-}g;
-		$self->name($name);
-		unless ( $self->module_name ) {
-			$self->module_name($module_name);
-		}
-	} else {
-		die("Cannot determine name from $file\n");
-	}
-}
-
-sub _extract_perl_version {
-	if (
-		$_[0] =~ m/
-		^\s*
-		(?:use|require) \s*
-		v?
-		([\d_\.]+)
-		\s* ;
-		/ixms
-	) {
-		my $perl_version = $1;
-		$perl_version =~ s{_}{}g;
-		return $perl_version;
-	} else {
-		return;
-	}
-}
-
-sub perl_version_from {
-	my $self = shift;
-	my $perl_version=_extract_perl_version(Module::Install::_read($_[0]));
-	if ($perl_version) {
-		$self->perl_version($perl_version);
-	} else {
-		warn "Cannot determine perl version info from $_[0]\n";
-		return;
-	}
-}
-
-sub author_from {
-	my $self    = shift;
-	my $content = Module::Install::_read($_[0]);
-	if ($content =~ m/
-		=head \d \s+ (?:authors?)\b \s*
-		([^\n]*)
-		|
-		=head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s*
-		.*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s*
-		([^\n]*)
-	/ixms) {
-		my $author = $1 || $2;
-
-		# XXX: ugly but should work anyway...
-		if (eval "require Pod::Escapes; 1") {
-			# Pod::Escapes has a mapping table.
-			# It's in core of perl >= 5.9.3, and should be installed
-			# as one of the Pod::Simple's prereqs, which is a prereq
-			# of Pod::Text 3.x (see also below).
-			$author =~ s{ E<( (\d+) | ([A-Za-z]+) )> }
-			{
-				defined $2
-				? chr($2)
-				: defined $Pod::Escapes::Name2character_number{$1}
-				? chr($Pod::Escapes::Name2character_number{$1})
-				: do {
-					warn "Unknown escape: E<$1>";
-					"E<$1>";
-				};
-			}gex;
-		}
-		elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) {
-			# Pod::Text < 3.0 has yet another mapping table,
-			# though the table name of 2.x and 1.x are different.
-			# (1.x is in core of Perl < 5.6, 2.x is in core of
-			# Perl < 5.9.3)
-			my $mapping = ($Pod::Text::VERSION < 2)
-				? \%Pod::Text::HTML_Escapes
-				: \%Pod::Text::ESCAPES;
-			$author =~ s{ E<( (\d+) | ([A-Za-z]+) )> }
-			{
-				defined $2
-				? chr($2)
-				: defined $mapping->{$1}
-				? $mapping->{$1}
-				: do {
-					warn "Unknown escape: E<$1>";
-					"E<$1>";
-				};
-			}gex;
-		}
-		else {
-			$author =~ s{E<lt>}{<}g;
-			$author =~ s{E<gt>}{>}g;
-		}
-		$self->author($author);
-	} else {
-		warn "Cannot determine author info from $_[0]\n";
-	}
-}
-
-#Stolen from M::B
-my %license_urls = (
-    perl         => 'http://dev.perl.org/licenses/',
-    apache       => 'http://apache.org/licenses/LICENSE-2.0',
-    apache_1_1   => 'http://apache.org/licenses/LICENSE-1.1',
-    artistic     => 'http://opensource.org/licenses/artistic-license.php',
-    artistic_2   => 'http://opensource.org/licenses/artistic-license-2.0.php',
-    lgpl         => 'http://opensource.org/licenses/lgpl-license.php',
-    lgpl2        => 'http://opensource.org/licenses/lgpl-2.1.php',
-    lgpl3        => 'http://opensource.org/licenses/lgpl-3.0.html',
-    bsd          => 'http://opensource.org/licenses/bsd-license.php',
-    gpl          => 'http://opensource.org/licenses/gpl-license.php',
-    gpl2         => 'http://opensource.org/licenses/gpl-2.0.php',
-    gpl3         => 'http://opensource.org/licenses/gpl-3.0.html',
-    mit          => 'http://opensource.org/licenses/mit-license.php',
-    mozilla      => 'http://opensource.org/licenses/mozilla1.1.php',
-    open_source  => undef,
-    unrestricted => undef,
-    restrictive  => undef,
-    unknown      => undef,
-);
-
-sub license {
-	my $self = shift;
-	return $self->{values}->{license} unless @_;
-	my $license = shift or die(
-		'Did not provide a value to license()'
-	);
-	$license = __extract_license($license) || lc $license;
-	$self->{values}->{license} = $license;
-
-	# Automatically fill in license URLs
-	if ( $license_urls{$license} ) {
-		$self->resources( license => $license_urls{$license} );
-	}
-
-	return 1;
-}
-
-sub _extract_license {
-	my $pod = shift;
-	my $matched;
-	return __extract_license(
-		($matched) = $pod =~ m/
-			(=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?)
-			(=head \d.*|=cut.*|)\z
-		/xms
-	) || __extract_license(
-		($matched) = $pod =~ m/
-			(=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?)
-			(=head \d.*|=cut.*|)\z
-		/xms
-	);
-}
-
-sub __extract_license {
-	my $license_text = shift or return;
-	my @phrases      = (
-		'(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1,
-		'(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1,
-		'Artistic and GPL'                   => 'perl',         1,
-		'GNU general public license'         => 'gpl',          1,
-		'GNU public license'                 => 'gpl',          1,
-		'GNU lesser general public license'  => 'lgpl',         1,
-		'GNU lesser public license'          => 'lgpl',         1,
-		'GNU library general public license' => 'lgpl',         1,
-		'GNU library public license'         => 'lgpl',         1,
-		'GNU Free Documentation license'     => 'unrestricted', 1,
-		'GNU Affero General Public License'  => 'open_source',  1,
-		'(?:Free)?BSD license'               => 'bsd',          1,
-		'Artistic license'                   => 'artistic',     1,
-		'Apache (?:Software )?license'       => 'apache',       1,
-		'GPL'                                => 'gpl',          1,
-		'LGPL'                               => 'lgpl',         1,
-		'BSD'                                => 'bsd',          1,
-		'Artistic'                           => 'artistic',     1,
-		'MIT'                                => 'mit',          1,
-		'Mozilla Public License'             => 'mozilla',      1,
-		'Q Public License'                   => 'open_source',  1,
-		'OpenSSL License'                    => 'unrestricted', 1,
-		'SSLeay License'                     => 'unrestricted', 1,
-		'zlib License'                       => 'open_source',  1,
-		'proprietary'                        => 'proprietary',  0,
-	);
-	while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
-		$pattern =~ s#\s+#\\s+#gs;
-		if ( $license_text =~ /\b$pattern\b/i ) {
-			return $license;
-		}
-	}
-	return '';
-}
-
-sub license_from {
-	my $self = shift;
-	if (my $license=_extract_license(Module::Install::_read($_[0]))) {
-		$self->license($license);
-	} else {
-		warn "Cannot determine license info from $_[0]\n";
-		return 'unknown';
-	}
-}
-
-sub _extract_bugtracker {
-	my @links   = $_[0] =~ m#L<(
-	 \Qhttp://rt.cpan.org/\E[^>]+|
-	 \Qhttp://github.com/\E[\w_]+/[\w_]+/issues|
-	 \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list
-	 )>#gx;
-	my %links;
-	@links{@links}=();
-	@links=keys %links;
-	return @links;
-}
-
-sub bugtracker_from {
-	my $self    = shift;
-	my $content = Module::Install::_read($_[0]);
-	my @links   = _extract_bugtracker($content);
-	unless ( @links ) {
-		warn "Cannot determine bugtracker info from $_[0]\n";
-		return 0;
-	}
-	if ( @links > 1 ) {
-		warn "Found more than one bugtracker link in $_[0]\n";
-		return 0;
-	}
-
-	# Set the bugtracker
-	bugtracker( $links[0] );
-	return 1;
-}
-
-sub requires_from {
-	my $self     = shift;
-	my $content  = Module::Install::_readperl($_[0]);
-	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
-	while ( @requires ) {
-		my $module  = shift @requires;
-		my $version = shift @requires;
-		$self->requires( $module => $version );
-	}
-}
-
-sub test_requires_from {
-	my $self     = shift;
-	my $content  = Module::Install::_readperl($_[0]);
-	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
-	while ( @requires ) {
-		my $module  = shift @requires;
-		my $version = shift @requires;
-		$self->test_requires( $module => $version );
-	}
-}
-
-# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
-# numbers (eg, 5.006001 or 5.008009).
-# Also, convert double-part versions (eg, 5.8)
-sub _perl_version {
-	my $v = $_[-1];
-	$v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
-	$v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
-	$v =~ s/(\.\d\d\d)000$/$1/;
-	$v =~ s/_.+$//;
-	if ( ref($v) ) {
-		# Numify
-		$v = $v + 0;
-	}
-	return $v;
-}
-
-sub add_metadata {
-    my $self = shift;
-    my %hash = @_;
-    for my $key (keys %hash) {
-        warn "add_metadata: $key is not prefixed with 'x_'.\n" .
-             "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/;
-        $self->{values}->{$key} = $hash{$key};
-    }
-}
-
-
-######################################################################
-# MYMETA Support
-
-sub WriteMyMeta {
-	die "WriteMyMeta has been deprecated";
-}
-
-sub write_mymeta_yaml {
-	my $self = shift;
-
-	# We need YAML::Tiny to write the MYMETA.yml file
-	unless ( eval { require YAML::Tiny; 1; } ) {
-		return 1;
-	}
-
-	# Generate the data
-	my $meta = $self->_write_mymeta_data or return 1;
-
-	# Save as the MYMETA.yml file
-	print "Writing MYMETA.yml\n";
-	YAML::Tiny::DumpFile('MYMETA.yml', $meta);
-}
-
-sub write_mymeta_json {
-	my $self = shift;
-
-	# We need JSON to write the MYMETA.json file
-	unless ( eval { require JSON; 1; } ) {
-		return 1;
-	}
-
-	# Generate the data
-	my $meta = $self->_write_mymeta_data or return 1;
-
-	# Save as the MYMETA.yml file
-	print "Writing MYMETA.json\n";
-	Module::Install::_write(
-		'MYMETA.json',
-		JSON->new->pretty(1)->canonical->encode($meta),
-	);
-}
-
-sub _write_mymeta_data {
-	my $self = shift;
-
-	# If there's no existing META.yml there is nothing we can do
-	return undef unless -f 'META.yml';
-
-	# We need Parse::CPAN::Meta to load the file
-	unless ( eval { require Parse::CPAN::Meta; 1; } ) {
-		return undef;
-	}
-
-	# Merge the perl version into the dependencies
-	my $val  = $self->Meta->{values};
-	my $perl = delete $val->{perl_version};
-	if ( $perl ) {
-		$val->{requires} ||= [];
-		my $requires = $val->{requires};
-
-		# Canonize to three-dot version after Perl 5.6
-		if ( $perl >= 5.006 ) {
-			$perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e
-		}
-		unshift @$requires, [ perl => $perl ];
-	}
-
-	# Load the advisory META.yml file
-	my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
-	my $meta = $yaml[0];
-
-	# Overwrite the non-configure dependency hashs
-	delete $meta->{requires};
-	delete $meta->{build_requires};
-	delete $meta->{recommends};
-	if ( exists $val->{requires} ) {
-		$meta->{requires} = { map { @$_ } @{ $val->{requires} } };
-	}
-	if ( exists $val->{build_requires} ) {
-		$meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } };
-	}
-
-	return $meta;
-}
-
-1;
diff --git a/sources/Catalyst-View-JSON/inc/Module/Install/Repository.pm b/sources/Catalyst-View-JSON/inc/Module/Install/Repository.pm
deleted file mode 100644
index f085fc6..0000000
--- a/sources/Catalyst-View-JSON/inc/Module/Install/Repository.pm
+++ /dev/null
@@ -1,88 +0,0 @@
-#line 1
-package Module::Install::Repository;
-
-use strict;
-use 5.005;
-use vars qw($VERSION);
-$VERSION = '0.06';
-
-use base qw(Module::Install::Base);
-
-sub _execute {
-    my ($command) = @_;
-    `$command`;
-}
-
-sub auto_set_repository {
-    my $self = shift;
-
-    return unless $Module::Install::AUTHOR;
-
-    my $repo = _find_repo(\&_execute);
-    if ($repo) {
-        $self->repository($repo);
-    } else {
-        warn "Cannot determine repository URL\n";
-    }
-}
-
-sub _find_repo {
-    my ($execute) = @_;
-
-    if (-e ".git") {
-        # TODO support remote besides 'origin'?
-        if ($execute->('git remote show -n origin') =~ /URL: (.*)$/m) {
-            # XXX Make it public clone URL, but this only works with github
-            my $git_url = $1;
-            $git_url =~ s![\w\-]+\@([^:]+):!git://$1/!;
-            return $git_url;
-        } elsif ($execute->('git svn info') =~ /URL: (.*)$/m) {
-            return $1;
-        }
-    } elsif (-e ".svn") {
-        if (`svn info` =~ /URL: (.*)$/m) {
-            return $1;
-        }
-    } elsif (-e "_darcs") {
-        # defaultrepo is better, but that is more likely to be ssh, not http
-        if (my $query_repo = `darcs query repo`) {
-            if ($query_repo =~ m!Default Remote: (http://.+)!) {
-                return $1;
-            }
-        }
-
-        open my $handle, '<', '_darcs/prefs/repos' or return;
-        while (<$handle>) {
-            chomp;
-            return $_ if m!^http://!;
-        }
-    } elsif (-e ".hg") {
-        if ($execute->('hg paths') =~ /default = (.*)$/m) {
-            my $mercurial_url = $1;
-            $mercurial_url =~ s!^ssh://hg\@(bitbucket\.org/)!https://$1!;
-            return $mercurial_url;
-        }
-    } elsif (-e "$ENV{HOME}/.svk") {
-        # Is there an explicit way to check if it's an svk checkout?
-        my $svk_info = `svk info` or return;
-        SVK_INFO: {
-            if ($svk_info =~ /Mirrored From: (.*), Rev\./) {
-                return $1;
-            }
-
-            if ($svk_info =~ m!Merged From: (/mirror/.*), Rev\.!) {
-                $svk_info = `svk info /$1` or return;
-                redo SVK_INFO;
-            }
-        }
-
-        return;
-    }
-}
-
-1;
-__END__
-
-=encoding utf-8
-
-#line 128
diff --git a/sources/Catalyst-View-JSON/inc/Module/Install/Win32.pm b/sources/Catalyst-View-JSON/inc/Module/Install/Win32.pm
deleted file mode 100644
index edc18b4..0000000
--- a/sources/Catalyst-View-JSON/inc/Module/Install/Win32.pm
+++ /dev/null
@@ -1,64 +0,0 @@
-#line 1
-package Module::Install::Win32;
-
-use strict;
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '1.00';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-# determine if the user needs nmake, and download it if needed
-sub check_nmake {
-	my $self = shift;
-	$self->load('can_run');
-	$self->load('get_file');
-
-	require Config;
-	return unless (
-		$^O eq 'MSWin32'                     and
-		$Config::Config{make}                and
-		$Config::Config{make} =~ /^nmake\b/i and
-		! $self->can_run('nmake')
-	);
-
-	print "The required 'nmake' executable not found, fetching it...\n";
-
-	require File::Basename;
-	my $rv = $self->get_file(
-		url       => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe',
-		ftp_url   => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe',
-		local_dir => File::Basename::dirname($^X),
-		size      => 51928,
-		run       => 'Nmake15.exe /o > nul',
-		check_for => 'Nmake.exe',
-		remove    => 1,
-	);
-
-	die <<'END_MESSAGE' unless $rv;
-
--------------------------------------------------------------------------------
-
-Since you are using Microsoft Windows, you will need the 'nmake' utility
-before installation. It's available at:
-
-  http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe
-      or
-  ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe
-
-Please download the file manually, save it to a directory in %PATH% (e.g.
-C:\WINDOWS\COMMAND\), then launch the MS-DOS command line shell, "cd" to
-that directory, and run "Nmake15.exe" from there; that will create the
-'nmake.exe' file needed by this module.
-
-You may then resume the installation process described in README.
-
--------------------------------------------------------------------------------
-END_MESSAGE
-
-}
-
-1;
diff --git a/sources/Catalyst-View-JSON/inc/Module/Install/WriteAll.pm b/sources/Catalyst-View-JSON/inc/Module/Install/WriteAll.pm
deleted file mode 100644
index d0f6599..0000000
--- a/sources/Catalyst-View-JSON/inc/Module/Install/WriteAll.pm
+++ /dev/null
@@ -1,63 +0,0 @@
-#line 1
-package Module::Install::WriteAll;
-
-use strict;
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '1.00';
-	@ISA     = qw{Module::Install::Base};
-	$ISCORE  = 1;
-}
-
-sub WriteAll {
-	my $self = shift;
-	my %args = (
-		meta        => 1,
-		sign        => 0,
-		inline      => 0,
-		check_nmake => 1,
-		@_,
-	);
-
-	$self->sign(1)                if $args{sign};
-	$self->admin->WriteAll(%args) if $self->is_admin;
-
-	$self->check_nmake if $args{check_nmake};
-	unless ( $self->makemaker_args->{PL_FILES} ) {
-		# XXX: This still may be a bit over-defensive...
-		unless ($self->makemaker(6.25)) {
-			$self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL';
-		}
-	}
-
-	# Until ExtUtils::MakeMaker support MYMETA.yml, make sure
-	# we clean it up properly ourself.
-	$self->realclean_files('MYMETA.yml');
-
-	if ( $args{inline} ) {
-		$self->Inline->write;
-	} else {
-		$self->Makefile->write;
-	}
-
-	# The Makefile write process adds a couple of dependencies,
-	# so write the META.yml files after the Makefile.
-	if ( $args{meta} ) {
-		$self->Meta->write;
-	}
-
-	# Experimental support for MYMETA
-	if ( $ENV{X_MYMETA} ) {
-		if ( $ENV{X_MYMETA} eq 'JSON' ) {
-			$self->Meta->write_mymeta_json;
-		} else {
-			$self->Meta->write_mymeta_yaml;
-		}
-	}
-
-	return 1;
-}
-
-1;
diff --git a/sources/Catalyst-View-JSON/lib/Catalyst/Helper/View/JSON.pm b/sources/Catalyst-View-JSON/lib/Catalyst/Helper/View/JSON.pm
deleted file mode 100644
index 68b82ea..0000000
--- a/sources/Catalyst-View-JSON/lib/Catalyst/Helper/View/JSON.pm
+++ /dev/null
@@ -1,78 +0,0 @@
-package Catalyst::Helper::View::JSON;
-
-use strict;
-
-=head1 NAME
-
-Catalyst::Helper::View::JSON - Helper for JSON Views
-
-=head1 SYNOPSIS
-
-    script/create.pl view JSON JSON
-
-=head1 DESCRIPTION
-
-Helper for JSON Views.
-
-=head2 METHODS
-
-=head3 mk_compclass
-
-=cut
-
-sub mk_compclass {
-    my ( $self, $helper ) = @_;
-    my $file = $helper->{file};
-    $helper->render_file( 'compclass', $file );
-}
-
-=head1 SEE ALSO
-
-L<Catalyst::Manual>, L<Catalyst::Test>, L<Catalyst::Request>,
-L<Catalyst::Response>, L<Catalyst::Helper>
-
-=head1 AUTHOR
-
-Sebastian Riedel, C<sri at oook.de>
-
-=head1 LICENSE
-
-This library is free software . You can redistribute it and/or modify
-it under the same terms as perl itself.
-
-=cut
-
-1;
-
-__DATA__
-
-__compclass__
-package [% class %];
-
-use strict;
-use base 'Catalyst::View::JSON';
-
-=head1 NAME
-
-[% class %] - Catalyst JSON View
-
-=head1 SYNOPSIS
-
-See L<[% app %]>
-
-=head1 DESCRIPTION
-
-Catalyst JSON View.
-
-=head1 AUTHOR
-
-[% author %]
-
-=head1 LICENSE
-
-This library is free software, you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=cut
-
-1;
diff --git a/sources/Catalyst-View-JSON/lib/Catalyst/View/JSON.pm b/sources/Catalyst-View-JSON/lib/Catalyst/View/JSON.pm
deleted file mode 100644
index b238779..0000000
--- a/sources/Catalyst-View-JSON/lib/Catalyst/View/JSON.pm
+++ /dev/null
@@ -1,434 +0,0 @@
-package Catalyst::View::JSON;
-
-use strict;
-our $VERSION = '0.33';
-use 5.008_001;
-
-use base qw( Catalyst::View );
-use Encode ();
-use MRO::Compat;
-use Catalyst::Exception;
-
-__PACKAGE__->mk_accessors(qw( allow_callback callback_param expose_stash encoding json_dumper no_x_json_header ));
-
-sub new {
-    my($class, $c, $arguments) = @_;
-    my $self = $class->next::method($c);
-
-    for my $field (keys %$arguments) {
-        
-        # Remove catalyst_component_name (and future Cat specific params)
-        next if $field =~ /^catalyst/;
-        
-        next if $field eq 'json_driver';
-        if ($self->can($field)) {
-            $self->$field($arguments->{$field});
-        } else {
-            $c->log->debug("Unknown config parameter '$field'");
-        }
-    }
-
-    my $driver = $arguments->{json_driver} || 'JSON';
-    $driver =~ s/^JSON:://; #backward compatibility
-
-    if (my $method = $self->can('encode_json')) {
-        $self->json_dumper( sub {
-                                my($data, $self, $c) = @_;
-                                $method->($self, $c, $data);
-                            } );
-    } else {
-        eval {
-            require JSON::Any;
-            JSON::Any->import($driver);
-            my $json = JSON::Any->new; # create the copy of JSON handler
-            $self->json_dumper(sub { $json->objToJson($_[0]) });
-        };
-
-        if (my $error = $@) {
-            die $error;
-        }
-    }
-
-    return $self;
-}
-
-sub process {
-    my($self, $c) = @_;
-
-    # get the response data from stash
-    my $cond = sub { 1 };
-
-    my $single_key;
-    if (my $expose = $self->expose_stash) {
-        if (ref($expose) eq 'Regexp') {
-            $cond = sub { $_[0] =~ $expose };
-        } elsif (ref($expose) eq 'ARRAY') {
-            my %match = map { $_ => 1 } @$expose;
-            $cond = sub { $match{$_[0]} };
-        } elsif (!ref($expose)) {
-            $single_key = $expose;
-        } else {
-            $c->log->warn("expose_stash should be an array referernce or Regexp object.");
-        }
-    }
-
-    my $data;
-    if ($single_key) {
-        $data = $c->stash->{$single_key};
-    } else {
-        $data = { map { $cond->($_) ? ($_ => $c->stash->{$_}) : () }
-                  keys %{$c->stash} };
-    }
-
-    my $cb_param = $self->allow_callback
-        ? ($self->callback_param || 'callback') : undef;
-    my $cb = $cb_param ? $c->req->param($cb_param) : undef;
-    $self->validate_callback_param($cb) if $cb;
-
-    my $json = $self->json_dumper->($data, $self, $c); # weird order to be backward compat
-
-    # When you set encoding option in View::JSON, this plugin DWIMs
-    my $encoding = $self->encoding || 'utf-8';
-
-    # if you pass a valid Unicode flagged string in the stash,
-    # this view automatically transcodes to the encoding you set.
-    # Otherwise it just bypasses the stash data in JSON format
-    if ( Encode::is_utf8($json) ) {
-        $json = Encode::encode($encoding, $json);
-    }
-
-    $c->res->content_type("application/json; charset=$encoding");
-
-    if ($c->req->header('X-Prototype-Version') && !$self->no_x_json_header) {
-        $c->res->header('X-JSON' => 'eval("("+this.transport.responseText+")")');
-    }
-
-    my $output;
-
-    ## add UTF-8 BOM if the client is Safari
-    if ($encoding eq 'utf-8') {
-        my $user_agent = $c->req->user_agent || '';
-        if ($user_agent =~ m/\bSafari\b/ and $user_agent !~ m/\bChrome\b/) {
-            $output = "\xEF\xBB\xBF";
-        }
-    }
-
-    $output .= "$cb(" if $cb;
-    $output .= $json;
-    $output .= ");"   if $cb;
-
-    $c->res->output($output);
-}
-
-sub validate_callback_param {
-    my($self, $param) = @_;
-    $param =~ /^[a-zA-Z0-9\.\_\[\]]+$/
-        or Catalyst::Exception->throw("Invalid callback parameter $param");
-}
-
-1;
-__END__
-
-=head1 NAME
-
-Catalyst::View::JSON - JSON view for your data
-
-=head1 SYNOPSIS
-
-  # lib/MyApp/View/JSON.pm
-  package MyApp::View::JSON;
-  use base qw( Catalyst::View::JSON );
-  1;
-
-  # configure in lib/MyApp.pm
-  MyApp->config({
-      ...
-      'View::JSON' => {
-          allow_callback  => 1,    # defaults to 0
-          callback_param  => 'cb', # defaults to 'callback'
-          expose_stash    => [ qw(foo bar) ], # defaults to everything
-      },
-  });
-
-  sub hello : Local {
-      my($self, $c) = @_;
-      $c->stash->{message} = 'Hello World!';
-      $c->forward('View::JSON');
-  }
-
-=head1 DESCRIPTION
-
-Catalyst::View::JSON is a Catalyst View handler that returns stash
-data in JSON format.
-
-=head1 CONFIG VARIABLES
-
-=over 4
-
-=item allow_callback
-
-Flag to allow callbacks by adding C<callback=function>. Defaults to 0
-(doesn't allow callbacks). See L</CALLBACKS> for details.
-
-=item callback_param
-
-Name of URI parameter to specify JSON callback function name. Defaults
-to C<callback>. Only effective when C<allow_callback> is turned on.
-
-=item expose_stash
-
-Scalar, List or regular expression object, to specify which stash keys are
-exposed as a JSON response. Defaults to everything. Examples configuration:
-
-  # use 'json_data' value as a data to return
-  expose_stash => 'json_data',
-
-  # only exposes keys 'foo' and 'bar'
-  expose_stash => [ qw( foo bar ) ],
-
-  # only exposes keys that matches with /^json_/
-  expose_stash => qr/^json_/,
-
-Suppose you have data structure of the following.
-
-  $c->stash->{foo} = [ 1, 2 ];
-  $c->stash->{bar} = [ 3, 4 ];
-
-By default, this view will return:
-
-  {"foo":[1,2],"bar":2}
-
-When you set C<< expose_stash => [ 'foo' ] >>, it'll return
-
-  {"foo":[1,2]}
-
-and in the case of C<< expose_stash => 'foo' >>, it'll just return
-
-  [1,2]
-
-instead of the whole object (hashref in perl). This option will be
-useful when you share the method with different views (e.g. TT) and
-don't want to expose non-irrelevant stash variables as in JSON.
-
-=item json_driver
-
-  json_driver: JSON::Syck
-
-By default this plugin uses JSON to encode the object, but you can
-switch to the other drivers like JSON::Syck, whichever JSON::Any
-supports.
-
-=item no_x_json_header
-
-  no_x_json_header: 1
-
-By default this plugin sets X-JSON header if the requested client is a
-Prototype.js with X-JSON support. By setting 1, you can opt-out this
-behavior so that you can do eval() by your own. Defaults to 0.
-
-=back
-
-=head1 OVERRIDING JSON ENCODER
-
-By default it uses JSON::Any to serialize perl data strucuture into
-JSON data format. If you want to avoid this and encode with your own
-encoder (like passing options to JSON::XS etc.), you can implement
-C<encode_json> method in your View class.
-
-  package MyApp::View::JSON;
-  use base qw( Catalyst::View::JSON );
-
-  use JSON::XS ();
-
-  sub encode_json {
-      my($self, $c, $data) = @_;
-      my $encoder = JSON::XS->new->ascii->pretty->allow_nonref;
-      $encoder->encode($data);
-  }
-
-  1;
-
-=head1 ENCODINGS
-
-Due to the browser gotchas like those of Safari and Opera, sometimes
-you have to specify a valid charset value in the response's
-Content-Type header, e.g. C<text/javascript; charset=utf-8>.
-
-Catalyst::View::JSON comes with the configuration variable C<encoding>
-which defaults to utf-8. You can change it via C<< YourApp->config >>
-or even runtime, using C<component>.
-
-  $c->component('View::JSON')->encoding('euc-jp');
-
-This assumes you set your stash data in raw euc-jp bytes, or Unicode
-flagged variable. In case of Unicode flagged variable,
-Catalyst::View::JSON automatically encodes the data into your
-C<encoding> value (euc-jp in this case) before emitting the data to
-the browser.
-
-Another option would be to use I<JavaScript-UCS> as an encoding (and
-pass Unicode flagged string to the stash). That way all non-ASCII
-characters in the output JSON will be automatically encoded to
-JavaScript Unicode encoding like I<\uXXXX>. You have to install
-L<Encode::JavaScript::UCS> to use the encoding.
-
-=head1 CALLBACKS
-
-By default it returns raw JSON data so your JavaScript app can deal
-with using XMLHttpRequest calls. Adding callbacks (JSONP) to the API
-gives more flexibility to the end users of the API: overcome the
-cross-domain restrictions of XMLHttpRequest. It can be done by
-appending I<script> node with dynamic DOM manipulation, and associate
-callback handler to the returned data.
-
-For example, suppose you have the following code.
-
-  sub end : Private {
-      my($self, $c) = @_;
-      if ($c->req->param('output') eq 'json') {
-          $c->forward('View::JSON');
-      } else {
-          ...
-      }
-  }
-
-C</foo/bar?output=json> will just return the data set in
-C<< $c->stash >> as JSON format, like:
-
-  { result: "foo", message: "Hello" }
-
-but C</foo/bar?output=json&callback=handle_result> will give you:
-
-  handle_result({ result: "foo", message: "Hello" });
-
-and you can write a custom C<handle_result> function to handle the
-returned data asynchronously.
-
-The valid characters you can use in the callback function are
-
-  [a-zA-Z0-9\.\_\[\]]
-
-but you can customize the behaviour by overriding the
-C<validate_callback_param> method in your View::JSON class.
-
-See L<http://developer.yahoo.net/common/json.html> and
-L<http://ajaxian.com/archives/jsonp-json-with-padding> for more about
-JSONP.
-
-=head1 INTEROPERABILITY
-
-JSON use is still developing and has not been standardized. This
-section provides some notes on various libraries.
-
-Dojo Toolkit: Setting dojo.io.bind's mimetype to 'text/json' in
-the JavaScript request will instruct dojo.io.bind to expect JSON
-data in the response body and auto-eval it. Dojo ignores the
-server response Content-Type. This works transparently with
-Catalyst::View::JSON.
-
-Prototype.js: prototype.js will auto-eval JSON data that is
-returned in the custom X-JSON header. The reason given for this is
-to allow a separate HTML fragment in the response body, however
-this of limited use because IE 6 has a max header length that will
-cause the JSON evaluation to silently fail when reached. The
-recommened approach is to use Catalyst::View::JSON which will JSON
-format all the response data and return it in the response body.
-
-In at least prototype 1.5.0 rc0 and above, prototype.js will send the
-X-Prototype-Version header. If this is encountered, a JavaScript eval
-will be returned in the X-JSON resonse header to automatically eval
-the response body, unless you set I<no_x_json_header> to 1. If your
-version of prototype does not send this header, you can manually eval
-the response body using the following JavaScript:
-
-  evalJSON: function(request) {
-    try {
-      return eval('(' + request.responseText + ')');
-    } catch (e) {}
-  }
-  // elsewhere
-  var json = this.evalJSON(request);
-
-=head1 SECURITY CONSIDERATION
-
-Catalyst::View::JSON makes the data available as a (sort of)
-JavaScript to the client, so you might want to be careful about the
-security of your data.
-
-=head2 Use callbacks only for public data
-
-When you enable callbacks (JSONP) by setting C<allow_callbacks>, all
-your JSON data will be available cross-site. This means embedding
-private data of logged-in user to JSON is considered bad.
-
-  # MyApp.yaml
-  View::JSON:
-    allow_callbacks: 1
-
-  sub foo : Local {
-      my($self, $c) = @_;
-      $c->stash->{address} = $c->user->street_address; # BAD
-      $c->forward('View::JSON');
-  }
-
-If you want to enable callbacks in a controller (for public API) and
-disable in another, you need to create two different View classes,
-like MyApp::View::JSON and MyApp::View::JSONP, because
-C<allow_callbacks> is a static configuration of the View::JSON class.
-
-See L<http://ajaxian.com/archives/gmail-csrf-security-flaw> for more.
-
-=head2 Avoid valid cross-site JSON requests
-
-Even if you disable the callbacks, the nature of JavaScript still has
-a possiblity to access private JSON data cross-site, by overriding
-Array constructor C<[]>.
-
-  # MyApp.yaml
-  View::JSON:
-    expose_stash: json
-
-  sub foo : Local {
-      my($self, $c) = @_;
-      $c->stash->{json} = [ $c->user->street_address ]; # BAD
-      $c->forward('View::JSON');
-  }
-
-When you return logged-in user's private data to the response JSON,
-you might want to disable GET requests (because I<script> tag invokes
-GET requests), or include a random digest string and validate it.
-
-See
-L<http://jeremiahgrossman.blogspot.com/2006/01/advanced-web-attack-techniques-using.html>
-for more.
-
-=head1 AUTHOR
-
-Tatsuhiko Miyagawa E<lt>miyagawa at bulknews.netE<gt>
-
-=head1 LICENSE
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=head1 CONTRIBUTORS
-
-Following people has been contributing patches, bug reports and
-suggestions for the improvement of Catalyst::View::JSON.
-
-John Wang
-kazeburo
-Daisuke Murase
-Jun Kuriyama
-Tomas Doran
-
-=head1 SEE ALSO
-
-L<Catalyst>, L<JSON>, L<Encode::JavaScript::UCS>
-
-L<http://www.prototypejs.org/learn/json>
-L<http://docs.jquery.com/Ajax/jQuery.getJSON>
-L<http://manual.dojotoolkit.org/json.html>
-L<http://developer.yahoo.com/yui/json/>
-
-=cut
diff --git a/sources/Catalyst-View-JSON/t/00_compile.t b/sources/Catalyst-View-JSON/t/00_compile.t
deleted file mode 100644
index 5a62ecf..0000000
--- a/sources/Catalyst-View-JSON/t/00_compile.t
+++ /dev/null
@@ -1,4 +0,0 @@
-use strict;
-use Test::More tests => 1;
-
-BEGIN { use_ok 'Catalyst::View::JSON' }
diff --git a/sources/Catalyst-View-JSON/t/01_server.t b/sources/Catalyst-View-JSON/t/01_server.t
deleted file mode 100644
index 4d65456..0000000
--- a/sources/Catalyst-View-JSON/t/01_server.t
+++ /dev/null
@@ -1,160 +0,0 @@
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/lib";
-
-use Encode;
-use Test::More;
-use Catalyst::Test 'TestApp';
-
-eval "use JSON 2.04";
-if ($@) {
-    plan skip_all => "JSON 2.04 is needed for testing";
-}
-
-plan tests => 40;
-
-BEGIN {
-    no warnings 'redefine';
-    if ( $Catalyst::VERSION < 5.89 ) {
-        *Catalyst::Test::local_request = sub {
-            my ( $class, $request ) = @_;
-
-            require HTTP::Request::AsCGI;
-            my $cgi = HTTP::Request::AsCGI->new( $request, %ENV )->setup;
-
-            $class->handle_request;
-
-            return $cgi->restore->response;
-        };
-    } else {
-        *Catalyst::Test::local_request => sub {
-            my ( $class, $request ) = @_;
-            my $app = ref($class) eq "CODE" ? $class : $class->_finalized_psgi_app;
-
-            my $ret;
-            require Plack::Test;
-            Plack::Test::test_psgi(
-                app    => sub { $app->(%{ $_[0] }) },
-                client => sub { $ret = shift->($request) },
-            );
-            return $ret;
-        };
-
-    }
-}
-
-my $entrypoint = "http://localhost/foo";
-
-{
-    my $request = HTTP::Request->new( GET => $entrypoint );
-
-    ok( my $response = request($request), 'Request' );
-    ok( $response->is_success, 'Response Successful 2xx' );
-    is( $response->code, 200, 'Response Code' );
-    is_deeply( [ $response->content_type ], [ 'application/json', 'charset=utf-8' ] );
-
-    my $data = JSON::from_json($response->content);
-    is $data->{json_foo}, "bar";
-    is_deeply $data->{json_baz}, [ 1, 2, 3 ];
-    ok ! $data->{foo}, "doesn't return stash that doesn't match json_";
-}
-
-{
-    my $request = HTTP::Request->new( GET => "http://localhost/foo2" );
-
-    ok( my $response = request($request), 'Request' );
-    ok( $response->is_success, 'Response Successful 2xx' );
-    is( $response->code, 200, 'Response Code' );
-    is_deeply( [ $response->content_type ], [ 'application/json', 'charset=utf-8' ] );
-
-    my $data = JSON::from_json($response->content);
-    is_deeply( $data, [1, 2, 3] );
-}
-
-{
-    my $request = HTTP::Request->new( GET => $entrypoint . "?cb=foobar" );
-
-    ok( my $response = request($request), 'Request' );
-    ok( $response->is_success, 'Response Successful 2xx' );
-    is( $response->code, 200, 'Response Code' );
-    is_deeply( [ $response->content_type ], [ 'application/json', 'charset=utf-8' ] );
-
-    my $body = $response->content;
-    ok $body =~ s/^foobar\((.*?)\);$/$1/sg, "wrapped in a callback";
-
-    my $data = JSON::from_json($body);
-    is $data->{json_foo}, "bar";
-    is_deeply $data->{json_baz}, [ 1, 2, 3 ];
-    ok ! $data->{foo}, "doesn't return stash that doesn't match json_";
-}
-
-{
-    my $request = HTTP::Request->new( GET => $entrypoint . "?cb=foobar%28" );
-
-    ok( my $response = request($request), 'Request' );
-    like $response->header('X-Error'), qr/Invalid callback parameter/;
-}
-
-{
-    my $request = HTTP::Request->new( GET => "http://localhost/foo3" );
-
-    ok( my $response = request($request), 'Request' );
-    is_deeply( [ $response->content_type ], [ 'application/json', 'charset=utf-8' ] );
-    ok decode('utf-8', $response->content);
-}
-
-{
-    my $request = HTTP::Request->new( GET => "http://localhost/foo4" );
-
-    ok( my $response = request($request), 'Request' );
-    is_deeply( [ $response->content_type ], [ 'application/json', 'charset=euc-jp' ] );
-    ok decode('euc-jp', $response->content);
-}
-
-{
-    my $request = HTTP::Request->new( GET => "http://localhost/foo3" );
-    $request->header("User-Agent", "Safari");
-
-    ok( my $response = request($request), 'Request' );
-    is_deeply( [ $response->content_type ], [ 'application/json', 'charset=utf-8' ] );
-    my $bom = substr $response->content, 0, 3;
-    is $bom, "\xEF\xBB\xBF";
-}
-
-{
-    my $request = HTTP::Request->new( GET => "http://localhost/foo3" );
-    $request->header("User-Agent", "Safari");
-
-    ok( my $response = request($request), 'Request' );
-    is_deeply( [ $response->content_type ], [ 'application/json', 'charset=utf-8' ] );
-    my $bom = substr $response->content, 0, 3;
-    is $bom, "\xEF\xBB\xBF";
-}
-
-{
-    my $request = HTTP::Request->new( GET => "http://localhost/foo3" );
-    $request->header("X-Prototype-Version", "1.5");
-
-    ok( my $response = request($request), 'Request' );
-    ok $response->header('X-JSON');
-}
-
-{
-    my $request = HTTP::Request->new( GET => "http://localhost/foo5" );
-    $request->header("X-Prototype-Version", "1.5");
-
-    ok( my $response = request($request), 'Request' );
-    ok !$response->header('X-JSON');
-}
-
-{
-    my $request = HTTP::Request->new( GET => "http://localhost/foo6" );
-
-    ok( my $response = request($request), 'Request' );
-    my $data = JSON::from_json($response->content);
-    is $data->{foo}, "fake";
-}
-
-
diff --git a/sources/Catalyst-View-JSON/t/lib/TestApp.pm b/sources/Catalyst-View-JSON/t/lib/TestApp.pm
deleted file mode 100644
index ff412ff..0000000
--- a/sources/Catalyst-View-JSON/t/lib/TestApp.pm
+++ /dev/null
@@ -1,28 +0,0 @@
-package TestApp;
-
-use strict;
-use warnings;
-use MRO::Compat;
-
-use Catalyst;
-
-our $VERSION = '0.01';
-__PACKAGE__->config({
-    name => 'TestApp',
-    disable_component_resolution_regex_fallback => 1,
-    'View::JSON' => {
-        expose_stash => qr/^json_/,
-        allow_callback => 1,
-        callback_param => 'cb',
-    },
-});
-
-__PACKAGE__->setup;
-
-sub finalize_error {
-    my $c = shift;
-    $c->res->header('X-Error' => $c->error->[0]);
-    $c->next::method;
-}
-
-1;
diff --git a/sources/Catalyst-View-JSON/t/lib/TestApp/Controller/Root.pm b/sources/Catalyst-View-JSON/t/lib/TestApp/Controller/Root.pm
deleted file mode 100644
index 8920fb3..0000000
--- a/sources/Catalyst-View-JSON/t/lib/TestApp/Controller/Root.pm
+++ /dev/null
@@ -1,58 +0,0 @@
-package TestApp::Controller::Root;
-
-use strict;
-use warnings;
-
-use base 'Catalyst::Controller';
-
-__PACKAGE__->config(namespace => '');
-
-sub foo : Global {
-    my ( $self, $c ) = @_;
-
-    $c->component('View::JSON')->expose_stash(qr/^json_/);
-    $c->stash->{json_foo} = "bar";
-    $c->stash->{json_baz} = [ 1, 2, 3 ];
-    $c->stash->{foo}      = "barbarbar";
-
-    $c->forward('View::JSON');
-}
-
-sub foo2 : Global {
-    my( $self, $c ) = @_;
-
-    $c->component('View::JSON')->expose_stash('json_baz');
-    $c->stash->{json_foo} = "bar";
-    $c->stash->{json_baz} = [ 1, 2, 3 ];
-
-    $c->forward('View::JSON');
-}
-
-sub foo3 : Global {
-    my( $self, $c ) = @_;
-    $c->stash->{json_foo} = "\x{5bae}\x{5ddd}";
-    $c->component('View::JSON')->encoding('utf-8');
-    $c->forward('View::JSON');
-}
-
-sub foo4 : Global {
-    my( $self, $c ) = @_;
-    $c->stash->{json_foo} = "\x{5bae}\x{5ddd}";
-    $c->component('View::JSON')->encoding('euc-jp');
-    $c->forward('View::JSON');
-}
-
-sub foo5 : Global {
-    my( $self, $c ) = @_;
-    $c->stash->{json_foo} = "\x{5bae}\x{5ddd}";
-    $c->component('View::JSON')->no_x_json_header(1);
-    $c->forward('View::JSON');
-}
-
-sub foo6 : Global {
-    my( $self, $c ) = @_;
-    $c->stash->{json_foo} = "\x{5bae}\x{5ddd}";
-    $c->forward('View::JSON2');
-}
-
-1;
diff --git a/sources/Catalyst-View-JSON/t/lib/TestApp/View/JSON.pm b/sources/Catalyst-View-JSON/t/lib/TestApp/View/JSON.pm
deleted file mode 100644
index f5381c0..0000000
--- a/sources/Catalyst-View-JSON/t/lib/TestApp/View/JSON.pm
+++ /dev/null
@@ -1,4 +0,0 @@
-package TestApp::View::JSON;
-use base qw( Catalyst::View::JSON );
-
-1;
diff --git a/sources/Catalyst-View-JSON/t/lib/TestApp/View/JSON2.pm b/sources/Catalyst-View-JSON/t/lib/TestApp/View/JSON2.pm
deleted file mode 100644
index ab8d40e..0000000
--- a/sources/Catalyst-View-JSON/t/lib/TestApp/View/JSON2.pm
+++ /dev/null
@@ -1,10 +0,0 @@
-package TestApp::View::JSON2;
-use base qw( Catalyst::View::JSON );
-use YAML;
-
-sub encode_json {
-    my($self, $c, $data) = @_;
-    return qq({"foo":"fake"});
-}
-
-1;
diff --git a/sources/Catalyst-View-JSON/t/lib/TestAppUnicode.pm b/sources/Catalyst-View-JSON/t/lib/TestAppUnicode.pm
deleted file mode 100644
index 8140fa8..0000000
--- a/sources/Catalyst-View-JSON/t/lib/TestAppUnicode.pm
+++ /dev/null
@@ -1,19 +0,0 @@
-package TestAppUnicode;
-
-use strict;
-use warnings;
-
-use Catalyst qw( Unicode );
-
-__PACKAGE__->config({
-    name => 'TestAppUnicode',
-    disable_component_resolution_regex_fallback => 1,
-    'View::JSON' => {
-        allow_callback => 1,
-        callback_param => 'cb',
-    },
-});
-
-__PACKAGE__->setup;
-
-1;
diff --git a/sources/Catalyst-View-JSON/t/lib/TestAppUnicode/Controller/Root.pm b/sources/Catalyst-View-JSON/t/lib/TestAppUnicode/Controller/Root.pm
deleted file mode 100644
index 7b42c08..0000000
--- a/sources/Catalyst-View-JSON/t/lib/TestAppUnicode/Controller/Root.pm
+++ /dev/null
@@ -1,16 +0,0 @@
-package TestAppUnicode::Controller::Root;
-
-use strict;
-use warnings;
-
-use base 'Catalyst::Controller';
-
-__PACKAGE__->config(namespace => '');
-
-sub foo : Global {
-    my ( $self, $c ) = @_;
-    $c->stash->{foo} = "\x{30c6}\x{30b9}\x{30c8}";
-    $c->forward('View::JSON');
-}
-
-1;
diff --git a/sources/Catalyst-View-JSON/t/lib/TestAppUnicode/View/JSON.pm b/sources/Catalyst-View-JSON/t/lib/TestAppUnicode/View/JSON.pm
deleted file mode 100644
index 192afb4..0000000
--- a/sources/Catalyst-View-JSON/t/lib/TestAppUnicode/View/JSON.pm
+++ /dev/null
@@ -1,4 +0,0 @@
-package TestAppUnicode::View::JSON;
-use base qw( Catalyst::View::JSON );
-
-1;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcatalyst-modules-perl.git



More information about the Pkg-perl-cvs-commits mailing list