update Mojolicious and added Mojolicious::Plugin::INICo... ・ 3d8f311 ・ Gitprep

- update Mojolicious and added Mojolicious::Plugin::INICo...
  
  ...nfig and display ssh URL
- Browse files
- Yuki Kimoto commited on 2013-03-20
- 1 parent cc38c8d
  
  commit 3d8f31136da7a6f9789c218e1253b3f7d8aa0ff9

Showing 153 changed files with 3207 additions and 2785 deletions

.gitignore

...	...	@@ -29,3 +29,4 @@ db/*
29	29	!db/.gitignore
30	30	extlib/*
31	31	rep/*
	32	+gitprep.my.ini

cpanfile

View

...	...	@@ -2,3 +2,6 @@ requires 'DBI', '== 1.621';
2	2	requires 'DBD::SQLite', '== 1.37';
3	3	requires 'Object::Simple', '== 3.08';
4	4	requires 'DBIx::Custom', '== 0.28';
	5	+requires 'Mojolicious::Plugin::INIConfig', '== 0.02';
	6	+requires 'Mojolicious', '== 3.91';
	7	+requires 'Config::Tiny', '== 2.14';

gitprep.conf

View

...	...	@@ -0,0 +1,6 @@
	1	+[basic]
	2	+;;; SSH port
	3	+;ssh_port=55555
	4	+
	5	+[hypnotoad]
	6	+listen=http://*:10020

gitprep.my.conf

View

...	...	@@ -0,0 +1,6 @@
	1	+[basic]
	2	+;;; SSH port
	3	+ssh_port=55555
	4	+
	5	+[hypnotoad]
	6	+listen=http://*:10020

+6 -3

lib/Gitprep.pm

View

@@ -20,9 +20,12 @@ sub startup {
   my $self = shift;
   
   # Config
-  #my $conf_file = $ENV{GITPREP_CONFIG_FILE}
-  #  || $self->home->rel_file('gitprep.conf');
-  #$self->plugin('JSONConfigLoose', {file => $conf_file}) if -f $conf_file;
+  $self->plugin('INIConfig', {ext => 'conf'});
+  
+  # My Config(Development)
+  my $my_conf_file = $self->home->rel_file('gitprep.my.conf');
+  $self->plugin('INIConfig', {file => $my_conf_file}) if -f $my_conf_file;
+  
   my $conf = $self->config;
   $conf->{root} = $self->home->rel_file('rep');
   $conf->{hypnotoad} ||= {listen => ["http://*:10020"]};

-3

mojolegacy/README.txt

View

...	...	@@ -1,3 +0,0 @@
1		-This is Mojolicious v3.70 back porting to perl 5.8.7
2		-
3		- https://github.com/jamadam/mojo-legacy

+9 -12

mojolegacy/lib/Mojo.pm

View

@@ -15,10 +15,9 @@ has log  => sub { Mojo::Log->new };
 has ua   => sub {
   my $self = shift;
 
-  # Fresh user agent
   my $ua = Mojo::UserAgent->new->app($self);
   weaken $self;
-  $ua->on(error => sub { $self->log->error(pop) });
+  $ua->on(error => sub { $self->log->error($_[1]) });
   weaken $ua->{app};
 
   return $ua;
@@ -27,10 +26,8 @@ has ua   => sub {
 sub new {
   my $self = shift->SUPER::new(@_);
 
-  # Detect home directory
+  # Check if we have a log directory
   my $home = $self->home->detect(ref $self);
-
-  # Log directory
   $self->log->path($home->rel_file('log/mojo.log'))
     if -w $home->rel_file('log');
 
@@ -101,7 +98,7 @@ See L<Mojolicious> for more!
 
 L<Mojo> implements the following attributes.
 
-=head2 C<home>
+=head2 home
 
   my $home = $app->home;
   $app     = $app->home(Mojo::Home->new);
@@ -112,7 +109,7 @@ which stringifies to the actual path.
   # Generate portable path relative to home directory
   my $path = $app->home->rel_file('data/important.txt');
 
-=head2 C<log>
+=head2 log
 
   my $log = $app->log;
   $app    = $app->log(Mojo::Log->new);
@@ -122,7 +119,7 @@ The logging layer of your application, defaults to a L<Mojo::Log> object.
   # Log debug message
   $app->log->debug('It works!');
 
-=head2 C<ua>
+=head2 ua
 
   my $ua = $app->ua;
   $app   = $app->ua(Mojo::UserAgent->new);
@@ -140,21 +137,21 @@ interfere with new blocking ones.
 L<Mojo> inherits all methods from L<Mojo::Base> and implements the following
 new ones.
 
-=head2 C<new>
+=head2 new
 
   my $app = Mojo->new;
 
 Construct a new L<Mojo> application. Will automatically detect your home
 directory and set up logging to C<log/mojo.log> if there's a C<log> directory.
 
-=head2 C<build_tx>
+=head2 build_tx
 
   my $tx = $app->build_tx;
 
 Transaction builder, defaults to building a L<Mojo::Transaction::HTTP>
 object.
 
-=head2 C<config>
+=head2 config
 
   my $config = $app->config;
   my $foo    = $app->config('foo');
@@ -168,7 +165,7 @@ Application configuration.
   my $foo = $app->config->{foo};
   delete $app->config->{foo};
 
-=head2 C<handler>
+=head2 handler
 
   $app->handler(Mojo::Transaction::HTTP->new);
 

+16 -12

mojolegacy/lib/Mojo/Asset.pm

View

@@ -40,18 +40,22 @@ Mojo::Asset - HTTP content storage base class
 
 L<Mojo::Asset> is an abstract base class for HTTP content storage.
 
+=head1 EVENTS
+
+L<Mojo::Asset> inherits all events from L<Mojo::EventEmitter>.
+
 =head1 ATTRIBUTES
 
 L<Mojo::Asset> implements the following attributes.
 
-=head2 C<end_range>
+=head2 end_range
 
   my $end = $asset->end_range;
   $asset  = $asset->end_range(8);
 
 Pretend file ends earlier.
 
-=head2 C<start_range>
+=head2 start_range
 
   my $start = $asset->start_range;
   $asset    = $asset->start_range(0);
@@ -63,53 +67,53 @@ Pretend file starts later.
 L<Mojo::Asset> inherits all methods from L<Mojo::EventEmitter> and implements
 the following new ones.
 
-=head2 C<add_chunk>
+=head2 add_chunk
 
   $asset = $asset->add_chunk('foo bar baz');
 
 Add chunk of data to asset. Meant to be overloaded in a subclass.
 
-=head2 C<contains>
+=head2 contains
 
   my $position = $asset->contains('bar');
 
 Check if asset contains a specific string. Meant to be overloaded in a
 subclass.
 
-=head2 C<get_chunk>
+=head2 get_chunk
 
-  my $chunk = $asset->get_chunk($offset);
+  my $bytes = $asset->get_chunk($offset);
 
 Get chunk of data starting from a specific position. Meant to be overloaded
 in a subclass.
 
-=head2 C<is_file>
+=head2 is_file
 
   my $false = $asset->is_file;
 
 False.
 
-=head2 C<is_range>
+=head2 is_range
 
   my $success = $asset->is_range;
 
 Check if asset has a C<start_range> or C<end_range>.
 
-=head2 C<move_to>
+=head2 move_to
 
   $asset = $asset->move_to('/home/sri/foo.txt');
 
 Move asset data into a specific file. Meant to be overloaded in a subclass.
 
-=head2 C<size>
+=head2 size
 
   my $size = $asset->size;
 
 Size of asset data in bytes. Meant to be overloaded in a subclass.
 
-=head2 C<slurp>
+=head2 slurp
 
-  my $string = $asset->slurp;
+  my $bytes = $asset->slurp;
 
 Read all asset data at once. Meant to be overloaded in a subclass.
 

+21 -20

mojolegacy/lib/Mojo/Asset/File.pm

View

@@ -5,7 +5,7 @@ use Carp 'croak';
 use Errno 'EEXIST';
 use Fcntl qw(O_CREAT O_EXCL O_RDWR);
 use File::Copy 'move';
-use File::Spec;
+use File::Spec::Functions 'catfile';
 use IO::File;
 use Mojo::Util 'md5_sum';
 
@@ -17,12 +17,12 @@ has handle => sub {
   my $handle = IO::File->new;
   my $path   = $self->path;
   if (defined $path && -f $path) {
-    $handle->open("< $path") or croak qq{Can't open file "$path": $!};
+    $handle->open($path, '<') or croak qq{Can't open file "$path": $!};
     return $handle;
   }
 
   # Open new or temporary file
-  my $base = File::Spec->catfile($self->tmpdir, 'mojo.tmp');
+  my $base = catfile File::Spec::Functions::tmpdir, 'mojo.tmp';
   my $name = defined $path ? $path : $base;
   until ($handle->open($name, O_CREAT | O_EXCL | O_RDWR)) {
     croak qq{Can't open file "$name": $!} if defined $path || $! != $!{EEXIST};
@@ -35,7 +35,7 @@ has handle => sub {
 
   return $handle;
 };
-has tmpdir => sub { $ENV{MOJO_TMPDIR} || File::Spec->tmpdir };
+has tmpdir => sub { $ENV{MOJO_TMPDIR} || File::Spec::Functions::tmpdir };
 
 sub DESTROY {
   my $self = shift;
@@ -59,7 +59,6 @@ sub add_chunk {
 sub contains {
   my ($self, $string) = @_;
 
-  # Seek to start
   my $handle = $self->handle;
   $handle->sysseek($self->start_range, SEEK_SET);
 
@@ -95,12 +94,10 @@ sub contains {
 sub get_chunk {
   my ($self, $start) = @_;
 
-  # Seek to start
   $start += $self->start_range;
   my $handle = $self->handle;
   $handle->sysseek($start, SEEK_SET);
 
-  # Range support
   my $buffer;
   if (defined(my $end = $self->end_range)) {
     my $chunk = $end + 1 - $start;
@@ -165,26 +162,30 @@ Mojo::Asset::File - File storage for HTTP content
 
 L<Mojo::Asset::File> is a file storage backend for HTTP content.
 
+=head1 EVENTS
+
+L<Mojo::Asset::File> inherits all events from L<Mojo::Asset>.
+
 =head1 ATTRIBUTES
 
 L<Mojo::Asset::File> inherits all attributes from L<Mojo::Asset> and
 implements the following new ones.
 
-=head2 C<cleanup>
+=head2 cleanup
 
   my $cleanup = $file->cleanup;
   $file       = $file->cleanup(1);
 
 Delete file automatically once it's not used anymore.
 
-=head2 C<handle>
+=head2 handle
 
   my $handle = $file->handle;
   $file      = $file->handle(IO::File->new);
 
 File handle, created on demand.
 
-=head2 C<path>
+=head2 path
 
   my $path = $file->path;
   $file    = $file->path('/home/sri/foo.txt');
@@ -192,7 +193,7 @@ File handle, created on demand.
 File path used to create C<handle>, can also be automatically generated if
 necessary.
 
-=head2 C<tmpdir>
+=head2 tmpdir
 
   my $tmpdir = $file->tmpdir;
   $file      = $file->tmpdir('/tmp');
@@ -205,45 +206,45 @@ C<MOJO_TMPDIR> environment variable or auto detection.
 L<Mojo::Asset::File> inherits all methods from L<Mojo::Asset> and implements
 the following new ones.
 
-=head2 C<add_chunk>
+=head2 add_chunk
 
   $file = $file->add_chunk('foo bar baz');
 
 Add chunk of data.
 
-=head2 C<contains>
+=head2 contains
 
   my $position = $file->contains('bar');
 
 Check if asset contains a specific string.
 
-=head2 C<get_chunk>
+=head2 get_chunk
 
-  my $chunk = $file->get_chunk($start);
+  my $bytes = $file->get_chunk($start);
 
 Get chunk of data starting from a specific position.
 
-=head2 C<is_file>
+=head2 is_file
 
   my $true = $file->is_file;
 
 True.
 
-=head2 C<move_to>
+=head2 move_to
 
   $file = $file->move_to('/home/sri/bar.txt');
 
 Move asset data into a specific file and disable C<cleanup>.
 
-=head2 C<size>
+=head2 size
 
   my $size = $file->size;
 
 Size of asset data in bytes.
 
-=head2 C<slurp>
+=head2 slurp
 
-  my $string = $file->slurp;
+  my $bytes = $file->slurp;
 
 Read all asset data at once.
 

+14 -13

mojolegacy/lib/Mojo/Asset/Memory.pm

View

@@ -73,9 +73,10 @@ L<Mojo::Asset::Memory> is an in-memory storage backend for HTTP content.
 
 =head1 EVENTS
 
-L<Mojo::Asset::Memory> can emit the following events.
+L<Mojo::Asset::Memory> inherits all events from L<Mojo::Asset> and can emit
+the following new ones.
 
-=head2 C<upgrade>
+=head2 upgrade
 
   $mem->on(upgrade => sub {
     my ($mem, $file) = @_;
@@ -94,7 +95,7 @@ Emitted when asset gets upgraded to a L<Mojo::Asset::File> object.
 L<Mojo::Asset::Memory> inherits all attributes from L<Mojo::Asset> and
 implements the following new ones.
 
-=head2 C<auto_upgrade>
+=head2 auto_upgrade
 
   my $upgrade = $mem->auto_upgrade;
   $mem        = $mem->auto_upgrade(1);
@@ -102,7 +103,7 @@ implements the following new ones.
 Try to detect if content size exceeds C<max_memory_size> limit and
 automatically upgrade to a L<Mojo::Asset::File> object.
 
-=head2 C<max_memory_size>
+=head2 max_memory_size
 
   my $size = $mem->max_memory_size;
   $mem     = $mem->max_memory_size(1024);
@@ -116,46 +117,46 @@ C<MOJO_MAX_MEMORY_SIZE> environment variable or C<262144>.
 L<Mojo::Asset::Memory> inherits all methods from L<Mojo::Asset> and implements
 the following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $mem = Mojo::Asset::Memory->new;
 
 Construct a new L<Mojo::Asset::Memory> object.
 
-=head2 C<add_chunk>
+=head2 add_chunk
 
   $mem     = $mem->add_chunk('foo bar baz');
   my $file = $mem->add_chunk('abc' x 262144);
 
 Add chunk of data and upgrade to L<Mojo::Asset::File> object if necessary.
 
-=head2 C<contains>
+=head2 contains
 
   my $position = $mem->contains('bar');
 
 Check if asset contains a specific string.
 
-=head2 C<get_chunk>
+=head2 get_chunk
 
-  my $chunk = $mem->get_chunk($offset);
+  my $bytes = $mem->get_chunk($offset);
 
 Get chunk of data starting from a specific position.
 
-=head2 C<move_to>
+=head2 move_to
 
   $mem = $mem->move_to('/home/sri/foo.txt');
 
 Move asset data into a specific file.
 
-=head2 C<size>
+=head2 size
 
   my $size = $mem->size;
 
 Size of asset data in bytes.
 
-=head2 C<slurp>
+=head2 slurp
 
-  my $string = mem->slurp;
+  my $bytes = mem->slurp;
 
 Read all asset data at once.
 

+8 -16

mojolegacy/lib/Mojo/Base.pm

View

@@ -2,8 +2,6 @@ package Mojo::Base;
 
 use strict;
 use warnings;
-
-# Mojo modules are modern!
 use utf8;
 
 # No imports because we get subclassed, a lot!
@@ -16,8 +14,6 @@ use IO::Handle ();
 sub import {
   my $class = shift;
   return unless my $flag = shift;
-
-  # No limits!
   no strict 'refs';
 
   # Base
@@ -37,8 +33,6 @@ sub import {
   if ($flag) {
     my $caller = caller;
     push @{"${caller}::ISA"}, $flag;
-
-    # Can haz?
     *{"${caller}::has"} = sub { attr($caller, @_) };
   }
   
@@ -64,14 +58,12 @@ sub attr {
   my ($class, $attrs, $default) = @_;
   return unless ($class = ref $class || $class) && $attrs;
 
-  # Check default
-  Carp::croak('Default has to be a code reference or constant value')
+  Carp::croak 'Default has to be a code reference or constant value'
     if ref $default && ref $default ne 'CODE';
 
-  # Create attributes
+  # Compile attributes
   for my $attr (@{ref $attrs eq 'ARRAY' ? $attrs : [$attrs]}) {
-    Carp::croak(qq{Attribute "$attr" invalid})
-      unless $attr =~ /^[a-zA-Z_]\w*$/;
+    Carp::croak qq{Attribute "$attr" invalid} unless $attr =~ /^[a-zA-Z_]\w*$/;
 
     # Header (check arguments)
     my $code = "package $class;\nsub $attr {\n  if (\@_ == 1) {\n";
@@ -100,7 +92,7 @@ sub attr {
     # We compile custom attribute code for speed
     no strict 'refs';
     warn "-- Attribute $attr in $class\n$code\n\n" if $ENV{MOJO_BASE_DEBUG};
-    Carp::croak("Mojo::Base error: $@") unless eval "$code;1";
+    Carp::croak "Mojo::Base error: $@" unless eval "$code;1";
   }
 }
 
@@ -184,7 +176,7 @@ All three forms save a lot of typing.
 L<Mojo::Base> exports the following functions if imported with the C<-base>
 flag or a base class.
 
-=head2 C<has>
+=head2 has
 
   has 'name';
   has [qw(name1 name2 name3)];
@@ -199,7 +191,7 @@ Create attributes for hash-based objects, just like the C<attr> method.
 
 L<Mojo::Base> implements the following methods.
 
-=head2 C<new>
+=head2 new
 
   my $object = BaseSubClass->new;
   my $object = BaseSubClass->new(name => 'value');
@@ -208,7 +200,7 @@ L<Mojo::Base> implements the following methods.
 This base class provides a basic constructor for hash-based objects. You can
 pass it either a hash or a hash reference with attribute values.
 
-=head2 C<attr>
+=head2 attr
 
   $object->attr('name');
   BaseSubClass->attr('name');
@@ -225,7 +217,7 @@ be excuted at accessor read time if there's no set value. Accessors can be
 chained, that means they return their invocant when they are called with an
 argument.
 
-=head2 C<tap>
+=head2 tap
 
   $object = $object->tap(sub {...});
 

+39 -47

mojolegacy/lib/Mojo/ByteStream.pm

View

@@ -11,10 +11,11 @@ our @EXPORT_OK = ('b');
 # Turn most functions from Mojo::Util into methods
 my @UTILS = (
   qw(b64_decode b64_encode camelize decamelize hmac_md5_sum hmac_sha1_sum),
-  qw(html_escape html_unescape md5_bytes md5_sum punycode_decode),
-  qw(punycode_encode quote sha1_bytes sha1_sum slurp spurt squish trim),
-  qw(unquote url_escape url_unescape xml_escape xor_encode)
+  qw(html_unescape md5_bytes md5_sum punycode_decode punycode_encode quote),
+  qw(sha1_bytes sha1_sum slurp spurt squish trim unquote url_escape),
+  qw(url_unescape xml_escape xor_encode)
 );
+push @UTILS, 'html_escape';    # DEPRECATED in Rainbow!
 for my $name (@UTILS) {
   my $sub = Mojo::Util->can($name);
   Mojo::Util::monkey_patch __PACKAGE__, $name, sub {
@@ -85,7 +86,7 @@ Mojo::ByteStream - ByteStream
 
   # Use the alternative constructor
   use Mojo::ByteStream 'b';
-  my $stream = b('foobarbaz')->html_escape;
+  my $stream = b('foobarbaz')->b64_encode('')->say;
 
 =head1 DESCRIPTION
 
@@ -96,7 +97,7 @@ manipulation functions in L<Mojo::Util>.
 
 L<Mojo::ByteStream> implements the following functions.
 
-=head2 C<b>
+=head2 b
 
   my $stream = b('test123');
 
@@ -107,19 +108,19 @@ Construct a new scalar-based L<Mojo::ByteStream> object.
 L<Mojo::ByteStream> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $stream = Mojo::ByteStream->new('test123');
 
 Construct a new scalar-based L<Mojo::ByteStream> object.
 
-=head2 C<b64_decode>
+=head2 b64_decode
 
   $stream = $stream->b64_decode;
 
 Base64 decode bytestream with L<Mojo::Util/"b64_decode">.
 
-=head2 C<b64_encode>
+=head2 b64_encode
 
   $stream = $stream->b64_encode;
   $stream = $stream->b64_encode("\n");
@@ -128,25 +129,25 @@ Base64 encode bytestream with L<Mojo::Util/"b64_encode">.
 
   b('foo bar baz')->b64_encode('')->say;
 
-=head2 C<camelize>
+=head2 camelize
 
   $stream = $stream->camelize;
 
 Camelize bytestream with L<Mojo::Util/"camelize">.
 
-=head2 C<clone>
+=head2 clone
 
   my $stream2 = $stream->clone;
 
 Clone bytestream.
 
-=head2 C<decamelize>
+=head2 decamelize
 
   $stream = $stream->decamelize;
 
 Decamelize bytestream with L<Mojo::Util/"decamelize">.
 
-=head2 C<decode>
+=head2 decode
 
   $stream = $stream->decode;
   $stream = $stream->decode('iso-8859-1');
@@ -155,7 +156,7 @@ Decode bytestream with L<Mojo::Util/"decode">, defaults to C<UTF-8>.
 
   $stream->decode('UTF-16LE')->unquote->trim->say;
 
-=head2 C<encode>
+=head2 encode
 
   $stream = $stream->encode;
   $stream = $stream->encode('iso-8859-1');
@@ -164,13 +165,13 @@ Encode bytestream with L<Mojo::Util/"encode">, defaults to C<UTF-8>.
 
   $stream->trim->quote->encode->say;
 
-=head2 C<hmac_md5_sum>
+=head2 hmac_md5_sum
 
   $stream = $stream->hmac_md5_sum('passw0rd');
 
 Generate HMAC-MD5 checksum for bytestream with L<Mojo::Util/"hmac_md5_sum">.
 
-=head2 C<hmac_sha1_sum>
+=head2 hmac_sha1_sum
 
   $stream = $stream->hmac_sha1_sum('passw0rd');
 
@@ -178,16 +179,7 @@ Generate HMAC-SHA1 checksum for bytestream with L<Mojo::Util/"hmac_sha1_sum">.
 
   b('foo bar baz')->hmac_sha1_sum('secr3t')->quote->say;
 
-=head2 C<html_escape>
-
-  $stream = $stream->html_escape;
-  $stream = $stream->html_escape('^\n\r\t !#$%(-;=?-~');
-
-Escape unsafe characters in bytestream with L<Mojo::Util/"html_escape">.
-
-  b('<html>')->html_escape->say;
-
-=head2 C<html_unescape>
+=head2 html_unescape
 
   $stream = $stream->html_unescape;
 
@@ -195,44 +187,44 @@ Unescape all HTML entities in bytestream with L<Mojo::Util/"html_unescape">.
 
   b('&lt;html&gt;')->html_unescape->url_escape->say;
 
-=head2 C<md5_bytes>
+=head2 md5_bytes
 
   $stream = $stream->md5_bytes;
 
 Generate binary MD5 checksum for bytestream with L<Mojo::Util/"md5_bytes">.
 
-=head2 C<md5_sum>
+=head2 md5_sum
 
   $stream = $stream->md5_sum;
 
 Generate MD5 checksum for bytestream with L<Mojo::Util/"md5_sum">.
 
-=head2 C<punycode_decode>
+=head2 punycode_decode
 
   $stream = $stream->punycode_decode;
 
 Punycode decode bytestream with L<Mojo::Util/"punycode_decode">.
 
-=head2 C<punycode_encode>
+=head2 punycode_encode
 
   $stream = $stream->punycode_encode;
 
 Punycode encode bytestream with L<Mojo::Util/"punycode_encode">.
 
-=head2 C<quote>
+=head2 quote
 
   $stream = $stream->quote;
 
 Quote bytestream with L<Mojo::Util/"quote">.
 
-=head2 C<say>
+=head2 say
 
   $stream->say;
   $stream->say(*STDERR);
 
 Print bytestream to handle and append a newline, defaults to C<STDOUT>.
 
-=head2 C<secure_compare>
+=head2 secure_compare
 
   my $success = $stream->secure_compare($string);
 
@@ -240,25 +232,25 @@ Compare bytestream with L<Mojo::Util/"secure_compare">.
 
   say 'Match!' if b('foo')->secure_compare('foo');
 
-=head2 C<sha1_bytes>
+=head2 sha1_bytes
 
   $stream = $stream->sha1_bytes;
 
 Generate binary SHA1 checksum for bytestream with L<Mojo::Util/"sha1_bytes">.
 
-=head2 C<sha1_sum>
+=head2 sha1_sum
 
   $stream = $stream->sha1_sum;
 
 Generate SHA1 checksum for bytestream with L<Mojo::Util/"sha1_sum">.
 
-=head2 C<size>
+=head2 size
 
   my $size = $stream->size;
 
 Size of bytestream.
 
-=head2 C<slurp>
+=head2 slurp
 
   $stream = $stream->slurp;
 
@@ -266,7 +258,7 @@ Read all data at once from file into bytestream with L<Mojo::Util/"slurp">.
 
   b('/home/sri/myapp.pl')->slurp->split("\n")->shuffle->join("\n")->say;
 
-=head2 C<spurt>
+=head2 spurt
 
   $stream = $stream->spurt('/home/sri/myapp.pl');
 
@@ -274,7 +266,7 @@ Write all data from bytestream at once to file with L<Mojo::Util/"spurt">.
 
   b('/home/sri/foo.txt')->slurp->squish->spurt('/home/sri/bar.txt');
 
-=head2 C<split>
+=head2 split
 
   my $collection = $stream->split(',');
 
@@ -282,7 +274,7 @@ Turn bytestream into L<Mojo::Collection>.
 
   b('a,b,c')->split(',')->pluck('quote')->join(',')->say;
 
-=head2 C<squish>
+=head2 squish
 
   $stream = $stream->squish;
 
@@ -290,27 +282,27 @@ Trim whitespace characters from both ends of bytestream and then change all
 consecutive groups of whitespace into one space each with
 L<Mojo::Util/"squish">.
 
-=head2 C<to_string>
+=head2 to_string
 
   my $string = $stream->to_string;
   my $string = "$stream";
 
 Stringify bytestream.
 
-=head2 C<trim>
+=head2 trim
 
   $stream = $stream->trim;
 
 Trim whitespace characters from both ends of bytestream with
 L<Mojo::Util/"trim">.
 
-=head2 C<unquote>
+=head2 unquote
 
   $stream = $stream->unquote;
 
 Unquote bytestream with L<Mojo::Util/"unquote">.
 
-=head2 C<url_escape>
+=head2 url_escape
 
   $stream = $stream->url_escape;
   $stream = $stream->url_escape('^A-Za-z0-9\-._~');
@@ -320,23 +312,23 @@ L<Mojo::Util/"url_escape">.
 
   b('foo bar baz')->url_escape->say;
 
-=head2 C<url_unescape>
+=head2 url_unescape
 
   $stream = $stream->url_unescape;
 
 Decode percent encoded characters in bytestream with
 L<Mojo::Util/"url_unescape">.
 
-  b('%3Chtml%3E')->url_unescape->html_escape->say;
+  b('%3Chtml%3E')->url_unescape->xml_escape->say;
 
-=head2 C<xml_escape>
+=head2 xml_escape
 
   $stream = $stream->xml_escape;
 
 Escape only the characters C<&>, C<E<lt>>, C<E<gt>>, C<"> and C<'> in
 bytestream with L<Mojo::Util/"xml_escape">.
 
-=head2 C<xor_encode>
+=head2 xor_encode
 
   $stream = $stream->xor_encode($key);
 

+3 -4

mojolegacy/lib/Mojo/Cache.pm

View

@@ -8,7 +8,6 @@ sub get { (shift->{cache} || {})->{shift()} }
 sub set {
   my ($self, $key, $value) = @_;
 
-  # Cache with size limit
   my $cache = $self->{cache} ||= {};
   my $queue = $self->{queue} ||= [];
   delete $cache->{shift @$queue} if @$queue >= $self->max_keys;
@@ -40,7 +39,7 @@ L<Mojo::Cache> is a naive in-memory cache with size limits.
 
 L<Mojo::Cache> implements the following attributes.
 
-=head2 C<max_keys>
+=head2 max_keys
 
   my $max = $cache->max_keys;
   $cache  = $cache->max_keys(50);
@@ -52,13 +51,13 @@ Maximum number of cache keys, defaults to C<100>.
 L<Mojo::Cache> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<get>
+=head2 get
 
   my $value = $cache->get('foo');
 
 Get cached value.
 
-=head2 C<set>
+=head2 set
 
   $cache = $cache->set(foo => 'bar');
 

+14 -14

mojolegacy/lib/Mojo/Collection.pm

View

@@ -112,7 +112,7 @@ L<Mojo::Collection> is a container for collections.
 
 L<Mojo::Collection> implements the following functions.
 
-=head2 C<c>
+=head2 c
 
   my $collection = c(1, 2, 3);
 
@@ -123,13 +123,13 @@ Construct a new array-based L<Mojo::Collection> object.
 L<Mojo::Collection> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $collection = Mojo::Collection->new(1, 2, 3);
 
 Construct a new array-based L<Mojo::Collection> object.
 
-=head2 C<each>
+=head2 each
 
   my @elements = $collection->each;
   $collection  = $collection->each(sub {...});
@@ -141,7 +141,7 @@ Evaluate callback for each element in collection.
     say "$count: $e";
   });
 
-=head2 C<first>
+=head2 first
 
   my $first = $collection->first;
   my $first = $collection->first(qr/foo/);
@@ -153,7 +153,7 @@ callback returned true.
 
   my $five = $collection->first(sub { $_ == 5 });
 
-=head2 C<grep>
+=head2 grep
 
   my $new = $collection->grep(qr/foo/);
   my $new = $collection->grep(sub {...});
@@ -164,7 +164,7 @@ or for which the callback returned true.
 
   my $interesting = $collection->grep(qr/mojo/i);
 
-=head2 C<join>
+=head2 join
 
   my $stream = $collection->join("\n");
 
@@ -172,7 +172,7 @@ Turn collection into L<Mojo::ByteStream>.
 
   $collection->join("\n")->say;
 
-=head2 C<map>
+=head2 map
 
   my $new = $collection->map(sub {...});
 
@@ -181,7 +181,7 @@ from the results.
 
   my $doubled = $collection->map(sub { $_ * 2 });
 
-=head2 C<pluck>
+=head2 pluck
 
   my $new = $collection->pluck($method);
   my $new = $collection->pluck($method, @args);
@@ -192,31 +192,31 @@ results.
   # Equal to but more convenient than
   my $new = $collection->map(sub { $_->$method(@args) });
 
-=head2 C<reverse>
+=head2 reverse
 
   my $new = $collection->reverse;
 
 Create a new collection with all elements in reverse order.
 
-=head2 C<slice>
+=head2 slice
 
   my $new = $collection->slice(4 .. 7);
 
 Create a new collection with all selected elements.
 
-=head2 C<shuffle>
+=head2 shuffle
 
   my $new = $collection->shuffle;
 
 Create a new collection with all elements in random order.
 
-=head2 C<size>
+=head2 size
 
   my $size = $collection->size;
 
 Number of elements in collection.
 
-=head2 C<sort>
+=head2 sort
 
   my $new = $collection->sort;
   my $new = $collection->sort(sub {...});
@@ -226,7 +226,7 @@ from the results.
 
   my $insensitive = $collection->sort(sub { uc(shift) cmp uc(shift) });
 
-=head2 C<uniq>
+=head2 uniq
 
   my $new = $collection->uniq;
 

+56 -89

mojolegacy/lib/Mojo/Content.pm

View

@@ -40,14 +40,9 @@ sub clone {
 sub generate_body_chunk {
   my ($self, $offset) = @_;
 
-  # Drain
   $self->emit(drain => $offset)
     if !delete $self->{delay} && !length(defined $self->{body_buffer} ? $self->{body_buffer} : '');
-
-  # Get chunk
-  my $chunk = do { my $tmp = (delete $self->{body_buffer}); defined $tmp ? $tmp : '' };
-
-  # EOF or delay
+  my $chunk = do { my $tmp = delete $self->{body_buffer}; defined $tmp ? $tmp : '' };
   return $self->{eof} ? '' : undef unless length $chunk;
 
   return $chunk;
@@ -92,12 +87,12 @@ sub leftovers { shift->{buffer} }
 sub parse {
   my $self = shift;
 
-  # Parse headers
+  # Headers
   $self->_parse_until_body(@_);
   return $self if $self->{state} eq 'headers';
   $self->emit('body') unless $self->{body}++;
 
-  # Parse chunked content
+  # Chunked content
   $self->{real_size} = defined $self->{real_size} ? $self->{real_size} : 0;
   if ($self->is_chunked && $self->{state} ne 'headers') {
     $self->_parse_chunked;
@@ -130,7 +125,7 @@ sub parse {
 
   # Chunked or relaxed content
   if ($self->is_chunked || $self->relaxed) {
-    $self->{size} += length(defined $self->{buffer} ? $self->{buffer} : '');
+    $self->{size} += length($self->{buffer} = defined $self->{buffer} ? $self->{buffer} : '');
     $self->_uncompress($self->{buffer});
     $self->{buffer} = '';
   }
@@ -140,12 +135,11 @@ sub parse {
     my $len = $headers->content_length || 0;
     $self->{size} ||= 0;
     if ((my $need = $len - $self->{size}) > 0) {
-      my $chunk = substr $self->{buffer}, 0, $need, '';
+      my $len = length $self->{buffer};
+      my $chunk = substr $self->{buffer}, 0, $need > $len ? $len : $need, '';
       $self->_uncompress($chunk);
       $self->{size} += length $chunk;
     }
-
-    # Finished
     $self->{state} = 'finished' if $len <= $self->progress;
   }
 
@@ -168,19 +162,10 @@ sub progress {
 sub write {
   my ($self, $chunk, $cb) = @_;
 
-  # Dynamic content
   $self->{dynamic} = 1;
-
-  # Add chunk
   if (defined $chunk) { $self->{body_buffer} .= $chunk }
-
-  # Delay
-  else { $self->{delay} = 1 }
-
-  # Drain
+  else                { $self->{delay} = 1 }
   $self->once(drain => $cb) if $cb;
-
-  # Finish
   $self->{eof} = 1 if defined $chunk && $chunk eq '';
 
   return $self;
@@ -188,23 +173,15 @@ sub write {
 
 sub write_chunk {
   my ($self, $chunk, $cb) = @_;
-
-  # Chunked transfer encoding
   $self->headers->transfer_encoding('chunked') unless $self->is_chunked;
-
-  # Write
   $self->write(defined $chunk ? $self->_build_chunk($chunk) : $chunk, $cb);
-
-  # Finish
   $self->{eof} = 1 if defined $chunk && $chunk eq '';
-
   return $self;
 }
 
 sub _build {
   my ($self, $method) = @_;
 
-  # Build part from chunks
   my $buffer = '';
   my $offset = 0;
   while (1) {
@@ -215,7 +192,6 @@ sub _build {
     # End of part
     last unless my $len = length $chunk;
 
-    # Part
     $offset += $len;
     $buffer .= $chunk;
   }
@@ -241,7 +217,6 @@ sub _parse_chunked {
   return $self->_parse_chunked_trailing_headers
     if (defined $self->{chunk_state} ? $self->{chunk_state} : '') eq 'trailing_headers';
 
-  # Parse chunks
   while (my $len = length $self->{pre_buffer}) {
 
     # Start new chunk (ignore the chunk extension)
@@ -274,7 +249,6 @@ sub _parse_chunked {
 sub _parse_chunked_trailing_headers {
   my $self = shift;
 
-  # Parse
   my $headers = $self->headers->parse(delete $self->{pre_buffer});
   return unless $headers->is_finished;
   $self->{chunk_state} = 'finished';
@@ -287,7 +261,6 @@ sub _parse_chunked_trailing_headers {
 sub _parse_headers {
   my $self = shift;
 
-  # Parse
   my $headers = $self->headers->parse(delete $self->{pre_buffer});
   return unless $headers->is_finished;
   $self->{state} = 'body';
@@ -301,21 +274,13 @@ sub _parse_headers {
 sub _parse_until_body {
   my ($self, $chunk) = @_;
 
-  # Add chunk
   $self->{raw_size} += length($chunk = defined $chunk ? $chunk : '');
   $self->{pre_buffer} .= $chunk;
 
-  # Parser started
   unless ($self->{state}) {
-
-    # Update size
     $self->{header_size} = $self->{raw_size} - length $self->{pre_buffer};
-
-    # Headers
-    $self->{state} = 'headers';
+    $self->{state}       = 'headers';
   }
-
-  # Parse headers
   $self->_parse_headers if (defined $self->{state} ? $self->{state} : '') eq 'headers';
 }
 
@@ -363,9 +328,10 @@ RFC 2616.
 
 =head1 EVENTS
 
-L<Mojo::Content> can emit the following events.
+L<Mojo::Content> inherits all events from L<Mojo::EventEmitter> and can emit
+the following new ones.
 
-=head2 C<body>
+=head2 body
 
   $content->on(body => sub {
     my $content = shift;
@@ -379,7 +345,7 @@ Emitted once all headers have been parsed and the body starts.
     $content->auto_upgrade(0) if $content->headers->header('X-No-MultiPart');
   });
 
-=head2 C<drain>
+=head2 drain
 
   $content->on(drain => sub {
     my ($content, $offset) = @_;
@@ -393,10 +359,10 @@ Emitted once all data has been written.
     $content->write_chunk(time);
   });
 
-=head2 C<read>
+=head2 read
 
   $content->on(read => sub {
-    my ($content, $chunk) = @_;
+    my ($content, $bytes) = @_;
     ...
   });
 
@@ -404,29 +370,29 @@ Emitted when a new chunk of content arrives.
 
   $content->unsubscribe('read');
   $content->on(read => sub {
-    my ($content, $chunk) = @_;
-    say "Streaming: $chunk";
+    my ($content, $bytes) = @_;
+    say "Streaming: $bytes";
   });
 
 =head1 ATTRIBUTES
 
 L<Mojo::Content> implements the following attributes.
 
-=head2 C<auto_relax>
+=head2 auto_relax
 
   my $relax = $content->auto_relax;
   $content  = $content->auto_relax(1);
 
 Try to detect when relaxed parsing is necessary.
 
-=head2 C<headers>
+=head2 headers
 
   my $headers = $content->headers;
   $content    = $content->headers(Mojo::Headers->new);
 
 Content headers, defaults to a L<Mojo::Headers> object.
 
-=head2 C<max_buffer_size>
+=head2 max_buffer_size
 
   my $size = $content->max_buffer_size;
   $content = $content->max_buffer_size(1024);
@@ -434,7 +400,7 @@ Content headers, defaults to a L<Mojo::Headers> object.
 Maximum size in bytes of buffer for content parser, defaults to the value of
 the C<MOJO_MAX_BUFFER_SIZE> environment variable or C<262144>.
 
-=head2 C<max_leftover_size>
+=head2 max_leftover_size
 
   my $size = $content->max_leftover_size;
   $content = $content->max_leftover_size(1024);
@@ -442,7 +408,7 @@ the C<MOJO_MAX_BUFFER_SIZE> environment variable or C<262144>.
 Maximum size in bytes of buffer for pipelined HTTP requests, defaults to the
 value of the C<MOJO_MAX_LEFTOVER_SIZE> environment variable or C<262144>.
 
-=head2 C<relaxed>
+=head2 relaxed
 
   my $relaxed = $content->relaxed;
   $content    = $content->relaxed(1);
@@ -450,7 +416,7 @@ value of the C<MOJO_MAX_LEFTOVER_SIZE> environment variable or C<262144>.
 Activate relaxed parsing for responses that are terminated with a connection
 close.
 
-=head2 C<skip_body>
+=head2 skip_body
 
   my $skip = $content->skip_body;
   $content = $content->skip_body(1);
@@ -462,159 +428,160 @@ Skip body parsing and finish after headers.
 L<Mojo::Content> inherits all methods from L<Mojo::EventEmitter> and
 implements the following new ones.
 
-=head2 C<body_contains>
+=head2 body_contains
 
   my $success = $content->body_contains('foo bar baz');
 
 Check if content contains a specific string. Meant to be overloaded in a
 subclass.
 
-=head2 C<body_size>
+=head2 body_size
 
   my $size = $content->body_size;
 
 Content size in bytes. Meant to be overloaded in a subclass.
 
-=head2 C<boundary>
+=head2 boundary
 
   my $boundary = $content->boundary;
 
 Extract multipart boundary from C<Content-Type> header.
 
-=head2 C<build_body>
+=head2 build_body
 
   my $string = $content->build_body;
 
 Render whole body.
 
-=head2 C<build_headers>
+=head2 build_headers
 
   my $string = $content->build_headers;
 
 Render all headers.
 
-=head2 C<charset>
+=head2 charset
 
   my $charset = $content->charset;
 
 Extract charset from C<Content-Type> header.
 
-=head2 C<clone>
+=head2 clone
 
   my $clone = $content->clone;
 
 Clone content if possible, otherwise return C<undef>.
 
-=head2 C<generate_body_chunk>
+=head2 generate_body_chunk
 
-  my $chunk = $content->generate_body_chunk(0);
+  my $bytes = $content->generate_body_chunk(0);
 
 Generate dynamic content.
 
-=head2 C<get_body_chunk>
+=head2 get_body_chunk
 
-  my $chunk = $content->get_body_chunk(0);
+  my $bytes = $content->get_body_chunk(0);
 
 Get a chunk of content starting from a specfic position. Meant to be
 overloaded in a subclass.
 
-=head2 C<get_header_chunk>
+=head2 get_header_chunk
 
-  my $chunk = $content->get_header_chunk(13);
+  my $bytes = $content->get_header_chunk(13);
 
 Get a chunk of the headers starting from a specfic position.
 
-=head2 C<has_leftovers>
+=head2 has_leftovers
 
   my $success = $content->has_leftovers;
 
 Check if there are leftovers.
 
-=head2 C<header_size>
+=head2 header_size
 
   my $size = $content->header_size;
 
 Size of headers in bytes.
 
-=head2 C<is_chunked>
+=head2 is_chunked
 
   my $success = $content->is_chunked;
 
 Check if content is chunked.
 
-=head2 C<is_compressed>
+=head2 is_compressed
 
   my $success = $content->is_compressed;
 
 Check if content is C<gzip> compressed.
 
-=head2 C<is_dynamic>
+=head2 is_dynamic
 
   my $success = $content->is_dynamic;
 
 Check if content will be dynamically generated, which prevents C<clone> from
 working.
 
-=head2 C<is_finished>
+=head2 is_finished
 
   my $success = $content->is_finished;
 
 Check if parser is finished.
 
-=head2 C<is_limit_exceeded>
+=head2 is_limit_exceeded
 
   my $success = $content->is_limit_exceeded;
 
 Check if buffer has exceeded C<max_buffer_size>.
 
-=head2 C<is_multipart>
+=head2 is_multipart
 
   my $false = $content->is_multipart;
 
 False.
 
-=head2 C<is_parsing_body>
+=head2 is_parsing_body
 
   my $success = $content->is_parsing_body;
 
 Check if body parsing started yet.
 
-=head2 C<leftovers>
+=head2 leftovers
 
   my $bytes = $content->leftovers;
 
 Get leftover data from content parser.
 
-=head2 C<parse>
+=head2 parse
 
-  $content = $content->parse("Content-Length: 12\r\n\r\nHello World!");
+  $content
+    = $content->parse("Content-Length: 12\x0d\x0a\x0d\x0aHello World!");
 
 Parse content chunk.
 
-=head2 C<parse_body>
+=head2 parse_body
 
   $content = $content->parse_body('Hi!');
 
 Parse body chunk and skip headers.
 
-=head2 C<progress>
+=head2 progress
 
   my $size = $content->progress;
 
 Size of content already received from message in bytes.
 
-=head2 C<write>
+=head2 write
 
-  $content = $content->write('Hello!');
-  $content = $content->write('Hello!' => sub {...});
+  $content = $content->write($bytes);
+  $content = $content->write($bytes => sub {...});
 
 Write dynamic content non-blocking, the optional drain callback will be
 invoked once all data has been written.
 
-=head2 C<write_chunk>
+=head2 write_chunk
 
-  $content = $content->write_chunk('Hello!');
-  $content = $content->write_chunk('Hello!' => sub {...});
+  $content = $content->write_chunk($bytes);
+  $content = $content->write_chunk($bytes => sub {...});
 
 Write dynamic content non-blocking with C<chunked> transfer encoding, the
 optional drain callback will be invoked once all data has been written.

+12 -15

mojolegacy/lib/Mojo/Content/MultiPart.pm

View

@@ -23,7 +23,7 @@ sub body_contains {
 sub body_size {
   my $self = shift;
 
-  # Check for Content-Lenght header
+  # Check for existing Content-Lenght header
   my $content_len = $self->headers->content_length;
   return $content_len if $content_len;
 
@@ -78,7 +78,7 @@ sub get_body_chunk {
   my $len          = $boundary_len - 2;
   return substr "--$boundary\x0d\x0a", $offset if $len > $offset;
 
-  # Parts
+  # Prepare content part by part
   my $parts = $self->parts;
   for (my $i = 0; $i < @$parts; $i++) {
     my $part = $parts->[$i];
@@ -150,8 +150,6 @@ sub _parse_multipart_boundary {
   my $end = "\x0d\x0a--$boundary--";
   if ((index $self->{multipart}, $end) == 0) {
     substr $self->{multipart}, 0, length $end, '';
-
-    # Finished
     $self->{multi_state} = 'finished';
   }
 
@@ -174,7 +172,6 @@ sub _parse_multipart_preamble {
 sub _read {
   my ($self, $chunk) = @_;
 
-  # Parse
   $self->{multipart} .= $chunk;
   my $boundary = $self->boundary;
   until (($self->{multi_state} = defined $self->{multi_state} ? $self->{multi_state} : 'multipart_preamble') eq 'finished') {
@@ -224,7 +221,7 @@ described in RFC 2616.
 L<Mojo::Content::Multipart> inherits all events from L<Mojo::Content> and can
 emit the following new ones.
 
-=head2 C<part>
+=head2 part
 
   $multi->on(part => sub {
     my ($multi, $single) = @_;
@@ -244,7 +241,7 @@ Emitted when a new L<Mojo::Content::Single> part starts.
 L<Mojo::Content::MultiPart> inherits all attributes from L<Mojo::Content> and
 implements the following new ones.
 
-=head2 C<parts>
+=head2 parts
 
   my $parts = $multi->parts;
   $multi    = $multi->parts([]);
@@ -257,44 +254,44 @@ L<Mojo::Content::Single> objects.
 L<Mojo::Content::MultiPart> inherits all methods from L<Mojo::Content> and
 implements the following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $multi = Mojo::Content::MultiPart->new;
 
 Construct a new L<Mojo::Content::MultiPart> object and subscribe to C<read>
 event with default content parser.
 
-=head2 C<body_contains>
+=head2 body_contains
 
   my $success = $multi->body_contains('foobarbaz');
 
 Check if content parts contain a specific string.
 
-=head2 C<body_size>
+=head2 body_size
 
   my $size = $multi->body_size;
 
 Content size in bytes.
 
-=head2 C<build_boundary>
+=head2 build_boundary
 
   my $boundary = $multi->build_boundary;
 
 Generate a suitable boundary for content and add it to C<Content-Type> header.
 
-=head2 C<clone>
+=head2 clone
 
   my $clone = $multi->clone;
 
 Clone content if possible, otherwise return C<undef>.
 
-=head2 C<get_body_chunk>
+=head2 get_body_chunk
 
-  my $chunk = $multi->get_body_chunk(0);
+  my $bytes = $multi->get_body_chunk(0);
 
 Get a chunk of content starting from a specfic position.
 
-=head2 C<is_multipart>
+=head2 is_multipart
 
   my $true = $multi->is_multipart;
 

+16 -23

mojolegacy/lib/Mojo/Content/Single.pm

View

@@ -9,7 +9,8 @@ has auto_upgrade => 1;
 
 sub new {
   my $self = shift->SUPER::new(@_);
-  $self->{read} = $self->on(read => \&_read);
+  $self->{read}
+    = $self->on(read => sub { $_[0]->asset($_[0]->asset->add_chunk($_[1])) });
   return $self;
 }
 
@@ -29,11 +30,7 @@ sub clone {
 
 sub get_body_chunk {
   my ($self, $offset) = @_;
-
-  # Body generator
   return $self->generate_body_chunk($offset) if $self->{dynamic};
-
-  # Normal content
   return $self->asset->get_chunk($offset);
 }
 
@@ -54,11 +51,6 @@ sub parse {
   return $multi->parse;
 }
 
-sub _read {
-  my ($self, $chunk) = @_;
-  $self->asset($self->asset->add_chunk($chunk));
-}
-
 1;
 
 =head1 NAME
@@ -70,7 +62,7 @@ Mojo::Content::Single - HTTP content
   use Mojo::Content::Single;
 
   my $single = Mojo::Content::Single->new;
-  $single->parse("Content-Length: 12\r\n\r\nHello World!");
+  $single->parse("Content-Length: 12\x0d\x0a\x0d\x0aHello World!");
   say $single->headers->content_length;
 
 =head1 DESCRIPTION
@@ -83,7 +75,7 @@ L<Mojo::Content::Single> is a container for HTTP content as described in RFC
 L<Mojo::Content::Single> inherits all events from L<Mojo::Content> and can
 emit the following new ones.
 
-=head2 C<upgrade>
+=head2 upgrade
 
   $single->on(upgrade => sub {
     my ($single, $multi) = @_;
@@ -103,7 +95,7 @@ Emitted when content gets upgraded to a L<Mojo::Content::MultiPart> object.
 L<Mojo::Content::Single> inherits all attributes from L<Mojo::Content> and
 implements the following new ones.
 
-=head2 C<asset>
+=head2 asset
 
   my $asset = $single->asset;
   $single   = $single->asset(Mojo::Asset::Memory->new);
@@ -111,7 +103,7 @@ implements the following new ones.
 The actual content, defaults to a L<Mojo::Asset::Memory> object with
 C<auto_upgrade> enabled.
 
-=head2 C<auto_upgrade>
+=head2 auto_upgrade
 
   my $upgrade = $single->auto_upgrade;
   $single     = $single->auto_upgrade(0);
@@ -124,41 +116,42 @@ L<Mojo::Content::MultiPart> object, defaults to C<1>.
 L<Mojo::Content::Single> inherits all methods from L<Mojo::Content> and
 implements the following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $single = Mojo::Content::Single->new;
 
 Construct a new L<Mojo::Content::Single> object and subscribe to C<read> event
 with default content parser.
 
-=head2 C<body_contains>
+=head2 body_contains
 
   my $success = $single->body_contains('1234567');
 
 Check if content contains a specific string.
 
-=head2 C<body_size>
+=head2 body_size
 
   my $size = $single->body_size;
 
 Content size in bytes.
 
-=head2 C<clone>
+=head2 clone
 
   my $clone = $single->clone;
 
 Clone content if possible, otherwise return C<undef>.
 
-=head2 C<get_body_chunk>
+=head2 get_body_chunk
 
-  my $chunk = $single->get_body_chunk(0);
+  my $bytes = $single->get_body_chunk(0);
 
 Get a chunk of content starting from a specfic position.
 
-=head2 C<parse>
+=head2 parse
 
-  $single   = $single->parse("Content-Length: 12\r\n\r\nHello World!");
-  my $multi = $single->parse("Content-Type: multipart/form-data\r\n\r\n");
+  $single = $single->parse("Content-Length: 12\x0d\x0a\x0d\x0aHello World!");
+  my $multi
+    = $single->parse("Content-Type: multipart/form-data\x0d\x0a\x0d\x0a");
 
 Parse content chunk and upgrade to L<Mojo::Content::MultiPart> object if
 possible.

+4 -6

mojolegacy/lib/Mojo/Cookie.pm

View

@@ -30,8 +30,6 @@ sub _tokenize {
     # Value
     my $value;
     $value = unquote $1 if $string =~ s/^("(?:\\\\|\\"|[^"])+"|[^;,]+)\s*//;
-
-    # Token
     push @token, [$name, $value];
 
     # Separator
@@ -68,14 +66,14 @@ L<Mojo::Cookie> is an abstract base class for HTTP cookies.
 
 L<Mojo::Cookie> implements the following attributes.
 
-=head2 C<name>
+=head2 name
 
   my $name = $cookie->name;
   $cookie  = $cookie->name('foo');
 
 Cookie name.
 
-=head2 C<value>
+=head2 value
 
   my $value = $cookie->value;
   $cookie   = $cookie->value('/test');
@@ -87,13 +85,13 @@ Cookie value.
 L<Mojo::Cookie> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<parse>
+=head2 parse
 
   my $cookies = $cookie->parse($string);
 
 Parse cookies. Meant to be overloaded in a subclass.
 
-=head2 C<to_string>
+=head2 to_string
 
   my $string = $cookie->to_string;
   my $string = "$cookie";

+2 -3

mojolegacy/lib/Mojo/Cookie/Request.pm

View

@@ -6,7 +6,6 @@ use Mojo::Util 'quote';
 sub parse {
   my ($self, $string) = @_;
 
-  # Walk tree
   my @cookies;
   for my $token (map {@$_} $self->_tokenize($string)) {
     my ($name, $value) = @$token;
@@ -54,13 +53,13 @@ L<Mojo::Cookie::Request> inherits all attributes from L<Mojo::Cookie>.
 L<Mojo::Cookie::Request> inherits all methods from L<Mojo::Cookie> and
 implements the following new ones.
 
-=head2 C<parse>
+=head2 parse
 
   my $cookies = $cookie->parse('f=b; g=a');
 
 Parse cookies.
 
-=head2 C<to_string>
+=head2 to_string
 
   my $string = $cookie->to_string;
 

+8 -11

mojolegacy/lib/Mojo/Cookie/Response.pm

View

@@ -15,8 +15,6 @@ sub expires {
     ? Mojo::Date->new($self->{expires})
     : $self->{expires}
     unless @_;
-
-  # New expires value
   $self->{expires} = shift;
 
   return $self;
@@ -25,7 +23,6 @@ sub expires {
 sub parse {
   my ($self, $string) = @_;
 
-  # Walk tree
   my @cookies;
   for my $token ($self->_tokenize($string)) {
     for my $i (0 .. $#$token) {
@@ -104,14 +101,14 @@ L<Mojo::Cookie::Response> is a container for HTTP response cookies.
 L<Mojo::Cookie::Response> inherits all attributes from L<Mojo::Cookie> and
 implements the followign new ones.
 
-=head2 C<domain>
+=head2 domain
 
   my $domain = $cookie->domain;
   $cookie    = $cookie->domain('localhost');
 
 Cookie domain.
 
-=head2 C<httponly>
+=head2 httponly
 
   my $httponly = $cookie->httponly;
   $cookie      = $cookie->httponly(1);
@@ -119,21 +116,21 @@ Cookie domain.
 HttpOnly flag, which can prevent client-side scripts from accessing this
 cookie.
 
-=head2 C<max_age>
+=head2 max_age
 
   my $max_age = $cookie->max_age;
   $cookie     = $cookie->max_age(60);
 
 Max age for cookie.
 
-=head2 C<path>
+=head2 path
 
   my $path = $cookie->path;
   $cookie  = $cookie->path('/test');
 
 Cookie path.
 
-=head2 C<secure>
+=head2 secure
 
   my $secure = $cookie->secure;
   $cookie    = $cookie->secure(1);
@@ -146,7 +143,7 @@ connections.
 L<Mojo::Cookie::Response> inherits all methods from L<Mojo::Cookie> and
 implements the following new ones.
 
-=head2 C<expires>
+=head2 expires
 
   my $expires = $cookie->expires;
   $cookie     = $cookie->expires(time + 60);
@@ -154,13 +151,13 @@ implements the following new ones.
 
 Expiration for cookie.
 
-=head2 C<parse>
+=head2 parse
 
   my $cookies = $cookie->parse('f=b; path=/');
 
 Parse cookies.
 
-=head2 C<to_string>
+=head2 to_string
 
   my $string = $cookie->to_string;
 

+66 -100

mojolegacy/lib/Mojo/DOM.pm

View

@@ -71,24 +71,21 @@ sub attrs {
   return $self;
 }
 
-sub charset { shift->_parser(charset => @_) }
+sub charset { shift->_html(charset => @_) }
 
 sub children {
   my ($self, $type) = @_;
 
-  # Walk tree
   my @children;
-  my $tree = $self->tree;
-  my $start = $tree->[0] eq 'root' ? 1 : 4;
-  for my $e (@$tree[$start .. $#$tree]) {
+  my $charset = $self->charset;
+  my $xml     = $self->xml;
+  my $tree    = $self->tree;
+  for my $e (@$tree[($tree->[0] eq 'root' ? 1 : 4) .. $#$tree]) {
 
-    # Make sure child is a tag
+    # Make sure child is the right type
     next unless $e->[0] eq 'tag';
     next if defined $type && $e->[1] ne $type;
-
-    # Add child
-    push @children,
-      $self->new->charset($self->charset)->tree($e)->xml($self->xml);
+    push @children, $self->new->charset($charset)->tree($e)->xml($xml);
   }
 
   return Mojo::Collection->new(@children);
@@ -97,43 +94,31 @@ sub children {
 sub content_xml {
   my $self = shift;
 
-  # Walk tree
-  my $result = '';
-  my $tree   = $self->tree;
-  my $start  = $tree->[0] eq 'root' ? 1 : 4;
-  for my $e (@$tree[$start .. $#$tree]) {
-    $result .= Mojo::DOM::HTML->new(
-      charset => $self->charset,
-      tree    => $e,
-      xml     => $self->xml
-    )->render;
-  }
-
-  return $result;
+  # Render children
+  my $tree    = $self->tree;
+  my $charset = $self->charset;
+  my $xml     = $self->xml;
+  return join '', map {
+    Mojo::DOM::HTML->new(charset => $charset, tree => $_, xml => $xml)->render
+  } @$tree[($tree->[0] eq 'root' ? 1 : 4) .. $#$tree];
 }
 
 sub find {
   my ($self, $selector) = @_;
 
-  # Match selector against tree
-  my $results = Mojo::DOM::CSS->new(tree => $self->tree)->select($selector);
-
-  # Upgrade results
-  @$results
-    = map { $self->new->charset($self->charset)->tree($_)->xml($self->xml) }
-    @$results;
-
-  return Mojo::Collection->new(@$results);
+  my $charset = $self->charset;
+  my $xml     = $self->xml;
+  return Mojo::Collection->new(
+    map { $self->new->charset($charset)->tree($_)->xml($xml) }
+      @{Mojo::DOM::CSS->new(tree => $self->tree)->select($selector)});
 }
 
 sub namespace {
   my $self = shift;
 
-  # Namespace prefix
+  # Extract namespace prefix and search parents
   return '' if (my $current = $self->tree)->[0] eq 'root';
   my $ns = $current->[1] =~ /^(.*?):/ ? "xmlns:$1" : undef;
-
-  # Walk tree
   while ($current) {
     last if $current->[0] eq 'root';
 
@@ -155,11 +140,7 @@ sub next { shift->_sibling(1) }
 
 sub parent {
   my $self = shift;
-
-  # Not a tag
   return undef if (my $tree = $self->tree)->[0] eq 'root';
-
-  # Parent
   return $self->new->charset($self->charset)->tree($tree->[3])
     ->xml($self->xml);
 }
@@ -206,29 +187,15 @@ sub replace {
 
 sub replace_content {
   my ($self, $new) = @_;
-
-  # Parse
-  $new = $self->_parse("$new");
-
-  # Replacements
   my $tree = $self->tree;
-  my @new;
-  for my $e (@$new[1 .. $#$new]) {
-    $e->[3] = $tree if $e->[0] eq 'tag';
-    push @new, $e;
-  }
-
-  # Replace
-  my $start = $tree->[0] eq 'root' ? 1 : 4;
-  splice @$tree, $start, $#$tree, @new;
-
+  splice @$tree, $tree->[0] eq 'root' ? 1 : 4, $#$tree,
+    @{_parent($self->_parse("$new"), $tree)};
   return $self;
 }
 
 sub root {
   my $self = shift;
 
-  # Find root
   my $root = $self->tree;
   while ($root->[0] eq 'tag') {
     last unless my $parent = $root->[3];
@@ -277,7 +244,7 @@ sub text_before {
 
 sub to_xml { shift->[0]->render }
 
-sub tree { shift->_parser(tree => @_) }
+sub tree { shift->_html(tree => @_) }
 
 sub type {
   my ($self, $type) = @_;
@@ -292,18 +259,15 @@ sub type {
   return $self;
 }
 
-sub xml { shift->_parser(xml => @_) }
+sub xml { shift->_html(xml => @_) }
 
 sub _add {
   my ($self, $offset, $new) = @_;
 
-  # Parse
-  $new = $self->_parse("$new");
-
   # Not a tag
   return $self if (my $tree = $self->tree)->[0] eq 'root';
 
-  # Find
+  # Find parent
   my $parent = $tree->[3];
   my $i = $parent->[0] eq 'root' ? 1 : 4;
   for my $e (@$parent[$i .. $#$parent]) {
@@ -311,8 +275,8 @@ sub _add {
     $i++;
   }
 
-  # Add
-  splice @$parent, $i + $offset, 0, @{_parent($new, $parent)};
+  # Add children
+  splice @$parent, $i + $offset, 0, @{_parent($self->_parse("$new"), $parent)};
 
   return $self;
 }
@@ -322,8 +286,17 @@ sub _elements {
   return [@$e[($e->[0] eq 'root' ? 1 : 4) .. $#$e]];
 }
 
+sub _html {
+  my ($self, $method) = (shift, shift);
+  return $self->[0]->$method unless @_;
+  $self->[0]->$method(@_);
+  return $self;
+}
+
 sub _parent {
   my ($children, $parent) = @_;
+
+  # Link parent to children
   my @new;
   for my $e (@$children[1 .. $#$children]) {
     if ($e->[0] eq 'tag') {
@@ -332,6 +305,7 @@ sub _parent {
     }
     push @new, $e;
   }
+
   return \@new;
 }
 
@@ -341,17 +315,10 @@ sub _parse {
     ->parse(shift)->tree;
 }
 
-sub _parser {
-  my ($self, $method) = (shift, shift);
-  return $self->[0]->$method unless @_;
-  $self->[0]->$method(@_);
-  return $self;
-}
-
 sub _sibling {
   my ($self, $next) = @_;
 
-  # Root
+  # Make sure we have a parent
   return undef unless my $parent = $self->parent;
 
   # Find previous or next sibling
@@ -369,7 +336,6 @@ sub _sibling {
 sub _text {
   my ($elements, $recurse, $trim) = @_;
 
-  # Walk tree
   my $text = '';
   for my $e (@$elements) {
     my $type = $e->[0];
@@ -481,14 +447,14 @@ XML detection can also be disabled with the C<xml> method.
 L<Mojo::DOM> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $dom = Mojo::DOM->new;
   my $dom = Mojo::DOM->new('<foo bar="baz">test</foo>');
 
 Construct a new array-based L<Mojo::DOM> object.
 
-=head2 C<all_text>
+=head2 all_text
 
   my $trimmed   = $dom->all_text;
   my $untrimmed = $dom->all_text(0);
@@ -502,7 +468,7 @@ enabled by default.
   # "foo\nbarbaz\n"
   $dom->parse("<div>foo\n<p>bar</p>baz\n</div>")->div->all_text(0);
 
-=head2 C<append>
+=head2 append
 
   $dom = $dom->append('<p>Hi!</p>');
 
@@ -511,7 +477,7 @@ Append to element.
   # "<div><h1>A</h1><h2>B</h2></div>"
   $dom->parse('<div><h1>A</h1></div>')->at('h1')->append('<h2>B</h2>')->root;
 
-=head2 C<append_content>
+=head2 append_content
 
   $dom = $dom->append_content('<p>Hi!</p>');
 
@@ -520,7 +486,7 @@ Append to element content.
   # "<div><h1>AB</h1></div>"
   $dom->parse('<div><h1>A</h1></div>')->at('h1')->append_content('B')->root;
 
-=head2 C<at>
+=head2 at
 
   my $result = $dom->at('html title');
 
@@ -530,7 +496,7 @@ are supported.
   # Find first element with "svg" namespace definition
   my $namespace = $dom->at('[xmlns\:svg]')->{'xmlns:svg'};
 
-=head2 C<attrs>
+=head2 attrs
 
   my $attrs = $dom->attrs;
   my $foo   = $dom->attrs('foo');
@@ -539,14 +505,14 @@ are supported.
 
 Element attributes.
 
-=head2 C<charset>
+=head2 charset
 
   my $charset = $dom->charset;
   $dom        = $dom->charset('UTF-8');
 
 Charset used for decoding and encoding HTML/XML.
 
-=head2 C<children>
+=head2 children
 
   my $collection = $dom->children;
   my $collection = $dom->children('div');
@@ -557,7 +523,7 @@ similar to C<find>.
   # Show type of random child element
   say $dom->children->shuffle->first->type;
 
-=head2 C<content_xml>
+=head2 content_xml
 
   my $xml = $dom->content_xml;
 
@@ -567,7 +533,7 @@ C<charset> has been defined.
   # "<b>test</b>"
   $dom->parse('<div><b>test</b></div>')->div->content_xml;
 
-=head2 C<find>
+=head2 find
 
   my $collection = $dom->find('html title');
 
@@ -580,7 +546,7 @@ selectors from L<Mojo::DOM::CSS> are supported.
   # Extract information from multiple elements
   my @headers = $dom->find('h1, h2, h3')->pluck('text')->each;
 
-=head2 C<namespace>
+=head2 namespace
 
   my $namespace = $dom->namespace;
 
@@ -592,7 +558,7 @@ Find element namespace.
   # Find namespace for an element that may or may not have a namespace prefix
   my $namespace = $dom->at('svg > circle')->namespace;
 
-=head2 C<next>
+=head2 next
 
   my $sibling = $dom->next;
 
@@ -601,13 +567,13 @@ Next sibling of element.
   # "<h2>B</h2>"
   $dom->parse('<div><h1>A</h1><h2>B</h2></div>')->at('h1')->next;
 
-=head2 C<parent>
+=head2 parent
 
   my $parent = $dom->parent;
 
 Parent of element.
 
-=head2 C<parse>
+=head2 parse
 
   $dom = $dom->parse('<foo bar="baz">test</foo>');
 
@@ -616,7 +582,7 @@ Parse HTML/XML document with L<Mojo::DOM::HTML>.
   # Parse UTF-8 encoded XML
   my $dom = Mojo::DOM->new->charset('UTF-8')->xml(1)->parse($xml);
 
-=head2 C<prepend>
+=head2 prepend
 
   $dom = $dom->prepend('<p>Hi!</p>');
 
@@ -625,7 +591,7 @@ Prepend to element.
   # "<div><h1>A</h1><h2>B</h2></div>"
   $dom->parse('<div><h2>B</h2></div>')->at('h2')->prepend('<h1>A</h1>')->root;
 
-=head2 C<prepend_content>
+=head2 prepend_content
 
   $dom = $dom->prepend_content('<p>Hi!</p>');
 
@@ -634,7 +600,7 @@ Prepend to element content.
   # "<div><h2>AB</h2></div>"
   $dom->parse('<div><h2>B</h2></div>')->at('h2')->prepend_content('A')->root;
 
-=head2 C<previous>
+=head2 previous
 
   my $sibling = $dom->previous;
 
@@ -643,7 +609,7 @@ Previous sibling of element.
   # "<h1>A</h1>"
   $dom->parse('<div><h1>A</h1><h2>B</h2></div>')->at('h2')->previous;
 
-=head2 C<remove>
+=head2 remove
 
   my $old = $dom->remove;
 
@@ -652,7 +618,7 @@ Remove element.
   # "<div></div>"
   $dom->parse('<div><h1>A</h1></div>')->at('h1')->remove->root;
 
-=head2 C<replace>
+=head2 replace
 
   my $old = $dom->replace('<div>test</div>');
 
@@ -664,7 +630,7 @@ Replace element.
   # "<div></div>"
   $dom->parse('<div><h1>A</h1></div>')->at('h1')->replace('')->root;
 
-=head2 C<replace_content>
+=head2 replace_content
 
   $dom = $dom->replace_content('test');
 
@@ -676,13 +642,13 @@ Replace element content.
   # "<div><h1></h1></div>"
   $dom->parse('<div><h1>A</h1></div>')->at('h1')->replace_content('')->root;
 
-=head2 C<root>
+=head2 root
 
   my $root = $dom->root;
 
 Find root node.
 
-=head2 C<text>
+=head2 text
 
   my $trimmed   = $dom->text;
   my $untrimmed = $dom->text(0);
@@ -696,7 +662,7 @@ whitespace trimming is enabled by default.
   # "foo\nbaz\n"
   $dom->parse("<div>foo\n<p>bar</p>baz\n</div>")->div->text(0);
 
-=head2 C<text_after>
+=head2 text_after
 
   my $trimmed   = $dom->text_after;
   my $untrimmed = $dom->text_after(0);
@@ -710,7 +676,7 @@ is enabled by default.
   # "baz\n"
   $dom->parse("<div>foo\n<p>bar</p>baz\n</div>")->div->p->text_after(0);
 
-=head2 C<text_before>
+=head2 text_before
 
   my $trimmed   = $dom->text_before;
   my $untrimmed = $dom->text_before(0);
@@ -724,7 +690,7 @@ is enabled by default.
   # "foo\n"
   $dom->parse("<div>foo\n<p>bar</p>baz\n</div>")->div->p->text_before(0);
 
-=head2 C<to_xml>
+=head2 to_xml
 
   my $xml = $dom->to_xml;
   my $xml = "$dom";
@@ -735,14 +701,14 @@ if a C<charset> has been defined.
   # "<b>test</b>"
   $dom->parse('<div><b>test</b></div>')->div->b->to_xml;
 
-=head2 C<tree>
+=head2 tree
 
   my $tree = $dom->tree;
   $dom     = $dom->tree(['root', [qw(text lalala)]]);
 
 Document Object Model.
 
-=head2 C<type>
+=head2 type
 
   my $type = $dom->type;
   $dom     = $dom->type('div');
@@ -752,7 +718,7 @@ Element type.
   # List types of child elements
   say $dom->children->pluck('type');
 
-=head2 C<xml>
+=head2 xml
 
   my $xml = $dom->xml;
   $dom    = $dom->xml(1);

+35 -41

mojolegacy/lib/Mojo/DOM/CSS.pm

View

@@ -36,13 +36,10 @@ my $TOKEN_RE        = qr/
 sub select {
   my $self = shift;
 
-  # Compile selectors
-  my $pattern = $self->_compile(shift);
-
-  # Walk tree
   my @results;
-  my $tree  = $self->tree;
-  my @queue = ($tree);
+  my $pattern = $self->_compile(shift);
+  my $tree    = $self->tree;
+  my @queue   = ($tree);
   while (my $current = shift @queue) {
     my $type = $current->[0];
 
@@ -123,7 +120,6 @@ sub _combinator {
 sub _compile {
   my ($self, $css) = @_;
 
-  # Tokenize
   my $pattern = [[]];
   while ($css =~ /$TOKEN_RE/g) {
     my ($separator, $element, $pc, $attrs, $combinator)
@@ -321,7 +317,6 @@ sub _regex {
 sub _selector {
   my ($self, $selector, $current) = @_;
 
-  # Selectors
   for my $s (@$selector[1 .. $#$selector]) {
     my $type = $s->[0];
 
@@ -348,7 +343,6 @@ sub _selector {
 sub _sibling {
   my ($self, $selectors, $current, $tree, $immediate) = @_;
 
-  # Find preceding elements
   my $parent = $current->[3];
   my $found;
   my $start = $parent->[0] eq 'root' ? 1 : 4;
@@ -403,77 +397,77 @@ L<Mojo::DOM::CSS> is the CSS selector engine used by L<Mojo::DOM>.
 
 All CSS selectors that make sense for a standalone parser are supported.
 
-=head2 C<*>
+=head2 *
 
 Any element.
 
   my $all = $css->select('*');
 
-=head2 C<E>
+=head2 E
 
 An element of type C<E>.
 
   my $title = $css->select('title');
 
-=head2 C<E[foo]>
+=head2 E[foo]
 
 An C<E> element with a C<foo> attribute.
 
   my $links = $css->select('a[href]');
 
-=head2 C<E[foo="bar"]>
+=head2 E[foo="bar"]
 
 An C<E> element whose C<foo> attribute value is exactly equal to C<bar>.
 
   my $fields = $css->select('input[name="foo"]');
 
-=head2 C<E[foo~="bar"]>
+=head2 E[foo~="bar"]
 
 An C<E> element whose C<foo> attribute value is a list of
 whitespace-separated values, one of which is exactly equal to C<bar>.
 
   my $fields = $css->select('input[name~="foo"]');
 
-=head2 C<E[foo^="bar"]>
+=head2 E[foo^="bar"]
 
 An C<E> element whose C<foo> attribute value begins exactly with the string
 C<bar>.
 
   my $fields = $css->select('input[name^="f"]');
 
-=head2 C<E[foo$="bar"]>
+=head2 E[foo$="bar"]
 
 An C<E> element whose C<foo> attribute value ends exactly with the string
 C<bar>.
 
   my $fields = $css->select('input[name$="o"]');
 
-=head2 C<E[foo*="bar"]>
+=head2 E[foo*="bar"]
 
 An C<E> element whose C<foo> attribute value contains the substring C<bar>.
 
   my $fields = $css->select('input[name*="fo"]');
 
-=head2 C<E:root>
+=head2 E:root
 
 An C<E> element, root of the document.
 
   my $root = $css->select(':root');
 
-=head2 C<E:checked>
+=head2 E:checked
 
 A user interface element C<E> which is checked (for instance a radio-button or
 checkbox).
 
   my $input = $css->select(':checked');
 
-=head2 C<E:empty>
+=head2 E:empty
 
 An C<E> element that has no children (including text nodes).
 
   my $empty = $css->select(':empty');
 
-=head2 C<E:nth-child(n)>
+=head2 E:nth-child(n)
 
 An C<E> element, the C<n-th> child of its parent.
 
@@ -482,7 +476,7 @@ An C<E> element, the C<n-th> child of its parent.
   my $even  = $css->select('div:nth-child(even)');
   my $top3  = $css->select('div:nth-child(-n+3)');
 
-=head2 C<E:nth-last-child(n)>
+=head2 E:nth-last-child(n)
 
 An C<E> element, the C<n-th> child of its parent, counting from the last one.
 
@@ -491,7 +485,7 @@ An C<E> element, the C<n-th> child of its parent, counting from the last one.
   my $even     = $css->select('div:nth-last-child(even)');
   my $bottom3  = $css->select('div:nth-last-child(-n+3)');
 
-=head2 C<E:nth-of-type(n)>
+=head2 E:nth-of-type(n)
 
 An C<E> element, the C<n-th> sibling of its type.
 
@@ -500,7 +494,7 @@ An C<E> element, the C<n-th> sibling of its type.
   my $even  = $css->select('div:nth-of-type(even)');
   my $top3  = $css->select('div:nth-of-type(-n+3)');
 
-=head2 C<E:nth-last-of-type(n)>
+=head2 E:nth-last-of-type(n)
 
 An C<E> element, the C<n-th> sibling of its type, counting from the last one.
 
@@ -509,91 +503,91 @@ An C<E> element, the C<n-th> sibling of its type, counting from the last one.
   my $even     = $css->select('div:nth-last-of-type(even)');
   my $bottom3  = $css->select('div:nth-last-of-type(-n+3)');
 
-=head2 C<E:first-child>
+=head2 E:first-child
 
 An C<E> element, first child of its parent.
 
   my $first = $css->select('div p:first-child');
 
-=head2 C<E:last-child>
+=head2 E:last-child
 
 An C<E> element, last child of its parent.
 
   my $last = $css->select('div p:last-child');
 
-=head2 C<E:first-of-type>
+=head2 E:first-of-type
 
 An C<E> element, first sibling of its type.
 
   my $first = $css->select('div p:first-of-type');
 
-=head2 C<E:last-of-type>
+=head2 E:last-of-type
 
 An C<E> element, last sibling of its type.
 
   my $last = $css->select('div p:last-of-type');
 
-=head2 C<E:only-child>
+=head2 E:only-child
 
 An C<E> element, only child of its parent.
 
   my $lonely = $css->select('div p:only-child');
 
-=head2 C<E:only-of-type>
+=head2 E:only-of-type
 
 An C<E> element, only sibling of its type.
 
   my $lonely = $css->select('div p:only-of-type');
 
-=head2 C<E.warning>
+=head2 E.warning
 
   my $warning = $css->select('div.warning');
 
 An C<E> element whose class is "warning".
 
-=head2 C<E#myid>
+=head2 E#myid
 
   my $foo = $css->select('div#foo');
 
 An C<E> element with C<ID> equal to "myid".
 
-=head2 C<E:not(s)>
+=head2 E:not(s)
 
 An C<E> element that does not match simple selector C<s>.
 
   my $others = $css->select('div p:not(:first-child)');
 
-=head2 C<E F>
+=head2 E F
 
 An C<F> element descendant of an C<E> element.
 
   my $headlines = $css->select('div h1');
 
-=head2 C<E E<gt> F>
+=head2 E E<gt> F
 
 An C<F> element child of an C<E> element.
 
   my $headlines = $css->select('html > body > div > h1');
 
-=head2 C<E + F>
+=head2 E + F
 
 An C<F> element immediately preceded by an C<E> element.
 
   my $second = $css->select('h1 + h2');
 
-=head2 C<E ~ F>
+=head2 E ~ F
 
 An C<F> element preceded by an C<E> element.
 
   my $second = $css->select('h1 ~ h2');
 
-=head2 C<E, F, G>
+=head2 E, F, G
 
 Elements of type C<E>, C<F> and C<G>.
 
   my $headlines = $css->select('h1, h2, h3');
 
-=head2 C<E[foo=bar][bar=baz]>
+=head2 E[foo=bar][bar=baz]
 
 An C<E> element whose attributes match all following attribute selectors.
 
@@ -603,7 +597,7 @@ An C<E> element whose attributes match all following attribute selectors.
 
 L<Mojo::DOM::CSS> implements the following attributes.
 
-=head2 C<tree>
+=head2 tree
 
   my $tree = $css->tree;
   $css     = $css->tree(['root', [qw(text lalala)]]);
@@ -615,7 +609,7 @@ Document Object Model.
 L<Mojo::DOM::CSS> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<select>
+=head2 select
 
   my $results = $css->select('head > title');
 

+8 -14

mojolegacy/lib/Mojo/DOM/HTML.pm

View

@@ -76,11 +76,9 @@ my %INLINE = map { $_ => 1 } (
 sub parse {
   my ($self, $html) = @_;
 
-  # Try to decode
   my $charset = $self->charset;
   defined ($html = decode($charset, $html)) || return $self->charset(undef) if $charset;
 
-  # Tokenize
   my $tree    = ['root'];
   my $current = $tree;
   while ($html =~ m/\G$TOKEN_RE/gcs) {
@@ -269,14 +267,10 @@ sub _render {
   # Processing instruction
   return "<?" . $tree->[1] . "?>" if $e eq 'pi';
 
-  # Offset
-  my $start = $e eq 'root' ? 1 : 2;
-
   # Start tag
+  my $start = $e eq 'root' ? 1 : 2;
   my $content = '';
   if ($e eq 'tag') {
-
-    # Offset
     $start = 4;
 
     # Open tag
@@ -305,7 +299,7 @@ sub _render {
     $content .= '>';
   }
 
-  # Walk tree
+  # Render whole tree
   $content .= $self->_render($tree->[$_]) for $start .. $#$tree;
 
   # End tag
@@ -362,7 +356,7 @@ sub _start {
     }
   }
 
-  # New
+  # New tag
   my $new = ['tag', $start, $attrs, $$current];
   weaken $new->[3];
   push @$$current, $new;
@@ -397,21 +391,21 @@ L<Mojo::DOM::HTML> is the HTML/XML engine used by L<Mojo::DOM>.
 
 L<Mojo::DOM::HTML> implements the following attributes.
 
-=head2 C<charset>
+=head2 charset
 
   my $charset = $html->charset;
   $html       = $html->charset('UTF-8');
 
 Charset used for decoding and encoding HTML/XML.
 
-=head2 C<tree>
+=head2 tree
 
   my $tree = $html->tree;
   $html    = $html->tree(['root', [qw(text lalala)]]);
 
 Document Object Model.
 
-=head2 C<xml>
+=head2 xml
 
   my $xml = $html->xml;
   $html   = $html->xml(1);
@@ -424,13 +418,13 @@ auto detection based on processing instructions.
 L<Mojo::DOM::HTML> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<parse>
+=head2 parse
 
   $html = $html->parse('<foo bar="baz">test</foo>');
 
 Parse HTML/XML document.
 
-=head2 C<render>
+=head2 render
 
   my $xml = $html->render;
 

+4 -5

mojolegacy/lib/Mojo/Date.pm

View

@@ -9,7 +9,6 @@ use Time::Local 'timegm';
 
 has 'epoch';
 
-# Days and months
 my @DAYS   = qw(Sun Mon Tue Wed Thu Fri Sat);
 my @MONTHS = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
 my %MONTHS;
@@ -93,7 +92,7 @@ L<Mojo::Date> implements HTTP date and time functions as described in RFC
 
 L<Mojo::Date> implements the following attributes.
 
-=head2 C<epoch>
+=head2 epoch
 
   my $epoch = $date->epoch;
   $date     = $date->epoch(784111777);
@@ -105,14 +104,14 @@ Epoch seconds.
 L<Mojo::Date> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $date = Mojo::Date->new;
   my $date = Mojo::Date->new('Sun Nov  6 08:49:37 1994');
 
 Construct a new L<Mojo::Date> object.
 
-=head2 C<parse>
+=head2 parse
 
   $date = $date->parse('Sun Nov  6 08:49:37 1994');
 
@@ -130,7 +129,7 @@ Parse date.
   # Ansi C asctime()
   say Mojo::Date->new('Sun Nov  6 08:49:37 1994')->epoch;
 
-=head2 C<to_string>
+=head2 to_string
 
   my $string = $date->to_string;
   my $string = "$date";

+34 -14

mojolegacy/lib/Mojo/EventEmitter.pm

View

@@ -12,7 +12,10 @@ sub emit {
     warn "-- Emit $name in @{[blessed($self)]} (@{[scalar(@$s)]})\n" if DEBUG;
     for my $cb (@$s) { $self->$cb(@_) }
   }
-  elsif (DEBUG) { warn "-- Emit $name in @{[blessed($self)]} (0)\n" }
+  else {
+    warn "-- Emit $name in @{[blessed($self)]} (0)\n" if DEBUG;
+    warn $_[0] if $name eq 'error';
+  }
 
   return $self;
 }
@@ -30,15 +33,14 @@ sub emit_safe {
         if ($name eq 'error') { warn qq{Event "error" failed: $@} }
 
         # Normal event failed
-        else {
-          $self->once(error => sub { warn $_[1] })
-            unless $self->has_subscribers('error');
-          $self->emit_safe('error', qq{Event "$name" failed: $@});
-        }
+        else { $self->emit_safe('error', qq{Event "$name" failed: $@}) }
       }
     }
   }
-  elsif (DEBUG) { warn "-- Emit $name in @{[blessed($self)]} safely (0)\n" }
+  else {
+    warn "-- Emit $name in @{[blessed($self)]} safely (0)\n" if DEBUG;
+    warn $_[0] if $name eq 'error';
+  }
 
   return $self;
 }
@@ -113,32 +115,50 @@ Mojo::EventEmitter - Event emitter base class
 
 L<Mojo::EventEmitter> is a simple base class for event emitting objects.
 
+=head1 EVENTS
+
+L<Mojo::EventEmitter> can emit the following events.
+
+=head2 error
+
+  $e->on(error => sub {
+    my ($e, $err) = @_;
+    ...
+  });
+
+Emitted safely for event errors.
+
+  $e->on(error => sub {
+    my ($e, $err) = @_;
+    say "This looks bad: $err";
+  });
+
 =head1 METHODS
 
 L<Mojo::EventEmitter> inherits all methods from L<Mojo::Base> and
 implements the following new ones.
 
-=head2 C<emit>
+=head2 emit
 
   $e = $e->emit('foo');
   $e = $e->emit('foo', 123);
 
 Emit event.
 
-=head2 C<emit_safe>
+=head2 emit_safe
 
   $e = $e->emit_safe('foo');
   $e = $e->emit_safe('foo', 123);
 
 Emit event safely and emit C<error> event on failure.
 
-=head2 C<has_subscribers>
+=head2 has_subscribers
 
   my $success = $e->has_subscribers('foo');
 
 Check if event has subscribers.
 
-=head2 C<on>
+=head2 on
 
   my $cb = $e->on(foo => sub {...});
 
@@ -149,7 +169,7 @@ Subscribe to event.
     ...
   });
 
-=head2 C<once>
+=head2 once
 
   my $cb = $e->once(foo => sub {...});
 
@@ -160,7 +180,7 @@ Subscribe to event and unsubscribe again after it has been emitted once.
     ...
   });
 
-=head2 C<subscribers>
+=head2 subscribers
 
   my $subscribers = $e->subscribers('foo');
 
@@ -169,7 +189,7 @@ All subscribers for event.
   # Unsubscribe last subscriber
   $e->unsubscribe(foo => $e->subscribers('foo')->[-1]);
 
-=head2 C<unsubscribe>
+=head2 unsubscribe
 
   $e = $e->unsubscribe('foo');
   $e = $e->unsubscribe(foo => $cb);

+12 -20

mojolegacy/lib/Mojo/Exception.pm

View

@@ -16,18 +16,11 @@ sub new {
   return @_ ? $self->_detect(@_) : $self;
 }
 
-# DEPRECATED in Rainbow!
-sub raw_message {
-  warn "Mojo::Exception->raw_message has been DEPRECATED!\n";
-  shift->message(@_);
-}
-
 sub throw { die shift->new->trace(2)->_detect(@_) }
 
 sub to_string {
   my $self = shift;
 
-  # Message
   return $self->message unless $self->verbose;
   my $string = $self->message ? $self->message : '';
 
@@ -94,7 +87,6 @@ sub _context {
 sub _detect {
   my ($self, $msg, $files) = @_;
 
-  # Message
   return $msg if blessed $msg && $msg->isa('Mojo::Exception');
   $self->message($msg);
 
@@ -144,76 +136,76 @@ L<Mojo::Exception> is a container for exceptions with context information.
 
 L<Mojo::Exception> implements the following attributes.
 
-=head2 C<frames>
+=head2 frames
 
   my $frames = $e->frames;
   $e         = $e->frames($frames);
 
 Stacktrace.
 
-=head2 C<line>
+=head2 line
 
   my $line = $e->line;
   $e       = $e->line([3 => 'foo']);
 
 The line where the exception occured.
 
-=head2 C<lines_after>
+=head2 lines_after
 
   my $lines = $e->lines_after;
   $e        = $e->lines_after([[1 => 'bar'], [2 => 'baz']]);
 
 Lines after the line where the exception occured.
 
-=head2 C<lines_before>
+=head2 lines_before
 
   my $lines = $e->lines_before;
   $e        = $e->lines_before([[4 => 'bar'], [5 => 'baz']]);
 
 Lines before the line where the exception occured.
 
-=head2 C<message>
+=head2 message
 
   my $msg = $e->message;
   $e      = $e->message('Oops!');
 
 Exception message.
 
-=head2 C<verbose>
+=head2 verbose
 
   my $verbose = $e->verbose;
   $e          = $e->verbose(1);
 
-Activate verbose rendering, defaults to the value of
-C<MOJO_EXCEPTION_VERBOSE> or C<0>.
+Activate verbose rendering, defaults to the value of the
+C<MOJO_EXCEPTION_VERBOSE> environment variable or C<0>.
 
 =head1 METHODS
 
 L<Mojo::Exception> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $e = Mojo::Exception->new('Oops!');
   my $e = Mojo::Exception->new('Oops!', $files);
 
 Construct a new L<Mojo::Exception> object.
 
-=head2 C<throw>
+=head2 throw
 
   Mojo::Exception->throw('Oops!');
   Mojo::Exception->throw('Oops!', $files);
 
 Throw exception with stacktrace.
 
-=head2 C<to_string>
+=head2 to_string
 
   my $string = $e->to_string;
   my $string = "$e";
 
 Render exception.
 
-=head2 C<trace>
+=head2 trace
 
   $e = $e->trace;
   $e = $e->trace(2);

+58 -61

mojolegacy/lib/Mojo/Headers.pm

View

@@ -89,7 +89,6 @@ sub names {
 sub parse {
   my $self = shift;
 
-  # Parse headers with size limit
   $self->{state} = 'headers';
   $self->{buffer} .= do {my $buffer = shift; defined $buffer ? $buffer : ''};
   my $headers = $self->{cache} ||= [];
@@ -134,7 +133,6 @@ sub remove {
 sub to_hash {
   my ($self, $multi) = @_;
 
-  # Build
   my %hash;
   for my $header (@{$self->names}) {
     my @headers = $self->header($header);
@@ -163,7 +161,6 @@ sub to_string {
     push @headers, "$name: " . join("\x0d\x0a ", @$_) for $self->header($name);
   }
 
-  # Format headers
   return join "\x0d\x0a", @headers;
 }
 
@@ -179,8 +176,8 @@ Mojo::Headers - Headers
 
   # Parse
   my $headers = Mojo::Headers->new;
-  $headers->parse("Content-Length: 42\r\n");
-  $headers->parse("Content-Type: text/html\r\n\r\n");
+  $headers->parse("Content-Length: 42\x0d\x0a");
+  $headers->parse("Content-Type: text/html\x0d\x0a\x0d\x0a");
   say $headers->content_length;
   say $headers->content_type;
 
@@ -198,7 +195,7 @@ L<Mojo::Headers> is a container for HTTP headers as described in RFC 2616.
 
 L<Mojo::Headers> implements the following attributes.
 
-=head2 C<max_line_size>
+=head2 max_line_size
 
   my $size = $headers->max_line_size;
   $headers = $headers->max_line_size(1024);
@@ -211,124 +208,124 @@ C<MOJO_MAX_LINE_SIZE> environment variable or C<10240>.
 L<Mojo::Headers> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<accept>
+=head2 accept
 
   my $accept = $headers->accept;
   $headers   = $headers->accept('application/json');
 
 Shortcut for the C<Accept> header.
 
-=head2 C<accept_charset>
+=head2 accept_charset
 
   my $charset = $headers->accept_charset;
   $headers    = $headers->accept_charset('UTF-8');
 
 Shortcut for the C<Accept-Charset> header.
 
-=head2 C<accept_encoding>
+=head2 accept_encoding
 
   my $encoding = $headers->accept_encoding;
   $headers     = $headers->accept_encoding('gzip');
 
 Shortcut for the C<Accept-Encoding> header.
 
-=head2 C<accept_language>
+=head2 accept_language
 
   my $language = $headers->accept_language;
   $headers     = $headers->accept_language('de, en');
 
 Shortcut for the C<Accept-Language> header.
 
-=head2 C<accept_ranges>
+=head2 accept_ranges
 
   my $ranges = $headers->accept_ranges;
   $headers   = $headers->accept_ranges('bytes');
 
 Shortcut for the C<Accept-Ranges> header.
 
-=head2 C<add>
+=head2 add
 
   $headers = $headers->add('Content-Type', 'text/plain');
 
 Add one or more header lines.
 
-=head2 C<authorization>
+=head2 authorization
 
   my $authorization = $headers->authorization;
   $headers          = $headers->authorization('Basic Zm9vOmJhcg==');
 
 Shortcut for the C<Authorization> header.
 
-=head2 C<cache_control>
+=head2 cache_control
 
   my $cache_control = $headers->cache_control;
   $headers          = $headers->cache_control('max-age=1, no-cache');
 
 Shortcut for the C<Cache-Control> header.
 
-=head2 C<clone>
+=head2 clone
 
   my $clone = $headers->clone;
 
 Clone headers.
 
-=head2 C<connection>
+=head2 connection
 
   my $connection = $headers->connection;
   $headers       = $headers->connection('close');
 
 Shortcut for the C<Connection> header.
 
-=head2 C<content_disposition>
+=head2 content_disposition
 
   my $disposition = $headers->content_disposition;
   $headers        = $headers->content_disposition('foo');
 
 Shortcut for the C<Content-Disposition> header.
 
-=head2 C<content_encoding>
+=head2 content_encoding
 
   my $encoding = $headers->content_encoding;
   $headers     = $headers->content_encoding('gzip');
 
 Shortcut for the C<Content-Encoding> header.
 
-=head2 C<content_length>
+=head2 content_length
 
   my $len  = $headers->content_length;
   $headers = $headers->content_length(4000);
 
 Shortcut for the C<Content-Length> header.
 
-=head2 C<content_range>
+=head2 content_range
 
   my $range = $headers->content_range;
   $headers  = $headers->content_range('bytes 2-8/100');
 
 Shortcut for the C<Content-Range> header.
 
-=head2 C<content_type>
+=head2 content_type
 
   my $type = $headers->content_type;
   $headers = $headers->content_type('text/plain');
 
 Shortcut for the C<Content-Type> header.
 
-=head2 C<cookie>
+=head2 cookie
 
   my $cookie = $headers->cookie;
   $headers   = $headers->cookie('f=b');
 
 Shortcut for the C<Cookie> header from RFC 6265.
 
-=head2 C<date>
+=head2 date
 
   my $date = $headers->date;
   $headers = $headers->date('Sun, 17 Aug 2008 16:27:35 GMT');
 
 Shortcut for the C<Date> header.
 
-=head2 C<dnt>
+=head2 dnt
 
   my $dnt  = $headers->dnt;
   $headers = $headers->dnt(1);
@@ -336,35 +333,35 @@ Shortcut for the C<Date> header.
 Shortcut for the C<DNT> (Do Not Track) header, which has no specification yet,
 but is very commonly used.
 
-=head2 C<etag>
+=head2 etag
 
   my $etag = $headers->etag;
   $headers = $headers->etag('abc321');
 
 Shortcut for the C<ETag> header.
 
-=head2 C<expect>
+=head2 expect
 
   my $expect = $headers->expect;
   $headers   = $headers->expect('100-continue');
 
 Shortcut for the C<Expect> header.
 
-=head2 C<expires>
+=head2 expires
 
   my $expires = $headers->expires;
   $headers    = $headers->expires('Thu, 01 Dec 1994 16:00:00 GMT');
 
 Shortcut for the C<Expires> header.
 
-=head2 C<from_hash>
+=head2 from_hash
 
   $headers = $headers->from_hash({'Content-Type' => 'text/html'});
   $headers = $headers->from_hash({});
 
 Parse headers from a hash reference.
 
-=head2 C<header>
+=head2 header
 
   my $string = $headers->header('Content-Type');
   my @lines  = $headers->header('Content-Type');
@@ -380,93 +377,93 @@ Get or replace the current header values.
     say for @$header;
   }
 
-=head2 C<host>
+=head2 host
 
   my $host = $headers->host;
   $headers = $headers->host('127.0.0.1');
 
 Shortcut for the C<Host> header.
 
-=head2 C<if_modified_since>
+=head2 if_modified_since
 
   my $date = $headers->if_modified_since;
   $headers = $headers->if_modified_since('Sun, 17 Aug 2008 16:27:35 GMT');
 
 Shortcut for the C<If-Modified-Since> header.
 
-=head2 C<is_finished>
+=head2 is_finished
 
   my $success = $headers->is_finished;
 
 Check if header parser is finished.
 
-=head2 C<is_limit_exceeded>
+=head2 is_limit_exceeded
 
   my $success = $headers->is_limit_exceeded;
 
 Check if a header has exceeded C<max_line_size>.
 
-=head2 C<last_modified>
+=head2 last_modified
 
   my $date = $headers->last_modified;
   $headers = $headers->last_modified('Sun, 17 Aug 2008 16:27:35 GMT');
 
 Shortcut for the C<Last-Modified> header.
 
-=head2 C<leftovers>
+=head2 leftovers
 
   my $bytes = $headers->leftovers;
 
 Get leftover data from header parser.
 
-=head2 C<location>
+=head2 location
 
   my $location = $headers->location;
   $headers     = $headers->location('http://127.0.0.1/foo');
 
 Shortcut for the C<Location> header.
 
-=head2 C<names>
+=head2 names
 
   my $names = $headers->names;
 
 Generate a list of all currently defined headers.
 
-=head2 C<origin>
+=head2 origin
 
   my $origin = $headers->origin;
   $headers   = $headers->origin('http://example.com');
 
 Shortcut for the C<Origin> header from RFC 6454.
 
-=head2 C<parse>
+=head2 parse
 
-  $headers = $headers->parse("Content-Type: text/plain\r\n\r\n");
+  $headers = $headers->parse("Content-Type: text/plain\x0d\x0a\x0d\x0a");
 
 Parse formatted headers.
 
-=head2 C<proxy_authenticate>
+=head2 proxy_authenticate
 
   my $authenticate = $headers->proxy_authenticate;
   $headers         = $headers->proxy_authenticate('Basic "realm"');
 
 Shortcut for the C<Proxy-Authenticate> header.
 
-=head2 C<proxy_authorization>
+=head2 proxy_authorization
 
   my $authorization = $headers->proxy_authorization;
   $headers          = $headers->proxy_authorization('Basic Zm9vOmJhcg==');
 
 Shortcut for the C<Proxy-Authorization> header.
 
-=head2 C<range>
+=head2 range
 
   my $range = $headers->range;
   $headers  = $headers->range('bytes=2-8');
 
 Shortcut for the C<Range> header.
 
-=head2 C<referrer>
+=head2 referrer
 
   my $referrer = $headers->referrer;
   $headers     = $headers->referrer('http://mojolicio.us');
@@ -474,76 +471,76 @@ Shortcut for the C<Range> header.
 Shortcut for the C<Referer> header, there was a typo in RFC 2068 which
 resulted in C<Referer> becoming an official header.
 
-=head2 C<remove>
+=head2 remove
 
   $headers = $headers->remove('Content-Type');
 
 Remove a header.
 
-=head2 C<sec_websocket_accept>
+=head2 sec_websocket_accept
 
   my $accept = $headers->sec_websocket_accept;
   $headers   = $headers->sec_websocket_accept('s3pPLMBiTxaQ9kYGzzhZRbK+xOo=');
 
 Shortcut for the C<Sec-WebSocket-Accept> header from RFC 6455.
 
-=head2 C<sec_websocket_extensions>
+=head2 sec_websocket_extensions
 
   my $extensions = $headers->sec_websocket_extensions;
   $headers       = $headers->sec_websocket_extensions('foo');
 
 Shortcut for the C<Sec-WebSocket-Extensions> header from RFC 6455.
 
-=head2 C<sec_websocket_key>
+=head2 sec_websocket_key
 
   my $key  = $headers->sec_websocket_key;
   $headers = $headers->sec_websocket_key('dGhlIHNhbXBsZSBub25jZQ==');
 
 Shortcut for the C<Sec-WebSocket-Key> header from RFC 6455.
 
-=head2 C<sec_websocket_protocol>
+=head2 sec_websocket_protocol
 
   my $protocol = $headers->sec_websocket_protocol;
   $headers     = $headers->sec_websocket_protocol('sample');
 
 Shortcut for the C<Sec-WebSocket-Protocol> header from RFC 6455.
 
-=head2 C<sec_websocket_version>
+=head2 sec_websocket_version
 
   my $version = $headers->sec_websocket_version;
   $headers    = $headers->sec_websocket_version(13);
 
 Shortcut for the C<Sec-WebSocket-Version> header from RFC 6455.
 
-=head2 C<server>
+=head2 server
 
   my $server = $headers->server;
   $headers   = $headers->server('Mojo');
 
 Shortcut for the C<Server> header.
 
-=head2 C<set_cookie>
+=head2 set_cookie
 
   my $cookie = $headers->set_cookie;
   $headers   = $headers->set_cookie('f=b; path=/');
 
 Shortcut for the C<Set-Cookie> header from RFC 6265.
 
-=head2 C<status>
+=head2 status
 
   my $status = $headers->status;
   $headers   = $headers->status('200 OK');
 
 Shortcut for the C<Status> header from RFC 3875.
 
-=head2 C<te>
+=head2 te
 
   my $te   = $headers->te;
   $headers = $headers->te('chunked');
 
 Shortcut for the C<TE> header.
 
-=head2 C<to_hash>
+=head2 to_hash
 
   my $single = $headers->to_hash;
   my $multi  = $headers->to_hash(1);
@@ -553,41 +550,41 @@ line values are disabled by default.
 
   say $headers->to_hash->{DNT};
 
-=head2 C<to_string>
+=head2 to_string
 
   my $string = $headers->to_string;
 
 Turn headers into a string, suitable for HTTP messages.
 
-=head2 C<trailer>
+=head2 trailer
 
   my $trailer = $headers->trailer;
   $headers    = $headers->trailer('X-Foo');
 
 Shortcut for the C<Trailer> header.
 
-=head2 C<transfer_encoding>
+=head2 transfer_encoding
 
   my $encoding = $headers->transfer_encoding;
   $headers     = $headers->transfer_encoding('chunked');
 
 Shortcut for the C<Transfer-Encoding> header.
 
-=head2 C<upgrade>
+=head2 upgrade
 
   my $upgrade = $headers->upgrade;
   $headers    = $headers->upgrade('websocket');
 
 Shortcut for the C<Upgrade> header.
 
-=head2 C<user_agent>
+=head2 user_agent
 
   my $agent = $headers->user_agent;
   $headers  = $headers->user_agent('Mojo/1.0');
 
 Shortcut for the C<User-Agent> header.
 
-=head2 C<www_authenticate>
+=head2 www_authenticate
 
   my $authenticate = $headers->www_authenticate;
   $headers         = $headers->www_authenticate('Basic realm="realm"');

+16 -18

mojolegacy/lib/Mojo/Home.pm

View

@@ -80,7 +80,13 @@ sub parse {
 sub rel_dir { catdir(@{shift->{parts} || []}, split '/', shift) }
 sub rel_file { catfile(@{shift->{parts} || []}, split '/', shift) }
 
-sub slurp_rel_file { slurp shift->rel_file(@_) }
+# DEPRECATED in Rainbow!
+sub slurp_rel_file {
+  warn <<EOF;
+Mojo::Home->slurp_rel_file is DEPRECATED in favor of Mojo::Util->slurp!!!
+EOF
+  slurp shift->rel_file(@_);
+}
 
 sub to_string { catdir(@{shift->{parts} || []}) }
 
@@ -110,14 +116,14 @@ L<Mojo::Home> is a container for home directories.
 L<Mojo::Home> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $home = Mojo::Home->new;
   my $home = Mojo::Home->new('/home/sri/myapp');
 
 Construct a new L<Mojo::Home> object.
 
-=head2 C<detect>
+=head2 detect
 
   $home = $home->detect;
   $home = $home->detect('My::App');
@@ -125,13 +131,13 @@ Construct a new L<Mojo::Home> object.
 Detect home directory from the value of the C<MOJO_HOME> environment variable
 or application class.
 
-=head2 C<lib_dir>
+=head2 lib_dir
 
   my $path = $home->lib_dir;
 
 Path to C<lib> directory of application.
 
-=head2 C<list_files>
+=head2 list_files
 
   my $files = $home->list_files;
   my $files = $home->list_files('foo/bar');
@@ -141,40 +147,32 @@ diectory.
 
   $home->rel_file($home->list_files('templates/layouts')->[1]);
 
-=head2 C<mojo_lib_dir>
+=head2 mojo_lib_dir
 
   my $path = $home->mojo_lib_dir;
 
 Path to C<lib> directory in which L<Mojolicious> is installed.
 
-=head2 C<parse>
+=head2 parse
 
   $home = $home->parse('/home/sri/myapp');
 
 Parse home directory.
 
-=head2 C<rel_dir>
+=head2 rel_dir
 
   my $path = $home->rel_dir('foo/bar');
 
 Portably generate an absolute path for a directory relative to the home
 directory.
 
-=head2 C<rel_file>
+=head2 rel_file
 
   my $path = $home->rel_file('foo/bar.html');
 
 Portably generate an absolute path for a file relative to the home directory.
 
-=head2 C<slurp_rel_file>
-
-  my $content = $home->slurp_rel_file('foo/bar.html');
-
-Portably read all data at once from file relative to the home directory.
-
-  my $content = $home->slurp_rel_file($home->list_files('public')->[1]);
-
-=head2 C<to_string>
+=head2 to_string
 
   my $string = $home->to_string;
   my $string = "$home";

+36 -41

mojolegacy/lib/Mojo/IOLoop.pm

View

@@ -42,13 +42,13 @@ sub acceptor {
   # Make sure connection manager is running
   $self->_manager;
 
-  # New acceptor
+  # Connect acceptor with reactor
   my $id = $self->_id;
   $self->{acceptors}{$id} = $acceptor;
   weaken $acceptor->reactor($self->reactor)->{reactor};
   $self->{accepts} = $self->max_accepts if $self->max_accepts;
 
-  # Stop accepting
+  # Stop accepting so new acceptor can get picked up
   $self->_not_accepting;
 
   return $id;
@@ -61,25 +61,22 @@ sub client {
   # Make sure connection manager is running
   $self->_manager;
 
-  # New client
   my $id     = $self->_id;
   my $c      = $self->{connections}{$id} ||= {};
   my $client = $c->{client} = Mojo::IOLoop::Client->new;
   weaken $client->reactor($self->reactor)->{reactor};
 
-  # Connect
   weaken $self;
   $client->on(
     connect => sub {
       my $handle = pop;
 
-      # New stream
+      # Turn handle into stream
       my $c = $self->{connections}{$id};
       delete $c->{client};
       my $stream = $c->{stream} = Mojo::IOLoop::Stream->new($handle);
       $self->_stream($stream => $id);
 
-      # Connected
       $self->$cb(undef, $stream);
     }
   );
@@ -128,14 +125,13 @@ sub server {
   my ($self, $cb) = (shift, pop);
   $self = $self->singleton unless ref $self;
 
-  # New server
   my $server = Mojo::IOLoop::Server->new;
   weaken $self;
   $server->on(
     accept => sub {
       my $handle = pop;
 
-      # Accept
+      # Turn handle into stream
       my $stream = Mojo::IOLoop::Stream->new($handle);
       $self->$cb($stream, $self->stream($stream));
 
@@ -144,7 +140,7 @@ sub server {
         if defined $self->{accepts}
         && ($self->{accepts} -= int(rand 2) + 1) <= 0;
 
-      # Stop accepting
+      # Stop accepting to release accept mutex
       $self->_not_accepting;
     }
   );
@@ -214,7 +210,7 @@ sub _id {
 sub _manage {
   my $self = shift;
 
-  # Start accepting if possible
+  # Try to acquire accept mutex
   $self->_accepting;
 
   # Close connections gracefully
@@ -241,9 +237,8 @@ sub _not_accepting {
   # Release accept mutex
   return unless delete $self->{accepting};
   return unless my $cb = $self->unlock;
-  $self->$cb();
+  $self->$cb;
 
-  # Stop accepting
   $_->stop for values %{$self->{acceptors} || {}};
 }
 
@@ -274,7 +269,7 @@ sub _stream {
   $self->{connections}{$id}{stream} = $stream;
   weaken $stream->reactor($self->reactor)->{reactor};
 
-  # Stream
+  # Start streaming
   weaken $self;
   $stream->on(close => sub { $self->{connections}{$id}{finish} = 1 });
   $stream->start;
@@ -297,12 +292,12 @@ Mojo::IOLoop - Minimalistic event loop
     my ($loop, $stream) = @_;
 
     $stream->on(read => sub {
-      my ($stream, $chunk) = @_;
+      my ($stream, $bytes) = @_;
 
-      # Process input
-      say $chunk;
+      # Process input chunk
+      say $bytes;
 
-      # Got some data, time to write
+      # Write response
       $stream->write('HTTP/1.1 200 OK');
     });
   });
@@ -312,14 +307,14 @@ Mojo::IOLoop - Minimalistic event loop
     my ($loop, $err, $stream) = @_;
 
     $stream->on(read => sub {
-      my ($stream, $chunk) = @_;
+      my ($stream, $bytes) = @_;
 
       # Process input
-      say "Input: $chunk";
+      say "Input: $bytes";
     });
 
     # Write request
-    $stream->write("GET / HTTP/1.1\r\n\r\n");
+    $stream->write("GET / HTTP/1.1\x0d\x0a\x0d\x0a");
   });
 
   # Add a timer
@@ -352,7 +347,7 @@ See L<Mojolicious::Guides::Cookbook> for more.
 
 L<Mojo::IOLoop> implements the following attributes.
 
-=head2 C<accept_interval>
+=head2 accept_interval
 
   my $interval = $loop->accept_interval;
   $loop        = $loop->accept_interval(0.5);
@@ -361,7 +356,7 @@ Interval in seconds for trying to reacquire the accept mutex and connection
 management, defaults to C<0.025>. Note that changing this value can affect
 performance and idle CPU usage.
 
-=head2 C<lock>
+=head2 lock
 
   my $cb = $loop->lock;
   $loop  = $loop->lock(sub {...});
@@ -377,7 +372,7 @@ this callback are not captured.
     return 1;
   });
 
-=head2 C<max_accepts>
+=head2 max_accepts
 
   my $max = $loop->max_accepts;
   $loop   = $loop->max_accepts(1000);
@@ -388,7 +383,7 @@ to C<0>. Setting the value to C<0> will allow this event loop to accept new
 connections indefinitely. Note that up to half of this value can be subtracted
 randomly to improve load balancing between multiple server processes.
 
-=head2 C<max_connections>
+=head2 max_connections
 
   my $max = $loop->max_connections;
   $loop   = $loop->max_connections(1000);
@@ -399,14 +394,14 @@ C<1000>. Setting the value to C<0> will make this event loop stop accepting
 new connections and allow it to shut down gracefully without interrupting
 existing connections.
 
-=head2 C<multi_accept>
+=head2 multi_accept
 
   my $multi = $loop->multi_accept;
   $loop     = $loop->multi_accept(100);
 
 Number of connections to accept at once, defaults to C<50>.
 
-=head2 C<reactor>
+=head2 reactor
 
   my $reactor = $loop->reactor;
   $loop       = $loop->reactor(Mojo::Reactor->new);
@@ -423,7 +418,7 @@ L<Mojo::Reactor::EV> object.
   # Change to watching only if handle becomes writable
   $loop->reactor->watch($handle, 0, 1);
 
-=head2 C<unlock>
+=head2 unlock
 
   my $cb = $loop->unlock;
   $loop  = $loop->unlock(sub {...});
@@ -436,7 +431,7 @@ processes. Note that exceptions in this callback are not captured.
 L<Mojo::IOLoop> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<acceptor>
+=head2 acceptor
 
   my $server = Mojo::IOLoop->acceptor($id);
   my $server = $loop->acceptor($id);
@@ -444,7 +439,7 @@ following new ones.
 
 Get L<Mojo::IOLoop::Server> object for id or turn object into an acceptor.
 
-=head2 C<client>
+=head2 client
 
   my $id
     = Mojo::IOLoop->client(address => '127.0.0.1', port => 3000, sub {...});
@@ -460,7 +455,7 @@ L<Mojo::IOLoop::Client/"connect">.
     ...
   });
 
-=head2 C<delay>
+=head2 delay
 
   my $delay = Mojo::IOLoop->delay;
   my $delay = $loop->delay;
@@ -506,14 +501,14 @@ ones as a chain of steps.
   # Wait for events if necessary
   $delay->wait unless Mojo::IOLoop->is_running;
 
-=head2 C<generate_port>
+=head2 generate_port
 
   my $port = Mojo::IOLoop->generate_port;
   my $port = $loop->generate_port;
 
 Find a free TCP port, this is a utility function primarily used for tests.
 
-=head2 C<is_running>
+=head2 is_running
 
   my $success = Mojo::IOLoop->is_running;
   my $success = $loop->is_running;
@@ -522,7 +517,7 @@ Check if event loop is running.
 
   exit unless Mojo::IOLoop->is_running;
 
-=head2 C<one_tick>
+=head2 one_tick
 
   Mojo::IOLoop->one_tick;
   $loop->one_tick;
@@ -530,7 +525,7 @@ Check if event loop is running.
 Run event loop until an event occurs. Note that this method can recurse back
 into the reactor, so you need to be careful.
 
-=head2 C<recurring>
+=head2 recurring
 
   my $id = Mojo::IOLoop->recurring(0.5 => sub {...});
   my $id = $loop->recurring(3 => sub {...});
@@ -541,7 +536,7 @@ amount of time in seconds.
   # Invoke as soon as possible
   Mojo::IOLoop->recurring(0 => sub { say 'Reactor tick.' });
 
-=head2 C<remove>
+=head2 remove
 
   Mojo::IOLoop->remove($id);
   $loop->remove($id);
@@ -549,7 +544,7 @@ amount of time in seconds.
 Remove anything with an id, connections will be dropped gracefully by allowing
 them to finish writing all data in their write buffers.
 
-=head2 C<server>
+=head2 server
 
   my $id = Mojo::IOLoop->server(port => 3000, sub {...});
   my $id = $loop->server(port => 3000, sub {...});
@@ -564,7 +559,7 @@ as L<Mojo::IOLoop::Server/"listen">.
     ...
   });
 
-=head2 C<singleton>
+=head2 singleton
 
   my $loop = Mojo::IOLoop->singleton;
 
@@ -575,7 +570,7 @@ loop object from everywhere inside the process.
   Mojo::IOLoop->timer(2 => sub { Mojo::IOLoop->stop });
   Mojo::IOLoop->start;
 
-=head2 C<start>
+=head2 start
 
   Mojo::IOLoop->start;
   $loop->start;
@@ -586,7 +581,7 @@ reactors stop automatically if there are no events being watched anymore.
   # Start event loop only if it is not running already
   Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
 
-=head2 C<stop>
+=head2 stop
 
   Mojo::IOLoop->stop;
   $loop->stop;
@@ -594,7 +589,7 @@ reactors stop automatically if there are no events being watched anymore.
 Stop the event loop, this will not interrupt any existing connections and the
 event loop can be restarted by running C<start> again.
 
-=head2 C<stream>
+=head2 stream
 
   my $stream = Mojo::IOLoop->stream($id);
   my $stream = $loop->stream($id);
@@ -605,7 +600,7 @@ Get L<Mojo::IOLoop::Stream> object for id or turn object into a connection.
   # Increase inactivity timeout for connection to 300 seconds
   Mojo::IOLoop->stream($id)->timeout(300);
 
-=head2 C<timer>
+=head2 timer
 
   my $id = Mojo::IOLoop->timer(5 => sub {...});
   my $id = $loop->timer(5 => sub {...});

+15 -19

mojolegacy/lib/Mojo/IOLoop/Client.pm

View

@@ -43,7 +43,6 @@ sub _cleanup {
 sub _connect {
   my ($self, $args) = @_;
 
-  # New socket
   my $handle;
   my $reactor = $self->reactor;
   my $address = $args->{address} ||= 'localhost';
@@ -83,7 +82,6 @@ sub _tls {
     return;
   }
 
-  # Connected
   $self->_cleanup->emit_safe(connect => $handle);
 }
 
@@ -102,8 +100,6 @@ sub _try {
 
   # TLS
   if ($args->{tls} && !$handle->isa('IO::Socket::SSL')) {
-
-    # No TLS support
     return $self->emit_safe(
       error => 'IO::Socket::SSL 1.75 required for TLS support')
       unless TLS;
@@ -130,7 +126,6 @@ sub _try {
     return $reactor->io($handle => sub { $self->_tls })->watch($handle, 0, 1);
   }
 
-  # Connected
   $self->_cleanup->emit_safe(connect => $handle);
 }
 
@@ -165,9 +160,10 @@ L<Mojo::IOLoop::Client> opens TCP connections for L<Mojo::IOLoop>.
 
 =head1 EVENTS
 
-L<Mojo::IOLoop::Client> can emit the following events.
+L<Mojo::IOLoop::Client> inherits all events from L<Mojo::EventEmitter> and can
+emit the following new ones.
 
-=head2 C<connect>
+=head2 connect
 
   $client->on(connect => sub {
     my ($client, $handle) = @_;
@@ -176,7 +172,7 @@ L<Mojo::IOLoop::Client> can emit the following events.
 
 Emitted safely once the connection is established.
 
-=head2 C<error>
+=head2 error
 
   $client->on(error => sub {
     my ($client, $err) = @_;
@@ -189,7 +185,7 @@ Emitted safely if an error occurs on the connection.
 
 L<Mojo::IOLoop::Client> implements the following attributes.
 
-=head2 C<reactor>
+=head2 reactor
 
   my $reactor = $client->reactor;
   $client     = $client->reactor(Mojo::Reactor::Poll->new);
@@ -202,7 +198,7 @@ global L<Mojo::IOLoop> singleton.
 L<Mojo::IOLoop::Client> inherits all methods from L<Mojo::EventEmitter> and
 implements the following new ones.
 
-=head2 C<connect>
+=head2 connect
 
   $client->connect(address => '127.0.0.1', port => 3000);
 
@@ -213,40 +209,40 @@ These options are currently available:
 
 =over 2
 
-=item C<address>
+=item address
 
 Address or host name of the peer to connect to, defaults to C<localhost>.
 
-=item C<handle>
+=item handle
 
 Use an already prepared handle.
 
-=item C<local_address>
+=item local_address
 
 Local address to bind to.
 
-=item C<port>
+=item port
 
 Port to connect to.
 
-=item C<timeout>
+=item timeout
 
 Maximum amount of time in seconds establishing connection may take before
 getting canceled, defaults to C<10>.
 
-=item C<tls>
+=item tls
 
 Enable TLS.
 
-=item C<tls_ca>
+=item tls_ca
 
 Path to TLS certificate authority file. Also activates hostname verification.
 
-=item C<tls_cert>
+=item tls_cert
 
 Path to the TLS certificate file.
 
-=item C<tls_key>
+=item tls_key
 
 Path to the TLS key file.
 

+8 -7

mojolegacy/lib/Mojo/IOLoop/Delay.pm

View

@@ -109,9 +109,10 @@ L<Mojo::IOLoop::Delay> controls the flow of events for L<Mojo::IOLoop>.
 
 =head1 EVENTS
 
-L<Mojo::IOLoop::Delay> can emit the following events.
+L<Mojo::IOLoop::Delay> inherits all events from L<Mojo::EventEmitter> and can
+emit the following new ones.
 
-=head2 C<finish>
+=head2 finish
 
   $delay->on(finish => sub {
     my ($delay, @args) = @_;
@@ -125,7 +126,7 @@ steps.
 
 L<Mojo::IOLoop::Delay> implements the following attributes.
 
-=head2 C<ioloop>
+=head2 ioloop
 
   my $ioloop = $delay->ioloop;
   $delay     = $delay->ioloop(Mojo::IOLoop->new);
@@ -138,7 +139,7 @@ singleton.
 L<Mojo::IOLoop::Delay> inherits all methods from L<Mojo::EventEmitter> and
 implements the following new ones.
 
-=head2 C<begin>
+=head2 begin
 
   my $cb = $delay->begin;
 
@@ -150,7 +151,7 @@ that the first argument passed to the callback will be ignored.
   Mojo::UserAgent->new->get('mojolicio.us' => $delay->begin);
   my $tx = $delay->wait;
 
-=head2 C<end>
+=head2 end
 
   my $remaining = $delay->end;
   my $remaining = $delay->end(@args);
@@ -158,7 +159,7 @@ that the first argument passed to the callback will be ignored.
 Decrement active event counter, all arguments are queued for the next step or
 C<finish> event and C<wait> method.
 
-=head2 C<steps>
+=head2 steps
 
   $delay = $delay->steps(sub {...}, sub {...});
 
@@ -166,7 +167,7 @@ Sequentialize multiple events, the first callback will run right away, and the
 next one once the active event counter reaches zero, this chain will continue
 until there are no more callbacks left.
 
-=head2 C<wait>
+=head2 wait
 
   my @args = $delay->wait;
 

+17 -18

mojolegacy/lib/Mojo/IOLoop/Server.pm

View

@@ -78,7 +78,6 @@ sub listen {
   $handle->blocking(0);
   $self->{handle} = $handle;
 
-  # TLS
   return unless $args->{tls};
   croak "IO::Socket::SSL 1.75 required for TLS support" unless TLS;
 
@@ -115,7 +114,6 @@ sub stop { $_[0]->reactor->remove($_[0]->{handle}) }
 sub _accept {
   my $self = shift;
 
-  # Accept
   return unless my $handle = $self->{handle}->accept;
   $handle->blocking(0);
 
@@ -182,9 +180,10 @@ L<Mojo::IOLoop::Server> accepts TCP connections for L<Mojo::IOLoop>.
 
 =head1 EVENTS
 
-L<Mojo::IOLoop::Server> can emit the following events.
+L<Mojo::IOLoop::Server> inherits all events from L<Mojo::EventEmitter> and can
+emit the following new ones.
 
-=head2 C<accept>
+=head2 accept
 
   $server->on(accept => sub {
     my ($server, $handle) = @_;
@@ -197,14 +196,14 @@ Emitted safely for each accepted connection.
 
 L<Mojo::IOLoop::Server> implements the following attributes.
 
-=head2 C<multi_accept>
+=head2 multi_accept
 
   my $multi = $server->multi_accept;
   $server   = $server->multi_accept(100);
 
 Number of connections to accept at once, defaults to C<50>.
 
-=head2 C<reactor>
+=head2 reactor
 
   my $reactor = $server->reactor;
   $server     = $server->reactor(Mojo::Reactor::Poll->new);
@@ -217,7 +216,7 @@ global L<Mojo::IOLoop> singleton.
 L<Mojo::IOLoop::Server> inherits all methods from L<Mojo::EventEmitter> and
 implements the following new ones.
 
-=head2 C<listen>
+=head2 listen
 
   $server->listen(port => 3000);
 
@@ -228,53 +227,53 @@ These options are currently available:
 
 =over 2
 
-=item C<address>
+=item address
 
 Local address to listen on, defaults to all.
 
-=item C<backlog>
+=item backlog
 
 Maximum backlog size, defaults to C<SOMAXCONN>.
 
-=item C<port>
+=item port
 
 Port to listen on.
 
-=item C<tls>
+=item tls
 
 Enable TLS.
 
-=item C<tls_ca>
+=item tls_ca
 
 Path to TLS certificate authority file.
 
-=item C<tls_cert>
+=item tls_cert
 
 Path to the TLS cert file, defaults to a built-in test certificate.
 
-=item C<tls_key>
+=item tls_key
 
 Path to the TLS key file, defaults to a built-in test key.
 
-=item C<tls_verify>
+=item tls_verify
 
 TLS verification mode, defaults to C<0x03>.
 
 =back
 
-=head2 C<generate_port>
+=head2 generate_port
 
   my $port = $server->generate_port;
 
 Find a free TCP port, this is a utility function primarily used for tests.
 
-=head2 C<start>
+=head2 start
 
   $server->start;
 
 Start accepting connections.
 
-=head2 C<stop>
+=head2 stop
 
   $server->stop;
 

+24 -41

mojolegacy/lib/Mojo/IOLoop/Stream.pm

View

@@ -24,7 +24,6 @@ sub close {
   return unless my $handle = delete $self->{handle};
   $reactor->remove($handle);
 
-  # Close
   close $handle;
   $self->emit_safe('close');
 }
@@ -65,14 +64,9 @@ sub steal_handle {
 sub write {
   my ($self, $chunk, $cb) = @_;
 
-  # Prepare chunk for writing
   $self->{buffer} .= $chunk;
-
-  # Write with roundtrip
   if ($cb) { $self->once(drain => $cb) }
   else     { return $self unless length $self->{buffer} }
-
-  # Start writing
   $self->reactor->watch($self->{handle}, !$self->{paused}, 1)
     if $self->{handle};
 
@@ -82,10 +76,7 @@ sub write {
 sub _read {
   my $self = shift;
 
-  # Read
   my $read = $self->{handle}->sysread(my $buffer, 131072, 0);
-
-  # Error
   unless (defined $read) {
 
     # Retry
@@ -101,7 +92,6 @@ sub _read {
   # EOF
   return $self->close if $read == 0;
 
-  # Handle read
   $self->emit_safe(read => $buffer)->{active} = time;
 }
 
@@ -118,19 +108,15 @@ sub _startup {
     }
   );
 
-  # Start streaming
   $reactor->io($self->{handle}, sub { pop() ? $self->_write : $self->_read });
 }
 
 sub _write {
   my $self = shift;
 
-  # Write as much as possible
   my $handle = $self->{handle};
   if (length $self->{buffer}) {
     my $written = $handle->syswrite($self->{buffer});
-
-    # Error
     unless (defined $written) {
 
       # Retry
@@ -143,15 +129,11 @@ sub _write {
       return $self->emit_safe(error => $!)->close;
     }
 
-    # Remove written chunk from buffer
     $self->emit_safe(write => substr($self->{buffer}, 0, $written, ''));
     $self->{active} = time;
   }
 
-  # Handle drain
   $self->emit_safe('drain') if !length $self->{buffer};
-
-  # Stop writing
   return if $self->is_writing;
   $self->reactor->watch($handle, !$self->{paused}, 0);
 }
@@ -169,7 +151,7 @@ Mojo::IOLoop::Stream - Non-blocking I/O stream
   # Create stream
   my $stream = Mojo::IOLoop::Stream->new($handle);
   $stream->on(read => sub {
-    my ($stream, $chunk) = @_;
+    my ($stream, $bytes) = @_;
     ...
   });
   $stream->on(close => sub {
@@ -195,9 +177,10 @@ L<Mojo::IOLoop>.
 
 =head1 EVENTS
 
-L<Mojo::IOLoop::Stream> can emit the following events.
+L<Mojo::IOLoop::Stream> inherits all events from L<Mojo::EventEmitter> and can
+emit the following new ones.
 
-=head2 C<close>
+=head2 close
 
   $stream->on(close => sub {
     my $stream = shift;
@@ -206,7 +189,7 @@ L<Mojo::IOLoop::Stream> can emit the following events.
 
 Emitted safely if the stream gets closed.
 
-=head2 C<drain>
+=head2 drain
 
   $stream->on(drain => sub {
     my $stream = shift;
@@ -215,7 +198,7 @@ Emitted safely if the stream gets closed.
 
 Emitted safely once all data has been written.
 
-=head2 C<error>
+=head2 error
 
   $stream->on(error => sub {
     my ($stream, $err) = @_;
@@ -224,16 +207,16 @@ Emitted safely once all data has been written.
 
 Emitted safely if an error occurs on the stream.
 
-=head2 C<read>
+=head2 read
 
   $stream->on(read => sub {
-    my ($stream, $chunk) = @_;
+    my ($stream, $bytes) = @_;
     ...
   });
 
 Emitted safely if new data arrives on the stream.
 
-=head2 C<timeout>
+=head2 timeout
 
   $stream->on(timeout => sub {
     my $stream = shift;
@@ -243,10 +226,10 @@ Emitted safely if new data arrives on the stream.
 Emitted safely if the stream has been inactive for too long and will get
 closed automatically.
 
-=head2 C<write>
+=head2 write
 
   $stream->on(write => sub {
-    my ($stream, $chunk) = @_;
+    my ($stream, $bytes) = @_;
     ...
   });
 
@@ -256,7 +239,7 @@ Emitted safely if new data has been written to the stream.
 
 L<Mojo::IOLoop::Stream> implements the following attributes.
 
-=head2 C<reactor>
+=head2 reactor
 
   my $reactor = $stream->reactor;
   $stream     = $stream->reactor(Mojo::Reactor::Poll->new);
@@ -264,7 +247,7 @@ L<Mojo::IOLoop::Stream> implements the following attributes.
 Low level event reactor, defaults to the C<reactor> attribute value of the
 global L<Mojo::IOLoop> singleton.
 
-=head2 C<timeout>
+=head2 timeout
 
   my $timeout = $stream->timeout;
   $stream     = $stream->timeout(45);
@@ -278,59 +261,59 @@ stream to be inactive indefinitely.
 L<Mojo::IOLoop::Stream> inherits all methods from L<Mojo::EventEmitter> and
 implements the following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $stream = Mojo::IOLoop::Stream->new($handle);
 
 Construct a new L<Mojo::IOLoop::Stream> object.
 
-=head2 C<close>
+=head2 close
 
   $stream->close;
 
 Close stream immediately.
 
-=head2 C<handle>
+=head2 handle
 
   my $handle = $stream->handle;
 
 Get handle for stream.
 
-=head2 C<is_readable>
+=head2 is_readable
 
   my $success = $stream->is_readable;
 
 Quick non-blocking check if stream is readable, useful for identifying tainted
 sockets.
 
-=head2 C<is_writing>
+=head2 is_writing
 
   my $success = $stream->is_writing;
 
 Check if stream is writing.
 
-=head2 C<start>
+=head2 start
 
   $stream->start;
 
 Start watching for new data on the stream.
 
-=head2 C<stop>
+=head2 stop
 
   $stream->stop;
 
 Stop watching for new data on the stream.
 
-=head2 C<steal_handle>
+=head2 steal_handle
 
   my $handle = $stream->steal_handle;
 
 Steal handle from stream and prevent it from getting closed automatically.
 
-=head2 C<write>
+=head2 write
 
-  $stream = $stream->write('Hello!');
-  $stream = $stream->write('Hello!' => sub {...});
+  $stream = $stream->write($bytes);
+  $stream = $stream->write($bytes => sub {...});
 
 Write data to stream, the optional drain callback will be invoked once all
 data has been written.

+45 -19

mojolegacy/lib/Mojo/JSON.pm

View

@@ -2,11 +2,14 @@ package Mojo::JSON;
 use Mojo::Base -base;
 
 use B;
+use Exporter 'import';
 use Mojo::Util;
 use Scalar::Util 'blessed';
 
 has 'error';
 
+our @EXPORT_OK = ('j');
+
 # Literal names
 my $FALSE = bless \(my $false = 0), 'Mojo::JSON::_Bool';
 my $TRUE  = bless \(my $true  = 1), 'Mojo::JSON::_Bool';
@@ -40,7 +43,7 @@ my $WHITESPACE_RE = qr/[\x20\x09\x0a\x0d]*/;
 sub decode {
   my ($self, $bytes) = @_;
 
-  # Cleanup
+  # Clean start
   $self->error(undef);
 
   # Missing input
@@ -99,7 +102,14 @@ sub encode {
 }
 
 sub false {$FALSE}
-sub true  {$TRUE}
+
+sub j {
+  my $d = shift;
+  return __PACKAGE__->new->encode($d) if ref $d eq 'ARRAY' || ref $d eq 'HASH';
+  return __PACKAGE__->new->decode($d);
+}
+
+sub true {$TRUE}
 
 sub _decode_array {
   my @array;
@@ -246,22 +256,14 @@ sub _encode_array {
 
 sub _encode_object {
   my $object = shift;
-
-  # Encode pairs
   my @pairs = map { _encode_string($_) . ':' . _encode_values($object->{$_}) }
     keys %$object;
-
-  # Stringify
   return '{' . join(',', @pairs) . '}';
 }
 
 sub _encode_string {
   my $string = shift;
-
-  # Escape string
   $string =~ s!([\x00-\x1F\x7F\x{2028}\x{2029}\\"/\b\f\n\r\t])!$REVERSE{$1}!gs;
-
-  # Stringify
   return "\"$string\"";
 }
 
@@ -312,7 +314,6 @@ sub _exception {
     $context .= ' at line ' . @lines . ', offset ' . length(pop @lines || '');
   }
 
-  # Throw
   die "$context\n";
 }
 
@@ -328,12 +329,22 @@ Mojo::JSON - Minimalistic JSON
 
 =head1 SYNOPSIS
 
+  # Encode and decode JSON
   use Mojo::JSON;
-
   my $json  = Mojo::JSON->new;
   my $bytes = $json->encode({foo => [1, 2], bar => 'hello!', baz => \1});
   my $hash  = $json->decode($bytes);
 
+  # Check for errors
+  my $json = Mojo::JSON->new;
+  if (defined(my $hash = $json->decode($bytes))) { say $hash->{message} }
+  else { say 'Error: ', $json->error }
+
+  # Use the alternative interface
+  use Mojo::JSON 'j';
+  my $bytes = j({foo => [1, 2], bar => 'hello!', baz => \1});
+  my $hash  = j($bytes);
+
 =head1 DESCRIPTION
 
 L<Mojo::JSON> is a minimalistic and relaxed implementation of RFC 4627. While
@@ -359,11 +370,25 @@ Decoding UTF-16 (LE/BE) and UTF-32 (LE/BE) will be handled transparently,
 encoding will only generate UTF-8. The two Unicode whitespace characters
 C<u2028> and C<u2029> will always be escaped to make JSONP easier.
 
+=head1 FUNCTIONS
+
+L<Mojo::JSON> implements the following functions.
+
+=head2 j
+
+  my $bytes = j([1, 2, 3]);
+  my $bytes = j({foo => 'bar'});
+  my $array = j($bytes);
+  my $hash  = j($bytes);
+
+Encode Perl data structure or decode JSON and return C<undef> if decoding
+fails.
+
 =head1 ATTRIBUTES
 
 L<Mojo::JSON> implements the following attributes.
 
-=head2 C<error>
+=head2 error
 
   my $err = $json->error;
   $json   = $json->error('Parser error');
@@ -375,27 +400,28 @@ Parser errors.
 L<Mojo::JSON> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<decode>
+=head2 decode
 
   my $array = $json->decode($bytes);
   my $hash  = $json->decode($bytes);
 
-Decode JSON.
+Decode JSON to Perl data structure and return C<undef> if decoding fails.
 
-=head2 C<encode>
+=head2 encode
 
+  my $bytes = $json->encode([1, 2, 3]);
   my $bytes = $json->encode({foo => 'bar'});
 
-Encode Perl data structure.
+Encode Perl data structure to JSON.
 
-=head2 C<false>
+=head2 false
 
   my $false = Mojo::JSON->false;
   my $false = $json->false;
 
 False value, used because Perl has no native equivalent.
 
-=head2 C<true>
+=head2 true
 
   my $true = Mojo::JSON->true;
   my $true = $json->true;

+2 -3

mojolegacy/lib/Mojo/JSON/Pointer.pm

View

@@ -10,7 +10,6 @@ sub get      { shift->_pointer(0, @_) }
 sub _pointer {
   my ($self, $contains, $data, $pointer) = @_;
 
-  # Parse pointer and walk data structure
   $pointer = decode('UTF-8', url_unescape $pointer);
   return $data unless $pointer =~ s!^/!!;
   for my $p (split '/', $pointer) {
@@ -52,7 +51,7 @@ L<Mojo::JSON::Pointer> implements JSON Pointers.
 
 =head1 METHODS
 
-=head2 C<contains>
+=head2 contains
 
   my $success = $pointer->contains($data, '/foo/1');
 
@@ -67,7 +66,7 @@ JSON Pointer.
   $pointer->contains({foo => 'bar', baz => [4, 5, 6]}, '/bar');
   $pointer->contains({foo => 'bar', baz => [4, 5, 6]}, '/baz/9');
 
-=head2 C<get>
+=head2 get
 
   my $value = $pointer->get($data, '/foo/bar');
 

+4 -8

mojolegacy/lib/Mojo/Loader.pm

View

@@ -6,7 +6,6 @@ use File::Spec::Functions qw(catdir catfile splitdir);
 use Mojo::Exception;
 use Mojo::Util qw(b64_decode class_to_path);
 
-# Cache
 my %CACHE;
 
 sub data {
@@ -34,7 +33,6 @@ sub load {
 sub search {
   my ($self, $namespace) = @_;
 
-  # Check all directories
   my (@modules, %found);
   for my $directory (@INC) {
     next unless -d (my $path = catdir $directory, split(/::|'/, $namespace));
@@ -43,8 +41,6 @@ sub search {
     opendir(my $dir, $path);
     for my $file (grep /\.pm$/, readdir $dir) {
       next if -d catfile splitdir($path), $file;
-
-      # Module found
       my $class = "${namespace}::" . fileparse $file, qr/\.pm/;
       push @modules, $class unless $found{$class}++;
     }
@@ -69,7 +65,7 @@ sub _all {
   # Ignore everything after __END__
   $content =~ s/\n__END__\r?\n.*$/\n/s;
 
-  # Split
+  # Split files
   my @data = split /^@@\s*(.+?)\s*\r?\n/m, $content;
   shift @data;
 
@@ -115,7 +111,7 @@ L<Mojo::Loader> is a class loader and plugin framework.
 L<Mojo::Loader> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<data>
+=head2 data
 
   my $all   = $loader->data('Foo::Bar');
   my $index = $loader->data('Foo::Bar', 'index.html');
@@ -124,7 +120,7 @@ Extract embedded file from the C<DATA> section of a class.
 
   say for keys %{$loader->data('Foo::Bar')};
 
-=head2 C<load>
+=head2 load
 
   my $e = $loader->load('Foo::Bar');
 
@@ -135,7 +131,7 @@ method to see if they are already loaded.
     die ref $e ? "Exception: $e" : 'Already loaded!';
   }
 
-=head2 C<search>
+=head2 search
 
   my $modules = $loader->search('MyApp::Namespace');
 

+25 -26

mojolegacy/lib/Mojo/Log.pm

View

@@ -59,10 +59,8 @@ sub warn { shift->log(warn => @_) }
 sub _message {
   my ($self, $level, @lines) = @_;
 
-  # Check level
   return unless $self->is_level($level) && (my $handle = $self->handle);
 
-  # Format lines and write to handle
   flock $handle, LOCK_EX;
   croak "Can't write to log: $!"
     unless defined $handle->syswrite($self->format($level, @lines));
@@ -98,9 +96,10 @@ L<Mojo::Log> is a simple logger for L<Mojo> projects.
 
 =head1 EVENTS
 
-L<Mojo::Log> can emit the following events.
+L<Mojo::Log> inherits all events from L<Mojo::EventEmitter> and can emit the
+following new ones.
 
-=head2 C<message>
+=head2 message
 
   $log->on(message => sub {
     my ($log, $level, @lines) = @_;
@@ -119,7 +118,7 @@ Emitted when a new message gets logged.
 
 L<Mojo::Log> implements the following attributes.
 
-=head2 C<handle>
+=head2 handle
 
   my $handle = $log->handle;
   $log       = $log->handle(IO::Handle->new);
@@ -127,7 +126,7 @@ L<Mojo::Log> implements the following attributes.
 Log file handle used by default C<message> event, defaults to opening C<path>
 or C<STDERR>.
 
-=head2 C<level>
+=head2 level
 
   my $level = $log->level;
   $log      = $log->level('debug');
@@ -139,19 +138,19 @@ These levels are currently available:
 
 =over 2
 
-=item C<debug>
+=item debug
 
-=item C<info>
+=item info
 
-=item C<warn>
+=item warn
 
-=item C<error>
+=item error
 
-=item C<fatal>
+=item fatal
 
 =back
 
-=head2 C<path>
+=head2 path
 
   my $path = $log->path
   $log     = $log->path('/var/log/mojo.log');
@@ -163,87 +162,87 @@ Log file path used by C<handle>.
 L<Mojo::Log> inherits all methods from L<Mojo::EventEmitter> and implements
 the following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $log = Mojo::Log->new;
 
 Construct a new L<Mojo::Log> object and subscribe to C<message> event with
 default logger.
 
-=head2 C<debug>
+=head2 debug
 
   $log = $log->debug('You screwed up, but that is ok');
 
 Log debug message.
 
-=head2 C<error>
+=head2 error
 
   $log = $log->error('You really screwed up this time');
 
 Log error message.
 
-=head2 C<fatal>
+=head2 fatal
 
   $log = $log->fatal('Its over...');
 
 Log fatal message.
 
-=head2 C<format>
+=head2 format
 
   my $msg = $log->format('debug', 'Hi there!');
   my $msg = $log->format('debug', 'Hi', 'there!');
 
 Format log message.
 
-=head2 C<info>
+=head2 info
 
   $log = $log->info('You are bad, but you prolly know already');
 
 Log info message.
 
-=head2 C<is_level>
+=head2 is_level
 
   my $success = $log->is_level('debug');
 
 Check log level.
 
-=head2 C<is_debug>
+=head2 is_debug
 
   my $success = $log->is_debug;
 
 Check for debug log level.
 
-=head2 C<is_error>
+=head2 is_error
 
   my $success = $log->is_error;
 
 Check for error log level.
 
-=head2 C<is_fatal>
+=head2 is_fatal
 
   my $success = $log->is_fatal;
 
 Check for fatal log level.
 
-=head2 C<is_info>
+=head2 is_info
 
   my $success = $log->is_info;
 
 Check for info log level.
 
-=head2 C<is_warn>
+=head2 is_warn
 
   my $success = $log->is_warn;
 
 Check for warn log level.
 
-=head2 C<log>
+=head2 log
 
   $log = $log->log(debug => 'This should work');
 
 Emit C<message> event.
 
-=head2 C<warn>
+=head2 warn
 
   $log = $log->warn('Dont do that Dave...');
 

+66 -88

mojolegacy/lib/Mojo/Message.pm

View

@@ -43,10 +43,7 @@ sub body {
 sub body_params {
   my $self = shift;
 
-  # Cached
   return $self->{body_params} if $self->{body_params};
-
-  # Charset
   my $params = $self->{body_params} = Mojo::Parameters->new;
   $params->charset($self->content->charset || $self->default_charset);
 
@@ -59,15 +56,9 @@ sub body_params {
   # "multipart/formdata"
   elsif ($type =~ m!multipart/form-data!i) {
     my $formdata = $self->_parse_formdata;
-
-    # Formdata
     for my $data (@$formdata) {
       my ($name, $filename, $value) = @$data;
-
-      # File
       next if defined $filename;
-
-      # Form value
       $params->append($name, $value);
     }
   }
@@ -143,14 +134,9 @@ sub fix_headers {
 sub get_body_chunk {
   my ($self, $offset) = @_;
 
-  # Progress
   $self->emit('progress', 'body', $offset);
-
-  # Chunk
   my $chunk = $self->content->get_body_chunk($offset);
   return $chunk if !defined $chunk || length $chunk;
-
-  # Finish
   $self->finish;
 
   return $chunk;
@@ -197,9 +183,10 @@ sub param { shift->body_params->param(@_) }
 sub parse {
   my ($self, $chunk) = @_;
 
-  # Check message size and add chunk
+  # Check message size
   return $self->error('Maximum message size exceeded', 413)
     if ($self->{raw_size} += length($chunk = defined $chunk ? $chunk : '')) > $self->max_message_size;
+
   $self->{buffer} .= $chunk;
 
   # Start line
@@ -211,7 +198,6 @@ sub parse {
     return $self->error('Maximum line size exceeded', 431)
       if $len > $self->max_line_size;
 
-    # Extract
     $self->{state} = 'content' if $self->extract_start_line(\$self->{buffer});
   }
 
@@ -227,7 +213,6 @@ sub parse {
   return $self->error('Maximum buffer size exceeded', 400)
     if $self->content->is_limit_exceeded;
 
-  # Progress
   return $self->emit('progress')->content->is_finished ? $self->finish : $self;
 }
 
@@ -249,11 +234,7 @@ sub upload {
 sub uploads {
   my $self = shift;
 
-  # Only multipart messages have uploads
   my @uploads;
-  return \@uploads unless $self->is_multipart;
-
-  # Extract formdata
   my $formdata = $self->_parse_formdata;
   for my $data (@$formdata) {
     my ($name, $filename, $part) = @$data;
@@ -280,7 +261,6 @@ sub write_chunk { shift->_write(write_chunk => @_) }
 sub _build {
   my ($self, $method) = @_;
 
-  # Build part from chunks
   my $buffer = '';
   my $offset = 0;
   while (1) {
@@ -291,7 +271,6 @@ sub _build {
     # End of part
     last unless my $len = length $chunk;
 
-    # Part
     $offset += $len;
     $buffer .= $chunk;
   }
@@ -323,37 +302,35 @@ sub _nest {
 sub _parse_formdata {
   my $self = shift;
 
-  # Check content
+  # Check for multipart content
   my @formdata;
   my $content = $self->content;
   return \@formdata unless $content->is_multipart;
   my $charset = $content->charset || $self->default_charset;
 
-  # Walk the tree
+  # Check all parts for form data
   my @parts;
   push @parts, $content;
   while (my $part = shift @parts) {
 
-    # Multipart
+    # Nested multipart content
     if ($part->is_multipart) {
       unshift @parts, @{$part->parts};
       next;
     }
 
-    # Content-Disposition header
+    # Extract information from Content-Disposition header
     my $disposition = $part->headers->content_disposition;
     next unless $disposition;
     my ($name)     = $disposition =~ /[; ]name="?([^";]+)"?/;
     my ($filename) = $disposition =~ /[; ]filename="?([^"]*)"?/;
-    my $value      = $part;
-
-    # Decode
     if ($charset) {
       $name     = do {my $tmp = decode($charset, $name); defined $tmp ? $tmp : $name} if $name;
       $filename = do {my $tmp = decode($charset, $filename); defined $tmp ? $tmp : $filename} if $filename;
     }
 
-    # Form value
+    # Check for file upload
+    my $value = $part;
     unless (defined $filename) {
       $value = $part->asset->slurp;
       $value = do {my $tmp = decode($charset, $value); defined $tmp ? $tmp : $value} if $charset;
@@ -394,9 +371,10 @@ RFC 2616 and RFC 2388.
 
 =head1 EVENTS
 
-L<Mojo::Message> can emit the following events.
+L<Mojo::Message> inherits all events from L<Mojo::EventEmitter> and can emit
+the following new ones.
 
-=head2 C<finish>
+=head2 finish
 
   $msg->on(finish => sub {
     my $msg = shift;
@@ -411,7 +389,7 @@ Emitted after message building or parsing is finished.
     $msg->headers->header('X-Parser-Time' => time - $before);
   });
 
-=head2 C<progress>
+=head2 progress
 
   $msg->on(progress => sub {
     my $msg = shift;
@@ -438,21 +416,21 @@ Emitted when message building or parsing makes progress.
 
 L<Mojo::Message> implements the following attributes.
 
-=head2 C<content>
+=head2 content
 
   my $msg = $msg->content;
   $msg    = $msg->content(Mojo::Content::Single->new);
 
 Message content, defaults to a L<Mojo::Content::Single> object.
 
-=head2 C<default_charset>
+=head2 default_charset
 
   my $charset = $msg->default_charset;
   $msg        = $msg->default_charset('UTF-8');
 
 Default charset used for form data parsing, defaults to C<UTF-8>.
 
-=head2 C<max_line_size>
+=head2 max_line_size
 
   my $size = $msg->max_line_size;
   $msg     = $msg->max_line_size(1024);
@@ -460,7 +438,7 @@ Default charset used for form data parsing, defaults to C<UTF-8>.
 Maximum start line size in bytes, defaults to the value of the
 C<MOJO_MAX_LINE_SIZE> environment variable or C<10240>.
 
-=head2 C<max_message_size>
+=head2 max_message_size
 
   my $size = $msg->max_message_size;
   $msg     = $msg->max_message_size(1024);
@@ -471,7 +449,7 @@ increasing this value can also drastically increase memory usage, should you
 for example attempt to parse an excessively large message body with the
 C<body_params>, C<dom> or C<json> methods.
 
-=head2 C<version>
+=head2 version
 
   my $version = $msg->version;
   $msg        = $msg->version('1.1');
@@ -483,20 +461,20 @@ HTTP version of message, defaults to C<1.1>.
 L<Mojo::Message> inherits all methods from L<Mojo::EventEmitter> and
 implements the following new ones.
 
-=head2 C<body>
+=head2 body
 
-  my $string = $msg->body;
-  $msg       = $msg->body('Hello!');
-  my $cb     = $msg->body(sub {...});
+  my $bytes = $msg->body;
+  $msg      = $msg->body('Hello!');
+  my $cb    = $msg->body(sub {...});
 
 Access C<content> data or replace all subscribers of the C<read> event.
 
   $msg->body(sub {
-    my ($msg, $chunk) = @_;
-    say "Streaming: $chunk";
+    my ($msg, $bytes) = @_;
+    say "Streaming: $bytes";
   });
 
-=head2 C<body_params>
+=head2 body_params
 
   my $params = $msg->body_params;
 
@@ -508,31 +486,31 @@ so it should not be called before the entire message body has been received.
   # Get POST parameter value
   say $msg->body_params->param('foo');
 
-=head2 C<body_size>
+=head2 body_size
 
   my $size = $msg->body_size;
 
 Content size in bytes.
 
-=head2 C<build_body>
+=head2 build_body
 
-  my $string = $msg->build_body;
+  my $bytes = $msg->build_body;
 
 Render whole body.
 
-=head2 C<build_headers>
+=head2 build_headers
 
-  my $string = $msg->build_headers;
+  my $bytes = $msg->build_headers;
 
 Render all headers.
 
-=head2 C<build_start_line>
+=head2 build_start_line
 
-  my $string = $msg->build_start_line;
+  my $bytes = $msg->build_start_line;
 
 Render start line.
 
-=head2 C<cookie>
+=head2 cookie
 
   my $cookie  = $msg->cookie('foo');
   my @cookies = $msg->cookie('foo');
@@ -544,13 +522,13 @@ it should not be called before all headers have been received.
   # Get cookie value
   say $msg->cookie('foo')->value;
 
-=head2 C<cookies>
+=head2 cookies
 
   my $cookies = $msg->cookies;
 
 Access message cookies. Meant to be overloaded in a subclass.
 
-=head2 C<dom>
+=head2 dom
 
   my $dom        = $msg->dom;
   my $collection = $msg->dom('a[href]');
@@ -567,7 +545,7 @@ before the entire message body has been received.
   say $msg->dom->at('title')->text;
   say $msg->dom->html->body->children->pluck('type')->uniq;
 
-=head2 C<error>
+=head2 error
 
   my $err          = $msg->error;
   my ($err, $code) = $msg->error;
@@ -576,93 +554,93 @@ before the entire message body has been received.
 
 Error and code.
 
-=head2 C<extract_start_line>
+=head2 extract_start_line
 
   my $success = $msg->extract_start_line(\$string);
 
 Extract start line from string. Meant to be overloaded in a subclass.
 
-=head2 C<finish>
+=head2 finish
 
   $msg = $msg->finish;
 
 Finish message parser/generator.
 
-=head2 C<fix_headers>
+=head2 fix_headers
 
   $msg = $msg->fix_headers;
 
 Make sure message has all required headers.
 
-=head2 C<get_body_chunk>
+=head2 get_body_chunk
 
-  my $string = $msg->get_body_chunk($offset);
+  my $bytes = $msg->get_body_chunk($offset);
 
 Get a chunk of body data starting from a specific position.
 
-=head2 C<get_header_chunk>
+=head2 get_header_chunk
 
-  my $string = $msg->get_header_chunk($offset);
+  my $bytes = $msg->get_header_chunk($offset);
 
 Get a chunk of header data, starting from a specific position.
 
-=head2 C<get_start_line_chunk>
+=head2 get_start_line_chunk
 
-  my $string = $msg->get_start_line_chunk($offset);
+  my $bytes = $msg->get_start_line_chunk($offset);
 
 Get a chunk of start line data starting from a specific position. Meant to be
 overloaded in a subclass.
 
-=head2 C<has_leftovers>
+=head2 has_leftovers
 
   my $success = $msg->has_leftovers;
 
 Check if there are leftovers.
 
-=head2 C<header_size>
+=head2 header_size
 
   my $size = $msg->header_size;
 
 Size of headers in bytes.
 
-=head2 C<headers>
+=head2 headers
 
   my $headers = $msg->headers;
 
 Message headers, usually a L<Mojo::Headers> object.
 
-=head2 C<is_chunked>
+=head2 is_chunked
 
   my $success = $msg->is_chunked;
 
 Check if content is chunked.
 
-=head2 C<is_dynamic>
+=head2 is_dynamic
 
   my $success = $msg->is_dynamic;
 
 Check if content will be dynamically generated, which prevents C<clone> from
 working.
 
-=head2 C<is_finished>
+=head2 is_finished
 
   my $success = $msg->is_finished;
 
 Check if message parser/generator is finished.
 
-=head2 C<is_limit_exceeded>
+=head2 is_limit_exceeded
 
   my $success = $msg->is_limit_exceeded;
 
 Check if message has exceeded C<max_line_size> or C<max_message_size>.
 
-=head2 C<is_multipart>
+=head2 is_multipart
 
   my $success = $msg->is_multipart;
 
 Check if content is a L<Mojo::Content::MultiPart> object.
 
-=head2 C<json>
+=head2 json
 
   my $hash  = $msg->json;
   my $array = $msg->json;
@@ -677,13 +655,13 @@ it should not be called before the entire message body has been received.
   say $msg->json->{foo}{bar}[23];
   say $msg->json('/foo/bar/23');
 
-=head2 C<leftovers>
+=head2 leftovers
 
   my $bytes = $msg->leftovers;
 
 Get leftover data from content parser.
 
-=head2 C<param>
+=head2 param
 
   my @names = $msg->param;
   my $foo   = $msg->param('foo');
@@ -692,25 +670,25 @@ Get leftover data from content parser.
 Access C<POST> parameters. Note that this method caches all data, so it should
 not be called before the entire message body has been received.
 
-=head2 C<parse>
+=head2 parse
 
   $msg = $msg->parse('HTTP/1.1 200 OK...');
 
 Parse message chunk.
 
-=head2 C<start_line_size>
+=head2 start_line_size
 
   my $size = $msg->start_line_size;
 
 Size of the start line in bytes.
 
-=head2 C<to_string>
+=head2 to_string
 
   my $string = $msg->to_string;
 
 Render whole message.
 
-=head2 C<upload>
+=head2 upload
 
   my $upload  = $msg->upload('foo');
   my @uploads = $msg->upload('foo');
@@ -722,24 +700,24 @@ entire message body has been received.
   # Get content of uploaded file
   say $msg->upload('foo')->asset->slurp;
 
-=head2 C<uploads>
+=head2 uploads
 
   my $uploads = $msg->uploads;
 
 All C<multipart/form-data> file uploads, usually L<Mojo::Upload> objects.
 
-=head2 C<write>
+=head2 write
 
-  $msg = $msg->write('Hello!');
-  $msg = $msg->write('Hello!' => sub {...});
+  $msg = $msg->write($bytes);
+  $msg = $msg->write($bytes => sub {...});
 
 Write dynamic content non-blocking, the optional drain callback will be
 invoked once all data has been written.
 
-=head2 C<write_chunk>
+=head2 write_chunk
 
-  $msg = $msg->write_chunk('Hello!');
-  $msg = $msg->write_chunk('Hello!' => sub {...});
+  $msg = $msg->write_chunk($bytes);
+  $msg = $msg->write_chunk($bytes => sub {...});
 
 Write dynamic content non-blocking with C<chunked> transfer encoding, the
 optional drain callback will be invoked once all data has been written.

+19 -23

mojolegacy/lib/Mojo/Message/Request.pm

View

@@ -55,11 +55,11 @@ sub cookies {
 }
 
 sub extract_start_line {
-  my ($self, $bufferref) = @_;
+  my ($self, $bufref) = @_;
 
   # Ignore any leading empty lines
-  $$bufferref =~ s/^\s+//;
-  return undef unless defined(my $line = get_line $bufferref);
+  $$bufref =~ s/^\s+//;
+  return undef unless defined(my $line = get_line $bufref);
 
   # We have a (hopefully) full request line
   $self->error('Bad request start line', 400) and return undef
@@ -100,7 +100,6 @@ sub fix_headers {
 sub get_start_line_chunk {
   my ($self, $offset) = @_;
 
-  # Request line
   unless (defined $self->{start_buffer}) {
 
     # Path
@@ -128,10 +127,7 @@ sub get_start_line_chunk {
     $self->{start_buffer} = "$method $path HTTP/@{[$self->version]}\x0d\x0a";
   }
 
-  # Progress
   $self->emit(progress => 'start_line', $offset);
-
-  # Chunk
   return substr $self->{start_buffer}, $offset, 131072;
 }
 
@@ -306,7 +302,7 @@ L<Mojo::Message::Request> inherits all events from L<Mojo::Message>.
 L<Mojo::Message::Request> inherits all attributes from L<Mojo::Message> and
 implements the following new ones.
 
-=head2 C<env>
+=head2 env
 
   my $env = $req->env;
   $req    = $req->env({});
@@ -319,14 +315,14 @@ Direct access to the C<CGI> or C<PSGI> environment hash if available.
   # Check PSGI version
   my $version = $req->env->{'psgi.version'};
 
-=head2 C<method>
+=head2 method
 
   my $method = $req->method;
   $req       = $req->method('POST');
 
 HTTP request method, defaults to C<GET>.
 
-=head2 C<url>
+=head2 url
 
   my $url = $req->url;
   $req    = $req->url(Mojo::URL->new);
@@ -341,13 +337,13 @@ HTTP request URL, defaults to a L<Mojo::URL> object.
 L<Mojo::Message::Request> inherits all methods from L<Mojo::Message> and
 implements the following new ones.
 
-=head2 C<clone>
+=head2 clone
 
   my $clone = $req->clone;
 
 Clone request if possible, otherwise return C<undef>.
 
-=head2 C<cookies>
+=head2 cookies
 
   my $cookies = $req->cookies;
   $req        = $req->cookies(Mojo::Cookie::Request->new);
@@ -355,37 +351,37 @@ Clone request if possible, otherwise return C<undef>.
 
 Access request cookies, usually L<Mojo::Cookie::Request> objects.
 
-=head2 C<extract_start_line>
+=head2 extract_start_line
 
   my $success = $req->extract_start_line(\$string);
 
 Extract request line from string.
 
-=head2 C<fix_headers>
+=head2 fix_headers
 
   $req = $req->fix_headers;
 
 Make sure request has all required headers.
 
-=head2 C<get_start_line_chunk>
+=head2 get_start_line_chunk
 
-  my $string = $req->get_start_line_chunk($offset);
+  my $bytes = $req->get_start_line_chunk($offset);
 
 Get a chunk of request line data starting from a specific position.
 
-=head2 C<is_secure>
+=head2 is_secure
 
   my $success = $req->is_secure;
 
 Check if connection is secure.
 
-=head2 C<is_xhr>
+=head2 is_xhr
 
   my $success = $req->is_xhr;
 
 Check C<X-Requested-With> header for C<XMLHttpRequest> value.
 
-=head2 C<param>
+=head2 param
 
   my @names = $req->param;
   my $foo   = $req->param('foo');
@@ -394,7 +390,7 @@ Check C<X-Requested-With> header for C<XMLHttpRequest> value.
 Access C<GET> and C<POST> parameters. Note that this method caches all data,
 so it should not be called before the entire request body has been received.
 
-=head2 C<params>
+=head2 params
 
   my $params = $req->params;
 
@@ -405,7 +401,7 @@ request body has been received.
   # Get parameter value
   say $req->params->param('foo');
 
-=head2 C<parse>
+=head2 parse
 
   $req = $req->parse('GET /foo/bar HTTP/1.1');
   $req = $req->parse(REQUEST_METHOD => 'GET');
@@ -413,7 +409,7 @@ request body has been received.
 
 Parse HTTP request chunks or environment hash.
 
-=head2 C<proxy>
+=head2 proxy
 
   my $proxy = $req->proxy;
   $req      = $req->proxy('http://foo:bar@127.0.0.1:3000');
@@ -424,7 +420,7 @@ Proxy URL for request.
   # Disable proxy
   $req->proxy(0);
 
-=head2 C<query_params>
+=head2 query_params
 
   my $params = $req->query_params;
 

+12 -16

mojolegacy/lib/Mojo/Message/Response.pm

View

@@ -92,10 +92,10 @@ sub cookies {
 sub default_message { $MESSAGES{$_[1] || $_[0]->code || 404} || '' }
 
 sub extract_start_line {
-  my ($self, $bufferref) = @_;
+  my ($self, $bufref) = @_;
 
   # We have a full response line
-  return undef unless defined(my $line = get_line $bufferref);
+  return undef unless defined(my $line = get_line $bufref);
   $self->error('Bad response start line') and return undef
     unless $line =~ m!^\s*HTTP/(\d\.\d)\s+(\d\d\d)\s*(.+)?$!;
   $self->content->skip_body(1) if $self->code($2)->is_empty;
@@ -116,17 +116,13 @@ sub fix_headers {
 sub get_start_line_chunk {
   my ($self, $offset) = @_;
 
-  # Status line
   unless (defined $self->{start_buffer}) {
     my $code = $self->code    || 404;
     my $msg  = $self->message || $self->default_message;
     $self->{start_buffer} = "HTTP/@{[$self->version]} $code $msg\x0d\x0a";
   }
 
-  # Progress
   $self->emit(progress => 'start_line', $offset);
-
-  # Chunk
   return substr $self->{start_buffer}, $offset, 131072;
 }
 
@@ -183,14 +179,14 @@ L<Mojo::Message::Response> inherits all events from L<Mojo::Message>.
 L<Mojo::Message::Response> inherits all attributes from L<Mojo::Message> and
 implements the following new ones.
 
-=head2 C<code>
+=head2 code
 
   my $code = $res->code;
   $res     = $res->code(200);
 
 HTTP response code.
 
-=head2 C<message>
+=head2 message
 
   my $msg = $res->message;
   $res    = $res->message('OK');
@@ -202,7 +198,7 @@ HTTP response message.
 L<Mojo::Message::Response> inherits all methods from L<Mojo::Message> and
 implements the following new ones.
 
-=head2 C<cookies>
+=head2 cookies
 
   my $cookies = $res->cookies;
   $res        = $res->cookies(Mojo::Cookie::Response->new);
@@ -210,37 +206,37 @@ implements the following new ones.
 
 Access response cookies, usually L<Mojo::Cookie::Response> objects.
 
-=head2 C<default_message>
+=head2 default_message
 
   my $msg = $res->default_message;
 
 Generate default response message for code.
 
-=head2 C<extract_start_line>
+=head2 extract_start_line
 
   my $success = $req->extract_start_line(\$string);
 
 Extract status line from string.
 
-=head2 C<fix_headers>
+=head2 fix_headers
 
   $res = $res->fix_headers;
 
 Make sure response has all required headers.
 
-=head2 C<get_start_line_chunk>
+=head2 get_start_line_chunk
 
-  my $string = $res->get_start_line_chunk($offset);
+  my $bytes = $res->get_start_line_chunk($offset);
 
 Get a chunk of status line data starting from a specific position.
 
-=head2 C<is_empty>
+=head2 is_empty
 
   my $success = $res->is_empty;
 
 Check if this is a C<1xx>, C<204> or C<304> response.
 
-=head2 C<is_status_class>
+=head2 is_status_class
 
   my $success = $res->is_status_class(200);
 

+13 -20

mojolegacy/lib/Mojo/Parameters.pm

View

@@ -88,16 +88,12 @@ sub params {
     # W3C suggests to also accept ";" as a separator
     my $charset = $self->charset;
     for my $pair (split /[\&\;]+/, $string) {
-
-      # Parse
       $pair =~ /^([^=]*)(?:=(.*))?$/;
       my $name  = defined $1 ? $1 : '';
       my $value = defined $2 ? $2 : '';
 
-      # Replace "+" with whitespace
+      # Replace "+" with whitespace, unescape and decode
       s/\+/ /g for $name, $value;
-
-      # Unescape
       $name  = url_unescape $name;
       $name  = do { my $tmp = decode($charset, $name); defined $tmp ? $tmp : $name } if $charset;
       $value = url_unescape $value;
@@ -126,7 +122,6 @@ sub remove {
   my $self = shift;
   my $name = do {my $tmp = shift; defined $tmp ? $tmp : ''};
 
-  # Remove
   my $params = $self->params;
   for (my $i = 0; $i < @$params;) {
     if ($params->[$i] eq $name) { splice @$params, $i, 2 }
@@ -139,7 +134,6 @@ sub remove {
 sub to_hash {
   my $self = shift;
 
-  # Format
   my $params = $self->params;
   my %hash;
   for (my $i = 0; $i < @$params; $i += 2) {
@@ -188,7 +182,6 @@ sub to_string {
     push @pairs, defined $value ? "$name=$value" : $name;
   }
 
-  # Concatenate pairs
   return join $self->pair_separator, @pairs;
 }
 
@@ -218,7 +211,7 @@ L<Mojo::Parameters> is a container for form parameters.
 
 L<Mojo::Parameters> implements the following attributes.
 
-=head2 C<charset>
+=head2 charset
 
   my $charset = $params->charset;
   $params     = $params->charset('UTF-8');
@@ -228,7 +221,7 @@ Charset used for encoding and decoding parameters, defaults to C<UTF-8>.
   # Disable encoding and decoding
   $params->charset(undef);
 
-=head2 C<pair_separator>
+=head2 pair_separator
 
   my $separator = $params->pair_separator;
   $params       = $params->pair_separator(';');
@@ -240,7 +233,7 @@ Separator for parameter pairs, defaults to C<&>.
 L<Mojo::Parameters> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $params = Mojo::Parameters->new;
   my $params = Mojo::Parameters->new('foo=b%3Bar&baz=23');
@@ -250,7 +243,7 @@ following new ones.
 
 Construct a new L<Mojo::Parameters> object.
 
-=head2 C<append>
+=head2 append
 
   $params = $params->append(foo => 'ba;r');
   $params = $params->append(foo => ['ba;r', 'b;az']);
@@ -267,19 +260,19 @@ Append parameters.
   # "foo=bar&foo=baz&foo=yada&bar=23"
   Mojo::Parameters->new('foo=bar')->append(foo => ['baz', 'yada'], bar => 23);
 
-=head2 C<clone>
+=head2 clone
 
   my $params2 = $params->clone;
 
 Clone parameters.
 
-=head2 C<merge>
+=head2 merge
 
   $params = $params->merge(Mojo::Parameters->new(foo => 'b;ar', baz => 23));
 
 Merge L<Mojo::Parameters> objects.
 
-=head2 C<param>
+=head2 param
 
   my @names = $params->param;
   my $foo   = $params->param('foo');
@@ -289,20 +282,20 @@ Merge L<Mojo::Parameters> objects.
 
 Check and replace parameter values.
 
-=head2 C<params>
+=head2 params
 
   my $array = $params->params;
   $params   = $params->params([foo => 'b;ar', baz => 23]);
 
 Parsed parameters.
 
-=head2 C<parse>
+=head2 parse
 
   $params = $params->parse('foo=b%3Bar&baz=23');
 
 Parse parameters.
 
-=head2 C<remove>
+=head2 remove
 
   $params = $params->remove('foo');
 
@@ -311,7 +304,7 @@ Remove parameters.
   # "bar=yada"
   Mojo::Parameters->new('foo=bar&foo=baz&bar=yada')->remove('foo');
 
-=head2 C<to_hash>
+=head2 to_hash
 
   my $hash = $params->to_hash;
 
@@ -320,7 +313,7 @@ Turn parameters into a hash reference.
   # "baz"
   Mojo::Parameters->new('foo=bar&foo=baz')->to_hash->{foo}[1];
 
-=head2 C<to_string>
+=head2 to_string
 
   my $string = $params->to_string;
   my $string = "$params";

+49 -17

mojolegacy/lib/Mojo/Path.pm

View

@@ -16,7 +16,6 @@ sub new { shift->SUPER::new->parse(@_) }
 sub canonicalize {
   my $self = shift;
 
-  # Resolve path
   my @parts;
   for my $part (@{$self->parts}) {
 
@@ -30,7 +29,6 @@ sub canonicalize {
     # "."
     next if grep { $_ eq $part } '.', '';
 
-    # Part
     push @parts, $part;
   }
   $self->trailing_slash(undef) unless @parts;
@@ -83,9 +81,17 @@ sub parse {
   return $self->parts([split '/', $path, -1]);
 }
 
-sub to_abs_string {
+sub to_abs_string { $_[0]->leading_slash ? "$_[0]" : "/$_[0]" }
+
+sub to_dir {
+  my $clone = shift->clone;
+  pop @{$clone->parts} unless $clone->trailing_slash;
+  return $clone->trailing_slash(@{$clone->parts} ? 1 : 0);
+}
+
+sub to_route {
   my $self = shift;
-  return $self->leading_slash ? "$self" : "/$self";
+  return '/' . join('/', @{$self->parts}) . ($self->trailing_slash ? '/' : '');
 }
 
 sub to_string {
@@ -104,6 +110,8 @@ sub to_string {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Path - Path
@@ -124,7 +132,7 @@ L<Mojo::Path> is a container for URL paths.
 
 L<Mojo::Path> implements the following attributes.
 
-=head2 C<charset>
+=head2 charset
 
   my $charset = $path->charset;
   $path       = $path->charset('UTF-8');
@@ -134,14 +142,14 @@ Charset used for encoding and decoding, defaults to C<UTF-8>.
   # Disable encoding and decoding
   $path->charset(undef);
 
-=head2 C<leading_slash>
+=head2 leading_slash
 
   my $leading_slash = $path->leading_slash;
   $path             = $path->leading_slash(1);
 
 Path has a leading slash.
 
-=head2 C<parts>
+=head2 parts
 
   my $parts = $path->parts;
   $path     = $path->parts([qw(foo bar baz)]);
@@ -151,7 +159,7 @@ The path parts.
   # Part with slash
   push @{$path->parts}, 'foo/bar';
 
-=head2 C<trailing_slash>
+=head2 trailing_slash
 
   my $trailing_slash = $path->trailing_slash;
   $path              = $path->trailing_slash(1);
@@ -163,14 +171,14 @@ Path has a trailing slash.
 L<Mojo::Path> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $path = Mojo::Path->new;
   my $path = Mojo::Path->new('/foo%2Fbar%3B/baz.html');
 
 Construct a new L<Mojo::Path> object.
 
-=head2 C<canonicalize>
+=head2 canonicalize
 
   $path = $path->canonicalize;
 
@@ -179,15 +187,15 @@ Canonicalize path.
   # "/foo/baz"
   Mojo::Path->new('/foo/bar/../baz')->canonicalize;
 
-=head2 C<clone>
+=head2 clone
 
   my $clone = $path->clone;
 
 Clone path.
 
-=head2 C<contains>
+=head2 contains
 
-  my $success = $path->contains('/foo');
+  my $success = $path->contains('/i/♥/mojolicious');
 
 Check if path contains given prefix.
 
@@ -201,7 +209,7 @@ Check if path contains given prefix.
   Mojo::Path->new('/foo/bar')->contains('/bar');
   Mojo::Path->new('/foo/bar')->contains('/whatever');
 
-=head2 C<merge>
+=head2 merge
 
   $path = $path->merge('/foo/bar');
   $path = $path->merge('foo/bar');
@@ -218,25 +226,49 @@ Merge paths.
   # "/foo/bar/baz/yada"
   Mojo::Path->new('/foo/bar/')->merge('baz/yada');
 
-=head2 C<parse>
+=head2 parse
 
   $path = $path->parse('/foo%2Fbar%3B/baz.html');
 
 Parse path. Note that C<%2F> will be treated as C</> for security reasons.
 
-=head2 C<to_abs_string>
+=head2 to_abs_string
 
   my $string = $path->to_abs_string;
 
 Turn path into an absolute string.
 
-=head2 C<to_string>
+  # "/i/%E2%99%A5/mojolicious"
+  Mojo::Path->new('i/%E2%99%A5/mojolicious')->to_abs_string;
+
+=head2 to_dir
+
+  my $dir = $route->to_dir;
+
+Clone path and remove everything after the right-most slash.
+
+  # "/i/%E2%99%A5/"
+  Mojo::Path->new('i/%E2%99%A5/mojolicious')->to_dir->to_abs_string;
+
+=head2 to_route
+
+  my $route = $path->to_route;
+
+Turn path into a route.
+
+  # "/i/♥/mojolicious"
+  Mojo::Path->new('i/%E2%99%A5/mojolicious')->to_route;
+
+=head2 to_string
 
   my $string = $path->to_string;
   my $string = "$path";
 
 Turn path into a string.
 
+  # "i/%E2%99%A5/mojolicious"
+  Mojo::Path->new('i/%E2%99%A5/mojolicious')->to_string;
+
 =head1 SEE ALSO
 
 L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicio.us>.

+14 -13

mojolegacy/lib/Mojo/Reactor.pm

View

@@ -62,9 +62,10 @@ L<Mojo::Reactor> is an abstract base class for low level event reactors.
 
 =head1 EVENTS
 
-L<Mojo::Reactor> can emit the following events.
+L<Mojo::Reactor> inherits all events from L<Mojo::EventEmitter> and can emit
+the following new ones.
 
-=head2 C<error>
+=head2 error
 
   $reactor->on(error => sub {
     my ($reactor, $err) = @_;
@@ -83,7 +84,7 @@ Emitted safely for exceptions caught in callbacks.
 L<Mojo::Reactor> inherits all methods from L<Mojo::EventEmitter> and
 implements the following new ones.
 
-=head2 C<detect>
+=head2 detect
 
   my $class = Mojo::Reactor->detect;
 
@@ -94,7 +95,7 @@ L<Mojo::Reactor::Poll>.
   # Instantiate best reactor implementation available
   my $reactor = Mojo::Reactor->detect->new;
 
-=head2 C<io>
+=head2 io
 
   $reactor = $reactor->io($handle => sub {...});
 
@@ -107,20 +108,20 @@ readable or writable. Meant to be overloaded in a subclass.
     say $writable ? 'Handle is writable' : 'Handle is readable';
   });
 
-=head2 C<is_readable>
+=head2 is_readable
 
   my $success = $reactor->is_readable($handle);
 
 Quick non-blocking check if a handle is readable, useful for identifying
 tainted sockets.
 
-=head2 C<is_running>
+=head2 is_running
 
   my $success = $reactor->is_running;
 
 Check if reactor is running. Meant to be overloaded in a subclass.
 
-=head2 C<one_tick>
+=head2 one_tick
 
   $reactor->one_tick;
 
@@ -132,7 +133,7 @@ the reactor, so you need to be careful. Meant to be overloaded in a subclass.
   $reactor->one_tick;
   $reactor->remove($id);
 
-=head2 C<recurring>
+=head2 recurring
 
   my $id = $reactor->recurring(0.25 => sub {...});
 
@@ -142,14 +143,14 @@ amount of time in seconds. Meant to be overloaded in a subclass.
   # Invoke as soon as possible
   $reactor->recurring(0 => sub { say 'Reactor tick.' });
 
-=head2 C<remove>
+=head2 remove
 
   my $success = $reactor->remove($handle);
   my $success = $reactor->remove($id);
 
 Remove handle or timer. Meant to be overloaded in a subclass.
 
-=head2 C<start>
+=head2 start
 
   $reactor->start;
 
@@ -157,13 +158,13 @@ Start watching for I/O and timer events, this will block until C<stop> is
 called. Note that some reactors stop automatically if there are no events
 being watched anymore. Meant to be overloaded in a subclass.
 
-=head2 C<stop>
+=head2 stop
 
   $reactor->stop;
 
 Stop watching for I/O and timer events. Meant to be overloaded in a subclass.
 
-=head2 C<timer>
+=head2 timer
 
   my $id = $reactor->timer(0.5 => sub {...});
 
@@ -173,7 +174,7 @@ seconds. Meant to be overloaded in a subclass.
   # Invoke as soon as possible
   $reactor->timer(0 => sub { say 'Next tick.' });
 
-=head2 C<watch>
+=head2 watch
 
   $reactor = $reactor->watch($handle, $readable, $writable);
 

+8 -8

mojolegacy/lib/Mojo/Reactor/EV.pm

View

@@ -111,53 +111,53 @@ L<Mojo::Reactor::EV> inherits all events from L<Mojo::Reactor::Poll>.
 L<Mojo::Reactor::EV> inherits all methods from L<Mojo::Reactor::Poll> and
 implements the following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $reactor = Mojo::Reactor::EV->new;
 
 Construct a new L<Mojo::Reactor::EV> object.
 
-=head2 C<is_running>
+=head2 is_running
 
   my $success = $reactor->is_running;
 
 Check if reactor is running.
 
-=head2 C<one_tick>
+=head2 one_tick
 
   $reactor->one_tick;
 
 Run reactor until an event occurs or no events are being watched anymore. Note
 that this method can recurse back into the reactor, so you need to be careful.
 
-=head2 C<recurring>
+=head2 recurring
 
   my $id = $reactor->recurring(0.25 => sub {...});
 
 Create a new recurring timer, invoking the callback repeatedly after a given
 amount of time in seconds.
 
-=head2 C<start>
+=head2 start
 
   $reactor->start;
 
 Start watching for I/O and timer events, this will block until C<stop> is
 called or no events are being watched anymore.
 
-=head2 C<stop>
+=head2 stop
 
   $reactor->stop;
 
 Stop watching for I/O and timer events.
 
-=head2 C<timer>
+=head2 timer
 
   my $id = $reactor->timer(0.5 => sub {...});
 
 Create a new timer, invoking the callback after a given amount of time in
 seconds.
 
-=head2 C<watch>
+=head2 watch
 
   $reactor = $reactor->watch($handle, $readable, $writable);
 

+13 -15

mojolegacy/lib/Mojo/Reactor/Poll.pm

View

@@ -17,7 +17,7 @@ sub is_running { !!shift->{running} }
 sub one_tick {
   my $self = shift;
 
-  # Remember state
+  # Remember state for later
   my $running = $self->{running};
   $self->{running} = 1;
 
@@ -56,7 +56,6 @@ sub one_tick {
       # Normal timer
       else { $self->remove($id) }
 
-      # Handle timer
       ++$i and $self->_sandbox("Timer $id", $t->{cb}) if $t->{cb};
     }
   }
@@ -100,18 +99,17 @@ sub _poll { shift->{poll} ||= IO::Poll->new }
 
 sub _sandbox {
   my ($self, $desc, $cb) = (shift, shift, shift);
-  return if eval { $self->$cb(@_); 1 };
-  $self->once(error => sub { warn $_[1] })
-    unless $self->has_subscribers('error');
-  $self->emit_safe(error => "$desc failed: $@");
+  eval { $self->$cb(@_); 1 } or $self->emit_safe(error => "$desc failed: $@");
 }
 
 sub _timer {
   my ($self, $recurring, $after, $cb) = @_;
+
   my $id;
   do { $id = md5_sum('t' . time . rand 999) } while $self->{timers}{$id};
   my $t = $self->{timers}{$id} = {cb => $cb, time => time + $after};
   $t->{recurring} = $after if $recurring;
+
   return $id;
 }
 
@@ -160,61 +158,61 @@ L<Mojo::Reactor::Poll> inherits all events from L<Mojo::Reactor>.
 L<Mojo::Reactor::Poll> inherits all methods from L<Mojo::Reactor> and
 implements the following new ones.
 
-=head2 C<io>
+=head2 io
 
   $reactor = $reactor->io($handle => sub {...});
 
 Watch handle for I/O events, invoking the callback whenever handle becomes
 readable or writable.
 
-=head2 C<is_running>
+=head2 is_running
 
   my $success = $reactor->is_running;
 
 Check if reactor is running.
 
-=head2 C<one_tick>
+=head2 one_tick
 
   $reactor->one_tick;
 
 Run reactor until an event occurs or no events are being watched anymore. Note
 that this method can recurse back into the reactor, so you need to be careful.
 
-=head2 C<recurring>
+=head2 recurring
 
   my $id = $reactor->recurring(0.25 => sub {...});
 
 Create a new recurring timer, invoking the callback repeatedly after a given
 amount of time in seconds.
 
-=head2 C<remove>
+=head2 remove
 
   my $success = $reactor->remove($handle);
   my $success = $reactor->remove($id);
 
 Remove handle or timer.
 
-=head2 C<start>
+=head2 start
 
   $reactor->start;
 
 Start watching for I/O and timer events, this will block until C<stop> is
 called or no events are being watched anymore.
 
-=head2 C<stop>
+=head2 stop
 
   $reactor->stop;
 
 Stop watching for I/O and timer events.
 
-=head2 C<timer>
+=head2 timer
 
   my $id = $reactor->timer(0.5 => sub {...});
 
 Create a new timer, invoking the callback after a given amount of time in
 seconds.
 
-=head2 C<watch>
+=head2 watch
 
   $reactor = $reactor->watch($handle, $readable, $writable);
 

+9 -9

mojolegacy/lib/Mojo/Server.pm

View

@@ -18,7 +18,6 @@ sub new {
 sub build_app {
   my ($self, $app) = @_;
   local $ENV{MOJO_EXE};
-  local $ENV{MOJO_APP} = $app;
   return $app->new unless my $e = Mojo::Loader->new->load($app);
   die ref $e ? $e : qq{Couldn't find application class "$app".\n};
 }
@@ -80,9 +79,10 @@ L<Mojo::Server> is an abstract HTTP server base class.
 
 =head1 EVENTS
 
-L<Mojo::Server> can emit the following events.
+L<Mojo::Server> inherits all events from L<Mojo::EventEmitter> and can emit
+the following new ones.
 
-=head2 C<request>
+=head2 request
 
   $server->on(request => sub {
     my ($server, $tx) = @_;
@@ -104,7 +104,7 @@ Emitted when a request is ready and needs to be handled.
 
 L<Mojo::Server> implements the following attributes.
 
-=head2 C<app>
+=head2 app
 
   my $app = $server->app;
   $server = $server->app(MojoSubclass->new);
@@ -116,26 +116,26 @@ Application this server handles, defaults to a L<Mojo::HelloWorld> object.
 L<Mojo::Server> inherits all methods from L<Mojo::EventEmitter> and implements
 the following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $server = Mojo::Server->new;
 
 Construct a new L<Mojo::Server> object and subscribe to C<request> event with
 default request handling.
 
-=head2 C<build_app>
+=head2 build_app
 
   my $app = $server->build_app('Mojo::HelloWorld');
 
 Build application from class.
 
-=head2 C<build_tx>
+=head2 build_tx
 
   my $tx = $server->build_tx;
 
 Let application build a transaction.
 
-=head2 C<load_app>
+=head2 load_app
 
   my $app = $server->load_app('/home/sri/myapp.pl');
 
@@ -143,7 +143,7 @@ Load application from script.
 
   say Mojo::Server->new->load_app('./myapp.pl')->home;
 
-=head2 C<run>
+=head2 run
 
   $server->run;
 

+4 -8

mojolegacy/lib/Mojo/Server/CGI.pm

View

@@ -6,11 +6,8 @@ has 'nph';
 sub run {
   my $self = shift;
 
-  # Environment
   my $tx  = $self->build_tx;
   my $req = $tx->req->parse(\%ENV);
-
-  # Store connection information
   $tx->local_port($ENV{SERVER_PORT})->remote_address($ENV{REMOTE_ADDR});
 
   # Request body
@@ -20,7 +17,7 @@ sub run {
     $req->parse($buffer);
   }
 
-  # Handle
+  # Handle request
   $self->emit(request => $tx);
 
   # Response start line
@@ -48,7 +45,6 @@ sub run {
 sub _write {
   my ($res, $method) = @_;
 
-  # Write chunks to STDOUT
   my $offset = 0;
   while (1) {
 
@@ -58,7 +54,7 @@ sub _write {
     # End of part
     last unless my $len = length $chunk;
 
-    # Part
+    # Make sure we can still write
     $offset += $len;
     return undef unless STDOUT->opened;
     print STDOUT $chunk;
@@ -111,7 +107,7 @@ L<Mojo::Server::CGI> inherits all events from L<Mojo::Server>.
 L<Mojo::Server::CGI> inherits all attributes from L<Mojo::Server> and
 implements the following new ones.
 
-=head2 C<nph>
+=head2 nph
 
   my $nph = $cgi->nph;
   $cgi    = $cgi->nph(1);
@@ -123,7 +119,7 @@ Activate non parsed header mode.
 L<Mojo::Server::CGI> inherits all methods from L<Mojo::Server> and implements
 the following new ones.
 
-=head2 C<run>
+=head2 run
 
   my $status = $cgi->run;
 

+21 -44

mojolegacy/lib/Mojo/Server/Daemon.pm

View

@@ -25,11 +25,7 @@ sub DESTROY {
 
 sub run {
   my $self = shift;
-
-  # Signals
-  $SIG{INT} = $SIG{TERM} = sub { exit 0 };
-
-  # Change user/group and start accepting connections
+  local $SIG{INT} = local $SIG{TERM} = sub { $self->ioloop->stop };
   $self->start->setuidgid->ioloop->start;
 }
 
@@ -73,7 +69,7 @@ sub start {
 sub stop {
   my $self = shift;
 
-  # Pause accepting connections
+  # Suspend accepting connections but keep listen sockets open
   my $loop = $self->ioloop;
   while (my $id = shift @{$self->{acceptors}}) {
     my $server = $self->{servers}{$id} = $loop->acceptor($id);
@@ -87,18 +83,11 @@ sub stop {
 sub _build_tx {
   my ($self, $id, $c) = @_;
 
-  # Build transaction
   my $tx = $self->build_tx->connection($id);
-
-  # Identify
   $tx->res->headers->server('Mojolicious (Perl)');
-
-  # Store connection information
   my $handle = $self->ioloop->stream($id)->handle;
   $tx->local_address($handle->sockhost)->local_port($handle->sockport);
   $tx->remote_address($handle->peerhost)->remote_port($handle->peerport);
-
-  # TLS
   $tx->req->url->base->scheme('https') if $c->{tls};
 
   # Handle upgrades and requests
@@ -130,7 +119,6 @@ sub _close {
   # Finish gracefully
   if (my $tx = $self->{connections}{$id}{tx}) { $tx->server_close }
 
-  # Remove connection
   delete $self->{connections}{$id};
 }
 
@@ -173,7 +161,6 @@ sub _finish {
 sub _listen {
   my ($self, $listen) = @_;
 
-  # Options
   my $url     = Mojo::URL->new($listen);
   my $query   = $url->query;
   my $options = {
@@ -189,20 +176,15 @@ sub _listen {
   delete $options->{address} if $options->{address} eq '*';
   my $tls = $options->{tls} = $url->protocol eq 'https' ? 1 : undef;
 
-  # Listen
   weaken $self;
   my $id = $self->ioloop->server(
     $options => sub {
       my ($loop, $stream, $id) = @_;
 
-      # Add new connection
       my $c = $self->{connections}{$id} = {tls => $tls};
       warn "-- Accept (@{[$stream->handle->peerhost]})\n" if DEBUG;
-
-      # Inactivity timeout
       $stream->timeout($self->inactivity_timeout);
 
-      # Events
       $stream->on(close => sub { $self->_close($id) });
       $stream->on(
         error => sub {
@@ -218,7 +200,6 @@ sub _listen {
   );
   push @{$self->{acceptors} ||= []}, $id;
 
-  # Friendly message
   return if $self->silent;
   $self->app->log->info(qq{Listening at "$listen".});
   $listen =~ s!//\*!//127.0.0.1!i;
@@ -228,11 +209,9 @@ sub _listen {
 sub _read {
   my ($self, $id, $chunk) = @_;
 
-  # Make sure we have a transaction
+  # Make sure we have a transaction and parse chunk
   my $c = $self->{connections}{$id};
   my $tx = $c->{tx} ||= $self->_build_tx($id, $c);
-
-  # Parse chunk
   warn "-- Server <<< Client (@{[$tx->req->url->to_abs]})\n$chunk\n" if DEBUG;
   $tx->server_read($chunk);
 
@@ -259,13 +238,11 @@ sub _write {
   return unless my $tx = $c->{tx};
   return unless $tx->is_writing;
 
-  # Get chunk
+  # Get chunk and write
   return if $c->{writing}++;
   my $chunk = $tx->server_write;
   delete $c->{writing};
   warn "-- Server >>> Client (@{[$tx->req->url->to_abs]})\n$chunk\n" if DEBUG;
-
-  # Write chunk
   my $stream = $self->ioloop->stream($id)->write($chunk);
 
   # Finish or continue writing
@@ -334,21 +311,21 @@ L<Mojo::Server::Daemon> inherits all events from L<Mojo::Server>.
 L<Mojo::Server::Daemon> inherits all attributes from L<Mojo::Server> and
 implements the following new ones.
 
-=head2 C<backlog>
+=head2 backlog
 
   my $backlog = $daemon->backlog;
   $daemon     = $daemon->backlog(128);
 
 Listen backlog size, defaults to C<SOMAXCONN>.
 
-=head2 C<group>
+=head2 group
 
   my $group = $daemon->group;
   $daemon   = $daemon->group('users');
 
 Group for server process.
 
-=head2 C<inactivity_timeout>
+=head2 inactivity_timeout
 
   my $timeout = $daemon->inactivity_timeout;
   $daemon     = $daemon->inactivity_timeout(5);
@@ -358,7 +335,7 @@ closed, defaults to the value of the C<MOJO_INACTIVITY_TIMEOUT> environment
 variable or C<15>. Setting the value to C<0> will allow connections to be
 inactive indefinitely.
 
-=head2 C<ioloop>
+=head2 ioloop
 
   my $loop = $daemon->ioloop;
   $daemon  = $daemon->ioloop(Mojo::IOLoop->new);
@@ -366,7 +343,7 @@ inactive indefinitely.
 Event loop object to use for I/O operations, defaults to the global
 L<Mojo::IOLoop> singleton.
 
-=head2 C<listen>
+=head2 listen
 
   my $listen = $daemon->listen;
   $daemon    = $daemon->listen(['https://localhost:3000']);
@@ -391,46 +368,46 @@ These parameters are currently available:
 
 =over 4
 
-=item C<ca>
+=item ca
 
 Path to TLS certificate authority file.
 
-=item C<cert>
+=item cert
 
 Path to the TLS cert file, defaults to a built-in test certificate.
 
-=item C<key>
+=item key
 
 Path to the TLS key file, defaults to a built-in test key.
 
-=item C<verify>
+=item verify
 
 TLS verification mode, defaults to C<0x03>.
 
 =back
 
-=head2 C<max_clients>
+=head2 max_clients
 
   my $max = $daemon->max_clients;
   $daemon = $daemon->max_clients(1000);
 
 Maximum number of parallel client connections, defaults to C<1000>.
 
-=head2 C<max_requests>
+=head2 max_requests
 
   my $max = $daemon->max_requests;
   $daemon = $daemon->max_requests(100);
 
 Maximum number of keep alive requests per connection, defaults to C<25>.
 
-=head2 C<silent>
+=head2 silent
 
   my $silent = $daemon->silent;
   $daemon    = $daemon->silent(1);
 
 Disable console messages.
 
-=head2 C<user>
+=head2 user
 
   my $user = $daemon->user;
   $daemon  = $daemon->user('web');
@@ -442,25 +419,25 @@ User for the server process.
 L<Mojo::Server::Daemon> inherits all methods from L<Mojo::Server> and
 implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   $daemon->run;
 
 Run server.
 
-=head2 C<setuidgid>
+=head2 setuidgid
 
   $daemon = $daemon->setuidgid;
 
 Set user and group for process.
 
-=head2 C<start>
+=head2 start
 
   $daemon = $daemon->start;
 
 Start accepting connections.
 
-=head2 C<stop>
+=head2 stop
 
   $daemon = $daemon->stop;
 

+67 -258

mojolegacy/lib/Mojo/Server/Hypnotoad.pm

View

@@ -4,26 +4,11 @@ use Mojo::Base -base;
 # "Bender: I was God once.
 #  God: Yes, I saw. You were doing well, until everyone died."
 use Cwd 'abs_path';
-use Fcntl ':flock';
 use File::Basename 'dirname';
-use File::Spec::Functions qw(catfile tmpdir);
-use IO::Poll 'POLLIN';
-use List::Util 'shuffle';
-use Mojo::Server::Daemon;
-use POSIX qw(setsid WNOHANG);
+use File::Spec::Functions 'catfile';
+use Mojo::Server::Prefork;
+use POSIX 'setsid';
 use Scalar::Util 'weaken';
-use Time::HiRes 'ualarm';
-
-sub DESTROY {
-  my $self = shift;
-
-  # Worker or command
-  return unless $self->{finished};
-
-  # Manager
-  if (my $file = $self->{config}{pid_file})  { unlink $file if -w $file }
-  if (my $file = $self->{config}{lock_file}) { unlink $file if -w $file }
-}
 
 sub run {
   my ($self, $path) = @_;
@@ -31,13 +16,13 @@ sub run {
   # No Windows support
   _exit('Hypnotoad not available for Windows.') if $^O eq 'MSWin32';
 
-  # Application
+  # Remember application for later
   $ENV{HYPNOTOAD_APP} ||= abs_path $path;
 
   # This is a production server
   $ENV{MOJO_MODE} ||= 'production';
 
-  # Executable
+  # Remember executable for later
   $ENV{HYPNOTOAD_EXE} ||= $0;
   $0 = $ENV{HYPNOTOAD_APP};
 
@@ -45,9 +30,13 @@ sub run {
   die "Can't exec: $!" if !$ENV{HYPNOTOAD_REV}++ && !exec $ENV{HYPNOTOAD_EXE};
 
   # Preload application and configure server
-  my $daemon = $self->{daemon} = Mojo::Server::Daemon->new;
-  my $app = $daemon->load_app($ENV{HYPNOTOAD_APP});
+  my $prefork = $self->{prefork} = Mojo::Server::Prefork->new;
+  my $app = $prefork->load_app($ENV{HYPNOTOAD_APP});
   $self->_config($app);
+  weaken $self;
+  $prefork->on(wait   => sub { $self->_manage });
+  $prefork->on(reap   => sub { $self->_reap(pop) });
+  $prefork->on(finish => sub { $self->{finished} = 1 });
 
   # Testing
   _exit('Everything looks good!') if $ENV{HYPNOTOAD_TEST};
@@ -73,87 +62,38 @@ sub run {
   }
 
   # Start accepting connections
-  my $log = $self->{log} = $app->log;
-  $log->info(qq[Hypnotoad server $$ started for "$ENV{HYPNOTOAD_APP}".]);
-  $daemon->start;
-
-  # Pipe for worker communication
-  pipe($self->{reader}, $self->{writer}) or die "Can't create pipe: $!";
-  $self->{poll} = IO::Poll->new;
-  $self->{poll}->mask($self->{reader}, POLLIN);
-
-  # Clean manager environment
-  my $c = $self->{config};
-  $SIG{INT} = $SIG{TERM} = sub { $self->{finished} = 1 };
-  $SIG{CHLD} = sub {
-    while ((my $pid = waitpid -1, WNOHANG) > 0) { $self->_reap($pid) }
-  };
-  $SIG{QUIT} = sub { $self->{finished} = $self->{graceful} = 1 };
-  $SIG{USR2} = sub { $self->{upgrade} ||= time };
-  $SIG{TTIN} = sub { $c->{workers}++ };
-  $SIG{TTOU} = sub {
-    return unless $c->{workers} && $c->{workers}--;
-    $self->{workers}{shuffle keys %{$self->{workers}}}{graceful} ||= time;
-  };
-
-  # Mainloop
-  $self->_manage while 1;
+  local $SIG{USR2} = sub { $self->{upgrade} ||= time };
+  $prefork->run;
 }
 
 sub _config {
   my ($self, $app) = @_;
 
   # Hypnotoad settings
-  my $c = $self->{config} = $app->config('hypnotoad') || {};
-  $c->{graceful_timeout}   ||= 20;
-  $c->{heartbeat_interval} ||= 5;
-  $c->{heartbeat_timeout}  ||= 20;
-  $c->{lock_file}          ||= catfile tmpdir, 'hypnotoad.lock';
-  $c->{lock_file} .= ".$$";
-  $c->{lock_timeout} ||= 0.5;
-  $c->{pid_file} ||= catfile dirname($ENV{HYPNOTOAD_APP}), 'hypnotoad.pid';
-  $c->{upgrade_timeout} ||= 60;
-  $c->{workers}         ||= 4;
-
-  # Daemon settings
+  my $c = $app->config('hypnotoad') || {};
+  $self->{upgrade_timeout} = $c->{upgrade_timeout} || 60;
+
+  # Prefork settings
   $ENV{MOJO_REVERSE_PROXY} = $c->{proxy} if defined $c->{proxy};
-  my $daemon = $self->{daemon};
-  defined $c->{$_} and $daemon->$_($c->{$_}) for qw(backlog group user);
-  $daemon->max_clients($c->{clients}              || 1000);
-  $daemon->max_requests($c->{keep_alive_requests} || 25);
-  $daemon->inactivity_timeout(defined $c->{inactivity_timeout} ? $c->{inactivity_timeout} : 15);
-  $daemon->listen($c->{listen} || ['http://*:8080']);
-
-  # Event loop settings
-  my $loop = $daemon->ioloop;
-  $loop->max_accepts(defined $c->{accepts} ? $c->{accepts} : 1000);
-  defined $c->{$_} and $loop->$_($c->{$_})
-    for qw(accept_interval multi_accept);
+  my $prefork = $self->{prefork}->listen($c->{listen} || ['http://*:8080']);
+  my $file = catfile dirname($ENV{HYPNOTOAD_APP}), 'hypnotoad.pid';
+  $prefork->pid_file($c->{pid_file} || $file);
+  $prefork->max_clients($c->{clients}) if $c->{clients};
+  $prefork->max_requests($c->{keep_alive_requests})
+    if $c->{keep_alive_requests};
+  defined $c->{$_} and $prefork->$_($c->{$_})
+    for qw(accept_interval accepts backlog graceful_timeout group),
+    qw(heartbeat_interval heartbeat_timeout inactivity_timeout lock_file),
+    qw(lock_timeout multi_accept user workers);
 }
 
 sub _exit { say shift and exit 0 }
 
-sub _heartbeat {
-  my $self = shift;
-
-  # Poll for heartbeats
-  my $poll = $self->{poll};
-  $poll->poll(1);
-  return unless $poll->handles(POLLIN);
-  return unless $self->{reader}->sysread(my $chunk, 4194304);
-
-  # Update heartbeats
-  $self->{workers}{$1} and $self->{workers}{$1}{time} = time
-    while $chunk =~ /(\d+)\n/g;
-}
-
 sub _hot_deploy {
   my $self = shift;
 
-  # Make sure server is running and clean up PID file if necessary
-  return unless defined(my $pid = $self->_pid);
-  my $file = $self->{config}{pid_file};
-  return -w $file ? unlink $file : undef unless $pid && kill 0, $pid;
+  # Make sure server is running
+  return unless my $pid = $self->{prefork}->check_pid;
 
   # Start hot deployment
   kill 'USR2', $pid;
@@ -163,173 +103,42 @@ sub _hot_deploy {
 sub _manage {
   my $self = shift;
 
-  # Housekeeping
-  my $c = $self->{config};
-  if (!$self->{finished}) {
-
-    # Spawn more workers
-    $self->_spawn while keys %{$self->{workers}} < $c->{workers};
-
-    # Check PID file
-    $self->_pid_file;
-  }
-
-  # Shutdown
-  elsif (!keys %{$self->{workers}}) { exit 0 }
-
   # Upgraded
+  my $log = $self->{prefork}->app->log;
   if ($ENV{HYPNOTOAD_PID} && $ENV{HYPNOTOAD_PID} ne $$) {
-    $self->{log}->info("Upgrade successful, stopping $ENV{HYPNOTOAD_PID}.");
+    $log->info("Upgrade successful, stopping $ENV{HYPNOTOAD_PID}.");
     kill 'QUIT', $ENV{HYPNOTOAD_PID};
   }
-  $ENV{HYPNOTOAD_PID} = $$;
-
-  # Check heartbeat
-  $self->_heartbeat;
+  $ENV{HYPNOTOAD_PID} = $$ unless (defined $ENV{HYPNOTOAD_PID} ? $ENV{HYPNOTOAD_PID} : '') eq $$;
 
   # Upgrade
   if ($self->{upgrade} && !$self->{finished}) {
 
     # Fresh start
     unless ($self->{new}) {
-      $self->{log}->info('Starting zero downtime software upgrade.');
+      $log->info('Starting zero downtime software upgrade.');
       die "Can't fork: $!" unless defined(my $pid = $self->{new} = fork);
       exec($ENV{HYPNOTOAD_EXE}) or die("Can't exec: $!") unless $pid;
     }
 
     # Timeout
     kill 'KILL', $self->{new}
-      if $self->{upgrade} + $c->{upgrade_timeout} <= time;
+      if $self->{upgrade} + $self->{upgrade_timeout} <= time;
   }
-
-  # Workers
-  while (my ($pid, $w) = each %{$self->{workers}}) {
-
-    # No heartbeat (graceful stop)
-    my $interval = $c->{heartbeat_interval};
-    my $timeout  = $c->{heartbeat_timeout};
-    if (!$w->{graceful} && ($w->{time} + $interval + $timeout <= time)) {
-      $self->{log}->info("Worker $pid has no heartbeat, restarting.");
-      $w->{graceful} = time;
-    }
-
-    # Graceful stop with timeout
-    $w->{graceful} ||= time if $self->{graceful};
-    if ($w->{graceful}) {
-      $self->{log}->debug("Trying to stop worker $pid gracefully.");
-      kill 'QUIT', $pid;
-      $w->{force} = 1 if $w->{graceful} + $c->{graceful_timeout} <= time;
-    }
-
-    # Normal stop
-    if (($self->{finished} && !$self->{graceful}) || $w->{force}) {
-      $self->{log}->debug("Stopping worker $pid.");
-      kill 'KILL', $pid;
-    }
-  }
-}
-
-sub _pid {
-  return undef unless open my $file, '<', shift->{config}{pid_file};
-  my $pid = <$file>;
-  chomp $pid;
-  return $pid;
-}
-
-sub _pid_file {
-  my $self = shift;
-
-  # Don't need a PID file anymore
-  return if $self->{finished};
-
-  # Check if PID file already exists
-  return if -e (my $file = $self->{config}{pid_file});
-
-  # Create PID file
-  $self->{log}->info(qq{Creating process id file "$file".});
-  die qq{Can't create process id file "$file": $!}
-    unless open my $pid, '>', $file;
-  chmod 0644, $pid;
-  print $pid $$;
 }
 
 sub _reap {
   my ($self, $pid) = @_;
 
   # Clean up failed upgrade
-  if (($self->{new} || '') eq $pid) {
-    $self->{log}->info('Zero downtime software upgrade failed.');
-    delete $self->{$_} for qw(new upgrade);
-  }
-
-  # Clean up worker
-  else {
-    $self->{log}->debug("Worker $pid stopped.");
-    delete $self->{workers}{$pid};
-  }
-}
-
-sub _spawn {
-  my $self = shift;
-
-  # Manager
-  die "Can't fork: $!" unless defined(my $pid = fork);
-  return $self->{workers}{$pid} = {time => time} if $pid;
-
-  # Prepare lock file
-  my $c    = $self->{config};
-  my $file = $c->{lock_file};
-  die qq{Can't open lock file "$file": $!} unless open my $lock, '>', $file;
-
-  # Change user/group
-  my $loop = $self->{daemon}->setuidgid->ioloop;
-
-  # Accept mutex
-  $loop->lock(
-    sub {
-
-      # Blocking
-      my $l;
-      if ($_[1]) {
-        eval {
-          local $SIG{ALRM} = sub { die "alarm\n" };
-          my $old = ualarm $c->{lock_timeout} * 1000000;
-          $l = flock $lock, LOCK_EX;
-          ualarm $old;
-        };
-        if ($@) { $l = $@ eq "alarm\n" ? 0 : die($@) }
-      }
-
-      # Non blocking
-      else { $l = flock $lock, LOCK_EX | LOCK_NB }
-
-      return $l;
-    }
-  );
-  $loop->unlock(sub { flock $lock, LOCK_UN });
-
-  # Heartbeat messages (stop sending during graceful stop)
-  weaken $self;
-  $loop->recurring(
-    $c->{heartbeat_interval} => sub {
-      return unless shift->max_connections;
-      $self->{writer}->syswrite("$$\n") or exit 0;
-    }
-  );
-
-  # Clean worker environment
-  $SIG{$_} = 'DEFAULT' for qw(INT TERM CHLD USR2 TTIN TTOU);
-  $SIG{QUIT} = sub { $loop->max_connections(0) };
-  delete $self->{$_} for qw(poll reader);
-
-  # Start
-  $self->{log}->debug("Worker $$ started.");
-  $loop->start;
-  exit 0;
+  return unless ($self->{new} || '') eq $pid;
+  $self->{prefork}->app->log->info('Zero downtime software upgrade failed.');
+  delete $self->{$_} for qw(new upgrade);
 }
 
 sub _stop {
-  _exit('Hypnotoad server not running.') unless my $pid = shift->_pid;
+  _exit('Hypnotoad server not running.')
+    unless my $pid = shift->{prefork}->check_pid;
   kill 'QUIT', $pid;
   _exit("Stopping Hypnotoad server $pid gracefully.");
 }
@@ -351,7 +160,7 @@ Mojo::Server::Hypnotoad - ALL GLORY TO THE HYPNOTOAD!
 
 L<Mojo::Server::Hypnotoad> is a full featured, UNIX optimized, preforking
 non-blocking I/O HTTP and WebSocket server, built around the very well tested
-and reliable L<Mojo::Server::Daemon>, with C<IPv6>, C<TLS>, C<Comet> (long
+and reliable L<Mojo::Server::Prefork>, with C<IPv6>, C<TLS>, C<Comet> (long
 polling), multiple event loop and hot deployment support that just works. Note
 that the server uses signals for process management, so you should avoid
 modifying signal handlers in your applications.
@@ -385,23 +194,23 @@ signals.
 
 =over 2
 
-=item C<INT>, C<TERM>
+=item INT, TERM
 
 Shutdown server immediately.
 
-=item C<QUIT>
+=item QUIT
 
 Shutdown server gracefully.
 
-=item C<TTIN>
+=item TTIN
 
 Increase worker pool by one.
 
-=item C<TTOU>
+=item TTOU
 
 Decrease worker pool by one.
 
-=item C<USR2>
+=item USR2
 
 Attempt zero downtime software upgrade (hot deployment) without losing any
 incoming connections.
@@ -426,11 +235,11 @@ and take over serving requests after starting up successfully.
 
 =over 2
 
-=item C<INT>, C<TERM>
+=item INT, TERM
 
 Stop worker immediately.
 
-=item C<QUIT>
+=item QUIT
 
 Stop worker gracefully.
 
@@ -441,7 +250,7 @@ Stop worker gracefully.
 L<Mojo::Server::Hypnotoad> can be configured with the following settings, see
 L<Mojolicious::Guides::Cookbook/"Hypnotoad"> for examples.
 
-=head2 C<accept_interval>
+=head2 accept_interval
 
   accept_interval => 0.5
 
@@ -449,7 +258,7 @@ Interval in seconds for trying to reacquire the accept mutex and connection
 management, defaults to C<0.025>. Note that changing this value can affect
 performance and idle CPU usage.
 
-=head2 C<accepts>
+=head2 accepts
 
   accepts => 100
 
@@ -459,13 +268,13 @@ to accept new connections indefinitely. Note that up to half of this value can
 be subtracted randomly to improve load balancing, and that worker processes
 will stop sending heartbeat messages once the limit has been reached.
 
-=head2 C<backlog>
+=head2 backlog
 
   backlog => 128
 
 Listen backlog size, defaults to C<SOMAXCONN>.
 
-=head2 C<clients>
+=head2 clients
 
   clients => 100
 
@@ -474,33 +283,33 @@ C<1000>. Note that depending on how much your application may block, you might
 want to decrease this value and increase C<workers> instead for better
 performance.
 
-=head2 C<graceful_timeout>
+=head2 graceful_timeout
 
   graceful_timeout => 15
 
 Maximum amount of time in seconds stopping a worker gracefully may take before
 being forced, defaults to C<20>.
 
-=head2 C<group>
+=head2 group
 
   group => 'staff'
 
 Group name for worker processes.
 
-=head2 C<heartbeat_interval>
+=head2 heartbeat_interval
 
   heartbeat_interval => 3
 
 Heartbeat interval in seconds, defaults to C<5>.
 
-=head2 C<heartbeat_timeout>
+=head2 heartbeat_timeout
 
   heartbeat_timeout => 2
 
 Maximum amount of time in seconds before a worker without a heartbeat will be
 stopped gracefully, defaults to C<20>.
 
-=head2 C<inactivity_timeout>
+=head2 inactivity_timeout
 
   inactivity_timeout => 10
 
@@ -508,40 +317,40 @@ Maximum amount of time in seconds a connection can be inactive before getting
 closed, defaults to C<15>. Setting the value to C<0> will allow connections to
 be inactive indefinitely.
 
-=head2 C<keep_alive_requests>
+=head2 keep_alive_requests
 
   keep_alive_requests => 50
 
 Number of keep alive requests per connection, defaults to C<25>.
 
-=head2 C<listen>
+=head2 listen
 
   listen => ['http://*:80']
 
 List of one or more locations to listen on, defaults to C<http://*:8080>. See
 also L<Mojo::Server::Daemon/"listen"> for more examples.
 
-=head2 C<lock_file>
+=head2 lock_file
 
   lock_file => '/tmp/hypnotoad.lock'
 
 Full path of accept mutex lock file prefix, to which the process id will be
 appended, defaults to a random temporary path.
 
-=head2 C<lock_timeout>
+=head2 lock_timeout
 
   lock_timeout => 1
 
 Maximum amount of time in seconds a worker may block when waiting for the
 accept mutex, defaults to C<0.5>.
 
-=head2 C<multi_accept>
+=head2 multi_accept
 
   multi_accept => 100
 
 Number of connections to accept at once, defaults to C<50>.
 
-=head2 C<pid_file>
+=head2 pid_file
 
   pid_file => '/var/run/hypnotoad.pid'
 
@@ -549,7 +358,7 @@ Full path to process id file, defaults to C<hypnotoad.pid> in the same
 directory as the application. Note that this value can only be changed after
 the server has been stopped.
 
-=head2 C<proxy>
+=head2 proxy
 
   proxy => 1
 
@@ -557,20 +366,20 @@ Activate reverse proxy support, which allows for the C<X-Forwarded-For> and
 C<X-Forwarded-HTTPS> headers to be picked up automatically, defaults to the
 value of the C<MOJO_REVERSE_PROXY> environment variable.
 
-=head2 C<upgrade_timeout>
+=head2 upgrade_timeout
 
   upgrade_timeout => 45
 
 Maximum amount of time in seconds a zero downtime software upgrade may take
 before getting canceled, defaults to C<60>.
 
-=head2 C<user>
+=head2 user
 
   user => 'sri'
 
 Username for worker processes.
 
-=head2 C<workers>
+=head2 workers
 
   workers => 10
 
@@ -582,7 +391,7 @@ worker processes per CPU core.
 L<Mojo::Server::Hypnotoad> inherits all methods from L<Mojo::Base> and
 implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   $toad->run('script/myapp');
 

+5 -6

mojolegacy/lib/Mojo/Server/Morbo.pm

View

@@ -26,8 +26,8 @@ sub run {
   my ($self, $app) = @_;
 
   # Prepare environment
-  $SIG{CHLD} = sub { $self->_reap };
-  $SIG{INT} = $SIG{TERM} = $SIG{QUIT} = sub {
+  local $SIG{CHLD} = sub { $self->_reap };
+  local $SIG{INT} = local $SIG{TERM} = local $SIG{QUIT} = sub {
     $self->{finished} = 1;
     kill 'TERM', $self->{running} if $self->{running};
   };
@@ -63,7 +63,6 @@ sub _manage {
     $self->{modified} = 1;
   }
 
-  # Housekeeping
   $self->_reap;
   delete $self->{running} if $self->{running} && !kill 0, $self->{running};
   $self->_spawn if !$self->{running} && delete $self->{modified};
@@ -136,7 +135,7 @@ See L<Mojolicious::Guides::Cookbook> for more.
 
 L<Mojo::Server::Morbo> implements the following attributes.
 
-=head2 C<watch>
+=head2 watch
 
   my $watch = $morbo->watch;
   $morbo    = $morbo->watch(['/home/sri/myapp']);
@@ -150,13 +149,13 @@ directory.
 L<Mojo::Server::Morbo> inherits all methods from L<Mojo::Base> and implements
 the following new ones.
 
-=head2 C<check_file>
+=head2 check_file
 
   my $success = $morbo->check_file('/home/sri/lib/MyApp.pm');
 
 Check if file has been modified since last check.
 
-=head2 C<run>
+=head2 run
 
   $morbo->run('script/myapp');
 

+4 -7

mojolegacy/lib/Mojo/Server/PSGI.pm

View

@@ -4,11 +4,8 @@ use Mojo::Base 'Mojo::Server';
 sub run {
   my ($self, $env) = @_;
 
-  # Environment
   my $tx  = $self->build_tx;
   my $req = $tx->req->parse($env);
-
-  # Store connection information
   $tx->local_port($env->{SERVER_PORT})->remote_address($env->{REMOTE_ADDR});
 
   # Request body
@@ -20,7 +17,7 @@ sub run {
     last if ($len -= $read) <= 0;
   }
 
-  # Handle
+  # Handle request
   $self->emit(request => $tx);
 
   # Response headers
@@ -47,6 +44,7 @@ sub to_psgi_app {
 package Mojo::Server::PSGI::_IO;
 use Mojo::Base -base;
 
+# Finish transaction
 sub close { shift->{tx}->server_close }
 
 sub getline {
@@ -59,7 +57,6 @@ sub getline {
   # End of content
   return undef unless length $chunk;
 
-  # Content
   $self->{offset} += length $chunk;
   return $chunk;
 }
@@ -109,13 +106,13 @@ L<Mojo::Server::PSGI> inherits all events from L<Mojo::Server>.
 L<Mojo::Server::PSGI> inherits all methods from L<Mojo::Server> and implements
 the following new ones.
 
-=head2 C<run>
+=head2 run
 
   my $res = $psgi->run($env);
 
 Run L<PSGI>.
 
-=head2 C<to_psgi_app>
+=head2 to_psgi_app
 
   my $app = $psgi->to_psgi_app;
 

+495

mojolegacy/lib/Mojo/Server/Prefork.pm

View

...	...	@@ -0,0 +1,495 @@
	1	+package Mojo::Server::Prefork;
	2	+use Mojo::Base 'Mojo::Server::Daemon';
	3	+
	4	+use Fcntl ':flock';
	5	+use File::Spec::Functions qw(catfile tmpdir);
	6	+use IO::Poll 'POLLIN';
	7	+use List::Util 'shuffle';
	8	+use POSIX 'WNOHANG';
	9	+use Scalar::Util 'weaken';
	10	+use Time::HiRes ();
	11	+
	12	+has accepts => 1000;
	13	+has accept_interval => 0.025;
	14	+has [qw(graceful_timeout heartbeat_timeout)] => 20;
	15	+has heartbeat_interval => 5;
	16	+has lock_file => sub { catfile tmpdir, 'prefork.lock' };
	17	+has lock_timeout => 0.5;
	18	+has multi_accept => 50;
	19	+has pid_file => sub { catfile tmpdir, 'prefork.pid' };
	20	+has workers => 4;
	21	+
	22	+sub DESTROY {
	23	+ my $self = shift;
	24	+
	25	+ # Worker
	26	+ return unless $self->{finished};
	27	+
	28	+ # Manager
	29	+ if (my $file = $self->{lock_file}) { unlink $file if -w $file }
	30	+ if (my $file = $self->pid_file) { unlink $file if -w $file }
	31	+}
	32	+
	33	+sub check_pid {
	34	+ my $file = shift->pid_file;
	35	+ return undef unless open my $handle, '<', $file;
	36	+ my $pid = <$handle>;
	37	+ chomp $pid;
	38	+
	39	+ # Running
	40	+ return $pid if $pid && kill 0, $pid;
	41	+
	42	+ # Not running
	43	+ unlink $file if -w $file;
	44	+ return undef;
	45	+}
	46	+
	47	+sub run {
	48	+ my $self = shift;
	49	+
	50	+ # No Windows support
	51	+ say 'Preforking not available for Windows.' and exit 0 if $^O eq 'MSWin32';
	52	+
	53	+ # Prepare lock file and event loop
	54	+ $self->{lock_file} = $self->lock_file . ".$$";
	55	+ my $loop = $self->ioloop->max_accepts($self->accepts);
	56	+ $loop->$_($self->$_) for qw(accept_interval multi_accept);
	57	+
	58	+ # Pipe for worker communication
	59	+ pipe($self->{reader}, $self->{writer}) or die "Can't create pipe: $!";
	60	+ $self->{poll} = IO::Poll->new;
	61	+ $self->{poll}->mask($self->{reader}, POLLIN);
	62	+
	63	+ # Clean manager environment
	64	+ local $SIG{INT} = local $SIG{TERM} = sub { $self->_term };
	65	+ local $SIG{CHLD} = sub {
	66	+ while ((my $pid = waitpid -1, WNOHANG) > 0) { $self->_reap($pid) }
	67	+ };
	68	+ local $SIG{QUIT} = sub { $self->_term(1) };
	69	+ local $SIG{TTIN} = sub { $self->workers($self->workers + 1) };
	70	+ local $SIG{TTOU} = sub {
	71	+ $self->workers($self->workers - 1) if $self->workers > 0;
	72	+ return unless $self->workers;
	73	+ $self->{pool}{shuffle keys %{$self->{pool}}}{graceful} \|\|= time;
	74	+ };
	75	+
	76	+ # Preload application and start accepting connections
	77	+ $self->start->app->log->info("Manager $$ started.");
	78	+ $self->{running} = 1;
	79	+ $self->_manage while $self->{running};
	80	+}
	81	+
	82	+sub _heartbeat {
	83	+ my $self = shift;
	84	+
	85	+ # Poll for heartbeats
	86	+ my $poll = $self->{poll};
	87	+ $poll->poll(1);
	88	+ return unless $poll->handles(POLLIN);
	89	+ return unless $self->{reader}->sysread(my $chunk, 4194304);
	90	+
	91	+ # Update heartbeats
	92	+ $self->{pool}{$1} and $self->emit(heartbeat => $1)->{pool}{$1}{time} = time
	93	+ while $chunk =~ /(\d+)\n/g;
	94	+}
	95	+
	96	+sub _manage {
	97	+ my $self = shift;
	98	+
	99	+ # Spawn more workers and check PID file
	100	+ if (!$self->{finished}) {
	101	+ $self->_spawn while keys %{$self->{pool}} < $self->workers;
	102	+ $self->_pid_file;
	103	+ }
	104	+
	105	+ # Shutdown
	106	+ elsif (!keys %{$self->{pool}}) { return delete $self->{running} }
	107	+
	108	+ # Manage workers
	109	+ $self->emit('wait')->_heartbeat;
	110	+ my $log = $self->app->log;
	111	+ while (my ($pid, $w) = each %{$self->{pool}}) {
	112	+
	113	+ # No heartbeat (graceful stop)
	114	+ my $interval = $self->heartbeat_interval;
	115	+ my $timeout = $self->heartbeat_timeout;
	116	+ if (!$w->{graceful} && ($w->{time} + $interval + $timeout <= time)) {
	117	+ $log->info("Worker $pid has no heartbeat, restarting.");
	118	+ $w->{graceful} = time;
	119	+ }
	120	+
	121	+ # Graceful stop with timeout
	122	+ $w->{graceful} \|\|= time if $self->{graceful};
	123	+ if ($w->{graceful}) {
	124	+ $log->debug("Trying to stop worker $pid gracefully.");
	125	+ kill 'QUIT', $pid;
	126	+ $w->{force} = 1 if $w->{graceful} + $self->graceful_timeout <= time;
	127	+ }
	128	+
	129	+ # Normal stop
	130	+ if (($self->{finished} && !$self->{graceful}) \|\| $w->{force}) {
	131	+ $log->debug("Stopping worker $pid.");
	132	+ kill 'KILL', $pid;
	133	+ }
	134	+ }
	135	+}
	136	+
	137	+sub _pid_file {
	138	+ my $self = shift;
	139	+
	140	+ # Check if PID file already exists
	141	+ return if -e (my $file = $self->pid_file);
	142	+
	143	+ # Create PID file
	144	+ $self->app->log->info(qq{Creating process id file "$file".});
	145	+ die qq{Can't create process id file "$file": $!}
	146	+ unless open my $handle, '>', $file;
	147	+ chmod 0644, $handle;
	148	+ print $handle $$;
	149	+}
	150	+
	151	+sub _reap {
	152	+ my ($self, $pid) = @_;
	153	+
	154	+ # CLean up dead worker
	155	+ $self->app->log->debug("Worker $pid stopped.")
	156	+ if delete $self->emit(reap => $pid)->{pool}{$pid};
	157	+}
	158	+
	159	+sub _spawn {
	160	+ my $self = shift;
	161	+
	162	+ # Manager
	163	+ die "Can't fork: $!" unless defined(my $pid = fork);
	164	+ return $self->emit(spawn => $pid)->{pool}{$pid} = {time => time} if $pid;
	165	+
	166	+ # Prepare lock file
	167	+ my $file = $self->{lock_file};
	168	+ die qq{Can't open lock file "$file": $!} unless open my $handle, '>', $file;
	169	+
	170	+ # Change user/group
	171	+ my $loop = $self->setuidgid->ioloop;
	172	+
	173	+ # Accept mutex
	174	+ $loop->lock(
	175	+ sub {
	176	+
	177	+ # Blocking ("ualarm" can't be imported on Windows)
	178	+ my $l;
	179	+ if ($_[1]) {
	180	+ eval {
	181	+ local $SIG{ALRM} = sub { die "alarm\n" };
	182	+ my $old = Time::HiRes::ualarm $self->lock_timeout * 1000000;
	183	+ $l = flock $handle, LOCK_EX;
	184	+ Time::HiRes::ualarm $old;
	185	+ };
	186	+ if ($@) { $l = $@ eq "alarm\n" ? 0 : die($@) }
	187	+ }
	188	+
	189	+ # Non blocking
	190	+ else { $l = flock $handle, LOCK_EX \| LOCK_NB }
	191	+
	192	+ return $l;
	193	+ }
	194	+ );
	195	+ $loop->unlock(sub { flock $handle, LOCK_UN });
	196	+
	197	+ # Heartbeat messages (stop sending during graceful stop)
	198	+ weaken $self;
	199	+ $loop->recurring(
	200	+ $self->heartbeat_interval => sub {
	201	+ return unless shift->max_connections;
	202	+ $self->{writer}->syswrite("$$\n") or exit 0;
	203	+ }
	204	+ );
	205	+
	206	+ # Clean worker environment
	207	+ $SIG{$_} = 'DEFAULT' for qw(INT TERM CHLD TTIN TTOU);
	208	+ $SIG{QUIT} = sub { $loop->max_connections(0) };
	209	+ delete $self->{$_} for qw(poll reader);
	210	+
	211	+ # Start event loop
	212	+ $self->app->log->debug("Worker $$ started.");
	213	+ $loop->start;
	214	+ exit 0;
	215	+}
	216	+
	217	+sub _term {
	218	+ my ($self, $graceful) = @_;
	219	+ $self->emit(finish => $graceful)->{finished} = 1;
	220	+ $self->{graceful} = 1 if $graceful;
	221	+}
	222	+
	223	+1;
	224	+
	225	+=head1 NAME
	226	+
	227	+Mojo::Server::Prefork - Preforking non-blocking I/O HTTP and WebSocket server
	228	+
	229	+=head1 SYNOPSIS
	230	+
	231	+ use Mojo::Server::Prefork;
	232	+
	233	+ my $prefork = Mojo::Server::Prefork->new(listen => ['http://*:8080']);
	234	+ $prefork->unsubscribe('request');
	235	+ $prefork->on(request => sub {
	236	+ my ($prefork, $tx) = @_;
	237	+
	238	+ # Request
	239	+ my $method = $tx->req->method;
	240	+ my $path = $tx->req->url->path;
	241	+
	242	+ # Response
	243	+ $tx->res->code(200);
	244	+ $tx->res->headers->content_type('text/plain');
	245	+ $tx->res->body("$method request for $path!");
	246	+
	247	+ # Resume transaction
	248	+ $tx->resume;
	249	+ });
	250	+ $prefork->run;
	251	+
	252	+=head1 DESCRIPTION
	253	+
	254	+L<Mojo::Server::Prefork> is a full featured, UNIX optimized, preforking
	255	+non-blocking I/O HTTP and WebSocket server, built around the very well tested
	256	+and reliable L<Mojo::Server::Daemon>, with C<IPv6>, C<TLS>, C<Comet> (long
	257	+polling) and multiple event loop support. Note that the server uses signals
	258	+for process management, so you should avoid modifying signal handlers in your
	259	+applications.
	260	+
	261	+Optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.16+) and
	262	+L<IO::Socket::SSL> (1.75+) are supported transparently through
	263	+L<Mojo::IOLoop>, and used if installed. Individual features can also be
	264	+disabled with the C<MOJO_NO_IPV6> and C<MOJO_NO_TLS> environment variables.
	265	+
	266	+See L<Mojolicious::Guides::Cookbook> for more.
	267	+
	268	+=head1 SIGNALS
	269	+
	270	+L<Mojo::Server::Prefork> can be controlled at runtime with the following
	271	+signals.
	272	+
	273	+=head2 Manager
	274	+
	275	+=over 2
	276	+
	277	+=item INT, TERM
	278	+
	279	+Shutdown server immediately.
	280	+
	281	+=item QUIT
	282	+
	283	+Shutdown server gracefully.
	284	+
	285	+=item TTIN
	286	+
	287	+Increase worker pool by one.
	288	+
	289	+=item TTOU
	290	+
	291	+Decrease worker pool by one.
	292	+
	293	+=back
	294	+
	295	+=head2 Worker
	296	+
	297	+=over 2
	298	+
	299	+=item INT, TERM
	300	+
	301	+Stop worker immediately.
	302	+
	303	+=item QUIT
	304	+
	305	+Stop worker gracefully.
	306	+
	307	+=back
	308	+
	309	+=head1 EVENTS
	310	+
	311	+L<Mojo::Server::Prefork> inherits all events from L<Mojo::Server::Daemon> and
	312	+can emit the following new ones.
	313	+
	314	+=head2 finish
	315	+
	316	+ $prefork->on(finish => sub {
	317	+ my ($prefork, $graceful) = @_;
	318	+ ...
	319	+ });
	320	+
	321	+Emitted when the server shuts down.
	322	+
	323	+ $prefork->on(finish => sub {
	324	+ my ($prefork, $graceful) = @_;
	325	+ say $graceful ? 'Graceful server shutdown' : 'Server shutdown';
	326	+ });
	327	+
	328	+=head2 heartbeat
	329	+
	330	+ $prefork->on(heartbeat => sub {
	331	+ my ($prefork, $pid) = @_;
	332	+ ...
	333	+ });
	334	+
	335	+Emitted when a heartbeat message has been received from a worker.
	336	+
	337	+ $prefork->on(heartbeat => sub {
	338	+ my ($prefork, $pid) = @_;
	339	+ say "Worker $pid has a heartbeat";
	340	+ });
	341	+
	342	+=head2 reap
	343	+
	344	+ $prefork->on(reap => sub {
	345	+ my ($prefork, $pid) = @_;
	346	+ ...
	347	+ });
	348	+
	349	+Emitted when a child process dies.
	350	+
	351	+ $prefork->on(reap => sub {
	352	+ my ($prefork, $pid) = @_;
	353	+ say "Worker $pid stopped";
	354	+ });
	355	+
	356	+=head2 spawn
	357	+
	358	+ $prefork->on(spawn => sub {
	359	+ my ($prefork, $pid) = @_;
	360	+ ...
	361	+ });
	362	+
	363	+Emitted when a worker process is spawned.
	364	+
	365	+ $prefork->on(spawn => sub {
	366	+ my ($prefork, $pid) = @_;
	367	+ say "Worker $pid started";
	368	+ });
	369	+
	370	+=head2 wait
	371	+
	372	+ $prefork->on(wait => sub {
	373	+ my $prefork = shift;
	374	+ ...
	375	+ });
	376	+
	377	+Emitted when the manager starts waiting for new heartbeat messages.
	378	+
	379	+ $prefork->on(wait => sub {
	380	+ my $prefork = shift;
	381	+ my $workers = $prefork->workers;
	382	+ say "Waiting for heartbeat messages from $workers workers";
	383	+ });
	384	+
	385	+=head1 ATTRIBUTES
	386	+
	387	+L<Mojo::Server::Prefork> inherits all attributes from L<Mojo::Server::Daemon>
	388	+and implements the following new ones.
	389	+
	390	+=head2 accept_interval
	391	+
	392	+ my $interval = $prefork->accept_interval;
	393	+ $prefork = $prefork->accept_interval(0.5);
	394	+
	395	+Interval in seconds for trying to reacquire the accept mutex and connection
	396	+management, defaults to C<0.025>. Note that changing this value can affect
	397	+performance and idle CPU usage.
	398	+
	399	+=head2 accepts
	400	+
	401	+ my $accepts = $prefork->accepts;
	402	+ $prefork = $prefork->accepts(100);
	403	+
	404	+Maximum number of connections a worker is allowed to accept before stopping
	405	+gracefully, defaults to C<1000>. Setting the value to C<0> will allow workers
	406	+to accept new connections indefinitely. Note that up to half of this value can
	407	+be subtracted randomly to improve load balancing, and that worker processes
	408	+will stop sending heartbeat messages once the limit has been reached.
	409	+
	410	+=head2 graceful_timeout
	411	+
	412	+ my $timeout = $prefork->graceful_timeout;
	413	+ $prefork = $prefork->graceful_timeout(15);
	414	+
	415	+Maximum amount of time in seconds stopping a worker gracefully may take before
	416	+being forced, defaults to C<20>.
	417	+
	418	+=head2 heartbeat_interval
	419	+
	420	+ my $interval = $prefork->heartbeat_intrval;
	421	+ $prefork = $prefork->heartbeat_interval(3);
	422	+
	423	+Heartbeat interval in seconds, defaults to C<5>.
	424	+
	425	+=head2 heartbeat_timeout
	426	+
	427	+ my $timeout = $prefork->heartbeat_timeout;
	428	+ $prefork = $prefork->heartbeat_timeout(2);
	429	+
	430	+Maximum amount of time in seconds before a worker without a heartbeat will be
	431	+stopped gracefully, defaults to C<20>.
	432	+
	433	+=head2 lock_file
	434	+
	435	+ my $file = $prefork->lock_file;
	436	+ $prefork = $prefork->lock_file('/tmp/prefork.lock');
	437	+
	438	+Full path of accept mutex lock file prefix, to which the process id will be
	439	+appended, defaults to a random temporary path.
	440	+
	441	+=head2 lock_timeout
	442	+
	443	+ my $timeout = $prefork->lock_timeout;
	444	+ $prefork = $prefork->lock_timeout(1);
	445	+
	446	+Maximum amount of time in seconds a worker may block when waiting for the
	447	+accept mutex, defaults to C<0.5>.
	448	+
	449	+=head2 multi_accept
	450	+
	451	+ my $multi = $prefork->multi_accept;
	452	+ $prefork = $prefork->multi_accept(100);
	453	+
	454	+Number of connections to accept at once, defaults to C<50>.
	455	+
	456	+=head2 pid_file
	457	+
	458	+ my $file = $prefork->pid_file;
	459	+ $prefork = $prefork->pid_file('/tmp/prefork.pid');
	460	+
	461	+Full path of process id file, defaults to a random temporary path.
	462	+
	463	+=head2 workers
	464	+
	465	+ my $workers = $prefork->workers;
	466	+ $prefork = $prefork->workers(10);
	467	+
	468	+Number of worker processes, defaults to C<4>. A good rule of thumb is two
	469	+worker processes per CPU core.
	470	+
	471	+=head1 METHODS
	472	+
	473	+L<Mojo::Server::Prefork> inherits all methods from L<Mojo::Server::Daemon> and
	474	+implements the following new ones.
	475	+
	476	+=head2 check_pid
	477	+
	478	+ my $pid = $prefork->check_pid;
	479	+
	480	+Get process id for running server from C<pid_file> or delete it if server is
	481	+not running.
	482	+
	483	+ say 'Server is not running' unless $prefork->check_pid;
	484	+
	485	+=head2 run
	486	+
	487	+ $prefork->run;
	488	+
	489	+Run server.
	490	+
	491	+=head1 SEE ALSO
	492	+
	493	+L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicio.us>.
	494	+
	495	+=cut

+35 -42

mojolegacy/lib/Mojo/Template.pm

View

@@ -26,11 +26,8 @@ has tree      => sub { [] };
 sub build {
   my $self = shift;
 
-  # Lines
   my (@lines, $cpst, $multi);
   for my $line (@{$self->tree}) {
-
-    # New line
     push @lines, '';
     for (my $j = 0; $j < @{$line}; $j += 2) {
       my $type    = $line->[$j];
@@ -118,12 +115,11 @@ sub interpret {
     Mojo::Exception->throw(shift, [$self->template, $self->code]);
   };
 
-  # Interpret
   return undef unless my $compiled = $self->compiled;
   my $output = eval { $compiled->(@_) };
   return $output unless $@;
 
-  # Exception
+  # Exception with template context
   return Mojo::Exception->new($@, [$self->template])->verbose(1);
 }
 
@@ -133,7 +129,6 @@ sub parse {
   # Clean start
   delete $self->template($tmpl)->{tree};
 
-  # Token
   my $tag     = $self->tag_start;
   my $replace = $self->replace_mark;
   my $expr    = $self->expression_mark;
@@ -202,7 +197,7 @@ sub parse {
     # Normal line ending
     else { $line .= "\n" }
 
-    # Tokenize
+    # Mixed line
     my @token;
     for my $token (split $token_re, $line) {
 
@@ -270,14 +265,12 @@ sub render {
 sub render_file {
   my ($self, $path) = (shift, shift);
 
-  # Slurp file
   $self->name($path) unless defined $self->{name};
-  my $tmpl = slurp $path;
-
-  # Decode and render
+  my $tmpl     = slurp $path;
   my $encoding = $self->encoding;
   croak qq{Template "$path" has invalid encoding.}
     if $encoding && !defined($tmpl = decode $encoding, $tmpl);
+
   return $self->render($tmpl, @_);
 }
 
@@ -310,7 +303,7 @@ sub _wrap {
 
   # Escape function
   my $escape = $self->escape;
-  monkey_patch $self->namespace, '_escape', sub {
+  monkey_patch $self->namespace, _escape => sub {
     no warnings 'uninitialized';
     ref $_[0] eq 'Mojo::ByteStream' ? $_[0] : $escape->("$_[0]");
   };
@@ -321,7 +314,6 @@ sub _wrap {
   $lines->[0]  .= "sub { my \$_M = ''; @{[$self->prepend]}; do { $first";
   $lines->[-1] .= "@{[$self->append]}; \$_M } };";
 
-  # Code
   my $code = join "\n", @$lines;
   warn "-- Code for @{[$self->name]}\n@{[encode 'UTF-8', $code]}\n\n" if DEBUG;
   return $code;
@@ -402,7 +394,8 @@ the default in L<Mojolicious> C<.ep> templates for example.
 
 L<Mojo::ByteStream> objects are always excluded from automatic escaping.
 
-  <%= Mojo::ByteStream->new('<div>excluded!</div>') %>
+  % use Mojo::ByteStream 'b';
+  <%= b('<div>excluded!</div>') %>
 
 Newline characters can be escaped with a backslash.
 
@@ -461,14 +454,14 @@ error messages with context.
 
 L<Mojo::Template> implements the following attributes.
 
-=head2 C<auto_escape>
+=head2 auto_escape
 
   my $escape = $mt->auto_escape;
   $mt        = $mt->auto_escape(1);
 
 Activate automatic escaping.
 
-=head2 C<append>
+=head2 append
 
   my $code = $mt->append;
   $mt      = $mt->append('warn "Processed template"');
@@ -477,7 +470,7 @@ Append Perl code to compiled template. Note that this code should not contain
 newline characters, or line numbers in error messages might end up being
 wrong.
 
-=head2 C<capture_end>
+=head2 capture_end
 
   my $end = $mt->capture_end;
   $mt     = $mt->capture_end('end');
@@ -488,7 +481,7 @@ Keyword indicating the end of a capture block, defaults to C<end>.
     Some data!
   <% end %>
 
-=head2 C<capture_start>
+=head2 capture_start
 
   my $start = $mt->capture_start;
   $mt       = $mt->capture_start('begin');
@@ -499,14 +492,14 @@ Keyword indicating the start of a capture block, defaults to C<begin>.
     Some data!
   <% end %>
 
-=head2 C<code>
+=head2 code
 
   my $code = $mt->code;
   $mt      = $mt->code($code);
 
 Perl code for template.
 
-=head2 C<comment_mark>
+=head2 comment_mark
 
   my $mark = $mt->comment_mark;
   $mt      = $mt->comment_mark('#');
@@ -515,21 +508,21 @@ Character indicating the start of a comment, defaults to C<#>.
 
   <%# This is a comment %>
 
-=head2 C<compiled>
+=head2 compiled
 
   my $compiled = $mt->compiled;
   $mt          = $mt->compiled($compiled);
 
 Compiled template code.
 
-=head2 C<encoding>
+=head2 encoding
 
   my $encoding = $mt->encoding;
   $mt          = $mt->encoding('UTF-8');
 
 Encoding used for template files.
 
-=head2 C<escape>
+=head2 escape
 
   my $cb = $mt->escape;
   $mt    = $mt->escape(sub { reverse $_[0] });
@@ -537,7 +530,7 @@ Encoding used for template files.
 A callback used to escape the results of escaped expressions, defaults to
 L<Mojo::Util/"xml_escape">.
 
-=head2 C<escape_mark>
+=head2 escape_mark
 
   my $mark = $mt->escape_mark;
   $mt      = $mt->escape_mark('=');
@@ -546,7 +539,7 @@ Character indicating the start of an escaped expression, defaults to C<=>.
 
   <%== $foo %>
 
-=head2 C<expression_mark>
+=head2 expression_mark
 
   my $mark = $mt->expression_mark;
   $mt      = $mt->expression_mark('=');
@@ -555,7 +548,7 @@ Character indicating the start of an expression, defaults to C<=>.
 
   <%= $foo %>
 
-=head2 C<line_start>
+=head2 line_start
 
   my $start = $mt->line_start;
   $mt       = $mt->line_start('%');
@@ -564,7 +557,7 @@ Character indicating the start of a code line, defaults to C<%>.
 
   % $foo = 23;
 
-=head2 C<name>
+=head2 name
 
   my $name = $mt->name;
   $mt      = $mt->name('foo.mt');
@@ -573,7 +566,7 @@ Name of template currently being processed, defaults to C<template>. Note that
 this value should not contain quotes or newline characters, or error messages
 might end up being wrong.
 
-=head2 C<namespace>
+=head2 namespace
 
   my $namespace = $mt->namespace;
   $mt           = $mt->namespace('main');
@@ -582,7 +575,7 @@ Namespace used to compile templates, defaults to C<Mojo::Template::SandBox>.
 Note that namespaces should only be shared very carefully between templates,
 since functions and global variables will not be cleared automatically.
 
-=head2 C<prepend>
+=head2 prepend
 
   my $code = $mt->prepend;
   $mt      = $mt->prepend('my $self = shift;');
@@ -591,7 +584,7 @@ Prepend Perl code to compiled template. Note that this code should not contain
 newline characters, or line numbers in error messages might end up being
 wrong.
 
-=head2 C<replace_mark>
+=head2 replace_mark
 
   my $mark = $mt->replace_mark;
   $mt      = $mt->replace_mark('%');
@@ -600,7 +593,7 @@ Character used for escaping the start of a tag or line, defaults to C<%>.
 
   <%% my $foo = 23; %>
 
-=head2 C<tag_start>
+=head2 tag_start
 
   my $start = $mt->tag_start;
   $mt       = $mt->tag_start('<%');
@@ -609,7 +602,7 @@ Characters indicating the start of a tag, defaults to C<E<lt>%>.
 
   <% $foo = 23; %>
 
-=head2 C<tag_end>
+=head2 tag_end
 
   my $end = $mt->tag_end;
   $mt     = $mt->tag_end('%>');
@@ -618,21 +611,21 @@ Characters indicating the end of a tag, defaults to C<%E<gt>>.
 
   <%= $foo %>
 
-=head2 C<template>
+=head2 template
 
   my $template = $mt->template;
   $mt          = $mt->template($template);
 
 Raw template.
 
-=head2 C<tree>
+=head2 tree
 
   my $tree = $mt->tree;
   $mt      = $mt->tree($tree);
 
 Parsed tree.
 
-=head2 C<trim_mark>
+=head2 trim_mark
 
   my $mark = $mt->trim_mark;
   $mt      = $mt->trim_mark('-');
@@ -646,25 +639,25 @@ Character activating automatic whitespace trimming, defaults to C<=>.
 L<Mojo::Template> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $mt = Mojo::Template->new;
 
 Construct a new L<Mojo::Template> object.
 
-=head2 C<build>
+=head2 build
 
   $mt = $mt->build;
 
 Build Perl code from tree.
 
-=head2 C<compile>
+=head2 compile
 
   my $exception = $mt->compile;
 
 Compile Perl code for template.
 
-=head2 C<interpret>
+=head2 interpret
 
   my $output = $mt->interpret;
   my $output = $mt->interpret(@args);
@@ -676,13 +669,13 @@ Interpret compiled template code.
   say $mt->interpret('Fry');
   say $mt->interpret('Leela');
 
-=head2 C<parse>
+=head2 parse
 
   $mt = $mt->parse($template);
 
 Parse template into tree.
 
-=head2 C<render>
+=head2 render
 
   my $output = $mt->render($template);
   my $output = $mt->render($template, @args);
@@ -691,7 +684,7 @@ Render template.
 
   say $mt->render('Hello <%= $_[0] %>!', 'Bender');
 
-=head2 C<render_file>
+=head2 render_file
 
   my $output = $mt->render_file('/tmp/foo.mt');
   my $output = $mt->render_file('/tmp/foo.mt', @args);

+30 -29

mojolegacy/lib/Mojo/Transaction.pm

View

@@ -101,9 +101,10 @@ L<Mojo::Transaction> is an abstract base class for transactions.
 
 =head1 EVENTS
 
-L<Mojo::Transaction> can emit the following events.
+L<Mojo::Transaction> inherits all events from L<Mojo::EventEmitter> and can
+emit the following new ones.
 
-=head2 C<connection>
+=head2 connection
 
   $tx->on(connection => sub {
     my ($tx, $connection) = @_;
@@ -112,7 +113,7 @@ L<Mojo::Transaction> can emit the following events.
 
 Emitted when a connection has been assigned to transaction.
 
-=head2 C<finish>
+=head2 finish
 
   $tx->on(finish => sub {
     my $tx = shift;
@@ -121,7 +122,7 @@ Emitted when a connection has been assigned to transaction.
 
 Emitted when transaction is finished.
 
-=head2 C<resume>
+=head2 resume
 
   $tx->on(resume => sub {
     my $tx = shift;
@@ -134,28 +135,28 @@ Emitted when transaction is resumed.
 
 L<Mojo::Transaction> implements the following attributes.
 
-=head2 C<kept_alive>
+=head2 kept_alive
 
   my $kept_alive = $tx->kept_alive;
   $tx            = $tx->kept_alive(1);
 
 Connection has been kept alive.
 
-=head2 C<local_address>
+=head2 local_address
 
   my $address = $tx->local_address;
   $tx         = $tx->local_address('127.0.0.1');
 
 Local interface address.
 
-=head2 C<local_port>
+=head2 local_port
 
   my $port = $tx->local_port;
   $tx      = $tx->local_port(8080);
 
 Local interface port.
 
-=head2 C<previous>
+=head2 previous
 
   my $previous = $tx->previous;
   $tx          = $tx->previous(Mojo::Transaction->new);
@@ -165,21 +166,21 @@ Previous transaction that triggered this followup transaction.
   # Path of previous request
   say $tx->previous->req->url->path;
 
-=head2 C<remote_port>
+=head2 remote_port
 
   my $port = $tx->remote_port;
   $tx      = $tx->remote_port(8081);
 
 Remote interface port.
 
-=head2 C<req>
+=head2 req
 
   my $req = $tx->req;
   $tx     = $tx->req(Mojo::Message::Request->new);
 
 HTTP request, defaults to a L<Mojo::Message::Request> object.
 
-=head2 C<res>
+=head2 res
 
   my $res = $tx->res;
   $tx     = $tx->res(Mojo::Message::Response->new);
@@ -191,92 +192,92 @@ HTTP response, defaults to a L<Mojo::Message::Response> object.
 L<Mojo::Transaction> inherits all methods from L<Mojo::EventEmitter> and
 implements the following new ones.
 
-=head2 C<client_close>
+=head2 client_close
 
   $tx->client_close;
 
 Transaction closed client-side, used to implement user agents.
 
-=head2 C<client_read>
+=head2 client_read
 
-  $tx->client_read($chunk);
+  $tx->client_read($bytes);
 
 Read data client-side, used to implement user agents. Meant to be overloaded
 in a subclass.
 
-=head2 C<client_write>
+=head2 client_write
 
-  my $chunk = $tx->client_write;
+  my $bytes = $tx->client_write;
 
 Write data client-side, used to implement user agents. Meant to be overloaded
 in a subclass.
 
-=head2 C<connection>
+=head2 connection
 
   my $connection = $tx->connection;
   $tx            = $tx->connection($connection);
 
 Connection identifier or socket.
 
-=head2 C<error>
+=head2 error
 
   my $err          = $tx->error;
   my ($err, $code) = $tx->error;
 
 Error and code.
 
-=head2 C<is_finished>
+=head2 is_finished
 
   my $success = $tx->is_finished;
 
 Check if transaction is finished.
 
-=head2 C<is_websocket>
+=head2 is_websocket
 
   my $false = $tx->is_websocket;
 
 False.
 
-=head2 C<is_writing>
+=head2 is_writing
 
   my $success = $tx->is_writing;
 
 Check if transaction is writing.
 
-=head2 C<resume>
+=head2 resume
 
   $tx = $tx->resume;
 
 Resume transaction.
 
-=head2 C<remote_address>
+=head2 remote_address
 
   my $address = $tx->remote_address;
   $tx         = $tx->remote_address('127.0.0.1');
 
 Remote interface address.
 
-=head2 C<server_close>
+=head2 server_close
 
   $tx->server_close;
 
 Transaction closed server-side, used to implement web servers.
 
-=head2 C<server_read>
+=head2 server_read
 
-  $tx->server_read($chunk);
+  $tx->server_read($bytes);
 
 Read data server-side, used to implement web servers. Meant to be overloaded
 in a subclass.
 
-=head2 C<server_write>
+=head2 server_write
 
-  my $chunk = $tx->server_write;
+  my $bytes = $tx->server_write;
 
 Write data server-side, used to implement web servers. Meant to be overloaded
 in a subclass.
 
-=head2 C<success>
+=head2 success
 
   my $res = $tx->success;
 

+15 -15

mojolegacy/lib/Mojo/Transaction/HTTP.pm

View

@@ -57,7 +57,7 @@ sub server_write { shift->_write(1) }
 sub _body {
   my ($self, $msg, $finish) = @_;
 
-  # Chunk
+  # Prepare chunk
   my $buffer = $msg->get_body_chunk($self->{offset});
   my $written = defined $buffer ? length $buffer : 0;
   $self->{write} = $msg->is_dynamic ? 1 : ($self->{write} - $written);
@@ -80,7 +80,7 @@ sub _body {
 sub _headers {
   my ($self, $msg, $head) = @_;
 
-  # Chunk
+  # Prepare chunk
   my $buffer = $msg->get_header_chunk($self->{offset});
   my $written = defined $buffer ? length $buffer : 0;
   $self->{write}  = $self->{write} - $written;
@@ -107,7 +107,7 @@ sub _headers {
 sub _start_line {
   my ($self, $msg) = @_;
 
-  # Chunk
+  # Prepare chunk
   my $buffer = $msg->get_start_line_chunk($self->{offset});
   my $written = defined $buffer ? length $buffer : 0;
   $self->{write}  = $self->{write} - $written;
@@ -195,7 +195,7 @@ in RFC 2616.
 L<Mojo::Transaction::HTTP> inherits all events from L<Mojo::Transaction> and
 can emit the following new ones.
 
-=head2 C<request>
+=head2 request
 
   $tx->on(request => sub {
     my $tx = shift;
@@ -209,7 +209,7 @@ Emitted when a request is ready and needs to be handled.
     $tx->res->headers->header('X-Bender' => 'Bite my shiny metal ass!');
   });
 
-=head2 C<unexpected>
+=head2 unexpected
 
   $tx->on(unexpected => sub {
     my ($tx, $res) = @_;
@@ -223,7 +223,7 @@ Emitted for unexpected C<1xx> responses that will be ignored.
     $tx->res->on(finish => sub { say 'Followup response is finished.' });
   });
 
-=head2 C<upgrade>
+=head2 upgrade
 
   $tx->on(upgrade => sub {
     my ($tx, $ws) = @_;
@@ -247,33 +247,33 @@ L<Mojo::Transaction::HTTP> inherits all attributes from L<Mojo::Transaction>.
 L<Mojo::Transaction::HTTP> inherits all methods from L<Mojo::Transaction> and
 implements the following new ones.
 
-=head2 C<client_read>
+=head2 client_read
 
-  $tx->client_read($chunk);
+  $tx->client_read($bytes);
 
 Read data client-side, used to implement user agents.
 
-=head2 C<client_write>
+=head2 client_write
 
-  my $chunk = $tx->client_write;
+  my $bytes = $tx->client_write;
 
 Write data client-side, used to implement user agents.
 
-=head2 C<keep_alive>
+=head2 keep_alive
 
   my $success = $tx->keep_alive;
 
 Check if connection can be kept alive.
 
-=head2 C<server_read>
+=head2 server_read
 
-  $tx->server_read($chunk);
+  $tx->server_read($bytes);
 
 Read data server-side, used to implement web servers.
 
-=head2 C<server_write>
+=head2 server_write
 
-  my $chunk = $tx->server_write;
+  my $bytes = $tx->server_write;
 
 Write data server-side, used to implement web servers.
 

+66 -41

mojolegacy/lib/Mojo/Transaction/WebSocket.pm

View

@@ -88,7 +88,6 @@ sub client_challenge {
 sub client_handshake {
   my $self = shift;
 
-  # Default headers
   my $headers = $self->req->headers;
   $headers->upgrade('websocket')  unless $headers->upgrade;
   $headers->connection('Upgrade') unless $headers->connection;
@@ -205,12 +204,10 @@ sub send {
   # Text
   elsif (!ref $frame) { $frame = [1, 0, 0, 0, TEXT, encode('UTF-8', $frame)] }
 
-  # Prepare frame
   $self->once(drain => $cb) if $cb;
   $self->{write} .= $self->build_frame(@$frame);
   $self->{state} = 'write';
 
-  # Resume
   return $self->emit('resume');
 }
 
@@ -230,28 +227,23 @@ sub server_handshake {
 sub server_read {
   my ($self, $chunk) = @_;
 
-  # Parse frames
   $self->{read} .= defined $chunk ? $chunk : '';
   while (my $frame = $self->parse_frame(\$self->{read})) {
     $self->emit(frame => $frame);
   }
 
-  # Resume
   $self->emit('resume');
 }
 
 sub server_write {
   my $self = shift;
 
-  # Drain
   unless (length(defined $self->{write} ? $self->{write} : '')) {
     $self->{state} = $self->{finished} ? 'finished' : 'read';
     $self->emit('drain');
   }
 
-  # Empty buffer
-  my $chunk = delete $self->{write};
-  return $chunk ? $chunk : '';
+  return do { my $tmp = delete $self->{write}; defined $tmp ? $tmp : '' };
 }
 
 sub _challenge { b64_encode(sha1_bytes(($_[0] || '') . GUID), '') }
@@ -280,7 +272,11 @@ sub _message {
 
   # Message
   my $msg = delete $self->{message};
-  $msg = decode 'UTF-8', $msg if $msg && delete $self->{op} == TEXT;
+  if (delete $self->{op} == TEXT) {
+    $self->emit(text => $msg);
+    $msg = decode 'UTF-8', $msg if $msg;
+  }
+  else { $self->emit(binary => $msg); }
   $self->emit(message => $msg);
 }
 
@@ -317,7 +313,21 @@ integer support, or they are limited to 32bit.
 L<Mojo::Transaction::WebSocket> inherits all events from L<Mojo::Transaction>
 and can emit the following new ones.
 
-=head2 C<drain>
+=head2 binary
+
+  $ws->on(binary => sub {
+    my ($ws, $bytes) = @_;
+    ...
+  });
+
+Emitted when a complete WebSocket binary message has been received.
+
+  $ws->on(binary => sub {
+    my ($ws, $bytes) = @_;
+    say "Binary: $bytes";
+  });
+
+=head2 drain
 
   $ws->on(drain => sub {
     my $ws = shift;
@@ -331,7 +341,7 @@ Emitted once all data has been sent.
     $ws->send(time);
   });
 
-=head2 C<frame>
+=head2 frame
 
   $ws->on(frame => sub {
     my ($ws, $frame) = @_;
@@ -351,26 +361,41 @@ Emitted when a WebSocket frame has been received.
     say "Payload: $frame->[5]";
   });
 
-=head2 C<message>
+=head2 message
 
   $ws->on(message => sub {
     my ($ws, $msg) = @_;
     ...
   });
 
-Emitted when a complete WebSocket message has been received.
+Emitted when a complete WebSocket message has been received, text messages
+will be automatically decoded.
 
   $ws->on(message => sub {
     my ($ws, $msg) = @_;
     say "Message: $msg";
   });
 
+=head2 text
+
+  $ws->on(text => sub {
+    my ($ws, $bytes) = @_;
+    ...
+  });
+
+Emitted when a complete WebSocket text message has been received.
+
+  $ws->on(text => sub {
+    my ($ws, $bytes) = @_;
+    say "Text: $bytes";
+  });
+
 =head1 ATTRIBUTES
 
 L<Mojo::Transaction::WebSocket> inherits all attributes from
 L<Mojo::Transaction> and implements the following new ones.
 
-=head2 C<handshake>
+=head2 handshake
 
   my $handshake = $ws->handshake;
   $ws           = $ws->handshake(Mojo::Transaction::HTTP->new);
@@ -378,14 +403,14 @@ L<Mojo::Transaction> and implements the following new ones.
 The original handshake transaction, defaults to a L<Mojo::Transaction::HTTP>
 object.
 
-=head2 C<masked>
+=head2 masked
 
   my $masked = $ws->masked;
   $ws        = $ws->masked(1);
 
 Mask outgoing frames with XOR cipher and a random 32bit key.
 
-=head2 C<max_websocket_size>
+=head2 max_websocket_size
 
   my $size = $ws->max_websocket_size;
   $ws      = $ws->max_websocket_size(1024);
@@ -398,7 +423,7 @@ C<MOJO_MAX_WEBSOCKET_SIZE> environment variable or C<262144>.
 L<Mojo::Transaction::WebSocket> inherits all methods from
 L<Mojo::Transaction> and implements the following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $multi = Mojo::Content::MultiPart->new;
 
@@ -406,7 +431,7 @@ Construct a new L<Mojo::Transaction::WebSocket> object and subscribe to
 C<frame> event with default message parser, which also handles C<PING> and
 C<CLOSE> frames automatically.
 
-=head2 C<build_frame>
+=head2 build_frame
 
   my $bytes = $ws->build_frame($fin, $rsv1, $rsv2, $rsv3, $op, $payload);
 
@@ -430,68 +455,68 @@ Build WebSocket frame.
   # Pong frame with FIN bit and payload
   say $ws->build_frame(1, 0, 0, 0, 10, 'Test 123');
 
-=head2 C<client_challenge>
+=head2 client_challenge
 
   my $success = $ws->client_challenge;
 
 Check WebSocket handshake challenge client-side, used to implement user
 agents.
 
-=head2 C<client_handshake>
+=head2 client_handshake
 
   $ws->client_handshake;
 
 Perform WebSocket handshake client-side, used to implement user agents.
 
-=head2 C<client_read>
+=head2 client_read
 
   $ws->client_read($data);
 
 Read data client-side, used to implement user agents.
 
-=head2 C<client_write>
+=head2 client_write
 
-  my $chunk = $ws->client_write;
+  my $bytes = $ws->client_write;
 
 Write data client-side, used to implement user agents.
 
-=head2 C<connection>
+=head2 connection
 
   my $connection = $ws->connection;
 
 Connection identifier or socket.
 
-=head2 C<finish>
+=head2 finish
 
   $ws = $ws->finish;
 
 Finish the WebSocket connection gracefully.
 
-=head2 C<is_websocket>
+=head2 is_websocket
 
   my $true = $ws->is_websocket;
 
 True.
 
-=head2 C<kept_alive>
+=head2 kept_alive
 
   my $kept_alive = $ws->kept_alive;
 
 Connection has been kept alive.
 
-=head2 C<local_address>
+=head2 local_address
 
   my $address = $ws->local_address;
 
 Local interface address.
 
-=head2 C<local_port>
+=head2 local_port
 
   my $port = $ws->local_port;
 
 Local interface port.
 
-=head2 C<parse_frame>
+=head2 parse_frame
 
   my $frame = $ws->parse_frame(\$bytes);
 
@@ -506,37 +531,37 @@ Parse WebSocket frame.
   say "Opcode: $frame->[4]";
   say "Payload: $frame->[5]";
 
-=head2 C<remote_address>
+=head2 remote_address
 
   my $address = $ws->remote_address;
 
 Remote interface address.
 
-=head2 C<remote_port>
+=head2 remote_port
 
   my $port = $ws->remote_port;
 
 Remote interface port.
 
-=head2 C<req>
+=head2 req
 
   my $req = $ws->req;
 
 Handshake request, usually a L<Mojo::Message::Request> object.
 
-=head2 C<res>
+=head2 res
 
   my $res = $ws->res;
 
 Handshake response, usually a L<Mojo::Message::Response> object.
 
-=head2 C<resume>
+=head2 resume
 
   $ws = $ws->resume;
 
 Resume C<handshake> transaction.
 
-=head2 C<send>
+=head2 send
 
   $ws = $ws->send({binary => $bytes});
   $ws = $ws->send({text   => $bytes});
@@ -550,21 +575,21 @@ will be invoked once all data has been written.
   # Send "Ping" frame
   $ws->send([1, 0, 0, 0, 9, 'Hello World!']);
 
-=head2 C<server_handshake>
+=head2 server_handshake
 
   $ws->server_handshake;
 
 Perform WebSocket handshake server-side, used to implement web servers.
 
-=head2 C<server_read>
+=head2 server_read
 
   $ws->server_read($data);
 
 Read data server-side, used to implement web servers.
 
-=head2 C<server_write>
+=head2 server_write
 
-  my $chunk = $ws->server_write;
+  my $bytes = $ws->server_write;
 
 Write data server-side, used to implement web servers.
 

+19 -21

mojolegacy/lib/Mojo/URL.pm

View

@@ -31,7 +31,7 @@ sub authority {
     return $host =~ /[^\x00-\x7f]/ ? $self->ihost($host) : $self->host($host);
   }
 
-  # Format
+  # Build authority
   my $userinfo = $self->userinfo;
   $authority .= url_escape($userinfo, '^A-Za-z0-9\-._~!$&\'()*+,;=:') . '@'
     if $userinfo;
@@ -137,7 +137,6 @@ sub query {
 sub to_abs {
   my $self = shift;
 
-  # Already absolute
   my $abs = $self->clone;
   return $abs if $abs->is_abs;
 
@@ -173,7 +172,6 @@ sub to_abs {
 sub to_rel {
   my $self = shift;
 
-  # Already relative
   my $rel = $self->clone;
   return $rel unless $rel->is_abs;
 
@@ -274,42 +272,42 @@ Resource Locators with support for IDNA and IRIs.
 
 L<Mojo::URL> implements the following attributes.
 
-=head2 C<base>
+=head2 base
 
   my $base = $url->base;
   $url     = $url->base(Mojo::URL->new);
 
 Base of this URL.
 
-=head2 C<fragment>
+=head2 fragment
 
   my $fragment = $url->fragment;
   $url         = $url->fragment('foo');
 
 Fragment part of this URL.
 
-=head2 C<host>
+=head2 host
 
   my $host = $url->host;
   $url     = $url->host('127.0.0.1');
 
 Host part of this URL.
 
-=head2 C<port>
+=head2 port
 
   my $port = $url->port;
   $url     = $url->port(8080);
 
 Port part of this URL.
 
-=head2 C<scheme>
+=head2 scheme
 
   my $scheme = $url->scheme;
   $url       = $url->scheme('http');
 
 Scheme part of this URL.
 
-=head2 C<userinfo>
+=head2 userinfo
 
   my $userinfo = $url->userinfo;
   $url         = $url->userinfo('root:pass%3Bw0rd');
@@ -321,27 +319,27 @@ Userinfo part of this URL.
 L<Mojo::URL> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $url = Mojo::URL->new;
   my $url = Mojo::URL->new('http://127.0.0.1:3000/foo?f=b&baz=2#foo');
 
 Construct a new L<Mojo::URL> object.
 
-=head2 C<authority>
+=head2 authority
 
   my $authority = $url->authority;
   $url          = $url->authority('root:pass%3Bw0rd@localhost:8080');
 
 Authority part of this URL.
 
-=head2 C<clone>
+=head2 clone
 
   my $url2 = $url->clone;
 
 Clone this URL.
 
-=head2 C<ihost>
+=head2 ihost
 
   my $ihost = $url->ihost;
   $url      = $url->ihost('xn--bcher-kva.ch');
@@ -351,19 +349,19 @@ Host part of this URL in punycode format.
   # "xn--da5b0n.net"
   Mojo::URL->new('http://☃.net')->ihost;
 
-=head2 C<is_abs>
+=head2 is_abs
 
   my $success = $url->is_abs;
 
 Check if URL is absolute.
 
-=head2 C<parse>
+=head2 parse
 
   $url = $url->parse('http://127.0.0.1:3000/foo/bar?fo=o&baz=23#foo');
 
 Parse URL.
 
-=head2 C<path>
+=head2 path
 
   my $path = $url->path;
   $url     = $url->path('/foo/bar');
@@ -382,7 +380,7 @@ defaults to a L<Mojo::Path> object.
   # "http://mojolicio.us/perldoc/Mojo/DOM/HTML"
   Mojo::URL->new('http://mojolicio.us/perldoc/Mojo/')->path('DOM/HTML');
 
-=head2 C<protocol>
+=head2 protocol
 
   my $proto = $url->protocol;
 
@@ -391,7 +389,7 @@ Normalized version of C<scheme>.
   # "http"
   Mojo::URL->new('HtTp://mojolicio.us')->protocol;
 
-=head2 C<query>
+=head2 query
 
   my $query = $url->query;
   $url      = $url->query(replace => 'with');
@@ -419,21 +417,21 @@ Query part of this URL, defaults to a L<Mojo::Parameters> object.
   # "http://mojolicio.us?a=1&b=2&a=2&c=3"
   Mojo::URL->new('http://mojolicio.us?a=1&b=2')->query({a => 2, c => 3});
 
-=head2 C<to_abs>
+=head2 to_abs
 
   my $abs = $url->to_abs;
   my $abs = $url->to_abs(Mojo::URL->new('http://kraih.com/foo'));
 
 Clone relative URL and turn it into an absolute one.
 
-=head2 C<to_rel>
+=head2 to_rel
 
   my $rel = $url->to_rel;
   my $rel = $url->to_rel(Mojo::URL->new('http://kraih.com/foo'));
 
 Clone absolute URL and turn it into a relative one.
 
-=head2 C<to_string>
+=head2 to_string
 
   my $string = $url->to_string;
   my $string = "$url";

+8 -8

mojolegacy/lib/Mojo/Upload.pm

View

@@ -40,28 +40,28 @@ L<Mojo::Upload> is a container for uploaded files.
 
 L<Mojo::Upload> implements the following attributes.
 
-=head2 C<asset>
+=head2 asset
 
   my $asset = $upload->asset;
   $upload   = $upload->asset(Mojo::Asset::File->new);
 
 Asset containing the uploaded data, defaults to a L<Mojo::Asset::File> object.
 
-=head2 C<filename>
+=head2 filename
 
   my $filename = $upload->filename;
   $upload      = $upload->filename('foo.txt');
 
 Name of the uploaded file.
 
-=head2 C<headers>
+=head2 headers
 
   my $headers = $upload->headers;
   $upload     = $upload->headers(Mojo::Headers->new);
 
 Headers for upload, defaults to a L<Mojo::Headers> object.
 
-=head2 C<name>
+=head2 name
 
   my $name = $upload->name;
   $upload  = $upload->name('foo');
@@ -73,21 +73,21 @@ Name of the upload.
 L<Mojo::Upload> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<move_to>
+=head2 move_to
 
   $upload = $upload->move_to('/home/sri/foo.txt');
 
 Move uploaded data into a specific file.
 
-=head2 C<size>
+=head2 size
 
   my $size = $upload->size;
 
 Size of uploaded data in bytes.
 
-=head2 C<slurp>
+=head2 slurp
 
-  my $string = $upload->slurp;
+  my $bytes = $upload->slurp;
 
 Read all uploaded data at once.
 

+51 -54

mojolegacy/lib/Mojo/UserAgent.pm

View

@@ -99,18 +99,19 @@ sub start {
     unless ($self->{nb}) {
       croak 'Blocking request in progress' if keys %{$self->{connections}};
       warn "-- Switching to non-blocking mode\n" if DEBUG;
+      $self->_cleanup;
       $self->{nb}++;
-      $self->_cleanup(1);
     }
     return $self->_start($tx, $cb);
   }
 
   # Start blocking
   warn "-- Blocking request (@{[$tx->req->url->to_abs]})\n" if DEBUG;
-  if (delete $self->{nb}) {
+  if ($self->{nb}) {
     croak 'Non-blocking requests in progress' if keys %{$self->{connections}};
     warn "-- Switching to blocking mode\n" if DEBUG;
-    $self->_cleanup(1);
+    $self->_cleanup;
+    delete $self->{nb};
   }
   $self->_start($tx => sub { $tx = pop });
 
@@ -159,7 +160,7 @@ sub _cache {
 }
 
 sub _cleanup {
-  my ($self, $restart) = @_;
+  my $self = shift;
   return unless my $loop = $self->_loop;
 
   # Clean up active connections (by closing them)
@@ -168,15 +169,13 @@ sub _cleanup {
   # Clean up keep alive connections
   $loop->remove($_->[1]) for @{delete $self->{cache} || []};
 
-  # Stop or restart server
+  # Stop server
   delete $self->{server};
-  $self->_server if $restart;
 }
 
 sub _connect {
   my ($self, $proto, $host, $port, $handle, $cb) = @_;
 
-  # Open connection
   weaken $self;
   my $id;
   return $id = $self->_loop->client(
@@ -301,7 +300,6 @@ sub _finish {
   my $res = $tx->res;
   if (my $err = $res->error) { $res->error($err) }
 
-  # Common errors
   else {
 
     # Premature connection close
@@ -335,6 +333,7 @@ sub _handle {
 
   # Upgrade connection to WebSocket
   elsif ($old && (my $new = $self->_upgrade($id))) {
+    if (my $jar = $self->cookie_jar) { $jar->extract($old) }
     $old->client_close;
     $self->_finish($new, $c->{cb});
     $new->client_read($old->res->leftovers);
@@ -387,13 +386,12 @@ sub _remove {
 sub _redirect {
   my ($self, $c, $old) = @_;
 
-  # Try to build followup transaction
-  return undef unless my $new = $self->transactor->redirect($old);
-
   # Follow redirect unless the maximum has been reached already
+  return undef unless my $new = $self->transactor->redirect($old);
   my $redirects = delete $c->{redirects} || 0;
   return undef unless $redirects < $self->max_redirects;
   my $id = $self->_start($new, delete $c->{cb});
+
   return $self->{connections}{$id}{redirects} = $redirects + 1;
 }
 
@@ -444,7 +442,7 @@ sub _start {
   # We identify ourselves and accept gzip compression
   my $headers = $req->headers;
   $headers->user_agent($self->name) unless $headers->user_agent;
-  $headers->accept_encoding('gzip') unless $headers->accept_encoding && $Compress::Raw::Zlib::VERSION;
+  $headers->accept_encoding('gzip') if (! $headers->accept_encoding && $Compress::Raw::Zlib::VERSION);
   if (my $jar = $self->cookie_jar) { $jar->inject($tx) }
 
   # Connect and add request timeout if necessary
@@ -461,18 +459,18 @@ sub _start {
 sub _upgrade {
   my ($self, $id) = @_;
 
-  # Try to upgrade transaction
   my $c = $self->{connections}{$id};
   return undef unless my $new = $self->transactor->upgrade($c->{tx});
   weaken $self;
   $new->on(resume => sub { $self->_write($id) });
+
   return $c->{tx} = $new;
 }
 
 sub _write {
   my ($self, $id) = @_;
 
-  # Get chunk
+  # Get and write chunk
   return unless my $c  = $self->{connections}{$id};
   return unless my $tx = $c->{tx};
   return unless $tx->is_writing;
@@ -480,8 +478,6 @@ sub _write {
   my $chunk = $tx->client_write;
   delete $c->{writing};
   warn "-- Client >>> Server (@{[$tx->req->url->to_abs]})\n$chunk\n" if DEBUG;
-
-  # Write chunk
   my $stream = $self->_loop->stream($id)->write($chunk);
   $self->_handle($id) if $tx->is_finished;
 
@@ -596,9 +592,10 @@ See L<Mojolicious::Guides::Cookbook> for more.
 
 =head1 EVENTS
 
-L<Mojo::UserAgent> can emit the following events.
+L<Mojo::UserAgent> inherits all events from L<Mojo::EventEmitter> and can emit
+the following new ones.
 
-=head2 C<error>
+=head2 error
 
   $ua->on(error => sub {
     my ($ua, $err) = @_;
@@ -612,7 +609,7 @@ Emitted if an error occurs that can't be associated with a transaction.
     say "This looks bad: $err";
   });
 
-=head2 C<start>
+=head2 start
 
   $ua->on(start => sub {
     my ($ua, $tx) = @_;
@@ -631,7 +628,7 @@ automatically prepared proxy C<CONNECT> requests and followed redirects.
 
 L<Mojo::UserAgent> implements the following attributes.
 
-=head2 C<ca>
+=head2 ca
 
   my $ca = $ua->ca;
   $ua    = $ua->ca('/etc/tls/ca.crt');
@@ -643,7 +640,7 @@ C<MOJO_CA_FILE> environment variable. Also activates hostname verification.
   IO::Socket::SSL::set_defaults(
     SSL_verify_callback => sub { say "Authority: $_[2]" and return $_[0] });
 
-=head2 C<cert>
+=head2 cert
 
   my $cert = $ua->cert;
   $ua      = $ua->cert('/etc/tls/client.crt');
@@ -651,7 +648,7 @@ C<MOJO_CA_FILE> environment variable. Also activates hostname verification.
 Path to TLS certificate file, defaults to the value of the C<MOJO_CERT_FILE>
 environment variable.
 
-=head2 C<connect_timeout>
+=head2 connect_timeout
 
   my $timeout = $ua->connect_timeout;
   $ua         = $ua->connect_timeout(5);
@@ -660,7 +657,7 @@ Maximum amount of time in seconds establishing a connection may take before
 getting canceled, defaults to the value of the C<MOJO_CONNECT_TIMEOUT>
 environment variable or C<10>.
 
-=head2 C<cookie_jar>
+=head2 cookie_jar
 
   my $cookie_jar = $ua->cookie_jar;
   $ua            = $ua->cookie_jar(Mojo::UserAgent::CookieJar->new);
@@ -671,21 +668,21 @@ L<Mojo::UserAgent::CookieJar> object.
   # Disable cookie jar
   $ua->cookie_jar(0);
 
-=head2 C<http_proxy>
+=head2 http_proxy
 
   my $proxy = $ua->http_proxy;
   $ua       = $ua->http_proxy('http://sri:secret@127.0.0.1:8080');
 
 Proxy server to use for HTTP and WebSocket requests.
 
-=head2 C<https_proxy>
+=head2 https_proxy
 
   my $proxy = $ua->https_proxy;
   $ua       = $ua->https_proxy('http://sri:secret@127.0.0.1:8080');
 
 Proxy server to use for HTTPS and WebSocket requests.
 
-=head2 C<inactivity_timeout>
+=head2 inactivity_timeout
 
   my $timeout = $ua->inactivity_timeout;
   $ua         = $ua->inactivity_timeout(15);
@@ -695,7 +692,7 @@ closed, defaults to the value of the C<MOJO_INACTIVITY_TIMEOUT> environment
 variable or C<20>. Setting the value to C<0> will allow connections to be
 inactive indefinitely.
 
-=head2 C<ioloop>
+=head2 ioloop
 
   my $loop = $ua->ioloop;
   $ua      = $ua->ioloop(Mojo::IOLoop->new);
@@ -703,7 +700,7 @@ inactive indefinitely.
 Event loop object to use for blocking I/O operations, defaults to a
 L<Mojo::IOLoop> object.
 
-=head2 C<key>
+=head2 key
 
   my $key = $ua->key;
   $ua     = $ua->key('/etc/tls/client.crt');
@@ -711,14 +708,14 @@ L<Mojo::IOLoop> object.
 Path to TLS key file, defaults to the value of the C<MOJO_KEY_FILE>
 environment variable.
 
-=head2 C<local_address>
+=head2 local_address
 
   my $address = $ua->local_address;
   $ua         = $ua->local_address('127.0.0.1');
 
 Local address to bind to.
 
-=head2 C<max_connections>
+=head2 max_connections
 
   my $max = $ua->max_connections;
   $ua     = $ua->max_connections(5);
@@ -726,7 +723,7 @@ Local address to bind to.
 Maximum number of keep alive connections that the user agent will retain
 before it starts closing the oldest cached ones, defaults to C<5>.
 
-=head2 C<max_redirects>
+=head2 max_redirects
 
   my $max = $ua->max_redirects;
   $ua     = $ua->max_redirects(3);
@@ -735,21 +732,21 @@ Maximum number of redirects the user agent will follow before it fails,
 defaults to the value of the C<MOJO_MAX_REDIRECTS> environment variable or
 C<0>.
 
-=head2 C<name>
+=head2 name
 
   my $name = $ua->name;
   $ua      = $ua->name('Mojolicious');
 
 Value for C<User-Agent> request header, defaults to C<Mojolicious (Perl)>.
 
-=head2 C<no_proxy>
+=head2 no_proxy
 
   my $no_proxy = $ua->no_proxy;
   $ua          = $ua->no_proxy([qw(localhost intranet.mojolicio.us)]);
 
 Domains that don't require a proxy server to be used.
 
-=head2 C<request_timeout>
+=head2 request_timeout
 
   my $timeout = $ua->request_timeout;
   $ua         = $ua->request_timeout(5);
@@ -763,7 +760,7 @@ indefinitely. The timeout will reset for every followed redirect.
   # Total limit of 5 seconds, of which 3 seconds may be spent connecting
   $ua->max_redirects(0)->connect_timeout(3)->request_timeout(5);
 
-=head2 C<transactor>
+=head2 transactor
 
   my $t = $ua->transactor;
   $ua   = $ua->transactor(Mojo::UserAgent::Transactor->new);
@@ -775,7 +772,7 @@ Transaction builder, defaults to a L<Mojo::UserAgent::Transactor> object.
 L<Mojo::UserAgent> inherits all methods from L<Mojo::EventEmitter> and
 implements the following new ones.
 
-=head2 C<app>
+=head2 app
 
   my $app = Mojo::UserAgent->app;
             Mojo::UserAgent->app(MyApp->new);
@@ -794,7 +791,7 @@ applications override the global default.
   # Change application behavior
   $ua->app->defaults(testing => 'oh yea!');
 
-=head2 C<app_url>
+=head2 app_url
 
   my $url = $ua->app_url;
   my $url = $ua->app_url('http');
@@ -805,7 +802,7 @@ Get absolute L<Mojo::URL> object for C<app> and switch protocol if necessary.
   # Port currently used for processing relative URLs
   say $ua->app_url->port;
 
-=head2 C<build_form_tx>
+=head2 build_form_tx
 
   my $tx = $ua->build_form_tx('http://kraih.com' => {a => 'b'});
   my $tx = $ua->build_form_tx('kraih.com', 'UTF-8', {a => 'b'}, {DNT => 1});
@@ -813,7 +810,7 @@ Get absolute L<Mojo::URL> object for C<app> and switch protocol if necessary.
 Generate L<Mojo::Transaction::HTTP> object with
 L<Mojo::UserAgent::Transactor/"form">.
 
-=head2 C<build_json_tx>
+=head2 build_json_tx
 
   my $tx = $ua->build_json_tx('http://kraih.com' => {a => 'b'});
   my $tx = $ua->build_json_tx('kraih.com' => {a => 'b'} => {DNT => 1});
@@ -821,7 +818,7 @@ L<Mojo::UserAgent::Transactor/"form">.
 Generate L<Mojo::Transaction::HTTP> object with
 L<Mojo::UserAgent::Transactor/"json">.
 
-=head2 C<build_tx>
+=head2 build_tx
 
   my $tx = $ua->build_tx(GET => 'kraih.com');
   my $tx = $ua->build_tx(PUT => 'http://kraih.com' => {DNT => 1} => 'Hi!');
@@ -834,7 +831,7 @@ L<Mojo::UserAgent::Transactor/"tx">.
   $tx->req->cookies({name => 'foo', value => 'bar'});
   $ua->start($tx);
 
-=head2 C<build_websocket_tx>
+=head2 build_websocket_tx
 
   my $tx = $ua->build_websocket_tx('ws://localhost:3000');
   my $tx = $ua->build_websocket_tx('ws://localhost:3000' => {DNT => 1});
@@ -842,7 +839,7 @@ L<Mojo::UserAgent::Transactor/"tx">.
 Generate L<Mojo::Transaction::HTTP> object with
 L<Mojo::UserAgent::Transactor/"websocket">.
 
-=head2 C<delete>
+=head2 delete
 
   my $tx = $ua->delete('kraih.com');
   my $tx = $ua->delete('http://kraih.com' => {DNT => 1} => 'Hi!');
@@ -858,7 +855,7 @@ append a callback to perform requests non-blocking.
   });
   Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
 
-=head2 C<detect_proxy>
+=head2 detect_proxy
 
   $ua = $ua->detect_proxy;
 
@@ -866,7 +863,7 @@ Check environment variables C<HTTP_PROXY>, C<http_proxy>, C<HTTPS_PROXY>,
 C<https_proxy>, C<NO_PROXY> and C<no_proxy> for proxy information. Automatic
 proxy detection can be enabled with the C<MOJO_PROXY> environment variable.
 
-=head2 C<get>
+=head2 get
 
   my $tx = $ua->get('kraih.com');
   my $tx = $ua->get('http://kraih.com' => {DNT => 1} => 'Hi!');
@@ -882,7 +879,7 @@ append a callback to perform requests non-blocking.
   });
   Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
 
-=head2 C<head>
+=head2 head
 
   my $tx = $ua->head('kraih.com');
   my $tx = $ua->head('http://kraih.com' => {DNT => 1} => 'Hi!');
@@ -898,13 +895,13 @@ append a callback to perform requests non-blocking.
   });
   Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
 
-=head2 C<need_proxy>
+=head2 need_proxy
 
   my $success = $ua->need_proxy('intranet.mojolicio.us');
 
 Check if request for domain would use a proxy server.
 
-=head2 C<options>
+=head2 options
 
   my $tx = $ua->options('kraih.com');
   my $tx = $ua->options('http://kraih.com' => {DNT => 1} => 'Hi!');
@@ -920,7 +917,7 @@ append a callback to perform requests non-blocking.
   });
   Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
 
-=head2 C<patch>
+=head2 patch
 
   my $tx = $ua->patch('kraih.com');
   my $tx = $ua->patch('http://kraih.com' => {DNT => 1} => 'Hi!');
@@ -936,7 +933,7 @@ append a callback to perform requests non-blocking.
   });
   Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
 
-=head2 C<post>
+=head2 post
 
   my $tx = $ua->post('kraih.com');
   my $tx = $ua->post('http://kraih.com' => {DNT => 1} => 'Hi!');
@@ -952,7 +949,7 @@ append a callback to perform requests non-blocking.
   });
   Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
 
-=head2 C<post_form>
+=head2 post_form
 
   my $tx = $ua->post_form('http://kraih.com' => {a => 'b'});
   my $tx = $ua->post_form('kraih.com', 'UTF-8', {a => 'b'}, {DNT => 1});
@@ -968,7 +965,7 @@ perform requests non-blocking.
   });
   Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
 
-=head2 C<post_json>
+=head2 post_json
 
   my $tx = $ua->post_json('http://kraih.com' => {a => 'b'});
   my $tx = $ua->post_json('kraih.com' => {a => 'b'} => {DNT => 1});
@@ -984,7 +981,7 @@ perform requests non-blocking.
   });
   Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
 
-=head2 C<put>
+=head2 put
 
   my $tx = $ua->put('kraih.com');
   my $tx = $ua->put('http://kraih.com' => {DNT => 1} => 'Hi!');
@@ -1000,7 +997,7 @@ append a callback to perform requests non-blocking.
   });
   Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
 
-=head2 C<start>
+=head2 start
 
   my $tx = $ua->start(Mojo::Transaction::HTTP->new);
 
@@ -1014,7 +1011,7 @@ non-blocking.
   });
   Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
 
-=head2 C<websocket>
+=head2 websocket
 
   $ua->websocket('ws://localhost:3000' => sub {...});
   $ua->websocket('ws://localhost:3000' => {DNT => 1} => sub {...});

+27 -15

mojolegacy/lib/Mojo/UserAgent/CookieJar.pm

View

@@ -2,13 +2,13 @@ package Mojo::UserAgent::CookieJar;
 use Mojo::Base -base;
 
 use Mojo::Cookie::Request;
+use Mojo::Path;
 
 has max_cookie_size => 4096;
 
 sub add {
   my ($self, @cookies) = @_;
 
-  # Add cookies
   my $size = $self->max_cookie_size;
   for my $cookie (@cookies) {
 
@@ -41,18 +41,28 @@ sub extract {
   my ($self, $tx) = @_;
   my $url = $tx->req->url;
   for my $cookie (@{$tx->res->cookies}) {
-    $cookie->domain($url->host) unless $cookie->domain;
-    $cookie->path($url->path)   unless $cookie->path;
-    $self->add($cookie);
+
+    # Validate domain
+    my $host = lc $url->ihost;
+    my $domain = lc(defined $cookie->domain ? $cookie->domain : $host);
+    $domain =~ s/^\.//;
+    next unless $host eq $domain || $host =~ /\Q.$domain\E$/;
+    next if $host =~ /\.\d+$/;
+    $cookie->domain($domain);
+
+    # Validate path
+    my $path = defined $cookie->path ? $cookie->path : $url->path->to_dir->to_abs_string;
+    $path = Mojo::Path->new($path)->trailing_slash(0)->to_abs_string;
+    next unless _path($path, $url->path->to_abs_string);
+    $self->add($cookie->path($path));
   }
 }
 
 sub find {
   my ($self, $url) = @_;
 
-  # Look through the jar
-  return unless my $domain = $url->host;
-  my $path = $url->path->to_string || '/';
+  return unless my $domain = lc(defined $url->ihost ? $url->ihost : '');
+  my $path = $url->path->to_abs_string;
   my @found;
   while ($domain =~ /[^.]+\.[^.]+|localhost$/) {
     next unless my $old = $self->{jar}{$domain};
@@ -68,7 +78,7 @@ sub find {
 
       # Taste cookie
       next if $cookie->secure && $url->protocol ne 'https';
-      next unless $path =~ /^\Q@{[$cookie->path]}/;
+      next unless _path($cookie->path, $path);
       my $name  = $cookie->name;
       my $value = $cookie->value;
       push @found, Mojo::Cookie::Request->new(name => $name, value => $value);
@@ -88,6 +98,8 @@ sub inject {
   $req->cookies($self->find($req->url));
 }
 
+sub _path { $_[0] eq '/' || $_[0] eq $_[1] || $_[1] =~ m!^\Q$_[0]/! }
+
 1;
 
 =head1 NAME
@@ -124,7 +136,7 @@ L<Mojo::UserAgent>.
 
 L<Mojo::UserAgent::CookieJar> implements the following attributes.
 
-=head2 C<max_cookie_size>
+=head2 max_cookie_size
 
   my $size = $jar->max_cookie_size;
   $jar     = $jar->max_cookie_size(4096);
@@ -136,38 +148,38 @@ Maximum cookie size in bytes, defaults to C<4096>.
 L<Mojo::UserAgent::CookieJar> inherits all methods from L<Mojo::Base> and
 implements the following new ones.
 
-=head2 C<add>
+=head2 add
 
   $jar = $jar->add(@cookies);
 
 Add multiple L<Mojo::Cookie::Response> objects to the jar.
 
-=head2 C<all>
+=head2 all
 
   my @cookies = $jar->all;
 
 Return all L<Mojo::Cookie::Response> objects that are currently stored in the
 jar.
 
-=head2 C<empty>
+=head2 empty
 
   $jar->empty;
 
 Empty the jar.
 
-=head2 C<extract>
+=head2 extract
 
   $jar->extract($tx);
 
 Extract response cookies from transaction.
 
-=head2 C<find>
+=head2 find
 
   my @cookies = $jar->find($url);
 
 Find L<Mojo::Cookie::Request> objects in the jar for L<Mojo::URL> object.
 
-=head2 C<inject>
+=head2 inject
 
   $jar->inject($tx);
 

+60 -76

mojolegacy/lib/Mojo/UserAgent/Transactor.pm

View

@@ -1,7 +1,7 @@
 package Mojo::UserAgent::Transactor;
 use Mojo::Base -base;
 
-use File::Spec::Functions 'splitpath';
+use File::Basename 'basename';
 use Mojo::Asset::File;
 use Mojo::Asset::Memory;
 use Mojo::Content::MultiPart;
@@ -31,57 +31,25 @@ sub endpoint {
 }
 
 sub form {
-  my ($self, $url) = (shift, shift);
-
-  # Form
-  my $encoding = shift;
+  my ($self, $url, $encoding) = (shift, shift, shift);
   my $form = ref $encoding ? $encoding : shift;
   $encoding = undef if ref $encoding;
 
-  # Parameters
-  my $params = Mojo::Parameters->new;
-  $params->charset($encoding) if defined $encoding;
-  my $multipart;
-  for my $name (sort keys %$form) {
-    my $value = $form->{$name};
-
-    # Array
-    if (ref $value eq 'ARRAY') { $params->append($name, $_) for @$value }
-
-    # Hash
-    elsif (ref $value eq 'HASH') {
-
-      # Enforce "multipart/form-data"
-      $multipart++;
-
-      # File
-      if (my $file = $value->{file}) {
-        $value->{file} = Mojo::Asset::File->new(path => $file) if !ref $file;
-        $value->{filename} ||= (splitpath($value->{file}->path))[2]
-          if $value->{file}->isa('Mojo::Asset::File');
-      }
-
-      # Memory
-      elsif (defined(my $content = delete $value->{content})) {
-        $value->{file} = Mojo::Asset::Memory->new->add_chunk($content);
-      }
-
-      push @{$params->params}, $name, $value;
-    }
-
-    # Single value
-    else { $params->append($name, $value) }
-  }
-
-  # New transaction
+  # Start with normal POST transaction
   my $tx = $self->tx(POST => $url, @_);
 
-  # Multipart
+  # Check for uploads and force multipart if necessary
+  my $multipart;
+  for my $value (map { ref $_ eq 'ARRAY' ? @$_ : $_ } values %$form) {
+    ++$multipart and last if ref $value eq 'HASH';
+  }
   my $req     = $tx->req;
   my $headers = $req->headers;
   $headers->content_type('multipart/form-data') if $multipart;
+
+  # Multipart
   if ((defined $headers->content_type ? $headers->content_type : '') eq 'multipart/form-data') {
-    my $parts = $self->_multipart($encoding, $params->to_hash);
+    my $parts = $self->_multipart($encoding, $form);
     $req->content(
       Mojo::Content::MultiPart->new(headers => $headers, parts => $parts));
   }
@@ -89,7 +57,9 @@ sub form {
   # Urlencoded
   else {
     $headers->content_type('application/x-www-form-urlencoded');
-    $req->body($params->to_string);
+    my $p = Mojo::Parameters->new(map { $_ => $form->{$_} } sort keys %$form);
+    $p->charset($encoding) if defined $encoding;
+    $req->body($p->to_string);
   }
 
   return $tx;
@@ -203,36 +173,48 @@ sub websocket {
 sub _multipart {
   my ($self, $encoding, $form) = @_;
 
-  # Parts
   my @parts;
   for my $name (sort keys %$form) {
     my $values = $form->{$name};
-    my $part   = Mojo::Content::Single->new;
-
-    # File
-    my $filename;
-    my $headers = $part->headers;
-    if (ref $values eq 'HASH') {
-      $filename = delete $values->{filename} || $name;
-      $filename = encode $encoding, $filename if $encoding;
-      push @parts, $part->asset(delete $values->{file});
-      $headers->from_hash($values);
-    }
+    for my $value (ref $values eq 'ARRAY' ? @$values : ($values)) {
+      push @parts, my $part = Mojo::Content::Single->new;
+
+      # Upload
+      my $filename;
+      my $headers = $part->headers;
+      if (ref $value eq 'HASH') {
+
+        # File
+        if (my $file = delete $value->{file}) {
+          $file = Mojo::Asset::File->new(path => $file) unless ref $file;
+          $part->asset($file);
+          $value->{filename} ||= basename $file->path
+            if $file->isa('Mojo::Asset::File');
+        }
+
+        # Memory
+        elsif (defined(my $content = delete $value->{content})) {
+          $part->asset(Mojo::Asset::Memory->new->add_chunk($content));
+        }
+
+        # Filename and headers
+        $filename = delete $value->{filename} || $name;
+        $filename = encode $encoding, $filename if $encoding;
+        $headers->from_hash($value);
+      }
 
-    # Fields
-    else {
-      for my $value (ref $values ? @$values : ($values)) {
-        push @parts, $part = Mojo::Content::Single->new(headers => $headers);
+      # Field
+      else {
         $value = encode $encoding, $value if $encoding;
-        $part->asset->add_chunk($value);
+        $part->asset(Mojo::Asset::Memory->new->add_chunk($value));
       }
-    }
 
-    # Content-Disposition
-    $name = encode $encoding, $name if $encoding;
-    my $disposition = qq{form-data; name="$name"};
-    $disposition .= qq{; filename="$filename"} if $filename;
-    $headers->content_disposition($disposition);
+      # Content-Disposition
+      $name = encode $encoding, $name if $encoding;
+      my $disposition = qq{form-data; name="$name"};
+      $disposition .= qq{; filename="$filename"} if $filename;
+      $headers->content_disposition($disposition);
+    }
   }
 
   return \@parts;
@@ -284,19 +266,21 @@ framework used by L<Mojo::UserAgent>.
 L<Mojo::UserAgent::Transactor> inherits all methods from L<Mojo::Base> and
 implements the following new ones.
 
-=head2 C<endpoint>
+=head2 endpoint
 
   my ($proto, $host, $port) = $t->endpoint(Mojo::Transaction::HTTP->new);
 
 Actual endpoint for transaction.
 
-=head2 C<form>
+=head2 form
 
   my $tx = $t->form('kraih.com' => {a => 'b'});
   my $tx = $t->form('http://kraih.com' => {a => 'b'});
   my $tx = $t->form('http://kraih.com' => {a => [qw(b c d)]});
   my $tx = $t->form('http://kraih.com' => {mytext => {file => '/foo.txt'}});
   my $tx = $t->form('http://kraih.com' => {mytext => {content => 'lalala'}});
+  my $tx = $t->form('http://kraih.com' =>
+    {mytexts => [{content => 'first'}, {content => 'second'}]});
   my $tx = $t->form('http://kraih.com' => {
     myzip => {
       file     => Mojo::Asset::Memory->new->add_chunk('lalala'),
@@ -329,7 +313,7 @@ enforce it by setting the header manually.
     {'Content-Type' => 'multipart/form-data'}
   );
 
-=head2 C<json>
+=head2 json
 
   my $tx = $t->json('kraih.com' => {a => 'b'});
   my $tx = $t->json('http://kraih.com' => [1, 2, 3]);
@@ -343,27 +327,27 @@ with JSON data.
   my $tx = $t->json('mojolicio.us/hello', {hello => 'world'});
   $tx->req->method('PATCH');
 
-=head2 C<peer>
+=head2 peer
 
   my ($proto, $host, $port) = $t->peer(Mojo::Transaction::HTTP->new);
 
 Actual peer for transaction.
 
-=head2 C<proxy_connect>
+=head2 proxy_connect
 
   my $tx = $t->proxy_connect(Mojo::Transaction::HTTP->new);
 
 Build L<Mojo::Transaction::HTTP> proxy connect request for transaction if
 possible.
 
-=head2 C<redirect>
+=head2 redirect
 
   my $tx = $t->redirect(Mojo::Transaction::HTTP->new);
 
 Build L<Mojo::Transaction::HTTP> followup request for C<301>, C<302>, C<303>,
 C<307> or C<308> redirect response if possible.
 
-=head2 C<tx>
+=head2 tx
 
   my $tx = $t->tx(GET  => 'kraih.com');
   my $tx = $t->tx(POST => 'http://kraih.com');
@@ -385,14 +369,14 @@ requests.
   my $tx = $t->tx(GET => 'http://mojolicio.us');
   $tx->connection($sock);
 
-=head2 C<upgrade>
+=head2 upgrade
 
   my $tx = $t->upgrade(Mojo::Transaction::HTTP->new);
 
 Build L<Mojo::Transaction::WebSocket> followup transaction for WebSocket
 handshake if possible.
 
-=head2 C<websocket>
+=head2 websocket
 
   my $tx = $t->websocket('ws://localhost:3000');
   my $tx = $t->websocket('ws://localhost:3000' => {DNT => 1});

+71 -80

mojolegacy/lib/Mojo/Util.pm

View

@@ -20,18 +20,18 @@ use constant {
   PC_INITIAL_N    => 128
 };
 
-# Punycode delimiter
-my $DELIMITER = chr 0x2D;
-
 # To update HTML5 entities run this command
 # perl examples/entities.pl > lib/Mojo/entities.txt
 my %ENTITIES;
 {
   open my $entities, '<', catfile(dirname(__FILE__), 'entities.txt');
-  /^(\S+)\s+U\+(\S+)/ and $ENTITIES{$1} = chr hex($2) for <$entities>;
+  for my $entity (<$entities>) {
+    next unless $entity =~ /^(\S+)\s+U\+(\S+)(?:\s+U\+(\S+))?/;
+    $ENTITIES{$1} = defined $3 ? (chr(hex $2) . chr(hex $3)) : chr(hex $2);
+  }
 }
 
-# Reverse entities for html_escape (without "apos")
+# DEPRECATED in Rainbow!
 my %REVERSE = ("\x{0027}" => '#39;');
 $REVERSE{$ENTITIES{$_}} = defined $REVERSE{$ENTITIES{$_}} ? $REVERSE{$ENTITIES{$_}} : $_
   for sort  { @{[$a =~ /[A-Z]/g]} <=> @{[$b =~ /[A-Z]/g]} }
@@ -42,12 +42,15 @@ my %CACHE;
 
 our @EXPORT_OK = (
   qw(b64_decode b64_encode camelize class_to_file class_to_path decamelize),
-  qw(decode encode get_line hmac_md5_sum hmac_sha1_sum html_escape),
-  qw(html_unescape md5_bytes md5_sum monkey_patch punycode_decode),
-  qw(punycode_encode quote secure_compare sha1_bytes sha1_sum slurp spurt),
-  qw(squish trim unquote url_escape url_unescape xml_escape xor_encode)
+  qw(decode encode get_line hmac_md5_sum hmac_sha1_sum html_unescape),
+  qw(md5_bytes md5_sum monkey_patch punycode_decode punycode_encode quote),
+  qw(secure_compare sha1_bytes sha1_sum slurp spurt squish trim unquote),
+  qw(url_escape url_unescape xml_escape xor_encode)
 );
 
+# DEPRECATED in Rainbow!
+push @EXPORT_OK, 'html_escape';
+
 sub b64_decode { decode_base64($_[0]) }
 
 sub b64_encode { encode_base64($_[0], $_[1]) }
@@ -112,7 +115,11 @@ sub get_line {
 sub hmac_md5_sum  { _hmac(\&md5,  @_) }
 sub hmac_sha1_sum { _hmac(\&sha1, @_) }
 
+# DEPRECATED in Rainbow!
 sub html_escape {
+  warn <<EOF;
+Mojo::Util->html_escape is DEPRECATED in favor of Mojo::Util->xml_escape!!!
+EOF
   my ($string, $pattern) = @_;
   $pattern ||= '^\n\r\t !#$%(-;=?-~';
   return $string unless $string =~ /[^$pattern]/;
@@ -131,26 +138,24 @@ sub md5_bytes { md5(@_) }
 sub md5_sum   { md5_hex(@_) }
 
 sub monkey_patch {
-  my ($class, $name, $cb) = @_;
+  my ($class, %patch) = @_;
   no strict 'refs';
   no warnings 'redefine';
-  *{"${class}::$name"} = $cb;
+  *{"${class}::$_"} = $patch{$_} for keys %patch;
 }
 
+# Direct translation of RFC 3492
 sub punycode_decode {
   my $input = shift;
   use integer;
 
-  # Defaults
+  # Delimiter
+  my @output;
+  push @output, split //, $1 if $input =~ s/(.*)\x2d//s;
+
   my $n    = PC_INITIAL_N;
   my $i    = 0;
   my $bias = PC_INITIAL_BIAS;
-  my @output;
-
-  # Delimiter
-  if ($input =~ s/(.*)$DELIMITER//s) { push @output, split //, $1 }
-
-  # Decode (direct translation of RFC 3492)
   while (length $input) {
     my $oldi = $i;
     my $w    = 1;
@@ -174,47 +179,37 @@ sub punycode_decode {
     $n += $i / (@output + 1);
     $i = $i % (@output + 1);
 
-    # Insert
-    splice @output, $i, 0, chr($n);
-    $i++;
+    splice @output, $i++, 0, chr $n;
   }
 
   return join '', @output;
 }
 
+# Direct translation of RFC 3492
 sub punycode_encode {
-  use integer;
-
-  # Defaults
   my $output = shift;
-  my $len    = length $output;
+  use integer;
 
   # Split input
-  my @input = map ord, split //, $output;
+  my $len   = length $output;
+  my @input = map {ord} split //, $output;
   my @chars = sort grep { $_ >= PC_INITIAL_N } @input;
 
-  # Remove non basic characters
+  # Handle non basic characters
   $output =~ s/[^\x00-\x7f]+//gs;
-
-  # Non basic characters in input
   my $h = my $b = length $output;
-  $output .= $DELIMITER if $b > 0;
+  $output .= "\x2d" if $b > 0;
 
-  # Defaults
   my $n     = PC_INITIAL_N;
   my $delta = 0;
   my $bias  = PC_INITIAL_BIAS;
-
-  # Encode (direct translation of RFC 3492)
   for my $m (@chars) {
 
     # Basic character
     next if $m < $n;
 
-    # Delta
-    $delta += ($m - $n) * ($h + 1);
-
     # Walk all code points in order
+    $delta += ($m - $n) * ($h + 1);
     $n = $m;
     for (my $i = 0; $i < $len; $i++) {
       my $c = $input[$i];
@@ -376,6 +371,7 @@ sub _decode {
   return "&$_[1]";
 }
 
+# DEPRECATED in Rainbow!
 sub _encode {
   return exists $REVERSE{$_[0]} ? "&$REVERSE{$_[0]}" : "&#@{[ord($_[0])]};";
 }
@@ -420,20 +416,20 @@ L<Mojo::Util> provides portable utility functions for L<Mojo>.
 
 L<Mojo::Util> implements the following functions.
 
-=head2 C<b64_decode>
+=head2 b64_decode
 
   my $string = b64_decode $b64;
 
 Base64 decode string.
 
-=head2 C<b64_encode>
+=head2 b64_encode
 
   my $b64 = b64_encode $string;
   my $b64 = b64_encode $string, "\n";
 
 Base64 encode string, the line ending defaults to a newline.
 
-=head2 C<camelize>
+=head2 camelize
 
   my $camelcase = camelize $snakecase;
 
@@ -448,7 +444,7 @@ Convert snake case string to camel case and replace C<-> with C<::>.
   # "FooBar::Baz"
   camelize 'FooBar::Baz';
 
-=head2 C<class_to_file>
+=head2 class_to_file
 
   my $file = class_to_file 'Foo::Bar';
 
@@ -459,7 +455,7 @@ Convert a class name to a file.
   FooBar   -> foo_bar
   FOOBar   -> foobar
 
-=head2 C<class_to_path>
+=head2 class_to_path
 
   my $path = class_to_path 'Foo::Bar';
 
@@ -468,7 +464,7 @@ Convert class name to path.
   Foo::Bar -> Foo/Bar.pm
   FooBar   -> FooBar.pm
 
-=head2 C<decamelize>
+=head2 decamelize
 
   my $snakecase = decamelize $camelcase;
 
@@ -483,139 +479,135 @@ Convert camel case string to snake case and replace C<::> with C<->.
   # "foo_bar-baz"
   decamelize 'foo_bar-baz';
 
-=head2 C<decode>
+=head2 decode
 
   my $chars = decode 'UTF-8', $bytes;
 
 Decode bytes to characters and return C<undef> if decoding failed.
 
-=head2 C<encode>
+=head2 encode
 
   my $bytes = encode 'UTF-8', $chars;
 
 Encode characters to bytes.
 
-=head2 C<get_line>
+=head2 get_line
 
   my $line = get_line \$string;
 
 Extract whole line from string or return C<undef>. Lines are expected to end
 with C<0x0d 0x0a> or C<0x0a>.
 
-=head2 C<hmac_md5_sum>
+=head2 hmac_md5_sum
 
   my $checksum = hmac_md5_sum $string, 'passw0rd';
 
 Generate HMAC-MD5 checksum for string.
 
-=head2 C<hmac_sha1_sum>
+=head2 hmac_sha1_sum
 
   my $checksum = hmac_sha1_sum $string, 'passw0rd';
 
 Generate HMAC-SHA1 checksum for string.
 
-=head2 C<html_escape>
-
-  my $escaped = html_escape $string;
-  my $escaped = html_escape $string, '^\n\r\t !#$%(-;=?-~';
-
-Escape unsafe characters in string with HTML entities, the pattern used
-defaults to C<^\n\r\t !#$%(-;=?-~>.
-
-=head2 C<html_unescape>
+=head2 html_unescape
 
   my $string = html_unescape $escaped;
 
 Unescape all HTML entities in string.
 
-=head2 C<md5_bytes>
+=head2 md5_bytes
 
   my $checksum = md5_bytes $string;
 
 Generate binary MD5 checksum for string.
 
-=head2 C<md5_sum>
+=head2 md5_sum
 
   my $checksum = md5_sum $string;
 
 Generate MD5 checksum for string.
 
-=head2 C<monkey_patch>
+=head2 monkey_patch
 
-  monkey_patch $package, $name, sub {...};
+  monkey_patch $package, foo => sub {...};
+  monkey_patch $package, foo => sub {...}, bar => sub {...};
 
-Monkey patch function into package.
+Monkey patch functions into package.
 
-  monkey_patch 'MyApp', 'hello', sub { say 'Hello!' };
+  monkey_patch 'MyApp',
+    one   => sub { say 'One!' },
+    two   => sub { say 'Two!' },
+    three => sub { say 'Three!' };
 
-=head2 C<punycode_decode>
+=head2 punycode_decode
 
   my $string = punycode_decode $punycode;
 
 Punycode decode string.
 
-=head2 C<punycode_encode>
+=head2 punycode_encode
 
   my $punycode = punycode_encode $string;
 
 Punycode encode string.
 
-=head2 C<quote>
+=head2 quote
 
   my $quoted = quote $string;
 
 Quote string.
 
-=head2 C<secure_compare>
+=head2 secure_compare
 
   my $success = secure_compare $string1, $string2;
 
 Constant time comparison algorithm to prevent timing attacks.
 
-=head2 C<sha1_bytes>
+=head2 sha1_bytes
 
   my $checksum = sha1_bytes $string;
 
 Generate binary SHA1 checksum for string.
 
-=head2 C<sha1_sum>
+=head2 sha1_sum
 
   my $checksum = sha1_sum $string;
 
 Generate SHA1 checksum for string.
 
-=head2 C<slurp>
+=head2 slurp
 
   my $content = slurp '/etc/passwd';
 
 Read all data at once from file.
 
-=head2 C<spurt>
+=head2 spurt
 
   $content = spurt $content, '/etc/passwd';
 
 Write all data at once to file.
 
-=head2 C<squish>
+=head2 squish
 
   my $squished = squish $string;
 
 Trim whitespace characters from both ends of string and then change all
 consecutive groups of whitespace into one space each.
 
-=head2 C<trim>
+=head2 trim
 
   my $trimmed = trim $string;
 
 Trim whitespace characters from both ends of string.
 
-=head2 C<unquote>
+=head2 unquote
 
   my $string = unquote $quoted;
 
 Unquote string.
 
-=head2 C<url_escape>
+=head2 url_escape
 
   my $escaped = url_escape $string;
   my $escaped = url_escape $string, '^A-Za-z0-9\-._~';
@@ -623,24 +615,23 @@ Unquote string.
 Percent encode unsafe characters in string, the pattern used defaults to
 C<^A-Za-z0-9\-._~>.
 
-=head2 C<url_unescape>
+=head2 url_unescape
 
   my $string = url_unescape $escaped;
 
 Decode percent encoded characters in string.
 
-=head2 C<xml_escape>
+=head2 xml_escape
 
   my $escaped = xml_escape $string;
 
-Escape only the characters C<&>, C<E<lt>>, C<E<gt>>, C<"> and C<'> in string,
-this is a much faster version of C<html_escape>.
+Escape unsafe characters C<&>, C<E<lt>>, C<E<gt>>, C<"> and C<'> in string.
 
-=head2 C<xor_encode>
+=head2 xor_encode
 
   my $encoded = xor_encode $string, $key;
 
-XOR encode string.
+XOR encode string with variable length key.
 
 =head1 SEE ALSO
 

+111 -142

mojolegacy/lib/Mojolicious.pm

View

@@ -4,6 +4,7 @@ use Mojo::Base 'Mojo';
 # "Fry: Shut up and take my money!"
 use Carp 'croak';
 use Mojo::Exception;
+use Mojo::Util 'decamelize';
 use Mojolicious::Commands;
 use Mojolicious::Controller;
 use Mojolicious::Plugins;
@@ -21,6 +22,7 @@ has commands => sub {
 };
 has controller_class => 'Mojolicious::Controller';
 has mode => sub { $ENV{MOJO_MODE} || 'development' };
+has moniker  => sub { decamelize ref shift };
 has plugins  => sub { Mojolicious::Plugins->new };
 has renderer => sub { Mojolicious::Renderer->new };
 has routes   => sub { Mojolicious::Routes->new };
@@ -38,7 +40,7 @@ has static   => sub { Mojolicious::Static->new };
 has types    => sub { Mojolicious::Types->new };
 
 our $CODENAME = 'Rainbow';
-our $VERSION  = '3.70';
+our $VERSION  = '3.84';
 
 sub AUTOLOAD {
   my $self = shift;
@@ -61,7 +63,6 @@ sub DESTROY { }
 sub new {
   my $self = shift->SUPER::new(@_);
 
-  # Paths
   my $home = $self->home;
   push @{$self->renderer->paths}, $home->rel_dir('templates');
   push @{$self->static->paths},   $home->rel_dir('public');
@@ -76,25 +77,22 @@ sub new {
   $r->hide(qw(rendered req res respond_to send session signed_cookie stash));
   $r->hide(qw(tx ua url_for write write_chunk));
 
-  # Prepare log
+  # Check if we have a log directory
   my $mode = $self->mode;
   $self->log->path($home->rel_file("log/$mode.log"))
     if -w $home->rel_file('log');
 
-  # Load default plugins
   $self->plugin($_) for qw(HeaderCondition DefaultHelpers TagHelpers);
   $self->plugin($_) for qw(EPLRenderer EPRenderer RequestTimer PoweredBy);
 
-  # Exception handling
+  # Exception handling should be first in chain
   $self->hook(around_dispatch => \&_exception);
 
   # Reduced log output outside of development mode
   $self->log->level('info') unless $mode eq 'development';
 
-  # Run mode
+  # Run mode before startup
   if (my $sub = $self->can("${mode}_mode")) { $self->$sub(@_) }
-
-  # Startup
   $self->startup(@_);
 
   return $self;
@@ -119,10 +117,18 @@ sub dispatch {
   my $plugins = $self->plugins->emit_hook(before_dispatch => $c);
 
   # Try to find a static file
-  $self->static->dispatch($c) unless $tx->res->code;
-  $plugins->emit_hook_reverse(after_static_dispatch => $c);
+  $self->static->dispatch($c) and $plugins->emit_hook(after_static => $c)
+    unless $tx->res->code;
+
+  # DEPRECATED in Rainbow!
+  if ($plugins->has_subscribers('after_static_dispatch')) {
+    warn <<EOF and $plugins->emit_hook_reverse(after_static_dispatch => $c);
+after_static_dispatch hook is DEPRECATED in favor of before_routes!!!
+EOF
+  }
 
   # Routes
+  $plugins->emit_hook(before_routes => $c);
   my $res = $tx->res;
   return if $res->code;
   if (my $code = ($tx->req->error)[1]) { $res->code($code) }
@@ -145,18 +151,19 @@ sub handler {
     = $self->controller_class->new(app => $self, stash => $stash, tx => $tx);
   weaken $c->{$_} for qw(app tx);
 
-  # Dispatcher
-  ++$self->{dispatch} and $self->hook(around_dispatch => \&_dispatch)
+  # Dispatcher has to be last in the chain
+  ++$self->{dispatch}
+    and $self->hook(around_dispatch => sub { $_[1]->app->dispatch($_[1]) })
     unless $self->{dispatch};
 
-  # Process
+  # Process with chain
   unless (eval { $self->plugins->emit_chain(around_dispatch => $c) }) {
     $self->log->fatal("Processing request failed: $@");
     $tx->res->code(500);
     $tx->resume;
   }
 
-  # Delayed
+  # Delayed response
   $self->log->debug('Nothing has been rendered, expecting delayed response.')
     unless $stash->{'mojo.rendered'} || $tx->is_writing;
 }
@@ -180,11 +187,6 @@ sub start { shift->commands->run(@_ ? @_ : @ARGV) }
 
 sub startup { }
 
-sub _dispatch {
-  my ($next, $c) = @_;
-  $c->app->dispatch($c);
-}
-
 sub _exception {
   my ($next, $c) = @_;
   local $SIG{__DIE__}
@@ -229,7 +231,7 @@ Take a look at our excellent documentation in L<Mojolicious::Guides>!
 L<Mojolicious> inherits all attributes from L<Mojo> and implements the
 following new ones.
 
-=head2 C<commands>
+=head2 commands
 
   my $commands = $app->commands;
   $app         = $app->commands(Mojolicious::Commands->new);
@@ -240,7 +242,7 @@ L<Mojolicious::Commands> object.
   # Add another namespace to load commands from
   push @{$app->commands->namespaces}, 'MyApp::Command';
 
-=head2 C<controller_class>
+=head2 controller_class
 
   my $class = $app->controller_class;
   $app      = $app->controller_class('Mojolicious::Controller');
@@ -248,7 +250,7 @@ L<Mojolicious::Commands> object.
 Class to be used for the default controller, defaults to
 L<Mojolicious::Controller>.
 
-=head2 C<mode>
+=head2 mode
 
   my $mode = $app->mode;
   $app     = $app->mode('production');
@@ -272,7 +274,16 @@ Right before calling C<startup> and mode specific methods, L<Mojolicious>
 will pick up the current mode, name the log file after it and raise the log
 level from C<debug> to C<info> if it has a value other than C<development>.
 
-=head2 C<plugins>
+=head2 moniker
+
+  my $moniker = $app->moniker;
+  $app        = $app->moniker('foo_bar');
+
+Moniker of this application, often used as default filename for configuration
+files and the like, defaults to decamelizing the application class with
+L<Mojo::Util/"decamelize">.
+
+=head2 plugins
 
   my $plugins = $app->plugins;
   $app        = $app->plugins(Mojolicious::Plugins->new);
@@ -283,7 +294,7 @@ C<plugin> method below if you want to load a plugin.
   # Add another namespace to load plugins from
   push @{$app->plugins->namespaces}, 'MyApp::Plugin';
 
-=head2 C<renderer>
+=head2 renderer
 
   my $renderer = $app->renderer;
   $app         = $app->renderer(Mojolicious::Renderer->new);
@@ -299,7 +310,7 @@ contain more information.
   # Add another class with templates in DATA section
   push @{$app->renderer->classes}, 'Mojolicious::Plugin::Fun';
 
-=head2 C<routes>
+=head2 routes
 
   my $routes = $app->routes;
   $app       = $app->routes(Mojolicious::Routes->new);
@@ -307,14 +318,15 @@ contain more information.
 The router, defaults to a L<Mojolicious::Routes> object. You use this in your
 startup method to define the url endpoints for your application.
 
-  sub startup {
-    my $self = shift;
+  # Add routes
+  my $r = $app->routes;
+  $r->get('/foo/bar')->to('test#foo', title => 'Hello Mojo!');
+  $r->post('/baz')->to('test#baz');
 
-    my $r = $self->routes;
-    $r->get('/:controller/:action')->to('test#welcome');
-  }
+  # Add another namespace to load controllers from
+  push @{$app->routes->namespaces}, 'MyApp::Controller';
 
-=head2 C<secret>
+=head2 secret
 
   my $secret = $app->secret;
   $app       = $app->secret('passw0rd');
@@ -324,7 +336,7 @@ application name which is not very secure, so you should change it!!! As long
 as you are using the insecure default there will be debug messages in the log
 file reminding you to change your passphrase.
 
-=head2 C<sessions>
+=head2 sessions
 
   my $sessions = $app->sessions;
   $app         = $app->sessions(Mojolicious::Sessions->new);
@@ -334,7 +346,7 @@ object. You can usually leave this alone, see
 L<Mojolicious::Controller/"session"> for more information about working with
 session data.
 
-=head2 C<static>
+=head2 static
 
   my $static = $app->static;
   $app       = $app->static(Mojolicious::Static->new);
@@ -348,7 +360,7 @@ L<Mojolicious::Static> object.
   # Add another class with static files in DATA section
   push @{$app->static->classes}, 'Mojolicious::Plugin::Fun';
 
-=head2 C<types>
+=head2 types
 
   my $types = $app->types;
   $app      = $app->types(Mojolicious::Types->new);
@@ -363,23 +375,23 @@ L<Mojolicious::Types> object.
 L<Mojolicious> inherits all methods from L<Mojo> and implements the following
 new ones.
 
-=head2 C<new>
+=head2 new
 
   my $app = Mojolicious->new;
 
 Construct a new L<Mojolicious> application, calling C<${mode}_mode> and
 C<startup> in the process. Will automatically detect your home directory and
 set up logging based on your current operating mode. Also sets up the
-renderer, static dispatcher and a default set of plugins.
+renderer, static file server and a default set of plugins.
 
-=head2 C<build_tx>
+=head2 build_tx
 
   my $tx = $app->build_tx;
 
 Transaction builder, defaults to building a L<Mojo::Transaction::HTTP>
 object.
 
-=head2 C<defaults>
+=head2 defaults
 
   my $defaults = $app->defaults;
   my $foo      = $app->defaults('foo');
@@ -394,7 +406,7 @@ request.
   my $foo = $app->defaults->{foo};
   delete $app->defaults->{foo};
 
-=head2 C<dispatch>
+=head2 dispatch
 
   $app->dispatch(Mojolicious::Controller->new);
 
@@ -402,14 +414,14 @@ The heart of every Mojolicious application, calls the C<static> and C<routes>
 dispatchers for every request and passes them a L<Mojolicious::Controller>
 object.
 
-=head2 C<handler>
+=head2 handler
 
   $app->handler(Mojo::Transaction::HTTP->new);
   $app->handler(Mojolicious::Controller->new);
 
 Sets up the default controller and calls process for every request.
 
-=head2 C<helper>
+=head2 helper
 
   $app->helper(foo => sub {...});
 
@@ -427,7 +439,7 @@ and the application object, as well as a function in C<ep> templates.
   % cache->{foo} = 'bar';
   %= cache->{foo}
 
-=head2 C<hook>
+=head2 hook
 
   $app->hook(after_dispatch => sub {...});
 
@@ -438,14 +450,14 @@ requests indiscriminately.
   $app->hook(before_dispatch => sub {
     my $c = shift;
     $c->render(text => 'Skipped dispatchers!')
-      if $c->req->url->path->contains('/do_not_dispatch');
+      if $c->req->url->path->to_route =~ /do_not_dispatch/;
   });
 
 These hooks are currently available and are emitted in the listed order:
 
 =over 2
 
-=item C<after_build_tx>
+=item after_build_tx
 
 Emitted right after the transaction is built and before the HTTP request gets
 parsed.
@@ -460,9 +472,9 @@ rather advanced features such as upload progress bars possible. Note that this
 hook will not work for embedded applications. (Passed the transaction and
 application object)
 
-=item C<before_dispatch>
+=item before_dispatch
 
-Emitted right before the static dispatcher and router start their work.
+Emitted right before the static file server and router start their work.
 
   $app->hook(before_dispatch => sub {
     my $c = shift;
@@ -472,25 +484,51 @@ Emitted right before the static dispatcher and router start their work.
 Very useful for rewriting incoming requests and other preprocessing tasks.
 (Passed the default controller object)
 
-=item C<after_static_dispatch>
+=item after_static
 
-Emitted in reverse order after the static dispatcher determined if a static
-file should be served and before the router starts its work.
+Emitted after the static file server decided to serve a static file.
 
-  $app->hook(after_static_dispatch => sub {
+  $app->hook(after_static => sub {
     my $c = shift;
     ...
   });
 
-Mostly used for custom dispatchers and post-processing static file responses.
-(Passed the default controller object)
+Mostly used for post-processing static file responses. (Passed the default
+controller object)
+
+=item before_routes
+
+Emitted after the static file server decided if a static file should be served
+and before the router starts its work.
+
+  $app->hook(before_routes => sub {
+    my $c = shift;
+    ...
+  });
+
+Mostly used for custom dispatchers and collecting metrics. (Passed the default
+controller object)
+
+=item after_render
 
-=item C<after_dispatch>
+Emitted after content has been generated by the renderer that is not partial.
+Note that this hook can trigger out of order due to its dynamic nature, and
+with embedded applications will only work for the application that is
+rendering.
+
+  $app->hook(after_render => sub {
+    my ($c, $output, $format) = @_;
+    ...
+  });
+
+Mostly used for post-processing dynamically generated content. (Passed the
+current controller object, a reference to the content and the format)
+
+=item after_dispatch
 
 Emitted in reverse order after a response has been rendered. Note that this
-hook can trigger before C<after_static_dispatch> due to its dynamic nature,
-and with embedded applications will only work for the application rendering
-the response.
+hook can trigger out of order due to its dynamic nature, and with embedded
+applications will only work for the application that is rendering.
 
   $app->hook(after_dispatch => sub {
     my $c = shift;
@@ -500,7 +538,7 @@ the response.
 Useful for rewriting outgoing responses and other post-processing tasks.
 (Passed the current controller object)
 
-=item C<around_dispatch>
+=item around_dispatch
 
 Emitted right before the C<before_dispatch> hook and wraps around the whole
 dispatch process, so you have to manually forward to the next hook if you want
@@ -522,7 +560,7 @@ the default controller object)
 
 =back
 
-=head2 C<plugin>
+=head2 plugin
 
   $app->plugin('some_thing');
   $app->plugin('some_thing', foo => 23);
@@ -534,76 +572,21 @@ the default controller object)
   $app->plugin('MyApp::Plugin::SomeThing', foo => 23);
   $app->plugin('MyApp::Plugin::SomeThing', {foo => 23});
 
-Load a plugin with L<Mojolicious::Plugins/"register_plugin">.
-
-These plugins are included in the L<Mojolicious> distribution as examples:
-
-=over 2
-
-=item L<Mojolicious::Plugin::Charset>
-
-Change the application charset.
-
-=item L<Mojolicious::Plugin::Config>
-
-Perl-ish configuration files.
-
-=item L<Mojolicious::Plugin::DefaultHelpers>
-
-General purpose helper collection, loaded automatically.
+Load a plugin, for a full list of example plugins included in the
+L<Mojolicious> distribution see L<Mojolicious::Plugins/"PLUGINS">.
 
-=item L<Mojolicious::Plugin::EPLRenderer>
-
-Renderer for plain embedded Perl templates, loaded automatically.
-
-=item L<Mojolicious::Plugin::EPRenderer>
-
-Renderer for more sophisiticated embedded Perl templates, loaded
-automatically.
-
-=item L<Mojolicious::Plugin::HeaderCondition>
-
-Route condition for all kinds of headers, loaded automatically.
-
-=item L<Mojolicious::Plugin::JSONConfig>
-
-JSON configuration files.
-
-=item L<Mojolicious::Plugin::Mount>
-
-Mount whole L<Mojolicious> applications.
-
-=item L<Mojolicious::Plugin::PODRenderer>
-
-Renderer for turning POD into HTML and documentation browser for
-L<Mojolicious::Guides>.
-
-=item L<Mojolicious::Plugin::PoweredBy>
-
-Add an C<X-Powered-By> header to outgoing responses, loaded automatically.
-
-=item L<Mojolicious::Plugin::RequestTimer>
-
-Log timing information, loaded automatically.
-
-=item L<Mojolicious::Plugin::TagHelpers>
-
-Template specific helper collection, loaded automatically.
-
-=back
-
-=head2 C<start>
+=head2 start
 
   $app->start;
   $app->start(@ARGV);
 
-Start the command line interface for your application with
-L<Mojolicious::Commands/"start">.
+Start the command line interface for your application, for a full list of
+commands available by default see L<Mojolicious::Commands/"COMMANDS">.
 
   # Always start daemon and ignore @ARGV
   $app->start('daemon', '-l', 'http://*:8080');
 
-=head2 C<startup>
+=head2 startup
 
   $app->startup;
 
@@ -626,26 +609,6 @@ request, response and stash.
 
   $app->log->debug($app->dumper({foo => 'bar'}));
 
-=head1 SUPPORT
-
-=head2 Web
-
-L<http://mojolicio.us>
-
-=head2 IRC
-
-C<#mojo> on C<irc.perl.org>
-
-=head2 Mailing-List
-
-L<http://groups.google.com/group/mojolicious>
-
-=head1 DEVELOPMENT
-
-=head2 Repository
-
-L<http://github.com/kraih/mojo>
-
 =head1 BUNDLED FILES
 
 The L<Mojolicious> distribution includes a few files with different licenses
@@ -653,14 +616,14 @@ that have been bundled for internal use.
 
 =head2 Mojolicious Artwork
 
-  Copyright (C) 2010-2012, Sebastian Riedel.
+  Copyright (C) 2010-2013, Sebastian Riedel.
 
 Licensed under the CC-SA License, Version 3.0
 L<http://creativecommons.org/licenses/by-sa/3.0>.
 
 =head2 jQuery
 
-  Copyright (C) 2011, John Resig.
+  Copyright (C) 2005, 2012 jQuery Foundation, Inc.
 
 Licensed under the MIT License, L<http://creativecommons.org/licenses/MIT>.
 
@@ -810,6 +773,8 @@ James Duncan
 
 Jan Jona Javorsek
 
+Jan Schmidt
+
 Jaroslav Muhin
 
 Jesse Vincent
@@ -940,9 +905,13 @@ Zak B. Elep
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2008-2012, Sebastian Riedel.
+Copyright (C) 2008-2013, Sebastian Riedel.
 
 This program is free software, you can redistribute it and/or modify it under
 the terms of the Artistic License version 2.0.
 
+=head1 SEE ALSO
+
+L<Mojolicious::Guides>, L<http://mojolicio.us>.
+
 =cut

+17 -20

mojolegacy/lib/Mojolicious/Command.pm

View

@@ -32,10 +32,7 @@ sub chmod_rel_file {
 sub create_dir {
   my ($self, $path) = @_;
 
-  # Exists
   if (-d $path) { say "  [exist] $path" unless $self->quiet }
-
-  # Create
   else {
     mkpath $path or croak qq{Can't make directory "$path": $!};
     say "  [mkdir] $path" unless $self->quiet;
@@ -129,7 +126,7 @@ default.
 
 L<Mojolicious::Command> implements the following attributes.
 
-=head2 C<app>
+=head2 app
 
   my $app  = $command->app;
   $command = $command->app(MyApp->new);
@@ -139,21 +136,21 @@ Application for command, defaults to a L<Mojo::HelloWorld> object.
   # Introspect
   say "Template path: $_" for @{$command->app->renderer->paths};
 
-=head2 C<description>
+=head2 description
 
   my $description = $command->description;
   $command        = $command->description('Foo!');
 
 Short description of command, used for the command list.
 
-=head2 C<quiet>
+=head2 quiet
 
   my $quiet = $command->quiet;
   $command  = $command->quiet(1);
 
 Limited command output.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage = $command->usage;
   $command  = $command->usage('Foo!');
@@ -165,51 +162,51 @@ Usage information for command, used for the help screen.
 L<Mojolicious::Command> inherits all methods from L<Mojo::Base> and implements
 the following new ones.
 
-=head2 C<chmod_file>
+=head2 chmod_file
 
   $command = $command->chmod_file('/home/sri/foo.txt', 0644);
 
 Change mode of a file.
 
-=head2 C<chmod_rel_file>
+=head2 chmod_rel_file
 
   $command = $command->chmod_rel_file('foo/foo.txt', 0644);
 
 Portably change mode of a file relative to the current working directory.
 
-=head2 C<create_dir>
+=head2 create_dir
 
   $command = $command->create_dir('/home/sri/foo/bar');
 
 Create a directory.
 
-=head2 C<create_rel_dir>
+=head2 create_rel_dir
 
   $command = $command->create_rel_dir('foo/bar/baz');
 
 Portably create a directory relative to the current working directory.
 
-=head2 C<help>
+=head2 help
 
   $command->help;
 
 Print usage information for command.
 
-=head2 C<rel_dir>
+=head2 rel_dir
 
   my $path = $command->rel_dir('foo/bar');
 
 Portably generate an absolute path for a directory relative to the current
 working directory.
 
-=head2 C<rel_file>
+=head2 rel_file
 
   my $path = $command->rel_file('foo/bar.txt');
 
 Portably generate an absolute path for a file relative to the current working
 directory.
 
-=head2 C<render_data>
+=head2 render_data
 
 
   my $data = $command->render_data('foo_bar');
@@ -218,7 +215,7 @@ directory.
 Render a template from the C<DATA> section of the command class with
 L<Mojo::Template>.
 
-=head2 C<render_to_file>
+=head2 render_to_file
 
   $command = $command->render_to_file('foo_bar', '/home/sri/foo.txt');
   $command = $command->render_to_file('foo_bar', '/home/sri/foo.txt', @args);
@@ -226,7 +223,7 @@ L<Mojo::Template>.
 Render a template from the C<DATA> section of the command class with
 L<Mojo::Template> to a file and create directory if necessary.
 
-=head2 C<render_to_rel_file>
+=head2 render_to_rel_file
 
   $command = $command->render_to_rel_file('foo_bar', 'foo/bar.txt');
   $command = $command->render_to_rel_file('foo_bar', 'foo/bar.txt', @args);
@@ -235,20 +232,20 @@ Portably render a template from the C<DATA> section of the command class with
 L<Mojo::Template> to a file relative to the current working directory and
 create directory if necessary.
 
-=head2 C<run>
+=head2 run
 
   $command->run;
   $command->run(@ARGV);
 
 Run command. Meant to be overloaded in a subclass.
 
-=head2 C<write_file>
+=head2 write_file
 
   $command = $command->write_file('/home/sri/foo.txt', 'Hello World!');
 
 Write text to a file and create directory if necessary.
 
-=head2 C<write_rel_file>
+=head2 write_rel_file
 
   $command = $command->write_rel_file('foo/bar.txt', 'Hello World!');
 

+3 -3

mojolegacy/lib/Mojolicious/Command/cgi.pm

View

@@ -45,14 +45,14 @@ example for learning to build new commands, you're welcome to fork it.
 L<Mojolicious::Command::cgi> inherits all attributes from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<description>
+=head2 description
 
   my $description = $cgi->description;
   $cgi            = $cgi->description('Foo!');
 
 Short description of this command, used for the command list.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage = $cgi->usage;
   $cgi      = $cgi->usage('Foo!');
@@ -64,7 +64,7 @@ Usage information for this command, used for the help screen.
 L<Mojolicious::Command::cgi> inherits all methods from L<Mojolicious::Command>
 and implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   $cgi->run(@ARGV);
 

+4 -6

mojolegacy/lib/Mojolicious/Command/cpanify.pm

View

@@ -19,13 +19,11 @@ EOF
 sub run {
   my ($self, @args) = @_;
 
-  # Options
   GetOptionsFromArray \@args,
     'p|password=s' => \(my $password = ''),
     'u|user=s'     => \(my $user     = '');
   die $self->usage unless my $file = shift @args;
 
-  # Upload
   my $tx = Mojo::UserAgent->new->detect_proxy->post_form(
     "https://$user:$password\@pause.perl.org/pause/authenquery" => {
       HIDDENNAME                        => $user,
@@ -37,7 +35,6 @@ sub run {
     }
   );
 
-  # Error
   unless ($tx->success) {
     my $code = $tx->res->code || '';
     my $msg = $tx->error;
@@ -45,6 +42,7 @@ sub run {
     elsif ($code eq '409') { $msg = 'File already exists on CPAN.' }
     die qq{Problem uploading file "$file". ($msg)\n};
   }
+
   say 'Upload successful!';
 }
 
@@ -73,14 +71,14 @@ example for learning to build new commands, you're welcome to fork it.
 L<Mojolicious::Command::cpanify> inherits all attributes from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<description>
+=head2 description
 
   my $description = $cpanify->description;
   $cpanify        = $cpanify->description('Foo!');
 
 Short description of this command, used for the command list.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage = $cpanify->usage;
   $cpanify  = $cpanify->usage('Foo!');
@@ -92,7 +90,7 @@ Usage information for this command, used for the help screen.
 L<Mojolicious::Command::cpanify> inherits all methods from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   $cpanify->run(@ARGV);
 

+13 -16

mojolegacy/lib/Mojolicious/Command/daemon.pm

View

@@ -9,27 +9,25 @@ has usage       => <<"EOF";
 usage: $0 daemon [OPTIONS]
 
 These options are available:
-  -b, --backlog <size>         Set listen backlog size, defaults to
-                               SOMAXCONN.
-  -c, --clients <number>       Set maximum number of concurrent clients,
-                               defaults to 1000.
-  -g, --group <name>           Set group name for process.
-  -i, --inactivity <seconds>   Set inactivity timeout, defaults to the value
-                               of MOJO_INACTIVITY_TIMEOUT or 15.
-  -l, --listen <location>      Set one or more locations you want to listen
-                               on, defaults to the value of MOJO_LISTEN or
+  -b, --backlog <size>         Listen backlog size, defaults to SOMAXCONN.
+  -c, --clients <number>       Maximum number of concurrent clients, defaults
+                               to 1000.
+  -g, --group <name>           Group name for process.
+  -i, --inactivity <seconds>   Inactivity timeout, defaults to the value of
+                               MOJO_INACTIVITY_TIMEOUT or 15.
+  -l, --listen <location>      One or more locations you want to listen on,
+                               defaults to the value of MOJO_LISTEN or
                                "http://*:3000".
   -p, --proxy                  Activate reverse proxy support, defaults to
                                the value of MOJO_REVERSE_PROXY.
-  -r, --requests <number>      Set maximum number of requests per keep-alive
+  -r, --requests <number>      Maximum number of requests per keep-alive
                                connection, defaults to 25.
-  -u, --user <name>            Set username for process.
+  -u, --user <name>            Username for process.
 EOF
 
 sub run {
   my ($self, @args) = @_;
 
-  # Options
   my $daemon = Mojo::Server::Daemon->new(app => $self->app);
   GetOptionsFromArray \@args,
     'b|backlog=i'    => sub { $daemon->backlog($_[1]) },
@@ -41,7 +39,6 @@ sub run {
     'r|requests=i' => sub { $daemon->max_requests($_[1]) },
     'u|user=s'     => sub { $daemon->user($_[1]) };
 
-  # Start
   $daemon->listen(\@listen) if @listen;
   $daemon->run;
 }
@@ -72,14 +69,14 @@ example for learning to build new commands, you're welcome to fork it.
 L<Mojolicious::Command::daemon> inherits all attributes from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<description>
+=head2 description
 
   my $description = $daemon->description;
   $daemon         = $daemon->description('Foo!');
 
 Short description of this command, used for the command list.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage = $daemon->usage;
   $daemon   = $daemon->usage('Foo!');
@@ -91,7 +88,7 @@ Usage information for this command, used for the help screen.
 L<Mojolicious::Command::daemon> inherits all methods from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   $daemon->run(@ARGV);
 

+3 -4

mojolegacy/lib/Mojolicious/Command/eval.pm

View

@@ -17,7 +17,6 @@ EOF
 sub run {
   my ($self, @args) = @_;
 
-  # Options
   GetOptionsFromArray \@args, 'v|verbose' => \my $verbose;
   my $code = shift @args || '';
 
@@ -54,14 +53,14 @@ example for learning to build new commands, you're welcome to fork it.
 L<Mojolicious::Command::eval> inherits all attributes from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<description>
+=head2 description
 
   my $description = $eval->description;
   $eval           = $eval->description('Foo!');
 
 Short description of this command, used for the command list.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage = $eval->usage;
   $eval     = $eval->usage('Foo!');
@@ -73,7 +72,7 @@ Usage information for this command, used for the help screen.
 L<Mojolicious::Command::eval> inherits all methods from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   $eval->run(@ARGV);
 

+6 -6

mojolegacy/lib/Mojolicious/Command/generate.pm

View

@@ -41,35 +41,35 @@ example for learning to build new commands, you're welcome to fork it.
 L<Mojolicious::Command::generate> inherits all attributes from
 L<Mojolicious::Commands> and implements the following new ones.
 
-=head2 C<description>
+=head2 description
 
   my $description = $generator->description;
   $generator      = $generator->description('Foo!');
 
 Short description of this command, used for the command list.
 
-=head2 C<hint>
+=head2 hint
 
   my $hint   = $generator->hint;
   $generator = $generator->hint('Foo!');
 
 Short hint shown after listing available generator commands.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage  = $generator->usage;
   $generator = $generator->usage('Foo!');
 
 Usage information for this command, used for the help screen.
 
-=head2 C<message>
+=head2 message
 
   my $msg    = $generator->message;
   $generator = $generator->message('Bar!');
 
 Short usage message shown before listing available generator commands.
 
-=head2 C<namespaces>
+=head2 namespaces
 
   my $namespaces = $generator->namespaces;
   $generator     = $generator->namespaces(['MyApp::Command::generate']);
@@ -82,7 +82,7 @@ L<Mojolicious::Command::generate>.
 L<Mojolicious::Command::generate> inherits all methods from
 L<Mojolicious::Commands> and implements the following new ones.
 
-=head2 C<help>
+=head2 help
 
   $generator->help('app');
 

+4 -4

mojolegacy/lib/Mojolicious/Command/generate/app.pm

View

@@ -59,7 +59,7 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../lib";
 
-# Start commands for application
+# Start command line interface for application
 require Mojolicious::Commands;
 Mojolicious::Commands->start_app('<%= $class %>');
 
@@ -166,14 +166,14 @@ example for learning to build new commands, you're welcome to fork it.
 L<Mojolicious::Command::generate::app> inherits all attributes from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<description>
+=head2 description
 
   my $description = $app->description;
   $app            = $app->description('Foo!');
 
 Short description of this command, used for the command list.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage = $app->usage;
   $app      = $app->usage('Foo!');
@@ -185,7 +185,7 @@ Usage information for this command, used for the help screen.
 L<Mojolicious::Command::generate::app> inherits all methods from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   $app->run(@ARGV);
 

+3 -3

mojolegacy/lib/Mojolicious/Command/generate/lite_app.pm

View

@@ -66,14 +66,14 @@ example for learning to build new commands, you're welcome to fork it.
 L<Mojolicious::Command::generate::lite_app> inherits all attributes from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<description>
+=head2 description
 
   my $description = $app->description;
   $app            = $app->description('Foo!');
 
 Short description of this command, used for the command list.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage = $app->usage;
   $app      = $app->usage('Foo!');
@@ -85,7 +85,7 @@ Usage information for this command, used for the help screen.
 L<Mojolicious::Command::generate::lite_app> inherits all methods from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   $app->run(@ARGV);
 

+3 -3

mojolegacy/lib/Mojolicious/Command/generate/makefile.pm

View

@@ -48,14 +48,14 @@ example for learning to build new commands, you're welcome to fork it.
 L<Mojolicious::Command::generate::makefile> inherits all attributes from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<description>
+=head2 description
 
   my $description = $makefile->description;
   $makefile       = $makefile->description('Foo!');
 
 Short description of this command, used for the command list.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage = $makefile->usage;
   $makefile = $makefile->usage('Foo!');
@@ -67,7 +67,7 @@ Usage information for this command, used for the help screen.
 L<Mojolicious::Command::generate::makefile> inherits all methods from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   $makefile->run(@ARGV);
 

+4 -4

mojolegacy/lib/Mojolicious/Command/generate/plugin.pm

View

@@ -62,7 +62,7 @@ L<<%= $class %>> is a L<Mojolicious> plugin.
 L<<%= $class %>> inherits all methods from
 L<Mojolicious::Plugin> and implements the following new ones.
 
-<% %>=head2 C<register>
+<% %>=head2 register
 
   $plugin->register(Mojolicious->new);
 
@@ -134,14 +134,14 @@ example for learning to build new commands, you're welcome to fork it.
 L<Mojolicious::Command::generate::plugin> inherits all attributes from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<description>
+=head2 description
 
   my $description = $plugin->description;
   $plugin         = $plugin->description('Foo!');
 
 Short description of this command, used for the command list.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage = $plugin->usage;
   $plugin   = $plugin->usage('Foo!');
@@ -153,7 +153,7 @@ Usage information for this command, used for the help screen.
 L<Mojolicious::Command::generate::plugin> inherits all methods from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   $plugin->run(@ARGV);
 

+20 -37

mojolegacy/lib/Mojolicious/Command/get.pm

View

@@ -38,7 +38,6 @@ EOF
 sub run {
   my ($self, @args) = @_;
 
-  # Options
   GetOptionsFromArray \@args,
     'C|charset=s' => \my $charset,
     'c|content=s' => \(my $content = ''),
@@ -46,37 +45,28 @@ sub run {
     'M|method=s'  => \(my $method = 'GET'),
     'r|redirect'  => \my $redirect,
     'v|verbose'   => \my $verbose;
-  $verbose = 1 if $method eq 'HEAD';
-
-  # Headers
-  my %headers;
-  /^\s*([^:]+)\s*:\s*(.+)$/ and $headers{$1} = $2 for @headers;
 
-  # URL and selector
   die $self->usage unless my $url = decode 'UTF-8', do {my $tmp = shift @args; defined $tmp ? $tmp : ''};
   my $selector = shift @args;
 
-  # Fresh user agent
+  # Parse header pairs
+  my %headers;
+  /^\s*([^:]+)\s*:\s*(.+)$/ and $headers{$1} = $2 for @headers;
+
+  # Use global event loop singleton
   my $ua = Mojo::UserAgent->new(ioloop => Mojo::IOLoop->singleton);
   $ua->max_redirects(10) if $redirect;
 
-  # Absolute URL
-  if ($url !~ m!/!) { $ua->detect_proxy }
-
-  # Application
-  else { $ua->app($self->app) }
+  # Detect proxy for absolute URLs
+  if   ($url !~ m!/!) { $ua->detect_proxy }
+  else                { $ua->app($self->app) }
 
-  # Start
+  # Do the real work with "start" event
   my $v = my $buffer = '';
   $ua->on(
     start => sub {
       my $tx = pop;
 
-      # Prepare request information
-      my $req         = $tx->req;
-      my $startline   = $req->build_start_line;
-      my $req_headers = $req->build_headers;
-
       # Verbose callback
       my $v  = $verbose;
       my $cb = sub {
@@ -84,22 +74,21 @@ sub run {
 
         # Wait for headers
         return unless $v && $res->headers->is_finished;
+        $v = undef;
 
-        # Request
+        # Show request
+        my $req         = $tx->req;
+        my $startline   = $req->build_start_line;
+        my $req_headers = $req->build_headers;
         warn "$startline$req_headers";
 
-        # Response
+        # Show response
         my $version     = $res->version;
         my $code        = $res->code;
         my $msg         = $res->message;
         my $res_headers = $res->headers->to_string;
         warn "HTTP/$version $code $msg\n$res_headers\n\n";
-
-        # Finished
-        $v = undef;
       };
-
-      # Progress
       $tx->res->on(progress => $cb);
 
       # Stream content
@@ -109,19 +98,16 @@ sub run {
 
           # Ignore intermediate content
           return if $redirect && $res->is_status_class(300);
-
-          # Chunk
           $selector ? ($buffer .= pop) : print(pop);
         }
       );
     }
   );
 
-  # Get
+  # Switch to verbose for HEAD requests
+  $verbose = 1 if $method eq 'HEAD';
   STDOUT->autoflush(1);
   my $tx = $ua->start($ua->build_tx($method, $url, \%headers, $content));
-
-  # Error
   my ($err, $code) = $tx->error;
   $url = encode 'UTF-8', $url;
   warn qq{Problem loading URL "$url". ($err)\n} if $err && !$code;
@@ -151,11 +137,9 @@ sub _say {
 sub _select {
   my ($buffer, $selector, $charset, @args) = @_;
 
-  # Find
   my $dom     = Mojo::DOM->new->charset($charset)->parse($buffer);
   my $results = $dom->find($selector);
 
-  # Commands
   my $finished;
   while (defined(my $command = shift @args)) {
 
@@ -182,7 +166,6 @@ sub _select {
     $finished++;
   }
 
-  # Render
   unless ($finished) { _say($_) for @$results }
 }
 
@@ -211,14 +194,14 @@ example for learning to build new commands, you're welcome to fork it.
 L<Mojolicious::Command::get> performs requests to remote hosts or local
 applications.
 
-=head2 C<description>
+=head2 description
 
   my $description = $get->description;
   $get            = $get->description('Foo!');
 
 Short description of this command, used for the command list.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage = $get->usage;
   $get      = $get->usage('Foo!');
@@ -230,7 +213,7 @@ Usage information for this command, used for the help screen.
 L<Mojolicious::Command::get> inherits all methods from L<Mojolicious::Command>
 and implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   $get->run(@ARGV);
 

+3 -3

mojolegacy/lib/Mojolicious/Command/inflate.pm

View

@@ -51,14 +51,14 @@ example for learning to build new commands, you're welcome to fork it.
 L<Mojolicious::Command::inflate> inherits all attributes from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<description>
+=head2 description
 
   my $description = $inflate->description;
   $inflate        = $inflate->description('Foo!');
 
 Short description of this command, used for the command list.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage = $inflate->usage;
   $inflate  = $inflate->usage('Foo!');
@@ -70,7 +70,7 @@ Usage information for this command, used for the help screen.
 L<Mojolicious::Command::inflate> inherits all methods from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   $inflate->run(@ARGV);
 

+128

mojolegacy/lib/Mojolicious/Command/prefork.pm

View

...	...	@@ -0,0 +1,128 @@
	1	+package Mojolicious::Command::prefork;
	2	+use Mojo::Base 'Mojolicious::Command';
	3	+
	4	+use Getopt::Long qw(GetOptionsFromArray :config no_auto_abbrev no_ignore_case);
	5	+use Mojo::Server::Prefork;
	6	+
	7	+has description =>
	8	+ "Start application with preforking HTTP and WebSocket server.\n";
	9	+has usage => <<"EOF";
	10	+usage: $0 prefork [OPTIONS]
	11	+
	12	+These options are available:
	13	+ -A, --accepts <number> Number of connections for workers to
	14	+ accept, defaults to 1000.
	15	+ -a, --accept-interval <seconds> Accept interval, defaults to 0.025.
	16	+ -b, --backlog <size> Listen backlog size, defaults to
	17	+ SOMAXCONN.
	18	+ -c, --clients <number> Maximum number of concurrent clients,
	19	+ defaults to 1000.
	20	+ -G, --graceful-timeout <seconds> Graceful timeout, defaults to 20.
	21	+ -g, --group <name> Group name for process.
	22	+ --heartbeat-interval <seconds> Heartbeat interval, defaults to 5.
	23	+ -H, --heartbeat-timeout <seconds> Heartbeat timeout, defaults to 20.
	24	+ -i, --inactivity <seconds> Inactivity timeout, defaults to the
	25	+ value of MOJO_INACTIVITY_TIMEOUT or 15.
	26	+ --lock-file <path> Path to lock file, defaults to a random
	27	+ file.
	28	+ -L, --lock-timeout <seconds> Lock timeout, defaults to 0.5.
	29	+ -l, --listen <location> One or more locations you want to
	30	+ listen on, defaults to the value of
	31	+ MOJO_LISTEN or "http://*:3000".
	32	+ --multi-accept <number> Number of connection to accept at once,
	33	+ defaults to 50.
	34	+ -P, --pid-file <path> Path to process id file, defaults to a
	35	+ random file.
	36	+ -p, --proxy Activate reverse proxy support,
	37	+ defaults to the value of
	38	+ MOJO_REVERSE_PROXY.
	39	+ -r, --requests <number> Maximum number of requests per
	40	+ keep-alive connection, defaults to 25.
	41	+ -u, --user <name> Username for process.
	42	+ -w, --workers <number> Number of workers, defaults to 4.
	43	+EOF
	44	+
	45	+sub run {
	46	+ my ($self, @args) = @_;
	47	+
	48	+ my $prefork = Mojo::Server::Prefork->new(app => $self->app);
	49	+ GetOptionsFromArray \@args,
	50	+ 'A\|accepts=i' => sub { $prefork->accepts($_[1]) },
	51	+ 'a\|accept-interval=i' => sub { $prefork->accept_interval($_[1]) },
	52	+ 'b\|backlog=i' => sub { $prefork->backlog($_[1]) },
	53	+ 'c\|clients=i' => sub { $prefork->max_clients($_[1]) },
	54	+ 'G\|graceful-timeout=i' => sub { $prefork->graceful_timeout($_[1]) },
	55	+ 'g\|group=s' => sub { $prefork->group($_[1]) },
	56	+ 'heartbeat-interval=i' => sub { $prefork->heartbeat_interval($_[1]) },
	57	+ 'H\|heartbeat-timeout=i' => sub { $prefork->heartbeat_timeout($_[1]) },
	58	+ 'i\|inactivity=i' => sub { $prefork->inactivity_timeout($_[1]) },
	59	+ 'lock-file=s' => sub { $prefork->lock_file($_[1]) },
	60	+ 'L\|lock-timeout=i' => sub { $prefork->lock_timeout($_[1]) },
	61	+ 'l\|listen=s' => \my @listen,
	62	+ 'multi-accept=i' => sub { $prefork->multi_accept($_[1]) },
	63	+ 'P\|pid-file=s' => sub { $prefork->pid_file($_[1]) },
	64	+ 'p\|proxy' => sub { $ENV{MOJO_REVERSE_PROXY} = 1 },
	65	+ 'r\|requests=i' => sub { $prefork->max_requests($_[1]) },
	66	+ 'u\|user=s' => sub { $prefork->user($_[1]) },
	67	+ 'w\|workers=i' => sub { $prefork->workers($_[1]) };
	68	+
	69	+ $prefork->listen(\@listen) if @listen;
	70	+ $prefork->run;
	71	+}
	72	+
	73	+1;
	74	+
	75	+=head1 NAME
	76	+
	77	+Mojolicious::Command::prefork - Prefork command
	78	+
	79	+=head1 SYNOPSIS
	80	+
	81	+ use Mojolicious::Command::prefork;
	82	+
	83	+ my $prefork = Mojolicious::Command::prefork->new;
	84	+ $prefork->run(@ARGV);
	85	+
	86	+=head1 DESCRIPTION
	87	+
	88	+L<Mojolicious::Command::prefork> starts applications with
	89	+L<Mojo::Server::Prefork> backend.
	90	+
	91	+This is a core command, that means it is always enabled and its code a good
	92	+example for learning to build new commands, you're welcome to fork it.
	93	+
	94	+=head1 ATTRIBUTES
	95	+
	96	+L<Mojolicious::Command::prefork> inherits all attributes from
	97	+L<Mojolicious::Command> and implements the following new ones.
	98	+
	99	+=head2 description
	100	+
	101	+ my $description = $prefork->description;
	102	+ $prefork = $prefork->description('Foo!');
	103	+
	104	+Short description of this command, used for the command list.
	105	+
	106	+=head2 usage
	107	+
	108	+ my $usage = $prefork->usage;
	109	+ $prefork = $prefork->usage('Foo!');
	110	+
	111	+Usage information for this command, used for the help screen.
	112	+
	113	+=head1 METHODS
	114	+
	115	+L<Mojolicious::Command::prefork> inherits all methods from
	116	+L<Mojolicious::Command> and implements the following new ones.
	117	+
	118	+=head2 run
	119	+
	120	+ $prefork->run(@ARGV);
	121	+
	122	+Run this command.
	123	+
	124	+=head1 SEE ALSO
	125	+
	126	+L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicio.us>.
	127	+
	128	+=cut

+3 -3

mojolegacy/lib/Mojolicious/Command/psgi.pm

View

@@ -34,14 +34,14 @@ example for learning to build new commands, you're welcome to fork it.
 L<Mojolicious::Command::psgi> inherits all attributes from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<description>
+=head2 description
 
   my $description = $psgi->description;
   $psgi           = $psgi->description('Foo!');
 
 Short description of this command, used for the command list.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage = $psgi->usage;
   $psgi     = $psgi->usage('Foo!');
@@ -53,7 +53,7 @@ Usage information for this command, used for the help screen.
 L<Mojolicious::Command::psgi> inherits all methods from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   my $app = $psgi->run;
 

+5 -10

mojolegacy/lib/Mojolicious/Command/routes.pm

View

@@ -15,10 +15,8 @@ EOF
 sub run {
   my ($self, @args) = @_;
 
-  # Options
   GetOptionsFromArray \@args, 'v|verbose' => \my $verbose;
 
-  # Walk and draw
   my $routes = [];
   $self->_walk($_, 0, $routes) for @{$self->app->routes->children};
   $self->_draw($routes, $verbose);
@@ -27,7 +25,7 @@ sub run {
 sub _draw {
   my ($self, $routes, $verbose) = @_;
 
-  # Length
+  # Calculate column widths
   my @length = (0, 0, 0);
   for my $node (@$routes) {
 
@@ -46,7 +44,7 @@ sub _draw {
     $length[2] = $len if $len > $length[2];
   }
 
-  # Draw
+  # Draw all routes
   for my $node (@$routes) {
     my @parts;
 
@@ -75,7 +73,6 @@ sub _draw {
     $format .= '?' if $format && $optional;
     push @parts, $format ? "$regex$format" : $regex if $verbose;
 
-    # Route
     say join('  ', @parts);
   }
 }
@@ -83,12 +80,10 @@ sub _draw {
 sub _walk {
   my ($self, $node, $depth, $routes) = @_;
 
-  # Pattern
   my $prefix = '';
   if (my $i = $depth * 2) { $prefix .= ' ' x $i . '+' }
   push @$routes, [$prefix . ($node->pattern->pattern || '/'), $node];
 
-  # Walk
   $depth++;
   $self->_walk($_, $depth, $routes) for @{$node->children};
   $depth--;
@@ -119,14 +114,14 @@ example for learning to build new commands, you're welcome to fork it.
 L<Mojolicious::Command::routes> inherits all attributes from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<description>
+=head2 description
 
   my $description = $routes->description;
   $routes         = $routes->description('Foo!');
 
 Short description of this command, used for the command list.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage = $routes->usage;
   $routes   = $routes->usage('Foo!');
@@ -138,7 +133,7 @@ Usage information for this command, used for the help screen.
 L<Mojolicious::Command::routes> inherits all methods from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   $routes->run(@ARGV);
 

+5 -10

mojolegacy/lib/Mojolicious/Command/test.pm

View

@@ -18,28 +18,23 @@ EOF
 sub run {
   my ($self, @args) = @_;
 
-  # Options
   GetOptionsFromArray \@args, 'v|verbose' => sub { $ENV{HARNESS_VERBOSE} = 1 };
 
-  # Search tests
   unless (@args) {
     my @base = splitdir(abs2rel $FindBin::Bin);
 
-    # Test directory in the same directory as "mojo" (t)
+    # "./t"
     my $path = catdir @base, 't';
 
-    # Test dirctory in the directory above "mojo" (../t)
+    # "../t"
     $path = catdir @base, '..', 't' unless -d $path;
     die "Can't find test directory.\n" unless -d $path;
 
-    # List test files
     my $home = Mojo::Home->new($path);
     /\.t$/ and push(@args, $home->rel_file($_)) for @{$home->list_files};
-
     say "Running tests from '", realpath($path), "'.";
   }
 
-  # Run tests
   $ENV{HARNESS_OPTIONS} = defined $ENV{HARNESS_OPTIONS} ? $ENV{HARNESS_OPTIONS} : 'c';
   require Test::Harness;
   Test::Harness::runtests(sort @args);
@@ -70,14 +65,14 @@ example for learning to build new commands, you're welcome to fork it.
 L<Mojolicious::Command::test> inherits all attributes from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<description>
+=head2 description
 
   my $description = $test->description;
   $test           = $test->description('Foo!');
 
 Short description of this command, used for the command list.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage = $test->usage;
   $test     = $test->usage('Foo!');
@@ -89,7 +84,7 @@ Usage information for this command, used for the help screen.
 L<Mojolicious::Command::test> inherits all methods from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   $test->run(@ARGV);
 

+4 -10

mojolegacy/lib/Mojolicious/Command/version.pm

View

@@ -11,14 +11,9 @@ has usage       => "usage: $0 version\n";
 sub run {
   my $self = shift;
 
-  # EV
   my $ev = eval 'use Mojo::Reactor::EV; 1' ? $EV::VERSION : 'not installed';
-
-  # IPv6
   my $ipv6
     = Mojo::IOLoop::Server::IPV6 ? $IO::Socket::IP::VERSION : 'not installed';
-
-  # TLS
   my $tls
     = Mojo::IOLoop::Server::TLS ? $IO::Socket::SSL::VERSION : 'not installed';
 
@@ -34,13 +29,12 @@ OPTIONAL
 
 EOF
 
-  # Latest version
+  # Check latest version on CPAN
   my $latest = eval {
     my $ua = Mojo::UserAgent->new(max_redirects => 10)->detect_proxy;
     $ua->get('api.metacpan.org/v0/release/Mojolicious')->res->json->{version};
   };
 
-  # Message
   return unless $latest;
   my $msg = 'This version is up to date, have fun!';
   $msg = 'Thanks for testing a development release, you are awesome!'
@@ -76,14 +70,14 @@ example for learning to build new commands, you're welcome to fork it.
 L<Mojolicious::Command::version> inherits all attributes from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<description>
+=head2 description
 
   my $description = $v->description;
   $v              = $v->description('Foo!');
 
 Short description of this command, used for the command list.
 
-=head2 C<usage>
+=head2 usage
 
   my $usage = $v->usage;
   $v        = $v->usage('Foo!');
@@ -95,7 +89,7 @@ Usage information for this command, used for the help screen.
 L<Mojolicious::Command::version> inherits all methods from
 L<Mojolicious::Command> and implements the following new ones.
 
-=head2 C<run>
+=head2 run
 
   $v->run(@ARGV);
 

+47 -53

mojolegacy/lib/Mojolicious/Commands.pm

View

@@ -1,8 +1,8 @@
 package Mojolicious::Commands;
 use Mojo::Base 'Mojolicious::Command';
 
-use Getopt::Long
-  qw(GetOptions :config no_auto_abbrev no_ignore_case pass_through);
+use Getopt::Long 'GetOptions';
+use List::Util 'max';
 use Mojo::Server;
 
 has hint => <<"EOF";
@@ -41,11 +41,13 @@ sub detect {
 
 # Command line options for MOJO_HELP, MOJO_HOME and MOJO_MODE
 BEGIN {
+  Getopt::Long::Configure(qw(no_auto_abbrev no_ignore_case pass_through));
   GetOptions(
     'h|help'   => sub { $ENV{MOJO_HELP} = 1 },
     'home=s'   => sub { $ENV{MOJO_HOME} = $_[1] },
     'm|mode=s' => sub { $ENV{MOJO_MODE} = $_[1] }
   ) unless __PACKAGE__->detect;
+  Getopt::Long::Configure('default');
 }
 
 sub run {
@@ -64,7 +66,6 @@ sub run {
     $name = shift @args if my $help = $name eq 'help';
     $help = $ENV{MOJO_HELP} = $ENV{MOJO_HELP} ? 1 : $help;
 
-    # Try all namespaces
     my $module;
     $module = _command("${_}::$name", 1) and last for @{$self->namespaces};
 
@@ -72,15 +73,15 @@ sub run {
     die qq{Unknown command "$name", maybe you need to install it?\n}
       unless $module;
 
-    # Run
+    # Run command
     my $command = $module->new(app => $self->app);
     return $help ? $command->help(@args) : $command->run(@args);
   }
 
-  # Test
+  # Hide list for tests
   return 1 if $ENV{HARNESS_ACTIVE};
 
-  # Try all namespaces
+  # Find all available commands
   my (@commands, %seen);
   my $loader = Mojo::Loader->new;
   for my $namespace (@{$self->namespaces}) {
@@ -91,25 +92,23 @@ sub run {
     }
   }
 
-  # Make list
-  my @list;
-  my $max = 0;
-  for my $command (@commands) {
-    my $len = length $command->[0];
-    $max = $len if $len > $max;
-    push @list, [$command->[0], $command->[1]->new->description];
-  }
-
-  # Print list
+  # Print list of all available commands
+  my $max = max map { length $_->[0] } @commands;
   print $self->message;
-  for my $command (@list) {
-    my ($name, $description) = @$command;
-    print "  $name" . (' ' x ($max - length $name)) . "   $description";
+  for my $command (@commands) {
+    my $name        = $command->[0];
+    my $description = $command->[1]->new->description;
+    print "  $name", (' ' x ($max - length $name)), "   $description";
   }
   return print $self->hint;
 }
 
+# DEPRECATED in Rainbow!
 sub start {
+  warn <<EOF;
+Mojolicious::Commands->start is DEPRECATED in favor of
+Mojolicious::Commands->start_app!!!
+EOF
   my $self = shift;
   return $self->start_app($ENV{MOJO_APP} => @_) if $ENV{MOJO_APP};
   return $self->new->app->start(@_);
@@ -151,7 +150,7 @@ the C<Mojolicious::Command> namespace.
 
 These commands are available by default.
 
-=head2 C<help>
+=head2 help
 
   $ mojo
   $ mojo help
@@ -164,31 +163,31 @@ List available commands with short descriptions.
 
 List available options for the command with short descriptions.
 
-=head2 C<cgi>
+=head2 cgi
 
   $ ./myapp.pl cgi
 
 Start application with CGI backend, usually auto detected.
 
-=head2 C<cpanify>
+=head2 cpanify
 
   $ mojo cpanify -u sri -p secr3t Mojolicious-Plugin-Fun-0.1.tar.gz
 
 Upload files to CPAN.
 
-=head2 C<daemon>
+=head2 daemon
 
   $ ./myapp.pl daemon
 
-Start application with standalone HTTP server backend.
+Start application with standalone HTTP and WebSocket server server.
 
-=head2 C<eval>
+=head2 eval
 
   $ ./myapp.pl eval 'say app->home'
 
 Run code against application.
 
-=head2 C<generate>
+=head2 generate
 
   $ mojo generate
   $ mojo generate help
@@ -201,66 +200,72 @@ List available generator commands with short descriptions.
 
 List available options for generator command with short descriptions.
 
-=head2 C<generate app>
+=head2 generate app
 
   $ mojo generate app <AppName>
 
 Generate application directory structure for a fully functional L<Mojolicious>
 application.
 
-=head2 C<generate lite_app>
+=head2 generate lite_app
 
   $ mojo generate lite_app
 
 Generate a fully functional L<Mojolicious::Lite> application.
 
-=head2 C<generate makefile>
+=head2 generate makefile
 
   $ mojo generate makefile
   $ ./myapp.pl generate makefile
 
 Generate C<Makefile.PL> file for application.
 
-=head2 C<generate plugin>
+=head2 generate plugin
 
   $ mojo generate plugin <PluginName>
 
 Generate directory structure for a fully functional L<Mojolicious> plugin.
 
-=head2 C<get>
+=head2 get
 
   $ mojo get http://mojolicio.us
   $ ./myapp.pl get /foo
 
 Perform requests to remote host or local application.
 
-=head2 C<inflate>
+=head2 inflate
 
   $ ./myapp.pl inflate
 
 Turn templates and static files embedded in the C<DATA> sections of your
 application into real files.
 
-=head2 C<psgi>
+=head2 prefork
+
+  $ ./myapp.pl prefork
+
+Start application with standalone preforking HTTP and WebSocket server.
+
+=head2 psgi
 
   $ ./myapp.pl psgi
 
 Start application with PSGI backend, usually auto detected.
 
-=head2 C<routes>
+=head2 routes
 
   $ ./myapp.pl routes
 
 List application routes.
 
-=head2 C<test>
+=head2 test
 
   $ ./myapp.pl test
   $ ./myapp.pl test t/fun.t
 
 Runs application tests from the C<t> directory.
 
-=head2 C<version>
+=head2 version
 
   $ mojo version
   $ ./myapp.pl version
@@ -273,21 +278,21 @@ for debugging.
 L<Mojolicious::Commands> inherits all attributes from L<Mojolicious::Command>
 and implements the following new ones.
 
-=head2 C<hint>
+=head2 hint
 
   my $hint  = $commands->hint;
   $commands = $commands->hint('Foo!');
 
 Short hint shown after listing available commands.
 
-=head2 C<message>
+=head2 message
 
   my $msg   = $commands->message;
   $commands = $commands->message('Hello World!');
 
 Short usage message shown before listing available commands.
 
-=head2 C<namespaces>
+=head2 namespaces
 
   my $namespaces = $commands->namespaces;
   $commands      = $commands->namespaces(['MyApp::Command']);
@@ -302,14 +307,14 @@ Namespaces to load commands from, defaults to C<Mojolicious::Command>.
 L<Mojolicious::Commands> inherits all methods from L<Mojolicious::Command> and
 implements the following new ones.
 
-=head2 C<detect>
+=head2 detect
 
   my $env = $commands->detect;
   my $env = $commands->detect($guess);
 
 Try to detect environment.
 
-=head2 C<run>
+=head2 run
 
   $commands->run;
   $commands->run(@ARGV);
@@ -317,18 +322,7 @@ Try to detect environment.
 Load and run commands. Automatic deployment environment detection can be
 disabled with the C<MOJO_NO_DETECT> environment variable.
 
-=head2 C<start>
-
-  Mojolicious::Commands->start;
-  Mojolicious::Commands->start(@ARGV);
-
-Start the command line interface for application from the value of the
-C<MOJO_APP> environment variable or L<Mojo::HelloWorld>.
-
-  # Always start daemon and ignore @ARGV
-  Mojolicious::Commands->start('daemon', '-l', 'http://*:8080');
-
-=head2 C<start_app>
+=head2 start_app
 
   Mojolicious::Commands->start_app('MyApp');
   Mojolicious::Commands->start_app(MyApp => @ARGV);

+86 -67

mojolegacy/lib/Mojolicious/Controller.pm

View

@@ -1,6 +1,7 @@
 package Mojolicious::Controller;
 use Mojo::Base -base;
 
+# No imports, for security reasons!
 use Carp ();
 use Mojo::ByteStream;
 use Mojo::Cookie::Response;
@@ -29,11 +30,11 @@ sub AUTOLOAD {
 
   # Method
   my ($package, $method) = our $AUTOLOAD =~ /^([\w:]+)::(\w+)$/;
-  Carp::croak("Undefined subroutine &${package}::$method called")
-    unless Scalar::Util::blessed($self) && $self->isa(__PACKAGE__);
+  Carp::croak "Undefined subroutine &${package}::$method called"
+    unless Scalar::Util::blessed $self && $self->isa(__PACKAGE__);
 
   # Call helper
-  Carp::croak(qq{Can't locate object method "$method" via package "$package"})
+  Carp::croak qq{Can't locate object method "$method" via package "$package"}
     unless my $helper = $self->app->renderer->helpers->{$method};
   return $self->$helper(@_);
 }
@@ -59,8 +60,6 @@ sub cookie {
 
   # Request cookies
   return map { $_->value } $self->req->cookie($name) if wantarray;
-
-  # Request cookie
   return undef unless my $cookie = $self->req->cookie($name);
   return $cookie->value;
 }
@@ -133,9 +132,8 @@ sub param {
     return ref $value eq 'ARRAY' ? wantarray ? @$value : $$value[0] : $value;
   }
 
-  # Upload
-  my $upload = $req->upload($name);
-  return $upload if $upload;
+  # Uploads
+  return $req->upload($name) if $req->upload($name);
 
   # Param values
   return $req->param($name);
@@ -158,7 +156,7 @@ sub render {
   my $args = ref $_[0] ? $_[0] : {@_};
   $args->{template} = $template if $template;
 
-  # Template
+  # Detect template name
   my $stash = $self->stash;
   unless ($args->{template} || $stash->{template}) {
 
@@ -177,13 +175,16 @@ sub render {
   }
 
   # Render
-  my ($output, $type) = $self->app->renderer->render($self, $args);
+  my $app = $self->app;
+  my ($output, $format) = $app->renderer->render($self, $args);
   return undef unless defined $output;
   return Mojo::ByteStream->new($output) if $args->{partial};
 
   # Prepare response
+  $app->plugins->emit_hook(after_render => $self, \$output, $format);
   my $headers = $self->res->body($output)->headers;
-  $headers->content_type($type) unless $headers->content_type;
+  $headers->content_type($app->types->type($format) || 'text/plain')
+    unless $headers->content_type;
   return !!$self->rendered($stash->{status});
 }
 
@@ -192,7 +193,6 @@ sub render_data { shift->render(data => @_) }
 sub render_exception {
   my ($self, $e) = @_;
 
-  # Log exception
   my $app = $self->app;
   $app->log->error($e = Mojo::Exception->new($e));
 
@@ -310,7 +310,7 @@ sub respond_to {
 sub send {
   my ($self, $msg, $cb) = @_;
   my $tx = $self->tx;
-  Carp::croak('No WebSocket connection to send message to')
+  Carp::croak 'No WebSocket connection to send message to'
     unless $tx->is_websocket;
   $tx->send($msg => sub { shift and $self->$cb(@_) if $cb });
   return $self->rendered(101);
@@ -395,8 +395,7 @@ sub url_for {
   my $target = shift; $target = defined $target ? $target : '';
 
   # Absolute URL
-  return $target
-    if Scalar::Util::blessed($target) && $target->isa('Mojo::URL');
+  return $target if Scalar::Util::blessed $target && $target->isa('Mojo::URL');
   return Mojo::URL->new($target) if $target =~ m!^\w+://!;
 
   # Base
@@ -408,8 +407,7 @@ sub url_for {
   my $path = $url->path;
   if ($target =~ m!^/!) {
     if (my $prefix = $self->stash->{path}) {
-      my $real = Mojo::Util::url_unescape($req->url->path->to_abs_string);
-      $real = do {my $tmp = Mojo::Util::decode('UTF-8', $real); defined $tmp ? $tmp : $real};
+      my $real = $req->url->path->to_route;
       $real =~ s!/?$prefix$!$target!;
       $target = $real;
     }
@@ -457,7 +455,7 @@ sub _fallbacks {
   # Mode specific template
   return 1 if $self->render($options);
 
-  # Template
+  # Normal template
   $options->{template} = $template;
   return 1 if $self->render($options);
 
@@ -471,6 +469,8 @@ sub _fallbacks {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Controller - Controller base class
@@ -500,7 +500,7 @@ unless you set C<controller_class> in your application.
 L<Mojolicious::Controller> inherits all attributes from L<Mojo::Base> and
 implements the following new ones.
 
-=head2 C<app>
+=head2 app
 
   my $app = $c->app;
   $c      = $c->app(Mojolicious->new);
@@ -511,7 +511,7 @@ defaults to a L<Mojolicious> object.
   # Use application logger
   $c->app->log->debug('Hello Mojo!');
 
-=head2 C<match>
+=head2 match
 
   my $m = $c->match;
   $c    = $c->match(Mojolicious::Routes::Match->new);
@@ -522,7 +522,7 @@ L<Mojolicious::Routes::Match> object.
   # Introspect
   my $foo = $c->match->endpoint->pattern->defaults->{foo};
 
-=head2 C<tx>
+=head2 tx
 
   my $tx = $c->tx;
   $c     = $c->tx(Mojo::Transaction::HTTP->new);
@@ -538,7 +538,7 @@ L<Mojo::Transaction::HTTP> or L<Mojo::Transaction::WebSocket> object.
 L<Mojolicious::Controller> inherits all methods from L<Mojo::Base> and
 implements the following new ones.
 
-=head2 C<cookie>
+=head2 cookie
 
   my $value  = $c->cookie('foo');
   my @values = $c->cookie('foo');
@@ -547,17 +547,17 @@ implements the following new ones.
 
 Access request cookie values and create new response cookies.
 
-  # Create response cookie with domain
-  $c->cookie(name => 'sebastian', {domain => 'mojolicio.us'});
+  # Create response cookie with domain and expiration date
+  $c->cookie(user => 'sri', {domain => 'mojolicio.us', expires => time + 60});
 
-=head2 C<finish>
+=head2 finish
 
   $c = $c->finish;
   $c = $c->finish('Bye!');
 
 Gracefully end WebSocket connection or long poll stream.
 
-=head2 C<flash>
+=head2 flash
 
   my $foo = $c->flash('foo');
   $c      = $c->flash({foo => 'bar'});
@@ -569,26 +569,42 @@ Data storage persistent only for the next request, stored in the C<session>.
   $c->flash(message => 'User created successfully!');
   $c->redirect_to('show_user', id => 23);
 
-=head2 C<on>
+=head2 on
 
   my $cb = $c->on(finish => sub {...});
 
 Subscribe to events of C<tx>, which is usually a L<Mojo::Transaction::HTTP> or
 L<Mojo::Transaction::WebSocket> object.
 
-  # Emitted when the transaction has been finished
+  # Do something after the transaction has been finished
   $c->on(finish => sub {
     my $c = shift;
     $c->app->log->debug('We are done!');
   });
 
-  # Emitted when new WebSocket messages arrive
+  # Receive WebSocket message
   $c->on(message => sub {
     my ($c, $msg) = @_;
     $c->app->log->debug("Message: $msg");
   });
 
-=head2 C<param>
+  # Receive JSON object via WebSocket "Text" message
+  use Mojo::JSON 'j';
+  $c->on(text => sub {
+    my ($c, $bytes) = @_;
+    my $test = j($bytes)->{test};
+    $c->app->log->debug("Test: $test");
+  });
+
+  # Receive JSON object via WebSocket "Binary" message
+  use Mojo::JSON 'j';
+  $c->on(binary => sub {
+    my ($c, $bytes) = @_;
+    my $test = j($bytes)->{test};
+    $c->app->log->debug("Test: $test");
+  });
+
+=head2 param
 
   my @names       = $c->param;
   my $foo         = $c->param('foo');
@@ -622,7 +638,7 @@ For more control you can also access request information directly.
   # Only file uploads
   my $foo = $c->req->upload('foo');
 
-=head2 C<redirect_to>
+=head2 redirect_to
 
   $c = $c->redirect_to('named');
   $c = $c->redirect_to('named', foo => 'bar');
@@ -638,7 +654,7 @@ Prepare a C<302> redirect response, takes the same arguments as C<url_for>.
   $c->res->code(301);
   $c->redirect_to('some_route');
 
-=head2 C<render>
+=head2 render
 
   my $success = $c->render;
   my $success = $c->render(controller => 'foo', action => 'bar');
@@ -652,11 +668,12 @@ Prepare a C<302> redirect response, takes the same arguments as C<url_for>.
   my $success = $c->render('foo/index');
   my $output  = $c->render('foo/index', partial => 1);
 
-Render content using L<Mojolicious::Renderer/"render">, if no template is
+Render content using L<Mojolicious::Renderer/"render"> and emit
+C<after_render> hook unless the result is C<partial>. If no template is
 provided a default one based on controller and action or route name will be
-generated. All additional values get merged into the C<stash>.
+generated, all additional values get merged into the C<stash>.
 
-=head2 C<render_data>
+=head2 render_data
 
   $c->render_data($bytes);
   $c->render_data($bytes, format => 'png');
@@ -667,7 +684,7 @@ not be encoded. All additional values get merged into the C<stash>.
   # Longer version
   $c->render(data => $bytes);
 
-=head2 C<render_exception>
+=head2 render_exception
 
   $c->render_exception('Oops!');
   $c->render_exception(Mojo::Exception->new('Oops!'));
@@ -675,7 +692,7 @@ not be encoded. All additional values get merged into the C<stash>.
 Render the exception template C<exception.$mode.$format.*> or
 C<exception.$format.*> and set the response status code to C<500>.
 
-=head2 C<render_json>
+=head2 render_json
 
   $c->render_json({foo => 'bar'});
   $c->render_json([1, 2, -3], status => 201);
@@ -686,7 +703,7 @@ C<stash>.
   # Longer version
   $c->render(json => {foo => 'bar'});
 
-=head2 C<render_later>
+=head2 render_later
 
   $c = $c->render_later;
 
@@ -699,14 +716,14 @@ automatic rendring would result in a response.
     $c->render(text => 'Delayed by 2 seconds!');
   });
 
-=head2 C<render_not_found>
+=head2 render_not_found
 
   $c->render_not_found;
 
 Render the not found template C<not_found.$mode.$format.*> or
 C<not_found.$format.*> and set the response status code to C<404>.
 
-=head2 C<render_partial>
+=head2 render_partial
 
   my $output = $c->render_partial('menubar');
   my $output = $c->render_partial('menubar', format => 'txt');
@@ -717,7 +734,7 @@ Same as C<render> but returns the rendered result.
   # Longer version
   my $output = $c->render('menubar', partial => 1);
 
-=head2 C<render_static>
+=head2 render_static
 
   my $success = $c->render_static('images/logo.png');
   my $success = $c->render_static('../lib/MyApp.pm');
@@ -726,7 +743,7 @@ Render a static file using L<Mojolicious::Static/"serve">, usually from the
 C<public> directories or C<DATA> sections of your application. Note that this
 method does not protect from traversing to parent directories.
 
-=head2 C<render_text>
+=head2 render_text
 
   $c->render_text('Hello World!');
   $c->render_text('Hello World!', layout => 'green');
@@ -742,15 +759,15 @@ of the response, which is C<text/html;charset=UTF-8> by default.
   # Render "text/plain" response
   $c->render_text('Hello World!', format => 'txt');
 
-=head2 C<rendered>
+=head2 rendered
 
   $c = $c->rendered;
   $c = $c->rendered(302);
 
-Finalize response and emit C<after_dispatch> plugin hook, defaults to using a
-C<200> response code.
+Finalize response and emit C<after_dispatch> hook, defaults to using a C<200>
+response code.
 
-=head2 C<req>
+=head2 req
 
   my $req = $c->req;
 
@@ -766,7 +783,7 @@ Get L<Mojo::Message::Request> object from L<Mojo::Transaction/"req">.
   my $foo      = $c->req->json('/23/foo');
   my $bar      = $c->req->dom('div.bar')->first->text;
 
-=head2 C<res>
+=head2 res
 
   my $res = $c->res;
 
@@ -778,7 +795,7 @@ Get L<Mojo::Message::Response> object from L<Mojo::Transaction/"res">.
   # Force file download by setting a custom response header
   $c->res->headers->content_disposition('attachment; filename=foo.png;');
 
-=head2 C<respond_to>
+=head2 respond_to
 
   $c->respond_to(
     json => {json => {message => 'Welcome!'}},
@@ -799,7 +816,7 @@ is set to the value C<XMLHttpRequest>.
     any  => {data => '', status => 204}
   );
 
-=head2 C<send>
+=head2 send
 
   $c = $c->send({binary => $bytes});
   $c = $c->send({text   => $bytes});
@@ -810,14 +827,16 @@ is set to the value C<XMLHttpRequest>.
 Send message or frame non-blocking via WebSocket, the optional drain callback
 will be invoked once all data has been written.
 
-  # Send "Text" frame
-  $c->send('Hello World!');
+  # Send "Text" message
+  $c->send('I ♥ Mojolicious!');
 
-  # Send JSON object as "Text" frame
-  $c->send({text => Mojo::JSON->new->encode({hello => 'world'})});
+  # Send JSON object as "Text" message
+  use Mojo::JSON 'j';
+  $c->send({text => j({test => 'I ♥ Mojolicious!'})});
 
-  # Send JSON object as "Binary" frame
-  $c->send({binary => Mojo::JSON->new->encode({hello => 'world'})});
+  # Send JSON object as "Binary" message
+  use Mojo::JSON 'j';
+  $c->send({binary => j({test => 'I ♥ Mojolicious!'})});
 
   # Send "Ping" frame
   $c->send([1, 0, 0, 0, 9, 'Hello World!']);
@@ -828,7 +847,7 @@ timeout, which usually defaults to C<15> seconds.
   # Increase inactivity timeout for connection to 300 seconds
   Mojo::IOLoop->stream($c->tx->connection)->timeout(300);
 
-=head2 C<session>
+=head2 session
 
   my $session = $c->session;
   my $foo     = $c->session('foo');
@@ -853,7 +872,7 @@ usually have a 4096 byte limit, depending on browser.
   # Delete whole session by setting an expiration date in the past
   $c->session(expires => 1);
 
-=head2 C<signed_cookie>
+=head2 signed_cookie
 
   my $value  = $c->signed_cookie('foo');
   my @values = $c->signed_cookie('foo');
@@ -864,7 +883,7 @@ Access signed request cookie values and create new signed response cookies.
 Cookies failing C<HMAC-SHA1> signature verification will be automatically
 discarded.
 
-=head2 C<stash>
+=head2 stash
 
   my $stash = $c->stash;
   my $foo   = $c->stash('foo');
@@ -883,7 +902,7 @@ that all stash values with a C<mojo.*> prefix are reserved for internal use.
   my $foo = $c->stash->{foo};
   delete $c->stash->{foo};
 
-=head2 C<ua>
+=head2 ua
 
   my $ua = $c->ua;
 
@@ -915,7 +934,7 @@ Get L<Mojo::UserAgent> object from L<Mojo/"ua">.
     });
   }
 
-=head2 C<url_for>
+=head2 url_for
 
   my $url = $c->url_for;
   my $url = $c->url_for(name => 'sebastian');
@@ -937,12 +956,12 @@ to inherit query parameters from the current request.
   # "/list?q=mojo&page=2" if current request was for "/list?q=mojo&page=1"
   $c->url_with->query([page => 2]);
 
-=head2 C<write>
+=head2 write
 
   $c = $c->write;
-  $c = $c->write('Hello!');
+  $c = $c->write($bytes);
   $c = $c->write(sub {...});
-  $c = $c->write('Hello!' => sub {...});
+  $c = $c->write($bytes => sub {...});
 
 Write dynamic content non-blocking, the optional drain callback will be
 invoked once all data has been written.
@@ -963,18 +982,18 @@ invoked once all data has been written.
     });
   });
 
-For Comet (C<long polling>) you might also want to increase the inactivity
+For Comet (long polling) you might also want to increase the inactivity
 timeout, which usually defaults to C<15> seconds.
 
   # Increase inactivity timeout for connection to 300 seconds
   Mojo::IOLoop->stream($c->tx->connection)->timeout(300);
 
-=head2 C<write_chunk>
+=head2 write_chunk
 
   $c = $c->write_chunk;
-  $c = $c->write_chunk('Hello!');
+  $c = $c->write_chunk($bytes);
   $c = $c->write_chunk(sub {...});
-  $c = $c->write_chunk('Hello!' => sub {...});
+  $c = $c->write_chunk($bytes => sub {...});
 
 Write dynamic content non-blocking with C<chunked> transfer encoding, the
 optional drain callback will be invoked once all data has been written.

+20 -10

mojolegacy/lib/Mojolicious/Guides.pod

View

@@ -20,6 +20,12 @@ available in many formats. Both are excellent introductions to the language.
 For more books and documentation, check out
 L<learn.perl.org|http://learn.perl.org/>.
 
+=head1 SCREENCASTS
+
+Before starting with the tutorial below, you should take a look at the
+wonderful L<Mojocasts|http://mojocasts.com/e1>, they will give you a general
+overview of what L<Mojolicious> is all about.
+
 =head1 TUTORIAL
 
 =over 2
@@ -90,26 +96,23 @@ Full featured, highly portable non-blocking I/O HTTP and WebSocket server,
 with self-restart support through L<Mojo::Server::Morbo>, perfect for
 development and testing.
 
-=item L<Mojo::Server::Hypnotoad>
+=item L<Mojo::Server::Prefork>
 
 Full featured, UNIX optimized, preforking non-blocking I/O HTTP and WebSocket
-server with support for zero downtime software upgrades (hot deployment).
+server with support for zero downtime software upgrades (hot deployment)
+through L<Mojo::Server::Hypnotoad>.
 
 =item L<Mojo::Server::CGI>, L<Mojo::Server::PSGI>
 
 Transparent CGI and L<PSGI> support out of the box.
 
-=item L<Mojo::Template>
-
-Very Perl-ish and minimalistic template system.
-
-=item L<Mojo::ByteStream>
+=item L<Mojo::IOLoop>
 
-Countless portable and very convenient bytestream manipulation methods.
+A minimalistic event loop with support for multiple reactor backends.
 
-=item L<Mojolicious::Commands>
+=item L<Mojo::Template>
 
-Pluggable command line system and the backbone of the L<mojo> script.
+Very Perl-ish and minimalistic template system.
 
 =item L<Test::Mojo>
 
@@ -126,4 +129,11 @@ Fun oneliners using everything above.
 A lot more documentation and examples by many different authors can be found
 in the L<Mojolicious wiki|http://github.com/kraih/mojo/wiki>.
 
+=head1 SUPPORT
+
+If you have any questions the documentation might not yet answer, don't
+hesitate to ask on the
+L<mailing-list|http://groups.google.com/group/mojolicious> or the official IRC
+channel C<#mojo> on C<irc.perl.org>.
+
 =cut

+8 -3

mojolegacy/lib/Mojolicious/Guides/Contributing.pod

View

@@ -164,9 +164,7 @@ feature branches for actual development.
 Code has to be run through L<Perl::Tidy> with the included C<.perltidyrc>, and
 everything should look like it was written by a single person.
 
-Code should be organized in blocks and those blocks should be commented.
-
-No spaghetti code.
+Methods and functions should be as short as possible, no spaghetti code.
 
 Comments should be correctly capitalized, and funny if possible, punctuation
 is optional if it doesn't increase readability.
@@ -185,4 +183,11 @@ You can continue with L<Mojolicious::Guides> now or take a look at the
 L<Mojolicious wiki|http://github.com/kraih/mojo/wiki>, which contains a lot
 more documentation and examples by many different authors.
 
+=head1 SUPPORT
+
+If you have any questions the documentation might not yet answer, don't
+hesitate to ask on the
+L<mailing-list|http://groups.google.com/group/mojolicious> or the official IRC
+channel C<#mojo> on C<irc.perl.org>.
+
 =cut

+33 -27

mojolegacy/lib/Mojolicious/Guides/Cookbook.pod

View

@@ -5,7 +5,7 @@ Mojolicious::Guides::Cookbook - Cookbook
 
 =head1 OVERVIEW
 
-This document cotains many fun recipes for cooking with L<Mojolicious>.
+This document contains many fun recipes for cooking with L<Mojolicious>.
 
 =head1 DEPLOYMENT
 
@@ -30,13 +30,17 @@ works on.
   $ ./script/myapp daemon -h
   ...List of available options...
 
-Another huge advantage is that it supports TLS and WebSockets out of the box.
+Another huge advantage is that it supports TLS and WebSockets out of the box,
+a development certificate for testing purposes is built right in, so it just
+works.
 
   $ ./script/myapp daemon -l https://*:3000
   Server available at https://127.0.0.1:3000.
 
-A development certificate for testing purposes is built right in, so it just
-works.
+On UNIX platforms you can also add preforking with L<Mojo::Server::Prefork>.
+
+  $ ./script/myapp prefork
+  Server available at http://127.0.0.1:3000.
 
 =head2 Morbo
 
@@ -65,8 +69,9 @@ multiple CPU cores and copy-on-write.
   |- Mojo::Server::Daemon [3]
   +- Mojo::Server::Daemon [4]
 
-It is also based on the L<Mojo::Server::Daemon> web server, but optimized
-specifically for production environments out of the box.
+It is based on the L<Mojo::Server::Prefork> web server, which adds preforking
+to L<Mojo::Server::Daemon>, but optimized specifically for production
+environments out of the box.
 
   $ hypnotoad script/myapp
   Server available at http://127.0.0.1:8080.
@@ -512,6 +517,7 @@ L<Test::Mojo> API to be used.
   my $t = Test::Mojo->new;
   $t->websocket_ok('/echo')
     ->send_ok('Hello Mojo!')
+    ->message_ok
     ->message_is('echo: Hello Mojo!')
     ->finish_ok;
 
@@ -611,10 +617,10 @@ which can be combined to solve some of hardest problems in web development.
         # Make sure we have the right part and replace "read" event
         return unless $single->headers->content_disposition =~ /example/;
         $single->unsubscribe('read')->on(read => sub {
-          my ($single, $chunk) = @_;
+          my ($single, $bytes) = @_;
 
           # Log size of every chunk we receive
-          $self->app->log->debug(length($chunk) . ' bytes uploaded.');
+          $self->app->log->debug(length($bytes) . ' bytes uploaded.');
         });
       });
     }) unless $self->req->is_finished;
@@ -734,30 +740,23 @@ sense for a standalone parser.
   say 'Title: ', $tx->res->dom->at('head > title')->text;
 
   # Extract headings
-  $tx->res->dom('h1, h2, h3')->each(sub {
-    say 'Heading: ', shift->all_text;
-  });
+  $tx->res->dom('h1, h2, h3')->each(sub { say 'Heading: ', shift->all_text });
 
-  # Recurse through children manually to extract more than just text
-  sub text_and_images {
-    my $elements = shift;
-    for my $e ($elements->each) {
+  # Visit all elements recursively to extract more than just text
+  for my $e ($tx->res->dom('*')->each) {
 
-      # Text before this element
-      print $e->text_before(0);
+    # Text before this element
+    print $e->text_before(0);
 
-      # Also include alternate text for images
-      print $e->{alt} if $e->type eq 'img';
+    # Also include alternate text for images
+    print $e->{alt} if $e->type eq 'img';
 
-      # Text from children
-      my $children = $e->children;
-      $children->size ? text_and_images($children) : print $e->text(0);
-    }
+    # Text for elements without children
+    print $e->text(0) unless $e->children->size;
 
     # Text after last element
-    print $elements->[-1]->text_after(0);
+    print $e->text_after(0) unless $e->next;
   }
-  text_and_images($tx->res->dom->children);
 
 Especially for unit testing your L<Mojolicious> applications this can be a
 very powerful tool.
@@ -834,8 +833,8 @@ L<Mojo::UserAgent> makes it actually easy.
 
   # Replace "read" events to disable default content parser
   $tx->res->content->unsubscribe('read')->on(read => sub {
-    my ($content, $chunk) = @_;
-    say "Streaming: $chunk";
+    my ($content, $bytes) = @_;
+    say "Streaming: $bytes";
   });
 
   # Process transaction
@@ -1179,4 +1178,11 @@ You can continue with L<Mojolicious::Guides> now or take a look at the
 L<Mojolicious wiki|http://github.com/kraih/mojo/wiki>, which contains a lot
 more documentation and examples by many different authors.
 
+=head1 SUPPORT
+
+If you have any questions the documentation might not yet answer, don't
+hesitate to ask on the
+L<mailing-list|http://groups.google.com/group/mojolicious> or the official IRC
+channel C<#mojo> on C<irc.perl.org>.
+
 =cut

+10 -3

mojolegacy/lib/Mojolicious/Guides/FAQ.pod

View

@@ -69,9 +69,9 @@ variable to change this value.
 
 This is a very similar protection mechanism to the one described in the
 previous answer, but a little more specific. It limits the maximum length of
-any C<\r\n> terminated part of a HTTP message, such as request line, status
-line and headers. This limit is around C<10KB> by default, you can use the
-C<MOJO_MAX_LINE_SIZE> environment variable to change this value.
+any C<\x0d\x0a> terminated part of a HTTP message, such as request line,
+status line and headers. This limit is around C<10KB> by default, you can use
+the C<MOJO_MAX_LINE_SIZE> environment variable to change this value.
 
 =head2 What does the error "Maximum buffer size exceeded" mean?
 
@@ -140,4 +140,11 @@ You can continue with L<Mojolicious::Guides> now or take a look at the
 L<Mojolicious wiki|http://github.com/kraih/mojo/wiki>, which contains a lot
 more documentation and examples by many different authors.
 
+=head1 SUPPORT
+
+If you have any questions the documentation might not yet answer, don't
+hesitate to ask on the
+L<mailing-list|http://groups.google.com/group/mojolicious> or the official IRC
+channel C<#mojo> on C<irc.perl.org>.
+
 =cut

+9 -2

mojolegacy/lib/Mojolicious/Guides/Growing.pod

View

@@ -551,7 +551,7 @@ allow running unit tests again.
   use lib 'lib';
   use Mojolicious::Commands;
 
-  # Start commands for application
+  # Start command line interface for application
   Mojolicious::Commands->start_app('MyApp');
 
 =head2 Controller class
@@ -651,7 +651,7 @@ Only a few small details change.
   use FindBin;
   use lib "$FindBin::Bin/../lib";
 
-  # Start commands for application
+  # Start command line interface for application
   require Mojolicious::Commands;
   Mojolicious::Commands->start_app('MyApp');
 
@@ -694,4 +694,11 @@ You can continue with L<Mojolicious::Guides> now or take a look at the
 L<Mojolicious wiki|http://github.com/kraih/mojo/wiki>, which contains a lot
 more documentation and examples by many different authors.
 
+=head1 SUPPORT
+
+If you have any questions the documentation might not yet answer, don't
+hesitate to ask on the
+L<mailing-list|http://groups.google.com/group/mojolicious> or the official IRC
+channel C<#mojo> on C<irc.perl.org>.
+
 =cut

+77 -66

mojolegacy/lib/Mojolicious/Guides/Rendering.pod

View

@@ -114,7 +114,8 @@ which is the default to prevent XSS attacks against your application.
 
 Only L<Mojo::ByteStream> objects are excluded from automatic escaping.
 
-  <%= Mojo::ByteStream->new('<p>test</p>') %>
+  % use Mojo::ByteStream 'b';
+  <%= b('<p>test</p>') %>
 
 Newline characters can be escaped with a backslash.
 
@@ -186,7 +187,7 @@ shortcut.
 
 Some renderers such as C<ep> allow templates to be passed inline.
 
-  $self->render(inline => 'The result is <%= 1 + 1%>.');
+  $self->render(inline => 'The result is <%= 1 + 1 %>.');
 
 Since auto detection depends on a path you might have to supply a C<handler>
 too.
@@ -489,7 +490,7 @@ the partial template.
 =head2 Reusable template blocks
 
 It's never fun to repeat yourself, that's why you can build reusable template
-blocks in C<ep> that work very similar normal Perl functions.
+blocks in C<ep> that work very similar to normal Perl functions.
 
   @@ welcome.html.ep
   <% my $block = begin %>
@@ -605,14 +606,14 @@ everything.
 
   get '/' => sub {
     my $self = shift;
-    $self->debug('action');
+    $self->debug('Hello from an action!');
   } => 'index';
 
   app->start;
   __DATA__
 
   @@ index.html.ep
-  % debug 'template';
+  % debug 'Hello from a template!';
 
 Helpers can also accept template blocks as last argument, this for example
 allows very pleasant to use tag helpers and filters.
@@ -674,14 +675,14 @@ The C<register> method will be called when you load the plugin.
 
   app->start;
 
-A skeleton for a full C<CPAN> compatible plugin distribution can be
-automatically generated.
+A skeleton for a full CPAN compatible plugin distribution can be automatically
+generated.
 
   $ mojo generate plugin DebugHelper
 
 And if you have a C<PAUSE> account (which can be requested at
 L<http://pause.perl.org>), you are only a few commands away from relasing it
-to C<CPAN>.
+to CPAN.
 
   $ perl Makefile.PL
   $ make test
@@ -692,7 +693,7 @@ to C<CPAN>.
 =head2 Bundling assets with plugins
 
 Assets such as templates and static files can be easily bundled with your
-plugins, even if you plan to release them to C<CPAN>.
+plugins, even if you plan to release them to CPAN.
 
   $ mojo generate plugin AlertAssets
   $ mkdir AlertAssets/lib/Mojolicious/Plugin/AlertAssets
@@ -790,10 +791,46 @@ that a response has been generated.
   $self->res->content->asset(Mojo::Asset::File->new(path => '/etc/passwd'));
   $self->rendered(200);
 
+=head2 Post-processing dynamic content
+
+While post-processing tasks are generally very easy with the C<after_dispatch>
+hook, for content generated by the renderer it is a lot more efficient to use
+C<after_render>.
+
+  use Mojolicious::Lite;
+  use IO::Compress::Gzip 'gzip';
+
+  hook after_render => sub {
+    my ($self, $output, $format) = @_;
+
+    # Check if "gzip => 1" has been set in the stash
+    return unless $self->stash->{gzip};
+
+    # Check if user agent accepts GZip compression
+    return unless ($self->req->headers->accept_encoding // '') =~ /gzip/i;
+
+    # Compress content with GZip
+    $self->res->headers->content_encoding('gzip');
+    gzip $output, \my $compressed;
+    $$output = $compressed;
+  };
+
+  get '/' => {template => 'hello', title => 'Hello', gzip => 1};
+
+  app->start;
+  __DATA__
+
+  @@ hello.html.ep
+  <!DOCTYPE html>
+  <html>
+    <head><title><%= title %></title></head>
+    <body>Compressed content.</body>
+  </html>
+
 =head2 Chunked transfer encoding
 
-For very dynamic content you might not know the response C<Content-Length> in
-advance, that's where the C<chunked> C<Transfer-Encoding> comes in handy. A
+For very dynamic content you might not know the response content length in
+advance, that's where the C<chunked> transfer encoding comes in handy. A
 common use would be to send the C<head> section of an HTML document to the
 browser in advance and speed up preloading of referenced images and
 stylesheets.
@@ -814,8 +851,8 @@ L<Mojolicious::Controller/"finish"> marks the end of the stream.
   0
 
 Especially in combination with long inactivity timeouts this can be very
-useful for Comet (C<long polling>). Due to limitations in some web servers
-this might not work perfectly in all deployment environments.
+useful for Comet (long polling). Due to limitations in some web servers this
+might not work perfectly in all deployment environments.
 
 =head2 Encoding
 
@@ -893,23 +930,28 @@ L<Mojo::Template> contains the whole list of available options.
 
 =head2 Adding your favorite template system
 
-Maybe you would prefer a different template system than C<ep>, all you have to
-do is add a new C<handler>.
+Maybe you would prefer a different template system than C<ep>, and there is
+not already a plugin on CPAN for your favorite one, all you have to do is add
+a new C<handler> when C<register> is called.
 
-  use Mojolicious::Lite;
+  package Mojolicious::Plugin::MyRenderer;
+  use Mojo::Base 'Mojolicious::Plugin';
+
+  sub register {
+    my ($self, $app) = @_;
 
-  app->renderer->add_handler(
-    mine => sub {
+    # Add "mine" handler
+    $app->renderer->add_handler(mine => sub {
       my ($renderer, $c, $output, $options) = @_;
 
-      # Check for one time use inline template
+      # Check for one-time use inline template
       my $inline = $options->{inline};
 
       # Check for absolute template path
-      my $path = $r->template_path($options);
+      my $path = $renderer->template_path($options);
 
       # Check for appropriate template in DATA section
-      my $data = $r->get_data_template($options);
+      my $data = $renderer->get_data_template($options);
 
       # This part is up to you and your template system :)
       ...
@@ -922,63 +964,25 @@ do is add a new C<handler>.
 
       # And return true if something has been rendered or false otherwise
       return 1;
-    }
-  );
-
-  get '/' => 'index';
-
-  app->start;
-  __DATA__
+    });
+  }
 
-  @@ index.html.mine
-  ...
+  1;
 
 Since most template systems don't support templates in the C<DATA> section,
 the renderer provides methods to help you with that.
 
-=head2 Post-processing content
-
-While post-processing tasks are generally very easy with the C<after_dispatch>
-hook, especially for content generated by the renderer, there are a few things
-you need to watch out for, such as multipart content, dynamically generated
-content, content that is streamed directly from files and content with range
-constraints.
-
   use Mojolicious::Lite;
-  use IO::Compress::Gzip 'gzip';
 
-  hook after_dispatch => sub {
-    my $self = shift;
+  plugin 'MyRenderer';
 
-    # Check if "gzip => 1" has been set in the stash
-    return unless $self->stash->{gzip};
-
-    # Check if user agent accepts GZip compression
-    return unless ($self->req->headers->accept_encoding // '') =~ /gzip/i;
-
-    # Check for multipart content or if content will be dynamically generated
-    return if $self->res->is_multipart || $self->res->is_dynamic;
-
-    # Check if content is streamed from a file or has a range constraint
-    my $asset = $self->res->content->asset;
-    return if $asset->is_file || $asset->is_range;
-
-    # Compress content
-    gzip \(my $dummy = $asset->slurp), \my $compressed;
-    $self->res->body($compressed)->headers->content_encoding('gzip');
-  };
-
-  get '/' => {template => 'hello', title => 'Hello', gzip => 1};
+  get '/' => 'index';
 
   app->start;
   __DATA__
 
-  @@ hello.html.ep
-  <!DOCTYPE html>
-  <html>
-    <head><title><%= title %></title></head>
-    <body>Compressed content.</body>
-  </html>
+  @@ index.html.mine
+  ...
 
 =head1 MORE
 
@@ -986,4 +990,11 @@ You can continue with L<Mojolicious::Guides> now or take a look at the
 L<Mojolicious wiki|http://github.com/kraih/mojo/wiki>, which contains a lot
 more documentation and examples by many different authors.
 
+=head1 SUPPORT
+
+If you have any questions the documentation might not yet answer, don't
+hesitate to ask on the
+L<mailing-list|http://groups.google.com/group/mojolicious> or the official IRC
+channel C<#mojo> on C<irc.perl.org>.
+
 =cut

+16 -12

mojolegacy/lib/Mojolicious/Guides/Routing.pod

View

@@ -623,10 +623,9 @@ Post-processing tasks such as setting additional response headers are a very
 common use.
 
   # Make sure static files are cached
-  $self->hook(after_static_dispatch => sub {
+  $self->hook(after_static => sub {
     my $self = shift;
-    $self->res->headers->cache_control('max-age=3600, must-revalidate')
-      if $self->res->code;
+    $self->res->headers->cache_control('max-age=3600, must-revalidate');
   });
 
 Same for monitoring tasks.
@@ -746,17 +745,15 @@ You can also package your conditions as reusable plugins.
     my ($self, $app) = @_;
 
     # Add "werewolf" condition
-    $app->routes->add_condition(
-      werewolf => sub {
-        my ($route, $c, $captures, $days) = @_;
+    $app->routes->add_condition(werewolf => sub {
+      my ($route, $c, $captures, $days) = @_;
 
-        # Keep the werewolfs out!
-        return undef if abs(14 - (phase(time))[2]) > ($days / 2);
+      # Keep the werewolfs out!
+      return undef if abs(14 - (phase(time))[2]) > ($days / 2);
 
-        # It's ok, no werewolf
-        return 1;
-      }
-    );
+      # It's ok, no werewolf
+      return 1;
+    });
   }
 
   1;
@@ -885,4 +882,11 @@ You can continue with L<Mojolicious::Guides> now or take a look at the
 L<Mojolicious wiki|http://github.com/kraih/mojo/wiki>, which contains a lot
 more documentation and examples by many different authors.
 
+=head1 SUPPORT
+
+If you have any questions the documentation might not yet answer, don't
+hesitate to ask on the
+L<mailing-list|http://groups.google.com/group/mojolicious> or the official IRC
+channel C<#mojo> on C<irc.perl.org>.
+
 =cut

+34 -29

mojolegacy/lib/Mojolicious/Lite.pm

View

@@ -2,50 +2,55 @@ package Mojolicious::Lite;
 use Mojo::Base 'Mojolicious';
 
 # "Bender: Bite my shiny metal ass!"
-use File::Basename 'dirname';
+use File::Basename qw(basename dirname);
 use File::Spec::Functions 'catdir';
 use Mojo::UserAgent;
 use Mojo::Util 'monkey_patch';
 
 sub import {
-  my $class = shift;
 
-  # Executable
+  # Remember executable for later
   $ENV{MOJO_EXE} ||= (caller)[1];
 
-  # Home
-  local $ENV{MOJO_HOME} = catdir(split '/', dirname($ENV{MOJO_EXE}))
+  # Reuse home directory if possible
+  local $ENV{MOJO_HOME} = catdir(split '/', dirname $ENV{MOJO_EXE})
     unless $ENV{MOJO_HOME};
 
-  # Initialize app
+  # Initialize application class
   my $caller = caller;
   no strict 'refs';
   push @{"${caller}::ISA"}, 'Mojo';
-  my $app = $class->new;
+  my $app = shift->new;
 
-  # Initialize routes
+  # Generate moniker based on filename
+  my $moniker = basename $ENV{MOJO_EXE};
+  $moniker =~ s/\.(?:pl|pm|t)$//i;
+  $app->moniker($moniker);
+
+  # Initialize routes without namespaces
   my $routes = $app->routes->namespaces([]);
 
   # Default static and template class
   $app->static->classes->[0] = $app->renderer->classes->[0] = $caller;
 
-  # Export
+  # The Mojolicious::Lite DSL
   my $root = $routes;
   for my $name (qw(any get options patch post put websocket)) {
     monkey_patch $caller, $name, sub { $routes->$name(@_) };
   }
   monkey_patch $caller, $_, sub {$app}
     for qw(new app);
-  monkey_patch $caller, 'del', sub { $routes->delete(@_) };
-  monkey_patch $caller, 'group', sub (&) {
+  monkey_patch $caller, del => sub { $routes->delete(@_) };
+  monkey_patch $caller, group => sub (&) {
     my $old = $root;
     $_[0]->($root = $routes);
     ($routes, $root) = ($root, $old);
   };
-  monkey_patch $caller, 'helper', sub { $app->helper(@_) };
-  monkey_patch $caller, 'hook',   sub { $app->hook(@_) };
-  monkey_patch $caller, 'plugin', sub { $app->plugin(@_) };
-  monkey_patch $caller, 'under',  sub { $routes = $root->under(@_) };
+  monkey_patch $caller,
+    helper => sub { $app->helper(@_) },
+    hook   => sub { $app->hook(@_) },
+    plugin => sub { $app->plugin(@_) },
+    under  => sub { $routes = $root->under(@_) };
 
   # Make sure there's a default application for testing
   Mojo::UserAgent->app($app) unless Mojo::UserAgent->app;
@@ -929,7 +934,7 @@ fun!
 
 L<Mojolicious::Lite> implements the following functions.
 
-=head2 C<any>
+=head2 any
 
   my $route = any '/:foo' => sub {...};
   my $route = any [qw(GET POST)] => '/:foo' => sub {...};
@@ -938,45 +943,45 @@ Generate route with L<Mojolicious::Routes::Route/"any">, matching any of the
 listed HTTP request methods or all. See also the tutorial above for more
 argument variations.
 
-=head2 C<app>
+=head2 app
 
   my $app = app;
 
 The L<Mojolicious::Lite> application.
 
-=head2 C<del>
+=head2 del
 
   my $route = del '/:foo' => sub {...};
 
 Generate route with L<Mojolicious::Routes::Route/"delete">, matching only
 C<DELETE> requests. See also the tutorial above for more argument variations.
 
-=head2 C<get>
+=head2 get
 
   my $route = get '/:foo' => sub {...};
 
 Generate route with L<Mojolicious::Routes::Route/"get">, matching only C<GET>
 requests. See also the tutorial above for more argument variations.
 
-=head2 C<group>
+=head2 group
 
   group {...};
 
 Start a new route group.
 
-=head2 C<helper>
+=head2 helper
 
   helper foo => sub {...};
 
 Add a new helper with L<Mojolicious/"helper">.
 
-=head2 C<hook>
+=head2 hook
 
   hook after_dispatch => sub {...};
 
 Share code with L<Mojolicious/"hook">.
 
-=head2 C<options>
+=head2 options
 
   my $route = options '/:foo' => sub {...};
 
@@ -984,34 +989,34 @@ Generate route with L<Mojolicious::Routes::Route/"options">, matching only
 C<OPTIONS> requests. See also the tutorial above for more argument
 variations.
 
-=head2 C<patch>
+=head2 patch
 
   my $route = patch '/:foo' => sub {...};
 
 Generate route with L<Mojolicious::Routes::Route/"patch">, matching only
 C<PATCH> requests. See also the tutorial above for more argument variations.
 
-=head2 C<plugin>
+=head2 plugin
 
   plugin SomePlugin => {foo => 23};
 
 Load a plugin with L<Mojolicious/"plugin">.
 
-=head2 C<post>
+=head2 post
 
   my $route = post '/:foo' => sub {...};
 
 Generate route with L<Mojolicious::Routes::Route/"post">, matching only
 C<POST> requests. See also the tutorial above for more argument variations.
 
-=head2 C<put>
+=head2 put
 
   my $route = put '/:foo' => sub {...};
 
 Generate route with L<Mojolicious::Routes::Route/"put">, matching only C<PUT>
 requests. See also the tutorial above for more argument variations.
 
-=head2 C<under>
+=head2 under
 
   my $route = under sub {...};
   my $route = under '/:foo';
@@ -1020,7 +1025,7 @@ Generate bridge route with L<Mojolicious::Routes::Route/"under">, to which all
 following routes are automatically appended. See also the tutorial above for
 more argument variations.
 
-=head2 C<websocket>
+=head2 websocket
 
   my $route = websocket '/:foo' => sub {...};
 

+1 -1

mojolegacy/lib/Mojolicious/Plugin.pm

View

@@ -32,7 +32,7 @@ L<Mojolicious::Plugin> is an abstract base class for L<Mojolicious> plugins.
 L<Mojolicious::Plugin> inherits all methods from L<Mojo::Base> and implements
 the following new ones.
 
-=head2 C<register>
+=head2 register
 
   $plugin->register(Mojolicious->new);
   $plugin->register(Mojolicious->new, {foo => 'bar'});

+3 -4

mojolegacy/lib/Mojolicious/Plugin/Charset.pm

View

@@ -4,7 +4,6 @@ use Mojo::Base 'Mojolicious::Plugin';
 sub register {
   my ($self, $app, $conf) = @_;
 
-  # Change default charset on all layers
   return unless my $c = $conf->{charset};
   $app->types->type(html => "text/html;charset=$c");
   $app->renderer->encoding($c);
@@ -38,7 +37,7 @@ you're welcome to fork it.
 
 L<Mojolicious::Plugin::Charset> supports the following options.
 
-=head2 C<charset>
+=head2 charset
 
   # Mojolicious::Lite
   plugin Charset => {charset => 'Shift_JIS'};
@@ -50,11 +49,11 @@ Application charset.
 L<Mojolicious::Plugin::Charset> inherits all methods from
 L<Mojolicious::Plugin> and implements the following new ones.
 
-=head2 C<register>
+=head2 register
 
   $plugin->register(Mojolicious->new, {charset => 'Shift_JIS'});
 
-Register plugin hooks in L<Mojolicious> application.
+Register hooks in L<Mojolicious> application.
 
 =head1 SEE ALSO
 

+10 -29

mojolegacy/lib/Mojolicious/Plugin/Config.pm

View

@@ -1,21 +1,13 @@
 package Mojolicious::Plugin::Config;
 use Mojo::Base 'Mojolicious::Plugin';
 
-use File::Basename 'basename';
 use File::Spec::Functions 'file_name_is_absolute';
-use Mojo::Util 'decamelize';
+use Mojo::Util qw(decode slurp);
 
 sub load {
   my ($self, $file, $conf, $app) = @_;
   $app->log->debug(qq{Reading config file "$file".});
-
-  # Slurp UTF-8 file
-  open my $handle, "<:encoding(UTF-8)", $file
-    or die qq{Couldn't open config file "$file": $!};
-  my $content = do { local $/; <$handle> };
-
-  # Process
-  return $self->parse($content, $file, $conf, $app);
+  return $self->parse(decode('UTF-8', slurp $file), $file, $conf, $app);
 }
 
 sub parse {
@@ -36,21 +28,11 @@ sub register {
 
   # Config file
   my $file = $conf->{file} || $ENV{MOJO_CONFIG};
-  unless ($file) {
-
-    # Class or executable
-    $file
-      = $ENV{MOJO_APP} ? decamelize($ENV{MOJO_APP}) : basename($ENV{MOJO_EXE});
-
-    # Replace ".pl" and ".t" with default extension
-    $file =~ s/\.(?:pl|t)$//i;
-    $file .= '.' . ($conf->{ext} || 'conf');
-  }
+  $file ||= $app->moniker . '.' . ($conf->{ext} || 'conf');
 
   # Mode specific config file
   my $mode = $file =~ /^(.*)\.([^.]+)$/ ? join('.', $1, $app->mode, $2) : '';
 
-  # Absolute paths
   my $home = $app->home;
   $file = $home->rel_file($file) unless file_name_is_absolute $file;
   $mode = $home->rel_file($mode) if $mode && !file_name_is_absolute $mode;
@@ -111,8 +93,7 @@ The application object can be accessed via C<$app> or the C<app> function,
 L<strict>, L<warnings>, L<utf8> and Perl 5.10 features are automatically
 enabled. You can extend the normal configuration file C<myapp.conf> with
 C<mode> specific ones like C<myapp.$mode.conf>. A default configuration
-filename will be generated by decamelizing the application class with
-L<Mojo::Util/"decamelize"> or from the application filename.
+filename will be generated from the value of L<Mojolicious/"moniker">.
 
 The code of this plugin is a good example for learning to build new plugins,
 you're welcome to fork it.
@@ -121,21 +102,21 @@ you're welcome to fork it.
 
 L<Mojolicious::Plugin::Config> supports the following options.
 
-=head2 C<default>
+=head2 default
 
   # Mojolicious::Lite
   plugin Config => {default => {foo => 'bar'}};
 
 Default configuration, making configuration files optional.
 
-=head2 C<ext>
+=head2 ext
 
   # Mojolicious::Lite
   plugin Config => {ext => 'stuff'};
 
 File extension for generated configuration filenames, defaults to C<conf>.
 
-=head2 C<file>
+=head2 file
 
   # Mojolicious::Lite
   plugin Config => {file => 'myapp.conf'};
@@ -149,7 +130,7 @@ environment variable or C<myapp.conf> in the application home directory.
 L<Mojolicious::Plugin::Config> inherits all methods from
 L<Mojolicious::Plugin> and implements the following new ones.
 
-=head2 C<load>
+=head2 load
 
   $plugin->load($file, $conf, $app);
 
@@ -161,7 +142,7 @@ Loads configuration file and passes the content to C<parse>.
     return $self->parse($content, $file, $conf, $app);
   }
 
-=head2 C<parse>
+=head2 parse
 
   $plugin->parse($content, $file, $conf, $app);
 
@@ -173,7 +154,7 @@ Parse configuration file.
     return $hash;
   }
 
-=head2 C<register>
+=head2 register
 
   my $config = $plugin->register(Mojolicious->new);
   my $config = $plugin->register(Mojolicious->new, {file => '/etc/app.conf'});

+22 -35

mojolegacy/lib/Mojolicious/Plugin/DefaultHelpers.pm

View

@@ -25,25 +25,13 @@ sub register {
     );
   }
 
-  # Add "config" helper
   $app->helper(config => sub { shift->app->config(@_) });
-
-  # Add "content" helper
-  $app->helper(content => \&_content);
-
-  # Add "content_for" helper
-  $app->helper(content_for => \&_content_for);
-
-  # Add "current_route" helper
+  $app->helper(content       => \&_content);
+  $app->helper(content_for   => \&_content_for);
   $app->helper(current_route => \&_current_route);
+  $app->helper(dumper        => \&_dumper);
+  $app->helper(include       => \&_include);
 
-  # Add "dumper" helper
-  $app->helper(dumper => \&_dumper);
-
-  # Add "include" helper
-  $app->helper(include => \&_include);
-
-  # Add "memorize" helper
   my %mem;
   $app->helper(
     memorize => sub {
@@ -77,7 +65,6 @@ sub register {
     }
   );
 
-  # Add "url_with" helper
   $app->helper(url_with => \&_url_with);
 }
 
@@ -157,19 +144,19 @@ example for learning to build new plugins, you're welcome to fork it.
 
 L<Mojolicious::Plugin::DefaultHelpers> implements the following helpers.
 
-=head2 C<app>
+=head2 app
 
   %= app->secret
 
 Alias for L<Mojolicious::Controller/"app">.
 
-=head2 C<config>
+=head2 config
 
   %= config 'something'
 
 Alias for L<Mojo/"config">.
 
-=head2 C<content>
+=head2 content
 
   %= content foo => begin
     test
@@ -181,7 +168,7 @@ Alias for L<Mojo/"config">.
 
 Store partial rendered content in named buffer and retrieve it.
 
-=head2 C<content_for>
+=head2 content_for
 
   % content_for foo => begin
     test
@@ -198,7 +185,7 @@ Append partial rendered content to named buffer and retrieve it.
   % end
   %= content_for 'message'
 
-=head2 C<current_route>
+=head2 current_route
 
   % if (current_route 'login') {
     Welcome to Mojolicious!
@@ -207,26 +194,26 @@ Append partial rendered content to named buffer and retrieve it.
 
 Check or get name of current route.
 
-=head2 C<dumper>
+=head2 dumper
 
   %= dumper {some => 'data'}
 
 Dump a Perl data structure with L<Data::Dumper>.
 
-=head2 C<extends>
+=head2 extends
 
   % extends 'blue';
   % extends 'blue', title => 'Blue!';
 
 Extend a template. All additional values get merged into the C<stash>.
 
-=head2 C<flash>
+=head2 flash
 
   %= flash 'foo'
 
 Alias for L<Mojolicious::Controller/"flash">.
 
-=head2 C<include>
+=head2 include
 
   %= include 'menubar'
   %= include 'menubar', format => 'txt'
@@ -234,7 +221,7 @@ Alias for L<Mojolicious::Controller/"flash">.
 Include a partial template, all arguments get localized automatically and are
 only available in the partial template.
 
-=head2 C<layout>
+=head2 layout
 
   % layout 'green';
   % layout 'green', title => 'Green!';
@@ -242,7 +229,7 @@ only available in the partial template.
 Render this template with a layout. All additional values get merged into the
 C<stash>.
 
-=head2 C<memorize>
+=head2 memorize
 
   %= memorize begin
     %= time
@@ -259,19 +246,19 @@ C<stash>.
 
 Memorize block result in memory and prevent future execution.
 
-=head2 C<param>
+=head2 param
 
   %= param 'foo'
 
 Alias for L<Mojolicious::Controller/"param">.
 
-=head2 C<session>
+=head2 session
 
   %= session 'foo'
 
 Alias for L<Mojolicious::Controller/"session">.
 
-=head2 C<stash>
+=head2 stash
 
   %= stash 'foo'
   % stash foo => 'bar';
@@ -280,7 +267,7 @@ Alias for L<Mojolicious::Controller/"stash">.
 
   %= stash 'name' // 'Somebody'
 
-=head2 C<title>
+=head2 title
 
   % title 'Welcome!';
   % title 'Welcome!', foo => 'bar';
@@ -288,13 +275,13 @@ Alias for L<Mojolicious::Controller/"stash">.
 
 Page title. All additional values get merged into the C<stash>.
 
-=head2 C<url_for>
+=head2 url_for
 
   %= url_for 'named', controller => 'bar', action => 'baz'
 
 Alias for L<Mojolicious::Controller/"url_for">.
 
-=head2 C<url_with>
+=head2 url_with
 
   %= url_with 'named', controller => 'bar', action => 'baz'
 
@@ -308,7 +295,7 @@ request.
 L<Mojolicious::Plugin::DefaultHelpers> inherits all methods from
 L<Mojolicious::Plugin> and implements the following new ones.
 
-=head2 C<register>
+=head2 register
 
   $plugin->register(Mojolicious->new);
 

+2 -7

mojolegacy/lib/Mojolicious/Plugin/EPLRenderer.pm

View

@@ -4,12 +4,7 @@ use Mojo::Base 'Mojolicious::Plugin';
 use Mojo::Template;
 use Mojo::Util qw(encode md5_sum);
 
-sub register {
-  my ($self, $app) = @_;
-
-  # Add "epl" handler
-  $app->renderer->add_handler(epl => \&_epl);
-}
+sub register { $_[1]->renderer->add_handler(epl => \&_epl) }
 
 sub _epl {
   my ($renderer, $c, $output, $options) = @_;
@@ -96,7 +91,7 @@ example for learning to build new plugins, you're welcome to fork it.
 L<Mojolicious::Plugin::EPLRenderer> inherits all methods from
 L<Mojolicious::Plugin> and implements the following new ones.
 
-=head2 C<register>
+=head2 register
 
   $plugin->register(Mojolicious->new);
 

+6 -9

mojolegacy/lib/Mojolicious/Plugin/EPRenderer.pm

View

@@ -11,8 +11,8 @@ sub register {
   # Auto escape by default to prevent XSS attacks
   my $template = {auto_escape => 1, %{$conf->{template} || {}}};
 
-  # Add "ep" handler
-  $app->renderer->add_handler(
+  # Add "ep" handler and make it the default
+  $app->renderer->default_handler('ep')->add_handler(
     $conf->{name} || 'ep' => sub {
       my ($renderer, $c, $output, $options) = @_;
 
@@ -39,7 +39,7 @@ sub register {
         # Be less relaxed for everything else
         $prepend .= 'use strict;';
 
-        # Stash
+        # Stash values
         $prepend .= 'my $_S = $self->stash;';
         $prepend .= " my \$$_ = \$_S->{'$_'};"
           for grep {/^\w+$/} keys %{$c->stash};
@@ -52,9 +52,6 @@ sub register {
       return $renderer->handlers->{epl}->($renderer, $c, $output, $options);
     }
   );
-
-  # Set default handler
-  $app->renderer->default_handler('ep');
 }
 
 1;
@@ -92,14 +89,14 @@ example for learning to build new plugins, you're welcome to fork it.
 
 L<Mojolicious::Plugin::EPRenderer> supports the following options.
 
-=head2 C<name>
+=head2 name
 
   # Mojolicious::Lite
   plugin EPRenderer => {name => 'foo'};
 
 Handler name, defaults to C<ep>.
 
-=head2 C<template>
+=head2 template
 
   # Mojolicious::Lite
   plugin EPRenderer => {template => {line_start => '.'}};
@@ -111,7 +108,7 @@ Attribute values passed to L<Mojo::Template> object used to render templates.
 L<Mojolicious::Plugin::EPRenderer> inherits all methods from
 L<Mojolicious::Plugin> and implements the following new ones.
 
-=head2 C<register>
+=head2 register
 
   $plugin->register(Mojolicious->new);
   $plugin->register(Mojolicious->new, {name => 'foo'});

+1 -6

mojolegacy/lib/Mojolicious/Plugin/HeaderCondition.pm

View

@@ -4,14 +4,9 @@ use Mojo::Base 'Mojolicious::Plugin';
 sub register {
   my ($self, $app) = @_;
 
-  # "headers" condition
   $app->routes->add_condition(headers => \&_headers);
-
-  # "agent" condition
   $app->routes->add_condition(
     agent => sub { _headers(@_[0 .. 2], {'User-Agent' => $_[3]}) });
-
-  # "host" condition
   $app->routes->add_condition(
     host => sub { _check($_[1]->req->url->to_abs->host, $_[3]) });
 }
@@ -77,7 +72,7 @@ example for learning to build new plugins, you're welcome to fork it.
 L<Mojolicious::Plugin::HeaderCondition> inherits all methods from
 L<Mojolicious::Plugin> and implements the following new ones.
 
-=head2 C<register>
+=head2 register
 
   $plugin->register(Mojolicious->new);
 

+7 -12

mojolegacy/lib/Mojolicious/Plugin/JSONConfig.pm

View

@@ -8,12 +8,8 @@ use Mojo::Util 'encode';
 sub parse {
   my ($self, $content, $file, $conf, $app) = @_;
 
-  # Render
-  $content = $self->render($content, $file, $conf, $app);
-
-  # Parse
   my $json   = Mojo::JSON->new;
-  my $config = $json->decode($content);
+  my $config = $json->decode($self->render($content, $file, $conf, $app));
   my $err    = $json->error;
   die qq{Couldn't parse config "$file": $err} if !$config && $err;
   die qq{Invalid config "$file".} if !$config || ref $config ne 'HASH';
@@ -30,7 +26,7 @@ sub render {
   my $prepend = q[my $app = shift; no strict 'refs'; no warnings 'redefine';];
   $prepend .= q[sub app; *app = sub { $app }; use Mojo::Base -strict;];
 
-  # Render
+  # Render and encode for JSON decoding
   my $mt = Mojo::Template->new($conf->{template} || {})->name($file);
   my $json = $mt->prepend($prepend . $mt->prepend)->render($content, $app);
   return ref $json ? die $json : encode 'UTF-8', $json;
@@ -73,8 +69,7 @@ preprocesses its input with L<Mojo::Template>.
 The application object can be accessed via C<$app> or the C<app> function. You
 can extend the normal config file C<myapp.json> with C<mode> specific ones
 like C<myapp.$mode.json>. A default configuration filename will be generated
-by decamelizing the application class with L<Mojo::Util/"decamelize"> or from
-the application filename.
+from the value of L<Mojolicious/"moniker">.
 
 The code of this plugin is a good example for learning to build new plugins,
 you're welcome to fork it.
@@ -84,7 +79,7 @@ you're welcome to fork it.
 L<Mojolicious::Plugin::JSONConfig> inherits all options from
 L<Mojolicious::Plugin::Config> and supports the following new ones.
 
-=head2 C<template>
+=head2 template
 
   # Mojolicious::Lite
   plugin JSONConfig => {template => {line_start => '.'}};
@@ -97,7 +92,7 @@ configuration files.
 L<Mojolicious::Plugin::JSONConfig> inherits all methods from
 L<Mojolicious::Plugin::Config> and implements the following new ones.
 
-=head2 C<parse>
+=head2 parse
 
   $plugin->parse($content, $file, $conf, $app);
 
@@ -111,14 +106,14 @@ Process content with C<render> and parse it with L<Mojo::JSON>.
     return $hash;
   }
 
-=head2 C<register>
+=head2 register
 
   my $config = $plugin->register(Mojolicious->new);
   my $config = $plugin->register(Mojolicious->new, {file => '/etc/foo.conf'});
 
 Register plugin in L<Mojolicious> application.
 
-=head2 C<render>
+=head2 render
 
   $plugin->render($content, $file, $conf, $app);
 

+1 -3

mojolegacy/lib/Mojolicious/Plugin/Mount.pm

View

@@ -6,7 +6,6 @@ use Mojo::Server;
 sub register {
   my ($self, $app, $conf) = @_;
 
-  # Load application
   my $path  = (keys %$conf)[0];
   my $embed = Mojo::Server->new->load_app($conf->{$path});
 
@@ -17,7 +16,6 @@ sub register {
     $path = $3;
   }
 
-  # Generate route
   my $route = $app->routes->route($path)->detour(app => $embed);
   $route->over(host => $host) if $host;
 
@@ -64,7 +62,7 @@ you're welcome to fork it.
 L<Mojolicious::Plugin::Mount> inherits all methods from L<Mojolicious::Plugin>
 and implements the following new ones.
 
-=head2 C<register>
+=head2 register
 
   my $route = $plugin->register(Mojolicious->new, {'/foo' => '/some/app.pl'});
 

+8 -15

mojolegacy/lib/Mojolicious/Plugin/PODRenderer.pm

View

@@ -8,13 +8,12 @@ use Mojo::Util 'url_escape';
 BEGIN {eval {require Pod::Simple::HTML; import Pod::Simple::HTML}}
 BEGIN {eval {require Pod::Simple::Search; import Pod::Simple::Search}}
 
-# Paths
+# Paths to search
 my @PATHS = map { $_, "$_/pods" } @INC;
 
 sub register {
   my ($self, $app, $conf) = @_;
 
-  # Add "pod" handler
   my $preprocess = $conf->{preprocess} || 'ep';
   $app->renderer->add_handler(
     $conf->{name} || 'pod' => sub {
@@ -28,10 +27,9 @@ sub register {
     }
   );
 
-  # Add "pod_to_html" helper
   $app->helper(pod_to_html => sub { shift; b(_pod_to_html(@_)) });
 
-  # Perldoc
+  # Perldoc browser
   return if $conf->{no_perldoc};
   return $app->routes->any(
     '/perldoc/*module' => {module => 'Mojolicious/Guides'} => \&_perldoc);
@@ -40,12 +38,10 @@ sub register {
 sub _perldoc {
   my $self = shift;
 
-  # Find module
+  # Find module or redirect to CPAN
   my $module = $self->param('module');
   $module =~ s!/!::!g;
   my $path = Pod::Simple::Search->new->find($module, @PATHS);
-
-  # Redirect to CPAN
   return $self->redirect_to("http://metacpan.org/module/$module")
     unless $path && -r $path;
 
@@ -120,14 +116,11 @@ sub _pod_to_html {
   # Block
   $pod = $pod->() if ref $pod eq 'CODE';
 
-  # Parser
   my $parser = Pod::Simple::HTML->new;
   $parser->force_title('');
   $parser->html_header_before_title('');
   $parser->html_header_after_title('');
   $parser->html_footer('');
-
-  # Parse
   $parser->output_string(\(my $output));
   return $@ unless eval { $parser->parse_string_document("$pod"); 1 };
 
@@ -170,14 +163,14 @@ you're welcome to fork it.
 
 L<Mojolicious::Plugin::PODRenderer> supports the following options.
 
-=head2 C<name>
+=head2 name
 
   # Mojolicious::Lite
   plugin PODRenderer => {name => 'foo'};
 
 Handler name, defaults to C<pod>.
 
-=head2 C<no_perldoc>
+=head2 no_perldoc
 
   # Mojolicious::Lite
   plugin PODRenderer => {no_perldoc => 1};
@@ -185,7 +178,7 @@ Handler name, defaults to C<pod>.
 Disable L<Mojolicious::Guides> documentation browser that will otherwise be
 available under C</perldoc>.
 
-=head2 C<preprocess>
+=head2 preprocess
 
   # Mojolicious::Lite
   plugin PODRenderer => {preprocess => 'epl'};
@@ -196,7 +189,7 @@ Name of handler used to preprocess POD, defaults to C<ep>.
 
 L<Mojolicious::Plugin::PODRenderer> implements the following helpers.
 
-=head2 C<pod_to_html>
+=head2 pod_to_html
 
   %= pod_to_html '=head2 lalala'
   <%= pod_to_html begin %>=head2 lalala<% end %>
@@ -208,7 +201,7 @@ Render POD to HTML without preprocessing.
 L<Mojolicious::Plugin::PODRenderer> inherits all methods from
 L<Mojolicious::Plugin> and implements the following new ones.
 
-=head2 C<register>
+=head2 register
 
   my $route = $plugin->register(Mojolicious->new);
   my $route = $plugin->register(Mojolicious->new, {name => 'foo'});

+3 -3

mojolegacy/lib/Mojolicious/Plugin/PoweredBy.pm

View

@@ -36,7 +36,7 @@ example for learning to build new plugins, you're welcome to fork it.
 
 L<Mojolicious::Plugin::PoweredBy> supports the following options.
 
-=head2 C<name>
+=head2 name
 
   plugin PoweredBy => (name => 'MyApp 1.0');
 
@@ -47,12 +47,12 @@ Value for C<X-Powered-By> header, defaults to C<Mojolicious (Perl)>.
 L<Mojolicious::Plugin::PoweredBy> inherits all methods from
 L<Mojolicious::Plugin> and implements the following new ones.
 
-=head2 C<register>
+=head2 register
 
   $plugin->register(Mojolicious->new);
   $plugin->register(Mojolicious->new, {name => 'MyFramework 1.0'});
 
-Register plugin hooks in L<Mojolicious> application.
+Register hooks in L<Mojolicious> application.
 
 =head1 SEE ALSO
 

+3 -7

mojolegacy/lib/Mojolicious/Plugin/RequestTimer.pm

View

@@ -5,11 +5,7 @@ use Time::HiRes qw(gettimeofday tv_interval);
 
 sub register {
   my ($self, $app) = @_;
-
-  # Start timer
-  $app->hook(after_static_dispatch => \&_start);
-
-  # End timer
+  $app->hook(before_routes  => \&_start);
   $app->hook(after_dispatch => \&_end);
 }
 
@@ -70,11 +66,11 @@ example for learning to build new plugins, you're welcome to fork it.
 L<Mojolicious::Plugin::RequestTimer> inherits all methods from
 L<Mojolicious::Plugin> and implements the following new ones.
 
-=head2 C<register>
+=head2 register
 
   $plugin->register(Mojolicious->new);
 
-Register plugin hooks in L<Mojolicious> application.
+Register hooks in L<Mojolicious> application.
 
 =head1 SEE ALSO
 

+43 -76

mojolegacy/lib/Mojolicious/Plugin/TagHelpers.pm

View

@@ -13,57 +13,38 @@ sub register {
     $app->helper("${name}_field" => sub { _input(@_, type => $name) });
   }
 
-  # Add "base_tag" helper
+  # DEPRECATED in Rainbow!
   $app->helper(
-    base_tag => sub { _tag('base', href => shift->req->url->base, @_) });
+    base_tag => sub {
+      warn "base_tag is DEPRECATED!!!\n";
+      _tag('base', href => shift->req->url->base, @_);
+    }
+  );
 
-  # Add "checkbox" helper
   $app->helper(check_box =>
       sub { _input(shift, shift, value => shift, @_, type => 'checkbox') });
-
-  # Add "file_field" helper
   $app->helper(file_field =>
       sub { shift; _tag('input', name => shift, @_, type => 'file') });
 
-  # Add "form_for" helper
-  $app->helper(form_for => \&_form_for);
-
-  # Add "hidden_field" helper
+  $app->helper(form_for     => \&_form_for);
   $app->helper(hidden_field => \&_hidden_field);
-
-  # Add "image" helper
   $app->helper(image => sub { _tag('img', src => shift->url_for(shift), @_) });
-
-  # Add "input_tag" helper
   $app->helper(input_tag => sub { _input(@_) });
-
-  # Add "javascript" helper
   $app->helper(javascript => \&_javascript);
+  $app->helper(link_to    => \&_link_to);
 
-  # Add "link_to" helper
-  $app->helper(link_to => \&_link_to);
-
-  # Add "password_field" helper
   $app->helper(password_field =>
       sub { shift; _tag('input', name => shift, @_, type => 'password') });
-
-  # Add "radio_button" helper
   $app->helper(radio_button =>
       sub { _input(shift, shift, value => shift, @_, type => 'radio') });
 
-  # Add "select_field" helper
-  $app->helper(select_field => \&_select_field);
-
-  # Add "stylesheet" helper
-  $app->helper(stylesheet => \&_stylesheet);
-
-  # Add "submit_button" helper
+  $app->helper(select_field  => \&_select_field);
+  $app->helper(stylesheet    => \&_stylesheet);
   $app->helper(submit_button => \&_submit_button);
 
-  # Add "t" and "tag" helpers
+  # "t" is just a shortcut for the "tag" helper
   $app->helper($_ => sub { shift; _tag(@_) }) for qw(t tag);
 
-  # Add "text_area" helper
   $app->helper(text_area => \&_text_area);
 }
 
@@ -93,14 +74,10 @@ sub _hidden_field {
 
 sub _input {
   my ($self, $name) = (shift, shift);
-
-  # Attributes
   my %attrs = @_ % 2 ? (value => shift, @_) : @_;
 
-  # Values
-  my @values = $self->param($name);
-
   # Special selection value
+  my @values = $self->param($name);
   my $type = $attrs{type} || '';
   if (@values && $type ne 'submit') {
 
@@ -206,10 +183,8 @@ sub _stylesheet {
     $cb = sub { "/*<![CDATA[*/\n" . $old->() . "\n/*]]>*/" }
   }
 
-  # URL
-  my $href = @_ % 2 ? $self->url_for(shift) : undef;
-
   # "link" or "style" tag
+  my $href = @_ % 2 ? $self->url_for(shift) : undef;
   return $href
     ? _tag('link', rel => 'stylesheet', href => $href, media => 'screen', @_)
     : _tag('style', @_, $cb);
@@ -299,15 +274,7 @@ example for learning how to build new plugins, you're welcome to fork it.
 
 L<Mojolicious::Plugin::TagHelpers> implements the following helpers.
 
-=head2 C<base_tag>
-
-  %= base_tag
-
-Generate portable C<base> tag refering to the current base URL.
-
-  <base href="http://localhost/cgi-bin/myapp.pl" />
-
-=head2 C<check_box>
+=head2 check_box
 
   %= check_box employed => 1
   %= check_box employed => 1, id => 'foo'
@@ -318,7 +285,7 @@ picked up and shown as default.
   <input name="employed" type="checkbox" value="1" />
   <input id="foo" name="employed" type="checkbox" value="1" />
 
-=head2 C<color_field>
+=head2 color_field
 
   %= color_field 'background'
   %= color_field background => '#ffffff'
@@ -331,7 +298,7 @@ picked up and shown as default.
   <input name="background" type="color" value="#ffffff" />
   <input id="foo" name="background" type="color" value="#ffffff" />
 
-=head2 C<date_field>
+=head2 date_field
 
   %= date_field 'end'
   %= date_field end => '2012-12-21'
@@ -344,7 +311,7 @@ picked up and shown as default.
   <input name="end" type="date" value="2012-12-21" />
   <input id="foo" name="end" type="date" value="2012-12-21" />
 
-=head2 C<datetime_field>
+=head2 datetime_field
 
   %= datetime_field 'end'
   %= datetime_field end => '2012-12-21T23:59:59Z'
@@ -357,7 +324,7 @@ picked up and shown as default.
   <input name="end" type="datetime" value="2012-12-21T23:59:59Z" />
   <input id="foo" name="end" type="datetime" value="2012-12-21T23:59:59Z" />
 
-=head2 C<email_field>
+=head2 email_field
 
   %= email_field 'notify'
   %= email_field notify => 'nospam@example.com'
@@ -370,7 +337,7 @@ picked up and shown as default.
   <input name="notify" type="email" value="nospam@example.com" />
   <input id="foo" name="notify" type="email" value="nospam@example.com" />
 
-=head2 C<file_field>
+=head2 file_field
 
   %= file_field 'avatar'
   %= file_field 'avatar', id => 'foo'
@@ -380,7 +347,7 @@ Generate file input element.
   <input name="avatar" type="file" />
   <input id="foo" name="avatar" type="file" />
 
-=head2 C<form_for>
+=head2 form_for
 
   %= form_for login => begin
     %= text_field 'first_name'
@@ -419,7 +386,7 @@ but not C<GET>, a C<method> attribute will be automatically added.
     <input value="Ok" type="submit" />
   </form>
 
-=head2 C<hidden_field>
+=head2 hidden_field
 
   %= hidden_field foo => 'bar'
   %= hidden_field foo => 'bar', id => 'bar'
@@ -429,7 +396,7 @@ Generate hidden input element.
   <input name="foo" type="hidden" value="bar" />
   <input id="bar" name="foo" type="hidden" value="bar" />
 
-=head2 C<image>
+=head2 image
 
   %= image '/images/foo.png'
   %= image '/images/foo.png', alt => 'Foo'
@@ -439,7 +406,7 @@ Generate image tag.
   <img src="/images/foo.png" />
   <img alt="Foo" src="/images/foo.png" />
 
-=head2 C<input_tag>
+=head2 input_tag
 
   %= input_tag 'first_name'
   %= input_tag first_name => 'Default name'
@@ -452,7 +419,7 @@ picked up and shown as default.
   <input name="first_name" value="Default name" />
   <input name="employed" type="checkbox" />
 
-=head2 C<javascript>
+=head2 javascript
 
   %= javascript '/script.js'
   %= javascript begin
@@ -466,7 +433,7 @@ Generate portable script tag for C<Javascript> asset.
     var a = 'b';
   ]]></script>
 
-=head2 C<link_to>
+=head2 link_to
 
   %= link_to Home => 'index'
   %= link_to Home => 'index' => {format => 'txt'} => (class => 'links')
@@ -491,7 +458,7 @@ capitalized link target as content.
   <a href="http://mojolicio.us">Mojolicious</a>
   <a href="http://127.0.0.1:3000/current/path?foo=bar">Retry</a>
 
-=head2 C<month_field>
+=head2 month_field
 
   %= month_field 'vacation'
   %= month_field vacation => '2012-12'
@@ -504,7 +471,7 @@ picked up and shown as default.
   <input name="vacation" type="month" value="2012-12" />
   <input id="foo" name="vacation" type="month" value="2012-12" />
 
-=head2 C<number_field>
+=head2 number_field
 
   %= number_field 'age'
   %= number_field age => 25
@@ -517,7 +484,7 @@ picked up and shown as default.
   <input name="age" type="number" value="25" />
   <input id="foo" max="200" min="0" name="age" type="number" value="25" />
 
-=head2 C<password_field>
+=head2 password_field
 
   %= password_field 'pass'
   %= password_field 'pass', id => 'foo'
@@ -527,7 +494,7 @@ Generate password input element.
   <input name="pass" type="password" />
   <input id="foo" name="pass" type="password" />
 
-=head2 C<radio_button>
+=head2 radio_button
 
   %= radio_button country => 'germany'
   %= radio_button country => 'germany', id => 'foo'
@@ -538,7 +505,7 @@ picked up and shown as default.
   <input name="country" type="radio" value="germany" />
   <input id="foo" name="country" type="radio" value="germany" />
 
-=head2 C<range_field>
+=head2 range_field
 
   %= range_field 'age'
   %= range_field age => 25
@@ -551,7 +518,7 @@ picked up and shown as default.
   <input name="age" type="range" value="25" />
   <input id="foo" max="200" min="200" name="age" type="range" value="25" />
 
-=head2 C<search_field>
+=head2 search_field
 
   %= search_field 'q'
   %= search_field q => 'perl'
@@ -564,7 +531,7 @@ picked up and shown as default.
   <input name="q" type="search" value="perl" />
   <input id="foo" name="q" type="search" value="perl" />
 
-=head2 C<select_field>
+=head2 select_field
 
   %= select_field language => [qw(de en)]
   %= select_field language => [qw(de en)], id => 'lang'
@@ -598,7 +565,7 @@ automatically get picked up and shown as default.
     <option value="en">en</option>
   </select>
 
-=head2 C<stylesheet>
+=head2 stylesheet
 
   %= stylesheet '/foo.css'
   %= stylesheet begin
@@ -612,7 +579,7 @@ Generate portable style or link tag for C<CSS> asset.
     body {color: #000}
   ]]></style>
 
-=head2 C<submit_button>
+=head2 submit_button
 
   %= submit_button
   %= submit_button 'Ok!', id => 'foo'
@@ -622,7 +589,7 @@ Generate submit input element.
   <input type="submit" value="Ok" />
   <input id="foo" type="submit" value="Ok!" />
 
-=head2 C<t>
+=head2 t
 
   %=t div => 'some & content'
 
@@ -630,7 +597,7 @@ Alias for C<tag>.
 
   <div>some &amp; content</div>
 
-=head2 C<tag>
+=head2 tag
 
   %= tag 'div'
   %= tag 'div', id => 'foo'
@@ -653,7 +620,7 @@ Very useful for reuse in more specific tag helpers.
 Results are automatically wrapped in L<Mojo::ByteStream> objects to prevent
 accidental double escaping.
 
-=head2 C<tel_field>
+=head2 tel_field
 
   %= tel_field 'work'
   %= tel_field work => '123456789'
@@ -666,7 +633,7 @@ picked up and shown as default.
   <input name="work" type="tel" value="123456789" />
   <input id="foo" name="work" type="tel" value="123456789" />
 
-=head2 C<text_area>
+=head2 text_area
 
   %= text_area 'foo'
   %= text_area 'foo', cols => 40
@@ -685,7 +652,7 @@ up and shown as default.
     Default!
   </textarea>
 
-=head2 C<text_field>
+=head2 text_field
 
   %= text_field 'first_name'
   %= text_field first_name => 'Default name'
@@ -698,7 +665,7 @@ picked up and shown as default.
   <input name="first_name" type="text" value="Default name" />
   <input class="user" name="first_name" type="text" value="Default name" />
 
-=head2 C<time_field>
+=head2 time_field
 
   %= time_field 'start'
   %= time_field start => '23:59:59'
@@ -711,7 +678,7 @@ picked up and shown as default.
   <input name="start" type="time" value="23:59:59" />
   <input id="foo" name="start" type="time" value="23:59:59" />
 
-=head2 C<url_field>
+=head2 url_field
 
   %= url_field 'address'
   %= url_field address => 'http://mojolicio.us'
@@ -724,7 +691,7 @@ picked up and shown as default.
   <input name="address" type="url" value="http://mojolicio.us" />
   <input id="foo" name="address" type="url" value="http://mojolicio.us" />
 
-=head2 C<week_field>
+=head2 week_field
 
   %= week_field 'vacation'
   %= week_field vacation => '2012-W17'
@@ -742,7 +709,7 @@ picked up and shown as default.
 L<Mojolicious::Plugin::TagHelpers> inherits all methods from
 L<Mojolicious::Plugin> and implements the following new ones.
 
-=head2 C<register>
+=head2 register
 
   $plugin->register(Mojolicious->new);
 

+72 -13

mojolegacy/lib/Mojolicious/Plugins.pm

View

@@ -37,11 +37,11 @@ sub load_plugin {
   my $class = $name =~ /^[a-z]/ ? camelize($name) : $name;
   for my $namespace (@{$self->namespaces}) {
     my $module = "${namespace}::$class";
-    return $module->new if $self->_load($module);
+    return $module->new if _load($module);
   }
 
   # Full module name
-  return $name->new if $self->_load($name);
+  return $name->new if _load($name);
 
   # Not found
   die qq{Plugin "$name" missing, maybe you need to install it?\n};
@@ -52,14 +52,10 @@ sub register_plugin {
 }
 
 sub _load {
-  my ($self, $module) = @_;
-
-  # Load
+  my $module = shift;
   if (my $e = Mojo::Loader->new->load($module)) {
     ref $e ? die $e : return undef;
   }
-
-  # Module is a plugin
   return $module->isa('Mojolicious::Plugin') ? 1 : undef;
 }
 
@@ -80,11 +76,74 @@ Mojolicious::Plugins - Plugin manager
 
 L<Mojolicious::Plugins> is the plugin manager of L<Mojolicious>.
 
+=head1 PLUGINS
+
+The following plugins are included in the L<Mojolicious> distribution as
+examples.
+
+=over 2
+
+=item L<Mojolicious::Plugin::Charset>
+
+Change the application charset.
+
+=item L<Mojolicious::Plugin::Config>
+
+Perl-ish configuration files.
+
+=item L<Mojolicious::Plugin::DefaultHelpers>
+
+General purpose helper collection, loaded automatically.
+
+=item L<Mojolicious::Plugin::EPLRenderer>
+
+Renderer for plain embedded Perl templates, loaded automatically.
+
+=item L<Mojolicious::Plugin::EPRenderer>
+
+Renderer for more sophisiticated embedded Perl templates, loaded
+automatically.
+
+=item L<Mojolicious::Plugin::HeaderCondition>
+
+Route condition for all kinds of headers, loaded automatically.
+
+=item L<Mojolicious::Plugin::JSONConfig>
+
+JSON configuration files.
+
+=item L<Mojolicious::Plugin::Mount>
+
+Mount whole L<Mojolicious> applications.
+
+=item L<Mojolicious::Plugin::PODRenderer>
+
+Renderer for turning POD into HTML and documentation browser for
+L<Mojolicious::Guides>.
+
+=item L<Mojolicious::Plugin::PoweredBy>
+
+Add an C<X-Powered-By> header to outgoing responses, loaded automatically.
+
+=item L<Mojolicious::Plugin::RequestTimer>
+
+Log timing information, loaded automatically.
+
+=item L<Mojolicious::Plugin::TagHelpers>
+
+Template specific helper collection, loaded automatically.
+
+=back
+
+=head1 EVENTS
+
+L<Mojolicious::Plugins> inherits all events from L<Mojo::EventEmitter>.
+
 =head1 ATTRIBUTES
 
 L<Mojolicious::Plugins> implements the following attributes.
 
-=head2 C<namespaces>
+=head2 namespaces
 
   my $namespaces = $plugins->namespaces;
   $plugins       = $plugins->namespaces(['Mojolicious::Plugin']);
@@ -99,28 +158,28 @@ Namespaces to load plugins from, defaults to L<Mojolicious::Plugin>.
 L<Mojolicious::Plugins> inherits all methods from L<Mojo::EventEmitter> and
 implements the following new ones.
 
-=head2 C<emit_chain>
+=head2 emit_chain
 
   $plugins = $plugins->emit_chain('foo');
   $plugins = $plugins->emit_chain(foo => 123);
 
 Emit events as chained hooks.
 
-=head2 C<emit_hook>
+=head2 emit_hook
 
   $plugins = $plugins->emit_hook('foo');
   $plugins = $plugins->emit_hook(foo => 123);
 
 Emit events as hooks.
 
-=head2 C<emit_hook_reverse>
+=head2 emit_hook_reverse
 
   $plugins = $plugins->emit_hook_reverse('foo');
   $plugins = $plugins->emit_hook_reverse(foo => 123);
 
 Emit events as hooks in reverse order.
 
-=head2 C<load_plugin>
+=head2 load_plugin
 
   my $plugin = $plugins->load_plugin('some_thing');
   my $plugin = $plugins->load_plugin('SomeThing');
@@ -128,7 +187,7 @@ Emit events as hooks in reverse order.
 
 Load a plugin from the configured namespaces or by full module name.
 
-=head2 C<register_plugin>
+=head2 register_plugin
 
   $plugins->register_plugin('some_thing', Mojolicious->new);
   $plugins->register_plugin('some_thing', Mojolicious->new, foo => 23);

+38 -53

mojolegacy/lib/Mojolicious/Renderer.pm

View

@@ -6,7 +6,7 @@ use Mojo::Cache;
 use Mojo::JSON;
 use Mojo::Home;
 use Mojo::Loader;
-use Mojo::Util 'encode';
+use Mojo::Util qw(encode slurp);
 
 has cache   => sub { Mojo::Cache->new };
 has classes => sub { ['main'] };
@@ -20,25 +20,22 @@ has paths => sub { [] };
 my $HOME = Mojo::Home->new;
 $HOME->parse(
   $HOME->parse($HOME->mojo_lib_dir)->rel_dir('Mojolicious/templates'));
-my %TEMPLATES = map { $_ => $HOME->slurp_rel_file($_) } @{$HOME->list_files};
+my %TEMPLATES = map { $_ => slurp $HOME->rel_file($_) } @{$HOME->list_files};
 
 sub new {
-  my $self = shift->SUPER::new(@_)->add_handler(json => \&_json);
-  return $self->add_handler(data => \&_data)->add_handler(text => \&_text);
-}
+  my $self = shift->SUPER::new(@_);
 
-sub add_handler {
-  my ($self, $name, $cb) = @_;
-  $self->handlers->{$name} = $cb;
-  return $self;
-}
+  $self->add_handler(
+    json => sub { ${$_[2]} = Mojo::JSON->new->encode($_[3]->{json}) });
+  $self->add_handler(data => sub { ${$_[2]} = $_[3]->{data} });
+  $self->add_handler(text => sub { ${$_[2]} = $_[3]->{text} });
 
-sub add_helper {
-  my ($self, $name, $cb) = @_;
-  $self->helpers->{$name} = $cb;
   return $self;
 }
 
+sub add_handler { shift->_add(handlers => @_) }
+sub add_helper  { shift->_add(helpers  => @_) }
+
 sub get_data_template {
   my ($self, $options) = @_;
 
@@ -131,7 +128,7 @@ sub render {
       if !$partial && $options->{encoding} && $output;
   }
 
-  return $output, $c->app->types->type($format) || 'text/plain';
+  return $output, $format;
 }
 
 sub template_name {
@@ -158,13 +155,14 @@ sub template_path {
   return catfile($self->paths->[0], split '/', $name);
 }
 
-sub _bundled { $TEMPLATES{"@{[pop]}.html.ep"} }
-
-sub _data {
-  my ($self, $c, $output, $options) = @_;
-  $$output = $options->{data};
+sub _add {
+  my ($self, $attr, $name, $cb) = @_;
+  $self->$attr->{$name} = $cb;
+  return $self;
 }
 
+sub _bundled { $TEMPLATES{"@{[pop]}.html.ep"} }
+
 sub _detect_handler {
   my ($self, $options) = @_;
 
@@ -196,11 +194,6 @@ sub _extends {
   return delete $stash->{extends};
 }
 
-sub _json {
-  my ($self, $c, $output, $options) = @_;
-  $$output = Mojo::JSON->new->encode($options->{json});
-}
-
 sub _render_template {
   my ($self, $c, $output, $options) = @_;
 
@@ -216,16 +209,11 @@ sub _render_template {
   return undef;
 }
 
-sub _text {
-  my ($self, $c, $output, $options) = @_;
-  $$output = $options->{text};
-}
-
 1;
 
 =head1 NAME
 
-Mojolicious::Renderer - MIME type based renderer
+Mojolicious::Renderer - Generate dynamic content
 
 =head1 SYNOPSIS
 
@@ -245,14 +233,14 @@ See L<Mojolicious::Guides::Rendering> for more.
 
 L<Mojolicious::Renderer> implements the following attributes.
 
-=head2 C<cache>
+=head2 cache
 
   my $cache = $renderer->cache;
   $renderer = $renderer->cache(Mojo::Cache->new);
 
 Renderer cache, defaults to a L<Mojo::Cache> object.
 
-=head2 C<classes>
+=head2 classes
 
   my $classes = $renderer->classes;
   $renderer   = $renderer->classes(['main']);
@@ -263,15 +251,14 @@ highest precedence, defaults to C<main>.
   # Add another class with templates in DATA section
   push @{$renderer->classes}, 'Mojolicious::Plugin::Fun';
 
-=head2 C<default_format>
+=head2 default_format
 
   my $default = $renderer->default_format;
   $renderer   = $renderer->default_format('html');
 
-The default format to render if C<format> is not set in the stash. The
-renderer will use L<Mojolicious/"types"> to look up the content MIME type.
+The default format to render if C<format> is not set in the stash.
 
-=head2 C<default_handler>
+=head2 default_handler
 
   my $default = $renderer->default_handler;
   $renderer   = $renderer->default_handler('ep');
@@ -279,28 +266,28 @@ renderer will use L<Mojolicious/"types"> to look up the content MIME type.
 The default template handler to use for rendering in cases where auto
 detection doesn't work, like for C<inline> templates.
 
-=head2 C<encoding>
+=head2 encoding
 
   my $encoding = $renderer->encoding;
   $renderer    = $renderer->encoding('koi8-r');
 
 Will encode the content if set, defaults to C<UTF-8>.
 
-=head2 C<handlers>
+=head2 handlers
 
   my $handlers = $renderer->handlers;
   $renderer    = $renderer->handlers({epl => sub {...}});
 
 Registered handlers.
 
-=head2 C<helpers>
+=head2 helpers
 
   my $helpers = $renderer->helpers;
   $renderer   = $renderer->helpers({url_for => sub {...}});
 
 Registered helpers.
 
-=head2 C<paths>
+=head2 paths
 
   my $paths = $renderer->paths;
   $renderer = $renderer->paths(['/home/sri/templates']);
@@ -313,28 +300,28 @@ Directories to look for templates in, first one has the highest precedence.
 =head1 METHODS
 
 L<Mojolicious::Renderer> inherits all methods from L<Mojo::Base> and
-implements the following ones.
+implements the following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $renderer = Mojolicious::Renderer->new;
 
 Construct a new renderer and register C<data>, C<json> as well as C<text>
 handlers.
 
-=head2 C<add_handler>
+=head2 add_handler
 
   $renderer = $renderer->add_handler(epl => sub {...});
 
 Register a new handler.
 
-=head2 C<add_helper>
+=head2 add_helper
 
   $renderer = $renderer->add_helper(url_for => sub {...});
 
 Register a new helper.
 
-=head2 C<get_data_template>
+=head2 get_data_template
 
   my $template = $renderer->get_data_template({
     template       => 'foo/bar',
@@ -344,20 +331,18 @@ Register a new helper.
 
 Get a C<DATA> section template by name, usually used by handlers.
 
-=head2 C<render>
+=head2 render
 
-  my ($output, $type) = $renderer->render(Mojolicious::Controller->new);
-  my ($output, $type) = $renderer->render(Mojolicious::Controller->new, {
+  my ($output, $format) = $renderer->render(Mojolicious::Controller->new);
+  my ($output, $format) = $renderer->render(Mojolicious::Controller->new, {
     template => 'foo/bar',
     foo      => 'bar'
   });
 
-Render output through one of the Mojo renderers. This renderer requires some
-configuration, at the very least you will need to have a default C<format> and
-a default C<handler> as well as a C<template> or C<text>/C<json>. See
+Render output through one of the renderers. See
 L<Mojolicious::Controller/"render"> for a more user-friendly interface.
 
-=head2 C<template_name>
+=head2 template_name
 
   my $template = $renderer->template_name({
     template => 'foo/bar',
@@ -368,7 +353,7 @@ L<Mojolicious::Controller/"render"> for a more user-friendly interface.
 Builds a template name based on an options hash reference with C<template>,
 C<format> and C<handler>, usually used by handlers.
 
-=head2 C<template_path>
+=head2 template_path
 
   my $path = $renderer->template_path({
     template => 'foo/bar',

+38 -29

mojolegacy/lib/Mojolicious/Routes.pm

View

@@ -14,17 +14,8 @@ has [qw(conditions shortcuts)] => sub { {} };
 has hidden     => sub { [qw(attr has new tap)] };
 has namespaces => sub { [] };
 
-sub add_condition {
-  my ($self, $name, $cb) = @_;
-  $self->conditions->{$name} = $cb;
-  return $self;
-}
-
-sub add_shortcut {
-  my ($self, $name, $cb) = @_;
-  $self->shortcuts->{$name} = $cb;
-  return $self;
-}
+sub add_condition { shift->_add(conditions => @_) }
+sub add_shortcut  { shift->_add(shortcuts  => @_) }
 
 sub auto_render {
   my ($self, $c) = @_;
@@ -40,7 +31,7 @@ sub dispatch {
   my $req  = $c->req;
   my $path = $c->stash->{path};
   if (defined $path) { $path = "/$path" if $path !~ m!^/! }
-  else               { $path = $req->url->path->to_abs_string }
+  else               { $path = $req->url->path->to_route }
 
   # Prepare match
   my $method = $req->method;
@@ -71,10 +62,8 @@ sub dispatch {
     }
   }
 
-  # No match
-  return undef unless $m && @{$m->stack};
-
   # Dispatch
+  return undef unless $m && @{$m->stack};
   return undef if $self->_walk($c);
   $self->auto_render($c);
   return 1;
@@ -82,6 +71,14 @@ sub dispatch {
 
 sub hide { push @{shift->hidden}, @_ }
 
+sub lookup {
+  my ($self, $name) = @_;
+  my $reverse = $self->{reverse} ||= {};
+  return $reverse->{$name} if exists $reverse->{$name};
+  return undef unless my $route = $self->find($name);
+  return $reverse->{$name} = $route;
+}
+
 # DEPRECATED in Rainbow!
 sub namespace {
   warn <<EOF;
@@ -98,6 +95,12 @@ sub route {
   shift->add_child(Mojolicious::Routes::Route->new(@_))->children->[-1];
 }
 
+sub _add {
+  my ($self, $attr, $name, $cb) = @_;
+  $self->$attr->{$name} = $cb;
+  return $self;
+}
+
 sub _callback {
   my ($self, $c, $field, $staging) = @_;
   $c->stash->{'mojo.routed'}++;
@@ -217,7 +220,6 @@ sub _method {
 sub _walk {
   my ($self, $c) = @_;
 
-  # Walk the stack
   my $stack   = $c->match->stack;
   my $stash   = $c->stash;
   my $staging = @$stack;
@@ -296,7 +298,7 @@ See L<Mojolicious::Guides::Routing> for more.
 L<Mojolicious::Routes> inherits all attributes from
 L<Mojolicious::Routes::Route> and implements the following new ones.
 
-=head2 C<base_classes>
+=head2 base_classes
 
   my $classes = $r->base_classes;
   $r          = $r->base_classes(['MyApp::Controller']);
@@ -304,7 +306,7 @@ L<Mojolicious::Routes::Route> and implements the following new ones.
 Base classes used to identify controllers, defaults to
 L<Mojolicious::Controller> and L<Mojo>.
 
-=head2 C<cache>
+=head2 cache
 
   my $cache = $r->cache;
   $r        = $r->cache(Mojo::Cache->new);
@@ -314,14 +316,14 @@ Routing cache, defaults to a L<Mojo::Cache> object.
   # Disable caching
   $r->cache(0);
 
-=head2 C<conditions>
+=head2 conditions
 
   my $conditions = $r->conditions;
   $r             = $r->conditions({foo => sub {...}});
 
 Contains all available conditions.
 
-=head2 C<hidden>
+=head2 hidden
 
   my $hidden = $r->hidden;
   $r         = $r->hidden([qw(attr has new)]);
@@ -329,7 +331,7 @@ Contains all available conditions.
 Controller methods and attributes that are hidden from routes, defaults to
 C<attr>, C<has>, C<new> and C<tap>.
 
-=head2 C<namespaces>
+=head2 namespaces
 
   my $namespaces = $r->namespaces;
   $r             = $r->namespaces(['Foo::Bar::Controller']);
@@ -339,7 +341,7 @@ Namespaces to load controllers from.
   # Add another namespace to load controllers from
   push @{$r->namespaces}, 'MyApp::Controller';
 
-=head2 C<shortcuts>
+=head2 shortcuts
 
   my $shortcuts = $r->shortcuts;
   $r            = $r->shortcuts({foo => sub {...}});
@@ -349,39 +351,46 @@ Contains all available shortcuts.
 =head1 METHODS
 
 L<Mojolicious::Routes> inherits all methods from
-L<Mojolicious::Routes::Route> and implements the following ones.
+L<Mojolicious::Routes::Route> and implements the following new ones.
 
-=head2 C<add_condition>
+=head2 add_condition
 
   $r = $r->add_condition(foo => sub {...});
 
 Add a new condition.
 
-=head2 C<add_shortcut>
+=head2 add_shortcut
 
   $r = $r->add_shortcut(foo => sub {...});
 
 Add a new shortcut.
 
-=head2 C<auto_render>
+=head2 auto_render
 
   $r->auto_render(Mojolicious::Controller->new);
 
 Automatic rendering.
 
-=head2 C<dispatch>
+=head2 dispatch
 
   my $success = $r->dispatch(Mojolicious::Controller->new);
 
 Match routes with L<Mojolicious::Routes::Match> and dispatch.
 
-=head2 C<hide>
+=head2 hide
 
   $r = $r->hide(qw(foo bar));
 
 Hide controller methods and attributes from routes.
 
-=head2 C<route>
+=head2 lookup
+
+  my $route = $r->lookup('foo');
+
+Find route by name with L<Mojolicious::Routes::Route/"find"> and cache all
+results for future lookups.
+
+=head2 route
 
   my $route = $r->route;
   my $route = $r->route('/:action');

+12 -18

mojolegacy/lib/Mojolicious/Routes/Match.pm

View

@@ -1,27 +1,22 @@
 package Mojolicious::Routes::Match;
 use Mojo::Base -base;
 
-use Mojo::Util qw(decode url_unescape);
-
 has captures => sub { {} };
 has [qw(endpoint root)];
 has stack => sub { [] };
 
 sub new {
   my $self = shift->SUPER::new;
-
-  $self->{method} = uc shift;
-  my $path = url_unescape shift;
-  $self->{path} = do { my $tmp = decode('UTF-8', $path); defined $tmp ? $tmp : $path};
+  $self->{method}    = uc shift;
+  $self->{path}      = shift;
   $self->{websocket} = shift;
-
   return $self;
 }
 
 sub match {
   my ($self, $r, $c) = @_;
 
-  # Match
+  # Pattern
   $self->root($r) unless $self->root;
   my $path    = $self->{path};
   my $pattern = $r->pattern;
@@ -120,7 +115,7 @@ sub path_for {
   }
 
   # Find endpoint
-  else { return $name unless $endpoint = $self->root->find($name) }
+  else { return $name unless $endpoint = $self->root->lookup($name) }
 
   # Merge values
   my $captures = $self->captures;
@@ -134,7 +129,6 @@ sub path_for {
 
   # Render
   my $path = $endpoint->render('', \%values);
-  utf8::downgrade $path, 1;
   return wantarray ? ($path, $endpoint->has_websocket) : $path;
 }
 
@@ -170,28 +164,28 @@ structures.
 
 L<Mojolicious::Routes::Match> implements the following attributes.
 
-=head2 C<captures>
+=head2 captures
 
   my $captures = $m->captures;
   $m           = $m->captures({foo => 'bar'});
 
 Captured parameters.
 
-=head2 C<endpoint>
+=head2 endpoint
 
   my $endpoint = $m->endpoint;
   $m           = $m->endpoint(Mojolicious::Routes->new);
 
 The route endpoint that actually matched.
 
-=head2 C<root>
+=head2 root
 
   my $root = $m->root;
   $m       = $m->root($routes);
 
 The root of the route tree.
 
-=head2 C<stack>
+=head2 stack
 
   my $stack = $m->stack;
   $m        = $m->stack([{foo => 'bar'}]);
@@ -201,22 +195,22 @@ Captured parameters with nesting history.
 =head1 METHODS
 
 L<Mojolicious::Routes::Match> inherits all methods from L<Mojo::Base> and
-implements the following ones.
+implements the following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $m = Mojolicious::Routes::Match->new(GET => '/foo');
   my $m = Mojolicious::Routes::Match->new(GET => '/foo', $ws);
 
 Construct a new L<Mojolicious::Routes::Match> object.
 
-=head2 C<match>
+=head2 match
 
   $m->match(Mojolicious::Routes->new, Mojolicious::Controller->new);
 
 Match against a route tree.
 
-=head2 C<path_for>
+=head2 path_for
 
   my $path        = $m->path_for;
   my $path        = $m->path_for(foo => 'bar');

+18 -26

mojolegacy/lib/Mojolicious/Routes/Pattern.pm

View

@@ -24,11 +24,8 @@ sub parse {
   # Make sure we have a viable pattern
   my $pattern = @_ % 2 ? (shift || '/') : '/';
   $pattern = "/$pattern" unless $pattern =~ m!^/!;
-
-  # Constraints
   $self->constraints({@_});
 
-  # Tokenize
   return $pattern eq '/' ? $self : $self->pattern($pattern)->_tokenize;
 }
 
@@ -39,7 +36,6 @@ sub render {
   my $format = ($values ||= {})->{format};
   $values = {%{$self->defaults}, %$values};
 
-  # Turn pattern into path
   my $string   = '';
   my $optional = 1;
   for my $token (reverse @{$self->tree}) {
@@ -104,7 +100,6 @@ sub shape_match {
 sub _compile {
   my $self = shift;
 
-  # Compile tree to regex
   my $block = my $regex = '';
   my $constraints = $self->constraints;
   my $optional    = 1;
@@ -152,7 +147,6 @@ sub _compile {
       $compiled .= '?' if $optional;
     }
 
-    # Add to block
     $block = "$compiled$block";
   }
 
@@ -188,14 +182,12 @@ sub _compile_req {
 sub _tokenize {
   my $self = shift;
 
-  # Token
   my $quote_end   = $self->quote_end;
   my $quote_start = $self->quote_start;
   my $placeholder = $self->placeholder_start;
   my $relaxed     = $self->relaxed_start;
   my $wildcard    = $self->wildcard_start;
 
-  # Parse the pattern character wise
   my $pattern = $self->pattern;
   my $state   = 'text';
   my (@tree, $quoted);
@@ -278,84 +270,84 @@ L<Mojolicious::Routes::Pattern> is the core of L<Mojolicious::Routes>.
 
 L<Mojolicious::Routes::Pattern> implements the following attributes.
 
-=head2 C<constraints>
+=head2 constraints
 
   my $constraints = $pattern->constraints;
   $pattern        = $pattern->constraints({foo => qr/\w+/});
 
 Regular expression constraints.
 
-=head2 C<defaults>
+=head2 defaults
 
   my $defaults = $pattern->defaults;
   $pattern     = $pattern->defaults({foo => 'bar'});
 
 Default parameters.
 
-=head2 C<format_regex>
+=head2 format_regex
 
   my $regex = $pattern->format_regex;
   $pattern  = $pattern->format_regex($regex);
 
 Compiled regular expression for format matching.
 
-=head2 C<pattern>
+=head2 pattern
 
   my $pattern = $pattern->pattern;
   $pattern    = $pattern->pattern('/(foo)/(bar)');
 
 Raw unparsed pattern.
 
-=head2 C<placeholder_start>
+=head2 placeholder_start
 
   my $start = $pattern->placeholder_start;
   $pattern  = $pattern->placeholder_start(':');
 
 Character indicating a placeholder, defaults to C<:>.
 
-=head2 C<placeholders>
+=head2 placeholders
 
   my $placeholders = $pattern->placeholders;
   $pattern         = $pattern->placeholders(['foo', 'bar']);
 
 Placeholder names.
 
-=head2 C<quote_end>
+=head2 quote_end
 
   my $end  = $pattern->quote_end;
   $pattern = $pattern->quote_end(']');
 
 Character indicating the end of a quoted placeholder, defaults to C<)>.
 
-=head2 C<quote_start>
+=head2 quote_start
 
   my $start = $pattern->quote_start;
   $pattern  = $pattern->quote_start('[');
 
 Character indicating the start of a quoted placeholder, defaults to C<(>.
 
-=head2 C<regex>
+=head2 regex
 
   my $regex = $pattern->regex;
   $pattern  = $pattern->regex($regex);
 
 Pattern in compiled regular expression form.
 
-=head2 C<relaxed_start>
+=head2 relaxed_start
 
   my $start = $pattern->relaxed_start;
   $pattern  = $pattern->relaxed_start('*');
 
 Character indicating a relaxed placeholder, defaults to C<#>.
 
-=head2 C<tree>
+=head2 tree
 
   my $tree = $pattern->tree;
   $pattern = $pattern->tree([ ... ]);
 
 Pattern in parsed form.
 
-=head2 C<wildcard_start>
+=head2 wildcard_start
 
   my $start = $pattern->wildcard_start;
   $pattern  = $pattern->wildcard_start('*');
@@ -365,9 +357,9 @@ Character indicating the start of a wildcard placeholder, defaults to C<*>.
 =head1 METHODS
 
 L<Mojolicious::Routes::Pattern> inherits all methods from L<Mojo::Base> and
-implements the following ones.
+implements the following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $pattern = Mojolicious::Routes::Pattern->new('/:action');
   my $pattern
@@ -376,14 +368,14 @@ implements the following ones.
 
 Construct a new L<Mojolicious::Routes::Pattern> object.
 
-=head2 C<match>
+=head2 match
 
   my $result = $pattern->match('/foo/bar');
   my $result = $pattern->match('/foo/bar', 1);
 
 Match pattern against entire path, format detection is disabled by default.
 
-=head2 C<parse>
+=head2 parse
 
   $pattern = $pattern->parse('/:action');
   $pattern = $pattern->parse('/:action', action => qr/\w+/);
@@ -391,7 +383,7 @@ Match pattern against entire path, format detection is disabled by default.
 
 Parse a raw pattern.
 
-=head2 C<render>
+=head2 render
 
   my $path = $pattern->render({action => 'foo'});
   my $path = $pattern->render({action => 'foo'}, 1);
@@ -399,7 +391,7 @@ Parse a raw pattern.
 Render pattern into a path with parameters, format rendering is disabled by
 default.
 
-=head2 C<shape_match>
+=head2 shape_match
 
   my $result = $pattern->shape_match(\$path);
   my $result = $pattern->shape_match(\$path, 1);

+37 -40

mojolegacy/lib/Mojolicious/Routes/Route.pm

View

@@ -45,7 +45,6 @@ sub detour { shift->partial(1)->to(@_) }
 sub find {
   my ($self, $name) = @_;
 
-  # Check all children
   my @children = (@{$self->children});
   my $candidate;
   while (my $child = shift @children) {
@@ -102,6 +101,7 @@ sub over {
   return $self unless @$conditions;
   $self->{over} = $conditions;
   $self->root->cache(0);
+
   return $self;
 }
 
@@ -159,8 +159,6 @@ sub to {
   # Single argument
   my ($shortcut, $defaults);
   if (@_ == 1) {
-
-    # Hash
     $defaults = shift if ref $_[0] eq 'HASH';
     $shortcut = shift if $_[0];
   }
@@ -229,7 +227,6 @@ sub websocket {
 sub _generate_route {
   my ($self, $methods, @args) = @_;
 
-  # Route information
   my ($cb, @conditions, @constraints, %defaults, $name, $pattern);
   while (defined(my $arg = shift @args)) {
 
@@ -286,35 +283,35 @@ L<Mojolicious::Routes>.
 
 L<Mojolicious::Routes::Route> implements the following attributes.
 
-=head2 C<children>
+=head2 children
 
   my $children = $r->children;
   $r           = $r->children([Mojolicious::Routes::Route->new]);
 
 The children of this route, used for nesting routes.
 
-=head2 C<inline>
+=head2 inline
 
   my $inline = $r->inline;
   $r         = $r->inline(1);
 
 Allow C<bridge> semantics for this route.
 
-=head2 C<parent>
+=head2 parent
 
   my $parent = $r->parent;
   $r         = $r->parent(Mojolicious::Routes::Route->new);
 
 The parent of this route, used for nesting routes.
 
-=head2 C<partial>
+=head2 partial
 
   my $partial = $r->partial;
   $r          = $r->partial(1);
 
 Route has no specific end, remaining characters will be captured in C<path>.
 
-=head2 C<pattern>
+=head2 pattern
 
   my $pattern = $r->pattern;
   $r          = $r->pattern(Mojolicious::Routes::Pattern->new);
@@ -324,16 +321,16 @@ Pattern for this route, defaults to a L<Mojolicious::Routes::Pattern> object.
 =head1 METHODS
 
 L<Mojolicious::Routes::Route> inherits all methods from L<Mojo::Base> and
-implements the following ones.
+implements the following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $r = Mojolicious::Routes::Route->new;
   my $r = Mojolicious::Routes::Route->new('/:controller/:action');
 
 Construct a new L<Mojolicious::Routes::Route> object.
 
-=head2 C<add_child>
+=head2 add_child
 
   $r = $r->add_child(Mojolicious::Route->new);
 
@@ -343,7 +340,7 @@ current parent if necessary.
   # Reattach route
   $r->add_child($r->find('foo'));
 
-=head2 C<any>
+=head2 any
 
   my $route = $r->any('/:foo' => sub {...});
   my $route = $r->any([qw(GET POST)] => '/:foo' => sub {...});
@@ -353,7 +350,7 @@ also the L<Mojolicious::Lite> tutorial for more argument variations.
 
   $r->any('/user')->to('user#whatever');
 
-=head2 C<bridge>
+=head2 bridge
 
   my $bridge = $r->bridge;
   my $bridge = $r->bridge('/:action');
@@ -366,7 +363,7 @@ Generate bridge route.
   $auth->get('/show')->to('#show');
   $auth->post('/create')->to('#create');
 
-=head2 C<delete>
+=head2 delete
 
   my $route = $r->delete('/:foo' => sub {...});
 
@@ -375,7 +372,7 @@ L<Mojolicious::Lite> tutorial for more argument variations.
 
   $r->delete('/user')->to('user#remove');
 
-=head2 C<detour>
+=head2 detour
 
   $r = $r->detour(action => 'foo');
   $r = $r->detour({action => 'foo'});
@@ -392,7 +389,7 @@ L<Mojolicious::Lite> tutorial for more argument variations.
 Set default parameters for this route and allow partial matching to simplify
 application embedding.
 
-=head2 C<find>
+=head2 find
 
   my $route = $r->find('foo');
 
@@ -401,7 +398,7 @@ generated ones.
 
   $r->find('show_user')->to(foo => 'bar');
 
-=head2 C<get>
+=head2 get
 
   my $route = $r->get('/:foo' => sub {...});
 
@@ -410,48 +407,48 @@ L<Mojolicious::Lite> tutorial for more argument variations.
 
   $r->get('/user')->to('user#show');
 
-=head2 C<has_conditions>
+=head2 has_conditions
 
   my $success = $r->has_conditions;
 
 Check if this route has active conditions.
 
-=head2 C<has_custom_name>
+=head2 has_custom_name
 
   my $success = $r->has_custom_name;
 
 Check if this route has a custom name.
 
-=head2 C<has_websocket>
+=head2 has_websocket
 
   my $success = $r->has_websocket;
 
 Check if this route has a WebSocket ancestor.
 
-=head2 C<is_endpoint>
+=head2 is_endpoint
 
   my $success = $r->is_endpoint;
 
 Check if this route qualifies as an endpoint.
 
-=head2 C<is_websocket>
+=head2 is_websocket
 
   my $success = $r->is_websocket;
 
 Check if this route is a WebSocket.
 
-=head2 C<name>
+=head2 name
 
   my $name = $r->name;
   $r       = $r->name('foo');
 
 The name of this route, defaults to an automatically generated name based on
-the route pattern. Note that the name C<current> is reserved for refering to
+the route pattern. Note that the name C<current> is reserved for referring to
 the current route.
 
   $r->get('/user')->to('user#show')->name('show_user');
 
-=head2 C<options>
+=head2 options
 
   my $route = $r->options('/:foo' => sub {...});
 
@@ -460,7 +457,7 @@ L<Mojolicious::Lite> tutorial for more argument variations.
 
   $r->options('/user')->to('user#overview');
 
-=head2 C<over>
+=head2 over
 
   my $over = $r->over;
   $r       = $r->over(foo => 1);
@@ -472,7 +469,7 @@ routing cache, since conditions are too complex for caching.
 
   $r->get('/foo')->over(host => qr/mojolicio\.us/)->to('foo#bar');
 
-=head2 C<parse>
+=head2 parse
 
   $r = $r->parse('/:action');
   $r = $r->parse('/:action', action => qr/\w+/);
@@ -480,7 +477,7 @@ routing cache, since conditions are too complex for caching.
 
 Parse a pattern.
 
-=head2 C<patch>
+=head2 patch
 
   my $route = $r->patch('/:foo' => sub {...});
 
@@ -489,7 +486,7 @@ L<Mojolicious::Lite> tutorial for more argument variations.
 
   $r->patch('/user')->to('user#update');
 
-=head2 C<post>
+=head2 post
 
   my $route = $r->post('/:foo' => sub {...});
 
@@ -498,7 +495,7 @@ L<Mojolicious::Lite> tutorial for more argument variations.
 
   $r->post('/user')->to('user#create');
 
-=head2 C<put>
+=head2 put
 
   my $route = $r->put('/:foo' => sub {...});
 
@@ -507,7 +504,7 @@ L<Mojolicious::Lite> tutorial for more argument variations.
 
   $r->put('/user')->to('user#replace');
 
-=head2 C<remove>
+=head2 remove
 
   $r = $r->remove;
 
@@ -519,14 +516,14 @@ Remove route from parent.
   # Reattach route to new parent
   $r->route('/foo')->add_child($r->find('bar')->remove);
 
-=head2 C<render>
+=head2 render
 
   my $path = $r->render($suffix);
   my $path = $r->render($suffix, {foo => 'bar'});
 
 Render route with parameters into a path.
 
-=head2 C<root>
+=head2 root
 
   my $root = $r->root;
 
@@ -534,7 +531,7 @@ The L<Mojolicious::Routes> object this route is an descendent of.
 
   $r->root->cache(0);
 
-=head2 C<route>
+=head2 route
 
   my $route = $r->route;
   my $route = $r->route('/:action');
@@ -543,7 +540,7 @@ The L<Mojolicious::Routes> object this route is an descendent of.
 
 Generate route matching all HTTP request methods.
 
-=head2 C<to>
+=head2 to
 
   my $defaults = $r->to;
   $r           = $r->to(action => 'foo');
@@ -560,13 +557,13 @@ Generate route matching all HTTP request methods.
 
 Set default parameters for this route.
 
-=head2 C<to_string>
+=head2 to_string
 
   my $string = $r->to_string;
 
 Stringify the whole route.
 
-=head2 C<under>
+=head2 under
 
   my $route = $r->under(sub {...});
   my $route = $r->under('/:foo');
@@ -578,7 +575,7 @@ argument variations.
   $auth->get('/show')->to('#show');
   $auth->post('/create')->to('#create');
 
-=head2 C<via>
+=head2 via
 
   my $methods = $r->via;
   $r          = $r->via('GET');
@@ -590,7 +587,7 @@ restrictions.
 
   $r->route('/foo')->via(qw(GET POST))->to('foo#bar');
 
-=head2 C<websocket>
+=head2 websocket
 
   my $websocket = $r->websocket('/:foo' => sub {...});
 

+11 -20

mojolegacy/lib/Mojolicious/Sessions.pm

View

@@ -12,52 +12,43 @@ has default_expiration => 3600;
 sub load {
   my ($self, $c) = @_;
 
-  # Session cookie
   return unless my $value = $c->signed_cookie($self->cookie_name);
-
-  # Deserialize
   $value =~ s/-/=/g;
   return unless my $session = Mojo::JSON->new->decode(b64_decode $value);
 
-  # Expiration
+  # "expiration" value is inherited
   my $expiration = defined $session->{expiration} ? $session->{expiration} : $self->default_expiration;
   return if !(my $expires = delete $session->{expires}) && $expiration;
   return if defined $expires && $expires <= time;
 
-  # Content
   my $stash = $c->stash;
   return unless $stash->{'mojo.active_session'} = keys %$session;
   $stash->{'mojo.session'} = $session;
-
-  # Flash
   $session->{flash} = delete $session->{new_flash} if $session->{new_flash};
 }
 
 sub store {
   my ($self, $c) = @_;
 
-  # Session
+  # Make sure session was active
   my $stash = $c->stash;
   return unless my $session = $stash->{'mojo.session'};
   return unless keys %$session || $stash->{'mojo.active_session'};
 
-  # Flash
+  # Don't reset flash for static files
   my $old = delete $session->{flash};
   @{$session->{new_flash}}{keys %$old} = values %$old
     if $stash->{'mojo.static'};
   delete $session->{new_flash} unless keys %{$session->{new_flash}};
 
-  # Expiration
+  # Generate "expires" value from "expiration" if necessary
   my $expiration = defined $session->{expiration} ? $session->{expiration} : $self->default_expiration;
   my $default = delete $session->{expires};
   $session->{expires} = $default || time + $expiration
     if $expiration || $default;
 
-  # Serialize
   my $value = b64_encode(Mojo::JSON->new->encode($session), '');
   $value =~ s/=/-/g;
-
-  # Session cookie
   my $options = {
     domain   => $self->cookie_domain,
     expires  => $session->{expires},
@@ -93,28 +84,28 @@ with a C<HMAC-SHA1> signature.
 
 L<Mojolicious::Sessions> implements the following attributes.
 
-=head2 C<cookie_domain>
+=head2 cookie_domain
 
   my $domain = $sessions->cookie_domain;
   $sessions  = $sessions->cookie_domain('.example.com');
 
 Domain for session cookies, not defined by default.
 
-=head2 C<cookie_name>
+=head2 cookie_name
 
   my $name  = $sessions->cookie_name;
   $sessions = $sessions->cookie_name('session');
 
 Name for session cookies, defaults to C<mojolicious>.
 
-=head2 C<cookie_path>
+=head2 cookie_path
 
   my $path  = $sessions->cookie_path;
   $sessions = $sessions->cookie_path('/foo');
 
 Path for session cookies, defaults to C</>.
 
-=head2 C<default_expiration>
+=head2 default_expiration
 
   my $time  = $sessions->default_expiration;
   $sessions = $sessions->default_expiration(3600);
@@ -134,7 +125,7 @@ C<expiration> and C<expires> session values.
   # Delete whole session by setting an expiration date in the past
   $c->session(expires => 1);
 
-=head2 C<secure>
+=head2 secure
 
   my $secure = $sessions->secure;
   $sessions  = $sessions->secure(1);
@@ -147,13 +138,13 @@ over HTTPS connections.
 L<Mojolicious::Sessions> inherits all methods from L<Mojo::Base> and
 implements the following ones.
 
-=head2 C<load>
+=head2 load
 
   $sessions->load(Mojolicious::Controller->new);
 
 Load session data from signed cookie.
 
-=head2 C<store>
+=head2 store
 
   $sessions->store(Mojolicious::Controller->new);
 

+8 -11

mojolegacy/lib/Mojolicious/Static.pm

View

@@ -24,8 +24,6 @@ sub dispatch {
   # Canonical path
   my $stash = $c->stash;
   my $path = $stash->{path} || $c->req->url->path->clone->canonicalize;
-
-  # Split parts
   return undef unless my @parts = @{Mojo::Path->new("$path")->parts};
 
   # Serve static file and prevent directory traversal
@@ -91,7 +89,6 @@ sub serve_asset {
       ->content_range("bytes $start-$end/$size");
   }
 
-  # Serve asset
   return $res->content->asset($asset->start_range($start)->end_range($end));
 }
 
@@ -138,14 +135,14 @@ Mojolicious::Static - Serve static files
 
 =head1 DESCRIPTION
 
-L<Mojolicious::Static> is a dispatcher for static files with C<Range> and
+L<Mojolicious::Static> is a static file server with C<Range> and
 C<If-Modified-Since> support.
 
 =head1 ATTRIBUTES
 
 L<Mojolicious::Static> implements the following attributes.
 
-=head2 C<classes>
+=head2 classes
 
   my $classes = $static->classes;
   $static     = $static->classes(['main']);
@@ -156,7 +153,7 @@ highest precedence, defaults to C<main>.
   # Add another class with static files in DATA section
   push @{$static->classes}, 'Mojolicious::Plugin::Fun';
 
-=head2 C<paths>
+=head2 paths
 
   my $paths = $static->paths;
   $static   = $static->paths(['/home/sri/public']);
@@ -169,15 +166,15 @@ Directories to serve static files from, first one has the highest precedence.
 =head1 METHODS
 
 L<Mojolicious::Static> inherits all methods from L<Mojo::Base> and implements
-the following ones.
+the following new ones.
 
-=head2 C<dispatch>
+=head2 dispatch
 
   my $success = $static->dispatch(Mojolicious::Controller->new);
 
 Serve static file for L<Mojolicious::Controller> object.
 
-=head2 C<file>
+=head2 file
 
   my $asset = $static->file('foo/bar.html');
 
@@ -186,13 +183,13 @@ to C<paths> or from C<classes>.
 
   my $content = $static->file('foo/bar.html')->slurp;
 
-=head2 C<serve>
+=head2 serve
 
   my $success = $static->serve(Mojolicious::Controller->new, 'foo/bar.html');
 
 Serve a specific file, relative to C<paths> or from C<classes>.
 
-=head2 C<serve_asset>
+=head2 serve_asset
 
   $static->serve_asset(Mojolicious::Controller->new, Mojo::Asset::File->new);
 

+4 -4

mojolegacy/lib/Mojolicious/Types.pm

View

@@ -112,7 +112,7 @@ The most common ones are already defined.
 
 L<Mojolicious::Types> implements the following attributes.
 
-=head2 C<types>
+=head2 types
 
   my $map = $types->types;
   $types  = $types->types({png => 'image/png'});
@@ -122,9 +122,9 @@ List of MIME types.
 =head1 METHODS
 
 L<Mojolicious::Types> inherits all methods from L<Mojo::Base> and implements
-the following ones.
+the following new ones.
 
-=head2 C<detect>
+=head2 detect
 
   my $exts = $types->detect('application/json;q=9');
   my $exts = $types->detect('text/html, application/json;q=9', 1);
@@ -135,7 +135,7 @@ unspecific values that contain more than one MIME type is disabled by default.
   # List detected extensions prioritized
   say for @{$types->detect('application/json, text/xml;q=0.1', 1)};
 
-=head2 C<type>
+=head2 type
 
   my $type = $types->type('png');
   $types   = $types->type(png => 'image/png');

BIN

mojolegacy/lib/Mojolicious/public/mojo/failraptor.png

View

mojolegacy/lib/Mojolicious/public/mojo/jquery/jquery.js

View

...	...	@@ -0,0 +1,4 @@
	1	+/! jQuery v1.9.0 \| (c) 2005, 2012 jQuery Foundation, Inc. \| jquery.org/license /(function(e,t){"use strict";function n(e){var t=e.length,n=st.type(e);return st.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n\|\|"function"!==n&&(0===t\|\|"number"==typeof t&&t>0&&t-1 in e)}function r(e){var t=Tt[e]={};return st.each(e.match(lt)\|\|[],function(e,n){t[n]=!0}),t}function i(e,n,r,i){if(st.acceptData(e)){var o,a,s=st.expando,u="string"==typeof n,l=e.nodeType,c=l?st.cache:e,f=l?e[s]:e[s]&&s;if(f&&c[f]&&(i\|\|c[f].data)\|\|!u\|\|r!==t)return f\|\|(l?e[s]=f=K.pop()\|\|st.guid++:f=s),c[f]\|\|(c[f]={},l\|\|(c[f].toJSON=st.noop)),("object"==typeof n\|\|"function"==typeof n)&&(i?c[f]=st.extend(c[f],n):c[f].data=st.extend(c[f].data,n)),o=c[f],i\|\|(o.data\|\|(o.data={}),o=o.data),r!==t&&(o[st.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[st.camelCase(n)])):a=o,a}}function o(e,t,n){if(st.acceptData(e)){var r,i,o,a=e.nodeType,u=a?st.cache:e,l=a?e[st.expando]:st.expando;if(u[l]){if(t&&(r=n?u[l]:u[l].data)){st.isArray(t)?t=t.concat(st.map(t,st.camelCase)):t in r?t=[t]:(t=st.camelCase(t),t=t in r?[t]:t.split(" "));for(i=0,o=t.length;o>i;i++)delete r[t[i]];if(!(n?s:st.isEmptyObject)(r))return}(n\|\|(delete u[l].data,s(u[l])))&&(a?st.cleanData([e],!0):st.support.deleteExpando\|\|u!=u.window?delete u[l]:u[l]=null)}}}function a(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(Nt,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:wt.test(r)?st.parseJSON(r):r}catch(o){}st.data(e,n,r)}else r=t}return r}function s(e){var t;for(t in e)if(("data"!==t\|\|!st.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function u(){return!0}function l(){return!1}function c(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function f(e,t,n){if(t=t\|\|0,st.isFunction(t))return st.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return st.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=st.grep(e,function(e){return 1===e.nodeType});if(Wt.test(t))return st.filter(t,r,!n);t=st.filter(t,r)}return st.grep(e,function(e){return st.inArray(e,t)>=0===n})}function p(e){var t=zt.split("\|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function d(e,t){return e.getElementsByTagName(t)[0]\|\|e.appendChild(e.ownerDocument.createElement(t))}function h(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function g(e){var t=nn.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function m(e,t){for(var n,r=0;null!=(n=e[r]);r++)st._data(n,"globalEval",!t\|\|st._data(t[r],"globalEval"))}function y(e,t){if(1===t.nodeType&&st.hasData(e)){var n,r,i,o=st._data(e),a=st._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)st.event.add(t,n,s[n][r])}a.data&&(a.data=st.extend({},a.data))}}function v(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!st.support.noCloneEvent&&t[st.expando]){r=st._data(t);for(i in r.events)st.removeEvent(t,i,r.handle);t.removeAttribute(st.expando)}"script"===n&&t.text!==e.text?(h(t).text=e.text,g(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),st.support.html5Clone&&e.innerHTML&&!st.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Zt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n\|\|"textarea"===n)&&(t.defaultValue=e.defaultValue)}}function b(e,n){var r,i,o=0,a=e.getElementsByTagName!==t?e.getElementsByTagName(n\|\|""):e.querySelectorAll!==t?e.querySelectorAll(n\|\|""):t;if(!a)for(a=[],r=e.childNodes\|\|e;null!=(i=r[o]);o++)!n\|\|st.nodeName(i,n)?a.push(i):st.merge(a,b(i,n));return n===t\|\|n&&st.nodeName(e,n)?st.merge([e],a):a}function x(e){Zt.test(e.type)&&(e.defaultChecked=e.checked)}function T(e,t){if(t in e)return t;for(var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Nn.length;i--;)if(t=Nn[i]+n,t in e)return t;return r}function w(e,t){return e=t\|\|e,"none"===st.css(e,"display")\|\|!st.contains(e.ownerDocument,e)}function N(e,t){for(var n,r=[],i=0,o=e.length;o>i;i++)n=e[i],n.style&&(r[i]=st._data(n,"olddisplay"),t?(r[i]\|\|"none"!==n.style.display\|\|(n.style.display=""),""===n.style.display&&w(n)&&(r[i]=st._data(n,"olddisplay",S(n.nodeName)))):r[i]\|\|w(n)\|\|st._data(n,"olddisplay",st.css(n,"display")));for(i=0;o>i;i++)n=e[i],n.style&&(t&&"none"!==n.style.display&&""!==n.style.display\|\|(n.style.display=t?r[i]\|\|"":"none"));return e}function C(e,t,n){var r=mn.exec(t);return r?Math.max(0,r[1]-(n\|\|0))+(r[2]\|\|"px"):t}function k(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;4>o;o+=2)"margin"===n&&(a+=st.css(e,n+wn[o],!0,i)),r?("content"===n&&(a-=st.css(e,"padding"+wn[o],!0,i)),"margin"!==n&&(a-=st.css(e,"border"+wn[o]+"Width",!0,i))):(a+=st.css(e,"padding"+wn[o],!0,i),"padding"!==n&&(a+=st.css(e,"border"+wn[o]+"Width",!0,i)));return a}function E(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=ln(e),a=st.support.boxSizing&&"border-box"===st.css(e,"boxSizing",!1,o);if(0>=i\|\|null==i){if(i=un(e,t,o),(0>i\|\|null==i)&&(i=e.style[t]),yn.test(i))return i;r=a&&(st.support.boxSizingReliable\|\|i===e.style[t]),i=parseFloat(i)\|\|0}return i+k(e,t,n\|\|(a?"border":"content"),r,o)+"px"}function S(e){var t=V,n=bn[e];return n\|\|(n=A(e,t),"none"!==n&&n\|\|(cn=(cn\|\|st("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(cn[0].contentWindow\|\|cn[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=A(e,t),cn.detach()),bn[e]=n),n}function A(e,t){var n=st(t.createElement(e)).appendTo(t.body),r=st.css(n[0],"display");return n.remove(),r}function j(e,t,n,r){var i;if(st.isArray(t))st.each(t,function(t,i){n\|\|kn.test(e)?r(e,i):j(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n\|\|"object"!==st.type(t))r(e,t);else for(i in t)j(e+"["+i+"]",t[i],n,r)}function D(e){return function(t,n){"string"!=typeof t&&(n=t,t="");var r,i=0,o=t.toLowerCase().match(lt)\|\|[];if(st.isFunction(n))for(;r=o[i++];)"+"===r[0]?(r=r.slice(1)\|\|"",(e[r]=e[r]\|\|[]).unshift(n)):(e[r]=e[r]\|\|[]).push(n)}}function L(e,n,r,i){function o(u){var l;return a[u]=!0,st.each(e[u]\|\|[],function(e,u){var c=u(n,r,i);return"string"!=typeof c\|\|s\|\|a[c]?s?!(l=c):t:(n.dataTypes.unshift(c),o(c),!1)}),l}var a={},s=e===$n;return o(n.dataTypes[0])\|\|!a[""]&&o("")}function H(e,n){var r,i,o=st.ajaxSettings.flatOptions\|\|{};for(r in n)n[r]!==t&&((o[r]?e:i\|\|(i={}))[r]=n[r]);return i&&st.extend(!0,e,i),e}function M(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(o in c)o in r&&(n[c[o]]=r[o]);for(;""===l[0];)l.shift(),i===t&&(i=e.mimeType\|\|n.getResponseHeader("Content-Type"));if(i)for(o in u)if(u[o]&&u[o].test(i)){l.unshift(o);break}if(l[0]in r)a=l[0];else{for(o in r){if(!l[0]\|\|e.converters[o+" "+l[0]]){a=o;break}s\|\|(s=o)}a=a\|\|s}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function q(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(n in e.converters)a[n.toLowerCase()]=e.converters[n];for(;i=u[++s];)if(""!==i){if(""!==l&&l!==i){if(n=a[l+" "+i]\|\|a[" "+i],!n)for(r in a)if(o=r.split(" "),o[1]===i&&(n=a[l+" "+o[0]]\|\|a["* "+o[0]])){n===!0?n=a[r]:a[r]!==!0&&(i=o[0],u.splice(s--,0,i));break}if(n!==!0)if(n&&e["throws"])t=n(t);else try{t=n(t)}catch(c){return{state:"parsererror",error:n?c:"No conversion from "+l+" to "+i}}}l=i}return{state:"success",data:t}}function _(){try{return new e.XMLHttpRequest}catch(t){}}function F(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function O(){return setTimeout(function(){Qn=t}),Qn=st.now()}function B(e,t){st.each(t,function(t,n){for(var r=(rr[t]\|\|[]).concat(rr[""]),i=0,o=r.length;o>i;i++)if(r[i].call(e,t,n))return})}function P(e,t,n){var r,i,o=0,a=nr.length,s=st.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=Qn\|\|O(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration\|\|0,o=1-r,a=0,u=l.tweens.length;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:st.extend({},t),opts:st.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Qn\|\|O(),duration:n.duration,tweens:[],createTween:function(t,n){var r=st.Tween(e,l.opts,t,n,l.opts.specialEasing[t]\|\|l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(R(c,l.opts.specialEasing);a>o;o++)if(r=nr[o].call(l,e,c,l.opts))return r;return B(l,c),st.isFunction(l.opts.start)&&l.opts.start.call(e,l),st.fx.timer(st.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function R(e,t){var n,r,i,o,a;for(n in e)if(r=st.camelCase(n),i=t[r],o=e[n],st.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=st.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e\|\|(e[n]=o[n],t[n]=i)}else t[r]=i}function W(e,t,n){var r,i,o,a,s,u,l,c,f,p=this,d=e.style,h={},g=[],m=e.nodeType&&w(e);n.queue\|\|(c=st._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,f=c.empty.fire,c.empty.fire=function(){c.unqueued\|\|f()}),c.unqueued++,p.always(function(){p.always(function(){c.unqueued--,st.queue(e,"fx").length\|\|c.empty.fire()})})),1===e.nodeType&&("height"in t\|\|"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===st.css(e,"display")&&"none"===st.css(e,"float")&&(st.support.inlineBlockNeedsLayout&&"inline"!==S(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",st.support.shrinkWrapBlocks\|\|p.done(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(r in t)if(o=t[r],Zn.exec(o)){if(delete t[r],u=u\|\|"toggle"===o,o===(m?"hide":"show"))continue;g.push(r)}if(a=g.length){s=st._data(e,"fxshow")\|\|st._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?st(e).show():p.done(function(){st(e).hide()}),p.done(function(){var t;st._removeData(e,"fxshow");for(t in h)st.style(e,t,h[t])});for(r=0;a>r;r++)i=g[r],l=p.createTween(i,m?s[i]:0),h[i]=s[i]\|\|st.style(e,i),i in s\|\|(s[i]=l.start,m&&(l.end=l.start,l.start="width"===i\|\|"height"===i?1:0))}}function $(e,t,n,r,i){return new $.prototype.init(e,t,n,r,i)}function I(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=wn[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function z(e){return st.isWindow(e)?e:9===e.nodeType?e.defaultView\|\|e.parentWindow:!1}var X,U,V=e.document,Y=e.location,J=e.jQuery,G=e.$,Q={},K=[],Z="1.9.0",et=K.concat,tt=K.push,nt=K.slice,rt=K.indexOf,it=Q.toString,ot=Q.hasOwnProperty,at=Z.trim,st=function(e,t){return new st.fn.init(e,t,X)},ut=/[+-]?(?:\d\.\|)\d+(?:[eE][+-]?\d+\|)/.source,lt=/\S+/g,ct=/^[\s\uFEFF\xA0]+\|[\s\uFEFF\xA0]+$/g,ft=/^(?:(<[\w\W]+>)[^>]\|#([\w-]))$/,pt=/^<(\w+)\s\/?>(?:<\/\1>\|)$/,dt=/^[\],:{}\s]$/,ht=/(?:^\|:\|,)(?:\s\[)+/g,gt=/\\(?:["\\\/bfnrt]\|u[\da-fA-F]{4})/g,mt=/"[^"\\\r\n]"\|true\|false\|null\|-?(?:\d+\.\|)\d+(?:[eE][+-]?\d+\|)/g,yt=/^-ms-/,vt=/-([\da-z])/gi,bt=function(e,t){return t.toUpperCase()},xt=function(){V.addEventListener?(V.removeEventListener("DOMContentLoaded",xt,!1),st.ready()):"complete"===V.readyState&&(V.detachEvent("onreadystatechange",xt),st.ready())};st.fn=st.prototype={jquery:Z,constructor:st,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:ft.exec(e),!i\|\|!i[1]&&n)return!n\|\|n.jquery?(n\|\|r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof st?n[0]:n,st.merge(this,st.parseHTML(i[1],n&&n.nodeType?n.ownerDocument\|\|n:V,!0)),pt.test(i[1])&&st.isPlainObject(n))for(i in n)st.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=V.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=V,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):st.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),st.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return nt.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=st.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return st.each(this,e,t)},ready:function(e){return st.ready.promise().done(e),this},slice:function(){return this.pushStack(nt.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(st.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject\|\|this.constructor(null)},push:tt,sort:[].sort,splice:[].splice},st.fn.init.prototype=st.fn,st.extend=st.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]\|\|{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]\|\|{},u=2),"object"==typeof s\|\|st.isFunction(s)\|\|(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(e=arguments[u]))for(n in e)r=s[n],i=e[n],s!==i&&(c&&i&&(st.isPlainObject(i)\|\|(o=st.isArray(i)))?(o?(o=!1,a=r&&st.isArray(r)?r:[]):a=r&&st.isPlainObject(r)?r:{},s[n]=st.extend(c,a,i)):i!==t&&(s[n]=i));return s},st.extend({noConflict:function(t){return e.$===st&&(e.$=G),t&&e.jQuery===st&&(e.jQuery=J),st},isReady:!1,readyWait:1,holdReady:function(e){e?st.readyWait++:st.ready(!0)},ready:function(e){if(e===!0?!--st.readyWait:!st.isReady){if(!V.body)return setTimeout(st.ready);st.isReady=!0,e!==!0&&--st.readyWait>0\|\|(U.resolveWith(V,[st]),st.fn.trigger&&st(V).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===st.type(e)},isArray:Array.isArray\|\|function(e){return"array"===st.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e\|\|"function"==typeof e?Q[it.call(e)]\|\|"object":typeof e},isPlainObject:function(e){if(!e\|\|"object"!==st.type(e)\|\|e.nodeType\|\|st.isWindow(e))return!1;try{if(e.constructor&&!ot.call(e,"constructor")&&!ot.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t\|\|ot.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e\|\|"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t\|\|V;var r=pt.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=st.buildFragment([e],t,i),i&&st(i).remove(),st.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=st.trim(n),n&&dt.test(n.replace(gt,"@").replace(mt,"]").replace(ht,"")))?Function("return "+n)():(st.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n\|\|"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length\|\|st.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&st.trim(t)&&(e.execScript\|\|function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(yt,"ms-").replace(vt,bt)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,r){var i,o=0,a=e.length,s=n(e);if(r){if(s)for(;a>o&&(i=t.apply(e[o],r),i!==!1);o++);else for(o in e)if(i=t.apply(e[o],r),i===!1)break}else if(s)for(;a>o&&(i=t.call(e[o],o,e[o]),i!==!1);o++);else for(o in e)if(i=t.call(e[o],o,e[o]),i===!1)break;return e},trim:at&&!at.call("\ufeff\u00a0")?function(e){return null==e?"":at.call(e)}:function(e){return null==e?"":(e+"").replace(ct,"")},makeArray:function(e,t){var r=t\|\|[];return null!=e&&(n(Object(e))?st.merge(r,"string"==typeof e?[e]:e):tt.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(rt)return rt.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else for(;n[o]!==t;)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,r){var i,o=0,a=e.length,s=n(e),u=[];if(s)for(;a>o;o++)i=t(e[o],o,r),null!=i&&(u[u.length]=i);else for(o in e)i=t(e[o],o,r),null!=i&&(u[u.length]=i);return et.apply([],u)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(r=e[n],n=e,e=r),st.isFunction(e)?(i=nt.call(arguments,2),o=function(){return e.apply(n\|\|this,i.concat(nt.call(arguments)))},o.guid=e.guid=e.guid\|\|st.guid++,o):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===st.type(r)){o=!0;for(u in r)st.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,st.isFunction(i)\|\|(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(st(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),st.ready.promise=function(t){if(!U)if(U=st.Deferred(),"complete"===V.readyState)setTimeout(st.ready);else if(V.addEventListener)V.addEventListener("DOMContentLoaded",xt,!1),e.addEventListener("load",st.ready,!1);else{V.attachEvent("onreadystatechange",xt),e.attachEvent("onload",st.ready);var n=!1;try{n=null==e.frameElement&&V.documentElement}catch(r){}n&&n.doScroll&&function i(){if(!st.isReady){try{n.doScroll("left")}catch(e){return setTimeout(i,50)}st.ready()}}()}return U.promise(t)},st.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){Q["[object "+t+"]"]=t.toLowerCase()}),X=st(V);var Tt={};st.Callbacks=function(e){e="string"==typeof e?Tt[e]\|\|r(e):st.extend({},e);var n,i,o,a,s,u,l=[],c=!e.once&&[],f=function(t){for(n=e.memory&&t,i=!0,u=a\|\|0,a=0,s=l.length,o=!0;l&&s>u;u++)if(l[u].apply(t[0],t[1])===!1&&e.stopOnFalse){n=!1;break}o=!1,l&&(c?c.length&&f(c.shift()):n?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function r(t){st.each(t,function(t,n){var i=st.type(n);"function"===i?e.unique&&p.has(n)\|\|l.push(n):n&&n.length&&"string"!==i&&r(n)})})(arguments),o?s=l.length:n&&(a=t,f(n))}return this},remove:function(){return l&&st.each(arguments,function(e,t){for(var n;(n=st.inArray(t,l,n))>-1;)l.splice(n,1),o&&(s>=n&&s--,u>=n&&u--)}),this},has:function(e){return st.inArray(e,l)>-1},empty:function(){return l=[],this},disable:function(){return l=c=n=t,this},disabled:function(){return!l},lock:function(){return c=t,n\|\|p.disable(),this},locked:function(){return!c},fireWith:function(e,t){return t=t\|\|[],t=[e,t.slice?t.slice():t],!l\|\|i&&!c\|\|(o?c.push(t):f(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},st.extend({Deferred:function(e){var t=[["resolve","done",st.Callbacks("once memory"),"resolved"],["reject","fail",st.Callbacks("once memory"),"rejected"],["notify","progress",st.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return st.Deferred(function(n){st.each(t,function(t,o){var a=o[0],s=st.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&st.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?st.extend(e,r):r}},i={};return r.pipe=r.then,st.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=nt.call(arguments),a=o.length,s=1!==a\|\|e&&st.isFunction(e.promise)?a:0,u=1===s?e:st.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?nt.call(arguments):i,r===t?u.notifyWith(n,r):--s\|\|u.resolveWith(n,r)}};if(a>1)for(t=Array(a),n=Array(a),r=Array(a);a>i;i++)o[i]&&st.isFunction(o[i].promise)?o[i].promise().done(l(i,r,o)).fail(u.reject).progress(l(i,n,t)):--s;return s\|\|u.resolveWith(r,o),u.promise()}}),st.support=function(){var n,r,i,o,a,s,u,l,c,f,p=V.createElement("div");if(p.setAttribute("className","t"),p.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",r=p.getElementsByTagName(""),i=p.getElementsByTagName("a")[0],!r\|\|!i\|\|!r.length)return{};o=V.createElement("select"),a=o.appendChild(V.createElement("option")),s=p.getElementsByTagName("input")[0],i.style.cssText="top:1px;float:left;opacity:.5",n={getSetAttribute:"t"!==p.className,leadingWhitespace:3===p.firstChild.nodeType,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(i.getAttribute("style")),hrefNormalized:"/a"===i.getAttribute("href"),opacity:/^0.5/.test(i.style.opacity),cssFloat:!!i.style.cssFloat,checkOn:!!s.value,optSelected:a.selected,enctype:!!V.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==V.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===V.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},s.checked=!0,n.noCloneChecked=s.cloneNode(!0).checked,o.disabled=!0,n.optDisabled=!a.disabled;try{delete p.test}catch(d){n.deleteExpando=!1}s=V.createElement("input"),s.setAttribute("value",""),n.input=""===s.getAttribute("value"),s.value="t",s.setAttribute("type","radio"),n.radioValue="t"===s.value,s.setAttribute("checked","t"),s.setAttribute("name","t"),u=V.createDocumentFragment(),u.appendChild(s),n.appendChecked=s.checked,n.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,p.attachEvent&&(p.attachEvent("onclick",function(){n.noCloneEvent=!1}),p.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})p.setAttribute(l="on"+f,"t"),n[f+"Bubbles"]=l in e\|\|p.attributes[l].expando===!1;return p.style.backgroundClip="content-box",p.cloneNode(!0).style.backgroundClip="",n.clearCloneStyle="content-box"===p.style.backgroundClip,st(function(){var r,i,o,a="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",s=V.getElementsByTagName("body")[0];s&&(r=V.createElement("div"),r.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",s.appendChild(r).appendChild(p),p.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=p.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",c=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",n.reliableHiddenOffsets=c&&0===o[0].offsetHeight,p.innerHTML="",p.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",n.boxSizing=4===p.offsetWidth,n.doesNotIncludeMarginInBodyOffset=1!==s.offsetTop,e.getComputedStyle&&(n.pixelPosition="1%"!==(e.getComputedStyle(p,null)\|\|{}).top,n.boxSizingReliable="4px"===(e.getComputedStyle(p,null)\|\|{width:"4px"}).width,i=p.appendChild(V.createElement("div")),i.style.cssText=p.style.cssText=a,i.style.marginRight=i.style.width="0",p.style.width="1px",n.reliableMarginRight=!parseFloat((e.getComputedStyle(i,null)\|\|{}).marginRight)),p.style.zoom!==t&&(p.innerHTML="",p.style.cssText=a+"width:1px;padding:1px;display:inline;zoom:1",n.inlineBlockNeedsLayout=3===p.offsetWidth,p.style.display="block",p.innerHTML="<div></div>",p.firstChild.style.width="5px",n.shrinkWrapBlocks=3!==p.offsetWidth,s.style.zoom=1),s.removeChild(r),r=p=o=i=null)}),r=o=u=a=i=s=null,n}();var wt=/(?:\{[\s\S]\}\|\[[\s\S]*\])$/,Nt=/([A-Z])/g;st.extend({cache:{},expando:"jQuery"+(Z+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?st.cache[e[st.expando]]:e[st.expando],!!e&&!s(e)},data:function(e,t,n){return i(e,t,n,!1)},removeData:function(e,t){return o(e,t,!1)},_data:function(e,t,n){return i(e,t,n,!0)},_removeData:function(e,t){return o(e,t,!0)},acceptData:function(e){var t=e.nodeName&&st.noData[e.nodeName.toLowerCase()];return!t\|\|t!==!0&&e.getAttribute("classid")===t}}),st.fn.extend({data:function(e,n){var r,i,o=this[0],s=0,u=null;if(e===t){if(this.length&&(u=st.data(o),1===o.nodeType&&!st._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>s;s++)i=r[s].name,i.indexOf("data-")\|\|(i=st.camelCase(i.substring(5)),a(o,i,u[i]));st._data(o,"parsedAttrs",!0)}return u}return"object"==typeof e?this.each(function(){st.data(this,e)}):st.access(this,function(n){return n===t?o?a(o,e,st.data(o,e)):null:(this.each(function(){st.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){st.removeData(this,e)})}}),st.extend({queue:function(e,n,r){var i;return e?(n=(n\|\|"fx")+"queue",i=st._data(e,n),r&&(!i\|\|st.isArray(r)?i=st._data(e,n,st.makeArray(r)):i.push(r)),i\|\|[]):t},dequeue:function(e,t){t=t\|\|"fx";var n=st.queue(e,t),r=n.length,i=n.shift(),o=st._queueHooks(e,t),a=function(){st.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return st._data(e,n)\|\|st._data(e,n,{empty:st.Callbacks("once memory").add(function(){st._removeData(e,t+"queue"),st._removeData(e,n)})})}}),st.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?st.queue(this[0],e):n===t?this:this.each(function(){var t=st.queue(this,e,n);st._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&st.dequeue(this,e)})},dequeue:function(e){return this.each(function(){st.dequeue(this,e)})},delay:function(e,t){return e=st.fx?st.fx.speeds[e]\|\|e:e,t=t\|\|"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e\|\|"fx",[])},promise:function(e,n){var r,i=1,o=st.Deferred(),a=this,s=this.length,u=function(){--i\|\|o.resolveWith(a,[a])};for("string"!=typeof e&&(n=e,e=t),e=e\|\|"fx";s--;)r=st._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var Ct,kt,Et=/[\t\r\n]/g,St=/\r/g,At=/^(?:input\|select\|textarea\|button\|object)$/i,jt=/^(?:a\|area)$/i,Dt=/^(?:checked\|selected\|autofocus\|autoplay\|async\|controls\|defer\|disabled\|hidden\|loop\|multiple\|open\|readonly\|required\|scoped)$/i,Lt=/^(?:checked\|selected)$/i,Ht=st.support.getSetAttribute,Mt=st.support.input;st.fn.extend({attr:function(e,t){return st.access(this,st.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){st.removeAttr(this,e)})},prop:function(e,t){return st.access(this,st.prop,e,t,arguments.length>1)},removeProp:function(e){return e=st.propFix[e]\|\|e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(st.isFunction(e))return this.each(function(t){st(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e\|\|"").match(lt)\|\|[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(Et," "):" ")){for(o=0;i=t[o++];)0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=st.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length\|\|"string"==typeof e&&e;if(st.isFunction(e))return this.each(function(t){st(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e\|\|"").match(lt)\|\|[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(Et," "):"")){for(o=0;i=t[o++];)for(;r.indexOf(" "+i+" ")>=0;)r=r.replace(" "+i+" "," ");n.className=e?st.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return st.isFunction(e)?this.each(function(n){st(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n)for(var i,o=0,a=st(this),s=t,u=e.match(lt)\|\|[];i=u[o++];)s=r?s:!a.hasClass(i),a[s?"addClass":"removeClass"](i);else("undefined"===n\|\|"boolean"===n)&&(this.className&&st._data(this,"__className__",this.className),this.className=this.className\|\|e===!1?"":st._data(this,"__className__")\|\|"")})},hasClass:function(e){for(var t=" "+e+" ",n=0,r=this.length;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(Et," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=st.isFunction(e),this.each(function(r){var o,a=st(this);1===this.nodeType&&(o=i?e.call(this,r,a.val()):e,null==o?o="":"number"==typeof o?o+="":st.isArray(o)&&(o=st.map(o,function(e){return null==e?"":e+""})),n=st.valHooks[this.type]\|\|st.valHooks[this.nodeName.toLowerCase()],n&&"set"in n&&n.set(this,o,"value")!==t\|\|(this.value=o))});if(o)return n=st.valHooks[o.type]\|\|st.valHooks[o.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(o,"value"))!==t?r:(r=o.value,"string"==typeof r?r.replace(St,""):null==r?"":r)}}}),st.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t\|\|t.specified?e.value:e.text}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type\|\|0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;s>u;u++)if(n=r[u],!(!n.selected&&u!==i\|\|(st.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))\|\|n.parentNode.disabled&&st.nodeName(n.parentNode,"optgroup"))){if(t=st(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=st.makeArray(t);return st(e).find("option").each(function(){this.selected=st.inArray(st(this).val(),n)>=0}),n.length\|\|(e.selectedIndex=-1),n}}},attr:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return e.getAttribute===t?st.prop(e,n,r):(a=1!==s\|\|!st.isXMLDoc(e),a&&(n=n.toLowerCase(),o=st.attrHooks[n]\|\|(Dt.test(n)?kt:Ct)),r===t?o&&a&&"get"in o&&null!==(i=o.get(e,n))?i:(e.getAttribute!==t&&(i=e.getAttribute(n)),null==i?t:i):null!==r?o&&a&&"set"in o&&(i=o.set(e,r,n))!==t?i:(e.setAttribute(n,r+""),r):(st.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(lt);if(o&&1===e.nodeType)for(;n=o[i++];)r=st.propFix[n]\|\|n,Dt.test(n)?!Ht&&Lt.test(n)?e[st.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:st.attr(e,n,""),e.removeAttribute(Ht?n:r)},attrHooks:{type:{set:function(e,t){if(!st.support.radioValue&&"radio"===t&&st.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s\|\|!st.isXMLDoc(e),a&&(n=st.propFix[n]\|\|n,o=st.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):At.test(e.nodeName)\|\|jt.test(e.nodeName)&&e.href?0:t}}}}),kt={get:function(e,n){var r=st.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?Mt&&Ht?null!=i:Lt.test(n)?e[st.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?st.removeAttr(e,n):Mt&&Ht\|\|!Lt.test(n)?e.setAttribute(!Ht&&st.propFix[n]\|\|n,n):e[st.camelCase("default-"+n)]=e[n]=!0,n}},Mt&&Ht\|\|(st.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return st.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t
	2	+},set:function(e,n,r){return st.nodeName(e,"input")?(e.defaultValue=n,t):Ct&&Ct.set(e,n,r)}}),Ht\|\|(Ct=st.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n\|\|"name"===n\|\|"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i\|\|e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r\|\|n===e.getAttribute(r)?n:t}},st.attrHooks.contenteditable={get:Ct.get,set:function(e,t,n){Ct.set(e,""===t?!1:t,n)}},st.each(["width","height"],function(e,n){st.attrHooks[n]=st.extend(st.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),st.support.hrefNormalized\|\|(st.each(["href","src","width","height"],function(e,n){st.attrHooks[n]=st.extend(st.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),st.each(["href","src"],function(e,t){st.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),st.support.style\|\|(st.attrHooks.style={get:function(e){return e.style.cssText\|\|t},set:function(e,t){return e.style.cssText=t+""}}),st.support.optSelected\|\|(st.propHooks.selected=st.extend(st.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),st.support.enctype\|\|(st.propFix.enctype="encoding"),st.support.checkOn\|\|st.each(["radio","checkbox"],function(){st.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),st.each(["radio","checkbox"],function(){st.valHooks[this]=st.extend(st.valHooks[this],{set:function(e,n){return st.isArray(n)?e.checked=st.inArray(st(e).val(),n)>=0:t}})});var qt=/^(?:input\|select\|textarea)$/i,_t=/^key/,Ft=/^(?:mouse\|contextmenu)\|click/,Ot=/^(?:focusinfocus\|focusoutblur)$/,Bt=/^([^.])(?:\.(.+)\|)$/;st.event={global:{},add:function(e,n,r,i,o){var a,s,u,l,c,f,p,d,h,g,m,y=3!==e.nodeType&&8!==e.nodeType&&st._data(e);if(y){for(r.handler&&(a=r,r=a.handler,o=a.selector),r.guid\|\|(r.guid=st.guid++),(l=y.events)\|\|(l=y.events={}),(s=y.handle)\|\|(s=y.handle=function(e){return st===t\|\|e&&st.event.triggered===e.type?t:st.event.dispatch.apply(s.elem,arguments)},s.elem=e),n=(n\|\|"").match(lt)\|\|[""],c=n.length;c--;)u=Bt.exec(n[c])\|\|[],h=m=u[1],g=(u[2]\|\|"").split(".").sort(),p=st.event.special[h]\|\|{},h=(o?p.delegateType:p.bindType)\|\|h,p=st.event.special[h]\|\|{},f=st.extend({type:h,origType:m,data:i,handler:r,guid:r.guid,selector:o,needsContext:o&&st.expr.match.needsContext.test(o),namespace:g.join(".")},a),(d=l[h])\|\|(d=l[h]=[],d.delegateCount=0,p.setup&&p.setup.call(e,i,g,s)!==!1\|\|(e.addEventListener?e.addEventListener(h,s,!1):e.attachEvent&&e.attachEvent("on"+h,s))),p.add&&(p.add.call(e,f),f.handler.guid\|\|(f.handler.guid=r.guid)),o?d.splice(d.delegateCount++,0,f):d.push(f),st.event.global[h]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,m=st.hasData(e)&&st._data(e);if(m&&(u=m.events)){for(t=(t\|\|"").match(lt)\|\|[""],l=t.length;l--;)if(s=Bt.exec(t[l])\|\|[],d=g=s[1],h=(s[2]\|\|"").split(".").sort(),d){for(f=st.event.special[d]\|\|{},d=(r?f.delegateType:f.bindType)\|\|d,p=u[d]\|\|[],s=s[2]&&RegExp("(^\|\\.)"+h.join("\\.(?:.\\.\|)")+"(\\.\|$)"),a=o=p.length;o--;)c=p[o],!i&&g!==c.origType\|\|n&&n.guid!==c.guid\|\|s&&!s.test(c.namespace)\|\|r&&r!==c.selector&&("*"!==r\|\|!c.selector)\|\|(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&f.teardown.call(e,h,m.handle)!==!1\|\|st.removeEvent(e,d,m.handle),delete u[d])}else for(d in u)st.event.remove(e,d+t[l],n,r,!0);st.isEmptyObject(u)&&(delete m.handle,st._removeData(e,"events"))}},trigger:function(n,r,i,o){var a,s,u,l,c,f,p,d=[i\|\|V],h=n.type\|\|n,g=n.namespace?n.namespace.split("."):[];if(s=u=i=i\|\|V,3!==i.nodeType&&8!==i.nodeType&&!Ot.test(h+st.event.triggered)&&(h.indexOf(".")>=0&&(g=h.split("."),h=g.shift(),g.sort()),c=0>h.indexOf(":")&&"on"+h,n=n[st.expando]?n:new st.Event(h,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=g.join("."),n.namespace_re=n.namespace?RegExp("(^\|\\.)"+g.join("\\.(?:.\\.\|)")+"(\\.\|$)"):null,n.result=t,n.target\|\|(n.target=i),r=null==r?[n]:st.makeArray(r,[n]),p=st.event.special[h]\|\|{},o\|\|!p.trigger\|\|p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!st.isWindow(i)){for(l=p.delegateType\|\|h,Ot.test(l+h)\|\|(s=s.parentNode);s;s=s.parentNode)d.push(s),u=s;u===(i.ownerDocument\|\|V)&&d.push(u.defaultView\|\|u.parentWindow\|\|e)}for(a=0;(s=d[a++])&&!n.isPropagationStopped();)n.type=a>1?l:p.bindType\|\|h,f=(st._data(s,"events")\|\|{})[n.type]&&st._data(s,"handle"),f&&f.apply(s,r),f=c&&s[c],f&&st.acceptData(s)&&f.apply&&f.apply(s,r)===!1&&n.preventDefault();if(n.type=h,!(o\|\|n.isDefaultPrevented()\|\|p._default&&p._default.apply(i.ownerDocument,r)!==!1\|\|"click"===h&&st.nodeName(i,"a")\|\|!st.acceptData(i)\|\|!c\|\|!i[h]\|\|st.isWindow(i))){u=i[c],u&&(i[c]=null),st.event.triggered=h;try{i[h]()}catch(m){}st.event.triggered=t,u&&(i[c]=u)}return n.result}},dispatch:function(e){e=st.event.fix(e);var n,r,i,o,a,s=[],u=nt.call(arguments),l=(st._data(this,"events")\|\|{})[e.type]\|\|[],c=st.event.special[e.type]\|\|{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch\|\|c.preDispatch.call(this,e)!==!1){for(s=st.event.handlers.call(this,e,l),n=0;(o=s[n++])&&!e.isPropagationStopped();)for(e.currentTarget=o.elem,r=0;(a=o.handlers[r++])&&!e.isImmediatePropagationStopped();)(!e.namespace_re\|\|e.namespace_re.test(a.namespace))&&(e.handleObj=a,e.data=a.data,i=((st.event.special[a.origType]\|\|{}).handle\|\|a.handler).apply(o.elem,u),i!==t&&(e.result=i)===!1&&(e.preventDefault(),e.stopPropagation()));return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button\|\|"click"!==e.type))for(;l!=this;l=l.parentNode\|\|this)if(l.disabled!==!0\|\|"click"!==e.type){for(i=[],r=0;u>r;r++)a=n[r],o=a.selector+" ",i[o]===t&&(i[o]=a.needsContext?st(o,this).index(l)>=0:st.find(o,this,null,[l]).length),i[o]&&i.push(a);i.length&&s.push({elem:l,handlers:i})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[st.expando])return e;var t,n,r=e,i=st.event.fixHooks[e.type]\|\|{},o=i.props?this.props.concat(i.props):this.props;for(e=new st.Event(r),t=o.length;t--;)n=o[t],e[n]=r[n];return e.target\|\|(e.target=r.srcElement\|\|V),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,i.filter?i.filter(e,r):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,a=n.button,s=n.fromElement;return null==e.pageX&&null!=n.clientX&&(r=e.target.ownerDocument\|\|V,i=r.documentElement,o=r.body,e.pageX=n.clientX+(i&&i.scrollLeft\|\|o&&o.scrollLeft\|\|0)-(i&&i.clientLeft\|\|o&&o.clientLeft\|\|0),e.pageY=n.clientY+(i&&i.scrollTop\|\|o&&o.scrollTop\|\|0)-(i&&i.clientTop\|\|o&&o.clientTop\|\|0)),!e.relatedTarget&&s&&(e.relatedTarget=s===e.target?n.toElement:s),e.which\|\|a===t\|\|(e.which=1&a?1:2&a?3:4&a?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return st.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==V.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===V.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=st.extend(new st.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?st.event.trigger(i,null,t):st.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},st.removeEvent=V.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,n,r){var i="on"+n;e.detachEvent&&(e[i]===t&&(e[i]=null),e.detachEvent(i,r))},st.Event=function(e,n){return this instanceof st.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented\|\|e.returnValue===!1\|\|e.getPreventDefault&&e.getPreventDefault()?u:l):this.type=e,n&&st.extend(this,n),this.timeStamp=e&&e.timeStamp\|\|st.now(),this[st.expando]=!0,t):new st.Event(e,n)},st.Event.prototype={isDefaultPrevented:l,isPropagationStopped:l,isImmediatePropagationStopped:l,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=u,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=u,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u,this.stopPropagation()}},st.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){st.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i\|\|i!==r&&!st.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),st.support.submitBubbles\|\|(st.event.special.submit={setup:function(){return st.nodeName(this,"form")?!1:(st.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=st.nodeName(n,"input")\|\|st.nodeName(n,"button")?n.form:t;r&&!st._data(r,"submitBubbles")&&(st.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),st._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&st.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return st.nodeName(this,"form")?!1:(st.event.remove(this,"._submit"),t)}}),st.support.changeBubbles\|\|(st.event.special.change={setup:function(){return qt.test(this.nodeName)?(("checkbox"===this.type\|\|"radio"===this.type)&&(st.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),st.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),st.event.simulate("change",this,e,!0)})),!1):(st.event.add(this,"beforeactivate._change",function(e){var t=e.target;qt.test(t.nodeName)&&!st._data(t,"changeBubbles")&&(st.event.add(t,"change._change",function(e){!this.parentNode\|\|e.isSimulated\|\|e.isTrigger\|\|st.event.simulate("change",this.parentNode,e,!0)}),st._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n\|\|e.isSimulated\|\|e.isTrigger\|\|"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return st.event.remove(this,"._change"),!qt.test(this.nodeName)}}),st.support.focusinBubbles\|\|st.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){st.event.simulate(t,e.target,st.event.fix(e),!0)};st.event.special[t]={setup:function(){0===n++&&V.addEventListener(e,r,!0)},teardown:function(){0===--n&&V.removeEventListener(e,r,!0)}}}),st.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r\|\|n,n=t);for(s in e)this.on(s,n,r,e[s],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=l;else if(!i)return this;return 1===o&&(a=i,i=function(e){return st().off(e),a.apply(this,arguments)},i.guid=a.guid\|\|(a.guid=st.guid++)),this.each(function(){st.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,st(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1\|\|"function"==typeof n)&&(r=n,n=t),r===!1&&(r=l),this.each(function(){st.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,""):this.off(t,e\|\|"",n)},trigger:function(e,t){return this.each(function(){st.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?st.event.trigger(e,n,r,!0):t},hover:function(e,t){return this.mouseenter(e).mouseleave(t\|\|e)}}),st.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){st.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)},_t.test(t)&&(st.event.fixHooks[t]=st.event.keyHooks),Ft.test(t)&&(st.event.fixHooks[t]=st.event.mouseHooks)}),function(e,t){function n(e){return ht.test(e+"")}function r(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>C.cacheLength&&delete e[t.shift()],e[n]=r}}function i(e){return e[P]=!0,e}function o(e){var t=L.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function a(e,t,n,r){var i,o,a,s,u,l,c,d,h,g;if((t?t.ownerDocument\|\|t:R)!==L&&D(t),t=t\|\|L,n=n\|\|[],!e\|\|"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!M&&!r){if(i=gt.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o\|\|!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&O(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return Q.apply(n,K.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&W.getByClassName&&t.getElementsByClassName)return Q.apply(n,K.call(t.getElementsByClassName(a),0)),n}if(W.qsa&&!q.test(e)){if(c=!0,d=P,h=t,g=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){for(l=f(e),(c=t.getAttribute("id"))?d=c.replace(vt,"\\$&"):t.setAttribute("id",d),d="[id='"+d+"'] ",u=l.length;u--;)l[u]=d+p(l[u]);h=dt.test(e)&&t.parentNode\|\|t,g=l.join(",")}if(g)try{return Q.apply(n,K.call(h.querySelectorAll(g),0)),n}catch(m){}finally{c\|\|t.removeAttribute("id")}}}return x(e.replace(at,"$1"),t,n,r)}function s(e,t){for(var n=e&&t&&e.nextSibling;n;n=n.nextSibling)if(n===t)return-1;return e?1:-1}function u(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function l(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n\|\|"button"===n)&&t.type===e}}function c(e){return i(function(t){return t=+t,i(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function f(e,t){var n,r,i,o,s,u,l,c=X[e+" "];if(c)return t?0:c.slice(0);for(s=e,u=[],l=C.preFilter;s;){(!n\|\|(r=ut.exec(s)))&&(r&&(s=s.slice(r[0].length)\|\|s),u.push(i=[])),n=!1,(r=lt.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(at," ")}),s=s.slice(n.length));for(o in C.filter)!(r=pt[o].exec(s))\|\|l[o]&&!(r=l[o](r))\|\|(n=r.shift(),i.push({value:n,type:o,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?a.error(e):X(e,u).slice(0)}function p(e){for(var t=0,n=e.length,r="";n>t;t++)r+=e[t].value;return r}function d(e,t,n){var r=t.dir,i=n&&"parentNode"===t.dir,o=I++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType\|\|i)return e(t,n,o)}:function(t,n,a){var s,u,l,c=$+" "+o;if(a){for(;t=t[r];)if((1===t.nodeType\|\|i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType\|\|i)if(l=t[P]\|\|(t[P]={}),(u=l[r])&&u[0]===c){if((s=u[1])===!0\|\|s===N)return s===!0}else if(u=l[r]=[c],u[1]=e(t,n,a)\|\|N,u[1]===!0)return!0}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function g(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;u>s;s++)(o=e[s])&&(!n\|\|n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function m(e,t,n,r,o,a){return r&&!r[P]&&(r=m(r)),o&&!o[P]&&(o=m(o,a)),i(function(i,a,s,u){var l,c,f,p=[],d=[],h=a.length,m=i\|\|b(t\|\|"",s.nodeType?[s]:s,[]),y=!e\|\|!i&&t?m:g(m,p,e,s,u),v=n?o\|\|(i?e:h\|\|r)?[]:a:y;if(n&&n(y,v,s,u),r)for(l=g(v,d),r(l,[],s,u),c=l.length;c--;)(f=l[c])&&(v[d[c]]=!(y[d[c]]=f));if(i){if(o\|\|e){if(o){for(l=[],c=v.length;c--;)(f=v[c])&&l.push(y[c]=f);o(null,v=[],l,u)}for(c=v.length;c--;)(f=v[c])&&(l=o?Z.call(i,f):p[c])>-1&&(i[l]=!(a[l]=f))}}else v=g(v===a?v.splice(h,v.length):v),o?o(null,a,v,u):Q.apply(a,v)})}function y(e){for(var t,n,r,i=e.length,o=C.relative[e[0].type],a=o\|\|C.relative[" "],s=o?1:0,u=d(function(e){return e===t},a,!0),l=d(function(e){return Z.call(t,e)>-1},a,!0),c=[function(e,n,r){return!o&&(r\|\|n!==j)\|\|((t=n).nodeType?u(e,n,r):l(e,n,r))}];i>s;s++)if(n=C.relative[e[s].type])c=[d(h(c),n)];else{if(n=C.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;i>r&&!C.relative[e[r].type];r++);return m(s>1&&h(c),s>1&&p(e.slice(0,s-1)).replace(at,"$1"),n,r>s&&y(e.slice(s,r)),i>r&&y(e=e.slice(r)),i>r&&p(e))}c.push(n)}return h(c)}function v(e,t){var n=0,r=t.length>0,o=e.length>0,s=function(i,s,u,l,c){var f,p,d,h=[],m=0,y="0",v=i&&[],b=null!=c,x=j,T=i\|\|o&&C.find.TAG("",c&&s.parentNode\|\|s),w=$+=null==x?1:Math.E;for(b&&(j=s!==L&&s,N=n);null!=(f=T[y]);y++){if(o&&f){for(p=0;d=e[p];p++)if(d(f,s,u)){l.push(f);break}b&&($=w,N=++n)}r&&((f=!d&&f)&&m--,i&&v.push(f))}if(m+=y,r&&y!==m){for(p=0;d=t[p];p++)d(v,h,s,u);if(i){if(m>0)for(;y--;)v[y]\|\|h[y]\|\|(h[y]=G.call(l));h=g(h)}Q.apply(l,h),b&&!i&&h.length>0&&m+t.length>1&&a.uniqueSort(l)}return b&&($=w,j=x),v};return r?i(s):s}function b(e,t,n){for(var r=0,i=t.length;i>r;r++)a(e,t[r],n);return n}function x(e,t,n,r){var i,o,a,s,u,l=f(e);if(!r&&1===l.length){if(o=l[0]=l[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&9===t.nodeType&&!M&&C.relative[o[1].type]){if(t=C.find.ID(a.matches[0].replace(xt,Tt),t)[0],!t)return n;e=e.slice(o.shift().value.length)}for(i=pt.needsContext.test(e)?-1:o.length-1;i>=0&&(a=o[i],!C.relative[s=a.type]);i--)if((u=C.find[s])&&(r=u(a.matches[0].replace(xt,Tt),dt.test(o[0].type)&&t.parentNode\|\|t))){if(o.splice(i,1),e=r.length&&p(o),!e)return Q.apply(n,K.call(r,0)),n;break}}return S(e,l)(r,t,M,n,dt.test(e)),n}function T(){}var w,N,C,k,E,S,A,j,D,L,H,M,q,_,F,O,B,P="sizzle"+-new Date,R=e.document,W={},$=0,I=0,z=r(),X=r(),U=r(),V=typeof t,Y=1<<31,J=[],G=J.pop,Q=J.push,K=J.slice,Z=J.indexOf\|\|function(e){for(var t=0,n=this.length;n>t;t++)if(this[t]===e)return t;return-1},et="[\\x20\\t\\r\\n\\f]",tt="(?:\\\\.\|[\\w-]\|[^\\x00-\\xa0])+",nt=tt.replace("w","w#"),rt="([^$\|!~]?=)",it="\\["+et+"("+tt+")"+et+"(?:"+rt+et+"(?:(['\"])((?:\\\\.\|[^\\\\])?)\\3\|("+nt+")\|)\|)"+et+"\\]",ot=":("+tt+")(?:\$((['\"])((?:\\\\.\|[^\\\\])?)\\3\|((?:\\\\.\|[^\\\\()[\\]]\|"+it.replace(3,8)+"))\|.)\$\|)",at=RegExp("^"+et+"+\|((?:^\|[^\\\\])(?:\\\\.))"+et+"+$","g"),ut=RegExp("^"+et+","+et+""),lt=RegExp("^"+et+"([\\x20\\t\\r\\n\\f>+~])"+et+""),ct=RegExp(ot),ft=RegExp("^"+nt+"$"),pt={ID:RegExp("^#("+tt+")"),CLASS:RegExp("^\\.("+tt+")"),NAME:RegExp("^\\[name=['\"]?("+tt+")['\"]?\\]"),TAG:RegExp("^("+tt.replace("w","w")+")"),ATTR:RegExp("^"+it),PSEUDO:RegExp("^"+ot),CHILD:RegExp("^:(only\|first\|last\|nth\|nth-last)-(child\|of-type)(?:\$"+et+"(even\|odd\|(([+-]\|)(\\d)n\|)"+et+"(?:([+-]\|)"+et+"(\\d+)\|))"+et+"\$\|)","i"),needsContext:RegExp("^"+et+"[>+~]\|:(even\|odd\|eq\|gt\|lt\|nth\|first\|last)(?:\$"+et+"((?:-\\d)?\\d)"+et+"\$\|)(?=[^-]\|$)","i")},dt=/[\x20\t\r\n\f][+~]/,ht=/\{\s\[native code\]\s\}/,gt=/^(?:#([\w-]+)\|(\w+)\|\.([\w-]+))$/,mt=/^(?:input\|select\|textarea\|button)$/i,yt=/^h\d$/i,vt=/'\|\\/g,bt=/\=[\x20\t\r\n\f]([^'"\]])[\x20\t\r\n\f]\]/g,xt=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?\|.)/g,Tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296\|n>>10,56320\|1023&n)};try{K.call(H.childNodes,0)[0].nodeType}catch(wt){K=function(e){for(var t,n=[];t=this[e];e++)n.push(t);return n}}E=a.isXML=function(e){var t=e&&(e.ownerDocument\|\|e).documentElement;return t?"HTML"!==t.nodeName:!1},D=a.setDocument=function(e){var r=e?e.ownerDocument\|\|e:R;return r!==L&&9===r.nodeType&&r.documentElement?(L=r,H=r.documentElement,M=E(r),W.tagNameNoComments=o(function(e){return e.appendChild(r.createComment("")),!e.getElementsByTagName("").length}),W.attributes=o(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),W.getByClassName=o(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),W.getByName=o(function(e){e.id=P+0,e.innerHTML="<a name='"+P+"'></a><div name='"+P+"'></div>",H.insertBefore(e,H.firstChild);var t=r.getElementsByName&&r.getElementsByName(P).length===2+r.getElementsByName(P+0).length;return W.getIdNotName=!r.getElementById(P),H.removeChild(e),t}),C.attrHandle=o(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==V&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},W.getIdNotName?(C.find.ID=function(e,t){if(typeof t.getElementById!==V&&!M){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},C.filter.ID=function(e){var t=e.replace(xt,Tt);return function(e){return e.getAttribute("id")===t}}):(C.find.ID=function(e,n){if(typeof n.getElementById!==V&&!M){var r=n.getElementById(e);return r?r.id===e\|\|typeof r.getAttributeNode!==V&&r.getAttributeNode("id").value===e?[r]:t:[]}},C.filter.ID=function(e){var t=e.replace(xt,Tt);return function(e){var n=typeof e.getAttributeNode!==V&&e.getAttributeNode("id");return n&&n.value===t}}),C.find.TAG=W.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==V?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if(""===e){for(;n=o[i];i++)1===n.nodeType&&r.push(n);return r}return o},C.find.NAME=W.getByName&&function(e,n){return typeof n.getElementsByName!==V?n.getElementsByName(name):t},C.find.CLASS=W.getByClassName&&function(e,n){return typeof n.getElementsByClassName===V\|\|M?t:n.getElementsByClassName(e)},_=[],q=[":focus"],(W.qsa=n(r.querySelectorAll))&&(o(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length\|\|q.push("\\["+et+"(?:checked\|disabled\|ismap\|multiple\|readonly\|selected\|value)"),e.querySelectorAll(":checked").length\|\|q.push(":checked")}),o(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&q.push("[^$]="+et+"(?:\"\"\|'')"),e.querySelectorAll(":enabled").length\|\|q.push(":enabled",":disabled"),e.querySelectorAll(",:x"),q.push(",.:")})),(W.matchesSelector=n(F=H.matchesSelector\|\|H.mozMatchesSelector\|\|H.webkitMatchesSelector\|\|H.oMatchesSelector\|\|H.msMatchesSelector))&&o(function(e){W.disconnectedMatch=F.call(e,"div"),F.call(e,"[s!='']:x"),_.push("!=",ot)}),q=RegExp(q.join("\|")),_=RegExp(_.join("\|")),O=n(H.contains)\|\|H.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r\|\|!(!r\|\|1!==r.nodeType\|\|!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},B=H.compareDocumentPosition?function(e,t){var n;return e===t?(A=!0,0):(n=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&n\|\|e.parentNode&&11===e.parentNode.nodeType?e===r\|\|O(R,e)?-1:t===r\|\|O(R,t)?1:0:4&n?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var n,i=0,o=e.parentNode,a=t.parentNode,u=[e],l=[t];if(e===t)return A=!0,0;if(e.sourceIndex&&t.sourceIndex)return(~t.sourceIndex\|\|Y)-(O(R,e)&&~e.sourceIndex\|\|Y);if(!o\|\|!a)return e===r?-1:t===r?1:o?-1:a?1:0;if(o===a)return s(e,t);for(n=e;n=n.parentNode;)u.unshift(n);for(n=t;n=n.parentNode;)l.unshift(n);for(;u[i]===l[i];)i++;return i?s(u[i],l[i]):u[i]===R?-1:l[i]===R?1:0},A=!1,[0,0].sort(B),W.detectDuplicates=A,L):L},a.matches=function(e,t){return a(e,null,null,t)},a.matchesSelector=function(e,t){if((e.ownerDocument\|\|e)!==L&&D(e),t=t.replace(bt,"='$1']"),!(!W.matchesSelector\|\|M\|\|_&&_.test(t)\|\|q.test(t)))try{var n=F.call(e,t);if(n\|\|W.disconnectedMatch\|\|e.document&&11!==e.document.nodeType)return n}catch(r){}return a(t,L,null,[e]).length>0},a.contains=function(e,t){return(e.ownerDocument\|\|e)!==L&&D(e),O(e,t)},a.attr=function(e,t){var n;return(e.ownerDocument\|\|e)!==L&&D(e),M\|\|(t=t.toLowerCase()),(n=C.attrHandle[t])?n(e):M\|\|W.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))\|\|e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},a.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},a.uniqueSort=function(e){var t,n=[],r=1,i=0;if(A=!W.detectDuplicates,e.sort(B),A){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));for(;i--;)e.splice(n[i],1)}return e},k=a.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i\|\|9===i\|\|11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=k(e)}else if(3===i\|\|4===i)return e.nodeValue}else for(;t=e[r];r++)n+=k(t);return n},C=a.selectors={cacheLength:50,createPseudo:i,match:pt,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(xt,Tt),e[3]=(e[4]\|\|e[5]\|\|"").replace(xt,Tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]\|\|a.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]\|\|1):2("even"===e[3]\|\|"odd"===e[3])),e[5]=+(e[7]+e[8]\|\|"odd"===e[3])):e[3]&&a.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return pt.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&ct.test(n)&&(t=f(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return""===e?function(){return!0}:(e=e.replace(xt,Tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=z[e+" "];return t\|\|(t=RegExp("(^\|"+et+")"+e+"("+et+"\|$)"))&&z(e,function(e){return t.test(e.className\|\|typeof e.getAttribute!==V&&e.getAttribute("class")\|\|"")})},ATTR:function(e,t,n){return function(r){var i=a.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.substr(i.length-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"\|="===t?i===n\|\|i.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){for(;g;){for(f=t;f=f[g];)if(s?f.nodeName.toLowerCase()===y:1===f.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){for(c=m[P]\|\|(m[P]={}),l=c[e]\|\|[],d=l[0]===$&&l[1],p=l[0]===$&&l[2],f=d&&m.childNodes[d];f=++d&&f&&f[g]\|\|(p=d=0)\|\|h.pop();)if(1===f.nodeType&&++p&&f===t){c[e]=[$,d,p];break}}else if(v&&(l=(t[P]\|\|(t[P]={}))[e])&&l[0]===$)p=l[1];else for(;(f=++d&&f&&f[g]\|\|(p=d=0)\|\|h.pop())&&((s?f.nodeName.toLowerCase()!==y:1!==f.nodeType)\|\|!++p\|\|(v&&((f[P]\|\|(f[P]={}))[e]=[$,p]),f!==t)););return p-=i,p===r\|\|0===p%r&&p/r>=0}}},PSEUDO:function(e,t){var n,r=C.pseudos[e]\|\|C.setFilters[e.toLowerCase()]\|\|a.error("unsupported pseudo: "+e);return r[P]?r(t):r.length>1?(n=[e,e,"",t],C.setFilters.hasOwnProperty(e.toLowerCase())?i(function(e,n){for(var i,o=r(e,t),a=o.length;a--;)i=Z.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:i(function(e){var t=[],n=[],r=S(e.replace(at,"$1"));return r[P]?i(function(e,t,n,i){for(var o,a=r(e,null,i,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:i(function(e){return function(t){return a(e,t).length>0}}),contains:i(function(e){return function(t){return(t.textContent\|\|t.innerText\|\|k(t)).indexOf(e)>-1}}),lang:i(function(e){return ft.test(e\|\|"")\|\|a.error("unsupported lang: "+e),e=e.replace(xt,Tt).toLowerCase(),function(t){var n;do if(n=M?t.getAttribute("xml:lang")\|\|t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e\|\|0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===H},focus:function(e){return e===L.activeElement&&(!L.hasFocus\|\|L.hasFocus())&&!!(e.type\|\|e.href\|\|~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked\|\|"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"\|\|3===e.nodeType\|\|4===e.nodeType)return!1;return!0},parent:function(e){return!C.pseudos.empty(e)},header:function(e){return yt.test(e.nodeName)},input:function(e){return mt.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type\|\|"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))\|\|t.toLowerCase()===e.type)},first:c(function(){return[0]}),last:c(function(e,t){return[t-1]}),eq:c(function(e,t,n){return[0>n?n+t:n]}),even:c(function(e,t){for(var n=0;t>n;n+=2)e.push(n);return e}),odd:c(function(e,t){for(var n=1;t>n;n+=2)e.push(n);return e}),lt:c(function(e,t,n){for(var r=0>n?n+t:n;--r>=0;)e.push(r);return e}),gt:c(function(e,t,n){for(var r=0>n?n+t:n;t>++r;)e.push(r);return e})}};for(w in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})C.pseudos[w]=u(w);for(w in{submit:!0,reset:!0})C.pseudos[w]=l(w);S=a.compile=function(e,t){var n,r=[],i=[],o=U[e+" "];if(!o){for(t\|\|(t=f(e)),n=t.length;n--;)o=y(t[n]),o[P]?r.push(o):i.push(o);o=U(e,v(i,r))}return o},C.pseudos.nth=C.pseudos.eq,C.filters=T.prototype=C.pseudos,C.setFilters=new T,D(),a.attr=st.attr,st.find=a,st.expr=a.selectors,st.expr[":"]=st.expr.pseudos,st.unique=a.uniqueSort,st.text=a.getText,st.isXMLDoc=a.isXML,st.contains=a.contains}(e);var Pt=/Until$/,Rt=/^(?:parents\|prev(?:Until\|All))/,Wt=/^.[^:#\[\.,]*$/,$t=st.expr.match.needsContext,It={children:!0,contents:!0,next:!0,prev:!0};st.fn.extend({find:function(e){var t,n,r;if("string"!=typeof e)return r=this,this.pushStack(st(e).filter(function(){for(t=0;r.length>t;t++)if(st.contains(r[t],this))return!0}));for(n=[],t=0;this.length>t;t++)st.find(e,this[t],n);return n=this.pushStack(st.unique(n)),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=st(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(st.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(f(this,e,!1))},filter:function(e){return this.pushStack(f(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?$t.test(e)?st(e,this.context).index(this[0])>=0:st.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=$t.test(e)\|\|"string"!=typeof e?st(e,t\|\|this.context):0;i>r;r++)for(n=this[r];n&&n.ownerDocument&&n!==t&&11!==n.nodeType;){if(a?a.index(n)>-1:st.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}return this.pushStack(o.length>1?st.unique(o):o)},index:function(e){return e?"string"==typeof e?st.inArray(this[0],st(e)):st.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?st(e,t):st.makeArray(e&&e.nodeType?[e]:e),r=st.merge(this.get(),n);return this.pushStack(st.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),st.fn.andSelf=st.fn.addBack,st.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return st.dir(e,"parentNode")},parentsUntil:function(e,t,n){return st.dir(e,"parentNode",n)},next:function(e){return c(e,"nextSibling")},prev:function(e){return c(e,"previousSibling")
	3	+},nextAll:function(e){return st.dir(e,"nextSibling")},prevAll:function(e){return st.dir(e,"previousSibling")},nextUntil:function(e,t,n){return st.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return st.dir(e,"previousSibling",n)},siblings:function(e){return st.sibling((e.parentNode\|\|{}).firstChild,e)},children:function(e){return st.sibling(e.firstChild)},contents:function(e){return st.nodeName(e,"iframe")?e.contentDocument\|\|e.contentWindow.document:st.merge([],e.childNodes)}},function(e,t){st.fn[e]=function(n,r){var i=st.map(this,t,n);return Pt.test(e)\|\|(r=n),r&&"string"==typeof r&&(i=st.filter(r,i)),i=this.length>1&&!It[e]?st.unique(i):i,this.length>1&&Rt.test(e)&&(i=i.reverse()),this.pushStack(i)}}),st.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?st.find.matchesSelector(t[0],e)?[t[0]]:[]:st.find.matches(e,t)},dir:function(e,n,r){for(var i=[],o=e[n];o&&9!==o.nodeType&&(r===t\|\|1!==o.nodeType\|\|!st(o).is(r));)1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});var zt="abbr\|article\|aside\|audio\|bdi\|canvas\|data\|datalist\|details\|figcaption\|figure\|footer\|header\|hgroup\|mark\|meter\|nav\|output\|progress\|section\|summary\|time\|video",Xt=/ jQuery\d+="(?:null\|\d+)"/g,Ut=RegExp("<(?:"+zt+")[\\s/>]","i"),Vt=/^\s+/,Yt=/<(?!area\|br\|col\|embed\|hr\|img\|input\|link\|meta\|param)(([\w:]+)[^>])\/>/gi,Jt=/<([\w:]+)/,Gt=/<tbody/i,Qt=/<\|&#?\w+;/,Kt=/<(?:script\|style\|link)/i,Zt=/^(?:checkbox\|radio)$/i,en=/checked\s(?:[^=]\|=\s.checked.)/i,tn=/^$\|\/(?:java\|ecma)script/i,nn=/^true\/(.)/,rn=/^\s<!(?:\[CDATA\[\|--)\|(?:\]\]\|--)>\s$/g,on={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:st.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},an=p(V),sn=an.appendChild(V.createElement("div"));on.optgroup=on.option,on.tbody=on.tfoot=on.colgroup=on.caption=on.thead,on.th=on.td,st.fn.extend({text:function(e){return st.access(this,function(e){return e===t?st.text(this):this.empty().append((this[0]&&this[0].ownerDocument\|\|V).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(st.isFunction(e))return this.each(function(t){st(this).wrapAll(e.call(this,t))});if(this[0]){var t=st(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return st.isFunction(e)?this.each(function(t){st(this).wrapInner(e.call(this,t))}):this.each(function(){var t=st(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=st.isFunction(e);return this.each(function(n){st(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){st.nodeName(this,"body")\|\|st(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType\|\|11===this.nodeType\|\|9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType\|\|11===this.nodeType\|\|9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){for(var n,r=0;null!=(n=this[r]);r++)(!e\|\|st.filter(e,[n]).length>0)&&(t\|\|1!==n.nodeType\|\|st.cleanData(b(n)),n.parentNode&&(t&&st.contains(n.ownerDocument,n)&&m(b(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&st.cleanData(b(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&st.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return st.clone(this,e,t)})},html:function(e){return st.access(this,function(e){var n=this[0]\|\|{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(Xt,""):t;if(!("string"!=typeof e\|\|Kt.test(e)\|\|!st.support.htmlSerialize&&Ut.test(e)\|\|!st.support.leadingWhitespace&&Vt.test(e)\|\|on[(Jt.exec(e)\|\|["",""])[1].toLowerCase()])){e=e.replace(Yt,"<$1></$2>");try{for(;i>r;r++)n=this[r]\|\|{},1===n.nodeType&&(st.cleanData(b(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=st.isFunction(e);return t\|\|"string"==typeof e\|\|(e=st(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;(n&&1===this.nodeType\|\|11===this.nodeType)&&(st(this).remove(),t?t.parentNode.insertBefore(e,t):n.appendChild(e))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=et.apply([],e);var i,o,a,s,u,l,c=0,f=this.length,p=this,m=f-1,y=e[0],v=st.isFunction(y);if(v\|\|!(1>=f\|\|"string"!=typeof y\|\|st.support.checkClone)&&en.test(y))return this.each(function(i){var o=p.eq(i);v&&(e[0]=y.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(f&&(i=st.buildFragment(e,this[0].ownerDocument,!1,this),o=i.firstChild,1===i.childNodes.length&&(i=o),o)){for(n=n&&st.nodeName(o,"tr"),a=st.map(b(i,"script"),h),s=a.length;f>c;c++)u=i,c!==m&&(u=st.clone(u,!0,!0),s&&st.merge(a,b(u,"script"))),r.call(n&&st.nodeName(this[c],"table")?d(this[c],"tbody"):this[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,st.map(a,g),c=0;s>c;c++)u=a[c],tn.test(u.type\|\|"")&&!st._data(u,"globalEval")&&st.contains(l,u)&&(u.src?st.ajax({url:u.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):st.globalEval((u.text\|\|u.textContent\|\|u.innerHTML\|\|"").replace(rn,"")));i=o=null}return this}}),st.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){st.fn[e]=function(e){for(var n,r=0,i=[],o=st(e),a=o.length-1;a>=r;r++)n=r===a?this:this.clone(!0),st(o[r])[t](n),tt.apply(i,n.get());return this.pushStack(i)}}),st.extend({clone:function(e,t,n){var r,i,o,a,s,u=st.contains(e.ownerDocument,e);if(st.support.html5Clone\|\|st.isXMLDoc(e)\|\|!Ut.test("<"+e.nodeName+">")?s=e.cloneNode(!0):(sn.innerHTML=e.outerHTML,sn.removeChild(s=sn.firstChild)),!(st.support.noCloneEvent&&st.support.noCloneChecked\|\|1!==e.nodeType&&11!==e.nodeType\|\|st.isXMLDoc(e)))for(r=b(s),i=b(e),a=0;null!=(o=i[a]);++a)r[a]&&v(o,r[a]);if(t)if(n)for(i=i\|\|b(e),r=r\|\|b(s),a=0;null!=(o=i[a]);a++)y(o,r[a]);else y(e,s);return r=b(s,"script"),r.length>0&&m(r,!u&&b(e,"script")),r=i=o=null,s},buildFragment:function(e,t,n,r){for(var i,o,a,s,u,l,c,f=e.length,d=p(t),h=[],g=0;f>g;g++)if(o=e[g],o\|\|0===o)if("object"===st.type(o))st.merge(h,o.nodeType?[o]:o);else if(Qt.test(o)){for(s=s\|\|d.appendChild(t.createElement("div")),a=(Jt.exec(o)\|\|["",""])[1].toLowerCase(),u=on[a]\|\|on._default,s.innerHTML=u[1]+o.replace(Yt,"<$1></$2>")+u[2],c=u[0];c--;)s=s.lastChild;if(!st.support.leadingWhitespace&&Vt.test(o)&&h.push(t.createTextNode(Vt.exec(o)[0])),!st.support.tbody)for(o="table"!==a\|\|Gt.test(o)?"<table>"!==u[1]\|\|Gt.test(o)?0:s:s.firstChild,c=o&&o.childNodes.length;c--;)st.nodeName(l=o.childNodes[c],"tbody")&&!l.childNodes.length&&o.removeChild(l);for(st.merge(h,s.childNodes),s.textContent="";s.firstChild;)s.removeChild(s.firstChild);s=d.lastChild}else h.push(t.createTextNode(o));for(s&&d.removeChild(s),st.support.appendChecked\|\|st.grep(b(h,"input"),x),g=0;o=h[g++];)if((!r\|\|-1===st.inArray(o,r))&&(i=st.contains(o.ownerDocument,o),s=b(d.appendChild(o),"script"),i&&m(s),n))for(c=0;o=s[c++];)tn.test(o.type\|\|"")&&n.push(o);return s=null,d},cleanData:function(e,n){for(var r,i,o,a,s=0,u=st.expando,l=st.cache,c=st.support.deleteExpando,f=st.event.special;null!=(o=e[s]);s++)if((n\|\|st.acceptData(o))&&(i=o[u],r=i&&l[i])){if(r.events)for(a in r.events)f[a]?st.event.remove(o,a):st.removeEvent(o,a,r.handle);l[i]&&(delete l[i],c?delete o[u]:o.removeAttribute!==t?o.removeAttribute(u):o[u]=null,K.push(i))}}});var un,ln,cn,fn=/alpha$[^)]$/i,pn=/opacity\s=\s([^)])/,dn=/^(top\|right\|bottom\|left)$/,hn=/^(none\|table(?!-c[ea]).+)/,gn=/^margin/,mn=RegExp("^("+ut+")(.)$","i"),yn=RegExp("^("+ut+")(?!px)[a-z%]+$","i"),vn=RegExp("^([+-])=("+ut+")","i"),bn={BODY:"block"},xn={position:"absolute",visibility:"hidden",display:"block"},Tn={letterSpacing:0,fontWeight:400},wn=["Top","Right","Bottom","Left"],Nn=["Webkit","O","Moz","ms"];st.fn.extend({css:function(e,n){return st.access(this,function(e,n,r){var i,o,a={},s=0;if(st.isArray(n)){for(i=ln(e),o=n.length;o>s;s++)a[n[s]]=st.css(e,n[s],!1,i);return a}return r!==t?st.style(e,n,r):st.css(e,n)},e,n,arguments.length>1)},show:function(){return N(this,!0)},hide:function(){return N(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:w(this))?st(this).show():st(this).hide()})}}),st.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=un(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":st.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=st.camelCase(n),l=e.style;if(n=st.cssProps[u]\|\|(st.cssProps[u]=T(l,u)),s=st.cssHooks[n]\|\|st.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=vn.exec(r))&&(r=(o[1]+1)o[2]+parseFloat(st.css(e,n)),a="number"),!(null==r\|\|"number"===a&&isNaN(r)\|\|("number"!==a\|\|st.cssNumber[u]\|\|(r+="px"),st.support.clearCloneStyle\|\|""!==r\|\|0!==n.indexOf("background")\|\|(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=st.camelCase(n);return n=st.cssProps[u]\|\|(st.cssProps[u]=T(e.style,u)),s=st.cssHooks[n]\|\|st.cssHooks[u],s&&"get"in s&&(o=s.get(e,!0,r)),o===t&&(o=un(e,n,i)),"normal"===o&&n in Tn&&(o=Tn[n]),r?(a=parseFloat(o),r===!0\|\|st.isNumeric(a)?a\|\|0:o):o},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r\|\|[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(ln=function(t){return e.getComputedStyle(t,null)},un=function(e,n,r){var i,o,a,s=r\|\|ln(e),u=s?s.getPropertyValue(n)\|\|s[n]:t,l=e.style;return s&&(""!==u\|\|st.contains(e.ownerDocument,e)\|\|(u=st.style(e,n)),yn.test(u)&&gn.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):V.documentElement.currentStyle&&(ln=function(e){return e.currentStyle},un=function(e,n,r){var i,o,a,s=r\|\|ln(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),yn.test(u)&&!dn.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u}),st.each(["height","width"],function(e,n){st.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&hn.test(st.css(e,"display"))?st.swap(e,xn,function(){return E(e,n,i)}):E(e,n,i):t},set:function(e,t,r){var i=r&&ln(e);return C(e,t,r?k(e,n,r,st.support.boxSizing&&"border-box"===st.css(e,"boxSizing",!1,i),i):0)}}}),st.support.opacity\|\|(st.cssHooks.opacity={get:function(e,t){return pn.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)\|\|"")?.01parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=st.isNumeric(t)?"alpha(opacity="+100t+")":"",o=r&&r.filter\|\|n.filter\|\|"";n.zoom=1,(t>=1\|\|""===t)&&""===st.trim(o.replace(fn,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t\|\|r&&!r.filter)\|\|(n.filter=fn.test(o)?o.replace(fn,i):o+" "+i)}}),st(function(){st.support.reliableMarginRight\|\|(st.cssHooks.marginRight={get:function(e,n){return n?st.swap(e,{display:"inline-block"},un,[e,"marginRight"]):t}}),!st.support.pixelPosition&&st.fn.position&&st.each(["top","left"],function(e,n){st.cssHooks[n]={get:function(e,r){return r?(r=un(e,n),yn.test(r)?st(e).position()[n]+"px":r):t}}})}),st.expr&&st.expr.filters&&(st.expr.filters.hidden=function(e){return 0===e.offsetWidth&&0===e.offsetHeight\|\|!st.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display\|\|st.css(e,"display"))},st.expr.filters.visible=function(e){return!st.expr.filters.hidden(e)}),st.each({margin:"",padding:"",border:"Width"},function(e,t){st.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];4>r;r++)i[e+wn[r]+t]=o[r]\|\|o[r-2]\|\|o[0];return i}},gn.test(e)\|\|(st.cssHooks[e+t].set=C)});var Cn=/%20/g,kn=/\[\]$/,En=/\r?\n/g,Sn=/^(?:submit\|button\|image\|reset)$/i,An=/^(?:input\|select\|textarea\|keygen)/i;st.fn.extend({serialize:function(){return st.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=st.prop(this,"elements");return e?st.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!st(this).is(":disabled")&&An.test(this.nodeName)&&!Sn.test(e)&&(this.checked\|\|!Zt.test(e))}).map(function(e,t){var n=st(this).val();return null==n?null:st.isArray(n)?st.map(n,function(e){return{name:t.name,value:e.replace(En,"\r\n")}}):{name:t.name,value:n.replace(En,"\r\n")}}).get()}}),st.param=function(e,n){var r,i=[],o=function(e,t){t=st.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=st.ajaxSettings&&st.ajaxSettings.traditional),st.isArray(e)\|\|e.jquery&&!st.isPlainObject(e))st.each(e,function(){o(this.name,this.value)});else for(r in e)j(r,e[r],n,o);return i.join("&").replace(Cn,"+")};var jn,Dn,Ln=st.now(),Hn=/\?/,Mn=/#.$/,qn=/([?&])_=[^&]/,_n=/^(.?):[ \t]([^\r\n])\r?$/gm,Fn=/^(?:about\|app\|app-storage\|.+-extension\|file\|res\|widget):$/,On=/^(?:GET\|HEAD)$/,Bn=/^\/\//,Pn=/^([\w.+-]+:)(?:\/\/([^\/?#:])(?::(\d+)\|)\|)/,Rn=st.fn.load,Wn={},$n={},In="/".concat("");try{Dn=Y.href}catch(zn){Dn=V.createElement("a"),Dn.href="",Dn=Dn.href}jn=Pn.exec(Dn.toLowerCase())\|\|[],st.fn.load=function(e,n,r){if("string"!=typeof e&&Rn)return Rn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),st.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(o="POST"),s.length>0&&st.ajax({url:e,type:o,dataType:"html",data:n}).done(function(e){a=arguments,s.html(i?st("<div>").append(st.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,a\|\|[e.responseText,t,e])}),this},st.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){st.fn[t]=function(e){return this.on(t,e)}}),st.each(["get","post"],function(e,n){st[n]=function(e,r,i,o){return st.isFunction(r)&&(o=o\|\|i,i=r,r=t),st.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),st.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Dn,type:"GET",isLocal:Fn.test(jn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"":In,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{" text":e.String,"text html":!0,"text json":st.parseJSON,"text xml":st.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?H(H(e,st.ajaxSettings),t):H(st.ajaxSettings,e)},ajaxPrefilter:D(Wn),ajaxTransport:D($n),ajax:function(e,n){function r(e,n,r,s){var l,f,v,b,T,N=n;2!==x&&(x=2,u&&clearTimeout(u),i=t,a=s\|\|"",w.readyState=e>0?4:0,r&&(b=M(p,w,r)),e>=200&&300>e\|\|304===e?(p.ifModified&&(T=w.getResponseHeader("Last-Modified"),T&&(st.lastModified[o]=T),T=w.getResponseHeader("etag"),T&&(st.etag[o]=T)),304===e?(l=!0,N="notmodified"):(l=q(p,b),N=l.state,f=l.data,v=l.error,l=!v)):(v=N,(e\|\|!N)&&(N="error",0>e&&(e=0))),w.status=e,w.statusText=(n\|\|N)+"",l?g.resolveWith(d,[f,N,w]):g.rejectWith(d,[w,N,v]),w.statusCode(y),y=t,c&&h.trigger(l?"ajaxSuccess":"ajaxError",[w,p,l?f:v]),m.fireWith(d,[w,N]),c&&(h.trigger("ajaxComplete",[w,p]),--st.active\|\|st.event.trigger("ajaxStop")))}"object"==typeof e&&(n=e,e=t),n=n\|\|{};var i,o,a,s,u,l,c,f,p=st.ajaxSetup({},n),d=p.context\|\|p,h=p.context&&(d.nodeType\|\|d.jquery)?st(d):st.event,g=st.Deferred(),m=st.Callbacks("once memory"),y=p.statusCode\|\|{},v={},b={},x=0,T="canceled",w={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!s)for(s={};t=_n.exec(a);)s[t[1].toLowerCase()]=t[2];t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x\|\|(e=b[n]=b[n]\|\|e,v[e]=t),this},overrideMimeType:function(e){return x\|\|(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)y[t]=[y[t],e[t]];else w.always(e[w.status]);return this},abort:function(e){var t=e\|\|T;return i&&i.abort(t),r(0,t),this}};if(g.promise(w).complete=m.add,w.success=w.done,w.error=w.fail,p.url=((e\|\|p.url\|\|Dn)+"").replace(Mn,"").replace(Bn,jn[1]+"//"),p.type=n.method\|\|n.type\|\|p.method\|\|p.type,p.dataTypes=st.trim(p.dataType\|\|"").toLowerCase().match(lt)\|\|[""],null==p.crossDomain&&(l=Pn.exec(p.url.toLowerCase()),p.crossDomain=!(!l\|\|l[1]===jn[1]&&l[2]===jn[2]&&(l[3]\|\|("http:"===l[1]?80:443))==(jn[3]\|\|("http:"===jn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=st.param(p.data,p.traditional)),L(Wn,p,n,w),2===x)return w;c=p.global,c&&0===st.active++&&st.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!On.test(p.type),o=p.url,p.hasContent\|\|(p.data&&(o=p.url+=(Hn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=qn.test(o)?o.replace(qn,"$1_="+Ln++):o+(Hn.test(o)?"&":"?")+"_="+Ln++)),p.ifModified&&(st.lastModified[o]&&w.setRequestHeader("If-Modified-Since",st.lastModified[o]),st.etag[o]&&w.setRequestHeader("If-None-Match",st.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1\|\|n.contentType)&&w.setRequestHeader("Content-Type",p.contentType),w.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+(""!==p.dataTypes[0]?", "+In+"; q=0.01":""):p.accepts[""]);for(f in p.headers)w.setRequestHeader(f,p.headers[f]);if(p.beforeSend&&(p.beforeSend.call(d,w,p)===!1\|\|2===x))return w.abort();T="abort";for(f in{success:1,error:1,complete:1})w[f](p[f]);if(i=L($n,p,n,w)){w.readyState=1,c&&h.trigger("ajaxSend",[w,p]),p.async&&p.timeout>0&&(u=setTimeout(function(){w.abort("timeout")},p.timeout));try{x=1,i.send(v,r)}catch(N){if(!(2>x))throw N;r(-1,N)}}else r(-1,"No Transport");return w},getScript:function(e,n){return st.get(e,t,n,"script")},getJSON:function(e,t,n){return st.get(e,t,n,"json")}}),st.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java\|ecma)script/},converters:{"text script":function(e){return st.globalEval(e),e}}}),st.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),st.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=V.head\|\|st("head")[0]\|\|V.documentElement;return{send:function(t,i){n=V.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t\|\|!n.readyState\|\|/loaded\|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t\|\|i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Xn=[],Un=/(=)\?(?=&\|$)\|\?\?/;st.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xn.pop()\|\|st.expando+"_"+Ln++;return this[e]=!0,e}}),st.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Un.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType\|\|"").indexOf("application/x-www-form-urlencoded")&&Un.test(n.data)&&"data");return u\|\|"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=st.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Un,"$1"+o):n.jsonp!==!1&&(n.url+=(Hn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s\|\|st.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Xn.push(o)),s&&st.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Vn,Yn,Jn=0,Gn=e.ActiveXObject&&function(){var e;for(e in Vn)Vn[e](t,!0)};st.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&_()\|\|F()}:_,Yn=st.ajaxSettings.xhr(),st.support.cors=!!Yn&&"withCredentials"in Yn,Yn=st.support.ajax=!!Yn,Yn&&st.ajaxTransport(function(n){if(!n.crossDomain\|\|st.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain\|\|i["X-Requested-With"]\|\|(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data\|\|null),r=function(e,i){var s,l,c,f,p;try{if(r&&(i\|\|4===u.readyState))if(r=t,a&&(u.onreadystatechange=st.noop,Gn&&delete Vn[a]),i)4!==u.readyState&&u.abort();else{f={},s=u.status,p=u.responseXML,c=u.getAllResponseHeaders(),p&&p.documentElement&&(f.xml=p),"string"==typeof u.responseText&&(f.text=u.responseText);try{l=u.statusText}catch(d){l=""}s\|\|!n.isLocal\|\|n.crossDomain?1223===s&&(s=204):s=f.text?200:404}}catch(h){i\|\|o(-1,h)}f&&o(s,l,f,c)},n.async?4===u.readyState?setTimeout(r):(a=++Jn,Gn&&(Vn\|\|(Vn={},st(e).unload(Gn)),Vn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Qn,Kn,Zn=/^(?:toggle\|show\|hide)$/,er=RegExp("^(?:([+-])=\|)("+ut+")([a-z%])$","i"),tr=/queueHooks$/,nr=[W],rr={"":[function(e,t){var n,r,i=this.createTween(e,t),o=er.exec(t),a=i.cur(),s=+a\|\|0,u=1,l=20;if(o){if(n=+o[2],r=o[3]\|\|(st.cssNumber[e]?"":"px"),"px"!==r&&s){s=st.css(i.elem,e,!0)\|\|n\|\|1;do u=u\|\|".5",s/=u,st.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)n:n}return i}]};st.Animation=st.extend(P,{tweener:function(e,t){st.isFunction(e)?(t=e,e=[""]):e=e.split(" ");for(var n,r=0,i=e.length;i>r;r++)n=e[r],rr[n]=rr[n]\|\|[],rr[n].unshift(t)},prefilter:function(e,t){t?nr.unshift(e):nr.push(e)}}),st.Tween=$,$.prototype={constructor:$,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i\|\|"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o\|\|(st.cssNumber[n]?"":"px")},cur:function(){var e=$.propHooks[this.prop];return e&&e.get?e.get(this):$.propHooks._default.get(this)},run:function(e){var t,n=$.propHooks[this.prop];return this.pos=t=this.options.duration?st.easing[this.easing](e,this.options.duratione,0,1,this.options.duration):e,this.now=(this.end-this.start)t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):$.propHooks._default.set(this),this}},$.prototype.init.prototype=$.prototype,$.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]\|\|e.elem.style&&null!=e.elem.style[e.prop]?(t=st.css(e.elem,e.prop,"auto"),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){st.fx.step[e.prop]?st.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[st.cssProps[e.prop]]\|\|st.cssHooks[e.prop])?st.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},$.propHooks.scrollTop=$.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},st.each(["toggle","show","hide"],function(e,t){var n=st.fn[t];st.fn[t]=function(e,r,i){return null==e\|\|"boolean"==typeof e?n.apply(this,arguments):this.animate(I(t,!0),e,r,i)}}),st.fn.extend({fadeTo:function(e,t,n,r){return this.filter(w).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=st.isEmptyObject(e),o=st.speed(t,n,r),a=function(){var t=P(this,st.extend({},e),o);a.finish=function(){t.stop(!0)},(i\|\|st._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i\|\|o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e\|\|"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=st.timers,a=st._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&tr.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this\|\|null!=e&&o[n].queue!==e\|\|(o[n].anim.stop(r),t=!1,o.splice(n,1));(t\|\|!r)&&st.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e\|\|"fx"),this.each(function(){var t,n=st._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=st.timers,a=r?r.length:0;for(n.finish=!0,st.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),st.each({slideDown:I("show"),slideUp:I("hide"),slideToggle:I("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){st.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),st.speed=function(e,t,n){var r=e&&"object"==typeof e?st.extend({},e):{complete:n\|\|!n&&t\|\|st.isFunction(e)&&e,duration:e,easing:n&&t\|\|t&&!st.isFunction(t)&&t};return r.duration=st.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in st.fx.speeds?st.fx.speeds[r.duration]:st.fx.speeds._default,(null==r.queue\|\|r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){st.isFunction(r.old)&&r.old.call(this),r.queue&&st.dequeue(this,r.queue)},r},st.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(eMath.PI)/2}},st.timers=[],st.fx=$.prototype.init,st.fx.tick=function(){var e,n=st.timers,r=0;for(Qn=st.now();n.length>r;r++)e=n[r],e()\|\|n[r]!==e\|\|n.splice(r--,1);n.length\|\|st.fx.stop(),Qn=t},st.fx.timer=function(e){e()&&st.timers.push(e)&&st.fx.start()},st.fx.interval=13,st.fx.start=function(){Kn\|\|(Kn=setInterval(st.fx.tick,st.fx.interval))},st.fx.stop=function(){clearInterval(Kn),Kn=null},st.fx.speeds={slow:600,fast:200,_default:400},st.fx.step={},st.expr&&st.expr.filters&&(st.expr.filters.animated=function(e){return st.grep(st.timers,function(t){return e===t.elem}).length}),st.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){st.offset.setOffset(this,e,t)});var n,r,i={top:0,left:0},o=this[0],a=o&&o.ownerDocument;if(a)return n=a.documentElement,st.contains(n,o)?(o.getBoundingClientRect!==t&&(i=o.getBoundingClientRect()),r=z(a),{top:i.top+(r.pageYOffset\|\|n.scrollTop)-(n.clientTop\|\|0),left:i.left+(r.pageXOffset\|\|n.scrollLeft)-(n.clientLeft\|\|0)}):i},st.offset={setOffset:function(e,t,n){var r=st.css(e,"position");"static"===r&&(e.style.position="relative");var i,o,a=st(e),s=a.offset(),u=st.css(e,"top"),l=st.css(e,"left"),c=("absolute"===r\|\|"fixed"===r)&&st.inArray("auto",[u,l])>-1,f={},p={};c?(p=a.position(),i=p.top,o=p.left):(i=parseFloat(u)\|\|0,o=parseFloat(l)\|\|0),st.isFunction(t)&&(t=t.call(e,n,s)),null!=t.top&&(f.top=t.top-s.top+i),null!=t.left&&(f.left=t.left-s.left+o),"using"in t?t.using.call(e,f):a.css(f)}},st.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===st.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),st.nodeName(e[0],"html")\|\|(n=e.offset()),n.top+=st.css(e[0],"borderTopWidth",!0),n.left+=st.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-st.css(r,"marginTop",!0),left:t.left-n.left-st.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){for(var e=this.offsetParent\|\|V.documentElement;e&&!st.nodeName(e,"html")&&"static"===st.css(e,"position");)e=e.offsetParent;return e\|\|V.documentElement})}}),st.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);st.fn[e]=function(i){return st.access(this,function(e,i,o){var a=z(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?st(a).scrollLeft():o,r?o:st(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}}),st.each({Height:"height",Width:"width"},function(e,n){st.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){st.fn[i]=function(i,o){var a=arguments.length&&(r\|\|"boolean"!=typeof i),s=r\|\|(i===!0\|\|o===!0?"margin":"border");return st.access(this,function(n,r,i){var o;return st.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?st.css(n,r,s):st.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=st,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return st})})(window);
	4	+//@ sourceMappingURL=jquery.min.map

BIN

mojolegacy/lib/Mojolicious/public/mojo/logo-black.png

View

BIN

mojolegacy/lib/Mojolicious/public/mojo/logo-white.png

View

BIN

mojolegacy/lib/Mojolicious/public/mojo/noraptor.png

View

BIN

mojolegacy/lib/Mojolicious/public/mojo/notfound.png

View

BIN

mojolegacy/lib/Mojolicious/public/mojo/pinstripe.gif

View

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-apollo.js

View

...

@@ -0,0 +1,2 @@

+PR.registerLangHandler(PR.createSimpleLexer([["com",/^#[^\n\r]*/,null,"#"],["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r �\xa0"],["str",/^"(?:[^"\\]|\\[\S\s])*(?:"|$)/,null,'"']],[["kwd",/^(?:ADS|AD|AUG|BZF|BZMF|CAE|CAF|CA|CCS|COM|CS|DAS|DCA|DCOM|DCS|DDOUBL|DIM|DOUBLE|DTCB|DTCF|DV|DXCH|EDRUPT|EXTEND|INCR|INDEX|NDX|INHINT|LXCH|MASK|MSK|MP|MSU|NOOP|OVSK|QXCH|RAND|READ|RELINT|RESUME|RETURN|ROR|RXOR|SQUARE|SU|TCR|TCAA|OVSK|TCF|TC|TS|WAND|WOR|WRITE|XCH|XLQ|XXALQ|ZL|ZQ|ADD|ADZ|SUB|SUZ|MPY|MPR|MPZ|DVP|COM|ABS|CLA|CLZ|LDQ|STO|STQ|ALS|LLS|LRS|TRA|TSQ|TMI|TOV|AXT|TIX|DLY|INP|OUT)\s/,

+null],["typ",/^(?:-?GENADR|=MINUS|2BCADR|VN|BOF|MM|-?2CADR|-?[1-6]DNADR|ADRES|BBCON|[ES]?BANK=?|BLOCK|BNKSUM|E?CADR|COUNT\*?|2?DEC\*?|-?DNCHAN|-?DNPTR|EQUALS|ERASE|MEMORY|2?OCT|REMADR|SETLOC|SUBRO|ORG|BSS|BES|SYN|EQU|DEFINE|END)\s/,null],["lit",/^'(?:-*(?:\w|\\[!-~])(?:[\w-]*|\\[!-~])[!=?]?)?/],["pln",/^-*(?:[!-z]|\\[!-~])(?:[\w-]*|\\[!-~])[!=?]?/],["pun",/^[^\w\t\n\r "'-);\\\xa0]+/]]),["apollo","agc","aea"]);

+18

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-clj.js

View

...	...	@@ -0,0 +1,18 @@
	1	+/*
	2	+ Copyright (C) 2011 Google Inc.
	3	+
	4	+ Licensed under the Apache License, Version 2.0 (the "License");
	5	+ you may not use this file except in compliance with the License.
	6	+ You may obtain a copy of the License at
	7	+
	8	+ http://www.apache.org/licenses/LICENSE-2.0
	9	+
	10	+ Unless required by applicable law or agreed to in writing, software
	11	+ distributed under the License is distributed on an "AS IS" BASIS,
	12	+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	13	+ See the License for the specific language governing permissions and
	14	+ limitations under the License.
	15	+*/
	16	+var a=null;
	17	+PR.registerLangHandler(PR.createSimpleLexer([["opn",/^[([{]+/,a,"([{"],["clo",/^[)\]}]+/,a,")]}"],["com",/^;[^\n\r]/,a,";"],["pln",/^[\t\n\r \xa0]+/,a,"\t\n\r \xa0"],["str",/^"(?:[^"\\]\|\\[\S\s])(?:"\|$)/,a,'"']],[["kwd",/^(?:def\|if\|do\|let\|quote\|var\|fn\|loop\|recur\|throw\|try\|monitor-enter\|monitor-exit\|defmacro\|defn\|defn-\|macroexpand\|macroexpand-1\|for\|doseq\|dosync\|dotimes\|and\|or\|when\|not\|assert\|doto\|proxy\|defstruct\|first\|rest\|cons\|defprotocol\|deftype\|defrecord\|reify\|defmulti\|defmethod\|meta\|with-meta\|ns\|in-ns\|create-ns\|import\|intern\|refer\|alias\|namespace\|resolve\|ref\|deref\|refset\|new\|set!\|memfn\|to-array\|into-array\|aset\|gen-class\|reduce\|map\|filter\|find\|nil?\|empty?\|hash-map\|hash-set\|vec\|vector\|seq\|flatten\|reverse\|assoc\|dissoc\|list\|list?\|disj\|get\|union\|difference\|intersection\|extend\|extend-type\|extend-protocol\|prn)\b/,a],
	18	+["typ",/^:[\dA-Za-z-]+/]]),["clj"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-css.js

View

...

@@ -0,0 +1,2 @@

+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\f\r ]+/,null," \t\r\n"]],[["str",/^"(?:[^\n\f\r"\\]|\\(?:\r\n?|\n|\f)|\\[\S\s])*"/,null],["str",/^'(?:[^\n\f\r'\\]|\\(?:\r\n?|\n|\f)|\\[\S\s])*'/,null],["lang-css-str",/^url\(([^"')]*)\)/i],["kwd",/^(?:url|rgb|!important|@import|@page|@media|@charset|inherit)(?=[^\w-]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*)\s*:/i],["com",/^\/\*[^*]*\*+(?:[^*/][^*]*\*+)*\//],["com",

+/^(?:<\!--|--\>)/],["lit",/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],["lit",/^#[\da-f]{3,6}/i],["pln",/^-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*/i],["pun",/^[^\s\w"']+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[["kwd",/^-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[["str",/^[^"')]+/]]),["css-str"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-go.js

View

...

@@ -0,0 +1 @@

+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r �\xa0"],["pln",/^(?:"(?:[^"\\]|\\[\S\s])*(?:"|$)|'(?:[^'\\]|\\[\S\s])+(?:'|$)|`[^`]*(?:`|$))/,null,"\"'"]],[["com",/^(?:\/\/[^\n\r]*|\/\*[\S\s]*?\*\/)/],["pln",/^(?:[^"'/`]|\/(?![*/]))+/]]),["go"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-hs.js

View

...

@@ -0,0 +1,2 @@

+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t-\r ]+/,null,"\t\n\r "],["str",/^"(?:[^\n\f\r"\\]|\\[\S\s])*(?:"|$)/,null,'"'],["str",/^'(?:[^\n\f\r'\\]|\\[^&])'?/,null,"'"],["lit",/^(?:0o[0-7]+|0x[\da-f]+|\d+(?:\.\d+)?(?:e[+-]?\d+)?)/i,null,"0123456789"]],[["com",/^(?:--+[^\n\f\r]*|{-(?:[^-]|-+[^}-])*-})/],["kwd",/^(?:case|class|data|default|deriving|do|else|if|import|in|infix|infixl|infixr|instance|let|module|newtype|of|then|type|where|_)(?=[^\d'A-Za-z]|$)/,

+null],["pln",/^(?:[A-Z][\w']*\.)*[A-Za-z][\w']*/],["pun",/^[^\d\t-\r "'A-Za-z]+/]]),["hs"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-lisp.js

View

...	...	@@ -0,0 +1,3 @@
	1	+var a=null;
	2	+PR.registerLangHandler(PR.createSimpleLexer([["opn",/^$+/,a,"("],["clo",/^$+/,a,")"],["com",/^;[^\n\r]/,a,";"],["pln",/^[\t\n\r \xa0]+/,a,"\t\n\r \xa0"],["str",/^"(?:[^"\\]\|\\[\S\s])(?:"\|$)/,a,'"']],[["kwd",/^(?:block\|c[ad]+r\|catch\|con[ds]\|def(?:ine\|un)\|do\|eq\|eql\|equal\|equalp\|eval-when\|flet\|format\|go\|if\|labels\|lambda\|let\|load-time-value\|locally\|macrolet\|multiple-value-call\|nil\|progn\|progv\|quote\|require\|return-from\|setq\|symbol-macrolet\|t\|tagbody\|the\|throw\|unwind)\b/,a],
	3	+["lit",/^[+-]?(?:[#0]x[\da-f]+\|\d+\/\d+\|(?:\.\d+\|\d+(?:\.\d)?)(?:[de][+-]?\d+)?)/i],["lit",/^'(?:-(?:\w\|\\[!-~])(?:[\w-]\|\\[!-~])[!=?]?)?/],["pln",/^-(?:[_a-z]\|\\[!-~])(?:[\w-]*\|\\[!-~])[!=?]?/i],["pun",/^[^\w\t\n\r "'-);\\\xa0]+/]]),["cl","el","lisp","scm"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-lua.js

View

...

@@ -0,0 +1,2 @@

+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r �\xa0"],["str",/^(?:"(?:[^"\\]|\\[\S\s])*(?:"|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$))/,null,"\"'"]],[["com",/^--(?:\[(=*)\[[\S\s]*?(?:]\1]|$)|[^\n\r]*)/],["str",/^\[(=*)\[[\S\s]*?(?:]\1]|$)/],["kwd",/^(?:and|break|do|else|elseif|end|false|for|function|if|in|local|nil|not|or|repeat|return|then|true|until|while)\b/,null],["lit",/^[+-]?(?:0x[\da-f]+|(?:\.\d+|\d+(?:\.\d*)?)(?:e[+-]?\d+)?)/i],

+["pln",/^[_a-z]\w*/i],["pun",/^[^\w\t\n\r \xa0][^\w\t\n\r "'+=\xa0-]*/]]),["lua"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-ml.js

View

...

@@ -0,0 +1,2 @@

+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r �\xa0"],["com",/^#(?:if[\t\n\r \xa0]+(?:[$_a-z][\w']*|``[^\t\n\r`]*(?:``|$))|else|endif|light)/i,null,"#"],["str",/^(?:"(?:[^"\\]|\\[\S\s])*(?:"|$)|'(?:[^'\\]|\\[\S\s])(?:'|$))/,null,"\"'"]],[["com",/^(?:\/\/[^\n\r]*|\(\*[\S\s]*?\*\))/],["kwd",/^(?:abstract|and|as|assert|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|if|in|inherit|inline|interface|internal|lazy|let|match|member|module|mutable|namespace|new|null|of|open|or|override|private|public|rec|return|static|struct|then|to|true|try|type|upcast|use|val|void|when|while|with|yield|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|global|include|method|mixin|object|parallel|process|protected|pure|sealed|trait|virtual|volatile)\b/],

+["lit",/^[+-]?(?:0x[\da-f]+|(?:\.\d+|\d+(?:\.\d*)?)(?:e[+-]?\d+)?)/i],["pln",/^(?:[_a-z][\w']*[!#?]?|``[^\t\n\r`]*(?:``|$))/i],["pun",/^[^\w\t\n\r "'\xa0]+/]]),["fs","ml"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-n.js

View

...	...	@@ -0,0 +1,4 @@
	1	+var a=null;
	2	+PR.registerLangHandler(PR.createSimpleLexer([["str",/^(?:'(?:[^\n\r'\\]\|\\.)'\|"(?:[^\n\r"\\]\|\\.)(?:"\|$))/,a,'"'],["com",/^#(?:(?:define\|elif\|else\|endif\|error\|ifdef\|include\|ifndef\|line\|pragma\|undef\|warning)\b\|[^\n\r])/,a,"#"],["pln",/^\s+/,a," \r\n\t\xa0"]],[["str",/^@"(?:[^"]\|"")(?:"\|$)/,a],["str",/^<#[^#>](?:#>\|$)/,a],["str",/^<(?:(?:(?:\.\.\/)\|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h\|[a-z]\w)>/,a],["com",/^\/\/[^\n\r]/,a],["com",/^\/\[\S\s]?(?:\*\/\|$)/,
	3	+a],["kwd",/^(?:abstract\|and\|as\|base\|catch\|class\|def\|delegate\|enum\|event\|extern\|false\|finally\|fun\|implements\|interface\|internal\|is\|macro\|match\|matches\|module\|mutable\|namespace\|new\|null\|out\|override\|params\|partial\|private\|protected\|public\|ref\|sealed\|static\|struct\|syntax\|this\|throw\|true\|try\|type\|typeof\|using\|variant\|virtual\|volatile\|when\|where\|with\|assert\|assert2\|async\|break\|checked\|continue\|do\|else\|ensures\|for\|foreach\|if\|late\|lock\|new\|nolate\|otherwise\|regexp\|repeat\|requires\|return\|surroundwith\|unchecked\|unless\|using\|while\|yield)\b/,
	4	+a],["typ",/^(?:array\|bool\|byte\|char\|decimal\|double\|float\|int\|list\|long\|object\|sbyte\|short\|string\|ulong\|uint\|ufloat\|ulong\|ushort\|void)\b/,a],["lit",/^@[$_a-z][\w$@]/i,a],["typ",/^@[A-Z]+[a-z][\w$@]/,a],["pln",/^'?[$_a-z][\w$@]/i,a],["lit",/^(?:0x[\da-f]+\|(?:\d(?:_\d+)\d(?:\.\d)?\|\.\d\+)(?:e[+-]?\d+)?)[a-z]/i,a,"0123456789"],["pun",/^.[^\s\w"-$'./@`]/,a]]),["n","nemerle"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-proto.js

View

...

@@ -0,0 +1 @@

+PR.registerLangHandler(PR.sourceDecorator({keywords:"bytes,default,double,enum,extend,extensions,false,group,import,max,message,option,optional,package,repeated,required,returns,rpc,service,syntax,to,true",types:/^(bool|(double|s?fixed|[su]?int)(32|64)|float|string)\b/,cStyleComments:!0}),["proto"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-scala.js

View

...

@@ -0,0 +1,2 @@

+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r �\xa0"],["str",/^"(?:""(?:""?(?!")|[^"\\]|\\.)*"{0,3}|(?:[^\n\r"\\]|\\.)*"?)/,null,'"'],["lit",/^`(?:[^\n\r\\`]|\\.)*`?/,null,"`"],["pun",/^[!#%&(--:-@[-^{-~]+/,null,"!#%&()*+,-:;<=>?@[\\]^{|}~"]],[["str",/^'(?:[^\n\r'\\]|\\(?:'|[^\n\r']+))'/],["lit",/^'[$A-Z_a-z][\w$]*(?![\w$'])/],["kwd",/^(?:abstract|case|catch|class|def|do|else|extends|final|finally|for|forSome|if|implicit|import|lazy|match|new|object|override|package|private|protected|requires|return|sealed|super|throw|trait|try|type|val|var|while|with|yield)\b/],

+["lit",/^(?:true|false|null|this)\b/],["lit",/^(?:0(?:[0-7]+|x[\da-f]+)l?|(?:0|[1-9]\d*)(?:(?:\.\d+)?(?:e[+-]?\d+)?f?|l?)|\\.\d+(?:e[+-]?\d+)?f?)/i],["typ",/^[$_]*[A-Z][\d$A-Z_]*[a-z][\w$]*/],["pln",/^[$A-Z_a-z][\w$]*/],["com",/^\/(?:\/.*|\*(?:\/|\**[^*/])*(?:\*+\/?)?)/],["pun",/^(?:\.+|\/)/]]),["scala"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-sql.js

View

...

@@ -0,0 +1,2 @@

+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r �\xa0"],["str",/^(?:"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*')/,null,"\"'"]],[["com",/^(?:--[^\n\r]*|\/\*[\S\s]*?(?:\*\/|$))/],["kwd",/^(?:add|all|alter|and|any|as|asc|authorization|backup|begin|between|break|browse|bulk|by|cascade|case|check|checkpoint|close|clustered|coalesce|collate|column|commit|compute|constraint|contains|containstable|continue|convert|create|cross|current|current_date|current_time|current_timestamp|current_user|cursor|database|dbcc|deallocate|declare|default|delete|deny|desc|disk|distinct|distributed|double|drop|dummy|dump|else|end|errlvl|escape|except|exec|execute|exists|exit|fetch|file|fillfactor|for|foreign|freetext|freetexttable|from|full|function|goto|grant|group|having|holdlock|identity|identitycol|identity_insert|if|in|index|inner|insert|intersect|into|is|join|key|kill|left|like|lineno|load|match|merge|national|nocheck|nonclustered|not|null|nullif|of|off|offsets|on|open|opendatasource|openquery|openrowset|openxml|option|or|order|outer|over|percent|plan|precision|primary|print|proc|procedure|public|raiserror|read|readtext|reconfigure|references|replication|restore|restrict|return|revoke|right|rollback|rowcount|rowguidcol|rule|save|schema|select|session_user|set|setuser|shutdown|some|statistics|system_user|table|textsize|then|to|top|tran|transaction|trigger|truncate|tsequal|union|unique|update|updatetext|use|user|using|values|varying|view|waitfor|when|where|while|with|writetext)(?=[^\w-]|$)/i,

+null],["lit",/^[+-]?(?:0x[\da-f]+|(?:\.\d+|\d+(?:\.\d*)?)(?:e[+-]?\d+)?)/i],["pln",/^[_a-z][\w-]*/i],["pun",/^[^\w\t\n\r "'\xa0][^\w\t\n\r "'+\xa0-]*/]]),["sql"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-tex.js

View

...

@@ -0,0 +1 @@

+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r �\xa0"],["com",/^%[^\n\r]*/,null,"%"]],[["kwd",/^\\[@-Za-z]+/],["kwd",/^\\./],["typ",/^[$&]/],["lit",/[+-]?(?:\.\d+|\d+(?:\.\d*)?)(cm|em|ex|in|pc|pt|bp|mm)/i],["pun",/^[()=[\]{}]+/]]),["latex","tex"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-vb.js

View

...

@@ -0,0 +1,2 @@

+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0\u2028\u2029]+/,null,"\t\n\r �\xa0  "],["str",/^(?:["\u201c\u201d](?:[^"\u201c\u201d]|["\u201c\u201d]{2})(?:["\u201c\u201d]c|$)|["\u201c\u201d](?:[^"\u201c\u201d]|["\u201c\u201d]{2})*(?:["\u201c\u201d]|$))/i,null,'"“”'],["com",/^['\u2018\u2019].*/,null,"'‘’"]],[["kwd",/^(?:addhandler|addressof|alias|and|andalso|ansi|as|assembly|auto|boolean|byref|byte|byval|call|case|catch|cbool|cbyte|cchar|cdate|cdbl|cdec|char|cint|class|clng|cobj|const|cshort|csng|cstr|ctype|date|decimal|declare|default|delegate|dim|directcast|do|double|each|else|elseif|end|endif|enum|erase|error|event|exit|finally|for|friend|function|get|gettype|gosub|goto|handles|if|implements|imports|in|inherits|integer|interface|is|let|lib|like|long|loop|me|mod|module|mustinherit|mustoverride|mybase|myclass|namespace|new|next|not|notinheritable|notoverridable|object|on|option|optional|or|orelse|overloads|overridable|overrides|paramarray|preserve|private|property|protected|public|raiseevent|readonly|redim|removehandler|resume|return|select|set|shadows|shared|short|single|static|step|stop|string|structure|sub|synclock|then|throw|to|try|typeof|unicode|until|variant|wend|when|while|with|withevents|writeonly|xor|endif|gosub|let|variant|wend)\b/i,

+null],["com",/^rem.*/i],["lit",/^(?:true\b|false\b|nothing\b|\d+(?:e[+-]?\d+[dfr]?|[dfilrs])?|(?:&h[\da-f]+|&o[0-7]+)[ils]?|\d*\.\d+(?:e[+-]?\d+)?[dfr]?|#\s+(?:\d+[/-]\d+[/-]\d+(?:\s+\d+:\d+(?::\d+)?(\s*(?:am|pm))?)?|\d+:\d+(?::\d+)?(\s*(?:am|pm))?)\s+#)/i],["pln",/^(?:(?:[a-z]|_\w)\w*|\[(?:[a-z]|_\w)\w*])/i],["pun",/^[^\w\t\n\r "'[\]\xa0\u2018\u2019\u201c\u201d\u2028\u2029]+/],["pun",/^(?:\[|])/]]),["vb","vbs"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-vhdl.js

View

...	...	@@ -0,0 +1,3 @@
	1	+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r �\xa0"]],[["str",/^(?:[box]?"(?:[^"]\|"")"\|'.')/i],["com",/^--[^\n\r]/],["kwd",/^(?:abs\|access\|after\|alias\|all\|and\|architecture\|array\|assert\|attribute\|begin\|block\|body\|buffer\|bus\|case\|component\|configuration\|constant\|disconnect\|downto\|else\|elsif\|end\|entity\|exit\|file\|for\|function\|generate\|generic\|group\|guarded\|if\|impure\|in\|inertial\|inout\|is\|label\|library\|linkage\|literal\|loop\|map\|mod\|nand\|new\|next\|nor\|not\|null\|of\|on\|open\|or\|others\|out\|package\|port\|postponed\|procedure\|process\|pure\|range\|record\|register\|reject\|rem\|report\|return\|rol\|ror\|select\|severity\|shared\|signal\|sla\|sll\|sra\|srl\|subtype\|then\|to\|transport\|type\|unaffected\|units\|until\|use\|variable\|wait\|when\|while\|with\|xnor\|xor)(?=[^\w-]\|$)/i,
	2	+null],["typ",/^(?:bit\|bit_vector\|character\|boolean\|integer\|real\|time\|string\|severity_level\|positive\|natural\|signed\|unsigned\|line\|text\|std_u?logic(?:_vector)?)(?=[^\w-]\|$)/i,null],["typ",/^'(?:active\|ascending\|base\|delayed\|driving\|driving_value\|event\|high\|image\|instance_name\|last_active\|last_event\|last_value\|left\|leftof\|length\|low\|path_name\|pos\|pred\|quiet\|range\|reverse_range\|right\|rightof\|simple_name\|stable\|succ\|transaction\|val\|value)(?=[^\w-]\|$)/i,null],["lit",/^\d+(?:_\d+)(?:#[\w.\\]+#(?:[+-]?\d+(?:_\d+))?\|(?:\.\d+(?:_\d+))?(?:e[+-]?\d+(?:_\d+))?)/i],
	3	+["pln",/^(?:[a-z]\w\|\\[^\\]\\)/i],["pun",/^[^\w\t\n\r "'\xa0][^\w\t\n\r "'\xa0-]*/]]),["vhdl","vhd"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-wiki.js

View

...

@@ -0,0 +1,2 @@

+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\d\t a-gi-z\xa0]+/,null,"\t �\xa0abcdefgijklmnopqrstuvwxyz0123456789"],["pun",/^[*=[\]^~]+/,null,"=*~^[]"]],[["lang-wiki.meta",/(?:^^|\r\n?|\n)(#[a-z]+)\b/],["lit",/^[A-Z][a-z][\da-z]+[A-Z][a-z][^\W_]+\b/],["lang-",/^{{{([\S\s]+?)}}}/],["lang-",/^`([^\n\r`]+)`/],["str",/^https?:\/\/[^\s#/?]*(?:\/[^\s#?]*)?(?:\?[^\s#]*)?(?:#\S*)?/i],["pln",/^(?:\r\n|[\S\s])[^\n\r#*=A-[^`h{~]*/]]),["wiki"]);

+PR.registerLangHandler(PR.createSimpleLexer([["kwd",/^#[a-z]+/i,null,"#"]],[]),["wiki.meta"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-xq.js

View

...	...	@@ -0,0 +1,3 @@
	1	+PR.registerLangHandler(PR.createSimpleLexer([["var pln",/^\$[\w-]+/,null,"$"]],[["pln",/^[\s=][<>][\s=]/],["lit",/^@[\w-]+/],["tag",/^<\/?[a-z](?:[\w-.:]\w)?\|\/?>$/i],["com",/^$:[\S\s]?:$/],["pln",/^[(),/;[\]{}]$/],["str",/^(?:"(?:[^"\\{]\|\\[\S\s])(?:"\|$)\|'(?:[^'\\{]\|\\[\S\s])(?:'\|$))/,null,"\"'"],["kwd",/^(?:xquery\|where\|version\|variable\|union\|typeswitch\|treat\|to\|then\|text\|stable\|sortby\|some\|self\|schema\|satisfies\|returns\|return\|ref\|processing-instruction\|preceding-sibling\|preceding\|precedes\|parent\|only\|of\|node\|namespace\|module\|let\|item\|intersect\|instance\|in\|import\|if\|function\|for\|follows\|following-sibling\|following\|external\|except\|every\|else\|element\|descending\|descendant-or-self\|descendant\|define\|default\|declare\|comment\|child\|cast\|case\|before\|attribute\|assert\|ascending\|as\|ancestor-or-self\|ancestor\|after\|eq\|order\|by\|or\|and\|schema-element\|document-node\|node\|at)\b/],
	2	+["typ",/^(?:xs:yearMonthDuration\|xs:unsignedLong\|xs:time\|xs:string\|xs:short\|xs:QName\|xs:Name\|xs:long\|xs:integer\|xs:int\|xs:gYearMonth\|xs:gYear\|xs:gMonthDay\|xs:gDay\|xs:float\|xs:duration\|xs:double\|xs:decimal\|xs:dayTimeDuration\|xs:dateTime\|xs:date\|xs:byte\|xs:boolean\|xs:anyURI\|xf:yearMonthDuration)\b/,null],["fun pln",/^(?:xp:dereference\|xinc:node-expand\|xinc:link-references\|xinc:link-expand\|xhtml:restructure\|xhtml:clean\|xhtml:add-lists\|xdmp:zip-manifest\|xdmp:zip-get\|xdmp:zip-create\|xdmp:xquery-version\|xdmp:word-convert\|xdmp:with-namespaces\|xdmp:version\|xdmp:value\|xdmp:user-roles\|xdmp:user-last-login\|xdmp:user\|xdmp:url-encode\|xdmp:url-decode\|xdmp:uri-is-file\|xdmp:uri-format\|xdmp:uri-content-type\|xdmp:unquote\|xdmp:unpath\|xdmp:triggers-database\|xdmp:trace\|xdmp:to-json\|xdmp:tidy\|xdmp:subbinary\|xdmp:strftime\|xdmp:spawn-in\|xdmp:spawn\|xdmp:sleep\|xdmp:shutdown\|xdmp:set-session-field\|xdmp:set-response-encoding\|xdmp:set-response-content-type\|xdmp:set-response-code\|xdmp:set-request-time-limit\|xdmp:set\|xdmp:servers\|xdmp:server-status\|xdmp:server-name\|xdmp:server\|xdmp:security-database\|xdmp:security-assert\|xdmp:schema-database\|xdmp:save\|xdmp:role-roles\|xdmp:role\|xdmp:rethrow\|xdmp:restart\|xdmp:request-timestamp\|xdmp:request-status\|xdmp:request-cancel\|xdmp:request\|xdmp:redirect-response\|xdmp:random\|xdmp:quote\|xdmp:query-trace\|xdmp:query-meters\|xdmp:product-edition\|xdmp:privilege-roles\|xdmp:privilege\|xdmp:pretty-print\|xdmp:powerpoint-convert\|xdmp:platform\|xdmp:permission\|xdmp:pdf-convert\|xdmp:path\|xdmp:octal-to-integer\|xdmp:node-uri\|xdmp:node-replace\|xdmp:node-kind\|xdmp:node-insert-child\|xdmp:node-insert-before\|xdmp:node-insert-after\|xdmp:node-delete\|xdmp:node-database\|xdmp:mul64\|xdmp:modules-root\|xdmp:modules-database\|xdmp:merging\|xdmp:merge-cancel\|xdmp:merge\|xdmp:md5\|xdmp:logout\|xdmp:login\|xdmp:log-level\|xdmp:log\|xdmp:lock-release\|xdmp:lock-acquire\|xdmp:load\|xdmp:invoke-in\|xdmp:invoke\|xdmp:integer-to-octal\|xdmp:integer-to-hex\|xdmp:http-put\|xdmp:http-post\|xdmp:http-options\|xdmp:http-head\|xdmp:http-get\|xdmp:http-delete\|xdmp:hosts\|xdmp:host-status\|xdmp:host-name\|xdmp:host\|xdmp:hex-to-integer\|xdmp:hash64\|xdmp:hash32\|xdmp:has-privilege\|xdmp:groups\|xdmp:group-serves\|xdmp:group-servers\|xdmp:group-name\|xdmp:group-hosts\|xdmp:group\|xdmp:get-session-field-names\|xdmp:get-session-field\|xdmp:get-response-encoding\|xdmp:get-response-code\|xdmp:get-request-username\|xdmp:get-request-user\|xdmp:get-request-url\|xdmp:get-request-protocol\|xdmp:get-request-path\|xdmp:get-request-method\|xdmp:get-request-header-names\|xdmp:get-request-header\|xdmp:get-request-field-names\|xdmp:get-request-field-filename\|xdmp:get-request-field-content-type\|xdmp:get-request-field\|xdmp:get-request-client-certificate\|xdmp:get-request-client-address\|xdmp:get-request-body\|xdmp:get-current-user\|xdmp:get-current-roles\|xdmp:get\|xdmp:function-name\|xdmp:function-module\|xdmp:function\|xdmp:from-json\|xdmp:forests\|xdmp:forest-status\|xdmp:forest-restore\|xdmp:forest-restart\|xdmp:forest-name\|xdmp:forest-delete\|xdmp:forest-databases\|xdmp:forest-counts\|xdmp:forest-clear\|xdmp:forest-backup\|xdmp:forest\|xdmp:filesystem-file\|xdmp:filesystem-directory\|xdmp:exists\|xdmp:excel-convert\|xdmp:eval-in\|xdmp:eval\|xdmp:estimate\|xdmp:email\|xdmp:element-content-type\|xdmp:elapsed-time\|xdmp:document-set-quality\|xdmp:document-set-property\|xdmp:document-set-properties\|xdmp:document-set-permissions\|xdmp:document-set-collections\|xdmp:document-remove-properties\|xdmp:document-remove-permissions\|xdmp:document-remove-collections\|xdmp:document-properties\|xdmp:document-locks\|xdmp:document-load\|xdmp:document-insert\|xdmp:document-get-quality\|xdmp:document-get-properties\|xdmp:document-get-permissions\|xdmp:document-get-collections\|xdmp:document-get\|xdmp:document-forest\|xdmp:document-delete\|xdmp:document-add-properties\|xdmp:document-add-permissions\|xdmp:document-add-collections\|xdmp:directory-properties\|xdmp:directory-locks\|xdmp:directory-delete\|xdmp:directory-create\|xdmp:directory\|xdmp:diacritic-less\|xdmp:describe\|xdmp:default-permissions\|xdmp:default-collections\|xdmp:databases\|xdmp:database-restore-validate\|xdmp:database-restore-status\|xdmp:database-restore-cancel\|xdmp:database-restore\|xdmp:database-name\|xdmp:database-forests\|xdmp:database-backup-validate\|xdmp:database-backup-status\|xdmp:database-backup-purge\|xdmp:database-backup-cancel\|xdmp:database-backup\|xdmp:database\|xdmp:collection-properties\|xdmp:collection-locks\|xdmp:collection-delete\|xdmp:collation-canonical-uri\|xdmp:castable-as\|xdmp:can-grant-roles\|xdmp:base64-encode\|xdmp:base64-decode\|xdmp:architecture\|xdmp:apply\|xdmp:amp-roles\|xdmp:amp\|xdmp:add64\|xdmp:add-response-header\|xdmp:access\|trgr:trigger-set-recursive\|trgr:trigger-set-permissions\|trgr:trigger-set-name\|trgr:trigger-set-module\|trgr:trigger-set-event\|trgr:trigger-set-description\|trgr:trigger-remove-permissions\|trgr:trigger-module\|trgr:trigger-get-permissions\|trgr:trigger-enable\|trgr:trigger-disable\|trgr:trigger-database-online-event\|trgr:trigger-data-event\|trgr:trigger-add-permissions\|trgr:remove-trigger\|trgr:property-content\|trgr:pre-commit\|trgr:post-commit\|trgr:get-trigger-by-id\|trgr:get-trigger\|trgr:document-scope\|trgr:document-content\|trgr:directory-scope\|trgr:create-trigger\|trgr:collection-scope\|trgr:any-property-content\|thsr:set-entry\|thsr:remove-term\|thsr:remove-synonym\|thsr:remove-entry\|thsr:query-lookup\|thsr:lookup\|thsr:load\|thsr:insert\|thsr:expand\|thsr:add-synonym\|spell:suggest-detailed\|spell:suggest\|spell:remove-word\|spell:make-dictionary\|spell:load\|spell:levenshtein-distance\|spell:is-correct\|spell:insert\|spell:double-metaphone\|spell:add-word\|sec:users-collection\|sec:user-set-roles\|sec:user-set-password\|sec:user-set-name\|sec:user-set-description\|sec:user-set-default-permissions\|sec:user-set-default-collections\|sec:user-remove-roles\|sec:user-privileges\|sec:user-get-roles\|sec:user-get-description\|sec:user-get-default-permissions\|sec:user-get-default-collections\|sec:user-doc-permissions\|sec:user-doc-collections\|sec:user-add-roles\|sec:unprotect-collection\|sec:uid-for-name\|sec:set-realm\|sec:security-version\|sec:security-namespace\|sec:security-installed\|sec:security-collection\|sec:roles-collection\|sec:role-set-roles\|sec:role-set-name\|sec:role-set-description\|sec:role-set-default-permissions\|sec:role-set-default-collections\|sec:role-remove-roles\|sec:role-privileges\|sec:role-get-roles\|sec:role-get-description\|sec:role-get-default-permissions\|sec:role-get-default-collections\|sec:role-doc-permissions\|sec:role-doc-collections\|sec:role-add-roles\|sec:remove-user\|sec:remove-role-from-users\|sec:remove-role-from-role\|sec:remove-role-from-privileges\|sec:remove-role-from-amps\|sec:remove-role\|sec:remove-privilege\|sec:remove-amp\|sec:protect-collection\|sec:privileges-collection\|sec:privilege-set-roles\|sec:privilege-set-name\|sec:privilege-remove-roles\|sec:privilege-get-roles\|sec:privilege-add-roles\|sec:priv-doc-permissions\|sec:priv-doc-collections\|sec:get-user-names\|sec:get-unique-elem-id\|sec:get-role-names\|sec:get-role-ids\|sec:get-privilege\|sec:get-distinct-permissions\|sec:get-collection\|sec:get-amp\|sec:create-user-with-role\|sec:create-user\|sec:create-role\|sec:create-privilege\|sec:create-amp\|sec:collections-collection\|sec:collection-set-permissions\|sec:collection-remove-permissions\|sec:collection-get-permissions\|sec:collection-add-permissions\|sec:check-admin\|sec:amps-collection\|sec:amp-set-roles\|sec:amp-remove-roles\|sec:amp-get-roles\|sec:amp-doc-permissions\|sec:amp-doc-collections\|sec:amp-add-roles\|search:unparse\|search:suggest\|search:snippet\|search:search\|search:resolve-nodes\|search:resolve\|search:remove-constraint\|search:parse\|search:get-default-options\|search:estimate\|search:check-options\|prof:value\|prof:reset\|prof:report\|prof:invoke\|prof:eval\|prof:enable\|prof:disable\|prof:allowed\|ppt:clean\|pki:template-set-request\|pki:template-set-name\|pki:template-set-key-type\|pki:template-set-key-options\|pki:template-set-description\|pki:template-in-use\|pki:template-get-version\|pki:template-get-request\|pki:template-get-name\|pki:template-get-key-type\|pki:template-get-key-options\|pki:template-get-id\|pki:template-get-description\|pki:need-certificate\|pki:is-temporary\|pki:insert-trusted-certificates\|pki:insert-template\|pki:insert-signed-certificates\|pki:insert-certificate-revocation-list\|pki:get-trusted-certificate-ids\|pki:get-template-ids\|pki:get-template-certificate-authority\|pki:get-template-by-name\|pki:get-template\|pki:get-pending-certificate-requests-xml\|pki:get-pending-certificate-requests-pem\|pki:get-pending-certificate-request\|pki:get-certificates-for-template-xml\|pki:get-certificates-for-template\|pki:get-certificates\|pki:get-certificate-xml\|pki:get-certificate-pem\|pki:get-certificate\|pki:generate-temporary-certificate-if-necessary\|pki:generate-temporary-certificate\|pki:generate-template-certificate-authority\|pki:generate-certificate-request\|pki:delete-template\|pki:delete-certificate\|pki:create-template\|pdf:make-toc\|pdf:insert-toc-headers\|pdf:get-toc\|pdf:clean\|p:status-transition\|p:state-transition\|p:remove\|p:pipelines\|p:insert\|p:get-by-id\|p:get\|p:execute\|p:create\|p:condition\|p:collection\|p:action\|ooxml:runs-merge\|ooxml:package-uris\|ooxml:package-parts-insert\|ooxml:package-parts\|msword:clean\|mcgm:polygon\|mcgm:point\|mcgm:geospatial-query-from-elements\|mcgm:geospatial-query\|mcgm:circle\|math:tanh\|math:tan\|math:sqrt\|math:sinh\|math:sin\|math:pow\|math:modf\|math:log10\|math:log\|math:ldexp\|math:frexp\|math:fmod\|math:floor\|math:fabs\|math:exp\|math:cosh\|math:cos\|math:ceil\|math:atan2\|math:atan\|math:asin\|math:acos\|map:put\|map:map\|map:keys\|map:get\|map:delete\|map:count\|map:clear\|lnk:to\|lnk:remove\|lnk:insert\|lnk:get\|lnk:from\|lnk:create\|kml:polygon\|kml:point\|kml:interior-polygon\|kml:geospatial-query-from-elements\|kml:geospatial-query\|kml:circle\|kml:box\|gml:polygon\|gml:point\|gml:interior-polygon\|gml:geospatial-query-from-elements\|gml:geospatial-query\|gml:circle\|gml:box\|georss:point\|georss:geospatial-query\|georss:circle\|geo:polygon\|geo:point\|geo:interior-polygon\|geo:geospatial-query-from-elements\|geo:geospatial-query\|geo:circle\|geo:box\|fn:zero-or-one\|fn:years-from-duration\|fn:year-from-dateTime\|fn:year-from-date\|fn:upper-case\|fn:unordered\|fn:true\|fn:translate\|fn:trace\|fn:tokenize\|fn:timezone-from-time\|fn:timezone-from-dateTime\|fn:timezone-from-date\|fn:sum\|fn:subtract-dateTimes-yielding-yearMonthDuration\|fn:subtract-dateTimes-yielding-dayTimeDuration\|fn:substring-before\|fn:substring-after\|fn:substring\|fn:subsequence\|fn:string-to-codepoints\|fn:string-pad\|fn:string-length\|fn:string-join\|fn:string\|fn:static-base-uri\|fn:starts-with\|fn:seconds-from-time\|fn:seconds-from-duration\|fn:seconds-from-dateTime\|fn:round-half-to-even\|fn:round\|fn:root\|fn:reverse\|fn:resolve-uri\|fn:resolve-QName\|fn:replace\|fn:remove\|fn:QName\|fn:prefix-from-QName\|fn:position\|fn:one-or-more\|fn:number\|fn:not\|fn:normalize-unicode\|fn:normalize-space\|fn:node-name\|fn:node-kind\|fn:nilled\|fn:namespace-uri-from-QName\|fn:namespace-uri-for-prefix\|fn:namespace-uri\|fn:name\|fn:months-from-duration\|fn:month-from-dateTime\|fn:month-from-date\|fn:minutes-from-time\|fn:minutes-from-duration\|fn:minutes-from-dateTime\|fn:min\|fn:max\|fn:matches\|fn:lower-case\|fn:local-name-from-QName\|fn:local-name\|fn:last\|fn:lang\|fn:iri-to-uri\|fn:insert-before\|fn:index-of\|fn:in-scope-prefixes\|fn:implicit-timezone\|fn:idref\|fn:id\|fn:hours-from-time\|fn:hours-from-duration\|fn:hours-from-dateTime\|fn:floor\|fn:false\|fn:expanded-QName\|fn:exists\|fn:exactly-one\|fn:escape-uri\|fn:escape-html-uri\|fn:error\|fn:ends-with\|fn:encode-for-uri\|fn:empty\|fn:document-uri\|fn:doc-available\|fn:doc\|fn:distinct-values\|fn:distinct-nodes\|fn:default-collation\|fn:deep-equal\|fn:days-from-duration\|fn:day-from-dateTime\|fn:day-from-date\|fn:data\|fn:current-time\|fn:current-dateTime\|fn:current-date\|fn:count\|fn:contains\|fn:concat\|fn:compare\|fn:collection\|fn:codepoints-to-string\|fn:codepoint-equal\|fn:ceiling\|fn:boolean\|fn:base-uri\|fn:avg\|fn:adjust-time-to-timezone\|fn:adjust-dateTime-to-timezone\|fn:adjust-date-to-timezone\|fn:abs\|feed:unsubscribe\|feed:subscription\|feed:subscribe\|feed:request\|feed:item\|feed:description\|excel:clean\|entity:enrich\|dom:set-pipelines\|dom:set-permissions\|dom:set-name\|dom:set-evaluation-context\|dom:set-domain-scope\|dom:set-description\|dom:remove-pipeline\|dom:remove-permissions\|dom:remove\|dom:get\|dom:evaluation-context\|dom:domains\|dom:domain-scope\|dom:create\|dom:configuration-set-restart-user\|dom:configuration-set-permissions\|dom:configuration-set-evaluation-context\|dom:configuration-set-default-domain\|dom:configuration-get\|dom:configuration-create\|dom:collection\|dom:add-pipeline\|dom:add-permissions\|dls:retention-rules\|dls:retention-rule-remove\|dls:retention-rule-insert\|dls:retention-rule\|dls:purge\|dls:node-expand\|dls:link-references\|dls:link-expand\|dls:documents-query\|dls:document-versions-query\|dls:document-version-uri\|dls:document-version-query\|dls:document-version-delete\|dls:document-version-as-of\|dls:document-version\|dls:document-update\|dls:document-unmanage\|dls:document-set-quality\|dls:document-set-property\|dls:document-set-properties\|dls:document-set-permissions\|dls:document-set-collections\|dls:document-retention-rules\|dls:document-remove-properties\|dls:document-remove-permissions\|dls:document-remove-collections\|dls:document-purge\|dls:document-manage\|dls:document-is-managed\|dls:document-insert-and-manage\|dls:document-include-query\|dls:document-history\|dls:document-get-permissions\|dls:document-extract-part\|dls:document-delete\|dls:document-checkout-status\|dls:document-checkout\|dls:document-checkin\|dls:document-add-properties\|dls:document-add-permissions\|dls:document-add-collections\|dls:break-checkout\|dls:author-query\|dls:as-of-query\|dbk:convert\|dbg:wait\|dbg:value\|dbg:stopped\|dbg:stop\|dbg:step\|dbg:status\|dbg:stack\|dbg:out\|dbg:next\|dbg:line\|dbg:invoke\|dbg:function\|dbg:finish\|dbg:expr\|dbg:eval\|dbg:disconnect\|dbg:detach\|dbg:continue\|dbg:connect\|dbg:clear\|dbg:breakpoints\|dbg:break\|dbg:attached\|dbg:attach\|cvt:save-converted-documents\|cvt:part-uri\|cvt:destination-uri\|cvt:basepath\|cvt:basename\|cts:words\|cts:word-query-weight\|cts:word-query-text\|cts:word-query-options\|cts:word-query\|cts:word-match\|cts:walk\|cts:uris\|cts:uri-match\|cts:train\|cts:tokenize\|cts:thresholds\|cts:stem\|cts:similar-query-weight\|cts:similar-query-nodes\|cts:similar-query\|cts:shortest-distance\|cts:search\|cts:score\|cts:reverse-query-weight\|cts:reverse-query-nodes\|cts:reverse-query\|cts:remainder\|cts:registered-query-weight\|cts:registered-query-options\|cts:registered-query-ids\|cts:registered-query\|cts:register\|cts:query\|cts:quality\|cts:properties-query-query\|cts:properties-query\|cts:polygon-vertices\|cts:polygon\|cts:point-longitude\|cts:point-latitude\|cts:point\|cts:or-query-queries\|cts:or-query\|cts:not-query-weight\|cts:not-query-query\|cts:not-query\|cts:near-query-weight\|cts:near-query-queries\|cts:near-query-options\|cts:near-query-distance\|cts:near-query\|cts:highlight\|cts:geospatial-co-occurrences\|cts:frequency\|cts:fitness\|cts:field-words\|cts:field-word-query-weight\|cts:field-word-query-text\|cts:field-word-query-options\|cts:field-word-query-field-name\|cts:field-word-query\|cts:field-word-match\|cts:entity-highlight\|cts:element-words\|cts:element-word-query-weight\|cts:element-word-query-text\|cts:element-word-query-options\|cts:element-word-query-element-name\|cts:element-word-query\|cts:element-word-match\|cts:element-values\|cts:element-value-ranges\|cts:element-value-query-weight\|cts:element-value-query-text\|cts:element-value-query-options\|cts:element-value-query-element-name\|cts:element-value-query\|cts:element-value-match\|cts:element-value-geospatial-co-occurrences\|cts:element-value-co-occurrences\|cts:element-range-query-weight\|cts:element-range-query-value\|cts:element-range-query-options\|cts:element-range-query-operator\|cts:element-range-query-element-name\|cts:element-range-query\|cts:element-query-query\|cts:element-query-element-name\|cts:element-query\|cts:element-pair-geospatial-values\|cts:element-pair-geospatial-value-match\|cts:element-pair-geospatial-query-weight\|cts:element-pair-geospatial-query-region\|cts:element-pair-geospatial-query-options\|cts:element-pair-geospatial-query-longitude-name\|cts:element-pair-geospatial-query-latitude-name\|cts:element-pair-geospatial-query-element-name\|cts:element-pair-geospatial-query\|cts:element-pair-geospatial-boxes\|cts:element-geospatial-values\|cts:element-geospatial-value-match\|cts:element-geospatial-query-weight\|cts:element-geospatial-query-region\|cts:element-geospatial-query-options\|cts:element-geospatial-query-element-name\|cts:element-geospatial-query\|cts:element-geospatial-boxes\|cts:element-child-geospatial-values\|cts:element-child-geospatial-value-match\|cts:element-child-geospatial-query-weight\|cts:element-child-geospatial-query-region\|cts:element-child-geospatial-query-options\|cts:element-child-geospatial-query-element-name\|cts:element-child-geospatial-query-child-name\|cts:element-child-geospatial-query\|cts:element-child-geospatial-boxes\|cts:element-attribute-words\|cts:element-attribute-word-query-weight\|cts:element-attribute-word-query-text\|cts:element-attribute-word-query-options\|cts:element-attribute-word-query-element-name\|cts:element-attribute-word-query-attribute-name\|cts:element-attribute-word-query\|cts:element-attribute-word-match\|cts:element-attribute-values\|cts:element-attribute-value-ranges\|cts:element-attribute-value-query-weight\|cts:element-attribute-value-query-text\|cts:element-attribute-value-query-options\|cts:element-attribute-value-query-element-name\|cts:element-attribute-value-query-attribute-name\|cts:element-attribute-value-query\|cts:element-attribute-value-match\|cts:element-attribute-value-geospatial-co-occurrences\|cts:element-attribute-value-co-occurrences\|cts:element-attribute-range-query-weight\|cts:element-attribute-range-query-value\|cts:element-attribute-range-query-options\|cts:element-attribute-range-query-operator\|cts:element-attribute-range-query-element-name\|cts:element-attribute-range-query-attribute-name\|cts:element-attribute-range-query\|cts:element-attribute-pair-geospatial-values\|cts:element-attribute-pair-geospatial-value-match\|cts:element-attribute-pair-geospatial-query-weight\|cts:element-attribute-pair-geospatial-query-region\|cts:element-attribute-pair-geospatial-query-options\|cts:element-attribute-pair-geospatial-query-longitude-name\|cts:element-attribute-pair-geospatial-query-latitude-name\|cts:element-attribute-pair-geospatial-query-element-name\|cts:element-attribute-pair-geospatial-query\|cts:element-attribute-pair-geospatial-boxes\|cts:document-query-uris\|cts:document-query\|cts:distance\|cts:directory-query-uris\|cts:directory-query-depth\|cts:directory-query\|cts:destination\|cts:deregister\|cts:contains\|cts:confidence\|cts:collections\|cts:collection-query-uris\|cts:collection-query\|cts:collection-match\|cts:classify\|cts:circle-radius\|cts:circle-center\|cts:circle\|cts:box-west\|cts:box-south\|cts:box-north\|cts:box-east\|cts:box\|cts:bearing\|cts:arc-intersection\|cts:and-query-queries\|cts:and-query-options\|cts:and-query\|cts:and-not-query-positive-query\|cts:and-not-query-negative-query\|cts:and-not-query\|css:get\|css:convert\|cpf:success\|cpf:failure\|cpf:document-set-state\|cpf:document-set-processing-status\|cpf:document-set-last-updated\|cpf:document-set-error\|cpf:document-get-state\|cpf:document-get-processing-status\|cpf:document-get-last-updated\|cpf:document-get-error\|cpf:check-transition\|alert:spawn-matching-actions\|alert:rule-user-id-query\|alert:rule-set-user-id\|alert:rule-set-query\|alert:rule-set-options\|alert:rule-set-name\|alert:rule-set-description\|alert:rule-set-action\|alert:rule-remove\|alert:rule-name-query\|alert:rule-insert\|alert:rule-id-query\|alert:rule-get-user-id\|alert:rule-get-query\|alert:rule-get-options\|alert:rule-get-name\|alert:rule-get-id\|alert:rule-get-description\|alert:rule-get-action\|alert:rule-action-query\|alert:remove-triggers\|alert:make-rule\|alert:make-log-action\|alert:make-config\|alert:make-action\|alert:invoke-matching-actions\|alert:get-my-rules\|alert:get-all-rules\|alert:get-actions\|alert:find-matching-rules\|alert:create-triggers\|alert:config-set-uri\|alert:config-set-trigger-ids\|alert:config-set-options\|alert:config-set-name\|alert:config-set-description\|alert:config-set-cpf-domain-names\|alert:config-set-cpf-domain-ids\|alert:config-insert\|alert:config-get-uri\|alert:config-get-trigger-ids\|alert:config-get-options\|alert:config-get-name\|alert:config-get-id\|alert:config-get-description\|alert:config-get-cpf-domain-names\|alert:config-get-cpf-domain-ids\|alert:config-get\|alert:config-delete\|alert:action-set-options\|alert:action-set-name\|alert:action-set-module-root\|alert:action-set-module-db\|alert:action-set-module\|alert:action-set-description\|alert:action-remove\|alert:action-insert\|alert:action-get-options\|alert:action-get-name\|alert:action-get-module-root\|alert:action-get-module-db\|alert:action-get-module\|alert:action-get-description\|zero-or-one\|years-from-duration\|year-from-dateTime\|year-from-date\|upper-case\|unordered\|true\|translate\|trace\|tokenize\|timezone-from-time\|timezone-from-dateTime\|timezone-from-date\|sum\|subtract-dateTimes-yielding-yearMonthDuration\|subtract-dateTimes-yielding-dayTimeDuration\|substring-before\|substring-after\|substring\|subsequence\|string-to-codepoints\|string-pad\|string-length\|string-join\|string\|static-base-uri\|starts-with\|seconds-from-time\|seconds-from-duration\|seconds-from-dateTime\|round-half-to-even\|round\|root\|reverse\|resolve-uri\|resolve-QName\|replace\|remove\|QName\|prefix-from-QName\|position\|one-or-more\|number\|not\|normalize-unicode\|normalize-space\|node-name\|node-kind\|nilled\|namespace-uri-from-QName\|namespace-uri-for-prefix\|namespace-uri\|name\|months-from-duration\|month-from-dateTime\|month-from-date\|minutes-from-time\|minutes-from-duration\|minutes-from-dateTime\|min\|max\|matches\|lower-case\|local-name-from-QName\|local-name\|last\|lang\|iri-to-uri\|insert-before\|index-of\|in-scope-prefixes\|implicit-timezone\|idref\|id\|hours-from-time\|hours-from-duration\|hours-from-dateTime\|floor\|false\|expanded-QName\|exists\|exactly-one\|escape-uri\|escape-html-uri\|error\|ends-with\|encode-for-uri\|empty\|document-uri\|doc-available\|doc\|distinct-values\|distinct-nodes\|default-collation\|deep-equal\|days-from-duration\|day-from-dateTime\|day-from-date\|data\|current-time\|current-dateTime\|current-date\|count\|contains\|concat\|compare\|collection\|codepoints-to-string\|codepoint-equal\|ceiling\|boolean\|base-uri\|avg\|adjust-time-to-timezone\|adjust-dateTime-to-timezone\|adjust-date-to-timezone\|abs)\b/],
	3	+["pln",/^[\w:-]+/],["pln",/^[\t\n\r \xa0]+/]]),["xq","xquery"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/lang-yaml.js

View

...

@@ -0,0 +1,2 @@

+var a=null;

+PR.registerLangHandler(PR.createSimpleLexer([["pun",/^[:>?|]+/,a,":|>?"],["dec",/^%(?:YAML|TAG)[^\n\r#]+/,a,"%"],["typ",/^&\S+/,a,"&"],["typ",/^!\S*/,a,"!"],["str",/^"(?:[^"\\]|\\.)*(?:"|$)/,a,'"'],["str",/^'(?:[^']|'')*(?:'|$)/,a,"'"],["com",/^#[^\n\r]*/,a,"#"],["pln",/^\s+/,a," \t\r\n"]],[["dec",/^(?:---|\.\.\.)(?:[\n\r]|$)/],["pun",/^-/],["kwd",/^\w+:[\n\r ]/],["pln",/^\w+/]]),["yaml","yml"]);

mojolegacy/lib/Mojolicious/public/mojo/prettify/prettify-mojo.css

View

...

@@ -0,0 +1 @@

+.str{color:#9daa7e}.kwd{color:#d5b57c}.com{color:#726d73}.typ{color:#dd7e5e}.lit{color:#fcf0a4}.pun,.opn,.clo{color:#a78353}.pln{color:#889dbc}.tag{color:#d5b57c}.atn{color:#dd7e5e}.atv{color:#9daa7e}.dec{color:#dd7e5e}

mojolegacy/lib/Mojolicious/public/mojo/prettify/prettify.css

View

...

@@ -0,0 +1 @@

+.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}

+28

mojolegacy/lib/Mojolicious/public/mojo/prettify/prettify.js

View

...	...	@@ -0,0 +1,28 @@
	1	+var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
	2	+(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"\|\|b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"\|\|a==="-"\|\|a==="["\|\|a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}\|\\x[\dA-Fa-f]{2}\|\\[0-3][0-7]{0,2}\|\\[0-7]{1,2}\|\\[\S\s]\|[^\\]/g),a=
	3	+[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c<i;++c){var j=f[c];if(/\\[bdsw]/i.test(j))a.push(j);else{var j=m(j),d;c+2<i&&"-"===f[c+1]?(d=m(f[c+2]),c+=2):d=j;b.push([j,d]);d<65\|\|j>122\|\|(d<65\|\|j>90\|\|b.push([Math.max(65,j)\|32,Math.min(d,90)\|32]),d<97\|\|j>122\|\|b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]\|\|f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;c<b.length;++c)i=b[c],i[0]<=j[1]+1?j[1]=Math.max(j[1],i[1]):f.push(j=i);b=["["];o&&b.push("^");b.push.apply(b,a);for(c=0;c<
	4	+f.length;++c)i=f[c],b.push(e(i[0])),i[1]>i[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]\|\\[\S\s])*]\|\\u[\dA-Fa-f]{4}\|\\x[\dA-Fa-f]{2}\|\\\d+\|\\[^\dux]\|\(\?[!:=]\|[()^]\|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c<b;++c){var j=f[c];j==="("?++i:"\\"===j.charAt(0)&&(j=+j.substring(1))&&j<=i&&(d[j]=-1)}for(c=1;c<d.length;++c)-1===d[c]&&(d[c]=++t);for(i=c=0;c<b;++c)j=f[c],j==="("?(++i,d[i]===void 0&&(f[c]="(?:")):"\\"===j.charAt(0)&&
	5	+(j=+j.substring(1))&&j<=i&&(f[c]="\\"+d[i]);for(i=c=0;c<b;++c)"^"===f[c]&&"^"!==f[c+1]&&(f[c]="");if(a.ignoreCase&&s)for(c=0;c<b;++c)j=f[c],a=j.charAt(0),j.length>=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a\|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p<d;++p){var g=a[p];if(g.ignoreCase)l=!0;else if(/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}\|\\x[\da-f]{2}\|\\[^UXux]/gi,""))){s=!0;l=!1;break}}for(var r=
	6	+{b:8,t:9,n:10,v:11,f:12,r:13},n=[],p=0,d=a.length;p<d;++p){g=a[p];if(g.global\|\|g.multiline)throw Error(""+g);n.push("(?:"+y(g)+")")}return RegExp(n.join("\|"),l?"gi":"g")}function M(a){function m(a){switch(a.nodeType){case 1:if(e.test(a.className))break;for(var g=a.firstChild;g;g=g.nextSibling)m(g);g=a.nodeName;if("BR"===g\|\|"LI"===g)h[s]="\n",t[s<<1]=y++,t[s++<<1\|1]=a;break;case 3:case 4:g=a.nodeValue,g.length&&(g=p?g.replace(/\r\n?/g,"\n"):g.replace(/[\t\n\r ]+/g," "),h[s]=g,t[s<<1]=y,y+=g.length,
	7	+t[s++<<1\|1]=a)}}var e=/(?:^\|\s)nocode(?:\s\|$)/,h=[],y=0,t=[],s=0,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=document.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);m(a);return{a:h.join("").replace(/\n$/,""),c:t}}function B(a,m,e,h){m&&(a={a:m,d:a},e(a),h.push.apply(h,a.e))}function x(a,m){function e(a){for(var l=a.d,p=[l,"pln"],d=0,g=a.a.match(y)\|\|[],r={},n=0,z=g.length;n<z;++n){var f=g[n],b=r[f],o=void 0,c;if(typeof b===
	8	+"string")c=!1;else{var i=h[f.charAt(0)];if(i)o=f.match(i[1]),b=i[0];else{for(c=0;c<t;++c)if(i=m[c],o=f.match(i[1])){b=i[0];break}o\|\|(b="pln")}if((c=b.length>=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c\|\|(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m),
	9	+l=[],p={},d=0,g=e.length;d<g;++d){var r=e[d],n=r[3];if(n)for(var k=n.length;--k>=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)\|\|(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]\|\\[\S\s]\|''?(?=[^']))(?:'''\|$)\|"""(?:[^"\\]\|\\[\S\s]\|""?(?=[^"]))(?:"""\|$)\|'(?:[^'\\]\|\\[\S\s])(?:'\|$)\|"(?:[^"\\]\|\\[\S\s])(?:"\|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]\|\\[\S\s])(?:'\|$)\|"(?:[^"\\]\|\\[\S\s])(?:"\|$)\|`(?:[^\\`]\|\\[\S\s])*(?:`\|$))/,
	10	+q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]\|\\.)(?:'\|$)\|"(?:[^\n\r"\\]\|\\.)(?:"\|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]\|"")(?:"\|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]\|#(?!##))(?:###\|$)\|.)/,q,"#"]):m.push(["com",/^#(?:(?:define\|elif\|else\|endif\|error\|ifdef\|include\|ifndef\|line\|pragma\|undef\|warning)\b\|[^\n\r])/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)\|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h\|[a-z]\w)>/,q])):m.push(["com",/^#[^\n\r]*/,
	11	+q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]/,q]),e.push(["com",/^\/\[\S\s]?(?:\\/\|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?\|[!+-]\|!=\|!==\|#\|%\|%=\|&\|&&\|&&=\|&=\|\(\|\\|\=\|\+=\|,\|-=\|->\|\/\|\/=\|:\|::\|;\|<\|<<\|<<=\|<=\|=\|==\|===\|>\|>=\|>>\|>>=\|>>>\|>>>=\|[?@[^]\|\^=\|\^\^\|\^\^=\|{\|\\|\|\\|=\|\\|\\|\|\\|\\|=\|~\|break\|case\|continue\|delete\|do\|else\|finally\|instanceof\|return\|throw\|try\|typeof)\s(\/(?=[^/])(?:[^/[\\]\|\\[\S\s]\|\[(?:[^\\\]]\|\\[\S\s])*(?:]\|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ \| $/g,
	12	+"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"\|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]\|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]/i,q],["lit",/^(?:0x[\da-f]+\|(?:\d(?:_\d+)\d(?:\.\d)?\|\.\d\+)(?:e[+-]?\d+)?)[a-z]/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a),
	13	+a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c\|\|a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e}
	14	+for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^\|\s)nocode(?:\s\|$)/,t=/\r\n?\|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g<d.length;++g)e(d[g]);m===(m\|0)&&d[0].setAttribute("value",
	15	+m);var r=s.createElement("OL");r.className="linenums";for(var n=Math.max(0,m-1\|0)\|\|0,g=0,z=d.length;g<z;++g)l=d[g],l.className="L"+(g+n)%10,l.firstChild\|\|l.appendChild(s.createTextNode("\xa0")),r.appendChild(l);a.appendChild(r)}function k(a,m){for(var e=m.length;--e>=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a\|\|!A.hasOwnProperty(a))a=/^\s*</.test(m)?"default-markup":"default-code";return A[a]}function E(a){var m=
	16	+a.g;try{var e=M(a.h),h=e.a;a.a=h;a.c=e.c;a.d=0;C(m,h)(a);var k=/\bMSIE\b/.test(navigator.userAgent),m=/\n/g,t=a.a,s=t.length,e=0,l=a.c,p=l.length,h=0,d=a.e,g=d.length,a=0;d[g]=s;var r,n;for(n=r=0;n<g;)d[n]!==d[n+2]?(d[r++]=d[n++],d[r++]=d[n++]):n+=2;g=r;for(n=r=0;n<g;){for(var z=d[n],f=d[n+1],b=n+2;b+2<=g&&d[b+1]===f;)b+=2;d[r++]=z;d[r++]=f;n=b}for(d.length=r;h<p;){var o=l[h+2]\|\|s,c=d[a+2]\|\|s,b=Math.min(o,c),i=l[h+1],j;if(i.nodeType!==1&&(j=t.substring(e,b))){k&&(j=j.replace(m,"\r"));i.nodeValue=
	17	+j;var u=i.ownerDocument,v=u.createElement("SPAN");v.className=d[a+1];var x=i.parentNode;x.replaceChild(v,i);v.appendChild(i);e<o&&(l[h+1]=i=u.createTextNode(t.substring(b,o)),x.insertBefore(i,v.nextSibling))}e=b;e>=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
	18	+"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"],
	19	+H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],
	20	+J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR\|FILE\|vector\|(de\|priority_)?queue\|list\|stack\|(const_)?iterator\|(multi)?(set\|map)\|bitset\|u?(int\|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+
	21	+I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^<?]+/],["dec",/^<!\w[^>](?:>\|$)/],["com",/^<\!--[\S\s]?(?:--\>\|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>\|$)/],["lang-",/^<%([\S\s]+?)(?:%>\|$)/],["pun",/^(?:<[%?]\|[%?]>)/],["lang-",/^<xmp\b[^>]>([\S\s]+?)<\/xmp\b[^>]>/i],["lang-js",/^<script\b[^>]>([\S\s]?)(<\/script\b[^>]>)/i],["lang-css",/^<style\b[^>]>([\S\s]?)(<\/style\b[^>]>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),
	22	+["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]"?\|'[^']'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]\w)?\|\/?>$/i],["atn",/^(?!style[\s=]\|on)[a-z](?:[\w:-]\w)?/i],["lang-uq.val",/^=\s([^\s"'>](?:[^\s"'/>]\|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s=\s"([^"]+)"/i],["lang-js",/^on\w+\s=\s'([^']+)'/i],["lang-js",/^on\w+\s=\s([^\s"'>]+)/i],["lang-css",/^style\s=\s"([^"]+)"/i],["lang-css",/^style\s=\s'([^']+)'/i],["lang-css",
	23	+/^style\s=\s([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),
	24	+["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes",
	25	+hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p<h.length&&l.now()<e;p++){var n=h[p],k=n.className;if(k.indexOf("prettyprint")>=0){var k=k.match(g),f,b;if(b=
	26	+!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"\|\|o.tagName==="code"\|\|o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b\|\|((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p<h.length?setTimeout(m,
	27	+250):a&&a()}for(var e=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],h=[],k=0;k<e.length;++k)for(var t=0,s=e[k].length;t<s;++t)h.push(e[k][t]);var e=q,l=Date;l.now\|\|(l={now:function(){return+new Date}});var p=0,d,g=/\blang(?:uage)?-([\w.]+)(?!\S)/;m()};window.PR={createSimpleLexer:x,registerLangHandler:k,sourceDecorator:u,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",
	28	+PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})();

+5 -5

mojolegacy/lib/Mojolicious/templates/exception.development.html.ep

View

@@ -4,9 +4,9 @@
     <title>Server error</title>
     <meta http-equiv="Pragma" content="no-cache">
     <meta http-equiv="Expires" content="-1">
-    %= javascript '/js/jquery.js'
-    %= stylesheet '/css/prettify-mojo.css'
-    %= javascript '/js/prettify.js'
+    %= javascript '/mojo/jquery/jquery.js'
+    %= stylesheet '/mojo/prettify/prettify-mojo.css'
+    %= javascript '/mojo/prettify/prettify.js'
     %= stylesheet begin
       a img { border: 0 }
       body {
@@ -39,7 +39,7 @@
       }
       .code {
         background-color: #1a1a1a;
-        background: url(<%= url_for '/mojolicious-pinstripe.gif' %>);
+        background: url(<%= url_for '/mojo/pinstripe.gif' %>);
         color: #eee;
         text-shadow: #333 0 1px 0;
       }
@@ -219,7 +219,7 @@
     </div>
     <div id="footer">
       %= link_to 'http://mojolicio.us' => begin
-        %= image '/mojolicious-black.png', alt => 'Mojolicious logo'
+        %= image '/mojo/logo-black.png', alt => 'Mojolicious logo'
       % end
     </div>
     %= javascript begin

+1 -1

mojolegacy/lib/Mojolicious/templates/exception.html.ep

View

@@ -4,7 +4,7 @@
    %= stylesheet begin
       body { background-color: #caecf6 }
       #raptor {
-        background: url(<%= url_for '/mojolicious-failraptor.png' %>);
+        background: url(<%= url_for '/mojo/failraptor.png' %>);
         height: 488px;
         left: 50%;
         margin-left: -371px;

+2 -2

mojolegacy/lib/Mojolicious/templates/mojobar.html.ep

View

@@ -1,4 +1,4 @@
-%= javascript '/js/jquery.js'
+%= javascript '/mojo/jquery/jquery.js'
 <div id="mojobar">
   %= stylesheet scoped => 'scoped', begin
     #mojobar {
@@ -56,7 +56,7 @@
   % end
   <div id="mojobar-logo">
     %= link_to 'http://mojolicio.us' => begin
-      %= image '/mojolicious-white.png', alt => 'Mojolicious logo'
+      %= image '/mojo/logo-white.png', alt => 'Mojolicious logo'
     % end
   </div>
   <div id="mojobar-links">

+3 -3

mojolegacy/lib/Mojolicious/templates/not_found.development.html.ep

View

@@ -2,8 +2,8 @@
 <html>
   <head>
     <title>Page not found</title>
-    %= stylesheet '/css/prettify-mojo.css'
-    %= javascript '/js/prettify.js'
+    %= stylesheet '/mojo/prettify/prettify-mojo.css'
+    %= javascript '/mojo/prettify/prettify.js'
     %= stylesheet begin
       body {
         background-color: #f5f6f8;
@@ -117,7 +117,7 @@
     </div>
     <div id="footer">
       %= link_to 'http://mojolicio.us' => begin
-        %= image '/mojolicious-black.png', alt => 'Mojolicious logo'
+        %= image '/mojo/logo-black.png', alt => 'Mojolicious logo'
       % end
     </div>
   </body>

+2 -2

mojolegacy/lib/Mojolicious/templates/not_found.html.ep

View

@@ -10,7 +10,7 @@
         top: 60%;
       }
       #notfound {
-        background: url(<%= url_for '/mojolicious-notfound.png' %>);
+        background: url(<%= url_for '/mojo/notfound.png' %>);
         height: 62px;
         left: 50%;
         margin-left: -153px;
@@ -22,7 +22,7 @@
     % end
   <body>
     %= link_to url_for->base => begin
-      %= image '/mojolicious-noraptor.png', alt => 'Bye!', id => 'noraptor'
+      %= image '/mojo/noraptor.png', alt => 'Bye!', id => 'noraptor'
     % end
     <div id="notfound"></div>
   </body>

+4 -4

mojolegacy/lib/Mojolicious/templates/perldoc.html.ep

View

@@ -2,8 +2,8 @@
 <html>
   <head>
     <title><%= $title %></title>
-    %= stylesheet '/css/prettify-mojo.css'
-    %= javascript '/js/prettify.js'
+    %= stylesheet '/mojo/prettify/prettify-mojo.css'
+    %= javascript '/mojo/prettify/prettify.js'
     %= stylesheet begin
       a { color: inherit }
       a:hover { color: #2a2a2a }
@@ -24,7 +24,7 @@
       h1 a, h2 a, h3 a { text-decoration: none }
       pre {
         background-color: #eee;
-        background: url(<%= url_for '/mojolicious-pinstripe.gif' %>);
+        background: url(<%= url_for '/mojo/pinstripe.gif' %>);
         -moz-border-radius: 5px;
         border-radius: 5px;
         color: #eee;
@@ -88,7 +88,7 @@
     </div>
     <div id="footer">
       %= link_to 'http://mojolicio.us' => begin
-        %= image '/mojolicious-black.png', alt => 'Mojolicious logo'
+        %= image '/mojo/logo-black.png', alt => 'Mojolicious logo'
       % end
     </div>
   </body>

+191 -76

mojolegacy/lib/Test/Mojo.pm

View

@@ -9,12 +9,14 @@ use Mojo::Base -base;
 #  Bender: You're better off dead, I'm telling you, dude.
 #  Fry: Santa Claus is gunning you down!"
 use Mojo::IOLoop;
+use Mojo::JSON;
+use Mojo::JSON::Pointer;
 use Mojo::Server;
 use Mojo::UserAgent;
 use Mojo::Util qw(decode encode);
 use Test::More ();
 
-has 'tx';
+has [qw(message tx)];
 has ua => sub { Mojo::UserAgent->new->ioloop(Mojo::IOLoop->singleton) };
 
 # Silent or loud tests
@@ -142,12 +144,6 @@ sub json_content_is {
   return $self->_test('is_deeply', $self->tx->res->json, $data, $desc);
 }
 
-sub json_is {
-  my ($self, $p, $data, $desc) = @_;
-  $desc ||= qq{exact match for JSON Pointer "$p"};
-  return $self->_test('is_deeply', $self->tx->res->json($p), $data, $desc);
-}
-
 sub json_has {
   my ($self, $p, $desc) = @_;
   $desc ||= qq{has value for JSON Pointer "$p"};
@@ -162,28 +158,53 @@ sub json_hasnt {
     !Mojo::JSON::Pointer->new->contains($self->tx->res->json, $p), $desc);
 }
 
+sub json_is {
+  my ($self, $p, $data, $desc) = @_;
+  $desc ||= qq{exact match for JSON Pointer "$p"};
+  return $self->_test('is_deeply', $self->tx->res->json($p), $data, $desc);
+}
+
+sub json_message_has {
+  my ($self, $p, $desc) = @_;
+  $desc ||= qq{has value for JSON Pointer "$p"};
+  return $self->_test('ok', $self->_json(contains => $p), $desc);
+}
+
+sub json_message_hasnt {
+  my ($self, $p, $desc) = @_;
+  $desc ||= qq{has no value for JSON Pointer "$p"};
+  return $self->_test('ok', !$self->_json(contains => $p), $desc);
+}
+
+sub json_message_is {
+  my ($self, $p, $data, $desc) = @_;
+  $desc ||= qq{exact match for JSON Pointer "$p"};
+  return $self->_test('is_deeply', $self->_json(get => $p), $data, $desc);
+}
+
 sub message_is {
   my ($self, $value, $desc) = @_;
-  $desc ||= 'exact match for message';
-  return $self->_test('is', $self->_message, $value, $desc);
+  return $self->_message('is', $value, $desc || 'exact match for message');
 }
 
 sub message_isnt {
   my ($self, $value, $desc) = @_;
-  $desc ||= 'no match for message';
-  return $self->_test('isnt', $self->_message, $value, $desc);
+  return $self->_message('isnt', $value, $desc || 'no match for message');
 }
 
 sub message_like {
   my ($self, $regex, $desc) = @_;
-  $desc ||= 'message is similar';
-  return $self->_test('like', $self->_message, $regex, $desc);
+  return $self->_message('like', $regex, $desc || 'message is similar');
+}
+
+sub message_ok {
+  my ($self, $desc) = @_;
+  return $self->_test('ok', !!$self->_wait(1), $desc, 'message received');
 }
 
 sub message_unlike {
   my ($self, $regex, $desc) = @_;
-  $desc ||= 'message is not similar';
-  return $self->_test('unlike', $self->_message, $regex, $desc);
+  return $self->_message('unlike', $regex, $desc || 'message is not similar');
 }
 
 sub options_ok { shift->_request_ok(options => @_) }
@@ -278,7 +299,8 @@ sub websocket_ok {
       my $tx = pop;
       $self->tx($tx);
       $tx->on(finish => sub { $self->{finished} = 1 });
-      $tx->on(message => sub { push @{$self->{messages}}, pop });
+      $tx->on(binary => sub { push @{$self->{messages}}, [binary => pop] });
+      $tx->on(text   => sub { push @{$self->{messages}}, [text   => pop] });
       Mojo::IOLoop->stop;
     }
   );
@@ -295,10 +317,28 @@ sub _get_content {
   return $charset ? decode($charset, $content) : $content;
 }
 
+sub _json {
+  my ($self, $method, $p) = @_;
+  return Mojo::JSON::Pointer->new->$method(
+    Mojo::JSON->new->decode(@{$self->_wait || []}[1]), $p);
+}
+
 sub _message {
-  my $self = shift;
-  Mojo::IOLoop->one_tick while !$self->{finished} && !@{$self->{messages}};
-  return shift @{$self->{messages}};
+  my ($self, $name, $value, $desc) = @_;
+  local $Test::Builder::Level = $Test::Builder::Level + 1;
+  my ($type, $msg) = @{$self->_wait || ['']};
+
+  # Type check
+  if (ref $value eq 'HASH') {
+    my $expect = exists $value->{text} ? 'text' : 'binary';
+    $value = $value->{$expect};
+    $msg = '' unless $type eq $expect;
+  }
+
+  # Decode text frame if there is no type check
+  else { $msg = decode 'UTF-8', $msg if $type eq 'text' }
+
+  return $self->_test($name, defined $msg ? $msg : '', $value, $desc);
 }
 
 sub _request_ok {
@@ -326,6 +366,21 @@ sub _text {
   return $e->text;
 }
 
+sub _wait {
+  my ($self, $wait) = @_;
+
+  # DEPRECATED in Rainbow!
+  my $new = $self->{new} = defined $self->{new} ? $self->{new} : $wait;
+  warn <<EOF unless $new;
+Testing WebSocket messages without Test::Mojo->message_ok is DEPRECATED!!!
+EOF
+  return $self->message if $new && !$wait;
+
+  # Wait for message
+  Mojo::IOLoop->one_tick while !$self->{finished} && !@{$self->{messages}};
+  return $self->message(shift @{$self->{messages}})->message;
+}
+
 1;
 
 =head1 NAME
@@ -352,6 +407,7 @@ Test::Mojo - Testing Mojo!
   # WebSocket
   $t->websocket_ok('/echo')
     ->send_ok('hello')
+    ->message_ok
     ->message_is('echo: hello')
     ->finish_ok;
 
@@ -366,7 +422,20 @@ L<Mojo> and L<Mojolicious> applications.
 
 L<Test::Mojo> implements the following attributes.
 
-=head2 C<tx>
+=head2 message
+
+  my $msg = $t->message;
+  $t      = $t->message([text => $bytes]);
+
+Current WebSocket message.
+
+  # Test custom message
+  $t->message([binary => $bytes])
+    ->json_message_has('/foo/bar')
+    ->json_message_hasnt('/bar')
+    ->json_message_is('/foo/baz' => {yada => [1, 2, 3]});
+
+=head2 tx
 
   my $tx = $t->tx;
   $t     = $t->tx(Mojo::Transaction::HTTP->new);
@@ -380,7 +449,7 @@ Current transaction, usually a L<Mojo::Transaction::HTTP> object.
   # Test custom transactions
   $t->tx($t->tx->previous)->status_is(302)->header_like(Location => qr/foo/);
 
-=head2 C<ua>
+=head2 ua
 
   my $ua = $t->ua;
   $t     = $t->ua(Mojo::UserAgent->new);
@@ -404,7 +473,7 @@ User agent used for testing, defaults to a L<Mojo::UserAgent> object.
 L<Test::Mojo> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<new>
+=head2 new
 
   my $t = Test::Mojo->new;
   my $t = Test::Mojo->new('MyApp');
@@ -412,7 +481,7 @@ following new ones.
 
 Construct a new L<Test::Mojo> object.
 
-=head2 C<app>
+=head2 app
 
   my $app = $t->app;
   $t      = $t->app(MyApp->new);
@@ -437,63 +506,63 @@ Access application with L<Mojo::UserAgent/"app">.
   my $stash;
   $t->app->hook(after_dispatch => sub { $stash = shift->stash });
 
-=head2 C<content_is>
+=head2 content_is
 
   $t = $t->content_is('working!');
   $t = $t->content_is('working!', 'right content');
 
 Check response content for exact match.
 
-=head2 C<content_isnt>
+=head2 content_isnt
 
   $t = $t->content_isnt('working!');
   $t = $t->content_isnt('working!', 'different content');
 
 Opposite of C<content_is>.
 
-=head2 C<content_like>
+=head2 content_like
 
   $t = $t->content_like(qr/working!/);
   $t = $t->content_like(qr/working!/, 'right content');
 
 Check response content for similar match.
 
-=head2 C<content_unlike>
+=head2 content_unlike
 
   $t = $t->content_unlike(qr/working!/);
   $t = $t->content_unlike(qr/working!/, 'different content');
 
 Opposite of C<content_like>.
 
-=head2 C<content_type_is>
+=head2 content_type_is
 
   $t = $t->content_type_is('text/html');
   $t = $t->content_type_is('text/html', 'right content type');
 
 Check response C<Content-Type> header for exact match.
 
-=head2 C<content_type_isnt>
+=head2 content_type_isnt
 
   $t = $t->content_type_isnt('text/html');
   $t = $t->content_type_isnt('text/html', 'different content type');
 
 Opposite of C<content_type_is>.
 
-=head2 C<content_type_like>
+=head2 content_type_like
 
   $t = $t->content_type_like(qr/text/);
   $t = $t->content_type_like(qr/text/, 'right content type');
 
 Check response C<Content-Type> header for similar match.
 
-=head2 C<content_type_unlike>
+=head2 content_type_unlike
 
   $t = $t->content_type_unlike(qr/text/);
   $t = $t->content_type_unlike(qr/text/, 'different content type');
 
 Opposite of C<content_type_like>.
 
-=head2 C<delete_ok>
+=head2 delete_ok
 
   $t = $t->delete_ok('/foo');
   $t = $t->delete_ok('/foo' => {DNT => 1} => 'Hi!');
@@ -501,7 +570,7 @@ Opposite of C<content_type_like>.
 Perform a C<DELETE> request and check for transport errors, takes the same
 arguments as L<Mojo::UserAgent/"delete">.
 
-=head2 C<element_exists>
+=head2 element_exists
 
   $t = $t->element_exists('div.foo[x=y]');
   $t = $t->element_exists('html head title', 'has a title');
@@ -509,21 +578,21 @@ arguments as L<Mojo::UserAgent/"delete">.
 Checks for existence of the CSS selectors first matching HTML/XML element with
 L<Mojo::DOM>.
 
-=head2 C<element_exists_not>
+=head2 element_exists_not
 
   $t = $t->element_exists_not('div.foo[x=y]');
   $t = $t->element_exists_not('html head title', 'has no title');
 
 Opposite of C<element_exists>.
 
-=head2 C<finish_ok>
+=head2 finish_ok
 
   $t = $t->finish_ok;
   $t = $t->finish_ok('finished successfully');
 
 Finish C<WebSocket> connection.
 
-=head2 C<get_ok>
+=head2 get_ok
 
   $t = $t->get_ok('/foo');
   $t = $t->get_ok('/foo' => {DNT => 1} => 'Hi!');
@@ -531,7 +600,7 @@ Finish C<WebSocket> connection.
 Perform a C<GET> request and check for transport errors, takes the same
 arguments as L<Mojo::UserAgent/"get">.
 
-=head2 C<head_ok>
+=head2 head_ok
 
   $t = $t->head_ok('/foo');
   $t = $t->head_ok('/foo' => {DNT => 1} => 'Hi!');
@@ -539,35 +608,35 @@ arguments as L<Mojo::UserAgent/"get">.
 Perform a C<HEAD> request and check for transport errors, takes the same
 arguments as L<Mojo::UserAgent/"head">.
 
-=head2 C<header_is>
+=head2 header_is
 
   $t = $t->header_is(Expect => 'fun');
   $t = $t->header_is(Expect => 'fun', 'right header');
 
 Check response header for exact match.
 
-=head2 C<header_isnt>
+=head2 header_isnt
 
   $t = $t->header_isnt(Expect => 'fun');
   $t = $t->header_isnt(Expect => 'fun', 'different header');
 
 Opposite of C<header_is>.
 
-=head2 C<header_like>
+=head2 header_like
 
   $t = $t->header_like(Expect => qr/fun/);
   $t = $t->header_like(Expect => qr/fun/, 'right header');
 
 Check response header for similar match.
 
-=head2 C<header_unlike>
+=head2 header_unlike
 
   $t = $t->header_like(Expect => qr/fun/);
   $t = $t->header_like(Expect => qr/fun/, 'different header');
 
 Opposite of C<header_like>.
 
-=head2 C<json_content_is>
+=head2 json_content_is
 
   $t = $t->json_content_is([1, 2, 3]);
   $t = $t->json_content_is([1, 2, 3], 'right content');
@@ -575,16 +644,7 @@ Opposite of C<header_like>.
 
 Check response content for JSON data.
 
-=head2 C<json_is>
-
-  $t = $t->json_is('/foo' => {bar => [1, 2, 3]});
-  $t = $t->json_is('/foo/bar' => [1, 2, 3]);
-  $t = $t->json_is('/foo/bar/1' => 2, 'right value');
-
-Check the value extracted from JSON response using the given JSON Pointer with
-L<Mojo::JSON::Pointer>.
-
-=head2 C<json_has>
+=head2 json_has
 
   $t = $t->json_has('/foo');
   $t = $t->json_has('/minibar', 'has a minibar');
@@ -592,42 +652,97 @@ L<Mojo::JSON::Pointer>.
 Check if JSON response contains a value that can be identified using the given
 JSON Pointer with L<Mojo::JSON::Pointer>.
 
-=head2 C<json_hasnt>
+=head2 json_hasnt
 
   $t = $t->json_hasnt('/foo');
   $t = $t->json_hasnt('/minibar', 'no minibar');
 
 Opposite of C<json_has>.
 
-=head2 C<message_is>
+=head2 json_is
+
+  $t = $t->json_is('/' => {foo => [1, 2, 3]});
+  $t = $t->json_is('/foo' => [1, 2, 3]);
+  $t = $t->json_is('/foo/1' => 2, 'right value');
+
+Check the value extracted from JSON response using the given JSON Pointer with
+L<Mojo::JSON::Pointer>.
+
+=head2 json_message_has
+
+  $t = $t->json_message_has('/foo');
+  $t = $t->json_message_has('/minibar', 'has a minibar');
+
+Check if JSON WebSocket message contains a value that can be identified using
+the given JSON Pointer with L<Mojo::JSON::Pointer>.
+
+=head2 json_message_hasnt
+
+  $t = $t->json_message_hasnt('/foo');
+  $t = $t->json_message_hasnt('/minibar', 'no minibar');
+
+Opposite of C<json_message_has>.
+
+=head2 json_message_is
 
+  $t = $t->json_message_is('/' => {foo => [1, 2, 3]});
+  $t = $t->json_message_is('/foo' => [1, 2, 3]);
+  $t = $t->json_message_is('/foo/1' => 2, 'right value');
+
+Check the value extracted from JSON WebSocket message using the given JSON
+Pointer with L<Mojo::JSON::Pointer>.
+
+=head2 message_is
+
+  $t = $t->message_is({binary => $bytes});
+  $t = $t->message_is({text   => $bytes});
   $t = $t->message_is('working!');
   $t = $t->message_is('working!', 'right message');
 
 Check WebSocket message for exact match.
 
-=head2 C<message_isnt>
+=head2 message_isnt
 
+  $t = $t->message_isnt({binary => $bytes});
+  $t = $t->message_isnt({text   => $bytes});
   $t = $t->message_isnt('working!');
   $t = $t->message_isnt('working!', 'different message');
 
 Opposite of C<message_is>.
 
-=head2 C<message_like>
+=head2 message_like
 
+  $t = $t->message_like({binary => qr/$bytes/});
+  $t = $t->message_like({text   => qr/$bytes/});
   $t = $t->message_like(qr/working!/);
   $t = $t->message_like(qr/working!/, 'right message');
 
 Check WebSocket message for similar match.
 
-=head2 C<message_unlike>
+=head2 message_ok
+
+  $t = $t->message_ok;
+  $t = $t->message_ok('got a message');
+
+Wait for next WebSocket message to arrive.
+
+  # Wait for message and perform multiple tests on it
+  $t->websocket_ok('/time')
+    ->message_ok
+    ->message_like(qr/\d+/)
+    ->message_unlike(qr/\w+/)
+    ->finish_ok;
+
+=head2 message_unlike
 
+  $t = $t->message_unlike({binary => qr/$bytes/});
+  $t = $t->message_unlike({text   => qr/$bytes/});
   $t = $t->message_unlike(qr/working!/);
   $t = $t->message_unlike(qr/working!/, 'different message');
 
 Opposite of C<message_like>.
 
-=head2 C<options_ok>
+=head2 options_ok
 
   $t = $t->options_ok('/foo');
   $t = $t->options_ok('/foo' => {DNT => 1} => 'Hi!');
@@ -635,7 +750,7 @@ Opposite of C<message_like>.
 Perform a C<OPTIONS> request and check for transport errors, takes the same
 arguments as L<Mojo::UserAgent/"options">.
 
-=head2 C<or>
+=head2 or
 
   $t = $t->or(sub {...});
 
@@ -645,7 +760,7 @@ Invoke callback if previous test failed.
   $t->get_ok('/bad')->or(sub { diag 'Must have been Glen!' })
     ->status_is(200)->or(sub { diag $t->tx->res->dom->at('title')->text });
 
-=head2 C<patch_ok>
+=head2 patch_ok
 
   $t = $t->patch_ok('/foo');
   $t = $t->patch_ok('/foo' => {DNT => 1} => 'Hi!');
@@ -653,7 +768,7 @@ Invoke callback if previous test failed.
 Perform a C<PATCH> request and check for transport errors, takes the same
 arguments as L<Mojo::UserAgent/"patch">.
 
-=head2 C<post_ok>
+=head2 post_ok
 
   $t = $t->post_ok('/foo');
   $t = $t->post_ok('/foo' => {DNT => 1} => 'Hi!');
@@ -661,7 +776,7 @@ arguments as L<Mojo::UserAgent/"patch">.
 Perform a C<POST> request and check for transport errors, takes the same
 arguments as L<Mojo::UserAgent/"post">.
 
-=head2 C<post_form_ok>
+=head2 post_form_ok
 
   $t = $t->post_form_ok('/foo' => {a => 'b'});
   $t = $t->post_form_ok('/foo' => 'UTF-8' => {a => 'b'} => {DNT => 1});
@@ -672,7 +787,7 @@ the same arguments as L<Mojo::UserAgent/"post_form">.
   # Test file upload
   $t->post_form_ok('/upload' => {foo => {content => 'bar'}})->status_is(200);
 
-=head2 C<post_json_ok>
+=head2 post_json_ok
 
   $t = $t->post_json_ok('/foo' => {a => 'b'});
   $t = $t->post_json_ok('/foo' => {a => 'b'} => {DNT => 1});
@@ -685,7 +800,7 @@ the same arguments as L<Mojo::UserAgent/"post_json">.
     ->status_is(200)
     ->json_content_is({bye => 'world'});
 
-=head2 C<put_ok>
+=head2 put_ok
 
   $t = $t->put_ok('/foo');
   $t = $t->put_ok('/foo' => {DNT => 1} => 'Hi!');
@@ -693,7 +808,7 @@ the same arguments as L<Mojo::UserAgent/"post_json">.
 Perform a C<PUT> request and check for transport errors, takes the same
 arguments as L<Mojo::UserAgent/"put">.
 
-=head2 C<request_ok>
+=head2 request_ok
 
   $t = $t->request_ok(Mojo::Transaction::HTTP->new);
   $t = $t->request_ok(Mojo::Transaction::HTTP->new, 'request successful');
@@ -707,37 +822,37 @@ Perform request and check for transport errors.
     ->status_is(200)
     ->json_is('/message' => 'User has been replaced.');
 
-=head2 C<reset_session>
+=head2 reset_session
 
   $t = $t->reset_session;
 
 Reset user agent session.
 
-=head2 C<send_ok>
+=head2 send_ok
 
   $t = $t->send_ok({binary => $bytes});
   $t = $t->send_ok({text   => $bytes});
   $t = $t->send_ok([$fin, $rsv1, $rsv2, $rsv3, $op, $payload]);
-  $t = $t->send_ok('hello');
-  $t = $t->send_ok('hello', 'sent successfully');
+  $t = $t->send_ok($chars);
+  $t = $t->send_ok($chars, 'sent successfully');
 
 Send message or frame via WebSocket.
 
-=head2 C<status_is>
+=head2 status_is
 
   $t = $t->status_is(200);
   $t = $t->status_is(200, 'right status');
 
 Check response status for exact match.
 
-=head2 C<status_isnt>
+=head2 status_isnt
 
   $t = $t->status_isnt(200);
   $t = $t->status_isnt(200, 'different status');
 
 Opposite of C<status_is>.
 
-=head2 C<text_is>
+=head2 text_is
 
   $t = $t->text_is('div.foo[x=y]' => 'Hello!');
   $t = $t->text_is('html head title' => 'Hello!', 'right title');
@@ -745,14 +860,14 @@ Opposite of C<status_is>.
 Checks text content of the CSS selectors first matching HTML/XML element for
 exact match with L<Mojo::DOM>.
 
-=head2 C<text_isnt>
+=head2 text_isnt
 
   $t = $t->text_isnt('div.foo[x=y]' => 'Hello!');
   $t = $t->text_isnt('html head title' => 'Hello!', 'different title');
 
 Opposite of C<text_is>.
 
-=head2 C<text_like>
+=head2 text_like
 
   $t = $t->text_like('div.foo[x=y]' => qr/Hello/);
   $t = $t->text_like('html head title' => qr/Hello/, 'right title');
@@ -760,14 +875,14 @@ Opposite of C<text_is>.
 Checks text content of the CSS selectors first matching HTML/XML element for
 similar match with L<Mojo::DOM>.
 
-=head2 C<text_unlike>
+=head2 text_unlike
 
   $t = $t->text_unlike('div.foo[x=y]' => qr/Hello/);
   $t = $t->text_unlike('html head title' => qr/Hello/, 'different title');
 
 Opposite of C<text_like>.
 
-=head2 C<websocket_ok>
+=head2 websocket_ok
 
   $t = $t->websocket_ok('/echo');
   $t = $t->websocket_ok('/echo' => {DNT => 1});

+35 -45

mojolegacy/lib/ojo.pm

View

@@ -4,14 +4,14 @@ use Mojo::Base -strict;
 use Mojo::ByteStream 'b';
 use Mojo::Collection 'c';
 use Mojo::DOM;
-use Mojo::JSON;
+use Mojo::JSON 'j';
 use Mojo::UserAgent;
 use Mojo::Util 'monkey_patch';
 
 # Silent oneliners
 $ENV{MOJO_LOG_LEVEL} ||= 'fatal';
 
-# User agent
+# Singleton user agent for oneliners
 my $UA = Mojo::UserAgent->new;
 
 sub import {
@@ -19,38 +19,28 @@ sub import {
   # Mojolicious::Lite
   my $caller = caller;
   eval "package $caller; use Mojolicious::Lite;";
+  $UA->app($caller->app);
 
-  # Allow redirects
   $UA->max_redirects(10) unless defined $ENV{MOJO_MAX_REDIRECTS};
-
-  # Detect proxy
   $UA->detect_proxy unless defined $ENV{MOJO_PROXY};
 
-  # Application
-  $UA->app($caller->app);
-
-  # Functions
-  monkey_patch $caller, 'a',
-    sub { $caller->can('any')->(@_) and return $UA->app };
-  monkey_patch $caller, 'b', \&b;
-  monkey_patch $caller, 'c', \&c;
-  monkey_patch $caller, 'd', sub { _request($UA->build_tx(DELETE => @_)) };
-  monkey_patch $caller, 'f', sub { _request($UA->build_form_tx(@_)) };
-  monkey_patch $caller, 'g', sub { _request($UA->build_tx(GET => @_)) };
-  monkey_patch $caller, 'h', sub { _request($UA->build_tx(HEAD => @_)) };
-  monkey_patch $caller, 'j', sub {
-    my $d = shift;
-    my $j = Mojo::JSON->new;
-    return $j->encode($d) if ref $d eq 'ARRAY' || ref $d eq 'HASH';
-    return $j->decode($d);
-  };
-  monkey_patch $caller, 'n', sub { _request($UA->build_json_tx(@_)) };
-  monkey_patch $caller, 'o', sub { _request($UA->build_tx(OPTIONS => @_)) };
-  monkey_patch $caller, 'p', sub { _request($UA->build_tx(POST => @_)) };
-  monkey_patch $caller, 'r', sub { $UA->app->dumper(@_) };
-  monkey_patch $caller, 't', sub { _request($UA->build_tx(PATCH => @_)) };
-  monkey_patch $caller, 'u', sub { _request($UA->build_tx(PUT => @_)) };
-  monkey_patch $caller, 'x', sub { Mojo::DOM->new(@_) };
+  # The ojo DSL
+  monkey_patch $caller,
+    a => sub { $caller->can('any')->(@_) and return $UA->app },
+    b => \&b,
+    c => \&c,
+    d => sub { _request($UA->build_tx(DELETE => @_)) },
+    f => sub { _request($UA->build_form_tx(@_)) },
+    g => sub { _request($UA->build_tx(GET    => @_)) },
+    h => sub { _request($UA->build_tx(HEAD   => @_)) },
+    j => \&j,
+    n => sub { _request($UA->build_json_tx(@_)) },
+    o => sub { _request($UA->build_tx(OPTIONS => @_)) },
+    p => sub { _request($UA->build_tx(POST => @_)) },
+    r => sub { $UA->app->dumper(@_) },
+    t => sub { _request($UA->build_tx(PATCH => @_)) },
+    u => sub { _request($UA->build_tx(PUT => @_)) },
+    x => sub { Mojo::DOM->new(@_) };
 }
 
 sub _request {
@@ -88,7 +78,7 @@ C<MOJO_PROXY> environment variable.
 
 L<ojo> implements the following functions.
 
-=head2 C<a>
+=head2 a
 
   my $app = a('/hello' => sub { shift->render(json => {hello => 'world'}) });
 
@@ -98,7 +88,7 @@ more argument variations.
 
   $ perl -Mojo -E 'a("/hello" => {text => "Hello Mojo!"})->start' daemon
 
-=head2 C<b>
+=head2 b
 
   my $stream = b('lalala');
 
@@ -106,13 +96,13 @@ Turn string into a L<Mojo::ByteStream> object.
 
   $ perl -Mojo -E 'b(g("mojolicio.us")->body)->html_unescape->say'
 
-=head2 C<c>
+=head2 c
 
   my $collection = c(1, 2, 3);
 
 Turn list into a L<Mojo::Collection> object.
 
-=head2 C<d>
+=head2 d
 
   my $res = d('mojolicio.us');
   my $res = d('http://mojolicio.us' => {DNT => 1} => 'Hi!');
@@ -120,7 +110,7 @@ Turn list into a L<Mojo::Collection> object.
 Perform C<DELETE> request with L<Mojo::UserAgent/"delete"> and return
 resulting L<Mojo::Message::Response> object.
 
-=head2 C<f>
+=head2 f
 
   my $res = f('http://kraih.com' => {a => 'b'});
   my $res = f('kraih.com' => 'UTF-8' => {a => 'b'} => {DNT => 1});
@@ -128,7 +118,7 @@ resulting L<Mojo::Message::Response> object.
 Perform C<POST> request with L<Mojo::UserAgent/"post_form"> and return
 resulting L<Mojo::Message::Response> object.
 
-=head2 C<g>
+=head2 g
 
   my $res = g('mojolicio.us');
   my $res = g('http://mojolicio.us' => {DNT => 1} => 'Hi!');
@@ -138,7 +128,7 @@ L<Mojo::Message::Response> object.
 
   $ perl -Mojo -E 'say g("mojolicio.us")->dom("h1, h2, h3")->pluck("text")'
 
-=head2 C<h>
+=head2 h
 
   my $res = h('mojolicio.us');
   my $res = h('http://mojolicio.us' => {DNT => 1} => 'Hi!');
@@ -146,7 +136,7 @@ L<Mojo::Message::Response> object.
 Perform C<HEAD> request with L<Mojo::UserAgent/"head"> and return resulting
 L<Mojo::Message::Response> object.
 
-=head2 C<j>
+=head2 j
 
   my $bytes = j({foo => 'bar'});
   my $array = j($bytes);
@@ -156,7 +146,7 @@ Encode Perl data structure or decode JSON with L<Mojo::JSON>.
 
   $ perl -Mojo -E 'b(j({hello => "world!"}))->spurt("hello.json")'
 
-=head2 C<n>
+=head2 n
 
   my $res = n('http://kraih.com' => {a => 'b'});
   my $res = n('kraih.com' => {a => 'b'} => {DNT => 1});
@@ -164,7 +154,7 @@ Encode Perl data structure or decode JSON with L<Mojo::JSON>.
 Perform C<POST> request with L<Mojo::UserAgent/"post_json"> and return
 resulting L<Mojo::Message::Response> object.
 
-=head2 C<o>
+=head2 o
 
   my $res = o('mojolicio.us');
   my $res = o('http://mojolicio.us' => {DNT => 1} => 'Hi!');
@@ -172,7 +162,7 @@ resulting L<Mojo::Message::Response> object.
 Perform C<OPTIONS> request with L<Mojo::UserAgent/"options"> and return
 resulting L<Mojo::Message::Response> object.
 
-=head2 C<p>
+=head2 p
 
   my $res = p('mojolicio.us');
   my $res = p('http://mojolicio.us' => {DNT => 1} => 'Hi!');
@@ -180,7 +170,7 @@ resulting L<Mojo::Message::Response> object.
 Perform C<POST> request with L<Mojo::UserAgent/"post"> and return resulting
 L<Mojo::Message::Response> object.
 
-=head2 C<r>
+=head2 r
 
   my $perl = r({data => 'structure'});
 
@@ -188,7 +178,7 @@ Dump a Perl data structure with L<Data::Dumper>.
 
   perl -Mojo -E 'say r(g("mojolicio.us")->headers->to_hash)'
 
-=head2 C<t>
+=head2 t
 
   my $res = t('mojolicio.us');
   my $res = t('http://mojolicio.us' => {DNT => 1} => 'Hi!');
@@ -196,7 +186,7 @@ Dump a Perl data structure with L<Data::Dumper>.
 Perform C<PATCH> request with L<Mojo::UserAgent/"patch"> and return resulting
 L<Mojo::Message::Response> object.
 
-=head2 C<u>
+=head2 u
 
   my $res = u('mojolicio.us');
   my $res = u('http://mojolicio.us' => {DNT => 1} => 'Hi!');
@@ -204,7 +194,7 @@ L<Mojo::Message::Response> object.
 Perform C<PUT> request with L<Mojo::UserAgent/"put"> and return resulting
 L<Mojo::Message::Response> object.
 
-=head2 C<x>
+=head2 x
 
   my $dom = x('<div>Hello!</div>');
 

-1

mojolegacy/script/hypnotoad

View

@@ -15,7 +15,6 @@ GetOptions(
   't|test'       => sub { $ENV{HYPNOTOAD_TEST}       = 1 }
 );
 
-# Usage
 die <<"EOF" if $help || !(my $app = shift || $ENV{HYPNOTOAD_APP});
 usage: $0 [OPTIONS] [APPLICATION]
 

+1 -1

mojolegacy/script/mojo

View

@@ -7,7 +7,7 @@ use FindBin;
 use lib "$FindBin::Bin/../lib";
 
 require Mojolicious::Commands;
-Mojolicious::Commands->start;
+Mojolicious::Commands->start_app('Mojo::HelloWorld');
 
 =head1 NAME
 

-1

mojolegacy/script/morbo

View

@@ -15,7 +15,6 @@ GetOptions(
   'w|watch=s'  => \my @watch
 );
 
-# Usage
 die <<"EOF" if $help || !(my $app = shift);
 usage: $0 [OPTIONS] [APPLICATION]
 

+1 -4

script/gitprep

View

@@ -16,8 +16,5 @@ Please visit http://mojolicio.us for detailed installation instructions.
 
 EOF
 
-# Application
-$ENV{MOJO_APP} ||= 'Gitprep';
-
 # Start commands
-Mojolicious::Commands->start;
+Mojolicious::Commands->start_app('Gitprep');

+13 -4

templates/main/project.html.ep

View

@@ -64,12 +64,20 @@
 
 % layout 'common';
 
+  % my $logined = $api->logined;
+
   %= javascript begin
     $(document).ready(function () {
       var http_rep_url = '<%= url_for("$user/$project.git")->to_abs %>';
       % my $execute_user = getpwuid($>);
       % my $rep = $git->rep($user, $project);
-      var ssh_rep_url = '<%= url_for($rep)->to_abs->scheme('ssh')->userinfo($execute_user)->port('') %>';
+      % my $ssh_port = config->{basic}{ssh_port} || '';
+      
+      var logined = <%= $logined ? 'true' : 'false' %>;
+      var ssh_rep_url = '';
+      if (logined) {
+        ssh_rep_url = '<%= url_for($rep)->to_abs->scheme('ssh')->userinfo($execute_user)->port($ssh_port) %>';
+      }
       
       // Click HTTP button
       $('#btn_http').on('click', function () {
@@ -84,7 +92,6 @@
       });
 
       // Initialize
-      var logined = <%= $api->logined ? 'true' : 'false' %>;
       if (logined) {
         $('#btn_ssh').trigger('click');
       }
@@ -111,7 +118,9 @@
         <div class="input-append" style="margin-top:10px">
           <div class="btn-group" data-toggle="buttons-radio">
             <button class="btn" id="btn_http" style="border-radius:0">HTTP</button>
-            <button class="btn" id="btn_ssh" style="border-radius:0">SSH</button>
+            % if ($logined) {
+              <button class="btn" id="btn_ssh" style="border-radius:0">SSH</button>
+            % }
           </div>
           <input class="span8" id="rep_url" type="text" style="border-radius:0;">
         </div>
@@ -144,7 +153,7 @@
       </div>
       
       % my $url = url_for->to_abs;
-      % my $ssh_port = config->{ssh_port};
+      % my $ssh_port = config->{basic}{ssh_port};
       % my $rep_home = app->git->rep_home;
       % my $ssh_url = 'ssh://kimoto@' . $url->host
       %   . ($ssh_port ? ":$ssh_port" : '') . "$rep_home/$user/$project.git";

...	...	@@ -20,9 +20,12 @@ sub startup {
20	20	my $self = shift;
21	21
22	22	# Config
23		- #my $conf_file = $ENV{GITPREP_CONFIG_FILE}
24		- # \|\| $self->home->rel_file('gitprep.conf');
25		- #$self->plugin('JSONConfigLoose', {file => $conf_file}) if -f $conf_file;
	23	+ $self->plugin('INIConfig', {ext => 'conf'});
	24	+
	25	+ # My Config(Development)
	26	+ my $my_conf_file = $self->home->rel_file('gitprep.my.conf');
	27	+ $self->plugin('INIConfig', {file => $my_conf_file}) if -f $my_conf_file;
	28	+
26	29	my $conf = $self->config;
27	30	$conf->{root} = $self->home->rel_file('rep');
28	31	$conf->{hypnotoad} \|\|= {listen => ["http://*:10020"]};

...	...	@@ -15,10 +15,9 @@ has log => sub { Mojo::Log->new };
15	15	has ua => sub {
16	16	my $self = shift;
17	17
18		- # Fresh user agent
19	18	my $ua = Mojo::UserAgent->new->app($self);
20	19	weaken $self;
21		- $ua->on(error => sub { $self->log->error(pop) });
	20	+ $ua->on(error => sub { $self->log->error($_[1]) });
22	21	weaken $ua->{app};
23	22
24	23	return $ua;
...	...	@@ -27,10 +26,8 @@ has ua => sub {
27	26	sub new {
28	27	my $self = shift->SUPER::new(@_);
29	28
30		- # Detect home directory
	29	+ # Check if we have a log directory
31	30	my $home = $self->home->detect(ref $self);
32		-
33		- # Log directory
34	31	$self->log->path($home->rel_file('log/mojo.log'))
35	32	if -w $home->rel_file('log');
36	33
...	...	@@ -101,7 +98,7 @@ See L<Mojolicious> for more!
101	98
102	99	L<Mojo> implements the following attributes.
103	100
104		-=head2 C<home>
	101	+=head2 home
105	102
106	103	my $home = $app->home;
107	104	$app = $app->home(Mojo::Home->new);
...	...	@@ -112,7 +109,7 @@ which stringifies to the actual path.
112	109	# Generate portable path relative to home directory
113	110	my $path = $app->home->rel_file('data/important.txt');
114	111
115		-=head2 C<log>
	112	+=head2 log
116	113
117	114	my $log = $app->log;
118	115	$app = $app->log(Mojo::Log->new);
...	...	@@ -122,7 +119,7 @@ The logging layer of your application, defaults to a L<Mojo::Log> object.
122	119	# Log debug message
123	120	$app->log->debug('It works!');
124	121
125		-=head2 C<ua>
	122	+=head2 ua
126	123
127	124	my $ua = $app->ua;
128	125	$app = $app->ua(Mojo::UserAgent->new);
...	...	@@ -140,21 +137,21 @@ interfere with new blocking ones.
140	137	L<Mojo> inherits all methods from L<Mojo::Base> and implements the following
141	138	new ones.
142	139
143		-=head2 C<new>
	140	+=head2 new
144	141
145	142	my $app = Mojo->new;
146	143
147	144	Construct a new L<Mojo> application. Will automatically detect your home
148	145	directory and set up logging to C<log/mojo.log> if there's a C<log> directory.
149	146
150		-=head2 C<build_tx>
	147	+=head2 build_tx
151	148
152	149	my $tx = $app->build_tx;
153	150
154	151	Transaction builder, defaults to building a L<Mojo::Transaction::HTTP>
155	152	object.
156	153
157		-=head2 C<config>
	154	+=head2 config
158	155
159	156	my $config = $app->config;
160	157	my $foo = $app->config('foo');
...	...	@@ -168,7 +165,7 @@ Application configuration.
168	165	my $foo = $app->config->{foo};
169	166	delete $app->config->{foo};
170	167
171		-=head2 C<handler>
	168	+=head2 handler
172	169
173	170	$app->handler(Mojo::Transaction::HTTP->new);
174	171

...	...	@@ -40,18 +40,22 @@ Mojo::Asset - HTTP content storage base class
40	40
41	41	L<Mojo::Asset> is an abstract base class for HTTP content storage.
42	42
	43	+=head1 EVENTS
	44	+
	45	+L<Mojo::Asset> inherits all events from L<Mojo::EventEmitter>.
	46	+
43	47	=head1 ATTRIBUTES
44	48
45	49	L<Mojo::Asset> implements the following attributes.
46	50
47		-=head2 C<end_range>
	51	+=head2 end_range
48	52
49	53	my $end = $asset->end_range;
50	54	$asset = $asset->end_range(8);
51	55
52	56	Pretend file ends earlier.
53	57
54		-=head2 C<start_range>
	58	+=head2 start_range
55	59
56	60	my $start = $asset->start_range;
57	61	$asset = $asset->start_range(0);
...	...	@@ -63,53 +67,53 @@ Pretend file starts later.
63	67	L<Mojo::Asset> inherits all methods from L<Mojo::EventEmitter> and implements
64	68	the following new ones.
65	69
66		-=head2 C<add_chunk>
	70	+=head2 add_chunk
67	71
68	72	$asset = $asset->add_chunk('foo bar baz');
69	73
70	74	Add chunk of data to asset. Meant to be overloaded in a subclass.
71	75
72		-=head2 C<contains>
	76	+=head2 contains
73	77
74	78	my $position = $asset->contains('bar');
75	79
76	80	Check if asset contains a specific string. Meant to be overloaded in a
77	81	subclass.
78	82
79		-=head2 C<get_chunk>
	83	+=head2 get_chunk
80	84
81		- my $chunk = $asset->get_chunk($offset);
	85	+ my $bytes = $asset->get_chunk($offset);
82	86
83	87	Get chunk of data starting from a specific position. Meant to be overloaded
84	88	in a subclass.
85	89
86		-=head2 C<is_file>
	90	+=head2 is_file
87	91
88	92	my $false = $asset->is_file;
89	93
90	94	False.
91	95
92		-=head2 C<is_range>
	96	+=head2 is_range
93	97
94	98	my $success = $asset->is_range;
95	99
96	100	Check if asset has a C<start_range> or C<end_range>.
97	101
98		-=head2 C<move_to>
	102	+=head2 move_to
99	103
100	104	$asset = $asset->move_to('/home/sri/foo.txt');
101	105
102	106	Move asset data into a specific file. Meant to be overloaded in a subclass.
103	107
104		-=head2 C<size>
	108	+=head2 size
105	109
106	110	my $size = $asset->size;
107	111
108	112	Size of asset data in bytes. Meant to be overloaded in a subclass.
109	113
110		-=head2 C<slurp>
	114	+=head2 slurp
111	115
112		- my $string = $asset->slurp;
	116	+ my $bytes = $asset->slurp;
113	117
114	118	Read all asset data at once. Meant to be overloaded in a subclass.
115	119

...	...	@@ -5,7 +5,7 @@ use Carp 'croak';
5	5	use Errno 'EEXIST';
6	6	use Fcntl qw(O_CREAT O_EXCL O_RDWR);
7	7	use File::Copy 'move';
8		-use File::Spec;
	8	+use File::Spec::Functions 'catfile';
9	9	use IO::File;
10	10	use Mojo::Util 'md5_sum';
11	11
...	...	@@ -17,12 +17,12 @@ has handle => sub {
17	17	my $handle = IO::File->new;
18	18	my $path = $self->path;
19	19	if (defined $path && -f $path) {
20		- $handle->open("< $path") or croak qq{Can't open file "$path": $!};
	20	+ $handle->open($path, '<') or croak qq{Can't open file "$path": $!};
21	21	return $handle;
22	22	}
23	23
24	24	# Open new or temporary file
25		- my $base = File::Spec->catfile($self->tmpdir, 'mojo.tmp');
	25	+ my $base = catfile File::Spec::Functions::tmpdir, 'mojo.tmp';
26	26	my $name = defined $path ? $path : $base;
27	27	until ($handle->open($name, O_CREAT \| O_EXCL \| O_RDWR)) {
28	28	croak qq{Can't open file "$name": $!} if defined $path \|\| $! != $!{EEXIST};
...	...	@@ -35,7 +35,7 @@ has handle => sub {
35	35
36	36	return $handle;
37	37	};
38		-has tmpdir => sub { $ENV{MOJO_TMPDIR} \|\| File::Spec->tmpdir };
	38	+has tmpdir => sub { $ENV{MOJO_TMPDIR} \|\| File::Spec::Functions::tmpdir };
39	39
40	40	sub DESTROY {
41	41	my $self = shift;
...	...	@@ -59,7 +59,6 @@ sub add_chunk {
59	59	sub contains {
60	60	my ($self, $string) = @_;
61	61
62		- # Seek to start
63	62	my $handle = $self->handle;
64	63	$handle->sysseek($self->start_range, SEEK_SET);
65	64
...	...	@@ -95,12 +94,10 @@ sub contains {
95	94	sub get_chunk {
96	95	my ($self, $start) = @_;
97	96
98		- # Seek to start
99	97	$start += $self->start_range;
100	98	my $handle = $self->handle;
101	99	$handle->sysseek($start, SEEK_SET);
102	100
103		- # Range support
104	101	my $buffer;
105	102	if (defined(my $end = $self->end_range)) {
106	103	my $chunk = $end + 1 - $start;
...	...	@@ -165,26 +162,30 @@ Mojo::Asset::File - File storage for HTTP content
165	162
166	163	L<Mojo::Asset::File> is a file storage backend for HTTP content.
167	164
	165	+=head1 EVENTS
	166	+
	167	+L<Mojo::Asset::File> inherits all events from L<Mojo::Asset>.
	168	+
168	169	=head1 ATTRIBUTES
169	170
170	171	L<Mojo::Asset::File> inherits all attributes from L<Mojo::Asset> and
171	172	implements the following new ones.
172	173
173		-=head2 C<cleanup>
	174	+=head2 cleanup
174	175
175	176	my $cleanup = $file->cleanup;
176	177	$file = $file->cleanup(1);
177	178
178	179	Delete file automatically once it's not used anymore.
179	180
180		-=head2 C<handle>
	181	+=head2 handle
181	182
182	183	my $handle = $file->handle;
183	184	$file = $file->handle(IO::File->new);
184	185
185	186	File handle, created on demand.
186	187
187		-=head2 C<path>
	188	+=head2 path
188	189
189	190	my $path = $file->path;
190	191	$file = $file->path('/home/sri/foo.txt');
...	...	@@ -192,7 +193,7 @@ File handle, created on demand.
192	193	File path used to create C<handle>, can also be automatically generated if
193	194	necessary.
194	195
195		-=head2 C<tmpdir>
	196	+=head2 tmpdir
196	197
197	198	my $tmpdir = $file->tmpdir;
198	199	$file = $file->tmpdir('/tmp');
...	...	@@ -205,45 +206,45 @@ C<MOJO_TMPDIR> environment variable or auto detection.
205	206	L<Mojo::Asset::File> inherits all methods from L<Mojo::Asset> and implements
206	207	the following new ones.
207	208
208		-=head2 C<add_chunk>
	209	+=head2 add_chunk
209	210
210	211	$file = $file->add_chunk('foo bar baz');
211	212
212	213	Add chunk of data.
213	214
214		-=head2 C<contains>
	215	+=head2 contains
215	216
216	217	my $position = $file->contains('bar');
217	218
218	219	Check if asset contains a specific string.
219	220
220		-=head2 C<get_chunk>
	221	+=head2 get_chunk
221	222
222		- my $chunk = $file->get_chunk($start);
	223	+ my $bytes = $file->get_chunk($start);
223	224
224	225	Get chunk of data starting from a specific position.
225	226
226		-=head2 C<is_file>
	227	+=head2 is_file
227	228
228	229	my $true = $file->is_file;
229	230
230	231	True.
231	232
232		-=head2 C<move_to>
	233	+=head2 move_to
233	234
234	235	$file = $file->move_to('/home/sri/bar.txt');
235	236
236	237	Move asset data into a specific file and disable C<cleanup>.
237	238
238		-=head2 C<size>
	239	+=head2 size
239	240
240	241	my $size = $file->size;
241	242
242	243	Size of asset data in bytes.
243	244
244		-=head2 C<slurp>
	245	+=head2 slurp
245	246
246		- my $string = $file->slurp;
	247	+ my $bytes = $file->slurp;
247	248
248	249	Read all asset data at once.
249	250

...	...	@@ -73,9 +73,10 @@ L<Mojo::Asset::Memory> is an in-memory storage backend for HTTP content.
73	73
74	74	=head1 EVENTS
75	75
76		-L<Mojo::Asset::Memory> can emit the following events.
	76	+L<Mojo::Asset::Memory> inherits all events from L<Mojo::Asset> and can emit
	77	+the following new ones.
77	78
78		-=head2 C<upgrade>
	79	+=head2 upgrade
79	80
80	81	$mem->on(upgrade => sub {
81	82	my ($mem, $file) = @_;
...	...	@@ -94,7 +95,7 @@ Emitted when asset gets upgraded to a L<Mojo::Asset::File> object.
94	95	L<Mojo::Asset::Memory> inherits all attributes from L<Mojo::Asset> and
95	96	implements the following new ones.
96	97
97		-=head2 C<auto_upgrade>
	98	+=head2 auto_upgrade
98	99
99	100	my $upgrade = $mem->auto_upgrade;
100	101	$mem = $mem->auto_upgrade(1);
...	...	@@ -102,7 +103,7 @@ implements the following new ones.
102	103	Try to detect if content size exceeds C<max_memory_size> limit and
103	104	automatically upgrade to a L<Mojo::Asset::File> object.
104	105
105		-=head2 C<max_memory_size>
	106	+=head2 max_memory_size
106	107
107	108	my $size = $mem->max_memory_size;
108	109	$mem = $mem->max_memory_size(1024);
...	...	@@ -116,46 +117,46 @@ C<MOJO_MAX_MEMORY_SIZE> environment variable or C<262144>.
116	117	L<Mojo::Asset::Memory> inherits all methods from L<Mojo::Asset> and implements
117	118	the following new ones.
118	119
119		-=head2 C<new>
	120	+=head2 new
120	121
121	122	my $mem = Mojo::Asset::Memory->new;
122	123
123	124	Construct a new L<Mojo::Asset::Memory> object.
124	125
125		-=head2 C<add_chunk>
	126	+=head2 add_chunk
126	127
127	128	$mem = $mem->add_chunk('foo bar baz');
128	129	my $file = $mem->add_chunk('abc' x 262144);
129	130
130	131	Add chunk of data and upgrade to L<Mojo::Asset::File> object if necessary.
131	132
132		-=head2 C<contains>
	133	+=head2 contains
133	134
134	135	my $position = $mem->contains('bar');
135	136
136	137	Check if asset contains a specific string.
137	138
138		-=head2 C<get_chunk>
	139	+=head2 get_chunk
139	140
140		- my $chunk = $mem->get_chunk($offset);
	141	+ my $bytes = $mem->get_chunk($offset);
141	142
142	143	Get chunk of data starting from a specific position.
143	144
144		-=head2 C<move_to>
	145	+=head2 move_to
145	146
146	147	$mem = $mem->move_to('/home/sri/foo.txt');
147	148
148	149	Move asset data into a specific file.
149	150
150		-=head2 C<size>
	151	+=head2 size
151	152
152	153	my $size = $mem->size;
153	154
154	155	Size of asset data in bytes.
155	156
156		-=head2 C<slurp>
	157	+=head2 slurp
157	158
158		- my $string = mem->slurp;
	159	+ my $bytes = mem->slurp;
159	160
160	161	Read all asset data at once.
161	162

...	...	@@ -2,8 +2,6 @@ package Mojo::Base;
2	2
3	3	use strict;
4	4	use warnings;
5		-
6		-# Mojo modules are modern!
7	5	use utf8;
8	6
9	7	# No imports because we get subclassed, a lot!
...	...	@@ -16,8 +14,6 @@ use IO::Handle ();
16	14	sub import {
17	15	my $class = shift;
18	16	return unless my $flag = shift;
19		-
20		- # No limits!
21	17	no strict 'refs';
22	18
23	19	# Base
...	...	@@ -37,8 +33,6 @@ sub import {
37	33	if ($flag) {
38	34	my $caller = caller;
39	35	push @{"${caller}::ISA"}, $flag;
40		-
41		- # Can haz?
42	36	*{"${caller}::has"} = sub { attr($caller, @_) };
43	37	}
44	38
...	...	@@ -64,14 +58,12 @@ sub attr {
64	58	my ($class, $attrs, $default) = @_;
65	59	return unless ($class = ref $class \|\| $class) && $attrs;
66	60
67		- # Check default
68		- Carp::croak('Default has to be a code reference or constant value')
	61	+ Carp::croak 'Default has to be a code reference or constant value'
69	62	if ref $default && ref $default ne 'CODE';
70	63
71		- # Create attributes
	64	+ # Compile attributes
72	65	for my $attr (@{ref $attrs eq 'ARRAY' ? $attrs : [$attrs]}) {
73		- Carp::croak(qq{Attribute "$attr" invalid})
74		- unless $attr =~ /^[a-zA-Z_]\w*$/;
	66	+ Carp::croak qq{Attribute "$attr" invalid} unless $attr =~ /^[a-zA-Z_]\w*$/;
75	67
76	68	# Header (check arguments)
77	69	my $code = "package $class;\nsub $attr {\n if (\@_ == 1) {\n";
...	...	@@ -100,7 +92,7 @@ sub attr {
100	92	# We compile custom attribute code for speed
101	93	no strict 'refs';
102	94	warn "-- Attribute $attr in $class\n$code\n\n" if $ENV{MOJO_BASE_DEBUG};
103		- Carp::croak("Mojo::Base error: $@") unless eval "$code;1";
	95	+ Carp::croak "Mojo::Base error: $@" unless eval "$code;1";
104	96	}
105	97	}
106	98
...	...	@@ -184,7 +176,7 @@ All three forms save a lot of typing.
184	176	L<Mojo::Base> exports the following functions if imported with the C<-base>
185	177	flag or a base class.
186	178
187		-=head2 C<has>
	179	+=head2 has
188	180
189	181	has 'name';
190	182	has [qw(name1 name2 name3)];
...	...	@@ -199,7 +191,7 @@ Create attributes for hash-based objects, just like the C<attr> method.
199	191
200	192	L<Mojo::Base> implements the following methods.
201	193
202		-=head2 C<new>
	194	+=head2 new
203	195
204	196	my $object = BaseSubClass->new;
205	197	my $object = BaseSubClass->new(name => 'value');
...	...	@@ -208,7 +200,7 @@ L<Mojo::Base> implements the following methods.
208	200	This base class provides a basic constructor for hash-based objects. You can
209	201	pass it either a hash or a hash reference with attribute values.
210	202
211		-=head2 C<attr>
	203	+=head2 attr
212	204
213	205	$object->attr('name');
214	206	BaseSubClass->attr('name');
...	...	@@ -225,7 +217,7 @@ be excuted at accessor read time if there's no set value. Accessors can be
225	217	chained, that means they return their invocant when they are called with an
226	218	argument.
227	219
228		-=head2 C<tap>
	220	+=head2 tap
229	221
230	222	$object = $object->tap(sub {...});
231	223

...	...	@@ -11,10 +11,11 @@ our @EXPORT_OK = ('b');
11	11	# Turn most functions from Mojo::Util into methods
12	12	my @UTILS = (
13	13	qw(b64_decode b64_encode camelize decamelize hmac_md5_sum hmac_sha1_sum),
14		- qw(html_escape html_unescape md5_bytes md5_sum punycode_decode),
15		- qw(punycode_encode quote sha1_bytes sha1_sum slurp spurt squish trim),
16		- qw(unquote url_escape url_unescape xml_escape xor_encode)
	14	+ qw(html_unescape md5_bytes md5_sum punycode_decode punycode_encode quote),
	15	+ qw(sha1_bytes sha1_sum slurp spurt squish trim unquote url_escape),
	16	+ qw(url_unescape xml_escape xor_encode)
17	17	);
	18	+push @UTILS, 'html_escape'; # DEPRECATED in Rainbow!
18	19	for my $name (@UTILS) {
19	20	my $sub = Mojo::Util->can($name);
20	21	Mojo::Util::monkey_patch __PACKAGE__, $name, sub {
...	...	@@ -85,7 +86,7 @@ Mojo::ByteStream - ByteStream
85	86
86	87	# Use the alternative constructor
87	88	use Mojo::ByteStream 'b';
88		- my $stream = b('foobarbaz')->html_escape;
	89	+ my $stream = b('foobarbaz')->b64_encode('')->say;
89	90
90	91	=head1 DESCRIPTION
91	92
...	...	@@ -96,7 +97,7 @@ manipulation functions in L<Mojo::Util>.
96	97
97	98	L<Mojo::ByteStream> implements the following functions.
98	99
99		-=head2 C<b>
	100	+=head2 b
100	101
101	102	my $stream = b('test123');
102	103
...	...	@@ -107,19 +108,19 @@ Construct a new scalar-based L<Mojo::ByteStream> object.
107	108	L<Mojo::ByteStream> inherits all methods from L<Mojo::Base> and implements the
108	109	following new ones.
109	110
110		-=head2 C<new>
	111	+=head2 new
111	112
112	113	my $stream = Mojo::ByteStream->new('test123');
113	114
114	115	Construct a new scalar-based L<Mojo::ByteStream> object.
115	116
116		-=head2 C<b64_decode>
	117	+=head2 b64_decode
117	118
118	119	$stream = $stream->b64_decode;
119	120
120	121	Base64 decode bytestream with L<Mojo::Util/"b64_decode">.
121	122
122		-=head2 C<b64_encode>
	123	+=head2 b64_encode
123	124
124	125	$stream = $stream->b64_encode;
125	126	$stream = $stream->b64_encode("\n");
...	...	@@ -128,25 +129,25 @@ Base64 encode bytestream with L<Mojo::Util/"b64_encode">.
128	129
129	130	b('foo bar baz')->b64_encode('')->say;
130	131
131		-=head2 C<camelize>
	132	+=head2 camelize
132	133
133	134	$stream = $stream->camelize;
134	135
135	136	Camelize bytestream with L<Mojo::Util/"camelize">.
136	137
137		-=head2 C<clone>
	138	+=head2 clone
138	139
139	140	my $stream2 = $stream->clone;
140	141
141	142	Clone bytestream.
142	143
143		-=head2 C<decamelize>
	144	+=head2 decamelize
144	145
145	146	$stream = $stream->decamelize;
146	147
147	148	Decamelize bytestream with L<Mojo::Util/"decamelize">.
148	149
149		-=head2 C<decode>
	150	+=head2 decode
150	151
151	152	$stream = $stream->decode;
152	153	$stream = $stream->decode('iso-8859-1');
...	...	@@ -155,7 +156,7 @@ Decode bytestream with L<Mojo::Util/"decode">, defaults to C<UTF-8>.
155	156
156	157	$stream->decode('UTF-16LE')->unquote->trim->say;
157	158
158		-=head2 C<encode>
	159	+=head2 encode
159	160
160	161	$stream = $stream->encode;
161	162	$stream = $stream->encode('iso-8859-1');
...	...	@@ -164,13 +165,13 @@ Encode bytestream with L<Mojo::Util/"encode">, defaults to C<UTF-8>.
164	165
165	166	$stream->trim->quote->encode->say;
166	167
167		-=head2 C<hmac_md5_sum>
	168	+=head2 hmac_md5_sum
168	169
169	170	$stream = $stream->hmac_md5_sum('passw0rd');
170	171
171	172	Generate HMAC-MD5 checksum for bytestream with L<Mojo::Util/"hmac_md5_sum">.
172	173
173		-=head2 C<hmac_sha1_sum>
	174	+=head2 hmac_sha1_sum
174	175
175	176	$stream = $stream->hmac_sha1_sum('passw0rd');
176	177
...	...	@@ -178,16 +179,7 @@ Generate HMAC-SHA1 checksum for bytestream with L<Mojo::Util/"hmac_sha1_sum">.
178	179
179	180	b('foo bar baz')->hmac_sha1_sum('secr3t')->quote->say;
180	181
181		-=head2 C<html_escape>
182		-
183		- $stream = $stream->html_escape;
184		- $stream = $stream->html_escape('^\n\r\t !#$%(-;=?-~');
185		-
186		-Escape unsafe characters in bytestream with L<Mojo::Util/"html_escape">.
187		-
188		- b('<html>')->html_escape->say;
189		-
190		-=head2 C<html_unescape>
	182	+=head2 html_unescape
191	183
192	184	$stream = $stream->html_unescape;
193	185
...	...	@@ -195,44 +187,44 @@ Unescape all HTML entities in bytestream with L<Mojo::Util/"html_unescape">.
195	187
196	188	b('<html>')->html_unescape->url_escape->say;
197	189
198		-=head2 C<md5_bytes>
	190	+=head2 md5_bytes
199	191
200	192	$stream = $stream->md5_bytes;
201	193
202	194	Generate binary MD5 checksum for bytestream with L<Mojo::Util/"md5_bytes">.
203	195
204		-=head2 C<md5_sum>
	196	+=head2 md5_sum
205	197
206	198	$stream = $stream->md5_sum;
207	199
208	200	Generate MD5 checksum for bytestream with L<Mojo::Util/"md5_sum">.
209	201
210		-=head2 C<punycode_decode>
	202	+=head2 punycode_decode
211	203
212	204	$stream = $stream->punycode_decode;
213	205
214	206	Punycode decode bytestream with L<Mojo::Util/"punycode_decode">.
215	207
216		-=head2 C<punycode_encode>
	208	+=head2 punycode_encode
217	209
218	210	$stream = $stream->punycode_encode;
219	211
220	212	Punycode encode bytestream with L<Mojo::Util/"punycode_encode">.
221	213
222		-=head2 C<quote>
	214	+=head2 quote
223	215
224	216	$stream = $stream->quote;
225	217
226	218	Quote bytestream with L<Mojo::Util/"quote">.
227	219
228		-=head2 C<say>
	220	+=head2 say
229	221
230	222	$stream->say;
231	223	$stream->say(*STDERR);
232	224
233	225	Print bytestream to handle and append a newline, defaults to C<STDOUT>.
234	226
235		-=head2 C<secure_compare>
	227	+=head2 secure_compare
236	228
237	229	my $success = $stream->secure_compare($string);
238	230
...	...	@@ -240,25 +232,25 @@ Compare bytestream with L<Mojo::Util/"secure_compare">.
240	232
241	233	say 'Match!' if b('foo')->secure_compare('foo');
242	234
243		-=head2 C<sha1_bytes>
	235	+=head2 sha1_bytes
244	236
245	237	$stream = $stream->sha1_bytes;
246	238
247	239	Generate binary SHA1 checksum for bytestream with L<Mojo::Util/"sha1_bytes">.
248	240
249		-=head2 C<sha1_sum>
	241	+=head2 sha1_sum
250	242
251	243	$stream = $stream->sha1_sum;
252	244
253	245	Generate SHA1 checksum for bytestream with L<Mojo::Util/"sha1_sum">.
254	246
255		-=head2 C<size>
	247	+=head2 size
256	248
257	249	my $size = $stream->size;
258	250
259	251	Size of bytestream.
260	252
261		-=head2 C<slurp>
	253	+=head2 slurp
262	254
263	255	$stream = $stream->slurp;
264	256
...	...	@@ -266,7 +258,7 @@ Read all data at once from file into bytestream with L<Mojo::Util/"slurp">.
266	258
267	259	b('/home/sri/myapp.pl')->slurp->split("\n")->shuffle->join("\n")->say;
268	260
269		-=head2 C<spurt>
	261	+=head2 spurt
270	262
271	263	$stream = $stream->spurt('/home/sri/myapp.pl');
272	264
...	...	@@ -274,7 +266,7 @@ Write all data from bytestream at once to file with L<Mojo::Util/"spurt">.
274	266
275	267	b('/home/sri/foo.txt')->slurp->squish->spurt('/home/sri/bar.txt');
276	268
277		-=head2 C<split>
	269	+=head2 split
278	270
279	271	my $collection = $stream->split(',');
280	272
...	...	@@ -282,7 +274,7 @@ Turn bytestream into L<Mojo::Collection>.
282	274
283	275	b('a,b,c')->split(',')->pluck('quote')->join(',')->say;
284	276
285		-=head2 C<squish>
	277	+=head2 squish
286	278
287	279	$stream = $stream->squish;
288	280
...	...	@@ -290,27 +282,27 @@ Trim whitespace characters from both ends of bytestream and then change all
290	282	consecutive groups of whitespace into one space each with
291	283	L<Mojo::Util/"squish">.
292	284
293		-=head2 C<to_string>
	285	+=head2 to_string
294	286
295	287	my $string = $stream->to_string;
296	288	my $string = "$stream";
297	289
298	290	Stringify bytestream.
299	291
300		-=head2 C<trim>
	292	+=head2 trim
301	293
302	294	$stream = $stream->trim;
303	295
304	296	Trim whitespace characters from both ends of bytestream with
305	297	L<Mojo::Util/"trim">.
306	298
307		-=head2 C<unquote>
	299	+=head2 unquote
308	300
309	301	$stream = $stream->unquote;
310	302
311	303	Unquote bytestream with L<Mojo::Util/"unquote">.
312	304
313		-=head2 C<url_escape>
	305	+=head2 url_escape
314	306
315	307	$stream = $stream->url_escape;
316	308	$stream = $stream->url_escape('^A-Za-z0-9\-._~');
...	...	@@ -320,23 +312,23 @@ L<Mojo::Util/"url_escape">.
320	312
321	313	b('foo bar baz')->url_escape->say;
322	314
323		-=head2 C<url_unescape>
	315	+=head2 url_unescape
324	316
325	317	$stream = $stream->url_unescape;
326	318
327	319	Decode percent encoded characters in bytestream with
328	320	L<Mojo::Util/"url_unescape">.
329	321
330		- b('%3Chtml%3E')->url_unescape->html_escape->say;
	322	+ b('%3Chtml%3E')->url_unescape->xml_escape->say;
331	323
332		-=head2 C<xml_escape>
	324	+=head2 xml_escape
333	325
334	326	$stream = $stream->xml_escape;
335	327
336	328	Escape only the characters C<&>, C<E<lt>>, C<E<gt>>, C<"> and C<'> in
337	329	bytestream with L<Mojo::Util/"xml_escape">.
338	330
339		-=head2 C<xor_encode>
	331	+=head2 xor_encode
340	332
341	333	$stream = $stream->xor_encode($key);
342	334

...	...	@@ -8,7 +8,6 @@ sub get { (shift->{cache} \|\| {})->{shift()} }
8	8	sub set {
9	9	my ($self, $key, $value) = @_;
10	10
11		- # Cache with size limit
12	11	my $cache = $self->{cache} \|\|= {};
13	12	my $queue = $self->{queue} \|\|= [];
14	13	delete $cache->{shift @$queue} if @$queue >= $self->max_keys;
...	...	@@ -40,7 +39,7 @@ L<Mojo::Cache> is a naive in-memory cache with size limits.
40	39
41	40	L<Mojo::Cache> implements the following attributes.
42	41
43		-=head2 C<max_keys>
	42	+=head2 max_keys
44	43
45	44	my $max = $cache->max_keys;
46	45	$cache = $cache->max_keys(50);
...	...	@@ -52,13 +51,13 @@ Maximum number of cache keys, defaults to C<100>.
52	51	L<Mojo::Cache> inherits all methods from L<Mojo::Base> and implements the
53	52	following new ones.
54	53
55		-=head2 C<get>
	54	+=head2 get
56	55
57	56	my $value = $cache->get('foo');
58	57
59	58	Get cached value.
60	59
61		-=head2 C<set>
	60	+=head2 set
62	61
63	62	$cache = $cache->set(foo => 'bar');
64	63

...	...	@@ -112,7 +112,7 @@ L<Mojo::Collection> is a container for collections.
112	112
113	113	L<Mojo::Collection> implements the following functions.
114	114
115		-=head2 C<c>
	115	+=head2 c
116	116
117	117	my $collection = c(1, 2, 3);
118	118
...	...	@@ -123,13 +123,13 @@ Construct a new array-based L<Mojo::Collection> object.
123	123	L<Mojo::Collection> inherits all methods from L<Mojo::Base> and implements the
124	124	following new ones.
125	125
126		-=head2 C<new>
	126	+=head2 new
127	127
128	128	my $collection = Mojo::Collection->new(1, 2, 3);
129	129
130	130	Construct a new array-based L<Mojo::Collection> object.
131	131
132		-=head2 C<each>
	132	+=head2 each
133	133
134	134	my @elements = $collection->each;
135	135	$collection = $collection->each(sub {...});
...	...	@@ -141,7 +141,7 @@ Evaluate callback for each element in collection.
141	141	say "$count: $e";
142	142	});
143	143
144		-=head2 C<first>
	144	+=head2 first
145	145
146	146	my $first = $collection->first;
147	147	my $first = $collection->first(qr/foo/);
...	...	@@ -153,7 +153,7 @@ callback returned true.
153	153
154	154	my $five = $collection->first(sub { $_ == 5 });
155	155
156		-=head2 C<grep>
	156	+=head2 grep
157	157
158	158	my $new = $collection->grep(qr/foo/);
159	159	my $new = $collection->grep(sub {...});
...	...	@@ -164,7 +164,7 @@ or for which the callback returned true.
164	164
165	165	my $interesting = $collection->grep(qr/mojo/i);
166	166
167		-=head2 C<join>
	167	+=head2 join
168	168
169	169	my $stream = $collection->join("\n");
170	170
...	...	@@ -172,7 +172,7 @@ Turn collection into L<Mojo::ByteStream>.
172	172
173	173	$collection->join("\n")->say;
174	174
175		-=head2 C<map>
	175	+=head2 map
176	176
177	177	my $new = $collection->map(sub {...});
178	178
...	...	@@ -181,7 +181,7 @@ from the results.
181	181
182	182	my $doubled = $collection->map(sub { $_ * 2 });
183	183
184		-=head2 C<pluck>
	184	+=head2 pluck
185	185
186	186	my $new = $collection->pluck($method);
187	187	my $new = $collection->pluck($method, @args);
...	...	@@ -192,31 +192,31 @@ results.
192	192	# Equal to but more convenient than
193	193	my $new = $collection->map(sub { $_->$method(@args) });
194	194
195		-=head2 C<reverse>
	195	+=head2 reverse
196	196
197	197	my $new = $collection->reverse;
198	198
199	199	Create a new collection with all elements in reverse order.
200	200
201		-=head2 C<slice>
	201	+=head2 slice
202	202
203	203	my $new = $collection->slice(4 .. 7);
204	204
205	205	Create a new collection with all selected elements.
206	206
207		-=head2 C<shuffle>
	207	+=head2 shuffle
208	208
209	209	my $new = $collection->shuffle;
210	210
211	211	Create a new collection with all elements in random order.
212	212
213		-=head2 C<size>
	213	+=head2 size
214	214
215	215	my $size = $collection->size;
216	216
217	217	Number of elements in collection.
218	218
219		-=head2 C<sort>
	219	+=head2 sort
220	220
221	221	my $new = $collection->sort;
222	222	my $new = $collection->sort(sub {...});
...	...	@@ -226,7 +226,7 @@ from the results.
226	226
227	227	my $insensitive = $collection->sort(sub { uc(shift) cmp uc(shift) });
228	228
229		-=head2 C<uniq>
	229	+=head2 uniq
230	230
231	231	my $new = $collection->uniq;
232	232

...	...	@@ -40,14 +40,9 @@ sub clone {
40	40	sub generate_body_chunk {
41	41	my ($self, $offset) = @_;
42	42
43		- # Drain
44	43	$self->emit(drain => $offset)
45	44	if !delete $self->{delay} && !length(defined $self->{body_buffer} ? $self->{body_buffer} : '');
46		-
47		- # Get chunk
48		- my $chunk = do { my $tmp = (delete $self->{body_buffer}); defined $tmp ? $tmp : '' };
49		-
50		- # EOF or delay
	45	+ my $chunk = do { my $tmp = delete $self->{body_buffer}; defined $tmp ? $tmp : '' };
51	46	return $self->{eof} ? '' : undef unless length $chunk;
52	47
53	48	return $chunk;
...	...	@@ -92,12 +87,12 @@ sub leftovers { shift->{buffer} }
92	87	sub parse {
93	88	my $self = shift;
94	89
95		- # Parse headers
	90	+ # Headers
96	91	$self->_parse_until_body(@_);
97	92	return $self if $self->{state} eq 'headers';
98	93	$self->emit('body') unless $self->{body}++;
99	94
100		- # Parse chunked content
	95	+ # Chunked content
101	96	$self->{real_size} = defined $self->{real_size} ? $self->{real_size} : 0;
102	97	if ($self->is_chunked && $self->{state} ne 'headers') {
103	98	$self->_parse_chunked;
...	...	@@ -130,7 +125,7 @@ sub parse {
130	125
131	126	# Chunked or relaxed content
132	127	if ($self->is_chunked \|\| $self->relaxed) {
133		- $self->{size} += length(defined $self->{buffer} ? $self->{buffer} : '');
	128	+ $self->{size} += length($self->{buffer} = defined $self->{buffer} ? $self->{buffer} : '');
134	129	$self->_uncompress($self->{buffer});
135	130	$self->{buffer} = '';
136	131	}
...	...	@@ -140,12 +135,11 @@ sub parse {
140	135	my $len = $headers->content_length \|\| 0;
141	136	$self->{size} \|\|= 0;
142	137	if ((my $need = $len - $self->{size}) > 0) {
143		- my $chunk = substr $self->{buffer}, 0, $need, '';
	138	+ my $len = length $self->{buffer};
	139	+ my $chunk = substr $self->{buffer}, 0, $need > $len ? $len : $need, '';
144	140	$self->_uncompress($chunk);
145	141	$self->{size} += length $chunk;
146	142	}
147		-
148		- # Finished
149	143	$self->{state} = 'finished' if $len <= $self->progress;
150	144	}
151	145
...	...	@@ -168,19 +162,10 @@ sub progress {
168	162	sub write {
169	163	my ($self, $chunk, $cb) = @_;
170	164
171		- # Dynamic content
172	165	$self->{dynamic} = 1;
173		-
174		- # Add chunk
175	166	if (defined $chunk) { $self->{body_buffer} .= $chunk }
176		-
177		- # Delay
178		- else { $self->{delay} = 1 }
179		-
180		- # Drain
	167	+ else { $self->{delay} = 1 }
181	168	$self->once(drain => $cb) if $cb;
182		-
183		- # Finish
184	169	$self->{eof} = 1 if defined $chunk && $chunk eq '';
185	170
186	171	return $self;
...	...	@@ -188,23 +173,15 @@ sub write {
188	173
189	174	sub write_chunk {
190	175	my ($self, $chunk, $cb) = @_;
191		-
192		- # Chunked transfer encoding
193	176	$self->headers->transfer_encoding('chunked') unless $self->is_chunked;
194		-
195		- # Write
196	177	$self->write(defined $chunk ? $self->_build_chunk($chunk) : $chunk, $cb);
197		-
198		- # Finish
199	178	$self->{eof} = 1 if defined $chunk && $chunk eq '';
200		-
201	179	return $self;
202	180	}
203	181
204	182	sub _build {
205	183	my ($self, $method) = @_;
206	184
207		- # Build part from chunks
208	185	my $buffer = '';
209	186	my $offset = 0;
210	187	while (1) {
...	...	@@ -215,7 +192,6 @@ sub _build {
215	192	# End of part
216	193	last unless my $len = length $chunk;
217	194
218		- # Part
219	195	$offset += $len;
220	196	$buffer .= $chunk;
221	197	}
...	...	@@ -241,7 +217,6 @@ sub _parse_chunked {
241	217	return $self->_parse_chunked_trailing_headers
242	218	if (defined $self->{chunk_state} ? $self->{chunk_state} : '') eq 'trailing_headers';
243	219
244		- # Parse chunks
245	220	while (my $len = length $self->{pre_buffer}) {
246	221
247	222	# Start new chunk (ignore the chunk extension)
...	...	@@ -274,7 +249,6 @@ sub _parse_chunked {
274	249	sub _parse_chunked_trailing_headers {
275	250	my $self = shift;
276	251
277		- # Parse
278	252	my $headers = $self->headers->parse(delete $self->{pre_buffer});
279	253	return unless $headers->is_finished;
280	254	$self->{chunk_state} = 'finished';
...	...	@@ -287,7 +261,6 @@ sub _parse_chunked_trailing_headers {
287	261	sub _parse_headers {
288	262	my $self = shift;
289	263
290		- # Parse
291	264	my $headers = $self->headers->parse(delete $self->{pre_buffer});
292	265	return unless $headers->is_finished;
293	266	$self->{state} = 'body';
...	...	@@ -301,21 +274,13 @@ sub _parse_headers {
301	274	sub _parse_until_body {
302	275	my ($self, $chunk) = @_;
303	276
304		- # Add chunk
305	277	$self->{raw_size} += length($chunk = defined $chunk ? $chunk : '');
306	278	$self->{pre_buffer} .= $chunk;
307	279
308		- # Parser started
309	280	unless ($self->{state}) {
310		-
311		- # Update size
312	281	$self->{header_size} = $self->{raw_size} - length $self->{pre_buffer};
313		-
314		- # Headers
315		- $self->{state} = 'headers';
	282	+ $self->{state} = 'headers';
316	283	}
317		-
318		- # Parse headers
319	284	$self->_parse_headers if (defined $self->{state} ? $self->{state} : '') eq 'headers';
320	285	}
321	286
...	...	@@ -363,9 +328,10 @@ RFC 2616.
363	328
364	329	=head1 EVENTS
365	330
366		-L<Mojo::Content> can emit the following events.
	331	+L<Mojo::Content> inherits all events from L<Mojo::EventEmitter> and can emit
	332	+the following new ones.
367	333
368		-=head2 C<body>
	334	+=head2 body
369	335
370	336	$content->on(body => sub {
371	337	my $content = shift;
...	...	@@ -379,7 +345,7 @@ Emitted once all headers have been parsed and the body starts.
379	345	$content->auto_upgrade(0) if $content->headers->header('X-No-MultiPart');
380	346	});
381	347
382		-=head2 C<drain>
	348	+=head2 drain
383	349
384	350	$content->on(drain => sub {
385	351	my ($content, $offset) = @_;
...	...	@@ -393,10 +359,10 @@ Emitted once all data has been written.
393	359	$content->write_chunk(time);
394	360	});
395	361
396		-=head2 C<read>
	362	+=head2 read
397	363
398	364	$content->on(read => sub {
399		- my ($content, $chunk) = @_;
	365	+ my ($content, $bytes) = @_;
400	366	...
401	367	});
402	368
...	...	@@ -404,29 +370,29 @@ Emitted when a new chunk of content arrives.
404	370
405	371	$content->unsubscribe('read');
406	372	$content->on(read => sub {
407		- my ($content, $chunk) = @_;
408		- say "Streaming: $chunk";
	373	+ my ($content, $bytes) = @_;
	374	+ say "Streaming: $bytes";
409	375	});
410	376
411	377	=head1 ATTRIBUTES
412	378
413	379	L<Mojo::Content> implements the following attributes.
414	380
415		-=head2 C<auto_relax>
	381	+=head2 auto_relax
416	382
417	383	my $relax = $content->auto_relax;
418	384	$content = $content->auto_relax(1);
419	385
420	386	Try to detect when relaxed parsing is necessary.
421	387
422		-=head2 C<headers>
	388	+=head2 headers
423	389
424	390	my $headers = $content->headers;
425	391	$content = $content->headers(Mojo::Headers->new);
426	392
427	393	Content headers, defaults to a L<Mojo::Headers> object.
428	394
429		-=head2 C<max_buffer_size>
	395	+=head2 max_buffer_size
430	396
431	397	my $size = $content->max_buffer_size;
432	398	$content = $content->max_buffer_size(1024);
...	...	@@ -434,7 +400,7 @@ Content headers, defaults to a L<Mojo::Headers> object.
434	400	Maximum size in bytes of buffer for content parser, defaults to the value of
435	401	the C<MOJO_MAX_BUFFER_SIZE> environment variable or C<262144>.
436	402
437		-=head2 C<max_leftover_size>
	403	+=head2 max_leftover_size
438	404
439	405	my $size = $content->max_leftover_size;
440	406	$content = $content->max_leftover_size(1024);
...	...	@@ -442,7 +408,7 @@ the C<MOJO_MAX_BUFFER_SIZE> environment variable or C<262144>.
442	408	Maximum size in bytes of buffer for pipelined HTTP requests, defaults to the
443	409	value of the C<MOJO_MAX_LEFTOVER_SIZE> environment variable or C<262144>.
444	410
445		-=head2 C<relaxed>
	411	+=head2 relaxed
446	412
447	413	my $relaxed = $content->relaxed;
448	414	$content = $content->relaxed(1);
...	...	@@ -450,7 +416,7 @@ value of the C<MOJO_MAX_LEFTOVER_SIZE> environment variable or C<262144>.
450	416	Activate relaxed parsing for responses that are terminated with a connection
451	417	close.
452	418
453		-=head2 C<skip_body>
	419	+=head2 skip_body
454	420
455	421	my $skip = $content->skip_body;
456	422	$content = $content->skip_body(1);
...	...	@@ -462,159 +428,160 @@ Skip body parsing and finish after headers.
462	428	L<Mojo::Content> inherits all methods from L<Mojo::EventEmitter> and
463	429	implements the following new ones.
464	430
465		-=head2 C<body_contains>
	431	+=head2 body_contains
466	432
467	433	my $success = $content->body_contains('foo bar baz');
468	434
469	435	Check if content contains a specific string. Meant to be overloaded in a
470	436	subclass.
471	437
472		-=head2 C<body_size>
	438	+=head2 body_size
473	439
474	440	my $size = $content->body_size;
475	441
476	442	Content size in bytes. Meant to be overloaded in a subclass.
477	443
478		-=head2 C<boundary>
	444	+=head2 boundary
479	445
480	446	my $boundary = $content->boundary;
481	447
482	448	Extract multipart boundary from C<Content-Type> header.
483	449
484		-=head2 C<build_body>
	450	+=head2 build_body
485	451
486	452	my $string = $content->build_body;
487	453
488	454	Render whole body.
489	455
490		-=head2 C<build_headers>
	456	+=head2 build_headers
491	457
492	458	my $string = $content->build_headers;
493	459
494	460	Render all headers.
495	461
496		-=head2 C<charset>
	462	+=head2 charset
497	463
498	464	my $charset = $content->charset;
499	465
500	466	Extract charset from C<Content-Type> header.
501	467
502		-=head2 C<clone>
	468	+=head2 clone
503	469
504	470	my $clone = $content->clone;
505	471
506	472	Clone content if possible, otherwise return C<undef>.
507	473
508		-=head2 C<generate_body_chunk>
	474	+=head2 generate_body_chunk
509	475
510		- my $chunk = $content->generate_body_chunk(0);
	476	+ my $bytes = $content->generate_body_chunk(0);
511	477
512	478	Generate dynamic content.
513	479
514		-=head2 C<get_body_chunk>
	480	+=head2 get_body_chunk
515	481
516		- my $chunk = $content->get_body_chunk(0);
	482	+ my $bytes = $content->get_body_chunk(0);
517	483
518	484	Get a chunk of content starting from a specfic position. Meant to be
519	485	overloaded in a subclass.
520	486
521		-=head2 C<get_header_chunk>
	487	+=head2 get_header_chunk
522	488
523		- my $chunk = $content->get_header_chunk(13);
	489	+ my $bytes = $content->get_header_chunk(13);
524	490
525	491	Get a chunk of the headers starting from a specfic position.
526	492
527		-=head2 C<has_leftovers>
	493	+=head2 has_leftovers
528	494
529	495	my $success = $content->has_leftovers;
530	496
531	497	Check if there are leftovers.
532	498
533		-=head2 C<header_size>
	499	+=head2 header_size
534	500
535	501	my $size = $content->header_size;
536	502
537	503	Size of headers in bytes.
538	504
539		-=head2 C<is_chunked>
	505	+=head2 is_chunked
540	506
541	507	my $success = $content->is_chunked;
542	508
543	509	Check if content is chunked.
544	510
545		-=head2 C<is_compressed>
	511	+=head2 is_compressed
546	512
547	513	my $success = $content->is_compressed;
548	514
549	515	Check if content is C<gzip> compressed.
550	516
551		-=head2 C<is_dynamic>
	517	+=head2 is_dynamic
552	518
553	519	my $success = $content->is_dynamic;
554	520
555	521	Check if content will be dynamically generated, which prevents C<clone> from
556	522	working.
557	523
558		-=head2 C<is_finished>
	524	+=head2 is_finished
559	525
560	526	my $success = $content->is_finished;
561	527
562	528	Check if parser is finished.
563	529
564		-=head2 C<is_limit_exceeded>
	530	+=head2 is_limit_exceeded
565	531
566	532	my $success = $content->is_limit_exceeded;
567	533
568	534	Check if buffer has exceeded C<max_buffer_size>.
569	535
570		-=head2 C<is_multipart>
	536	+=head2 is_multipart
571	537
572	538	my $false = $content->is_multipart;
573	539
574	540	False.
575	541
576		-=head2 C<is_parsing_body>
	542	+=head2 is_parsing_body
577	543
578	544	my $success = $content->is_parsing_body;
579	545
580	546	Check if body parsing started yet.
581	547
582		-=head2 C<leftovers>
	548	+=head2 leftovers
583	549
584	550	my $bytes = $content->leftovers;
585	551
586	552	Get leftover data from content parser.
587	553
588		-=head2 C<parse>
	554	+=head2 parse
589	555
590		- $content = $content->parse("Content-Length: 12\r\n\r\nHello World!");
	556	+ $content
	557	+ = $content->parse("Content-Length: 12\x0d\x0a\x0d\x0aHello World!");
591	558
592	559	Parse content chunk.
593	560
594		-=head2 C<parse_body>
	561	+=head2 parse_body
595	562
596	563	$content = $content->parse_body('Hi!');
597	564
598	565	Parse body chunk and skip headers.
599	566
600		-=head2 C<progress>
	567	+=head2 progress
601	568
602	569	my $size = $content->progress;
603	570
604	571	Size of content already received from message in bytes.
605	572
606		-=head2 C<write>
	573	+=head2 write
607	574
608		- $content = $content->write('Hello!');
609		- $content = $content->write('Hello!' => sub {...});
	575	+ $content = $content->write($bytes);
	576	+ $content = $content->write($bytes => sub {...});
610	577
611	578	Write dynamic content non-blocking, the optional drain callback will be
612	579	invoked once all data has been written.
613	580
614		-=head2 C<write_chunk>
	581	+=head2 write_chunk
615	582
616		- $content = $content->write_chunk('Hello!');
617		- $content = $content->write_chunk('Hello!' => sub {...});
	583	+ $content = $content->write_chunk($bytes);
	584	+ $content = $content->write_chunk($bytes => sub {...});
618	585
619	586	Write dynamic content non-blocking with C<chunked> transfer encoding, the
620	587	optional drain callback will be invoked once all data has been written.

...	...	@@ -23,7 +23,7 @@ sub body_contains {
23	23	sub body_size {
24	24	my $self = shift;
25	25
26		- # Check for Content-Lenght header
	26	+ # Check for existing Content-Lenght header
27	27	my $content_len = $self->headers->content_length;
28	28	return $content_len if $content_len;
29	29
...	...	@@ -78,7 +78,7 @@ sub get_body_chunk {
78	78	my $len = $boundary_len - 2;
79	79	return substr "--$boundary\x0d\x0a", $offset if $len > $offset;
80	80
81		- # Parts
	81	+ # Prepare content part by part
82	82	my $parts = $self->parts;
83	83	for (my $i = 0; $i < @$parts; $i++) {
84	84	my $part = $parts->[$i];
...	...	@@ -150,8 +150,6 @@ sub _parse_multipart_boundary {
150	150	my $end = "\x0d\x0a--$boundary--";
151	151	if ((index $self->{multipart}, $end) == 0) {
152	152	substr $self->{multipart}, 0, length $end, '';
153		-
154		- # Finished
155	153	$self->{multi_state} = 'finished';
156	154	}
157	155
...	...	@@ -174,7 +172,6 @@ sub _parse_multipart_preamble {
174	172	sub _read {
175	173	my ($self, $chunk) = @_;
176	174
177		- # Parse
178	175	$self->{multipart} .= $chunk;
179	176	my $boundary = $self->boundary;
180	177	until (($self->{multi_state} = defined $self->{multi_state} ? $self->{multi_state} : 'multipart_preamble') eq 'finished') {
...	...	@@ -224,7 +221,7 @@ described in RFC 2616.
224	221	L<Mojo::Content::Multipart> inherits all events from L<Mojo::Content> and can
225	222	emit the following new ones.
226	223
227		-=head2 C<part>
	224	+=head2 part
228	225
229	226	$multi->on(part => sub {
230	227	my ($multi, $single) = @_;
...	...	@@ -244,7 +241,7 @@ Emitted when a new L<Mojo::Content::Single> part starts.
244	241	L<Mojo::Content::MultiPart> inherits all attributes from L<Mojo::Content> and
245	242	implements the following new ones.
246	243
247		-=head2 C<parts>
	244	+=head2 parts
248	245
249	246	my $parts = $multi->parts;
250	247	$multi = $multi->parts([]);
...	...	@@ -257,44 +254,44 @@ L<Mojo::Content::Single> objects.
257	254	L<Mojo::Content::MultiPart> inherits all methods from L<Mojo::Content> and
258	255	implements the following new ones.
259	256
260		-=head2 C<new>
	257	+=head2 new
261	258
262	259	my $multi = Mojo::Content::MultiPart->new;
263	260
264	261	Construct a new L<Mojo::Content::MultiPart> object and subscribe to C<read>
265	262	event with default content parser.
266	263
267		-=head2 C<body_contains>
	264	+=head2 body_contains
268	265
269	266	my $success = $multi->body_contains('foobarbaz');
270	267
271	268	Check if content parts contain a specific string.
272	269
273		-=head2 C<body_size>
	270	+=head2 body_size
274	271
275	272	my $size = $multi->body_size;
276	273
277	274	Content size in bytes.
278	275
279		-=head2 C<build_boundary>
	276	+=head2 build_boundary
280	277
281	278	my $boundary = $multi->build_boundary;
282	279
283	280	Generate a suitable boundary for content and add it to C<Content-Type> header.
284	281
285		-=head2 C<clone>
	282	+=head2 clone
286	283
287	284	my $clone = $multi->clone;
288	285
289	286	Clone content if possible, otherwise return C<undef>.
290	287
291		-=head2 C<get_body_chunk>
	288	+=head2 get_body_chunk
292	289
293		- my $chunk = $multi->get_body_chunk(0);
	290	+ my $bytes = $multi->get_body_chunk(0);
294	291
295	292	Get a chunk of content starting from a specfic position.
296	293
297		-=head2 C<is_multipart>
	294	+=head2 is_multipart
298	295
299	296	my $true = $multi->is_multipart;
300	297

...	...	@@ -9,7 +9,8 @@ has auto_upgrade => 1;
9	9
10	10	sub new {
11	11	my $self = shift->SUPER::new(@_);
12		- $self->{read} = $self->on(read => \&_read);
	12	+ $self->{read}
	13	+ = $self->on(read => sub { $_[0]->asset($_[0]->asset->add_chunk($_[1])) });
13	14	return $self;
14	15	}
15	16
...	...	@@ -29,11 +30,7 @@ sub clone {
29	30
30	31	sub get_body_chunk {
31	32	my ($self, $offset) = @_;
32		-
33		- # Body generator
34	33	return $self->generate_body_chunk($offset) if $self->{dynamic};
35		-
36		- # Normal content
37	34	return $self->asset->get_chunk($offset);
38	35	}
39	36
...	...	@@ -54,11 +51,6 @@ sub parse {
54	51	return $multi->parse;
55	52	}
56	53
57		-sub _read {
58		- my ($self, $chunk) = @_;
59		- $self->asset($self->asset->add_chunk($chunk));
60		-}
61		-
62	54	1;
63	55
64	56	=head1 NAME
...	...	@@ -70,7 +62,7 @@ Mojo::Content::Single - HTTP content
70	62	use Mojo::Content::Single;
71	63
72	64	my $single = Mojo::Content::Single->new;
73		- $single->parse("Content-Length: 12\r\n\r\nHello World!");
	65	+ $single->parse("Content-Length: 12\x0d\x0a\x0d\x0aHello World!");
74	66	say $single->headers->content_length;
75	67
76	68	=head1 DESCRIPTION
...	...	@@ -83,7 +75,7 @@ L<Mojo::Content::Single> is a container for HTTP content as described in RFC
83	75	L<Mojo::Content::Single> inherits all events from L<Mojo::Content> and can
84	76	emit the following new ones.
85	77
86		-=head2 C<upgrade>
	78	+=head2 upgrade
87	79
88	80	$single->on(upgrade => sub {
89	81	my ($single, $multi) = @_;
...	...	@@ -103,7 +95,7 @@ Emitted when content gets upgraded to a L<Mojo::Content::MultiPart> object.
103	95	L<Mojo::Content::Single> inherits all attributes from L<Mojo::Content> and
104	96	implements the following new ones.
105	97
106		-=head2 C<asset>
	98	+=head2 asset
107	99
108	100	my $asset = $single->asset;
109	101	$single = $single->asset(Mojo::Asset::Memory->new);
...	...	@@ -111,7 +103,7 @@ implements the following new ones.
111	103	The actual content, defaults to a L<Mojo::Asset::Memory> object with
112	104	C<auto_upgrade> enabled.
113	105
114		-=head2 C<auto_upgrade>
	106	+=head2 auto_upgrade
115	107
116	108	my $upgrade = $single->auto_upgrade;
117	109	$single = $single->auto_upgrade(0);
...	...	@@ -124,41 +116,42 @@ L<Mojo::Content::MultiPart> object, defaults to C<1>.
124	116	L<Mojo::Content::Single> inherits all methods from L<Mojo::Content> and
125	117	implements the following new ones.
126	118
127		-=head2 C<new>
	119	+=head2 new
128	120
129	121	my $single = Mojo::Content::Single->new;
130	122
131	123	Construct a new L<Mojo::Content::Single> object and subscribe to C<read> event
132	124	with default content parser.
133	125
134		-=head2 C<body_contains>
	126	+=head2 body_contains
135	127
136	128	my $success = $single->body_contains('1234567');
137	129
138	130	Check if content contains a specific string.
139	131
140		-=head2 C<body_size>
	132	+=head2 body_size
141	133
142	134	my $size = $single->body_size;
143	135
144	136	Content size in bytes.
145	137
146		-=head2 C<clone>
	138	+=head2 clone
147	139
148	140	my $clone = $single->clone;
149	141
150	142	Clone content if possible, otherwise return C<undef>.
151	143
152		-=head2 C<get_body_chunk>
	144	+=head2 get_body_chunk
153	145
154		- my $chunk = $single->get_body_chunk(0);
	146	+ my $bytes = $single->get_body_chunk(0);
155	147
156	148	Get a chunk of content starting from a specfic position.
157	149
158		-=head2 C<parse>
	150	+=head2 parse
159	151
160		- $single = $single->parse("Content-Length: 12\r\n\r\nHello World!");
161		- my $multi = $single->parse("Content-Type: multipart/form-data\r\n\r\n");
	152	+ $single = $single->parse("Content-Length: 12\x0d\x0a\x0d\x0aHello World!");
	153	+ my $multi
	154	+ = $single->parse("Content-Type: multipart/form-data\x0d\x0a\x0d\x0a");
162	155
163	156	Parse content chunk and upgrade to L<Mojo::Content::MultiPart> object if
164	157	possible.

...	...	@@ -30,8 +30,6 @@ sub _tokenize {
30	30	# Value
31	31	my $value;
32	32	$value = unquote $1 if $string =~ s/^("(?:\\\\\|\\"\|[^"])+"\|[^;,]+)\s*//;
33		-
34		- # Token
35	33	push @token, [$name, $value];
36	34
37	35	# Separator
...	...	@@ -68,14 +66,14 @@ L<Mojo::Cookie> is an abstract base class for HTTP cookies.
68	66
69	67	L<Mojo::Cookie> implements the following attributes.
70	68
71		-=head2 C<name>
	69	+=head2 name
72	70
73	71	my $name = $cookie->name;
74	72	$cookie = $cookie->name('foo');
75	73
76	74	Cookie name.
77	75
78		-=head2 C<value>
	76	+=head2 value
79	77
80	78	my $value = $cookie->value;
81	79	$cookie = $cookie->value('/test');
...	...	@@ -87,13 +85,13 @@ Cookie value.
87	85	L<Mojo::Cookie> inherits all methods from L<Mojo::Base> and implements the
88	86	following new ones.
89	87
90		-=head2 C<parse>
	88	+=head2 parse
91	89
92	90	my $cookies = $cookie->parse($string);
93	91
94	92	Parse cookies. Meant to be overloaded in a subclass.
95	93
96		-=head2 C<to_string>
	94	+=head2 to_string
97	95
98	96	my $string = $cookie->to_string;
99	97	my $string = "$cookie";

...	...	@@ -6,7 +6,6 @@ use Mojo::Util 'quote';
6	6	sub parse {
7	7	my ($self, $string) = @_;
8	8
9		- # Walk tree
10	9	my @cookies;
11	10	for my $token (map {@$_} $self->_tokenize($string)) {
12	11	my ($name, $value) = @$token;
...	...	@@ -54,13 +53,13 @@ L<Mojo::Cookie::Request> inherits all attributes from L<Mojo::Cookie>.
54	53	L<Mojo::Cookie::Request> inherits all methods from L<Mojo::Cookie> and
55	54	implements the following new ones.
56	55
57		-=head2 C<parse>
	56	+=head2 parse
58	57
59	58	my $cookies = $cookie->parse('f=b; g=a');
60	59
61	60	Parse cookies.
62	61
63		-=head2 C<to_string>
	62	+=head2 to_string
64	63
65	64	my $string = $cookie->to_string;
66	65

...	...	@@ -15,8 +15,6 @@ sub expires {
15	15	? Mojo::Date->new($self->{expires})
16	16	: $self->{expires}
17	17	unless @_;
18		-
19		- # New expires value
20	18	$self->{expires} = shift;
21	19
22	20	return $self;
...	...	@@ -25,7 +23,6 @@ sub expires {
25	23	sub parse {
26	24	my ($self, $string) = @_;
27	25
28		- # Walk tree
29	26	my @cookies;
30	27	for my $token ($self->_tokenize($string)) {
31	28	for my $i (0 .. $#$token) {
...	...	@@ -104,14 +101,14 @@ L<Mojo::Cookie::Response> is a container for HTTP response cookies.
104	101	L<Mojo::Cookie::Response> inherits all attributes from L<Mojo::Cookie> and
105	102	implements the followign new ones.
106	103
107		-=head2 C<domain>
	104	+=head2 domain
108	105
109	106	my $domain = $cookie->domain;
110	107	$cookie = $cookie->domain('localhost');
111	108
112	109	Cookie domain.
113	110
114		-=head2 C<httponly>
	111	+=head2 httponly
115	112
116	113	my $httponly = $cookie->httponly;
117	114	$cookie = $cookie->httponly(1);
...	...	@@ -119,21 +116,21 @@ Cookie domain.
119	116	HttpOnly flag, which can prevent client-side scripts from accessing this
120	117	cookie.
121	118
122		-=head2 C<max_age>
	119	+=head2 max_age
123	120
124	121	my $max_age = $cookie->max_age;
125	122	$cookie = $cookie->max_age(60);
126	123
127	124	Max age for cookie.
128	125
129		-=head2 C<path>
	126	+=head2 path
130	127
131	128	my $path = $cookie->path;
132	129	$cookie = $cookie->path('/test');
133	130
134	131	Cookie path.
135	132
136		-=head2 C<secure>
	133	+=head2 secure
137	134
138	135	my $secure = $cookie->secure;
139	136	$cookie = $cookie->secure(1);
...	...	@@ -146,7 +143,7 @@ connections.
146	143	L<Mojo::Cookie::Response> inherits all methods from L<Mojo::Cookie> and
147	144	implements the following new ones.
148	145
149		-=head2 C<expires>
	146	+=head2 expires
150	147
151	148	my $expires = $cookie->expires;
152	149	$cookie = $cookie->expires(time + 60);
...	...	@@ -154,13 +151,13 @@ implements the following new ones.
154	151
155	152	Expiration for cookie.
156	153
157		-=head2 C<parse>
	154	+=head2 parse
158	155
159	156	my $cookies = $cookie->parse('f=b; path=/');
160	157
161	158	Parse cookies.
162	159
163		-=head2 C<to_string>
	160	+=head2 to_string
164	161
165	162	my $string = $cookie->to_string;
166	163

...	...	@@ -71,24 +71,21 @@ sub attrs {
71	71	return $self;
72	72	}
73	73
74		-sub charset { shift->_parser(charset => @_) }
	74	+sub charset { shift->_html(charset => @_) }
75	75
76	76	sub children {
77	77	my ($self, $type) = @_;
78	78
79		- # Walk tree
80	79	my @children;
81		- my $tree = $self->tree;
82		- my $start = $tree->[0] eq 'root' ? 1 : 4;
83		- for my $e (@$tree[$start .. $#$tree]) {
	80	+ my $charset = $self->charset;
	81	+ my $xml = $self->xml;
	82	+ my $tree = $self->tree;
	83	+ for my $e (@$tree[($tree->[0] eq 'root' ? 1 : 4) .. $#$tree]) {
84	84
85		- # Make sure child is a tag
	85	+ # Make sure child is the right type
86	86	next unless $e->[0] eq 'tag';
87	87	next if defined $type && $e->[1] ne $type;
88		-
89		- # Add child
90		- push @children,
91		- $self->new->charset($self->charset)->tree($e)->xml($self->xml);
	88	+ push @children, $self->new->charset($charset)->tree($e)->xml($xml);
92	89	}
93	90
94	91	return Mojo::Collection->new(@children);
...	...	@@ -97,43 +94,31 @@ sub children {
97	94	sub content_xml {
98	95	my $self = shift;
99	96
100		- # Walk tree
101		- my $result = '';
102		- my $tree = $self->tree;
103		- my $start = $tree->[0] eq 'root' ? 1 : 4;
104		- for my $e (@$tree[$start .. $#$tree]) {
105		- $result .= Mojo::DOM::HTML->new(
106		- charset => $self->charset,
107		- tree => $e,
108		- xml => $self->xml
109		- )->render;
110		- }
111		-
112		- return $result;
	97	+ # Render children
	98	+ my $tree = $self->tree;
	99	+ my $charset = $self->charset;
	100	+ my $xml = $self->xml;
	101	+ return join '', map {
	102	+ Mojo::DOM::HTML->new(charset => $charset, tree => $_, xml => $xml)->render
	103	+ } @$tree[($tree->[0] eq 'root' ? 1 : 4) .. $#$tree];
113	104	}
114	105
115	106	sub find {
116	107	my ($self, $selector) = @_;
117	108
118		- # Match selector against tree
119		- my $results = Mojo::DOM::CSS->new(tree => $self->tree)->select($selector);
120		-
121		- # Upgrade results
122		- @$results
123		- = map { $self->new->charset($self->charset)->tree($_)->xml($self->xml) }
124		- @$results;
125		-
126		- return Mojo::Collection->new(@$results);
	109	+ my $charset = $self->charset;
	110	+ my $xml = $self->xml;
	111	+ return Mojo::Collection->new(
	112	+ map { $self->new->charset($charset)->tree($_)->xml($xml) }
	113	+ @{Mojo::DOM::CSS->new(tree => $self->tree)->select($selector)});
127	114	}
128	115
129	116	sub namespace {
130	117	my $self = shift;
131	118
132		- # Namespace prefix
	119	+ # Extract namespace prefix and search parents
133	120	return '' if (my $current = $self->tree)->[0] eq 'root';
134	121	my $ns = $current->[1] =~ /^(.*?):/ ? "xmlns:$1" : undef;
135		-
136		- # Walk tree
137	122	while ($current) {
138	123	last if $current->[0] eq 'root';
139	124
...	...	@@ -155,11 +140,7 @@ sub next { shift->_sibling(1) }
155	140
156	141	sub parent {
157	142	my $self = shift;
158		-
159		- # Not a tag
160	143	return undef if (my $tree = $self->tree)->[0] eq 'root';
161		-
162		- # Parent
163	144	return $self->new->charset($self->charset)->tree($tree->[3])
164	145	->xml($self->xml);
165	146	}
...	...	@@ -206,29 +187,15 @@ sub replace {
206	187
207	188	sub replace_content {
208	189	my ($self, $new) = @_;
209		-
210		- # Parse
211		- $new = $self->_parse("$new");
212		-
213		- # Replacements
214	190	my $tree = $self->tree;
215		- my @new;
216		- for my $e (@$new[1 .. $#$new]) {
217		- $e->[3] = $tree if $e->[0] eq 'tag';
218		- push @new, $e;
219		- }
220		-
221		- # Replace
222		- my $start = $tree->[0] eq 'root' ? 1 : 4;
223		- splice @$tree, $start, $#$tree, @new;
224		-
	191	+ splice @$tree, $tree->[0] eq 'root' ? 1 : 4, $#$tree,
	192	+ @{_parent($self->_parse("$new"), $tree)};
225	193	return $self;
226	194	}
227	195
228	196	sub root {
229	197	my $self = shift;
230	198
231		- # Find root
232	199	my $root = $self->tree;
233	200	while ($root->[0] eq 'tag') {
234	201	last unless my $parent = $root->[3];
...	...	@@ -277,7 +244,7 @@ sub text_before {
277	244
278	245	sub to_xml { shift->[0]->render }
279	246
280		-sub tree { shift->_parser(tree => @_) }
	247	+sub tree { shift->_html(tree => @_) }
281	248
282	249	sub type {
283	250	my ($self, $type) = @_;
...	...	@@ -292,18 +259,15 @@ sub type {
292	259	return $self;
293	260	}
294	261
295		-sub xml { shift->_parser(xml => @_) }
	262	+sub xml { shift->_html(xml => @_) }
296	263
297	264	sub _add {
298	265	my ($self, $offset, $new) = @_;
299	266
300		- # Parse
301		- $new = $self->_parse("$new");
302		-
303	267	# Not a tag
304	268	return $self if (my $tree = $self->tree)->[0] eq 'root';
305	269
306		- # Find
	270	+ # Find parent
307	271	my $parent = $tree->[3];
308	272	my $i = $parent->[0] eq 'root' ? 1 : 4;
309	273	for my $e (@$parent[$i .. $#$parent]) {
...	...	@@ -311,8 +275,8 @@ sub _add {
311	275	$i++;
312	276	}
313	277
314		- # Add
315		- splice @$parent, $i + $offset, 0, @{_parent($new, $parent)};
	278	+ # Add children
	279	+ splice @$parent, $i + $offset, 0, @{_parent($self->_parse("$new"), $parent)};
316	280
317	281	return $self;
318	282	}
...	...	@@ -322,8 +286,17 @@ sub _elements {
322	286	return [@$e[($e->[0] eq 'root' ? 1 : 4) .. $#$e]];
323	287	}
324	288
	289	+sub _html {
	290	+ my ($self, $method) = (shift, shift);
	291	+ return $self->[0]->$method unless @_;
	292	+ $self->[0]->$method(@_);
	293	+ return $self;
	294	+}
	295	+
325	296	sub _parent {
326	297	my ($children, $parent) = @_;
	298	+
	299	+ # Link parent to children
327	300	my @new;
328	301	for my $e (@$children[1 .. $#$children]) {
329	302	if ($e->[0] eq 'tag') {
...	...	@@ -332,6 +305,7 @@ sub _parent {
332	305	}
333	306	push @new, $e;
334	307	}
	308	+
335	309	return \@new;
336	310	}
337	311
...	...	@@ -341,17 +315,10 @@ sub _parse {
341	315	->parse(shift)->tree;
342	316	}
343	317
344		-sub _parser {
345		- my ($self, $method) = (shift, shift);
346		- return $self->[0]->$method unless @_;
347		- $self->[0]->$method(@_);
348		- return $self;
349		-}
350		-
351	318	sub _sibling {
352	319	my ($self, $next) = @_;
353	320
354		- # Root
	321	+ # Make sure we have a parent
355	322	return undef unless my $parent = $self->parent;
356	323
357	324	# Find previous or next sibling
...	...	@@ -369,7 +336,6 @@ sub _sibling {
369	336	sub _text {
370	337	my ($elements, $recurse, $trim) = @_;
371	338
372		- # Walk tree
373	339	my $text = '';
374	340	for my $e (@$elements) {
375	341	my $type = $e->[0];
...	...	@@ -481,14 +447,14 @@ XML detection can also be disabled with the C<xml> method.
481	447	L<Mojo::DOM> inherits all methods from L<Mojo::Base> and implements the
482	448	following new ones.
483	449
484		-=head2 C<new>
	450	+=head2 new
485	451
486	452	my $dom = Mojo::DOM->new;
487	453	my $dom = Mojo::DOM->new('<foo bar="baz">test</foo>');
488	454
489	455	Construct a new array-based L<Mojo::DOM> object.
490	456
491		-=head2 C<all_text>
	457	+=head2 all_text
492	458
493	459	my $trimmed = $dom->all_text;
494	460	my $untrimmed = $dom->all_text(0);
...	...	@@ -502,7 +468,7 @@ enabled by default.
502	468	# "foo\nbarbaz\n"
503	469	$dom->parse("<div>foo\n<p>bar</p>baz\n</div>")->div->all_text(0);
504	470
505		-=head2 C<append>
	471	+=head2 append
506	472
507	473	$dom = $dom->append('<p>Hi!</p>');
508	474
...	...	@@ -511,7 +477,7 @@ Append to element.
511	477	# "<div><h1>A</h1><h2>B</h2></div>"
512	478	$dom->parse('<div><h1>A</h1></div>')->at('h1')->append('<h2>B</h2>')->root;
513	479
514		-=head2 C<append_content>
	480	+=head2 append_content
515	481
516	482	$dom = $dom->append_content('<p>Hi!</p>');
517	483
...	...	@@ -520,7 +486,7 @@ Append to element content.
520	486	# "<div><h1>AB</h1></div>"
521	487	$dom->parse('<div><h1>A</h1></div>')->at('h1')->append_content('B')->root;
522	488
523		-=head2 C<at>
	489	+=head2 at
524	490
525	491	my $result = $dom->at('html title');
526	492
...	...	@@ -530,7 +496,7 @@ are supported.
530	496	# Find first element with "svg" namespace definition
531	497	my $namespace = $dom->at('[xmlns\:svg]')->{'xmlns:svg'};
532	498
533		-=head2 C<attrs>
	499	+=head2 attrs
534	500
535	501	my $attrs = $dom->attrs;
536	502	my $foo = $dom->attrs('foo');
...	...	@@ -539,14 +505,14 @@ are supported.
539	505
540	506	Element attributes.
541	507
542		-=head2 C<charset>
	508	+=head2 charset
543	509
544	510	my $charset = $dom->charset;
545	511	$dom = $dom->charset('UTF-8');
546	512
547	513	Charset used for decoding and encoding HTML/XML.
548	514
549		-=head2 C<children>
	515	+=head2 children
550	516
551	517	my $collection = $dom->children;
552	518	my $collection = $dom->children('div');
...	...	@@ -557,7 +523,7 @@ similar to C<find>.
557	523	# Show type of random child element
558	524	say $dom->children->shuffle->first->type;
559	525
560		-=head2 C<content_xml>
	526	+=head2 content_xml
561	527
562	528	my $xml = $dom->content_xml;
563	529
...	...	@@ -567,7 +533,7 @@ C<charset> has been defined.
567	533	# "<b>test</b>"
568	534	$dom->parse('<div><b>test</b></div>')->div->content_xml;
569	535
570		-=head2 C<find>
	536	+=head2 find
571	537
572	538	my $collection = $dom->find('html title');
573	539
...	...	@@ -580,7 +546,7 @@ selectors from L<Mojo::DOM::CSS> are supported.
580	546	# Extract information from multiple elements
581	547	my @headers = $dom->find('h1, h2, h3')->pluck('text')->each;
582	548
583		-=head2 C<namespace>
	549	+=head2 namespace
584	550
585	551	my $namespace = $dom->namespace;
586	552
...	...	@@ -592,7 +558,7 @@ Find element namespace.
592	558	# Find namespace for an element that may or may not have a namespace prefix
593	559	my $namespace = $dom->at('svg > circle')->namespace;
594	560
595		-=head2 C<next>
	561	+=head2 next
596	562
597	563	my $sibling = $dom->next;
598	564
...	...	@@ -601,13 +567,13 @@ Next sibling of element.
601	567	# "<h2>B</h2>"
602	568	$dom->parse('<div><h1>A</h1><h2>B</h2></div>')->at('h1')->next;
603	569
604		-=head2 C<parent>
	570	+=head2 parent
605	571
606	572	my $parent = $dom->parent;
607	573
608	574	Parent of element.
609	575
610		-=head2 C<parse>
	576	+=head2 parse
611	577
612	578	$dom = $dom->parse('<foo bar="baz">test</foo>');
613	579
...	...	@@ -616,7 +582,7 @@ Parse HTML/XML document with L<Mojo::DOM::HTML>.
616	582	# Parse UTF-8 encoded XML
617	583	my $dom = Mojo::DOM->new->charset('UTF-8')->xml(1)->parse($xml);
618	584
619		-=head2 C<prepend>
	585	+=head2 prepend
620	586
621	587	$dom = $dom->prepend('<p>Hi!</p>');
622	588
...	...	@@ -625,7 +591,7 @@ Prepend to element.
625	591	# "<div><h1>A</h1><h2>B</h2></div>"
626	592	$dom->parse('<div><h2>B</h2></div>')->at('h2')->prepend('<h1>A</h1>')->root;
627	593
628		-=head2 C<prepend_content>
	594	+=head2 prepend_content
629	595
630	596	$dom = $dom->prepend_content('<p>Hi!</p>');
631	597
...	...	@@ -634,7 +600,7 @@ Prepend to element content.
634	600	# "<div><h2>AB</h2></div>"
635	601	$dom->parse('<div><h2>B</h2></div>')->at('h2')->prepend_content('A')->root;
636	602
637		-=head2 C<previous>
	603	+=head2 previous
638	604
639	605	my $sibling = $dom->previous;
640	606
...	...	@@ -643,7 +609,7 @@ Previous sibling of element.
643	609	# "<h1>A</h1>"
644	610	$dom->parse('<div><h1>A</h1><h2>B</h2></div>')->at('h2')->previous;
645	611
646		-=head2 C<remove>
	612	+=head2 remove
647	613
648	614	my $old = $dom->remove;
649	615
...	...	@@ -652,7 +618,7 @@ Remove element.
652	618	# "<div></div>"
653	619	$dom->parse('<div><h1>A</h1></div>')->at('h1')->remove->root;
654	620
655		-=head2 C<replace>
	621	+=head2 replace
656	622
657	623	my $old = $dom->replace('<div>test</div>');
658	624
...	...	@@ -664,7 +630,7 @@ Replace element.
664	630	# "<div></div>"
665	631	$dom->parse('<div><h1>A</h1></div>')->at('h1')->replace('')->root;
666	632
667		-=head2 C<replace_content>
	633	+=head2 replace_content
668	634
669	635	$dom = $dom->replace_content('test');
670	636
...	...	@@ -676,13 +642,13 @@ Replace element content.
676	642	# "<div><h1></h1></div>"
677	643	$dom->parse('<div><h1>A</h1></div>')->at('h1')->replace_content('')->root;
678	644
679		-=head2 C<root>
	645	+=head2 root
680	646
681	647	my $root = $dom->root;
682	648
683	649	Find root node.
684	650
685		-=head2 C<text>
	651	+=head2 text
686	652
687	653	my $trimmed = $dom->text;
688	654	my $untrimmed = $dom->text(0);
...	...	@@ -696,7 +662,7 @@ whitespace trimming is enabled by default.
696	662	# "foo\nbaz\n"
697	663	$dom->parse("<div>foo\n<p>bar</p>baz\n</div>")->div->text(0);
698	664
699		-=head2 C<text_after>
	665	+=head2 text_after
700	666
701	667	my $trimmed = $dom->text_after;
702	668	my $untrimmed = $dom->text_after(0);
...	...	@@ -710,7 +676,7 @@ is enabled by default.
710	676	# "baz\n"
711	677	$dom->parse("<div>foo\n<p>bar</p>baz\n</div>")->div->p->text_after(0);
712	678
713		-=head2 C<text_before>
	679	+=head2 text_before
714	680
715	681	my $trimmed = $dom->text_before;
716	682	my $untrimmed = $dom->text_before(0);
...	...	@@ -724,7 +690,7 @@ is enabled by default.
724	690	# "foo\n"
725	691	$dom->parse("<div>foo\n<p>bar</p>baz\n</div>")->div->p->text_before(0);
726	692
727		-=head2 C<to_xml>
	693	+=head2 to_xml
728	694
729	695	my $xml = $dom->to_xml;
730	696	my $xml = "$dom";
...	...	@@ -735,14 +701,14 @@ if a C<charset> has been defined.
735	701	# "<b>test</b>"
736	702	$dom->parse('<div><b>test</b></div>')->div->b->to_xml;
737	703
738		-=head2 C<tree>
	704	+=head2 tree
739	705
740	706	my $tree = $dom->tree;
741	707	$dom = $dom->tree(['root', [qw(text lalala)]]);
742	708
743	709	Document Object Model.
744	710
745		-=head2 C<type>
	711	+=head2 type
746	712
747	713	my $type = $dom->type;
748	714	$dom = $dom->type('div');
...	...	@@ -752,7 +718,7 @@ Element type.
752	718	# List types of child elements
753	719	say $dom->children->pluck('type');
754	720
755		-=head2 C<xml>
	721	+=head2 xml
756	722
757	723	my $xml = $dom->xml;
758	724	$dom = $dom->xml(1);

...	...	@@ -36,13 +36,10 @@ my $TOKEN_RE = qr/
36	36	sub select {
37	37	my $self = shift;
38	38
39		- # Compile selectors
40		- my $pattern = $self->_compile(shift);
41		-
42		- # Walk tree
43	39	my @results;
44		- my $tree = $self->tree;
45		- my @queue = ($tree);
	40	+ my $pattern = $self->_compile(shift);
	41	+ my $tree = $self->tree;
	42	+ my @queue = ($tree);
46	43	while (my $current = shift @queue) {
47	44	my $type = $current->[0];
48	45
...	...	@@ -123,7 +120,6 @@ sub _combinator {
123	120	sub _compile {
124	121	my ($self, $css) = @_;
125	122
126		- # Tokenize
127	123	my $pattern = [[]];
128	124	while ($css =~ /$TOKEN_RE/g) {
129	125	my ($separator, $element, $pc, $attrs, $combinator)
...	...	@@ -321,7 +317,6 @@ sub _regex {
321	317	sub _selector {
322	318	my ($self, $selector, $current) = @_;
323	319
324		- # Selectors
325	320	for my $s (@$selector[1 .. $#$selector]) {
326	321	my $type = $s->[0];
327	322
...	...	@@ -348,7 +343,6 @@ sub _selector {
348	343	sub _sibling {
349	344	my ($self, $selectors, $current, $tree, $immediate) = @_;
350	345
351		- # Find preceding elements
352	346	my $parent = $current->[3];
353	347	my $found;
354	348	my $start = $parent->[0] eq 'root' ? 1 : 4;
...	...	@@ -403,77 +397,77 @@ L<Mojo::DOM::CSS> is the CSS selector engine used by L<Mojo::DOM>.
403	397
404	398	All CSS selectors that make sense for a standalone parser are supported.
405	399
406		-=head2 C<*>
	400	+=head2 *
407	401
408	402	Any element.
409	403
410	404	my $all = $css->select('*');
411	405
412		-=head2 C<E>
	406	+=head2 E
413	407
414	408	An element of type C<E>.
415	409
416	410	my $title = $css->select('title');
417	411
418		-=head2 C<E[foo]>
	412	+=head2 E[foo]
419	413
420	414	An C<E> element with a C<foo> attribute.
421	415
422	416	my $links = $css->select('a[href]');
423	417
424		-=head2 C<E[foo="bar"]>
	418	+=head2 E[foo="bar"]
425	419
426	420	An C<E> element whose C<foo> attribute value is exactly equal to C<bar>.
427	421
428	422	my $fields = $css->select('input[name="foo"]');
429	423
430		-=head2 C<E[foo~="bar"]>
	424	+=head2 E[foo~="bar"]
431	425
432	426	An C<E> element whose C<foo> attribute value is a list of
433	427	whitespace-separated values, one of which is exactly equal to C<bar>.
434	428
435	429	my $fields = $css->select('input[name~="foo"]');
436	430
437		-=head2 C<E[foo^="bar"]>
	431	+=head2 E[foo^="bar"]
438	432
439	433	An C<E> element whose C<foo> attribute value begins exactly with the string
440	434	C<bar>.
441	435
442	436	my $fields = $css->select('input[name^="f"]');
443	437
444		-=head2 C<E[foo$="bar"]>
	438	+=head2 E[foo$="bar"]
445	439
446	440	An C<E> element whose C<foo> attribute value ends exactly with the string
447	441	C<bar>.
448	442
449	443	my $fields = $css->select('input[name$="o"]');
450	444
451		-=head2 C<E[foo*="bar"]>
	445	+=head2 E[foo*="bar"]
452	446
453	447	An C<E> element whose C<foo> attribute value contains the substring C<bar>.
454	448
455	449	my $fields = $css->select('input[name*="fo"]');
456	450
457		-=head2 C<E:root>
	451	+=head2 E:root
458	452
459	453	An C<E> element, root of the document.
460	454
461	455	my $root = $css->select(':root');
462	456
463		-=head2 C<E:checked>
	457	+=head2 E:checked
464	458
465	459	A user interface element C<E> which is checked (for instance a radio-button or
466	460	checkbox).
467	461
468	462	my $input = $css->select(':checked');
469	463
470		-=head2 C<E:empty>
	464	+=head2 E:empty
471	465
472	466	An C<E> element that has no children (including text nodes).
473	467
474	468	my $empty = $css->select(':empty');
475	469
476		-=head2 C<E:nth-child(n)>
	470	+=head2 E:nth-child(n)
477	471
478	472	An C<E> element, the C<n-th> child of its parent.
479	473
...	...	@@ -482,7 +476,7 @@ An C<E> element, the C<n-th> child of its parent.
482	476	my $even = $css->select('div:nth-child(even)');
483	477	my $top3 = $css->select('div:nth-child(-n+3)');
484	478
485		-=head2 C<E:nth-last-child(n)>
	479	+=head2 E:nth-last-child(n)
486	480
487	481	An C<E> element, the C<n-th> child of its parent, counting from the last one.
488	482
...	...	@@ -491,7 +485,7 @@ An C<E> element, the C<n-th> child of its parent, counting from the last one.
491	485	my $even = $css->select('div:nth-last-child(even)');
492	486	my $bottom3 = $css->select('div:nth-last-child(-n+3)');
493	487
494		-=head2 C<E:nth-of-type(n)>
	488	+=head2 E:nth-of-type(n)
495	489
496	490	An C<E> element, the C<n-th> sibling of its type.
497	491
...	...	@@ -500,7 +494,7 @@ An C<E> element, the C<n-th> sibling of its type.
500	494	my $even = $css->select('div:nth-of-type(even)');
501	495	my $top3 = $css->select('div:nth-of-type(-n+3)');
502	496
503		-=head2 C<E:nth-last-of-type(n)>
	497	+=head2 E:nth-last-of-type(n)
504	498
505	499	An C<E> element, the C<n-th> sibling of its type, counting from the last one.
506	500
...	...	@@ -509,91 +503,91 @@ An C<E> element, the C<n-th> sibling of its type, counting from the last one.
509	503	my $even = $css->select('div:nth-last-of-type(even)');
510	504	my $bottom3 = $css->select('div:nth-last-of-type(-n+3)');
511	505
512		-=head2 C<E:first-child>
	506	+=head2 E:first-child
513	507
514	508	An C<E> element, first child of its parent.
515	509
516	510	my $first = $css->select('div p:first-child');
517	511
518		-=head2 C<E:last-child>
	512	+=head2 E:last-child
519	513
520	514	An C<E> element, last child of its parent.
521	515
522	516	my $last = $css->select('div p:last-child');
523	517
524		-=head2 C<E:first-of-type>
	518	+=head2 E:first-of-type
525	519
526	520	An C<E> element, first sibling of its type.
527	521
528	522	my $first = $css->select('div p:first-of-type');
529	523
530		-=head2 C<E:last-of-type>
	524	+=head2 E:last-of-type
531	525
532	526	An C<E> element, last sibling of its type.
533	527
534	528	my $last = $css->select('div p:last-of-type');
535	529
536		-=head2 C<E:only-child>
	530	+=head2 E:only-child
537	531
538	532	An C<E> element, only child of its parent.
539	533
540	534	my $lonely = $css->select('div p:only-child');
541	535
542		-=head2 C<E:only-of-type>
	536	+=head2 E:only-of-type
543	537
544	538	An C<E> element, only sibling of its type.
545	539
546	540	my $lonely = $css->select('div p:only-of-type');
547	541
548		-=head2 C<E.warning>
	542	+=head2 E.warning
549	543
550	544	my $warning = $css->select('div.warning');
551	545
552	546	An C<E> element whose class is "warning".
553	547
554		-=head2 C<E#myid>
	548	+=head2 E#myid
555	549
556	550	my $foo = $css->select('div#foo');
557	551
558	552	An C<E> element with C<ID> equal to "myid".
559	553
560		-=head2 C<E:not(s)>
	554	+=head2 E:not(s)
561	555
562	556	An C<E> element that does not match simple selector C<s>.
563	557
564	558	my $others = $css->select('div p:not(:first-child)');
565	559
566		-=head2 C<E F>
	560	+=head2 E F
567	561
568	562	An C<F> element descendant of an C<E> element.
569	563
570	564	my $headlines = $css->select('div h1');
571	565
572		-=head2 C<E E<gt> F>
	566	+=head2 E E<gt> F
573	567
574	568	An C<F> element child of an C<E> element.
575	569
576	570	my $headlines = $css->select('html > body > div > h1');
577	571
578		-=head2 C<E + F>
	572	+=head2 E + F
579	573
580	574	An C<F> element immediately preceded by an C<E> element.
581	575
582	576	my $second = $css->select('h1 + h2');
583	577
584		-=head2 C<E ~ F>
	578	+=head2 E ~ F
585	579
586	580	An C<F> element preceded by an C<E> element.
587	581
588	582	my $second = $css->select('h1 ~ h2');
589	583
590		-=head2 C<E, F, G>
	584	+=head2 E, F, G
591	585
592	586	Elements of type C<E>, C<F> and C<G>.
593	587
594	588	my $headlines = $css->select('h1, h2, h3');
595	589
596		-=head2 C<E[foo=bar][bar=baz]>
	590	+=head2 E[foo=bar][bar=baz]
597	591
598	592	An C<E> element whose attributes match all following attribute selectors.
599	593
...	...	@@ -603,7 +597,7 @@ An C<E> element whose attributes match all following attribute selectors.
603	597
604	598	L<Mojo::DOM::CSS> implements the following attributes.
605	599
606		-=head2 C<tree>
	600	+=head2 tree
607	601
608	602	my $tree = $css->tree;
609	603	$css = $css->tree(['root', [qw(text lalala)]]);
...	...	@@ -615,7 +609,7 @@ Document Object Model.
615	609	L<Mojo::DOM::CSS> inherits all methods from L<Mojo::Base> and implements the
616	610	following new ones.
617	611
618		-=head2 C<select>
	612	+=head2 select
619	613
620	614	my $results = $css->select('head > title');
621	615

...	...	@@ -76,11 +76,9 @@ my %INLINE = map { $_ => 1 } (
76	76	sub parse {
77	77	my ($self, $html) = @_;
78	78
79		- # Try to decode
80	79	my $charset = $self->charset;
81	80	defined ($html = decode($charset, $html)) \|\| return $self->charset(undef) if $charset;
82	81
83		- # Tokenize
84	82	my $tree = ['root'];
85	83	my $current = $tree;
86	84	while ($html =~ m/\G$TOKEN_RE/gcs) {
...	...	@@ -269,14 +267,10 @@ sub _render {
269	267	# Processing instruction
270	268	return "<?" . $tree->[1] . "?>" if $e eq 'pi';
271	269
272		- # Offset
273		- my $start = $e eq 'root' ? 1 : 2;
274		-
275	270	# Start tag
	271	+ my $start = $e eq 'root' ? 1 : 2;
276	272	my $content = '';
277	273	if ($e eq 'tag') {
278		-
279		- # Offset
280	274	$start = 4;
281	275
282	276	# Open tag
...	...	@@ -305,7 +299,7 @@ sub _render {
305	299	$content .= '>';
306	300	}
307	301
308		- # Walk tree
	302	+ # Render whole tree
309	303	$content .= $self->_render($tree->[$_]) for $start .. $#$tree;
310	304
311	305	# End tag
...	...	@@ -362,7 +356,7 @@ sub _start {
362	356	}
363	357	}
364	358
365		- # New
	359	+ # New tag
366	360	my $new = ['tag', $start, $attrs, $$current];
367	361	weaken $new->[3];
368	362	push @$$current, $new;
...	...	@@ -397,21 +391,21 @@ L<Mojo::DOM::HTML> is the HTML/XML engine used by L<Mojo::DOM>.
397	391
398	392	L<Mojo::DOM::HTML> implements the following attributes.
399	393
400		-=head2 C<charset>
	394	+=head2 charset
401	395
402	396	my $charset = $html->charset;
403	397	$html = $html->charset('UTF-8');
404	398
405	399	Charset used for decoding and encoding HTML/XML.
406	400
407		-=head2 C<tree>
	401	+=head2 tree
408	402
409	403	my $tree = $html->tree;
410	404	$html = $html->tree(['root', [qw(text lalala)]]);
411	405
412	406	Document Object Model.
413	407
414		-=head2 C<xml>
	408	+=head2 xml
415	409
416	410	my $xml = $html->xml;
417	411	$html = $html->xml(1);
...	...	@@ -424,13 +418,13 @@ auto detection based on processing instructions.
424	418	L<Mojo::DOM::HTML> inherits all methods from L<Mojo::Base> and implements the
425	419	following new ones.
426	420
427		-=head2 C<parse>
	421	+=head2 parse
428	422
429	423	$html = $html->parse('<foo bar="baz">test</foo>');
430	424
431	425	Parse HTML/XML document.
432	426
433		-=head2 C<render>
	427	+=head2 render
434	428
435	429	my $xml = $html->render;
436	430

...	...	@@ -9,7 +9,6 @@ use Time::Local 'timegm';
9	9
10	10	has 'epoch';
11	11
12		-# Days and months
13	12	my @DAYS = qw(Sun Mon Tue Wed Thu Fri Sat);
14	13	my @MONTHS = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
15	14	my %MONTHS;
...	...	@@ -93,7 +92,7 @@ L<Mojo::Date> implements HTTP date and time functions as described in RFC
93	92
94	93	L<Mojo::Date> implements the following attributes.
95	94
96		-=head2 C<epoch>
	95	+=head2 epoch
97	96
98	97	my $epoch = $date->epoch;
99	98	$date = $date->epoch(784111777);
...	...	@@ -105,14 +104,14 @@ Epoch seconds.
105	104	L<Mojo::Date> inherits all methods from L<Mojo::Base> and implements the
106	105	following new ones.
107	106
108		-=head2 C<new>
	107	+=head2 new
109	108
110	109	my $date = Mojo::Date->new;
111	110	my $date = Mojo::Date->new('Sun Nov 6 08:49:37 1994');
112	111
113	112	Construct a new L<Mojo::Date> object.
114	113
115		-=head2 C<parse>
	114	+=head2 parse
116	115
117	116	$date = $date->parse('Sun Nov 6 08:49:37 1994');
118	117
...	...	@@ -130,7 +129,7 @@ Parse date.
130	129	# Ansi C asctime()
131	130	say Mojo::Date->new('Sun Nov 6 08:49:37 1994')->epoch;
132	131
133		-=head2 C<to_string>
	132	+=head2 to_string
134	133
135	134	my $string = $date->to_string;
136	135	my $string = "$date";

...	...	@@ -12,7 +12,10 @@ sub emit {
12	12	warn "-- Emit $name in @{[blessed($self)]} (@{[scalar(@$s)]})\n" if DEBUG;
13	13	for my $cb (@$s) { $self->$cb(@_) }
14	14	}
15		- elsif (DEBUG) { warn "-- Emit $name in @{[blessed($self)]} (0)\n" }
	15	+ else {
	16	+ warn "-- Emit $name in @{[blessed($self)]} (0)\n" if DEBUG;
	17	+ warn $_[0] if $name eq 'error';
	18	+ }
16	19
17	20	return $self;
18	21	}
...	...	@@ -30,15 +33,14 @@ sub emit_safe {
30	33	if ($name eq 'error') { warn qq{Event "error" failed: $@} }
31	34
32	35	# Normal event failed
33		- else {
34		- $self->once(error => sub { warn $_[1] })
35		- unless $self->has_subscribers('error');
36		- $self->emit_safe('error', qq{Event "$name" failed: $@});
37		- }
	36	+ else { $self->emit_safe('error', qq{Event "$name" failed: $@}) }
38	37	}
39	38	}
40	39	}
41		- elsif (DEBUG) { warn "-- Emit $name in @{[blessed($self)]} safely (0)\n" }
	40	+ else {
	41	+ warn "-- Emit $name in @{[blessed($self)]} safely (0)\n" if DEBUG;
	42	+ warn $_[0] if $name eq 'error';
	43	+ }
42	44
43	45	return $self;
44	46	}
...	...	@@ -113,32 +115,50 @@ Mojo::EventEmitter - Event emitter base class
113	115
114	116	L<Mojo::EventEmitter> is a simple base class for event emitting objects.
115	117
	118	+=head1 EVENTS
	119	+
	120	+L<Mojo::EventEmitter> can emit the following events.
	121	+
	122	+=head2 error
	123	+
	124	+ $e->on(error => sub {
	125	+ my ($e, $err) = @_;
	126	+ ...
	127	+ });
	128	+
	129	+Emitted safely for event errors.
	130	+
	131	+ $e->on(error => sub {
	132	+ my ($e, $err) = @_;
	133	+ say "This looks bad: $err";
	134	+ });
	135	+
116	136	=head1 METHODS
117	137
118	138	L<Mojo::EventEmitter> inherits all methods from L<Mojo::Base> and
119	139	implements the following new ones.
120	140
121		-=head2 C<emit>
	141	+=head2 emit
122	142
123	143	$e = $e->emit('foo');
124	144	$e = $e->emit('foo', 123);
125	145
126	146	Emit event.
127	147
128		-=head2 C<emit_safe>
	148	+=head2 emit_safe
129	149
130	150	$e = $e->emit_safe('foo');
131	151	$e = $e->emit_safe('foo', 123);
132	152
133	153	Emit event safely and emit C<error> event on failure.
134	154
135		-=head2 C<has_subscribers>
	155	+=head2 has_subscribers
136	156
137	157	my $success = $e->has_subscribers('foo');
138	158
139	159	Check if event has subscribers.
140	160
141		-=head2 C<on>
	161	+=head2 on
142	162
143	163	my $cb = $e->on(foo => sub {...});
144	164
...	...	@@ -149,7 +169,7 @@ Subscribe to event.
149	169	...
150	170	});
151	171
152		-=head2 C<once>
	172	+=head2 once
153	173
154	174	my $cb = $e->once(foo => sub {...});
155	175
...	...	@@ -160,7 +180,7 @@ Subscribe to event and unsubscribe again after it has been emitted once.
160	180	...
161	181	});
162	182
163		-=head2 C<subscribers>
	183	+=head2 subscribers
164	184
165	185	my $subscribers = $e->subscribers('foo');
166	186
...	...	@@ -169,7 +189,7 @@ All subscribers for event.
169	189	# Unsubscribe last subscriber
170	190	$e->unsubscribe(foo => $e->subscribers('foo')->[-1]);
171	191
172		-=head2 C<unsubscribe>
	192	+=head2 unsubscribe
173	193
174	194	$e = $e->unsubscribe('foo');
175	195	$e = $e->unsubscribe(foo => $cb);

...	...	@@ -16,18 +16,11 @@ sub new {
16	16	return @_ ? $self->_detect(@_) : $self;
17	17	}
18	18
19		-# DEPRECATED in Rainbow!
20		-sub raw_message {
21		- warn "Mojo::Exception->raw_message has been DEPRECATED!\n";
22		- shift->message(@_);
23		-}
24		-
25	19	sub throw { die shift->new->trace(2)->_detect(@_) }
26	20
27	21	sub to_string {
28	22	my $self = shift;
29	23
30		- # Message
31	24	return $self->message unless $self->verbose;
32	25	my $string = $self->message ? $self->message : '';
33	26
...	...	@@ -94,7 +87,6 @@ sub _context {
94	87	sub _detect {
95	88	my ($self, $msg, $files) = @_;
96	89
97		- # Message
98	90	return $msg if blessed $msg && $msg->isa('Mojo::Exception');
99	91	$self->message($msg);
100	92
...	...	@@ -144,76 +136,76 @@ L<Mojo::Exception> is a container for exceptions with context information.
144	136
145	137	L<Mojo::Exception> implements the following attributes.
146	138
147		-=head2 C<frames>
	139	+=head2 frames
148	140
149	141	my $frames = $e->frames;
150	142	$e = $e->frames($frames);
151	143
152	144	Stacktrace.
153	145
154		-=head2 C<line>
	146	+=head2 line
155	147
156	148	my $line = $e->line;
157	149	$e = $e->line([3 => 'foo']);
158	150
159	151	The line where the exception occured.
160	152
161		-=head2 C<lines_after>
	153	+=head2 lines_after
162	154
163	155	my $lines = $e->lines_after;
164	156	$e = $e->lines_after([[1 => 'bar'], [2 => 'baz']]);
165	157
166	158	Lines after the line where the exception occured.
167	159
168		-=head2 C<lines_before>
	160	+=head2 lines_before
169	161
170	162	my $lines = $e->lines_before;
171	163	$e = $e->lines_before([[4 => 'bar'], [5 => 'baz']]);
172	164
173	165	Lines before the line where the exception occured.
174	166
175		-=head2 C<message>
	167	+=head2 message
176	168
177	169	my $msg = $e->message;
178	170	$e = $e->message('Oops!');
179	171
180	172	Exception message.
181	173
182		-=head2 C<verbose>
	174	+=head2 verbose
183	175
184	176	my $verbose = $e->verbose;
185	177	$e = $e->verbose(1);
186	178
187		-Activate verbose rendering, defaults to the value of
188		-C<MOJO_EXCEPTION_VERBOSE> or C<0>.
	179	+Activate verbose rendering, defaults to the value of the
	180	+C<MOJO_EXCEPTION_VERBOSE> environment variable or C<0>.
189	181
190	182	=head1 METHODS
191	183
192	184	L<Mojo::Exception> inherits all methods from L<Mojo::Base> and implements the
193	185	following new ones.
194	186
195		-=head2 C<new>
	187	+=head2 new
196	188
197	189	my $e = Mojo::Exception->new('Oops!');
198	190	my $e = Mojo::Exception->new('Oops!', $files);
199	191
200	192	Construct a new L<Mojo::Exception> object.
201	193
202		-=head2 C<throw>
	194	+=head2 throw
203	195
204	196	Mojo::Exception->throw('Oops!');
205	197	Mojo::Exception->throw('Oops!', $files);
206	198
207	199	Throw exception with stacktrace.
208	200
209		-=head2 C<to_string>
	201	+=head2 to_string
210	202
211	203	my $string = $e->to_string;
212	204	my $string = "$e";
213	205
214	206	Render exception.
215	207
216		-=head2 C<trace>
	208	+=head2 trace
217	209
218	210	$e = $e->trace;
219	211	$e = $e->trace(2);

...	...	@@ -89,7 +89,6 @@ sub names {
89	89	sub parse {
90	90	my $self = shift;
91	91
92		- # Parse headers with size limit
93	92	$self->{state} = 'headers';
94	93	$self->{buffer} .= do {my $buffer = shift; defined $buffer ? $buffer : ''};
95	94	my $headers = $self->{cache} \|\|= [];
...	...	@@ -134,7 +133,6 @@ sub remove {
134	133	sub to_hash {
135	134	my ($self, $multi) = @_;
136	135
137		- # Build
138	136	my %hash;
139	137	for my $header (@{$self->names}) {
140	138	my @headers = $self->header($header);
...	...	@@ -163,7 +161,6 @@ sub to_string {
163	161	push @headers, "$name: " . join("\x0d\x0a ", @$_) for $self->header($name);
164	162	}
165	163
166		- # Format headers
167	164	return join "\x0d\x0a", @headers;
168	165	}
169	166
...	...	@@ -179,8 +176,8 @@ Mojo::Headers - Headers
179	176
180	177	# Parse
181	178	my $headers = Mojo::Headers->new;
182		- $headers->parse("Content-Length: 42\r\n");
183		- $headers->parse("Content-Type: text/html\r\n\r\n");
	179	+ $headers->parse("Content-Length: 42\x0d\x0a");
	180	+ $headers->parse("Content-Type: text/html\x0d\x0a\x0d\x0a");
184	181	say $headers->content_length;
185	182	say $headers->content_type;
186	183
...	...	@@ -198,7 +195,7 @@ L<Mojo::Headers> is a container for HTTP headers as described in RFC 2616.
198	195
199	196	L<Mojo::Headers> implements the following attributes.
200	197
201		-=head2 C<max_line_size>
	198	+=head2 max_line_size
202	199
203	200	my $size = $headers->max_line_size;
204	201	$headers = $headers->max_line_size(1024);
...	...	@@ -211,124 +208,124 @@ C<MOJO_MAX_LINE_SIZE> environment variable or C<10240>.
211	208	L<Mojo::Headers> inherits all methods from L<Mojo::Base> and implements the
212	209	following new ones.
213	210
214		-=head2 C<accept>
	211	+=head2 accept
215	212
216	213	my $accept = $headers->accept;
217	214	$headers = $headers->accept('application/json');
218	215
219	216	Shortcut for the C<Accept> header.
220	217
221		-=head2 C<accept_charset>
	218	+=head2 accept_charset
222	219
223	220	my $charset = $headers->accept_charset;
224	221	$headers = $headers->accept_charset('UTF-8');
225	222
226	223	Shortcut for the C<Accept-Charset> header.
227	224
228		-=head2 C<accept_encoding>
	225	+=head2 accept_encoding
229	226
230	227	my $encoding = $headers->accept_encoding;
231	228	$headers = $headers->accept_encoding('gzip');
232	229
233	230	Shortcut for the C<Accept-Encoding> header.
234	231
235		-=head2 C<accept_language>
	232	+=head2 accept_language
236	233
237	234	my $language = $headers->accept_language;
238	235	$headers = $headers->accept_language('de, en');
239	236
240	237	Shortcut for the C<Accept-Language> header.
241	238
242		-=head2 C<accept_ranges>
	239	+=head2 accept_ranges
243	240
244	241	my $ranges = $headers->accept_ranges;
245	242	$headers = $headers->accept_ranges('bytes');
246	243
247	244	Shortcut for the C<Accept-Ranges> header.
248	245
249		-=head2 C<add>
	246	+=head2 add
250	247
251	248	$headers = $headers->add('Content-Type', 'text/plain');
252	249
253	250	Add one or more header lines.
254	251
255		-=head2 C<authorization>
	252	+=head2 authorization
256	253
257	254	my $authorization = $headers->authorization;
258	255	$headers = $headers->authorization('Basic Zm9vOmJhcg==');
259	256
260	257	Shortcut for the C<Authorization> header.
261	258
262		-=head2 C<cache_control>
	259	+=head2 cache_control
263	260
264	261	my $cache_control = $headers->cache_control;
265	262	$headers = $headers->cache_control('max-age=1, no-cache');
266	263
267	264	Shortcut for the C<Cache-Control> header.
268	265
269		-=head2 C<clone>
	266	+=head2 clone
270	267
271	268	my $clone = $headers->clone;
272	269
273	270	Clone headers.
274	271
275		-=head2 C<connection>
	272	+=head2 connection
276	273
277	274	my $connection = $headers->connection;
278	275	$headers = $headers->connection('close');
279	276
280	277	Shortcut for the C<Connection> header.
281	278
282		-=head2 C<content_disposition>
	279	+=head2 content_disposition
283	280
284	281	my $disposition = $headers->content_disposition;
285	282	$headers = $headers->content_disposition('foo');
286	283
287	284	Shortcut for the C<Content-Disposition> header.
288	285
289		-=head2 C<content_encoding>
	286	+=head2 content_encoding
290	287
291	288	my $encoding = $headers->content_encoding;
292	289	$headers = $headers->content_encoding('gzip');
293	290
294	291	Shortcut for the C<Content-Encoding> header.
295	292
296		-=head2 C<content_length>
	293	+=head2 content_length
297	294
298	295	my $len = $headers->content_length;
299	296	$headers = $headers->content_length(4000);
300	297
301	298	Shortcut for the C<Content-Length> header.
302	299
303		-=head2 C<content_range>
	300	+=head2 content_range
304	301
305	302	my $range = $headers->content_range;
306	303	$headers = $headers->content_range('bytes 2-8/100');
307	304
308	305	Shortcut for the C<Content-Range> header.
309	306
310		-=head2 C<content_type>
	307	+=head2 content_type
311	308
312	309	my $type = $headers->content_type;
313	310	$headers = $headers->content_type('text/plain');
314	311
315	312	Shortcut for the C<Content-Type> header.
316	313
317		-=head2 C<cookie>
	314	+=head2 cookie
318	315
319	316	my $cookie = $headers->cookie;
320	317	$headers = $headers->cookie('f=b');
321	318
322	319	Shortcut for the C<Cookie> header from RFC 6265.
323	320
324		-=head2 C<date>
	321	+=head2 date
325	322
326	323	my $date = $headers->date;
327	324	$headers = $headers->date('Sun, 17 Aug 2008 16:27:35 GMT');
328	325
329	326	Shortcut for the C<Date> header.
330	327
331		-=head2 C<dnt>
	328	+=head2 dnt
332	329
333	330	my $dnt = $headers->dnt;
334	331	$headers = $headers->dnt(1);
...	...	@@ -336,35 +333,35 @@ Shortcut for the C<Date> header.
336	333	Shortcut for the C<DNT> (Do Not Track) header, which has no specification yet,
337	334	but is very commonly used.
338	335
339		-=head2 C<etag>
	336	+=head2 etag
340	337
341	338	my $etag = $headers->etag;
342	339	$headers = $headers->etag('abc321');
343	340
344	341	Shortcut for the C<ETag> header.
345	342
346		-=head2 C<expect>
	343	+=head2 expect
347	344
348	345	my $expect = $headers->expect;
349	346	$headers = $headers->expect('100-continue');
350	347
351	348	Shortcut for the C<Expect> header.
352	349
353		-=head2 C<expires>
	350	+=head2 expires
354	351
355	352	my $expires = $headers->expires;
356	353	$headers = $headers->expires('Thu, 01 Dec 1994 16:00:00 GMT');
357	354
358	355	Shortcut for the C<Expires> header.
359	356
360		-=head2 C<from_hash>
	357	+=head2 from_hash
361	358
362	359	$headers = $headers->from_hash({'Content-Type' => 'text/html'});
363	360	$headers = $headers->from_hash({});
364	361
365	362	Parse headers from a hash reference.
366	363
367		-=head2 C<header>
	364	+=head2 header
368	365
369	366	my $string = $headers->header('Content-Type');
370	367	my @lines = $headers->header('Content-Type');
...	...	@@ -380,93 +377,93 @@ Get or replace the current header values.
380	377	say for @$header;
381	378	}
382	379
383		-=head2 C<host>
	380	+=head2 host
384	381
385	382	my $host = $headers->host;
386	383	$headers = $headers->host('127.0.0.1');
387	384
388	385	Shortcut for the C<Host> header.
389	386
390		-=head2 C<if_modified_since>
	387	+=head2 if_modified_since
391	388
392	389	my $date = $headers->if_modified_since;
393	390	$headers = $headers->if_modified_since('Sun, 17 Aug 2008 16:27:35 GMT');
394	391
395	392	Shortcut for the C<If-Modified-Since> header.
396	393
397		-=head2 C<is_finished>
	394	+=head2 is_finished
398	395
399	396	my $success = $headers->is_finished;
400	397
401	398	Check if header parser is finished.
402	399
403		-=head2 C<is_limit_exceeded>
	400	+=head2 is_limit_exceeded
404	401
405	402	my $success = $headers->is_limit_exceeded;
406	403
407	404	Check if a header has exceeded C<max_line_size>.
408	405
409		-=head2 C<last_modified>
	406	+=head2 last_modified
410	407
411	408	my $date = $headers->last_modified;
412	409	$headers = $headers->last_modified('Sun, 17 Aug 2008 16:27:35 GMT');
413	410
414	411	Shortcut for the C<Last-Modified> header.
415	412
416		-=head2 C<leftovers>
	413	+=head2 leftovers
417	414
418	415	my $bytes = $headers->leftovers;
419	416
420	417	Get leftover data from header parser.
421	418
422		-=head2 C<location>
	419	+=head2 location
423	420
424	421	my $location = $headers->location;
425	422	$headers = $headers->location('http://127.0.0.1/foo');
426	423
427	424	Shortcut for the C<Location> header.
428	425
429		-=head2 C<names>
	426	+=head2 names
430	427
431	428	my $names = $headers->names;
432	429
433	430	Generate a list of all currently defined headers.
434	431
435		-=head2 C<origin>
	432	+=head2 origin
436	433
437	434	my $origin = $headers->origin;
438	435	$headers = $headers->origin('http://example.com');
439	436
440	437	Shortcut for the C<Origin> header from RFC 6454.
441	438
442		-=head2 C<parse>
	439	+=head2 parse
443	440
444		- $headers = $headers->parse("Content-Type: text/plain\r\n\r\n");
	441	+ $headers = $headers->parse("Content-Type: text/plain\x0d\x0a\x0d\x0a");
445	442
446	443	Parse formatted headers.
447	444
448		-=head2 C<proxy_authenticate>
	445	+=head2 proxy_authenticate
449	446
450	447	my $authenticate = $headers->proxy_authenticate;
451	448	$headers = $headers->proxy_authenticate('Basic "realm"');
452	449
453	450	Shortcut for the C<Proxy-Authenticate> header.
454	451
455		-=head2 C<proxy_authorization>
	452	+=head2 proxy_authorization
456	453
457	454	my $authorization = $headers->proxy_authorization;
458	455	$headers = $headers->proxy_authorization('Basic Zm9vOmJhcg==');
459	456
460	457	Shortcut for the C<Proxy-Authorization> header.
461	458
462		-=head2 C<range>
	459	+=head2 range
463	460
464	461	my $range = $headers->range;
465	462	$headers = $headers->range('bytes=2-8');
466	463
467	464	Shortcut for the C<Range> header.
468	465
469		-=head2 C<referrer>
	466	+=head2 referrer
470	467
471	468	my $referrer = $headers->referrer;
472	469	$headers = $headers->referrer('http://mojolicio.us');
...	...	@@ -474,76 +471,76 @@ Shortcut for the C<Range> header.
474	471	Shortcut for the C<Referer> header, there was a typo in RFC 2068 which
475	472	resulted in C<Referer> becoming an official header.
476	473
477		-=head2 C<remove>
	474	+=head2 remove
478	475
479	476	$headers = $headers->remove('Content-Type');
480	477
481	478	Remove a header.
482	479
483		-=head2 C<sec_websocket_accept>
	480	+=head2 sec_websocket_accept
484	481
485	482	my $accept = $headers->sec_websocket_accept;
486	483	$headers = $headers->sec_websocket_accept('s3pPLMBiTxaQ9kYGzzhZRbK+xOo=');
487	484
488	485	Shortcut for the C<Sec-WebSocket-Accept> header from RFC 6455.
489	486
490		-=head2 C<sec_websocket_extensions>
	487	+=head2 sec_websocket_extensions
491	488
492	489	my $extensions = $headers->sec_websocket_extensions;
493	490	$headers = $headers->sec_websocket_extensions('foo');
494	491
495	492	Shortcut for the C<Sec-WebSocket-Extensions> header from RFC 6455.
496	493
497		-=head2 C<sec_websocket_key>
	494	+=head2 sec_websocket_key
498	495
499	496	my $key = $headers->sec_websocket_key;
500	497	$headers = $headers->sec_websocket_key('dGhlIHNhbXBsZSBub25jZQ==');
501	498
502	499	Shortcut for the C<Sec-WebSocket-Key> header from RFC 6455.
503	500
504		-=head2 C<sec_websocket_protocol>
	501	+=head2 sec_websocket_protocol
505	502
506	503	my $protocol = $headers->sec_websocket_protocol;
507	504	$headers = $headers->sec_websocket_protocol('sample');
508	505
509	506	Shortcut for the C<Sec-WebSocket-Protocol> header from RFC 6455.
510	507
511		-=head2 C<sec_websocket_version>
	508	+=head2 sec_websocket_version
512	509
513	510	my $version = $headers->sec_websocket_version;
514	511	$headers = $headers->sec_websocket_version(13);
515	512
516	513	Shortcut for the C<Sec-WebSocket-Version> header from RFC 6455.
517	514
518		-=head2 C<server>
	515	+=head2 server
519	516
520	517	my $server = $headers->server;
521	518	$headers = $headers->server('Mojo');
522	519
523	520	Shortcut for the C<Server> header.
524	521
525		-=head2 C<set_cookie>
	522	+=head2 set_cookie
526	523
527	524	my $cookie = $headers->set_cookie;
528	525	$headers = $headers->set_cookie('f=b; path=/');
529	526
530	527	Shortcut for the C<Set-Cookie> header from RFC 6265.
531	528
532		-=head2 C<status>
	529	+=head2 status
533	530
534	531	my $status = $headers->status;
535	532	$headers = $headers->status('200 OK');
536	533
537	534	Shortcut for the C<Status> header from RFC 3875.
538	535
539		-=head2 C<te>
	536	+=head2 te
540	537
541	538	my $te = $headers->te;
542	539	$headers = $headers->te('chunked');
543	540
544	541	Shortcut for the C<TE> header.
545	542
546		-=head2 C<to_hash>
	543	+=head2 to_hash
547	544
548	545	my $single = $headers->to_hash;
549	546	my $multi = $headers->to_hash(1);
...	...	@@ -553,41 +550,41 @@ line values are disabled by default.
553	550
554	551	say $headers->to_hash->{DNT};
555	552
556		-=head2 C<to_string>
	553	+=head2 to_string
557	554
558	555	my $string = $headers->to_string;
559	556
560	557	Turn headers into a string, suitable for HTTP messages.
561	558
562		-=head2 C<trailer>
	559	+=head2 trailer
563	560
564	561	my $trailer = $headers->trailer;
565	562	$headers = $headers->trailer('X-Foo');
566	563
567	564	Shortcut for the C<Trailer> header.
568	565
569		-=head2 C<transfer_encoding>
	566	+=head2 transfer_encoding
570	567
571	568	my $encoding = $headers->transfer_encoding;
572	569	$headers = $headers->transfer_encoding('chunked');
573	570
574	571	Shortcut for the C<Transfer-Encoding> header.
575	572
576		-=head2 C<upgrade>
	573	+=head2 upgrade
577	574
578	575	my $upgrade = $headers->upgrade;
579	576	$headers = $headers->upgrade('websocket');
580	577
581	578	Shortcut for the C<Upgrade> header.
582	579
583		-=head2 C<user_agent>
	580	+=head2 user_agent
584	581
585	582	my $agent = $headers->user_agent;
586	583	$headers = $headers->user_agent('Mojo/1.0');
587	584
588	585	Shortcut for the C<User-Agent> header.
589	586
590		-=head2 C<www_authenticate>
	587	+=head2 www_authenticate
591	588
592	589	my $authenticate = $headers->www_authenticate;
593	590	$headers = $headers->www_authenticate('Basic realm="realm"');

...	...	@@ -80,7 +80,13 @@ sub parse {
80	80	sub rel_dir { catdir(@{shift->{parts} \|\| []}, split '/', shift) }
81	81	sub rel_file { catfile(@{shift->{parts} \|\| []}, split '/', shift) }
82	82
83		-sub slurp_rel_file { slurp shift->rel_file(@_) }
	83	+# DEPRECATED in Rainbow!
	84	+sub slurp_rel_file {
	85	+ warn <<EOF;
	86	+Mojo::Home->slurp_rel_file is DEPRECATED in favor of Mojo::Util->slurp!!!
	87	+EOF
	88	+ slurp shift->rel_file(@_);
	89	+}
84	90
85	91	sub to_string { catdir(@{shift->{parts} \|\| []}) }
86	92
...	...	@@ -110,14 +116,14 @@ L<Mojo::Home> is a container for home directories.
110	116	L<Mojo::Home> inherits all methods from L<Mojo::Base> and implements the
111	117	following new ones.
112	118
113		-=head2 C<new>
	119	+=head2 new
114	120
115	121	my $home = Mojo::Home->new;
116	122	my $home = Mojo::Home->new('/home/sri/myapp');
117	123
118	124	Construct a new L<Mojo::Home> object.
119	125
120		-=head2 C<detect>
	126	+=head2 detect
121	127
122	128	$home = $home->detect;
123	129	$home = $home->detect('My::App');
...	...	@@ -125,13 +131,13 @@ Construct a new L<Mojo::Home> object.
125	131	Detect home directory from the value of the C<MOJO_HOME> environment variable
126	132	or application class.
127	133
128		-=head2 C<lib_dir>
	134	+=head2 lib_dir
129	135
130	136	my $path = $home->lib_dir;
131	137
132	138	Path to C<lib> directory of application.
133	139
134		-=head2 C<list_files>
	140	+=head2 list_files
135	141
136	142	my $files = $home->list_files;
137	143	my $files = $home->list_files('foo/bar');
...	...	@@ -141,40 +147,32 @@ diectory.
141	147
142	148	$home->rel_file($home->list_files('templates/layouts')->[1]);
143	149
144		-=head2 C<mojo_lib_dir>
	150	+=head2 mojo_lib_dir
145	151
146	152	my $path = $home->mojo_lib_dir;
147	153
148	154	Path to C<lib> directory in which L<Mojolicious> is installed.
149	155
150		-=head2 C<parse>
	156	+=head2 parse
151	157
152	158	$home = $home->parse('/home/sri/myapp');
153	159
154	160	Parse home directory.
155	161
156		-=head2 C<rel_dir>
	162	+=head2 rel_dir
157	163
158	164	my $path = $home->rel_dir('foo/bar');
159	165
160	166	Portably generate an absolute path for a directory relative to the home
161	167	directory.
162	168
163		-=head2 C<rel_file>
	169	+=head2 rel_file
164	170
165	171	my $path = $home->rel_file('foo/bar.html');
166	172
167	173	Portably generate an absolute path for a file relative to the home directory.
168	174
169		-=head2 C<slurp_rel_file>
170		-
171		- my $content = $home->slurp_rel_file('foo/bar.html');
172		-
173		-Portably read all data at once from file relative to the home directory.
174		-
175		- my $content = $home->slurp_rel_file($home->list_files('public')->[1]);
176		-
177		-=head2 C<to_string>
	175	+=head2 to_string
178	176
179	177	my $string = $home->to_string;
180	178	my $string = "$home";

...	...	@@ -42,13 +42,13 @@ sub acceptor {
42	42	# Make sure connection manager is running
43	43	$self->_manager;
44	44
45		- # New acceptor
	45	+ # Connect acceptor with reactor
46	46	my $id = $self->_id;
47	47	$self->{acceptors}{$id} = $acceptor;
48	48	weaken $acceptor->reactor($self->reactor)->{reactor};
49	49	$self->{accepts} = $self->max_accepts if $self->max_accepts;
50	50
51		- # Stop accepting
	51	+ # Stop accepting so new acceptor can get picked up
52	52	$self->_not_accepting;
53	53
54	54	return $id;
...	...	@@ -61,25 +61,22 @@ sub client {
61	61	# Make sure connection manager is running
62	62	$self->_manager;
63	63
64		- # New client
65	64	my $id = $self->_id;
66	65	my $c = $self->{connections}{$id} \|\|= {};
67	66	my $client = $c->{client} = Mojo::IOLoop::Client->new;
68	67	weaken $client->reactor($self->reactor)->{reactor};
69	68
70		- # Connect
71	69	weaken $self;
72	70	$client->on(
73	71	connect => sub {
74	72	my $handle = pop;
75	73
76		- # New stream
	74	+ # Turn handle into stream
77	75	my $c = $self->{connections}{$id};
78	76	delete $c->{client};
79	77	my $stream = $c->{stream} = Mojo::IOLoop::Stream->new($handle);
80	78	$self->_stream($stream => $id);
81	79
82		- # Connected
83	80	$self->$cb(undef, $stream);
84	81	}
85	82	);
...	...	@@ -128,14 +125,13 @@ sub server {
128	125	my ($self, $cb) = (shift, pop);
129	126	$self = $self->singleton unless ref $self;
130	127
131		- # New server
132	128	my $server = Mojo::IOLoop::Server->new;
133	129	weaken $self;
134	130	$server->on(
135	131	accept => sub {
136	132	my $handle = pop;
137	133
138		- # Accept
	134	+ # Turn handle into stream
139	135	my $stream = Mojo::IOLoop::Stream->new($handle);
140	136	$self->$cb($stream, $self->stream($stream));
141	137
...	...	@@ -144,7 +140,7 @@ sub server {
144	140	if defined $self->{accepts}
145	141	&& ($self->{accepts} -= int(rand 2) + 1) <= 0;
146	142
147		- # Stop accepting
	143	+ # Stop accepting to release accept mutex
148	144	$self->_not_accepting;
149	145	}
150	146	);
...	...	@@ -214,7 +210,7 @@ sub _id {
214	210	sub _manage {
215	211	my $self = shift;
216	212
217		- # Start accepting if possible
	213	+ # Try to acquire accept mutex
218	214	$self->_accepting;
219	215
220	216	# Close connections gracefully
...	...	@@ -241,9 +237,8 @@ sub _not_accepting {
241	237	# Release accept mutex
242	238	return unless delete $self->{accepting};
243	239	return unless my $cb = $self->unlock;
244		- $self->$cb();
	240	+ $self->$cb;
245	241
246		- # Stop accepting
247	242	$_->stop for values %{$self->{acceptors} \|\| {}};
248	243	}
249	244
...	...	@@ -274,7 +269,7 @@ sub _stream {
274	269	$self->{connections}{$id}{stream} = $stream;
275	270	weaken $stream->reactor($self->reactor)->{reactor};
276	271
277		- # Stream
	272	+ # Start streaming
278	273	weaken $self;
279	274	$stream->on(close => sub { $self->{connections}{$id}{finish} = 1 });
280	275	$stream->start;
...	...	@@ -297,12 +292,12 @@ Mojo::IOLoop - Minimalistic event loop
297	292	my ($loop, $stream) = @_;
298	293
299	294	$stream->on(read => sub {
300		- my ($stream, $chunk) = @_;
	295	+ my ($stream, $bytes) = @_;
301	296
302		- # Process input
303		- say $chunk;
	297	+ # Process input chunk
	298	+ say $bytes;
304	299
305		- # Got some data, time to write
	300	+ # Write response
306	301	$stream->write('HTTP/1.1 200 OK');
307	302	});
308	303	});
...	...	@@ -312,14 +307,14 @@ Mojo::IOLoop - Minimalistic event loop
312	307	my ($loop, $err, $stream) = @_;
313	308
314	309	$stream->on(read => sub {
315		- my ($stream, $chunk) = @_;
	310	+ my ($stream, $bytes) = @_;
316	311
317	312	# Process input
318		- say "Input: $chunk";
	313	+ say "Input: $bytes";
319	314	});
320	315
321	316	# Write request
322		- $stream->write("GET / HTTP/1.1\r\n\r\n");
	317	+ $stream->write("GET / HTTP/1.1\x0d\x0a\x0d\x0a");
323	318	});
324	319
325	320	# Add a timer
...	...	@@ -352,7 +347,7 @@ See L<Mojolicious::Guides::Cookbook> for more.
352	347
353	348	L<Mojo::IOLoop> implements the following attributes.
354	349
355		-=head2 C<accept_interval>
	350	+=head2 accept_interval
356	351
357	352	my $interval = $loop->accept_interval;
358	353	$loop = $loop->accept_interval(0.5);
...	...	@@ -361,7 +356,7 @@ Interval in seconds for trying to reacquire the accept mutex and connection
361	356	management, defaults to C<0.025>. Note that changing this value can affect
362	357	performance and idle CPU usage.
363	358
364		-=head2 C<lock>
	359	+=head2 lock
365	360
366	361	my $cb = $loop->lock;
367	362	$loop = $loop->lock(sub {...});
...	...	@@ -377,7 +372,7 @@ this callback are not captured.
377	372	return 1;
378	373	});
379	374
380		-=head2 C<max_accepts>
	375	+=head2 max_accepts
381	376
382	377	my $max = $loop->max_accepts;
383	378	$loop = $loop->max_accepts(1000);
...	...	@@ -388,7 +383,7 @@ to C<0>. Setting the value to C<0> will allow this event loop to accept new
388	383	connections indefinitely. Note that up to half of this value can be subtracted
389	384	randomly to improve load balancing between multiple server processes.
390	385
391		-=head2 C<max_connections>
	386	+=head2 max_connections
392	387
393	388	my $max = $loop->max_connections;
394	389	$loop = $loop->max_connections(1000);
...	...	@@ -399,14 +394,14 @@ C<1000>. Setting the value to C<0> will make this event loop stop accepting
399	394	new connections and allow it to shut down gracefully without interrupting
400	395	existing connections.
401	396
402		-=head2 C<multi_accept>
	397	+=head2 multi_accept
403	398
404	399	my $multi = $loop->multi_accept;
405	400	$loop = $loop->multi_accept(100);
406	401
407	402	Number of connections to accept at once, defaults to C<50>.
408	403
409		-=head2 C<reactor>
	404	+=head2 reactor
410	405
411	406	my $reactor = $loop->reactor;
412	407	$loop = $loop->reactor(Mojo::Reactor->new);
...	...	@@ -423,7 +418,7 @@ L<Mojo::Reactor::EV> object.
423	418	# Change to watching only if handle becomes writable
424	419	$loop->reactor->watch($handle, 0, 1);
425	420
426		-=head2 C<unlock>
	421	+=head2 unlock
427	422
428	423	my $cb = $loop->unlock;
429	424	$loop = $loop->unlock(sub {...});
...	...	@@ -436,7 +431,7 @@ processes. Note that exceptions in this callback are not captured.
436	431	L<Mojo::IOLoop> inherits all methods from L<Mojo::Base> and implements the
437	432	following new ones.
438	433
439		-=head2 C<acceptor>
	434	+=head2 acceptor
440	435
441	436	my $server = Mojo::IOLoop->acceptor($id);
442	437	my $server = $loop->acceptor($id);
...	...	@@ -444,7 +439,7 @@ following new ones.
444	439
445	440	Get L<Mojo::IOLoop::Server> object for id or turn object into an acceptor.
446	441
447		-=head2 C<client>
	442	+=head2 client
448	443
449	444	my $id
450	445	= Mojo::IOLoop->client(address => '127.0.0.1', port => 3000, sub {...});
...	...	@@ -460,7 +455,7 @@ L<Mojo::IOLoop::Client/"connect">.
460	455	...
461	456	});
462	457
463		-=head2 C<delay>
	458	+=head2 delay
464	459
465	460	my $delay = Mojo::IOLoop->delay;
466	461	my $delay = $loop->delay;
...	...	@@ -506,14 +501,14 @@ ones as a chain of steps.
506	501	# Wait for events if necessary
507	502	$delay->wait unless Mojo::IOLoop->is_running;
508	503
509		-=head2 C<generate_port>
	504	+=head2 generate_port
510	505
511	506	my $port = Mojo::IOLoop->generate_port;
512	507	my $port = $loop->generate_port;
513	508
514	509	Find a free TCP port, this is a utility function primarily used for tests.
515	510
516		-=head2 C<is_running>
	511	+=head2 is_running
517	512
518	513	my $success = Mojo::IOLoop->is_running;
519	514	my $success = $loop->is_running;
...	...	@@ -522,7 +517,7 @@ Check if event loop is running.
522	517
523	518	exit unless Mojo::IOLoop->is_running;
524	519
525		-=head2 C<one_tick>
	520	+=head2 one_tick
526	521
527	522	Mojo::IOLoop->one_tick;
528	523	$loop->one_tick;
...	...	@@ -530,7 +525,7 @@ Check if event loop is running.
530	525	Run event loop until an event occurs. Note that this method can recurse back
531	526	into the reactor, so you need to be careful.
532	527
533		-=head2 C<recurring>
	528	+=head2 recurring
534	529
535	530	my $id = Mojo::IOLoop->recurring(0.5 => sub {...});
536	531	my $id = $loop->recurring(3 => sub {...});
...	...	@@ -541,7 +536,7 @@ amount of time in seconds.
541	536	# Invoke as soon as possible
542	537	Mojo::IOLoop->recurring(0 => sub { say 'Reactor tick.' });
543	538
544		-=head2 C<remove>
	539	+=head2 remove
545	540
546	541	Mojo::IOLoop->remove($id);
547	542	$loop->remove($id);
...	...	@@ -549,7 +544,7 @@ amount of time in seconds.
549	544	Remove anything with an id, connections will be dropped gracefully by allowing
550	545	them to finish writing all data in their write buffers.
551	546
552		-=head2 C<server>
	547	+=head2 server
553	548
554	549	my $id = Mojo::IOLoop->server(port => 3000, sub {...});
555	550	my $id = $loop->server(port => 3000, sub {...});
...	...	@@ -564,7 +559,7 @@ as L<Mojo::IOLoop::Server/"listen">.
564	559	...
565	560	});
566	561
567		-=head2 C<singleton>
	562	+=head2 singleton
568	563
569	564	my $loop = Mojo::IOLoop->singleton;
570	565
...	...	@@ -575,7 +570,7 @@ loop object from everywhere inside the process.
575	570	Mojo::IOLoop->timer(2 => sub { Mojo::IOLoop->stop });
576	571	Mojo::IOLoop->start;
577	572
578		-=head2 C<start>
	573	+=head2 start
579	574
580	575	Mojo::IOLoop->start;
581	576	$loop->start;
...	...	@@ -586,7 +581,7 @@ reactors stop automatically if there are no events being watched anymore.
586	581	# Start event loop only if it is not running already
587	582	Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
588	583
589		-=head2 C<stop>
	584	+=head2 stop
590	585
591	586	Mojo::IOLoop->stop;
592	587	$loop->stop;
...	...	@@ -594,7 +589,7 @@ reactors stop automatically if there are no events being watched anymore.
594	589	Stop the event loop, this will not interrupt any existing connections and the
595	590	event loop can be restarted by running C<start> again.
596	591
597		-=head2 C<stream>
	592	+=head2 stream
598	593
599	594	my $stream = Mojo::IOLoop->stream($id);
600	595	my $stream = $loop->stream($id);
...	...	@@ -605,7 +600,7 @@ Get L<Mojo::IOLoop::Stream> object for id or turn object into a connection.
605	600	# Increase inactivity timeout for connection to 300 seconds
606	601	Mojo::IOLoop->stream($id)->timeout(300);
607	602
608		-=head2 C<timer>
	603	+=head2 timer
609	604
610	605	my $id = Mojo::IOLoop->timer(5 => sub {...});
611	606	my $id = $loop->timer(5 => sub {...});

...	...	@@ -43,7 +43,6 @@ sub _cleanup {
43	43	sub _connect {
44	44	my ($self, $args) = @_;
45	45
46		- # New socket
47	46	my $handle;
48	47	my $reactor = $self->reactor;
49	48	my $address = $args->{address} \|\|= 'localhost';
...	...	@@ -83,7 +82,6 @@ sub _tls {
83	82	return;
84	83	}
85	84
86		- # Connected
87	85	$self->_cleanup->emit_safe(connect => $handle);
88	86	}
89	87
...	...	@@ -102,8 +100,6 @@ sub _try {
102	100
103	101	# TLS
104	102	if ($args->{tls} && !$handle->isa('IO::Socket::SSL')) {
105		-
106		- # No TLS support
107	103	return $self->emit_safe(
108	104	error => 'IO::Socket::SSL 1.75 required for TLS support')
109	105	unless TLS;
...	...	@@ -130,7 +126,6 @@ sub _try {
130	126	return $reactor->io($handle => sub { $self->_tls })->watch($handle, 0, 1);
131	127	}
132	128
133		- # Connected
134	129	$self->_cleanup->emit_safe(connect => $handle);
135	130	}
136	131
...	...	@@ -165,9 +160,10 @@ L<Mojo::IOLoop::Client> opens TCP connections for L<Mojo::IOLoop>.
165	160
166	161	=head1 EVENTS
167	162
168		-L<Mojo::IOLoop::Client> can emit the following events.
	163	+L<Mojo::IOLoop::Client> inherits all events from L<Mojo::EventEmitter> and can
	164	+emit the following new ones.
169	165
170		-=head2 C<connect>
	166	+=head2 connect
171	167
172	168	$client->on(connect => sub {
173	169	my ($client, $handle) = @_;
...	...	@@ -176,7 +172,7 @@ L<Mojo::IOLoop::Client> can emit the following events.
176	172
177	173	Emitted safely once the connection is established.
178	174
179		-=head2 C<error>
	175	+=head2 error
180	176
181	177	$client->on(error => sub {
182	178	my ($client, $err) = @_;
...	...	@@ -189,7 +185,7 @@ Emitted safely if an error occurs on the connection.
189	185
190	186	L<Mojo::IOLoop::Client> implements the following attributes.
191	187
192		-=head2 C<reactor>
	188	+=head2 reactor
193	189
194	190	my $reactor = $client->reactor;
195	191	$client = $client->reactor(Mojo::Reactor::Poll->new);
...	...	@@ -202,7 +198,7 @@ global L<Mojo::IOLoop> singleton.
202	198	L<Mojo::IOLoop::Client> inherits all methods from L<Mojo::EventEmitter> and
203	199	implements the following new ones.
204	200
205		-=head2 C<connect>
	201	+=head2 connect
206	202
207	203	$client->connect(address => '127.0.0.1', port => 3000);
208	204
...	...	@@ -213,40 +209,40 @@ These options are currently available:
213	209
214	210	=over 2
215	211
216		-=item C<address>
	212	+=item address
217	213
218	214	Address or host name of the peer to connect to, defaults to C<localhost>.
219	215
220		-=item C<handle>
	216	+=item handle
221	217
222	218	Use an already prepared handle.
223	219
224		-=item C<local_address>
	220	+=item local_address
225	221
226	222	Local address to bind to.
227	223
228		-=item C<port>
	224	+=item port
229	225
230	226	Port to connect to.
231	227
232		-=item C<timeout>
	228	+=item timeout
233	229
234	230	Maximum amount of time in seconds establishing connection may take before
235	231	getting canceled, defaults to C<10>.
236	232
237		-=item C<tls>
	233	+=item tls
238	234
239	235	Enable TLS.
240	236
241		-=item C<tls_ca>
	237	+=item tls_ca
242	238
243	239	Path to TLS certificate authority file. Also activates hostname verification.
244	240
245		-=item C<tls_cert>
	241	+=item tls_cert
246	242
247	243	Path to the TLS certificate file.
248	244
249		-=item C<tls_key>
	245	+=item tls_key
250	246
251	247	Path to the TLS key file.
252	248

...	...	@@ -109,9 +109,10 @@ L<Mojo::IOLoop::Delay> controls the flow of events for L<Mojo::IOLoop>.
109	109
110	110	=head1 EVENTS
111	111
112		-L<Mojo::IOLoop::Delay> can emit the following events.
	112	+L<Mojo::IOLoop::Delay> inherits all events from L<Mojo::EventEmitter> and can
	113	+emit the following new ones.
113	114
114		-=head2 C<finish>
	115	+=head2 finish
115	116
116	117	$delay->on(finish => sub {
117	118	my ($delay, @args) = @_;
...	...	@@ -125,7 +126,7 @@ steps.
125	126
126	127	L<Mojo::IOLoop::Delay> implements the following attributes.
127	128
128		-=head2 C<ioloop>
	129	+=head2 ioloop
129	130
130	131	my $ioloop = $delay->ioloop;
131	132	$delay = $delay->ioloop(Mojo::IOLoop->new);
...	...	@@ -138,7 +139,7 @@ singleton.
138	139	L<Mojo::IOLoop::Delay> inherits all methods from L<Mojo::EventEmitter> and
139	140	implements the following new ones.
140	141
141		-=head2 C<begin>
	142	+=head2 begin
142	143
143	144	my $cb = $delay->begin;
144	145
...	...	@@ -150,7 +151,7 @@ that the first argument passed to the callback will be ignored.
150	151	Mojo::UserAgent->new->get('mojolicio.us' => $delay->begin);
151	152	my $tx = $delay->wait;
152	153
153		-=head2 C<end>
	154	+=head2 end
154	155
155	156	my $remaining = $delay->end;
156	157	my $remaining = $delay->end(@args);
...	...	@@ -158,7 +159,7 @@ that the first argument passed to the callback will be ignored.
158	159	Decrement active event counter, all arguments are queued for the next step or
159	160	C<finish> event and C<wait> method.
160	161
161		-=head2 C<steps>
	162	+=head2 steps
162	163
163	164	$delay = $delay->steps(sub {...}, sub {...});
164	165
...	...	@@ -166,7 +167,7 @@ Sequentialize multiple events, the first callback will run right away, and the
166	167	next one once the active event counter reaches zero, this chain will continue
167	168	until there are no more callbacks left.
168	169
169		-=head2 C<wait>
	170	+=head2 wait
170	171
171	172	my @args = $delay->wait;
172	173

...	...	@@ -78,7 +78,6 @@ sub listen {
78	78	$handle->blocking(0);
79	79	$self->{handle} = $handle;
80	80
81		- # TLS
82	81	return unless $args->{tls};
83	82	croak "IO::Socket::SSL 1.75 required for TLS support" unless TLS;
84	83
...	...	@@ -115,7 +114,6 @@ sub stop { $_[0]->reactor->remove($_[0]->{handle}) }
115	114	sub _accept {
116	115	my $self = shift;
117	116
118		- # Accept
119	117	return unless my $handle = $self->{handle}->accept;
120	118	$handle->blocking(0);
121	119
...	...	@@ -182,9 +180,10 @@ L<Mojo::IOLoop::Server> accepts TCP connections for L<Mojo::IOLoop>.
182	180
183	181	=head1 EVENTS
184	182
185		-L<Mojo::IOLoop::Server> can emit the following events.
	183	+L<Mojo::IOLoop::Server> inherits all events from L<Mojo::EventEmitter> and can
	184	+emit the following new ones.
186	185
187		-=head2 C<accept>
	186	+=head2 accept
188	187
189	188	$server->on(accept => sub {
190	189	my ($server, $handle) = @_;
...	...	@@ -197,14 +196,14 @@ Emitted safely for each accepted connection.
197	196
198	197	L<Mojo::IOLoop::Server> implements the following attributes.
199	198
200		-=head2 C<multi_accept>
	199	+=head2 multi_accept
201	200
202	201	my $multi = $server->multi_accept;
203	202	$server = $server->multi_accept(100);
204	203
205	204	Number of connections to accept at once, defaults to C<50>.
206	205
207		-=head2 C<reactor>
	206	+=head2 reactor
208	207
209	208	my $reactor = $server->reactor;
210	209	$server = $server->reactor(Mojo::Reactor::Poll->new);
...	...	@@ -217,7 +216,7 @@ global L<Mojo::IOLoop> singleton.
217	216	L<Mojo::IOLoop::Server> inherits all methods from L<Mojo::EventEmitter> and
218	217	implements the following new ones.
219	218
220		-=head2 C<listen>
	219	+=head2 listen
221	220
222	221	$server->listen(port => 3000);
223	222
...	...	@@ -228,53 +227,53 @@ These options are currently available:
228	227
229	228	=over 2
230	229
231		-=item C<address>
	230	+=item address
232	231
233	232	Local address to listen on, defaults to all.
234	233
235		-=item C<backlog>
	234	+=item backlog
236	235
237	236	Maximum backlog size, defaults to C<SOMAXCONN>.
238	237
239		-=item C<port>
	238	+=item port
240	239
241	240	Port to listen on.
242	241
243		-=item C<tls>
	242	+=item tls
244	243
245	244	Enable TLS.
246	245
247		-=item C<tls_ca>
	246	+=item tls_ca
248	247
249	248	Path to TLS certificate authority file.
250	249
251		-=item C<tls_cert>
	250	+=item tls_cert
252	251
253	252	Path to the TLS cert file, defaults to a built-in test certificate.
254	253
255		-=item C<tls_key>
	254	+=item tls_key
256	255
257	256	Path to the TLS key file, defaults to a built-in test key.
258	257
259		-=item C<tls_verify>
	258	+=item tls_verify
260	259
261	260	TLS verification mode, defaults to C<0x03>.
262	261
263	262	=back
264	263
265		-=head2 C<generate_port>
	264	+=head2 generate_port
266	265
267	266	my $port = $server->generate_port;
268	267
269	268	Find a free TCP port, this is a utility function primarily used for tests.
270	269
271		-=head2 C<start>
	270	+=head2 start
272	271
273	272	$server->start;
274	273
275	274	Start accepting connections.
276	275
277		-=head2 C<stop>
	276	+=head2 stop
278	277
279	278	$server->stop;
280	279

...	...	@@ -24,7 +24,6 @@ sub close {
24	24	return unless my $handle = delete $self->{handle};
25	25	$reactor->remove($handle);
26	26
27		- # Close
28	27	close $handle;
29	28	$self->emit_safe('close');
30	29	}
...	...	@@ -65,14 +64,9 @@ sub steal_handle {
65	64	sub write {
66	65	my ($self, $chunk, $cb) = @_;
67	66
68		- # Prepare chunk for writing
69	67	$self->{buffer} .= $chunk;
70		-
71		- # Write with roundtrip
72	68	if ($cb) { $self->once(drain => $cb) }
73	69	else { return $self unless length $self->{buffer} }
74		-
75		- # Start writing
76	70	$self->reactor->watch($self->{handle}, !$self->{paused}, 1)
77	71	if $self->{handle};
78	72
...	...	@@ -82,10 +76,7 @@ sub write {
82	76	sub _read {
83	77	my $self = shift;
84	78
85		- # Read
86	79	my $read = $self->{handle}->sysread(my $buffer, 131072, 0);
87		-
88		- # Error
89	80	unless (defined $read) {
90	81
91	82	# Retry
...	...	@@ -101,7 +92,6 @@ sub _read {
101	92	# EOF
102	93	return $self->close if $read == 0;
103	94
104		- # Handle read
105	95	$self->emit_safe(read => $buffer)->{active} = time;
106	96	}
107	97
...	...	@@ -118,19 +108,15 @@ sub _startup {
118	108	}
119	109	);
120	110
121		- # Start streaming
122	111	$reactor->io($self->{handle}, sub { pop() ? $self->_write : $self->_read });
123	112	}
124	113
125	114	sub _write {
126	115	my $self = shift;
127	116
128		- # Write as much as possible
129	117	my $handle = $self->{handle};
130	118	if (length $self->{buffer}) {
131	119	my $written = $handle->syswrite($self->{buffer});
132		-
133		- # Error
134	120	unless (defined $written) {
135	121
136	122	# Retry
...	...	@@ -143,15 +129,11 @@ sub _write {
143	129	return $self->emit_safe(error => $!)->close;
144	130	}
145	131
146		- # Remove written chunk from buffer
147	132	$self->emit_safe(write => substr($self->{buffer}, 0, $written, ''));
148	133	$self->{active} = time;
149	134	}
150	135
151		- # Handle drain
152	136	$self->emit_safe('drain') if !length $self->{buffer};
153		-
154		- # Stop writing
155	137	return if $self->is_writing;
156	138	$self->reactor->watch($handle, !$self->{paused}, 0);
157	139	}
...	...	@@ -169,7 +151,7 @@ Mojo::IOLoop::Stream - Non-blocking I/O stream
169	151	# Create stream
170	152	my $stream = Mojo::IOLoop::Stream->new($handle);
171	153	$stream->on(read => sub {
172		- my ($stream, $chunk) = @_;
	154	+ my ($stream, $bytes) = @_;
173	155	...
174	156	});
175	157	$stream->on(close => sub {
...	...	@@ -195,9 +177,10 @@ L<Mojo::IOLoop>.
195	177
196	178	=head1 EVENTS
197	179
198		-L<Mojo::IOLoop::Stream> can emit the following events.
	180	+L<Mojo::IOLoop::Stream> inherits all events from L<Mojo::EventEmitter> and can
	181	+emit the following new ones.
199	182
200		-=head2 C<close>
	183	+=head2 close
201	184
202	185	$stream->on(close => sub {
203	186	my $stream = shift;
...	...	@@ -206,7 +189,7 @@ L<Mojo::IOLoop::Stream> can emit the following events.
206	189
207	190	Emitted safely if the stream gets closed.
208	191
209		-=head2 C<drain>
	192	+=head2 drain
210	193
211	194	$stream->on(drain => sub {
212	195	my $stream = shift;
...	...	@@ -215,7 +198,7 @@ Emitted safely if the stream gets closed.
215	198
216	199	Emitted safely once all data has been written.
217	200
218		-=head2 C<error>
	201	+=head2 error
219	202
220	203	$stream->on(error => sub {
221	204	my ($stream, $err) = @_;
...	...	@@ -224,16 +207,16 @@ Emitted safely once all data has been written.
224	207
225	208	Emitted safely if an error occurs on the stream.
226	209
227		-=head2 C<read>
	210	+=head2 read
228	211
229	212	$stream->on(read => sub {
230		- my ($stream, $chunk) = @_;
	213	+ my ($stream, $bytes) = @_;
231	214	...
232	215	});
233	216
234	217	Emitted safely if new data arrives on the stream.
235	218
236		-=head2 C<timeout>
	219	+=head2 timeout
237	220
238	221	$stream->on(timeout => sub {
239	222	my $stream = shift;
...	...	@@ -243,10 +226,10 @@ Emitted safely if new data arrives on the stream.
243	226	Emitted safely if the stream has been inactive for too long and will get
244	227	closed automatically.
245	228
246		-=head2 C<write>
	229	+=head2 write
247	230
248	231	$stream->on(write => sub {
249		- my ($stream, $chunk) = @_;
	232	+ my ($stream, $bytes) = @_;
250	233	...
251	234	});
252	235
...	...	@@ -256,7 +239,7 @@ Emitted safely if new data has been written to the stream.
256	239
257	240	L<Mojo::IOLoop::Stream> implements the following attributes.
258	241
259		-=head2 C<reactor>
	242	+=head2 reactor
260	243
261	244	my $reactor = $stream->reactor;
262	245	$stream = $stream->reactor(Mojo::Reactor::Poll->new);
...	...	@@ -264,7 +247,7 @@ L<Mojo::IOLoop::Stream> implements the following attributes.
264	247	Low level event reactor, defaults to the C<reactor> attribute value of the
265	248	global L<Mojo::IOLoop> singleton.
266	249
267		-=head2 C<timeout>
	250	+=head2 timeout
268	251
269	252	my $timeout = $stream->timeout;
270	253	$stream = $stream->timeout(45);
...	...	@@ -278,59 +261,59 @@ stream to be inactive indefinitely.
278	261	L<Mojo::IOLoop::Stream> inherits all methods from L<Mojo::EventEmitter> and
279	262	implements the following new ones.
280	263
281		-=head2 C<new>
	264	+=head2 new
282	265
283	266	my $stream = Mojo::IOLoop::Stream->new($handle);
284	267
285	268	Construct a new L<Mojo::IOLoop::Stream> object.
286	269
287		-=head2 C<close>
	270	+=head2 close
288	271
289	272	$stream->close;
290	273
291	274	Close stream immediately.
292	275
293		-=head2 C<handle>
	276	+=head2 handle
294	277
295	278	my $handle = $stream->handle;
296	279
297	280	Get handle for stream.
298	281
299		-=head2 C<is_readable>
	282	+=head2 is_readable
300	283
301	284	my $success = $stream->is_readable;
302	285
303	286	Quick non-blocking check if stream is readable, useful for identifying tainted
304	287	sockets.
305	288
306		-=head2 C<is_writing>
	289	+=head2 is_writing
307	290
308	291	my $success = $stream->is_writing;
309	292
310	293	Check if stream is writing.
311	294
312		-=head2 C<start>
	295	+=head2 start
313	296
314	297	$stream->start;
315	298
316	299	Start watching for new data on the stream.
317	300
318		-=head2 C<stop>
	301	+=head2 stop
319	302
320	303	$stream->stop;
321	304
322	305	Stop watching for new data on the stream.
323	306
324		-=head2 C<steal_handle>
	307	+=head2 steal_handle
325	308
326	309	my $handle = $stream->steal_handle;
327	310
328	311	Steal handle from stream and prevent it from getting closed automatically.
329	312
330		-=head2 C<write>
	313	+=head2 write
331	314
332		- $stream = $stream->write('Hello!');
333		- $stream = $stream->write('Hello!' => sub {...});
	315	+ $stream = $stream->write($bytes);
	316	+ $stream = $stream->write($bytes => sub {...});
334	317
335	318	Write data to stream, the optional drain callback will be invoked once all
336	319	data has been written.

...	...	@@ -2,11 +2,14 @@ package Mojo::JSON;
2	2	use Mojo::Base -base;
3	3
4	4	use B;
	5	+use Exporter 'import';
5	6	use Mojo::Util;
6	7	use Scalar::Util 'blessed';
7	8
8	9	has 'error';
9	10
	11	+our @EXPORT_OK = ('j');
	12	+
10	13	# Literal names
11	14	my $FALSE = bless \(my $false = 0), 'Mojo::JSON::_Bool';
12	15	my $TRUE = bless \(my $true = 1), 'Mojo::JSON::_Bool';
...	...	@@ -40,7 +43,7 @@ my $WHITESPACE_RE = qr/[\x20\x09\x0a\x0d]*/;
40	43	sub decode {
41	44	my ($self, $bytes) = @_;
42	45
43		- # Cleanup
	46	+ # Clean start
44	47	$self->error(undef);
45	48
46	49	# Missing input
...	...	@@ -99,7 +102,14 @@ sub encode {
99	102	}
100	103
101	104	sub false {$FALSE}
102		-sub true {$TRUE}
	105	+
	106	+sub j {
	107	+ my $d = shift;
	108	+ return __PACKAGE__->new->encode($d) if ref $d eq 'ARRAY' \|\| ref $d eq 'HASH';
	109	+ return __PACKAGE__->new->decode($d);
	110	+}
	111	+
	112	+sub true {$TRUE}
103	113
104	114	sub _decode_array {
105	115	my @array;
...	...	@@ -246,22 +256,14 @@ sub _encode_array {
246	256
247	257	sub _encode_object {
248	258	my $object = shift;
249		-
250		- # Encode pairs
251	259	my @pairs = map { _encode_string($_) . ':' . _encode_values($object->{$_}) }
252	260	keys %$object;
253		-
254		- # Stringify
255	261	return '{' . join(',', @pairs) . '}';
256	262	}
257	263
258	264	sub _encode_string {
259	265	my $string = shift;
260		-
261		- # Escape string
262	266	$string =~ s!([\x00-\x1F\x7F\x{2028}\x{2029}\\"/\b\f\n\r\t])!$REVERSE{$1}!gs;
263		-
264		- # Stringify
265	267	return "\"$string\"";
266	268	}
267	269
...	...	@@ -312,7 +314,6 @@ sub _exception {
312	314	$context .= ' at line ' . @lines . ', offset ' . length(pop @lines \|\| '');
313	315	}
314	316
315		- # Throw
316	317	die "$context\n";
317	318	}
318	319
...	...	@@ -328,12 +329,22 @@ Mojo::JSON - Minimalistic JSON
328	329
329	330	=head1 SYNOPSIS
330	331
	332	+ # Encode and decode JSON
331	333	use Mojo::JSON;
332		-
333	334	my $json = Mojo::JSON->new;
334	335	my $bytes = $json->encode({foo => [1, 2], bar => 'hello!', baz => \1});
335	336	my $hash = $json->decode($bytes);
336	337
	338	+ # Check for errors
	339	+ my $json = Mojo::JSON->new;
	340	+ if (defined(my $hash = $json->decode($bytes))) { say $hash->{message} }
	341	+ else { say 'Error: ', $json->error }
	342	+
	343	+ # Use the alternative interface
	344	+ use Mojo::JSON 'j';
	345	+ my $bytes = j({foo => [1, 2], bar => 'hello!', baz => \1});
	346	+ my $hash = j($bytes);
	347	+
337	348	=head1 DESCRIPTION
338	349
339	350	L<Mojo::JSON> is a minimalistic and relaxed implementation of RFC 4627. While
...	...	@@ -359,11 +370,25 @@ Decoding UTF-16 (LE/BE) and UTF-32 (LE/BE) will be handled transparently,
359	370	encoding will only generate UTF-8. The two Unicode whitespace characters
360	371	C<u2028> and C<u2029> will always be escaped to make JSONP easier.
361	372
	373	+=head1 FUNCTIONS
	374	+
	375	+L<Mojo::JSON> implements the following functions.
	376	+
	377	+=head2 j
	378	+
	379	+ my $bytes = j([1, 2, 3]);
	380	+ my $bytes = j({foo => 'bar'});
	381	+ my $array = j($bytes);
	382	+ my $hash = j($bytes);
	383	+
	384	+Encode Perl data structure or decode JSON and return C<undef> if decoding
	385	+fails.
	386	+
362	387	=head1 ATTRIBUTES
363	388
364	389	L<Mojo::JSON> implements the following attributes.
365	390
366		-=head2 C<error>
	391	+=head2 error
367	392
368	393	my $err = $json->error;
369	394	$json = $json->error('Parser error');
...	...	@@ -375,27 +400,28 @@ Parser errors.
375	400	L<Mojo::JSON> inherits all methods from L<Mojo::Base> and implements the
376	401	following new ones.
377	402
378		-=head2 C<decode>
	403	+=head2 decode
379	404
380	405	my $array = $json->decode($bytes);
381	406	my $hash = $json->decode($bytes);
382	407
383		-Decode JSON.
	408	+Decode JSON to Perl data structure and return C<undef> if decoding fails.
384	409
385		-=head2 C<encode>
	410	+=head2 encode
386	411
	412	+ my $bytes = $json->encode([1, 2, 3]);
387	413	my $bytes = $json->encode({foo => 'bar'});
388	414
389		-Encode Perl data structure.
	415	+Encode Perl data structure to JSON.
390	416
391		-=head2 C<false>
	417	+=head2 false
392	418
393	419	my $false = Mojo::JSON->false;
394	420	my $false = $json->false;
395	421
396	422	False value, used because Perl has no native equivalent.
397	423
398		-=head2 C<true>
	424	+=head2 true
399	425
400	426	my $true = Mojo::JSON->true;
401	427	my $true = $json->true;

...	...	@@ -10,7 +10,6 @@ sub get { shift->_pointer(0, @_) }
10	10	sub _pointer {
11	11	my ($self, $contains, $data, $pointer) = @_;
12	12
13		- # Parse pointer and walk data structure
14	13	$pointer = decode('UTF-8', url_unescape $pointer);
15	14	return $data unless $pointer =~ s!^/!!;
16	15	for my $p (split '/', $pointer) {
...	...	@@ -52,7 +51,7 @@ L<Mojo::JSON::Pointer> implements JSON Pointers.
52	51
53	52	=head1 METHODS
54	53
55		-=head2 C<contains>
	54	+=head2 contains
56	55
57	56	my $success = $pointer->contains($data, '/foo/1');
58	57
...	...	@@ -67,7 +66,7 @@ JSON Pointer.
67	66	$pointer->contains({foo => 'bar', baz => [4, 5, 6]}, '/bar');
68	67	$pointer->contains({foo => 'bar', baz => [4, 5, 6]}, '/baz/9');
69	68
70		-=head2 C<get>
	69	+=head2 get
71	70
72	71	my $value = $pointer->get($data, '/foo/bar');
73	72