update Mojolicious to 4.57 ・ 7f391f5 ・ Gitprep

- update Mojolicious to 4.57;
- Browse files
- Yuki Kimoto commited on 2013-12-02
- 1 parent 9358bf9
  
  commit 7f391f5c00d55bba97240e6522055c17f8191532

Showing 125 changed files with 3965 additions and 2478 deletions

mojo/README

...	...	@@ -0,0 +1,2 @@
	1	+mojo-legacy 4.57
	2	+https://github.com/jamadam/mojo-legacy

+10 -6

mojo/lib/Mojo.pm

View

@@ -15,10 +15,10 @@ has log  => sub { Mojo::Log->new };
 has ua   => sub {
   my $self = shift;
 
-  my $ua = Mojo::UserAgent->new->app($self);
+  my $ua = Mojo::UserAgent->new;
+  weaken $ua->server->app($self)->{app};
   weaken $self;
   $ua->on(error => sub { $self->log->error($_[1]) });
-  weaken $ua->{app};
 
   return $ua;
 };
@@ -27,7 +27,8 @@ sub new {
   my $self = shift->SUPER::new(@_);
 
   # Check if we have a log directory
-  my $home = $self->home->detect(ref $self);
+  my $home = $self->home;
+  $home->detect(ref $self) unless @{$home->parts};
   $self->log->path($home->rel_file('log/mojo.log'))
     if -w $home->rel_file('log');
 
@@ -58,6 +59,8 @@ sub _dict {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo - Duct tape for the HTML5 web!
@@ -92,7 +95,7 @@ frameworks. It provides all the basic tools and helpers needed to write
 simple web applications and higher level web frameworks, such as
 L<Mojolicious>.
 
-See L<Mojolicious> for more!
+See L<Mojolicious::Guides> for more!
 
 =head1 ATTRIBUTES
 
@@ -130,7 +133,7 @@ plugins, since non-blocking requests that are already in progress will
 interfere with new blocking ones.
 
   # Perform blocking request
-  my $body = $app->ua->get('example.com')->res->body;
+  say $app->ua->get('example.com')->res->body;
 
 =head1 METHODS
 
@@ -142,7 +145,8 @@ new ones.
   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.
+directory if necessary and set up logging to C<log/mojo.log> if there's a
+C<log> directory.
 
 =head2 build_tx
 

+5 -3

mojo/lib/Mojo/Asset.pm

View

@@ -20,6 +20,8 @@ sub slurp   { croak 'Method "slurp" not implemented by subclass' }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Asset - HTTP content storage base class
@@ -58,7 +60,7 @@ Pretend file ends earlier.
 =head2 start_range
 
   my $start = $asset->start_range;
-  $asset    = $asset->start_range(0);
+  $asset    = $asset->start_range(3);
 
 Pretend file starts later.
 
@@ -96,9 +98,9 @@ False.
 
 =head2 is_range
 
-  my $success = $asset->is_range;
+  my $bool = $asset->is_range;
 
-Check if asset has a C<start_range> or C<end_range>.
+Check if asset has a L</"start_range"> or L</"end_range">.
 
 =head2 move_to
 

+9 -7

mojo/lib/Mojo/Asset/File.pm

View

@@ -26,7 +26,7 @@ has handle => sub {
   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};
-    $name = "$base." . md5_sum(time . $$ . rand 9999999);
+    $name = "$base." . md5_sum(time . $$ . rand 9 x 7);
   }
   $self->path($name);
 
@@ -140,6 +140,8 @@ sub slurp {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Asset::File - File storage for HTTP content
@@ -174,8 +176,8 @@ implements the following new ones.
 
 =head2 cleanup
 
-  my $cleanup = $file->cleanup;
-  $file       = $file->cleanup(1);
+  my $bool = $file->cleanup;
+  $file    = $file->cleanup($bool);
 
 Delete file automatically once it's not used anymore.
 
@@ -184,14 +186,14 @@ Delete file automatically once it's not used anymore.
   my $handle = $file->handle;
   $file      = $file->handle(IO::File->new);
 
-File handle, created on demand.
+Filehandle, created on demand.
 
 =head2 path
 
   my $path = $file->path;
   $file    = $file->path('/home/sri/foo.txt');
 
-File path used to create C<handle>, can also be automatically generated if
+File path used to create L</"handle">, can also be automatically generated if
 necessary.
 
 =head2 tmpdir
@@ -199,7 +201,7 @@ necessary.
   my $tmpdir = $file->tmpdir;
   $file      = $file->tmpdir('/tmp');
 
-Temporary directory used to generate C<path>, defaults to the value of the
+Temporary directory used to generate L</"path">, defaults to the value of the
 MOJO_TMPDIR environment variable or auto detection.
 
 =head1 METHODS
@@ -237,7 +239,7 @@ True.
 
   $file = $file->move_to('/home/sri/bar.txt');
 
-Move asset data into a specific file and disable C<cleanup>.
+Move asset data into a specific file and disable L</"cleanup">.
 
 =head2 size
 

+5 -3

mojo/lib/Mojo/Asset/Memory.pm

View

@@ -55,6 +55,8 @@ sub slurp { shift->{content} }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Asset::Memory - In-memory storage for HTTP content
@@ -97,10 +99,10 @@ implements the following new ones.
 
 =head2 auto_upgrade
 
-  my $upgrade = $mem->auto_upgrade;
-  $mem        = $mem->auto_upgrade(1);
+  my $bool = $mem->auto_upgrade;
+  $mem     = $mem->auto_upgrade($bool);
 
-Try to detect if content size exceeds C<max_memory_size> limit and
+Try to detect if content size exceeds L</"max_memory_size"> limit and
 automatically upgrade to a L<Mojo::Asset::File> object.
 
 =head2 max_memory_size

+13 -15

mojo/lib/Mojo/Base.pm

View

@@ -14,7 +14,6 @@ use IO::Handle ();
 sub import {
   my $class = shift;
   return unless my $flag = shift;
-  no strict 'refs';
 
   # Base
   if ($flag eq '-base') { $flag = $class }
@@ -23,21 +22,24 @@ sub import {
   elsif ($flag eq '-strict') { $flag = undef }
 
   # Module
-  else {
-    my $file = $flag;
-    $file =~ s/::|'/\//g;
-    require "$file.pm" unless $flag->can('new');
+  elsif ((my $file = $flag) && !$flag->can('new')) {
+    $file =~ s!::|'!/!g;
+    require "$file.pm";
   }
 
   # ISA
   if ($flag) {
     my $caller = caller;
+    no strict 'refs';
     push @{"${caller}::ISA"}, $flag;
     *{"${caller}::has"} = sub { attr($caller, @_) };
   }
   
   my $caller = caller;
-  *{"${caller}::say"} = sub { say(@_) };
+  {
+    no strict 'refs';
+    *{"${caller}::say"} = sub { say(@_) };
+  }
 
   # Mojo modules are strict!
   strict->import;
@@ -51,9 +53,6 @@ sub new {
   bless @_ ? @_ > 1 ? {@_} : {%{$_[0]}} : {}, ref $class || $class;
 }
 
-# Performance is very important for something as often used as accessors,
-# so we optimize them by compiling our own code, don't be scared, we have
-# tests for every single case
 sub attr {
   my ($class, $attrs, $default) = @_;
   return unless ($class = ref $class || $class) && $attrs;
@@ -61,7 +60,6 @@ sub attr {
   Carp::croak 'Default has to be a code reference or constant value'
     if ref $default && ref $default ne 'CODE';
 
-  # Compile attributes
   for my $attr (@{ref $attrs eq 'ARRAY' ? $attrs : [$attrs]}) {
     Carp::croak qq{Attribute "$attr" invalid} unless $attr =~ /^[a-zA-Z_]\w*$/;
 
@@ -89,8 +87,6 @@ sub attr {
     # Footer (return invocant)
     $code .= "  \$_[0];\n}";
 
-    # 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";
   }
@@ -104,6 +100,8 @@ sub tap {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Base - Minimal base class for Mojo projects
@@ -185,7 +183,7 @@ flag or a base class.
   has [qw(name1 name2 name3)] => 'foo';
   has [qw(name1 name2 name3)] => sub {...};
 
-Create attributes for hash-based objects, just like the C<attr> method.
+Create attributes for hash-based objects, just like the L</"attr"> method.
 
 =head1 METHODS
 
@@ -222,8 +220,8 @@ argument.
   $object = $object->tap(sub {...});
 
 K combinator, tap into a method chain to perform operations on an object
-within the chain. The object will be the first argument passed to the closure
-and is also available via C<$_>.
+within the chain. The object will be the first argument passed to the callback
+and is also available as C<$_>.
 
 =head2 C<say>
 

+22 -6

mojo/lib/Mojo/ByteStream.pm

View

@@ -1,5 +1,5 @@
 package Mojo::ByteStream;
-use Mojo::Base -base;
+use Mojo::Base -strict;
 use overload '""' => sub { shift->to_string }, fallback => 1;
 
 use Exporter 'import';
@@ -63,10 +63,14 @@ sub split {
   return Mojo::Collection->new(map { $self->new($_) } split $pattern, $$self);
 }
 
+sub tap { shift->Mojo::Base::tap(@_) }
+
 sub to_string { ${$_[0]} }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::ByteStream - ByteStream
@@ -104,8 +108,7 @@ Construct a new scalar-based L<Mojo::ByteStream> object.
 
 =head1 METHODS
 
-L<Mojo::ByteStream> inherits all methods from L<Mojo::Base> and implements the
-following new ones.
+L<Mojo::ByteStream> implements the following methods.
 
 =head2 new
 
@@ -219,7 +222,7 @@ Print bytestream to handle and append a newline, defaults to C<STDOUT>.
 
 =head2 secure_compare
 
-  my $success = $stream->secure_compare($str);
+  my $bool = $stream->secure_compare($str);
 
 Compare bytestream with L<Mojo::Util/"secure_compare">.
 
@@ -263,9 +266,10 @@ Write all data from bytestream at once to file with L<Mojo::Util/"spurt">.
 
   my $collection = $stream->split(',');
 
-Turn bytestream into L<Mojo::Collection>.
+Turn bytestream into L<Mojo::Collection> object containing L<Mojo::ByteStream>
+objects.
 
-  b('a,b,c')->split(',')->pluck('quote')->join(',')->say;
+  b('a,b,c')->split(',')->quote->join(',')->say;
 
 =head2 squish
 
@@ -275,6 +279,12 @@ 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 tap
+
+  $stream = $stream->tap(sub {...});
+
+Alias for L<Mojo::Base/"tap">.
+
 =head2 to_string
 
   my $str = $stream->to_string;
@@ -327,6 +337,12 @@ bytestream with L<Mojo::Util/"xml_escape">.
 
 XOR encode bytestream with L<Mojo::Util/"xor_encode">.
 
+=head1 BYTESTREAM
+
+Direct scalar reference access to the bytestream is also possible.
+
+  $$stream .= 'foo';
+
 =head1 SEE ALSO
 
 L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicio.us>.

mojo/lib/Mojo/Cache.pm

View

@@ -19,6 +19,8 @@ sub set {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Cache - Naive in-memory cache

+76 -23

mojo/lib/Mojo/Collection.pm

View

@@ -1,16 +1,29 @@
 package Mojo::Collection;
-use Mojo::Base -base;
-use overload
-  'bool'   => sub {1},
-  '""'     => sub { shift->join("\n") },
-  fallback => 1;
+use Mojo::Base -strict;
+use overload bool => sub {1}, '""' => sub { shift->join("\n") }, fallback => 1;
 
+use Carp 'croak';
 use Exporter 'import';
 use List::Util;
 use Mojo::ByteStream;
+use Scalar::Util 'blessed';
 
 our @EXPORT_OK = ('c');
 
+sub AUTOLOAD {
+  my $self = shift;
+
+  my ($package, $method) = our $AUTOLOAD =~ /^([\w:]+)::(\w+)$/;
+  croak "Undefined subroutine &${package}::$method called"
+    unless blessed $self && $self->isa(__PACKAGE__);
+
+  croak qq{Can't locate object method "$method" via package "$package"}
+    unless @$self;
+  return $self->pluck($method, @_);
+}
+
+sub DESTROY { }
+
 sub new {
   my $class = shift;
   return bless [@_], ref $class || $class;
@@ -18,6 +31,10 @@ sub new {
 
 sub c { __PACKAGE__->new(@_) }
 
+sub compact {
+  shift->grep(sub { length(defined $_ ? $_ : '') });
+}
+
 sub each {
   my ($self, $cb) = @_;
   return @$self unless $cb;
@@ -33,16 +50,15 @@ sub first {
   return List::Util::first { $_ =~ $cb } @$self;
 }
 
+sub flatten { $_[0]->new(_flatten(@{$_[0]})) }
+
 sub grep {
   my ($self, $cb) = @_;
   return $self->new(grep { $cb->($_) } @$self) if ref $cb eq 'CODE';
   return $self->new(grep { $_ =~ $cb } @$self);
 }
 
-sub join {
-  my ($self, $expr) = @_;
-  return Mojo::ByteStream->new(join $expr, map({"$_"} @$self));
-}
+sub join { Mojo::ByteStream->new(join $_[1], map({"$_"} @{$_[0]})) }
 
 sub map {
   my ($self, $cb) = @_;
@@ -54,15 +70,9 @@ sub pluck {
   return $self->map(sub { $_->$method(@args) });
 }
 
-sub reverse {
-  my $self = shift;
-  return $self->new(reverse @$self);
-}
+sub reverse { $_[0]->new(reverse @{$_[0]}) }
 
-sub shuffle {
-  my $self = shift;
-  return $self->new(List::Util::shuffle @$self);
-}
+sub shuffle { $_[0]->new(List::Util::shuffle @{$_[0]}) }
 
 sub size { scalar @{$_[0]} }
 
@@ -76,14 +86,24 @@ sub sort {
   return $self->new($cb ? sort { $a->$cb($b) } @$self : sort @$self);
 }
 
+sub tap { shift->Mojo::Base::tap(@_) }
+
 sub uniq {
   my $self = shift;
   my %seen;
   return $self->grep(sub { !$seen{$_}++ });
 }
 
+sub _flatten {
+  map { _ref($_) ? _flatten(@$_) : $_ } @_;
+}
+
+sub _ref { ref $_[0] && (ref $_[0] eq 'ARRAY' || $_[0]->isa(__PACKAGE__)) }
+
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Collection - Collection
@@ -119,8 +139,7 @@ Construct a new array-based L<Mojo::Collection> object.
 
 =head1 METHODS
 
-L<Mojo::Collection> inherits all methods from L<Mojo::Base> and implements the
-following new ones.
+L<Mojo::Collection> implements the following methods.
 
 =head2 new
 
@@ -128,12 +147,21 @@ following new ones.
 
 Construct a new array-based L<Mojo::Collection> object.
 
+=head2 compact
+
+  my $new = $collection->compact;
+
+Create a new collection with all elements that are defined and not an empty
+string.
+
 =head2 each
 
   my @elements = $collection->each;
   $collection  = $collection->each(sub {...});
 
-Evaluate callback for each element in collection.
+Evaluate callback for each element in collection or return all elements as a
+list if none has been provided. The element will be the first argument passed
+to the callback and is also available as C<$_>.
 
   $collection->each(sub {
     my ($e, $count) = @_;
@@ -148,10 +176,18 @@ Evaluate callback for each element in collection.
 
 Evaluate regular expression or callback for each element in collection and
 return the first one that matched the regular expression, or for which the
-callback returned true.
+callback returned true. The element will be the first argument passed to the
+callback and is also available as C<$_>.
 
   my $five = $collection->first(sub { $_ == 5 });
 
+=head2 flatten
+
+  my $new = $collection->flatten;
+
+Flatten nested collections/arrays recursively and create a new collection with
+all elements.
+
 =head2 grep
 
   my $new = $collection->grep(qr/foo/);
@@ -159,7 +195,8 @@ callback returned true.
 
 Evaluate regular expression or callback for each element in collection and
 create a new collection with all elements that matched the regular expression,
-or for which the callback returned true.
+or for which the callback returned true. The element will be the first
+argument passed to the callback and is also available as C<$_>.
 
   my $interesting = $collection->grep(qr/mojo/i);
 
@@ -176,7 +213,8 @@ Turn collection into L<Mojo::ByteStream>.
   my $new = $collection->map(sub {...});
 
 Evaluate callback for each element in collection and create a new collection
-from the results.
+from the results. The element will be the first argument passed to the
+callback and is also available as C<$_>.
 
   my $doubled = $collection->map(sub { $_ * 2 });
 
@@ -225,12 +263,27 @@ from the results.
 
   my $insensitive = $collection->sort(sub { uc(shift) cmp uc(shift) });
 
+=head2 tap
+
+  $collection = $collection->tap(sub {...});
+
+Alias for L<Mojo::Base/"tap">.
+
 =head2 uniq
 
   my $new = $collection->uniq;
 
 Create a new collection without duplicate elements.
 
+=head1 ELEMENT METHODS
+
+In addition to the methods above, you can also call methods provided by all
+elements in the collection directly and create a new collection from the
+results, similar to L</"pluck">.
+
+  push @$collection, Mojo::DOM->new("<div><h1>$_</h1></div>") for 1 .. 9;
+  say $collection->at('h1')->type('h2')->prepend_content('Test ')->root;
+
 =head1 ELEMENTS
 
 Direct array reference access to elements is also possible.

+22 -20

mojo/lib/Mojo/Content.pm

View

@@ -18,7 +18,7 @@ sub body_size { croak 'Method "body_size" not implemented by subclass' }
 
 sub boundary {
   return undef unless my $type = shift->headers->content_type;
-  $type =~ m!multipart.*boundary=(?:"([^"]+)"|([\w'(),.:?\-+/]+))!i
+  $type =~ m!multipart.*boundary\s*=\s*(?:"([^"]+)"|([\w'(),.:?\-+/]+))!i
     and return defined $1 ? $1 : $2;
   return undef;
 }
@@ -27,8 +27,8 @@ sub build_body    { shift->_build('get_body_chunk') }
 sub build_headers { shift->_build('get_header_chunk') }
 
 sub charset {
-  my $type = do {my $tmp = shift->headers->content_type; defined $tmp ? $tmp : ''};
-  return $type =~ /charset="?([^"\s;]+)"?/i ? $1 : undef;
+  my $type = do { my $type = shift->headers->content_type; defined $type ? $type : ''};
+  return $type =~ /charset\s*=\s*"?([^"\s;]+)"?/i ? $1 : undef;
 }
 
 sub clone {
@@ -220,7 +220,7 @@ sub _parse_chunked {
     # Start new chunk (ignore the chunk extension)
     unless ($self->{chunk_len}) {
       last
-        unless $self->{pre_buffer} =~ s/^(?:\x0d?\x0a)?([[:xdigit:]]+).*\x0a//;
+        unless $self->{pre_buffer} =~ s/^(?:\x0d?\x0a)?([0-9a-fA-F]+).*\x0a//;
       next if $self->{chunk_len} = hex $1;
 
       # Last chunk
@@ -306,6 +306,8 @@ sub _uncompress {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Content - HTTP content base class
@@ -378,8 +380,8 @@ L<Mojo::Content> implements the following attributes.
 
 =head2 auto_relax
 
-  my $relax = $content->auto_relax;
-  $content  = $content->auto_relax(1);
+  my $bool = $content->auto_relax;
+  $content = $content->auto_relax($bool);
 
 Try to detect when relaxed parsing is necessary.
 
@@ -408,16 +410,16 @@ value of the MOJO_MAX_LEFTOVER_SIZE environment variable or C<262144>.
 
 =head2 relaxed
 
-  my $relaxed = $content->relaxed;
-  $content    = $content->relaxed(1);
+  my $bool = $content->relaxed;
+  $content = $content->relaxed($bool);
 
 Activate relaxed parsing for responses that are terminated with a connection
 close.
 
 =head2 skip_body
 
-  my $skip = $content->skip_body;
-  $content = $content->skip_body(1);
+  my $bool = $content->skip_body;
+  $content = $content->skip_body($bool);
 
 Skip body parsing and finish after headers.
 
@@ -428,7 +430,7 @@ implements the following new ones.
 
 =head2 body_contains
 
-  my $success = $content->body_contains('foo bar baz');
+  my $bool = $content->body_contains('foo bar baz');
 
 Check if content contains a specific string. Meant to be overloaded in a
 subclass.
@@ -496,34 +498,34 @@ Size of headers in bytes.
 
 =head2 is_chunked
 
-  my $success = $content->is_chunked;
+  my $bool = $content->is_chunked;
 
 Check if content is chunked.
 
 =head2 is_compressed
 
-  my $success = $content->is_compressed;
+  my $bool = $content->is_compressed;
 
 Check if content is C<gzip> compressed.
 
 =head2 is_dynamic
 
-  my $success = $content->is_dynamic;
+  my $bool = $content->is_dynamic;
 
-Check if content will be dynamically generated, which prevents C<clone> from
-working.
+Check if content will be dynamically generated, which prevents L</"clone">
+from working.
 
 =head2 is_finished
 
-  my $success = $content->is_finished;
+  my $bool = $content->is_finished;
 
 Check if parser is finished.
 
 =head2 is_limit_exceeded
 
-  my $success = $content->is_limit_exceeded;
+  my $bool = $content->is_limit_exceeded;
 
-Check if buffer has exceeded C<max_buffer_size>.
+Check if buffer has exceeded L</"max_buffer_size">.
 
 =head2 is_multipart
 
@@ -533,7 +535,7 @@ False.
 
 =head2 is_parsing_body
 
-  my $success = $content->is_parsing_body;
+  my $bool = $content->is_parsing_body;
 
 Check if body parsing started yet.
 

+5 -3

mojo/lib/Mojo/Content/MultiPart.pm

View

@@ -45,7 +45,7 @@ sub build_boundary {
   my $boundary;
   my $size = 1;
   while (1) {
-    $boundary = b64_encode join('', map chr(rand(256)), 1 .. $size++ * 3);
+    $boundary = b64_encode join('', map chr(rand 256), 1 .. $size++ * 3);
     $boundary =~ s/\W/X/g;
     last unless $self->body_contains($boundary);
   }
@@ -199,6 +199,8 @@ sub _read {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Content::MultiPart - HTTP multipart content
@@ -258,12 +260,12 @@ implements the following new ones.
 
   my $multi = Mojo::Content::MultiPart->new;
 
-Construct a new L<Mojo::Content::MultiPart> object and subscribe to C<read>
+Construct a new L<Mojo::Content::MultiPart> object and subscribe to L</"read">
 event with default content parser.
 
 =head2 body_contains
 
-  my $success = $multi->body_contains('foobarbaz');
+  my $bool = $multi->body_contains('foobarbaz');
 
 Check if content parts contain a specific string.
 

+6 -4

mojo/lib/Mojo/Content/Single.pm

View

@@ -46,13 +46,15 @@ sub parse {
 
   # Content needs to be upgraded to multipart
   $self->unsubscribe(read => $self->{read});
-  my $multi = Mojo::Content::MultiPart->new($self);
+  my $multi = Mojo::Content::MultiPart->new(%$self);
   $self->emit(upgrade => $multi);
   return $multi->parse;
 }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Content::Single - HTTP content
@@ -120,12 +122,12 @@ implements the following new ones.
 
   my $single = Mojo::Content::Single->new;
 
-Construct a new L<Mojo::Content::Single> object and subscribe to C<read> event
-with default content parser.
+Construct a new L<Mojo::Content::Single> object and subscribe to L</"read">
+event with default content parser.
 
 =head2 body_contains
 
-  my $success = $single->body_contains('1234567');
+  my $bool = $single->body_contains('1234567');
 
 Check if content contains a specific string.
 

+3 -32

mojo/lib/Mojo/Cookie.pm

View

@@ -1,47 +1,18 @@
 package Mojo::Cookie;
 use Mojo::Base -base;
-use overload
-  'bool'   => sub {1},
-  '""'     => sub { shift->to_string },
-  fallback => 1;
+use overload bool => sub {1}, '""' => sub { shift->to_string }, fallback => 1;
 
 use Carp 'croak';
-use Mojo::Util 'unquote';
 
 has [qw(name value)];
 
 sub parse     { croak 'Method "parse" not implemented by subclass' }
 sub to_string { croak 'Method "to_string" not implemented by subclass' }
 
-sub _tokenize {
-  my ($self, $str) = @_;
-
-  # Nibbling parser
-  my (@tree, @token);
-  while ($str =~ s/^\s*([^=;,]+)\s*=?\s*//) {
-    my $name = $1;
-
-    # "expires" is a special case, thank you Netscape...
-    $str =~ s/^([^;,]+,?[^;,]+)/"$1"/ if $name =~ /^expires$/i;
-
-    # Value
-    my $value;
-    $value = unquote $1 if $str =~ s/^("(?:\\\\|\\"|[^"])+"|[^;,]+)\s*//;
-    push @token, [$name, $value];
-
-    # Separator
-    $str =~ s/^\s*;\s*//;
-    next unless $str =~ s/^\s*,\s*//;
-    push @tree, [@token];
-    @token = ();
-  }
-
-  # Take care of final token
-  return @token ? (@tree, \@token) : @tree;
-}
-
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Cookie - HTTP cookie base class

+8 -6

mojo/lib/Mojo/Cookie/Request.pm

View

@@ -1,14 +1,15 @@
 package Mojo::Cookie::Request;
 use Mojo::Base 'Mojo::Cookie';
 
-use Mojo::Util 'quote';
+use Mojo::Util qw(quote split_header);
 
 sub parse {
   my ($self, $str) = @_;
 
   my @cookies;
-  for my $token (map {@$_} $self->_tokenize(defined $str ? $str : '')) {
-    my ($name, $value) = @$token;
+  my @pairs = map {@$_} @{split_header(defined $str? $str: '')};
+  while (@pairs) {
+    my ($name, $value) = (shift @pairs, shift @pairs);
     next if $name =~ /^\$/;
     push @cookies, $self->new(name => $name, value => defined $value ? $value : '');
   }
@@ -18,14 +19,15 @@ sub parse {
 
 sub to_string {
   my $self = shift;
-  return '' unless my $name = $self->name;
+  return '' unless length(my $name = defined $self->name ? $self->name : '');
   my $value = defined $self->value ? $self->value : '';
-  $value = $value =~ /[,;"]/ ? quote($value) : $value;
-  return "$name=$value";
+  return join '=', $name, $value =~ /[,;" ]/ ? quote($value) : $value;
 }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Cookie::Request - HTTP request cookie

+38 -22

mojo/lib/Mojo/Cookie/Response.pm

View

@@ -2,9 +2,9 @@ package Mojo::Cookie::Response;
 use Mojo::Base 'Mojo::Cookie';
 
 use Mojo::Date;
-use Mojo::Util 'quote';
+use Mojo::Util qw(quote split_header);
 
-has [qw(domain httponly max_age path secure)];
+has [qw(domain httponly max_age origin path secure)];
 
 sub expires {
   my $self = shift;
@@ -22,21 +22,29 @@ sub parse {
   my ($self, $str) = @_;
 
   my @cookies;
-  for my $token ($self->_tokenize(defined $str ? $str : '')) {
-    for my $i (0 .. $#$token) {
-      my ($name, $value) = @{$token->[$i]};
+  my $tree = split_header(defined $str ? $str : '');
+  while (my $pairs = shift @$tree) {
+    my $i = 0;
+    while (@$pairs) {
+      my ($name, $value) = (shift @$pairs, shift @$pairs);
+
+      # "expires" is a special case, thank you Netscape...
+      if ($name =~ /^expires$/i) {
+        push @$pairs, @{my $elem = shift @$tree; defined $elem ? $elem : []};
+        my $len = (defined $pairs->[0] ? $pairs->[0] : '') =~ /-/ ? 6 : 10;
+        $value .= join ' ', ',', grep {defined} splice @$pairs, 0, $len;
+      }
 
       # This will only run once
       push @cookies, $self->new(name => $name, value => defined $value ? $value : '') and next
-        unless $i;
+        unless $i++;
 
       # Attributes (Netscape and RFC 6265)
-      my @match
-        = $name =~ /^(expires|domain|path|secure|Max-Age|HttpOnly)$/msi;
-      next unless @match;
-      my $attr = lc $match[0];
-      $attr =~ tr/-/_/;
-      $cookies[-1]->$attr($attr =~ /(?:secure|HttpOnly)/i ? 1 : $value);
+      next unless $name =~ /^(expires|domain|path|secure|max-age|httponly)$/i;
+      my $attr = lc $1;
+      $attr = 'max_age' if $attr eq 'max-age';
+      $cookies[-1]
+        ->$attr($attr eq 'secure' || $attr eq 'httponly' ? 1 : $value);
     }
   }
 
@@ -47,10 +55,9 @@ sub to_string {
   my $self = shift;
 
   # Name and value (Netscape)
-  return '' unless my $name = $self->name;
+  return '' unless length(my $name = defined $self->name ? $self->name : '');
   my $value = defined $self->value ? $self->value : '';
-  $value = $value =~ /[,;"]/ ? quote($value) : $value;
-  my $cookie = "$name=$value";
+  my $cookie = join '=', $name, $value =~ /[,;" ]/ ? quote($value) : $value;
 
   # "expires" (Netscape)
   if (defined(my $e = $self->expires)) { $cookie .= "; expires=$e" }
@@ -62,19 +69,21 @@ sub to_string {
   if (my $path = $self->path) { $cookie .= "; path=$path" }
 
   # "secure" (Netscape)
-  if (my $secure = $self->secure) { $cookie .= "; secure" }
+  $cookie .= "; secure" if $self->secure;
 
   # "Max-Age" (RFC 6265)
-  if (defined(my $m = $self->max_age)) { $cookie .= "; Max-Age=$m" }
+  if (defined(my $max = $self->max_age)) { $cookie .= "; Max-Age=$max" }
 
   # "HttpOnly" (RFC 6265)
-  if (my $httponly = $self->httponly) { $cookie .= "; HttpOnly" }
+  $cookie .= "; HttpOnly" if $self->httponly;
 
   return $cookie;
 }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Cookie::Response - HTTP response cookie
@@ -107,8 +116,8 @@ Cookie domain.
 
 =head2 httponly
 
-  my $httponly = $cookie->httponly;
-  $cookie      = $cookie->httponly(1);
+  my $bool = $cookie->httponly;
+  $cookie  = $cookie->httponly($bool);
 
 HttpOnly flag, which can prevent client-side scripts from accessing this
 cookie.
@@ -120,6 +129,13 @@ cookie.
 
 Max age for cookie.
 
+=head2 origin
+
+  my $origin = $cookie->origin;
+  $cookie    = $cookie->origin('mojolicio.us');
+
+Origin of the cookie.
+
 =head2 path
 
   my $path = $cookie->path;
@@ -129,8 +145,8 @@ Cookie path.
 
 =head2 secure
 
-  my $secure = $cookie->secure;
-  $cookie    = $cookie->secure(1);
+  my $bool = $cookie->secure;
+  $cookie  = $cookie->secure($bool);
 
 Secure flag, which instructs browsers to only send this cookie over HTTPS
 connections.

+229 -158

mojo/lib/Mojo/DOM.pm

View

@@ -1,8 +1,8 @@
 package Mojo::DOM;
-use Mojo::Base -base;
+use Mojo::Base -strict;
 use overload
-  '%{}'    => sub { shift->attrs },
-  'bool'   => sub {1},
+  '%{}'    => sub { shift->attr },
+  bool     => sub {1},
   '""'     => sub { shift->to_xml },
   fallback => 1;
 
@@ -36,23 +36,22 @@ sub new {
   return @_ ? $self->parse(@_) : $self;
 }
 
-sub all_text {
-  my $tree = shift->tree;
-  return _text(_elements($tree), 1, _trim($tree, @_));
-}
+sub all_text { shift->_content(1, @_) }
+
+sub ancestors { _select($_[0]->_collect(_ancestors($_[0]->tree)), $_[1]) }
 
 sub append { shift->_add(1, @_) }
 
 sub append_content {
   my ($self, $new) = @_;
   my $tree = $self->tree;
-  push @$tree, @{_parent($self->_parse("$new"), $tree)};
+  push @$tree, _link($self->_parse("$new"), $tree);
   return $self;
 }
 
 sub at { shift->find(@_)->[0] }
 
-sub attrs {
+sub attr {
   my $self = shift;
 
   # Hash
@@ -70,45 +69,35 @@ sub attrs {
 }
 
 sub children {
-  my ($self, $type) = @_;
-
-  my @children;
-  my $xml  = $self->xml;
-  my $tree = $self->tree;
-  for my $e (@$tree[($tree->[0] eq 'root' ? 1 : 4) .. $#$tree]) {
-
-    # Make sure child is the right type
-    next if $e->[0] ne 'tag' || (defined $type && $e->[1] ne $type);
-    push @children, $self->new->tree($e)->xml($xml);
-  }
-
-  return Mojo::Collection->new(@children);
+  my $self = shift;
+  return _select(
+    $self->_collect(grep { $_->[0] eq 'tag' } _nodes($self->tree)), @_);
 }
 
 sub content_xml {
   my $self = shift;
-
-  # Render children individually
-  my $tree = $self->tree;
   my $xml  = $self->xml;
-  return join '',
-    map { Mojo::DOM::HTML->new(tree => $_, xml => $xml)->render }
-    @$tree[($tree->[0] eq 'root' ? 1 : 4) .. $#$tree];
+  return join '', map { _render($_, $xml) } _nodes($self->tree);
 }
 
 sub find {
-  my ($self, $selector) = @_;
-  my $xml = $self->xml;
-  my $results = Mojo::DOM::CSS->new(tree => $self->tree)->select($selector);
-  return Mojo::Collection->new(map { $self->new->tree($_)->xml($xml) }
-      @$results);
+  my $self = shift;
+  my $results = Mojo::DOM::CSS->new(tree => $self->tree)->select(@_);
+  return $self->_collect(@$results);
+}
+
+sub match {
+  my $self = shift;
+  return undef unless Mojo::DOM::CSS->new(tree => $self->tree)->match(@_);
+  return $self;
 }
 
 sub namespace {
   my $self = shift;
 
-  # Extract namespace prefix and search parents
   return '' if (my $current = $self->tree)->[0] eq 'root';
+
+  # Extract namespace prefix and search parents
   my $ns = $current->[1] =~ /^(.*?):/ ? "xmlns:$1" : undef;
   while ($current->[0] ne 'root') {
 
@@ -119,14 +108,13 @@ sub namespace {
     # Namespace attribute
     elsif (defined $attrs->{xmlns}) { return $attrs->{xmlns} }
 
-    # Parent
     $current = $current->[3];
   }
 
   return '';
 }
 
-sub next { shift->_sibling(1) }
+sub next { shift->_siblings->[1][0] }
 
 sub parent {
   my $self = shift;
@@ -134,201 +122,228 @@ sub parent {
   return $self->new->tree($tree->[3])->xml($self->xml);
 }
 
-sub parse { shift->_html(parse => shift) }
+sub parse { shift->_delegate(parse => shift) }
 
 sub prepend { shift->_add(0, @_) }
 
 sub prepend_content {
   my ($self, $new) = @_;
   my $tree = $self->tree;
-  splice @$tree, $tree->[0] eq 'root' ? 1 : 4, 0,
-    @{_parent($self->_parse("$new"), $tree)};
+  splice @$tree, _offset($tree), 0, _link($self->_parse("$new"), $tree);
   return $self;
 }
 
-sub previous { shift->_sibling(0) }
+sub previous { shift->_siblings->[0][-1] }
 
 sub remove { shift->replace('') }
 
 sub replace {
   my ($self, $new) = @_;
-
   my $tree = $self->tree;
-  if   ($tree->[0] eq 'root') { return $self->xml(undef)->parse($new) }
-  else                        { $new = $self->_parse("$new") }
-
-  my $parent = $tree->[3];
-  my $i = $parent->[0] eq 'root' ? 1 : 4;
-  for my $e (@$parent[$i .. $#$parent]) {
-    last if $e == $tree;
-    $i++;
-  }
-  splice @$parent, $i, 1, @{_parent($new, $parent)};
-
-  return $self;
+  return $self->xml(undef)->parse($new) if $tree->[0] eq 'root';
+  return $self->_replace($tree, $self->_parse("$new"));
 }
 
 sub replace_content {
   my ($self, $new) = @_;
   my $tree = $self->tree;
-  splice @$tree, $tree->[0] eq 'root' ? 1 : 4, $#$tree,
-    @{_parent($self->_parse("$new"), $tree)};
+  splice @$tree, _offset($tree), $#$tree, _link($self->_parse("$new"), $tree);
   return $self;
 }
 
 sub root {
   my $self = shift;
+  return $self unless my $tree = _ancestors($self->tree, 1);
+  return $self->new->tree($tree)->xml($self->xml);
+}
 
-  my $root = $self->tree;
-  while ($root->[0] eq 'tag') {
-    last unless my $parent = $root->[3];
-    $root = $parent;
-  }
+sub siblings { _select(Mojo::Collection->new(@{_siblings($_[0], 1)}), $_[1]) }
 
-  return $self->new->tree($root)->xml($self->xml);
+sub strip {
+  my $self = shift;
+  my $tree = $self->tree;
+  return $self if $tree->[0] eq 'root';
+  return $self->_replace($tree, ['root', _nodes($tree)]);
 }
 
-sub text {
-  my $tree = shift->tree;
-  return _text(_elements($tree), 0, _trim($tree, @_));
-}
+sub tap { shift->Mojo::Base::tap(@_) }
+
+sub text { shift->_content(0, @_) }
 
 sub text_after {
   my ($self, $trim) = @_;
 
-  # Find following text elements
   return '' if (my $tree = $self->tree)->[0] eq 'root';
-  my (@elements, $started);
-  for my $e (@{_elements($tree->[3])}) {
-    ++$started and next if $e eq $tree;
+
+  my (@nodes, $started);
+  for my $n (_nodes($tree->[3])) {
+    ++$started and next if $n eq $tree;
     next unless $started;
-    last if $e->[0] eq 'tag';
-    push @elements, $e;
+    last if $n->[0] eq 'tag';
+    push @nodes, $n;
   }
 
-  return _text(\@elements, 0, _trim($tree->[3], $trim));
+  return _text(\@nodes, 0, _trim($tree->[3], $trim));
 }
 
 sub text_before {
   my ($self, $trim) = @_;
 
-  # Find preceding text elements
   return '' if (my $tree = $self->tree)->[0] eq 'root';
-  my @elements;
-  for my $e (@{_elements($tree->[3])}) {
-    last if $e eq $tree;
-    push @elements, $e;
-    @elements = () if $e->[0] eq 'tag';
+
+  my @nodes;
+  for my $n (_nodes($tree->[3])) {
+    last if $n eq $tree;
+    push @nodes, $n;
+    @nodes = () if $n->[0] eq 'tag';
   }
 
-  return _text(\@elements, 0, _trim($tree->[3], $trim));
+  return _text(\@nodes, 0, _trim($tree->[3], $trim));
 }
 
 sub to_xml { shift->[0]->render }
 
-sub tree { shift->_html(tree => @_) }
+sub tree { shift->_delegate(tree => @_) }
 
 sub type {
   my ($self, $type) = @_;
-
-  # Get
   return '' if (my $tree = $self->tree)->[0] eq 'root';
   return $tree->[1] unless $type;
-
-  # Set
   $tree->[1] = $type;
-
   return $self;
 }
 
-sub xml { shift->_html(xml => @_) }
+sub xml { shift->_delegate(xml => @_) }
 
 sub _add {
   my ($self, $offset, $new) = @_;
 
-  # Not a tag
   return $self if (my $tree = $self->tree)->[0] eq 'root';
 
-  # Find parent
   my $parent = $tree->[3];
-  my $i = $parent->[0] eq 'root' ? 1 : 4;
-  for my $e (@$parent[$i .. $#$parent]) {
-    last if $e == $tree;
-    $i++;
-  }
-
-  # Add children
-  splice @$parent, $i + $offset, 0, @{_parent($self->_parse("$new"), $parent)};
+  splice @$parent, _parent($parent, $tree) + $offset, 0,
+    _link($self->_parse("$new"), $parent);
 
   return $self;
 }
 
-sub _elements {
-  return [] unless my $e = shift;
-  return [@$e[($e->[0] eq 'root' ? 1 : 4) .. $#$e]];
+sub _ancestors {
+  my ($tree, $root) = @_;
+  my @ancestors;
+  push @ancestors, $tree while ($tree->[0] eq 'tag') && ($tree = $tree->[3]);
+  return $root ? $ancestors[-1] : @ancestors[0 .. $#ancestors - 1];
+}
+
+sub _collect {
+  my $self = shift;
+  my $xml  = $self->xml;
+  return Mojo::Collection->new(@_)
+    ->map(sub { $self->new->tree($_)->xml($xml) });
+}
+
+sub _content {
+  my $tree = shift->tree;
+  return _text([_nodes($tree)], shift, _trim($tree, @_));
 }
 
-sub _html {
+sub _delegate {
   my ($self, $method) = (shift, shift);
   return $self->[0]->$method unless @_;
   $self->[0]->$method(@_);
   return $self;
 }
 
-sub _parent {
+sub _link {
   my ($children, $parent) = @_;
 
   # Link parent to children
   my @new;
-  for my $e (@$children[1 .. $#$children]) {
-    if ($e->[0] eq 'tag') {
-      $e->[3] = $parent;
-      weaken $e->[3];
-    }
-    push @new, $e;
+  for my $n (@$children[1 .. $#$children]) {
+    push @new, $n;
+    next unless $n->[0] eq 'tag';
+    $n->[3] = $parent;
+    weaken $n->[3];
+  }
+
+  return @new;
+}
+
+sub _nodes {
+  return unless my $n = shift;
+  return @$n[_offset($n) .. $#$n];
+}
+
+sub _offset { $_[0][0] eq 'root' ? 1 : 4 }
+
+sub _parent {
+  my ($parent, $child) = @_;
+
+  # Find parent offset for child
+  my $i = _offset($parent);
+  for my $n (@$parent[$i .. $#$parent]) {
+    last if $n == $child;
+    $i++;
   }
 
-  return \@new;
+  return $i;
 }
 
 sub _parse { Mojo::DOM::HTML->new(xml => shift->xml)->parse(shift)->tree }
 
-sub _sibling {
-  my ($self, $next) = @_;
+sub _render { Mojo::DOM::HTML->new(tree => shift, xml => shift)->render }
+
+sub _replace {
+  my ($self, $tree, $new) = @_;
+  my $parent = $tree->[3];
+  splice @$parent, _parent($parent, $tree), 1, _link($new, $parent);
+  return $self->parent;
+}
+
+sub _select {
+  my ($self, $selector) = @_;
+  return defined $selector ? $self->grep(sub { $_->match($selector) }) : $self;
+}
+
+sub _siblings {
+  my ($self, $merge) = @_;
 
-  # Make sure we have a parent
-  return undef unless my $parent = $self->parent;
+  return $merge ? [] : [[], []] unless my $parent = $self->parent;
 
-  # Find previous or next sibling
-  my ($previous, $current);
+  my $tree = $self->tree;
+  my (@before, @after, $match);
   for my $child ($parent->children->each) {
-    ++$current and next if $child->tree eq $self->tree;
-    return $next ? $child : $previous if $current;
-    $previous = $child;
+    ++$match and next if $child->tree eq $tree;
+    $match ? push @after, $child : push @before, $child;
   }
 
-  # No siblings
-  return undef;
+  return $merge ? [@before, @after] : [\@before, \@after];
 }
 
 sub _text {
-  my ($elements, $recurse, $trim) = @_;
+  my ($nodes, $recurse, $trim) = @_;
+
+  # Merge successive text nodes
+  my $i = 0;
+  while (my $next = $nodes->[$i + 1]) {
+    ++$i and next unless $nodes->[$i][0] eq 'text' && $next->[0] eq 'text';
+    splice @$nodes, $i, 2, ['text', $nodes->[$i][1] . $next->[1]];
+  }
 
   my $text = '';
-  for my $e (@$elements) {
-    my $type = $e->[0];
+  for my $n (@$nodes) {
+    my $type = $n->[0];
 
     # Nested tag
     my $content = '';
     if ($type eq 'tag' && $recurse) {
-      $content = _text(_elements($e), 1, _trim($e, $trim));
+      $content = _text([_nodes($n)], 1, _trim($n, $trim));
     }
 
     # Text
-    elsif ($type eq 'text') { $content = $trim ? squish($e->[1]) : $e->[1] }
+    elsif ($type eq 'text') { $content = $trim ? squish($n->[1]) : $n->[1] }
 
     # CDATA or raw text
-    elsif ($type eq 'cdata' || $type eq 'raw') { $content = $e->[1] }
+    elsif ($type eq 'cdata' || $type eq 'raw') { $content = $n->[1] }
 
     # Add leading whitespace if punctuation allows it
     $content = " $content" if $text =~ /\S\z/ && $content =~ /^[^.!?,;:\s]+/;
@@ -357,6 +372,8 @@ sub _trim {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::DOM - Minimalistic HTML/XML DOM parser with CSS selectors
@@ -370,7 +387,8 @@ Mojo::DOM - Minimalistic HTML/XML DOM parser with CSS selectors
 
   # Find
   say $dom->at('#b')->text;
-  say $dom->find('p')->pluck('text');
+  say $dom->find('p')->text;
+  say $dom->find('[id]')->attr('id');
 
   # Walk
   say $dom->div->p->[0]->text;
@@ -386,6 +404,7 @@ Mojo::DOM - Minimalistic HTML/XML DOM parser with CSS selectors
 
   # Modify
   $dom->div->p->[1]->append('<p id="c">C</p>');
+  $dom->find(':not(p)')->strip;
 
   # Render
   say "$dom";
@@ -399,7 +418,7 @@ use it for validation.
 =head1 CASE SENSITIVITY
 
 L<Mojo::DOM> defaults to HTML semantics, that means all tags and attributes
-are lowercased and selectors need to be lower case as well.
+are lowercased and selectors need to be lowercase as well.
 
   my $dom = Mojo::DOM->new('<P ID="greeting">Hi!</P>');
   say $dom->at('p')->text;
@@ -412,7 +431,7 @@ into XML mode and everything becomes case sensitive.
   say $dom->at('P')->text;
   say $dom->P->{ID};
 
-XML detection can also be disabled with the C<xml> method.
+XML detection can also be disabled with the L</"xml"> method.
 
   # Force XML semantics
   $dom->xml(1);
@@ -422,16 +441,15 @@ XML detection can also be disabled with the C<xml> method.
 
 =head1 METHODS
 
-L<Mojo::DOM> inherits all methods from L<Mojo::Base> and implements the
-following new ones.
+L<Mojo::DOM> implements the following methods.
 
 =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 and C<parse> HTML/XML document
-if necessary.
+Construct a new array-based L<Mojo::DOM> object and L</"parse"> HTML/XML
+fragment if necessary.
 
 =head2 all_text
 
@@ -447,11 +465,23 @@ enabled by default.
   # "foo\nbarbaz\n"
   $dom->parse("<div>foo\n<p>bar</p>baz\n</div>")->div->all_text(0);
 
+=head2 ancestors
+
+  my $collection = $dom->ancestors;
+  my $collection = $dom->ancestors('div');
+
+Find all ancestors of this element matching the CSS selector and return a
+L<Mojo::Collection> object containing these elements as L<Mojo::DOM> objects.
+All selectors from L<Mojo::DOM::CSS> are supported.
+
+  # List types of ancestor elements
+  say $dom->ancestors->type;
+
 =head2 append
 
   $dom = $dom->append('<p>Hi!</p>');
 
-Append HTML/XML to element.
+Append HTML/XML fragment to element.
 
   # "<div><h1>A</h1><h2>B</h2></div>"
   $dom->parse('<div><h1>A</h1></div>')->at('h1')->append('<h2>B</h2>')->root;
@@ -460,7 +490,7 @@ Append HTML/XML to element.
 
   $dom = $dom->append_content('<p>Hi!</p>');
 
-Append HTML/XML to element content.
+Append HTML/XML fragment to element content.
 
   # "<div><h1>AB</h1></div>"
   $dom->parse('<div><h1>A</h1></div>')->at('h1')->append_content('B')->root;
@@ -476,22 +506,26 @@ L<Mojo::DOM::CSS> are supported.
   # Find first element with "svg" namespace definition
   my $namespace = $dom->at('[xmlns\:svg]')->{'xmlns:svg'};
 
-=head2 attrs
+=head2 attr
 
-  my $attrs = $dom->attrs;
-  my $foo   = $dom->attrs('foo');
-  $dom      = $dom->attrs({foo => 'bar'});
-  $dom      = $dom->attrs(foo => 'bar');
+  my $attrs = $dom->attr;
+  my $foo   = $dom->attr('foo');
+  $dom      = $dom->attr({foo => 'bar'});
+  $dom      = $dom->attr(foo => 'bar');
 
 Element attributes.
 
+  # List id attributes
+  say $dom->find('*')->attr('id')->compact;
+
 =head2 children
 
   my $collection = $dom->children;
   my $collection = $dom->children('div');
 
-Return a L<Mojo::Collection> object containing the children of this element as
-L<Mojo::DOM> objects, similar to C<find>.
+Find all children of this element matching the CSS selector and return a
+L<Mojo::Collection> object containing these elements as L<Mojo::DOM> objects.
+All selectors from L<Mojo::DOM::CSS> are supported.
 
   # Show type of random child element
   say $dom->children->shuffle->first->type;
@@ -517,7 +551,16 @@ L<Mojo::DOM::CSS> are supported.
   my $id = $dom->find('div')->[23]{id};
 
   # Extract information from multiple elements
-  my @headers = $dom->find('h1, h2, h3')->pluck('text')->each;
+  my @headers = $dom->find('h1, h2, h3')->text->each;
+  my @links   = $dom->find('a[href]')->attr('href')->each;
+
+=head2 match
+
+  my $result = $dom->match('html title');
+
+Match the CSS selector against this element and return it as a L<Mojo::DOM>
+object or return C<undef> if it didn't match. All selectors from
+L<Mojo::DOM::CSS> are supported.
 
 =head2 namespace
 
@@ -552,7 +595,7 @@ has no parent.
 
   $dom = $dom->parse('<foo bar="baz">test</foo>');
 
-Parse HTML/XML document with L<Mojo::DOM::HTML>.
+Parse HTML/XML fragment with L<Mojo::DOM::HTML>.
 
   # Parse XML
   my $dom = Mojo::DOM->new->xml(1)->parse($xml);
@@ -561,7 +604,7 @@ Parse HTML/XML document with L<Mojo::DOM::HTML>.
 
   $dom = $dom->prepend('<p>Hi!</p>');
 
-Prepend HTML/XML to element.
+Prepend HTML/XML fragment to element.
 
   # "<div><h1>A</h1><h2>B</h2></div>"
   $dom->parse('<div><h2>B</h2></div>')->at('h2')->prepend('<h1>A</h1>')->root;
@@ -570,7 +613,7 @@ Prepend HTML/XML to element.
 
   $dom = $dom->prepend_content('<p>Hi!</p>');
 
-Prepend HTML/XML to element content.
+Prepend HTML/XML fragment to element content.
 
   # "<div><h2>AB</h2></div>"
   $dom->parse('<div><h2>B</h2></div>')->at('h2')->prepend_content('A')->root;
@@ -587,31 +630,31 @@ there are no more siblings.
 
 =head2 remove
 
-  my $old = $dom->remove;
+  my $parent = $dom->remove;
 
-Remove element and return it as a L<Mojo::DOM> object.
+Remove element and return L<Mojo::DOM> object for parent of element.
 
   # "<div></div>"
-  $dom->parse('<div><h1>A</h1></div>')->at('h1')->remove->root;
+  $dom->parse('<div><h1>A</h1></div>')->at('h1')->remove;
 
 =head2 replace
 
-  my $old = $dom->replace('<div>test</div>');
+  my $parent = $dom->replace('<div>test</div>');
 
-Replace element with HTML/XML and return the replaced element as a
-L<Mojo::DOM> object.
+Replace element with HTML/XML fragment and return L<Mojo::DOM> object for
+parent of element.
 
   # "<div><h2>B</h2></div>"
-  $dom->parse('<div><h1>A</h1></div>')->at('h1')->replace('<h2>B</h2>')->root;
+  $dom->parse('<div><h1>A</h1></div>')->at('h1')->replace('<h2>B</h2>');
 
   # "<div></div>"
-  $dom->parse('<div><h1>A</h1></div>')->at('h1')->replace('')->root;
+  $dom->parse('<div><h1>A</h1></div>')->at('h1')->replace('');
 
 =head2 replace_content
 
   $dom = $dom->replace_content('<p>test</p>');
 
-Replace element content with HTML/XML.
+Replace element content with HTML/XML fragment.
 
   # "<div><h1>B</h1></div>"
   $dom->parse('<div><h1>A</h1></div>')->at('h1')->replace_content('B')->root;
@@ -625,6 +668,34 @@ Replace element content with HTML/XML.
 
 Return L<Mojo::DOM> object for root node.
 
+=head2 siblings
+
+  my $collection = $dom->siblings;
+  my $collection = $dom->siblings('div');
+
+Find all siblings of this element matching the CSS selector and return a
+L<Mojo::Collection> object containing these elements as L<Mojo::DOM> objects.
+All selectors from L<Mojo::DOM::CSS> are supported.
+
+  # List types of sibling elements
+  say $dom->siblings->type;
+
+=head2 strip
+
+  my $parent = $dom->strip;
+
+Remove element while preserving its content and return L<Mojo::DOM> object for
+parent of element.
+
+  # "<div>A</div>"
+  $dom->parse('<div><h1>A</h1></div>')->at('h1')->strip;
+
+=head2 tap
+
+  $dom = $dom->tap(sub {...});
+
+Alias for L<Mojo::Base/"tap">.
+
 =head2 text
 
   my $trimmed   = $dom->text;
@@ -693,12 +764,12 @@ carefully since it is very dynamic.
 Element type.
 
   # List types of child elements
-  say $dom->children->pluck('type');
+  say $dom->children->type;
 
 =head2 xml
 
-  my $xml = $dom->xml;
-  $dom    = $dom->xml(1);
+  my $bool = $dom->xml;
+  $dom     = $dom->xml($bool);
 
 Disable HTML semantics in parser and activate case sensitivity, defaults to
 auto detection based on processing instructions.
@@ -711,7 +782,7 @@ L<Mojo::Collection> object, depending on number of children.
 
   say $dom->p->text;
   say $dom->div->[23]->text;
-  say $dom->div->pluck('text');
+  say $dom->div->text;
 
 =head1 ELEMENT ATTRIBUTES
 

+47 -40

mojo/lib/Mojo/DOM/CSS.pm

View

@@ -3,14 +3,14 @@ use Mojo::Base -base;
 
 has 'tree';
 
-my $ESCAPE_RE = qr/\\[^[:xdigit:]]|\\[[:xdigit:]]{1,6}/;
+my $ESCAPE_RE = qr/\\[^0-9a-fA-F]|\\[0-9a-fA-F]{1,6}/;
 my $ATTR_RE   = qr/
   \[
-  ((?:$ESCAPE_RE|[\w\-])+)        # Key
+  ((?:$ESCAPE_RE|[\w\-])+)           # Key
   (?:
-    (\W)?                         # Operator
+    (\W)?                            # Operator
     =
-    (?:"((?:\\"|[^"])+)"|(\S+))   # Value
+    (?:"((?:\\"|[^"])*)"|([^\]]+))   # Value
   )?
   \]
 /x;
@@ -33,6 +33,13 @@ my $TOKEN_RE        = qr/
   )?
 /x;
 
+sub match {
+  my $self = shift;
+  my $tree = $self->tree;
+  return undef if $tree->[0] eq 'root';
+  return $self->_match($self->_compile(shift), $tree, $tree);
+}
+
 sub select {
   my $self = shift;
 
@@ -43,19 +50,14 @@ sub select {
   while (my $current = shift @queue) {
     my $type = $current->[0];
 
-    # Root
-    if ($type eq 'root') { unshift @queue, @$current[1 .. $#$current] }
-
     # Tag
-    elsif ($type eq 'tag') {
+    if ($type eq 'tag') {
       unshift @queue, @$current[4 .. $#$current];
-
-      # Try all selectors with element
-      for my $part (@$pattern) {
-        push @results, $current and last
-          if $self->_combinator([reverse @$part], $current, $tree);
-      }
+      push @results, $current if $self->_match($pattern, $current, $tree);
     }
+
+    # Root
+    elsif ($type eq 'root') { unshift @queue, @$current[1 .. $#$current] }
   }
 
   return \@results;
@@ -125,7 +127,6 @@ sub _compile {
     my ($separator, $element, $pc, $attrs, $combinator)
       = ($1, defined $2 ? $2 : '', $3, $6, $11);
 
-    # Trash
     next unless $separator || $element || $pc || $attrs || $combinator;
 
     # New selector
@@ -149,12 +150,8 @@ sub _compile {
 
     # Class or ID
     while ($element =~ /$CLASS_ID_RE/g) {
-
-      # Class
       push @$selector, ['attr', 'class', $self->_regex('~', $1)] if defined $1;
-
-      # ID
-      push @$selector, ['attr', 'id', $self->_regex('', $2)] if defined $2;
+      push @$selector, ['attr', 'id',    $self->_regex('',  $2)] if defined $2;
     }
 
     # Pseudo classes
@@ -187,28 +184,33 @@ sub _equation {
   my ($self, $equation) = @_;
 
   # "even"
-  my $num = [1, 1];
-  if ($equation =~ /^even$/i) { $num = [2, 2] }
+  return [2, 2] if $equation =~ /^even$/i;
 
   # "odd"
-  elsif ($equation =~ /^odd$/i) { $num = [2, 1] }
+  return [2, 1] if $equation =~ /^odd$/i;
 
   # Equation
-  elsif ($equation =~ /(?:(-?(?:\d+)?)?(n))?\s*\+?\s*(-?\s*\d+)?\s*$/i) {
-    $num->[0] = defined($1) && length($1) ? $1 : $2 ? 1 : 0;
-    $num->[0] = -1 if $num->[0] eq '-';
-    $num->[1] = defined $3 ? $3 : 0;
-    $num->[1] =~ s/\s+//g;
-  }
-
+  my $num = [1, 1];
+  return $num if $equation !~ /(?:(-?(?:\d+)?)?(n))?\s*\+?\s*(-?\s*\d+)?\s*$/i;
+  $num->[0] = defined($1) && length($1) ? $1 : $2 ? 1 : 0;
+  $num->[0] = -1 if $num->[0] eq '-';
+  $num->[1] = defined $3 ? $3 : 0;
+  $num->[1] =~ s/\s+//g;
   return $num;
 }
 
+sub _match {
+  my ($self, $pattern, $current, $tree) = @_;
+  $self->_combinator([reverse @$_], $current, $tree) and return 1
+    for @$pattern;
+  return undef;
+}
+
 sub _parent {
   my ($self, $selectors, $current, $tree) = @_;
   return undef unless my $parent = $current->[3];
   return undef if $parent->[0] eq 'root';
-  return $self->_combinator($selectors, $parent, $tree) ? 1 : undef;
+  return $self->_combinator($selectors, $parent, $tree);
 }
 
 sub _pc {
@@ -251,10 +253,9 @@ sub _pc {
 
     # Siblings
     my $parent = $current->[3];
-    my $start = $parent->[0] eq 'root' ? 1 : 4;
     my @siblings;
     my $type = $class =~ /of-type$/ ? $current->[1] : undef;
-    for my $i ($start .. $#$parent) {
+    for my $i (($parent->[0] eq 'root' ? 1 : 4) .. $#$parent) {
       my $sibling = $parent->[$i];
       next unless $sibling->[0] eq 'tag';
       next if defined $type && $type ne $sibling->[1];
@@ -279,8 +280,7 @@ sub _pc {
 
     # Siblings
     my $parent = $current->[3];
-    my $start = $parent->[0] eq 'root' ? 1 : 4;
-    for my $i ($start .. $#$parent) {
+    for my $i (($parent->[0] eq 'root' ? 1 : 4) .. $#$parent) {
       my $sibling = $parent->[$i];
       next if $sibling->[0] ne 'tag' || $sibling eq $current;
       return undef unless defined $type && $sibling->[1] ne $type;
@@ -345,8 +345,7 @@ sub _sibling {
 
   my $parent = $current->[3];
   my $found;
-  my $start = $parent->[0] eq 'root' ? 1 : 4;
-  for my $e (@$parent[$start .. $#$parent]) {
+  for my $e (@$parent[($parent->[0] eq 'root' ? 1 : 4) .. $#$parent]) {
     return $found if $e eq $current;
     next unless $e->[0] eq 'tag';
 
@@ -367,7 +366,7 @@ sub _unescape {
   $value =~ s/\\\n//g;
 
   # Unescape Unicode characters
-  $value =~ s/\\([[:xdigit:]]{1,6})\s?/pack('U', hex $1)/ge;
+  $value =~ s/\\([0-9a-fA-F]{1,6})\s?/pack('U', hex $1)/ge;
 
   # Remove backslash
   $value =~ s/\\//g;
@@ -377,6 +376,8 @@ sub _unescape {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::DOM::CSS - CSS selector engine
@@ -591,7 +592,7 @@ Elements of type C<E>, C<F> and C<G>.
 
 An C<E> element whose attributes match all following attribute selectors.
 
-  my $links = $css->select('a[foo^="b"][foo$="ar"]');
+  my $links = $css->select('a[foo^=b][foo$=ar]');
 
 =head1 ATTRIBUTES
 
@@ -610,11 +611,17 @@ carefully since it is very dynamic.
 L<Mojo::DOM::CSS> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
+=head2 match
+
+  my $bool = $css->match('head > title');
+
+Match CSS selector against first node in L</"tree">.
+
 =head2 select
 
   my $results = $css->select('head > title');
 
-Run CSS selector against C<tree>.
+Run CSS selector against L</"tree">.
 
 =head1 SEE ALSO
 

+57 -63

mojo/lib/Mojo/DOM/HTML.pm

View

@@ -8,7 +8,7 @@ has 'xml';
 has tree => sub { ['root'] };
 
 my $ATTR_RE = qr/
-  ([^=\s>]+)       # Key
+  ([^<>=\s]+)      # Key
   (?:
     \s*=\s*
     (?:
@@ -40,50 +40,52 @@ my $TOKEN_RE = qr/
   |
     <(
       \s*
-      [^>\s]+                                       # Tag
+      [^<>\s]+                                      # Tag
       \s*
       (?:$ATTR_RE)*                                 # Attributes
     )>
+  |
+    (<)                                             # Runaway "<"
   )??
 /xis;
 
-# Optional HTML elements
-my %OPTIONAL = map { $_ => 1 }
-  qw(body colgroup dd head li optgroup option p rt rp tbody td tfoot th);
-
-# Elements that break HTML paragraphs
+# HTML elements that break paragraphs
 my %PARAGRAPH = map { $_ => 1 } (
   qw(address article aside blockquote dir div dl fieldset footer form h1 h2),
-  qw(h3 h4 h5 h6 header hgroup hr menu nav ol p pre section table ul)
+  qw(h3 h4 h5 h6 header hr main menu nav ol p pre section table ul)
 );
 
-# HTML table elements
-my %TABLE = map { $_ => 1 } qw(col colgroup tbody td th thead tr);
+# HTML table elements with optional end tags
+my %TABLE = map { $_ => 1 } qw(colgroup tbody td tfoot th thead tr);
 
-# HTML void elements
+# HTML elements without end tags
 my %VOID = map { $_ => 1 } (
-  qw(area base br col command embed hr img input keygen link meta param),
+  qw(area base br col embed hr img input keygen link menuitem meta param),
   qw(source track wbr)
 );
 
-# HTML inline elements
-my %INLINE = map { $_ => 1 } (
-  qw(a abbr acronym applet b basefont bdo big br button cite code del dfn em),
-  qw(font i iframe img ins input kbd label map object q s samp script select),
-  qw(small span strike strong sub sup textarea tt u var)
+# HTML elements categorized as phrasing content (and obsolete inline elements)
+my @PHRASING = (
+  qw(a abbr area audio b bdi bdo br button canvas cite code data datalist),
+  qw(del dfn em embed i iframe img input ins kbd keygen label link map mark),
+  qw(math meta meter noscript object output progress q ruby s samp script),
+  qw(select small span strong sub sup svg template textarea time u var video),
+  qw(wbr)
 );
+my @OBSOLETE = qw(acronym applet basefont big font strike tt);
+my %PHRASING = map { $_ => 1 } @OBSOLETE, @PHRASING;
 
 sub parse {
   my ($self, $html) = @_;
 
-  my $tree    = ['root'];
-  my $current = $tree;
+  my $current = my $tree = ['root'];
   while ($html =~ m/\G$TOKEN_RE/gcs) {
-    my ($text, $pi, $comment, $cdata, $doctype, $tag)
-      = ($1, $2, $3, $4, $5, $6);
+    my ($text, $pi, $comment, $cdata, $doctype, $tag, $runaway)
+      = ($1, $2, $3, $4, $5, $6, $11);
 
-    # Text
-    if (length $text) { push @$current, ['text', html_unescape($text)] }
+    # Text (and runaway "<")
+    $text .= '<' if defined $runaway;
+    push @$current, ['text', html_unescape $text] if length $text;
 
     # DOCTYPE
     if ($doctype) { push @$current, ['doctype', $doctype] }
@@ -124,7 +126,7 @@ sub parse {
       # Tag
       $self->_start($start, \%attrs, \$current);
 
-      # Empty element
+      # Element without end tag
       $self->_end($start, \$current)
         if (!$self->xml && $VOID{$start}) || $attr =~ m!/\s*$!;
 
@@ -144,18 +146,12 @@ sub parse {
 sub render { $_[0]->_render($_[0]->tree) }
 
 sub _close {
-  my ($self, $current, $tags, $stop) = @_;
-  $tags ||= \%TABLE;
-  $stop ||= 'table';
+  my ($self, $current, $allowed, $scope) = @_;
 
-  # Check if parents need to be closed
+  # Close allowed parent elements in scope
   my $parent = $$current;
-  while ($parent->[0] ne 'root' && $parent->[1] ne $stop) {
-
-    # Close
-    $tags->{$parent->[1]} and $self->_end($parent->[1], $current);
-
-    # Try next
+  while ($parent->[0] ne 'root' && $parent->[1] ne $scope) {
+    $self->_end($parent->[1], $current) if $allowed->{$parent->[1]};
     $parent = $parent->[3];
   }
 }
@@ -171,10 +167,9 @@ sub _end {
     # Right tag
     ++$found and last if $next->[1] eq $end;
 
-    # Inline elements can only cross other inline elements
-    return if !$self->xml && $INLINE{$end} && !$INLINE{$next->[1]};
+    # Phrasing content can only cross phrasing content
+    return if !$self->xml && $PHRASING{$end} && !$PHRASING{$next->[1]};
 
-    # Parent
     $next = $next->[3];
   }
 
@@ -189,11 +184,8 @@ sub _end {
     # Match
     if ($end eq $$current->[1]) { return $$current = $$current->[3] }
 
-    # Optional elements
-    elsif ($OPTIONAL{$$current->[1]}) { $self->_end($$current->[1], $current) }
-
     # Table
-    elsif ($end eq 'table') { $self->_close($current) }
+    elsif ($end eq 'table') { $self->_close($current, \%TABLE, $end) }
 
     # Missing end tag
     $self->_end($$current->[1], $current);
@@ -211,19 +203,19 @@ sub _render {
   return $tree->[1] if $e eq 'raw';
 
   # DOCTYPE
-  return "<!DOCTYPE" . $tree->[1] . ">" if $e eq 'doctype';
+  return '<!DOCTYPE' . $tree->[1] . '>' if $e eq 'doctype';
 
   # Comment
-  return "<!--" . $tree->[1] . "-->" if $e eq 'comment';
+  return '<!--' . $tree->[1] . '-->' if $e eq 'comment';
 
   # CDATA
-  return "<![CDATA[" . $tree->[1] . "]]>" if $e eq 'cdata';
+  return '<![CDATA[' . $tree->[1] . ']]>' if $e eq 'cdata';
 
   # Processing instruction
-  return "<?" . $tree->[1] . "?>" if $e eq 'pi';
+  return '<?' . $tree->[1] . '?>' if $e eq 'pi';
 
   # Start tag
-  my $start = $e eq 'root' ? 1 : 2;
+  my $start   = 1;
   my $content = '';
   if ($e eq 'tag') {
     $start = 4;
@@ -246,7 +238,7 @@ sub _render {
     my $attrs = join ' ', @attrs;
     $content .= " $attrs" if $attrs;
 
-    # Empty tag
+    # Element without end tag
     return $self->xml || $VOID{$tag} ? "$content />" : "$content></$tag>"
       unless $tree->[4];
 
@@ -269,40 +261,40 @@ sub _start {
   # Autoclose optional HTML elements
   if (!$self->xml && $$current->[0] ne 'root') {
 
-    # "<li>"
+    # "li"
     if ($start eq 'li') { $self->_close($current, {li => 1}, 'ul') }
 
-    # "<p>"
+    # "p"
     elsif ($PARAGRAPH{$start}) { $self->_end('p', $current) }
 
-    # "<head>"
+    # "head"
     elsif ($start eq 'body') { $self->_end('head', $current) }
 
-    # "<optgroup>"
+    # "optgroup"
     elsif ($start eq 'optgroup') { $self->_end('optgroup', $current) }
 
-    # "<option>"
+    # "option"
     elsif ($start eq 'option') { $self->_end('option', $current) }
 
-    # "<colgroup>", "<thead>", "tbody" and "tfoot"
+    # "colgroup", "thead", "tbody" and "tfoot"
     elsif (grep { $_ eq $start } qw(colgroup thead tbody tfoot)) {
-      $self->_close($current);
+      $self->_close($current, \%TABLE, 'table');
     }
 
-    # "<tr>"
-    elsif ($start eq 'tr') { $self->_close($current, {tr => 1}) }
+    # "tr"
+    elsif ($start eq 'tr') { $self->_close($current, {tr => 1}, 'table') }
 
-    # "<th>" and "<td>"
+    # "th" and "td"
     elsif ($start eq 'th' || $start eq 'td') {
-      $self->_close($current, {$_ => 1}) for qw(th td);
+      $self->_close($current, {$_ => 1}, 'table') for qw(th td);
     }
 
-    # "<dt>" and "<dd>"
+    # "dt" and "dd"
     elsif ($start eq 'dt' || $start eq 'dd') {
       $self->_end($_, $current) for qw(dt dd);
     }
 
-    # "<rt>" and "<rp>"
+    # "rt" and "rp"
     elsif ($start eq 'rt' || $start eq 'rp') {
       $self->_end($_, $current) for qw(rt rp);
     }
@@ -317,6 +309,8 @@ sub _start {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::DOM::HTML - HTML/XML engine
@@ -348,8 +342,8 @@ carefully since it is very dynamic.
 
 =head2 xml
 
-  my $xml = $html->xml;
-  $html   = $html->xml(1);
+  my $bool = $html->xml;
+  $html    = $html->xml($bool);
 
 Disable HTML semantics in parser and activate case sensitivity, defaults to
 auto detection based on processing instructions.
@@ -363,7 +357,7 @@ following new ones.
 
   $html = $html->parse('<foo bar="baz">test</foo>');
 
-Parse HTML/XML document.
+Parse HTML/XML fragment.
 
 =head2 render
 

+4 -5

mojo/lib/Mojo/Date.pm

View

@@ -1,9 +1,6 @@
 package Mojo::Date;
 use Mojo::Base -base;
-use overload
-  'bool'   => sub {1},
-  '""'     => sub { shift->to_string },
-  fallback => 1;
+use overload bool => sub {1}, '""' => sub { shift->to_string }, fallback => 1;
 
 use Time::Local 'timegm';
 
@@ -63,6 +60,8 @@ sub to_string {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Date - HTTP date
@@ -109,7 +108,7 @@ following new ones.
   my $date = Mojo::Date->new;
   my $date = Mojo::Date->new('Sun Nov  6 08:49:37 1994');
 
-Construct a new L<Mojo::Date> object and C<parse> date if necessary.
+Construct a new L<Mojo::Date> object and L</"parse"> date if necessary.
 
 =head2 parse
 

+14 -17

mojo/lib/Mojo/EventEmitter.pm

View

@@ -9,12 +9,12 @@ sub emit {
   my ($self, $name) = (shift, shift);
 
   if (my $s = $self->{events}{$name}) {
-    warn "-- Emit $name in @{[blessed($self)]} (@{[scalar(@$s)]})\n" if DEBUG;
+    warn "-- Emit $name in @{[blessed $self]} (@{[scalar @$s]})\n" if DEBUG;
     for my $cb (@$s) { $self->$cb(@_) }
   }
   else {
-    warn "-- Emit $name in @{[blessed($self)]} (0)\n" if DEBUG;
-    warn $_[0] if $name eq 'error';
+    warn "-- Emit $name in @{[blessed $self]} (0)\n" if DEBUG;
+    die "@{[blessed $self]}: $_[0]" if $name eq 'error';
   }
 
   return $self;
@@ -24,22 +24,16 @@ sub emit_safe {
   my ($self, $name) = (shift, shift);
 
   if (my $s = $self->{events}{$name}) {
-    warn "-- Emit $name in @{[blessed($self)]} safely (@{[scalar(@$s)]})\n"
+    warn "-- Emit $name in @{[blessed $self]} safely (@{[scalar @$s]})\n"
       if DEBUG;
     for my $cb (@$s) {
-      unless (eval { $self->$cb(@_); 1 }) {
-
-        # Error event failed
-        if ($name eq 'error') { warn qq{Event "error" failed: $@} }
-
-        # Normal event failed
-        else { $self->emit_safe('error', qq{Event "$name" failed: $@}) }
-      }
+      $self->emit(error => qq{Event "$name" failed: $@})
+        unless eval { $self->$cb(@_); 1 };
     }
   }
   else {
-    warn "-- Emit $name in @{[blessed($self)]} safely (0)\n" if DEBUG;
-    warn $_[0] if $name eq 'error';
+    warn "-- Emit $name in @{[blessed $self]} safely (0)\n" if DEBUG;
+    die "@{[blessed $self]}: $_[0]" if $name eq 'error';
   }
 
   return $self;
@@ -76,6 +70,7 @@ sub unsubscribe {
   # One
   if ($cb) {
     $self->{events}{$name} = [grep { $cb ne $_ } @{$self->{events}{$name}}];
+    delete $self->{events}{$name} unless @{$self->{events}{$name}};
   }
 
   # All
@@ -86,6 +81,8 @@ sub unsubscribe {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::EventEmitter - Event emitter base class
@@ -126,7 +123,7 @@ L<Mojo::EventEmitter> can emit the following events.
     ...
   });
 
-Emitted safely for event errors.
+Emitted for event errors, fatal if unhandled.
 
   $e->on(error => sub {
     my ($e, $err) = @_;
@@ -150,11 +147,11 @@ Emit event.
   $e = $e->emit_safe('foo');
   $e = $e->emit_safe('foo', 123);
 
-Emit event safely and emit C<error> event on failure.
+Emit event safely and emit L</"error"> event on failure.
 
 =head2 has_subscribers
 
-  my $success = $e->has_subscribers('foo');
+  my $bool = $e->has_subscribers('foo');
 
 Check if event has subscribers.
 

+23 -28

mojo/lib/Mojo/Exception.pm

View

@@ -1,9 +1,6 @@
 package Mojo::Exception;
 use Mojo::Base -base;
-use overload
-  'bool'   => sub {1},
-  '""'     => sub { shift->to_string },
-  fallback => 1;
+use overload bool => sub {1}, '""' => sub { shift->to_string }, fallback => 1;
 
 use Scalar::Util 'blessed';
 
@@ -46,40 +43,36 @@ sub trace {
 }
 
 sub _context {
-  my ($self, $line, $lines) = @_;
-
-  # Wrong file
-  return unless defined $lines->[0][$line - 1];
+  my ($self, $num, $lines) = @_;
 
   # Line
-  $self->line([$line]);
-  for my $l (@$lines) {
-    chomp(my $code = $l->[$line - 1]);
+  return unless defined $lines->[0][$num - 1];
+  $self->line([$num]);
+  for my $line (@$lines) {
+    chomp(my $code = $line->[$num - 1]);
     push @{$self->line}, $code;
   }
 
   # Before
   for my $i (2 .. 6) {
-    last if ((my $previous = $line - $i) < 0);
-    if (defined $lines->[0][$previous]) {
-      unshift @{$self->lines_before}, [$previous + 1];
-      for my $l (@$lines) {
-        chomp(my $code = $l->[$previous]);
-        push @{$self->lines_before->[0]}, $code;
-      }
+    last if ((my $previous = $num - $i) < 0);
+    next unless defined $lines->[0][$previous];
+    unshift @{$self->lines_before}, [$previous + 1];
+    for my $line (@$lines) {
+      chomp(my $code = $line->[$previous]);
+      push @{$self->lines_before->[0]}, $code;
     }
   }
 
   # After
   for my $i (0 .. 4) {
-    next if ((my $next = $line + $i) < 0);
-    if (defined $lines->[0][$next]) {
-      push @{$self->lines_after}, [$next + 1];
-      for my $l (@$lines) {
-        next unless defined(my $code = $l->[$next]);
-        chomp $code;
-        push @{$self->lines_after->[-1]}, $code;
-      }
+    next if ((my $next = $num + $i) < 0);
+    next unless defined $lines->[0][$next];
+    push @{$self->lines_after}, [$next + 1];
+    for my $line (@$lines) {
+      last unless defined(my $code = $line->[$next]);
+      chomp $code;
+      push @{$self->lines_after->[-1]}, $code;
     }
   }
 }
@@ -113,6 +106,8 @@ sub _detect {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Exception - Exceptions with context
@@ -172,8 +167,8 @@ Exception message.
 
 =head2 verbose
 
-  my $verbose = $e->verbose;
-  $e          = $e->verbose(1);
+  my $bool = $e->verbose;
+  $e       = $e->verbose($bool);
 
 Render exception with context.
 

+56 -8

mojo/lib/Mojo/Headers.pm

View

@@ -8,13 +8,13 @@ has max_line_size => sub { $ENV{MOJO_MAX_LINE_SIZE} || 10240 };
 # Common headers
 my @HEADERS = (
   qw(Accept Accept-Charset Accept-Encoding Accept-Language Accept-Ranges),
-  qw(Authorization Cache-Control Connection Content-Disposition),
+  qw(Allow Authorization Cache-Control Connection Content-Disposition),
   qw(Content-Encoding Content-Length Content-Range Content-Type Cookie DNT),
-  qw(Date ETag Expect Expires Host If-Modified-Since Last-Modified Location),
-  qw(Origin Proxy-Authenticate Proxy-Authorization Range),
+  qw(Date ETag Expect Expires Host If-Modified-Since Last-Modified Link),
+  qw(Location Origin Proxy-Authenticate Proxy-Authorization Range),
   qw(Sec-WebSocket-Accept Sec-WebSocket-Extensions Sec-WebSocket-Key),
   qw(Sec-WebSocket-Protocol Sec-WebSocket-Version Server Set-Cookie Status),
-  qw(TE Trailer Transfer-Encoding Upgrade User-Agent WWW-Authenticate)
+  qw(TE Trailer Transfer-Encoding Upgrade User-Agent Vary WWW-Authenticate)
 );
 for my $header (@HEADERS) {
   my $name = lc $header;
@@ -22,7 +22,7 @@ for my $header (@HEADERS) {
   monkey_patch __PACKAGE__, $name, sub { scalar shift->header($header => @_) };
 }
 
-# Lower case headers
+# Lowercase headers
 my %NORMALCASE = map { lc($_) => $_ } @HEADERS;
 
 sub add {
@@ -38,6 +38,12 @@ sub add {
   return $self;
 }
 
+sub append {
+  my ($self, $name, $value) = @_;
+  my $old = $self->header($name);
+  return $self->header($name => defined $old ? "$old, $value" : $value);
+}
+
 sub clone {
   my $self = shift;
   return $self->new->from_hash($self->to_hash(1));
@@ -149,6 +155,8 @@ sub to_string {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Headers - Headers
@@ -234,6 +242,29 @@ Shortcut for the C<Accept-Ranges> header.
 
 Add one or more header values with one or more lines.
 
+  # "Vary: Accept"
+  # "Vary: Accept-Encoding"
+  $headers->vary('Accept')->add(Vary => 'Accept-Encoding')->to_string;
+
+=head2 allow
+
+  my $allow = $headers->allow;
+  $headers  = $headers->allow('GET, POST');
+
+Shortcut for the C<Allow> header.
+
+=head2 append
+
+  $headers = $headers->append(Vary => 'Accept-Encoding');
+
+Append value to header and flatten it if necessary.
+
+  # "Vary: Accept"
+  $headers->append(Vary => 'Accept')->to_string;
+
+  # "Vary: Accept, Accept-Encoding"
+  $headers->vary('Accept')->append(Vary => 'Accept-Encoding')->to_string;
+
 =head2 authorization
 
   my $authorization = $headers->authorization;
@@ -380,13 +411,13 @@ Shortcut for the C<If-Modified-Since> header.
 
 =head2 is_finished
 
-  my $success = $headers->is_finished;
+  my $bool = $headers->is_finished;
 
 Check if header parser is finished.
 
 =head2 is_limit_exceeded
 
-  my $success = $headers->is_limit_exceeded;
+  my $bool = $headers->is_limit_exceeded;
 
 Check if a header has exceeded C<max_line_size>.
 
@@ -403,6 +434,13 @@ Shortcut for the C<Last-Modified> header.
 
 Get leftover data from header parser.
 
+=head2 link
+
+  my $link = $headers->link;
+  $headers = $headers->link('<http://127.0.0.1/foo/3>; rel="next"');
+
+Shortcut for the C<Link> header from RFC 5988.
+
 =head2 location
 
   my $location = $headers->location;
@@ -414,7 +452,10 @@ Shortcut for the C<Location> header.
 
   my $names = $headers->names;
 
-Generate a list of all currently defined headers.
+Return a list of all currently defined headers.
+
+  # Names of all headers
+  say for @{$headers->names};
 
 =head2 origin
 
@@ -571,6 +612,13 @@ Shortcut for the C<Upgrade> header.
 
 Shortcut for the C<User-Agent> header.
 
+=head2 vary
+
+  my $vary = $headers->vary;
+  $headers = $headers->vary('*');
+
+Shortcut for the C<Vary> header.
+
 =head2 www_authenticate
 
   my $authenticate = $headers->www_authenticate;

mojo/lib/Mojo/HelloWorld.pm

View

@@ -7,6 +7,8 @@ any '/*whatever' => {whatever => '', text => 'Your Mojo is working!'};
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::HelloWorld - Hello World!

+27 -23

mojo/lib/Mojo/Home.pm

View

@@ -1,9 +1,6 @@
 package Mojo::Home;
 use Mojo::Base -base;
-use overload
-  'bool'   => sub {1},
-  '""'     => sub { shift->to_string },
-  fallback => 1;
+use overload bool => sub {1}, '""' => sub { shift->to_string }, fallback => 1;
 
 use Cwd 'abs_path';
 use File::Basename 'dirname';
@@ -12,16 +9,15 @@ use File::Spec::Functions qw(abs2rel catdir catfile splitdir);
 use FindBin;
 use Mojo::Util qw(class_to_path slurp);
 
+has parts => sub { [] };
+
 sub new { shift->SUPER::new->parse(@_) }
 
 sub detect {
   my $self = shift;
 
   # Environment variable
-  if ($ENV{MOJO_HOME}) {
-    $self->{parts} = [splitdir(abs_path $ENV{MOJO_HOME})];
-    return $self;
-  }
+  return $self->parts([splitdir(abs_path $ENV{MOJO_HOME})]) if $ENV{MOJO_HOME};
 
   # Try to find home from lib directory
   if (my $class = @_ ? shift : 'Mojo::HelloWorld') {
@@ -34,28 +30,23 @@ sub detect {
       pop @home while @home && ($home[-1] =~ /^b?lib$/ || $home[-1] eq '');
 
       # Turn into absolute path
-      $self->{parts} = [splitdir(abs_path(catdir(@home) || '.'))];
+      return $self->parts([splitdir(abs_path(catdir(@home) || '.'))]);
     }
   }
 
   # FindBin fallback
-  $self->{parts} = [split /\//, $FindBin::Bin] unless $self->{parts};
-
-  return $self;
+  return $self->parts([split /\//, $FindBin::Bin]);
 }
 
 sub lib_dir {
-  my $path = catdir @{shift->{parts} || []}, 'lib';
+  my $path = catdir @{shift->parts}, 'lib';
   return -d $path ? $path : undef;
 }
 
 sub list_files {
   my ($self, $dir) = @_;
 
-  # Files relative to directory
-  my $parts = $self->{parts} || [];
-  my $root = catdir @$parts;
-  $dir = catdir $root, split '/', ($dir || '');
+  $dir = catdir @{$self->parts}, split '/', (defined $dir ? $dir : '');
   return [] unless -d $dir;
   my @files;
   find {
@@ -73,17 +64,18 @@ sub mojo_lib_dir { catdir(dirname(__FILE__), '..') }
 
 sub parse {
   my ($self, $path) = @_;
-  $self->{parts} = [splitdir $path] if defined $path;
-  return $self;
+  return defined $path ? $self->parts([splitdir $path]) : $self;
 }
 
-sub rel_dir { catdir(@{shift->{parts} || []}, split '/', shift) }
-sub rel_file { catfile(@{shift->{parts} || []}, split '/', shift) }
+sub rel_dir { catdir(@{shift->parts}, split '/', shift) }
+sub rel_file { catfile(@{shift->parts}, split '/', shift) }
 
-sub to_string { catdir(@{shift->{parts} || []}) }
+sub to_string { catdir(@{shift->parts}) }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Home - Home sweet home!
@@ -103,6 +95,17 @@ Mojo::Home - Home sweet home!
 
 L<Mojo::Home> is a container for home directories.
 
+=head1 ATTRIBUTES
+
+L<Mojo::Home> implements the following attributes.
+
+=head2 parts
+
+  my $parts = $home->parts;
+  $home     = $home->parts([]);
+
+Home directory parts.
+
 =head1 METHODS
 
 L<Mojo::Home> inherits all methods from L<Mojo::Base> and implements the
@@ -113,7 +116,8 @@ following new ones.
   my $home = Mojo::Home->new;
   my $home = Mojo::Home->new('/home/sri/myapp');
 
-Construct a new L<Mojo::Home> object and C<parse> home directory if necessary.
+Construct a new L<Mojo::Home> object and L</"parse"> home directory if
+necessary.
 
 =head2 detect
 

+67 -74

mojo/lib/Mojo/IOLoop.pm

View

@@ -10,7 +10,7 @@ use Mojo::IOLoop::Server;
 use Mojo::IOLoop::Stream;
 use Mojo::Reactor::Poll;
 use Mojo::Util qw(md5_sum steady_time);
-use Scalar::Util 'weaken';
+use Scalar::Util qw(blessed weaken);
 
 use constant DEBUG => $ENV{MOJO_IOLOOP_DEBUG} || 0;
 
@@ -22,7 +22,9 @@ has multi_accept    => 50;
 has reactor         => sub {
   my $class = Mojo::Reactor::Poll->detect;
   warn "-- Reactor initialized ($class)\n" if DEBUG;
-  return $class->new;
+  my $reactor = $class->new;
+  $reactor->on(error => sub { warn "@{[blessed $_[0]]}: $_[1]" });
+  return $reactor;
 };
 
 # Ignore PIPE signal
@@ -32,8 +34,7 @@ $SIG{PIPE} = 'IGNORE';
 __PACKAGE__->singleton->reactor;
 
 sub acceptor {
-  my ($self, $acceptor) = @_;
-  $self = $self->singleton unless ref $self;
+  my ($self, $acceptor) = (_instance(shift), @_);
 
   # Find acceptor for id
   return $self->{acceptors}{$acceptor} unless ref $acceptor;
@@ -44,35 +45,28 @@ sub acceptor {
   weaken $acceptor->reactor($self->reactor)->{reactor};
   $self->{accepts} = $self->max_accepts if $self->max_accepts;
 
-  # Stop accepting so new acceptor can get picked up
+  # Allow new acceptor to get picked up
   $self->_not_accepting;
 
   return $id;
 }
 
 sub client {
-  my ($self, $cb) = (shift, pop);
-  $self = $self->singleton unless ref $self;
+  my ($self, $cb) = (_instance(shift), pop);
 
   # Make sure timers are running
-  $self->_timers;
+  $self->_recurring;
 
-  my $id     = $self->_id;
-  my $c      = $self->{connections}{$id} ||= {};
-  my $client = $c->{client} = Mojo::IOLoop::Client->new;
+  my $id = $self->_id;
+  my $client = $self->{connections}{$id}{client} = Mojo::IOLoop::Client->new;
   weaken $client->reactor($self->reactor)->{reactor};
 
   weaken $self;
   $client->on(
     connect => sub {
-      my $handle = pop;
-
-      # Turn handle into stream
-      my $c = $self->{connections}{$id};
-      delete $c->{client};
-      my $stream = $c->{stream} = Mojo::IOLoop::Stream->new($handle);
+      delete $self->{connections}{$id}{client};
+      my $stream = Mojo::IOLoop::Stream->new(pop);
       $self->_stream($stream => $id);
-
       $self->$cb(undef, $stream);
     }
   );
@@ -88,8 +82,7 @@ sub client {
 }
 
 sub delay {
-  my $self = shift;
-  $self = $self->singleton unless ref $self;
+  my $self = _instance(shift);
 
   my $delay = Mojo::IOLoop::Delay->new;
   weaken $delay->ioloop($self)->{ioloop};
@@ -103,42 +96,24 @@ sub generate_port { Mojo::IOLoop::Server->generate_port }
 sub is_running { (ref $_[0] ? $_[0] : $_[0]->singleton)->reactor->is_running }
 sub one_tick   { (ref $_[0] ? $_[0] : $_[0]->singleton)->reactor->one_tick }
 
-sub recurring {
-  my ($self, $after, $cb) = @_;
-  $self = $self->singleton unless ref $self;
-  weaken $self;
-  return $self->reactor->recurring($after => sub { $self->$cb });
-}
+sub recurring { shift->_timer(recurring => @_) }
 
 sub remove {
-  my ($self, $id) = @_;
-  $self = $self->singleton unless ref $self;
+  my ($self, $id) = (_instance(shift), @_);
   my $c = $self->{connections}{$id};
   if ($c && (my $stream = $c->{stream})) { return $stream->close_gracefully }
   $self->_remove($id);
 }
 
 sub server {
-  my ($self, $cb) = (shift, pop);
-  $self = $self->singleton unless ref $self;
+  my ($self, $cb) = (_instance(shift), pop);
 
   my $server = Mojo::IOLoop::Server->new;
   weaken $self;
   $server->on(
     accept => sub {
-      my $handle = pop;
-
-      # Turn handle into stream
-      my $stream = Mojo::IOLoop::Stream->new($handle);
+      my $stream = Mojo::IOLoop::Stream->new(pop);
       $self->$cb($stream, $self->stream($stream));
-
-      # Enforce connection limit (randomize to improve load balancing)
-      $self->max_connections(0)
-        if defined $self->{accepts}
-        && ($self->{accepts} -= int(rand 2) + 1) <= 0;
-
-      # Stop accepting to release accept mutex
-      $self->_not_accepting;
     }
   );
   $server->listen(@_);
@@ -158,24 +133,23 @@ sub start {
 sub stop { (ref $_[0] ? $_[0] : $_[0]->singleton)->reactor->stop }
 
 sub stream {
-  my ($self, $stream) = @_;
-  $self = $self->singleton unless ref $self;
-
-  # Connect stream with reactor
-  return $self->_stream($stream, $self->_id) if ref $stream;
+  my ($self, $stream) = (_instance(shift), @_);
 
   # Find stream for id
-  return undef unless my $c = $self->{connections}{$stream};
-  return $c->{stream};
-}
+  return ($self->{connections}{$stream} || {})->{stream} unless ref $stream;
 
-sub timer {
-  my ($self, $after, $cb) = @_;
-  $self = $self->singleton unless ref $self;
-  weaken $self;
-  return $self->reactor->timer($after => sub { $self->$cb });
+  # Release accept mutex
+  $self->_not_accepting;
+
+  # Enforce connection limit (randomize to improve load balancing)
+  $self->max_connections(0)
+    if defined $self->{accepts} && ($self->{accepts} -= int(rand 2) + 1) <= 0;
+
+  return $self->_stream($stream, $self->_id);
 }
 
+sub timer { shift->_timer(timer => @_) }
+
 sub _accepting {
   my $self = shift;
 
@@ -206,11 +180,13 @@ sub _id {
   return $id;
 }
 
+sub _instance { ref $_[0] ? $_[0] : $_[0]->singleton }
+
 sub _not_accepting {
   my $self = shift;
 
   # Make sure timers are running
-  $self->_timers;
+  $self->_recurring;
 
   # Release accept mutex
   return unless delete $self->{accepting};
@@ -220,6 +196,12 @@ sub _not_accepting {
   $_->stop for values %{$self->{acceptors} || {}};
 }
 
+sub _recurring {
+  my $self = shift;
+  $self->{accept} ||= $self->recurring($self->accept_interval => \&_accepting);
+  $self->{stop} ||= $self->recurring(1 => \&_stop);
+}
+
 sub _remove {
   my ($self, $id) = @_;
 
@@ -246,7 +228,7 @@ sub _stream {
   my ($self, $stream, $id) = @_;
 
   # Make sure timers are running
-  $self->_timers;
+  $self->_recurring;
 
   # Connect stream with reactor
   $self->{connections}{$id}{stream} = $stream;
@@ -258,14 +240,16 @@ sub _stream {
   return $id;
 }
 
-sub _timers {
-  my $self = shift;
-  $self->{accept} ||= $self->recurring($self->accept_interval => \&_accepting);
-  $self->{stop} ||= $self->recurring(1 => \&_stop);
+sub _timer {
+  my ($self, $method, $after, $cb) = (_instance(shift), @_);
+  weaken $self;
+  return $self->reactor->$method($after => sub { $self->$cb });
 }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::IOLoop - Minimalistic event loop
@@ -319,17 +303,18 @@ L<Mojo::IOLoop> is a very minimalistic event loop based on L<Mojo::Reactor>,
 it has been reduced to the absolute minimal feature set required to build
 solid and scalable non-blocking TCP clients and servers.
 
-Optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.16+) and
-L<IO::Socket::SSL> (1.75+) are supported transparently, and used if installed.
-Individual features can also be disabled with the MOJO_NO_IPV6 and MOJO_NO_TLS
-environment variables.
-
 The event loop will be resilient to time jumps if a monotonic clock is
 available through L<Time::HiRes>. A TLS certificate and key are also built
 right in, to make writing test servers as easy as possible. Also note that for
 convenience the C<PIPE> signal will be set to C<IGNORE> when L<Mojo::IOLoop>
 is loaded.
 
+For better scalability (epoll, kqueue) and to provide IPv6 as well as TLS
+support, the optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.16+) and
+L<IO::Socket::SSL> (1.75+) will be used automatically if they are installed.
+Individual features can also be disabled with the MOJO_NO_IPV6 and MOJO_NO_TLS
+environment variables.
+
 See L<Mojolicious::Guides::Cookbook> for more.
 
 =head1 ATTRIBUTES
@@ -396,7 +381,7 @@ Number of connections to accept at once, defaults to C<50>.
   $loop       = $loop->reactor(Mojo::Reactor->new);
 
 Low level event reactor, usually a L<Mojo::Reactor::Poll> or
-L<Mojo::Reactor::EV> object.
+L<Mojo::Reactor::EV> object with a default C<error> event.
 
   # Watch if handle becomes readable or writable
   $loop->reactor->io($handle => sub {
@@ -464,6 +449,7 @@ event, and multiple ones as a chain of steps.
       $end->();
     });
   }
+  $delay->wait unless Mojo::IOLoop->is_running;
 
   # Sequentialize multiple events
   my $delay = Mojo::IOLoop->delay(
@@ -486,8 +472,6 @@ event, and multiple ones as a chain of steps.
     # Third step (the end)
     sub { say 'And done after 5 seconds total.' }
   );
-
-  # Wait for events if necessary
   $delay->wait unless Mojo::IOLoop->is_running;
 
 =head2 generate_port
@@ -499,8 +483,8 @@ Find a free TCP port, this is a utility function primarily used for tests.
 
 =head2 is_running
 
-  my $success = Mojo::IOLoop->is_running;
-  my $success = $loop->is_running;
+  my $bool = Mojo::IOLoop->is_running;
+  my $bool = $loop->is_running;
 
 Check if event loop is running.
 
@@ -514,6 +498,11 @@ 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.
 
+  # Don't block longer than 0.5 seconds
+  my $id = Mojo::IOLoop->timer(0.5 => sub {});
+  Mojo::IOLoop->one_tick;
+  Mojo::IOLoop->remove($id);
+
 =head2 recurring
 
   my $id = Mojo::IOLoop->recurring(0.5 => sub {...});
@@ -559,13 +548,17 @@ loop object from everywhere inside the process.
   Mojo::IOLoop->timer(2 => sub { Mojo::IOLoop->stop });
   Mojo::IOLoop->start;
 
+  # Restart active timer
+  my $id = Mojo::IOLoop->timer(3 => sub { say 'Timeout!' });
+  Mojo::IOLoop->singleton->reactor->again($id);
+
 =head2 start
 
   Mojo::IOLoop->start;
   $loop->start;
 
-Start the event loop, this will block until C<stop> is called. Note that some
-reactors stop automatically if there are no events being watched anymore.
+Start the event loop, this will block until L</"stop"> is called. Note that
+some 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;
@@ -576,7 +569,7 @@ reactors stop automatically if there are no events being watched anymore.
   $loop->stop;
 
 Stop the event loop, this will not interrupt any existing connections and the
-event loop can be restarted by running C<start> again.
+event loop can be restarted by running L</"start"> again.
 
 =head2 stream
 

+58 -45

mojo/lib/Mojo/IOLoop/Client.pm

View

@@ -34,7 +34,7 @@ sub connect {
 
 sub _cleanup {
   my $self = shift;
-  return $self unless my $reactor = $self->{reactor};
+  return $self unless my $reactor = $self->reactor;
   $self->{$_} && $reactor->remove(delete $self->{$_})
     for qw(delay timer handle);
   return $self;
@@ -50,18 +50,17 @@ sub _connect {
     my %options = (
       Blocking => 0,
       PeerAddr => $address eq 'localhost' ? '127.0.0.1' : $address,
-      PeerPort => $args->{port} || ($args->{tls} ? 443 : 80),
-      Proto    => 'tcp'
+      PeerPort => $args->{port} || ($args->{tls} ? 443 : 80)
     );
     $options{LocalAddr} = $args->{local_address} if $args->{local_address};
     $options{PeerAddr} =~ s/[\[\]]//g if $options{PeerAddr};
     my $class = IPV6 ? 'IO::Socket::IP' : 'IO::Socket::INET';
-    return $self->emit_safe(error => "Couldn't connect")
+    return $self->emit(error => "Couldn't connect: $@")
       unless $self->{handle} = $handle = $class->new(%options);
 
     # Timeout
     $self->{timer} = $reactor->timer($args->{timeout} || 10,
-      sub { $self->emit_safe(error => 'Connect timeout') });
+      sub { $self->emit(error => 'Connect timeout') });
   }
   $handle->blocking(0);
 
@@ -73,16 +72,15 @@ sub _connect {
 sub _tls {
   my $self = shift;
 
-  # Switch between reading and writing
+  # Connected
   my $handle = $self->{handle};
-  if ($self->{tls} && !$handle->connect_SSL) {
-    my $err = $IO::Socket::SSL::SSL_ERROR;
-    if    ($err == TLS_READ)  { $self->reactor->watch($handle, 1, 0) }
-    elsif ($err == TLS_WRITE) { $self->reactor->watch($handle, 1, 1) }
-    return;
-  }
+  return $self->_cleanup->emit_safe(connect => $handle)
+    if $handle->connect_SSL;
 
-  $self->_cleanup->emit_safe(connect => $handle);
+  # Switch between reading and writing
+  my $err = $IO::Socket::SSL::SSL_ERROR;
+  if    ($err == TLS_READ)  { $self->reactor->watch($handle, 1, 0) }
+  elsif ($err == TLS_WRITE) { $self->reactor->watch($handle, 1, 1) }
 }
 
 sub _try {
@@ -90,47 +88,44 @@ sub _try {
 
   # Retry or handle exceptions
   my $handle = $self->{handle};
-  return $! == EINPROGRESS ? undef : $self->emit_safe(error => $!)
+  return $! == EINPROGRESS ? undef : $self->emit(error => $!)
     if IPV6 && !$handle->connect;
-  return $self->emit_safe(error => $! = $handle->sockopt(SO_ERROR))
+  return $self->emit(error => $! = $handle->sockopt(SO_ERROR))
     if !IPV6 && !$handle->connected;
 
   # Disable Nagle's algorithm
   setsockopt $handle, IPPROTO_TCP, TCP_NODELAY, 1;
 
-  # TLS
-  if ($args->{tls} && !$handle->isa('IO::Socket::SSL')) {
-    return $self->emit_safe(
-      error => 'IO::Socket::SSL 1.75 required for TLS support')
-      unless TLS;
-
-    # Upgrade
-    weaken $self;
-    my %options = (
-      SSL_ca_file => $args->{tls_ca}
-        && -T $args->{tls_ca} ? $args->{tls_ca} : undef,
-      SSL_cert_file      => $args->{tls_cert},
-      SSL_error_trap     => sub { $self->_cleanup->emit_safe(error => $_[1]) },
-      SSL_hostname       => $args->{address},
-      SSL_key_file       => $args->{tls_key},
-      SSL_startHandshake => 0,
-      SSL_verify_mode    => $args->{tls_ca} ? 0x01 : 0x00,
-      SSL_verifycn_name  => $args->{address},
-      SSL_verifycn_scheme => $args->{tls_ca} ? 'http' : undef
-    );
-    $self->{tls} = 1;
-    my $reactor = $self->reactor;
-    $reactor->remove($handle);
-    return $self->emit_safe(error => 'TLS upgrade failed')
-      unless $handle = IO::Socket::SSL->start_SSL($handle, %options);
-    return $reactor->io($handle => sub { $self->_tls })->watch($handle, 0, 1);
-  }
+  return $self->_cleanup->emit_safe(connect => $handle)
+    if !$args->{tls} || $handle->isa('IO::Socket::SSL');
+  return $self->emit(error => 'IO::Socket::SSL 1.75 required for TLS support')
+    unless TLS;
 
-  $self->_cleanup->emit_safe(connect => $handle);
+  # Upgrade
+  weaken $self;
+  my %options = (
+    SSL_ca_file => $args->{tls_ca}
+      && -T $args->{tls_ca} ? $args->{tls_ca} : undef,
+    SSL_cert_file       => $args->{tls_cert},
+    SSL_error_trap      => sub { $self->_cleanup->emit(error => $_[1]) },
+    SSL_hostname        => $args->{address},
+    SSL_key_file        => $args->{tls_key},
+    SSL_startHandshake  => 0,
+    SSL_verify_mode     => $args->{tls_ca} ? 0x01 : 0x00,
+    SSL_verifycn_name   => $args->{address},
+    SSL_verifycn_scheme => $args->{tls_ca} ? 'http' : undef
+  );
+  my $reactor = $self->reactor;
+  $reactor->remove($handle);
+  return $self->emit(error => 'TLS upgrade failed')
+    unless $handle = IO::Socket::SSL->start_SSL($handle, %options);
+  $reactor->io($handle => sub { $self->_tls })->watch($handle, 0, 1);
 }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::IOLoop::Client - Non-blocking TCP client
@@ -179,7 +174,7 @@ Emitted safely once the connection is established.
     ...
   });
 
-Emitted safely if an error occurs on the connection.
+Emitted if an error occurs on the connection, fatal if unhandled.
 
 =head1 ATTRIBUTES
 
@@ -211,39 +206,57 @@ These options are currently available:
 
 =item address
 
+  address => 'mojolicio.us'
+
 Address or host name of the peer to connect to, defaults to C<localhost>.
 
 =item handle
 
+  handle => $handle
+
 Use an already prepared handle.
 
 =item local_address
 
+  local_address => '127.0.0.1'
+
 Local address to bind to.
 
 =item port
 
-Port to connect to.
+  port => 80
+
+Port to connect to, defaults to C<80> or C<443> with C<tls> option.
 
 =item timeout
 
+  timeout => 15
+
 Maximum amount of time in seconds establishing connection may take before
 getting canceled, defaults to C<10>.
 
 =item tls
 
+  tls => 1
+
 Enable TLS.
 
 =item tls_ca
 
+  tls_ca => '/etc/tls/ca.crt'
+
 Path to TLS certificate authority file. Also activates hostname verification.
 
 =item tls_cert
 
+  tls_cert => '/etc/tls/client.crt'
+
 Path to the TLS certificate file.
 
 =item tls_key
 
+  tls_key => '/etc/tls/client.key'
+
 Path to the TLS key file.
 
 =back

+35 -17

mojo/lib/Mojo/IOLoop/Delay.pm

View

@@ -15,36 +15,44 @@ sub begin {
 sub steps {
   my $self = shift;
   $self->{steps} = [@_];
-  $self->begin->();
+  $self->ioloop->timer(0 => $self->begin);
   return $self;
 }
 
 sub wait {
   my $self = shift;
+
   my @args;
+  $self->once(error => \&_die);
   $self->once(finish => sub { shift->ioloop->stop; @args = @_ });
   $self->ioloop->start;
+
   return wantarray ? @args : $args[0];
 }
 
+sub _die { $_[0]->has_subscribers('error') ? $_[0]->ioloop->stop : die $_[1] }
+
 sub _step {
   my ($self, $id) = (shift, shift);
 
   $self->{args}[$id] = [@_];
-  return $self->{pending} if --$self->{pending} || $self->{lock};
+  return if $self->{fail} || --$self->{pending} || $self->{lock};
   local $self->{lock} = 1;
   my @args = map {@$_} @{delete $self->{args}};
 
   $self->{counter} = 0;
-  if (my $cb = shift @{$self->{steps} ||= []}) { $self->$cb(@args) }
+  if (my $cb = shift @{$self->{steps} ||= []}) {
+    eval { $self->$cb(@args); 1 } or return $self->emit(error => $@)->{fail}++;
+  }
 
-  if (!$self->{counter}) { $self->emit(finish => @args) }
-  elsif (!$self->{pending}) { $self->ioloop->timer(0 => $self->begin) }
-  return 0;
+  return $self->emit(finish => @args) unless $self->{counter};
+  $self->ioloop->timer(0 => $self->begin) unless $self->{pending};
 }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::IOLoop::Delay - Manage callbacks and control the flow of events
@@ -63,6 +71,7 @@ Mojo::IOLoop::Delay - Manage callbacks and control the flow of events
       $end->();
     });
   }
+  $delay->wait unless Mojo::IOLoop->is_running;
 
   # Sequentialize multiple events
   my $delay = Mojo::IOLoop::Delay->new;
@@ -89,8 +98,6 @@ Mojo::IOLoop::Delay - Manage callbacks and control the flow of events
       say 'And done after 5 seconds total.';
     }
   );
-
-  # Wait for events if necessary
   $delay->wait unless Mojo::IOLoop->is_running;
 
 =head1 DESCRIPTION
@@ -103,6 +110,16 @@ L<Mojo::IOLoop>.
 L<Mojo::IOLoop::Delay> inherits all events from L<Mojo::EventEmitter> and can
 emit the following new ones.
 
+=head2 error
+
+  $delay->on(error => sub {
+    my ($delay, $err) = @_;
+    ...
+  });
+
+Emitted if an error occurs in one of the steps, breaking the chain, fatal if
+unhandled.
+
 =head2 finish
 
   $delay->on(finish => sub {
@@ -132,13 +149,13 @@ implements the following new ones.
 
 =head2 begin
 
-  my $cb = $delay->begin;
-  my $cb = $delay->begin(0);
+  my $without_first_arg = $delay->begin;
+  my $with_first_arg    = $delay->begin(0);
 
 Increment active event counter, the returned callback can be used to decrement
 the active event counter again. Arguments passed to the callback are queued in
-the right order for the next step or C<finish> event and C<wait> method, the
-first argument will be ignored by default.
+the right order for the next step or L</"finish"> event and L</"wait"> method,
+the first argument will be ignored by default.
 
   # Capture all arguments
   my $delay = Mojo::IOLoop->delay;
@@ -150,16 +167,17 @@ first argument will be ignored by default.
   $delay = $delay->steps(sub {...}, sub {...});
 
 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 or a callback does not increment the active
-event counter.
+next one once the active event counter reaches zero. This chain will continue
+until there are no more callbacks, a callback does not increment the active
+event counter or an error occurs in a callback.
 
 =head2 wait
 
+  my $arg  = $delay->wait;
   my @args = $delay->wait;
 
-Start C<ioloop> and stop it again once the C<finish> event gets emitted, only
-works when C<ioloop> is not running already.
+Start L</"ioloop"> and stop it again once an L</"error"> or L</"finish"> event
+gets emitted, only works when L</"ioloop"> is not running already.
 
   # Use the "finish" event to synchronize portably
   $delay->on(finish => sub {

+62 -27

mojo/lib/Mojo/IOLoop/Server.pm

View

@@ -34,11 +34,17 @@ has reactor      => sub {
 sub DESTROY {
   my $self = shift;
   if (my $port = $self->{port}) { $ENV{MOJO_REUSE} =~ s/(?:^|\,)${port}:\d+// }
-  return unless my $reactor = $self->{reactor};
+  return unless my $reactor = $self->reactor;
   $self->stop if $self->{handle};
   $reactor->remove($_) for values %{$self->{handles}};
 }
 
+sub generate_port {
+  IO::Socket::INET->new(Listen => 5, LocalAddr => '127.0.0.1')->sockport;
+}
+
+sub handle { shift->{handle} }
+
 sub listen {
   my $self = shift;
   my $args = ref $_[0] ? $_[0] : {@_};
@@ -56,8 +62,8 @@ sub listen {
   my $handle;
   my $class = IPV6 ? 'IO::Socket::IP' : 'IO::Socket::INET';
   if (defined $fd) {
-    $handle = $class->new;
-    $handle->fdopen($fd, 'r') or croak "Can't open file descriptor $fd: $!";
+    $handle = $class->new_from_fd($fd, 'r')
+      or croak "Can't open file descriptor $fd: $!";
   }
 
   # New socket
@@ -66,12 +72,12 @@ sub listen {
       Listen => defined $args->{backlog} ? $args->{backlog} : SOMAXCONN,
       LocalAddr => $args->{address} || '0.0.0.0',
       LocalPort => $port,
-      Proto     => 'tcp',
       ReuseAddr => 1,
+      ReusePort => $args->{reuse},
       Type      => SOCK_STREAM
     );
     $options{LocalAddr} =~ s/[\[\]]//g;
-    $handle = $class->new(%options) or croak "Can't create listen socket: $!";
+    $handle = $class->new(%options) or croak "Can't create listen socket: $@";
     $fd = fileno $handle;
     $ENV{MOJO_REUSE} .= length $ENV{MOJO_REUSE} ? ",$reuse:$fd" : "$reuse:$fd";
   }
@@ -81,25 +87,18 @@ sub listen {
   return unless $args->{tls};
   croak "IO::Socket::SSL 1.75 required for TLS support" unless TLS;
 
-  # Options (Prioritize RC4 to mitigate BEAST attack)
-  my $options = $self->{tls} = {
+  # Prioritize RC4 to mitigate BEAST attack
+  $self->{tls} = {
+    SSL_ca_file => $args->{tls_ca}
+      && -T $args->{tls_ca} ? $args->{tls_ca} : undef,
     SSL_cert_file => $args->{tls_cert} || $CERT,
-    SSL_cipher_list =>
-      '!aNULL:!eNULL:!EXPORT:!DSS:!DES:!SSLv2:!LOW:RC4-SHA:RC4-MD5:ALL',
+    SSL_cipher_list => defined $args->{tls_ciphers} ? $args->{tls_ciphers}
+      : 'ECDHE-RSA-AES128-SHA256:AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH',
     SSL_honor_cipher_order => 1,
     SSL_key_file           => $args->{tls_key} || $KEY,
     SSL_startHandshake     => 0,
-    SSL_verify_mode        => 0x00
+    SSL_verify_mode => defined $args->{tls_verify} ? $args->{tls_verify} : $args->{tls_ca} ? 0x03 : 0x00
   };
-  return unless $args->{tls_ca};
-  $options->{SSL_ca_file} = -T $args->{tls_ca} ? $args->{tls_ca} : undef;
-  $options->{SSL_verify_mode}
-    = defined $args->{tls_verify} ? $args->{tls_verify} : 0x03;
-}
-
-sub generate_port {
-  IO::Socket::INET->new(Listen => 5, LocalAddr => '127.0.0.1', Proto => 'tcp')
-    ->sockport;
 }
 
 sub start {
@@ -139,8 +138,7 @@ sub _tls {
   # Accepted
   if ($handle->accept_SSL) {
     $self->reactor->remove($handle);
-    delete $self->{handles}{$handle};
-    return $self->emit_safe(accept => $handle);
+    return $self->emit_safe(accept => delete $self->{handles}{$handle});
   }
 
   # Switch between reading and writing
@@ -151,6 +149,8 @@ sub _tls {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::IOLoop::Server - Non-blocking TCP server
@@ -216,6 +216,18 @@ global L<Mojo::IOLoop> singleton.
 L<Mojo::IOLoop::Server> inherits all methods from L<Mojo::EventEmitter> and
 implements the following new ones.
 
+=head2 generate_port
+
+  my $port = $server->generate_port;
+
+Find a free TCP port, this is a utility function primarily used for tests.
+
+=head2 handle
+
+  my $handle = $server->handle;
+
+Get handle for server.
+
 =head2 listen
 
   $server->listen(port => 3000);
@@ -229,44 +241,67 @@ These options are currently available:
 
 =item address
 
+  address => '127.0.0.1'
+
 Local address to listen on, defaults to all.
 
 =item backlog
 
+  backlog => 128
+
 Maximum backlog size, defaults to C<SOMAXCONN>.
 
 =item port
 
+  port => 80
+
 Port to listen on.
 
+=item reuse
+
+  reuse => 1
+
+Allow multiple servers to use the same port with the C<SO_REUSEPORT> socket
+option.
+
 =item tls
 
+  tls => 1
+
 Enable TLS.
 
 =item tls_ca
 
+  tls_ca => '/etc/tls/ca.crt'
+
 Path to TLS certificate authority file.
 
 =item tls_cert
 
+  tls_cert => '/etc/tls/server.crt'
+
 Path to the TLS cert file, defaults to a built-in test certificate.
 
+=item tls_ciphers
+
+  tls_ciphers => 'AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH'
+
+Cipher specification string.
+
 =item tls_key
 
+  tls_key => '/etc/tls/server.key'
+
 Path to the TLS key file, defaults to a built-in test key.
 
 =item tls_verify
 
+  tls_verify => 0x00
+
 TLS verification mode, defaults to C<0x03>.
 
 =back
 
-=head2 generate_port
-
-  my $port = $server->generate_port;
-
-Find a free TCP port, this is a utility function primarily used for tests.
-
 =head2 start
 
   $server->start;

+14 -14

mojo/lib/Mojo/IOLoop/Stream.pm

View

@@ -11,16 +11,14 @@ has reactor => sub {
 
 sub DESTROY { shift->close }
 
-sub new { shift->SUPER::new(handle => shift, buffer => '') }
+sub new { shift->SUPER::new(handle => shift, buffer => '', timeout => 15) }
 
 sub close {
   my $self = shift;
 
-  # Cleanup
-  return unless my $reactor = $self->{reactor};
+  return unless my $reactor = $self->reactor;
   return unless my $handle  = delete $self->timeout(0)->{handle};
   $reactor->remove($handle);
-
   close $handle;
   $self->emit_safe('close');
 }
@@ -48,14 +46,14 @@ sub is_writing {
 sub start {
   my $self = shift;
 
-  my $reactor = $self->reactor;
-  $reactor->io($self->timeout(15)->{handle},
-    sub { pop() ? $self->_write : $self->_read })
-    unless $self->{timer};
-
   # Resume
-  $reactor->watch($self->{handle}, 1, $self->is_writing)
+  my $reactor = $self->reactor;
+  return $reactor->watch($self->{handle}, 1, $self->is_writing)
     if delete $self->{paused};
+
+  weaken $self;
+  my $cb = sub { pop() ? $self->_write : $self->_read };
+  $reactor->io($self->timeout($self->{timeout})->{handle} => $cb);
 }
 
 sub stop {
@@ -109,7 +107,7 @@ sub _error {
   return $self->close if $! == ECONNRESET || $! == EPIPE;
 
   # Error
-  $self->emit_safe(error => $!)->close;
+  $self->emit(error => $!)->close;
 }
 
 sub _read {
@@ -139,6 +137,8 @@ sub _write {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::IOLoop::Stream - Non-blocking I/O stream
@@ -204,7 +204,7 @@ Emitted safely once all data has been written.
     ...
   });
 
-Emitted safely if an error occurs on the stream.
+Emitted if an error occurs on the stream, fatal if unhandled.
 
 =head2 read
 
@@ -277,14 +277,14 @@ Get handle for stream.
 
 =head2 is_readable
 
-  my $success = $stream->is_readable;
+  my $bool = $stream->is_readable;
 
 Quick non-blocking check if stream is readable, useful for identifying tainted
 sockets.
 
 =head2 is_writing
 
-  my $success = $stream->is_writing;
+  my $bool = $stream->is_writing;
 
 Check if stream is writing.
 

+32 -22

mojo/lib/Mojo/JSON.pm

View

@@ -19,23 +19,23 @@ my %ESCAPE = (
   '"'     => '"',
   '\\'    => '\\',
   '/'     => '/',
-  'b'     => "\x07",
-  'f'     => "\x0C",
-  'n'     => "\x0A",
-  'r'     => "\x0D",
+  'b'     => "\x08",
+  'f'     => "\x0c",
+  'n'     => "\x0a",
+  'r'     => "\x0d",
   't'     => "\x09",
   'u2028' => "\x{2028}",
   'u2029' => "\x{2029}"
 );
 my %REVERSE = map { $ESCAPE{$_} => "\\$_" } keys %ESCAPE;
-for (0x00 .. 0x1F, 0x7F) { $REVERSE{pack 'C', $_} = do {my $tmp = $REVERSE{pack 'C', $_}; defined $tmp ? $tmp : sprintf '\u%.4X', $_} }
+for (0x00 .. 0x1f, 0x7f) {$REVERSE{pack 'C', $_} = defined $REVERSE{pack 'C', $_} ? $REVERSE{pack 'C', $_} : sprintf '\u%.4X', $_}
 
 # Unicode encoding detection
 my $UTF_PATTERNS = {
-  'UTF-32BE' => qr/^\0\0\0[^\0]/,
-  'UTF-16BE' => qr/^\0[^\0]\0[^\0]/,
-  'UTF-32LE' => qr/^[^\0]\0\0\0/,
-  'UTF-16LE' => qr/^[^\0]\0[^\0]\0/
+  'UTF-32BE' => qr/^\x00{3}[^\x00]/,
+  'UTF-32LE' => qr/^[^\x00]\x00{3}/,
+  'UTF-16BE' => qr/^(?:\x00[^\x00]){2}/,
+  'UTF-16LE' => qr/^(?:[^\x00]\x00){2}/
 };
 
 my $WHITESPACE_RE = qr/[\x20\x09\x0a\x0d]*/;
@@ -75,7 +75,7 @@ sub decode {
     # Object
     elsif (m/\G\{/gc) { $ref = _decode_object() }
 
-    # Unexpected
+    # Invalid character
     else { _exception('Expected array or object') }
 
     # Leftover data
@@ -166,13 +166,13 @@ sub _decode_string {
   my $pos = pos;
 
   # Extract string with escaped characters
-  m#\G(((?:[^\x00-\x1F\\"]|\\(?:["\\/bfnrt]|u[[:xdigit:]]{4})){0,32766})*)#gc;
+  m!\G((?:(?:[^\x00-\x1f\\"]|\\(?:["\\/bfnrt]|u[0-9a-fA-F]{4})){0,32766})*)!gc;
   my $str = $1;
 
-  # Missing quote
+  # Invalid character
   unless (m/\G"/gc) {
     _exception('Unexpected character or invalid escape while parsing string')
-      if m/\G[\x00-\x1F\\]/;
+      if m/\G[\x00-\x1f\\]/;
     _exception('Unterminated string');
   }
 
@@ -195,18 +195,17 @@ sub _decode_string {
       my $ord = hex $3;
 
       # Surrogate pair
-      if (($ord & 0xF800) == 0xD800) {
+      if (($ord & 0xf800) == 0xd800) {
 
         # High surrogate
-        ($ord & 0xFC00) == 0xD800
+        ($ord & 0xfc00) == 0xd800
           or pos($_) = $pos + pos($str), _exception('Missing high-surrogate');
 
         # Low surrogate
         $str =~ m/\G\\u([Dd][C-Fc-f]..)/gc
           or pos($_) = $pos + pos($str), _exception('Missing low-surrogate');
 
-        # Pair
-        $ord = 0x10000 + ($ord - 0xD800) * 0x400 + (hex($1) - 0xDC00);
+        $ord = 0x10000 + ($ord - 0xd800) * 0x400 + (hex($1) - 0xdc00);
       }
 
       # Character
@@ -245,7 +244,7 @@ sub _decode_value {
   # Null
   return undef if m/\Gnull/gc;
 
-  # Invalid data
+  # Invalid character
   _exception('Expected string, array, object, number, boolean or null');
 }
 
@@ -263,7 +262,7 @@ sub _encode_object {
 
 sub _encode_string {
   my $str = shift;
-  $str =~ s!([\x00-\x1F\x7F\x{2028}\x{2029}\\"/\b\f\n\r\t])!$REVERSE{$1}!gs;
+  $str =~ s!([\x00-\x1f\x7f\x{2028}\x{2029}\\"/\b\f\n\r\t])!$REVERSE{$1}!gs;
   return "\"$str\"";
 }
 
@@ -322,6 +321,8 @@ use overload '0+' => sub { ${$_[0]} }, '""' => sub { ${$_[0]} }, fallback => 1;
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::JSON - Minimalistic JSON
@@ -352,19 +353,28 @@ it for validation.
 
 It supports normal Perl data types like C<Scalar>, C<Array> reference, C<Hash>
 reference and will try to call the C<TO_JSON> method on blessed references, or
-stringify them if it doesn't exist.
+stringify them if it doesn't exist. Differentiating between strings and
+numbers in Perl is hard, depending on how it has been used, a C<Scalar> can be
+both at the same time. Since numeric comparisons on strings are very unlikely
+to happen intentionally, the numeric value always gets priority, so any
+C<Scalar> that has been used in numeric context is considered a number.
 
   [1, -2, 3]     -> [1, -2, 3]
   {"foo": "bar"} -> {foo => 'bar'}
 
 Literal names will be translated to and from L<Mojo::JSON> constants or a
-similar native Perl value. In addition C<Scalar> references will be used to
-generate booleans, based on if their values are true or false.
+similar native Perl value.
 
   true  -> Mojo::JSON->true
   false -> Mojo::JSON->false
   null  -> undef
 
+In addition C<Scalar> references will be used to generate booleans, based on
+if their values are true or false.
+
+  \1 -> true
+  \0 -> false
+
 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.

+1 -1

mojo/lib/Mojo/JSON/Pointer.pm

View

@@ -53,7 +53,7 @@ L<Mojo::JSON::Pointer> is a relaxed implementation of RFC 6901.
 
 =head2 contains
 
-  my $success = $pointer->contains($data, '/foo/1');
+  my $bool = $pointer->contains($data, '/foo/1');
 
 Check if data structure contains a value that can be identified with the given
 JSON Pointer.

+23 -20

mojo/lib/Mojo/Loader.pm

View

@@ -6,12 +6,11 @@ use File::Spec::Functions qw(catdir catfile splitdir);
 use Mojo::Exception;
 use Mojo::Util qw(b64_decode class_to_path);
 
-my %CACHE;
+my (%BIN, %CACHE);
 
-sub data {
-  my ($self, $class, $data) = @_;
-  return $class ? $data ? _all($class)->{$data} : _all($class) : undef;
-}
+sub data { $_[1] ? $_[2] ? _all($_[1])->{$_[2]} : _all($_[1]) : undef }
+
+sub is_binary { keys %{_all($_[1])} ? !!$BIN{$_[1]}{$_[2]} : undef }
 
 sub load {
   my ($self, $module) = @_;
@@ -23,8 +22,7 @@ sub load {
   return undef if $module->can('new') || eval "require $module; 1";
 
   # Exists
-  my $path = class_to_path $module;
-  return 1 if $@ =~ /^Can't locate $path in \@INC/;
+  return 1 if $@ =~ /^Can't locate \Q@{[class_to_path $module]}\E in \@INC/;
 
   # Real error
   return Mojo::Exception->new($@);
@@ -52,29 +50,26 @@ sub search {
 sub _all {
   my $class = shift;
 
-  # Refresh or use cached data
   my $handle = do { no strict 'refs'; \*{"${class}::DATA"} };
-  return $CACHE{$class} || {} unless fileno $handle;
+  return $CACHE{$class} || {} if $CACHE{$class} || !fileno $handle;
   seek $handle, 0, 0;
-  my $content = join '', <$handle>;
-  close $handle;
+  my $data = join '', <$handle>;
 
   # Ignore everything before __DATA__ (Windows will seek to start of file)
-  $content =~ s/^.*\n__DATA__\r?\n/\n/s;
+  $data =~ s/^.*\n__DATA__\r?\n/\n/s;
 
   # Ignore everything after __END__
-  $content =~ s/\n__END__\r?\n.*$/\n/s;
+  $data =~ s/\n__END__\r?\n.*$/\n/s;
 
   # Split files
-  my @data = split /^@@\s*(.+?)\s*\r?\n/m, $content;
-  shift @data;
+  (undef, my @files) = split /^@@\s*(.+?)\s*\r?\n/m, $data;
 
   # Find data
   my $all = $CACHE{$class} = {};
-  while (@data) {
-    my ($name, $content) = splice @data, 0, 2;
-    $content = b64_decode $content if $name =~ s/\s*\(\s*base64\s*\)$//;
-    $all->{$name} = $content;
+  while (@files) {
+    my ($name, $data) = splice @files, 0, 2;
+    $all->{$name} = $name =~ s/\s*\(\s*base64\s*\)$//
+      && ++$BIN{$class}{$name} ? b64_decode($data) : $data;
   }
 
   return $all;
@@ -82,6 +77,8 @@ sub _all {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Loader - Loader
@@ -120,6 +117,12 @@ Extract embedded file from the C<DATA> section of a class.
 
   say for keys %{$loader->data('Foo::Bar')};
 
+=head2 is_binary
+
+  my $bool = $loader->is_binary('Foo::Bar', 'test.png');
+
+Check if embedded file from the C<DATA> section of a class was Base64 encoded.
+
 =head2 load
 
   my $e = $loader->load('Foo::Bar');
@@ -128,7 +131,7 @@ Load a class and catch exceptions. Note that classes are checked for a C<new>
 method to see if they are already loaded.
 
   if (my $e = $loader->load('Foo::Bar')) {
-    die ref $e ? "Exception: $e" : 'Already loaded!';
+    die ref $e ? "Exception: $e" : 'Not found!';
   }
 
 =head2 search

+32 -39

mojo/lib/Mojo/Log.pm

View

@@ -35,7 +35,8 @@ sub fatal { shift->log(fatal => @_) }
 
 sub format {
   my ($self, $level, @lines) = @_;
-  return '[' . localtime(time) . "] [$level] " . join("\n", @lines) . "\n";
+  return encode 'UTF-8',
+    '[' . localtime(time) . "] [$level] " . join("\n", @lines, '');
 }
 
 sub info { shift->log(info => @_) }
@@ -57,18 +58,19 @@ sub log { shift->emit('message', lc(shift), @_) }
 sub warn { shift->log(warn => @_) }
 
 sub _message {
-  my ($self, $level, @lines) = @_;
+  my ($self, $level) = (shift, shift);
 
   return unless $self->is_level($level) && (my $handle = $self->handle);
 
   flock $handle, LOCK_EX;
-  croak "Can't write to log: $!"
-    unless $handle->print(encode 'UTF-8', $self->format($level, @lines));
+  $handle->print($self->format($level, @_)) or croak "Can't write to log: $!";
   flock $handle, LOCK_UN;
 }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Log - Simple logger
@@ -123,39 +125,24 @@ L<Mojo::Log> implements the following attributes.
   my $handle = $log->handle;
   $log       = $log->handle(IO::Handle->new);
 
-Log file handle used by default C<message> event, defaults to opening C<path>
-or C<STDERR>.
+Log filehandle used by default L</"message"> event, defaults to opening
+L</"path"> or C<STDERR>.
 
 =head2 level
 
   my $level = $log->level;
   $log      = $log->level('debug');
 
-Active log level, defaults to C<debug>. Note that the MOJO_LOG_LEVEL
-environment variable can override this value.
-
-These levels are currently available:
-
-=over 2
-
-=item debug
-
-=item info
-
-=item warn
-
-=item error
-
-=item fatal
-
-=back
+Active log level, defaults to C<debug>. Available log levels are C<debug>,
+C<info>, C<warn>, C<error> and C<fatal>, in that order. Note that the
+MOJO_LOG_LEVEL environment variable can override this value.
 
 =head2 path
 
   my $path = $log->path
   $log     = $log->path('/var/log/mojo.log');
 
-Log file path used by C<handle>.
+Log file path used by L</"handle">.
 
 =head1 METHODS
 
@@ -166,85 +153,91 @@ the following new ones.
 
   my $log = Mojo::Log->new;
 
-Construct a new L<Mojo::Log> object and subscribe to C<message> event with
+Construct a new L<Mojo::Log> object and subscribe to L</"message"> event with
 default logger.
 
 =head2 debug
 
-  $log = $log->debug('You screwed up, but that is ok');
+  $log = $log->debug('You screwed up, but that is ok.');
+  $log = $log->debug('All', 'cool!');
 
 Log debug message.
 
 =head2 error
 
-  $log = $log->error('You really screwed up this time');
+  $log = $log->error('You really screwed up this time.');
+  $log = $log->error('Wow', 'seriously!');
 
 Log error message.
 
 =head2 fatal
 
   $log = $log->fatal('Its over...');
+  $log = $log->fatal('Bye', 'bye!');
 
 Log fatal message.
 
 =head2 format
 
-  my $msg = $log->format('debug', 'Hi there!');
-  my $msg = $log->format('debug', 'Hi', 'there!');
+  my $msg = $log->format(debug => 'Hi there!');
+  my $msg = $log->format(debug => 'Hi', 'there!');
 
 Format log message.
 
 =head2 info
 
-  $log = $log->info('You are bad, but you prolly know already');
+  $log = $log->info('You are bad, but you prolly know already.');
+  $log = $log->info('Ok', 'then!');
 
 Log info message.
 
 =head2 is_level
 
-  my $success = $log->is_level('debug');
+  my $bool = $log->is_level('debug');
 
 Check log level.
 
 =head2 is_debug
 
-  my $success = $log->is_debug;
+  my $bool = $log->is_debug;
 
 Check for debug log level.
 
 =head2 is_error
 
-  my $success = $log->is_error;
+  my $bool = $log->is_error;
 
 Check for error log level.
 
 =head2 is_fatal
 
-  my $success = $log->is_fatal;
+  my $bool = $log->is_fatal;
 
 Check for fatal log level.
 
 =head2 is_info
 
-  my $success = $log->is_info;
+  my $bool = $log->is_info;
 
 Check for info log level.
 
 =head2 is_warn
 
-  my $success = $log->is_warn;
+  my $bool = $log->is_warn;
 
 Check for warn log level.
 
 =head2 log
 
-  $log = $log->log(debug => 'This should work');
+  $log = $log->log(debug => 'This should work.');
+  $log = $log->log(debug => 'This', 'too!');
 
-Emit C<message> event.
+Emit L</"message"> event.
 
 =head2 warn
 
   $log = $log->warn('Dont do that Dave...');
+  $log = $log->warn('No', 'really!');
 
 Log warn message.
 

+67 -56

mojo/lib/Mojo/Message.pm

View

@@ -14,7 +14,7 @@ use Mojo::Util 'decode';
 has content => sub { Mojo::Content::Single->new };
 has default_charset  => 'UTF-8';
 has max_line_size    => sub { $ENV{MOJO_MAX_LINE_SIZE} || 10240 };
-has max_message_size => sub { $ENV{MOJO_MAX_MESSAGE_SIZE} || 5242880 };
+has max_message_size => sub { defined $ENV{MOJO_MAX_MESSAGE_SIZE} ? $ENV{MOJO_MAX_MESSAGE_SIZE} : 10485760 };
 has version          => '1.1';
 
 sub body {
@@ -28,7 +28,7 @@ sub body {
   # Get
   return $content->asset->slurp unless @_;
 
-  # Set raw content
+  # Set
   $content->asset(Mojo::Asset::Memory->new->add_chunk(@_));
 
   return $self;
@@ -41,17 +41,15 @@ sub body_params {
   my $params = $self->{body_params} = Mojo::Parameters->new;
   $params->charset($self->content->charset || $self->default_charset);
 
-  # "x-application-urlencoded" and "application/x-www-form-urlencoded"
+  # "application/x-www-form-urlencoded"
   my $type = defined $self->headers->content_type ? $self->headers->content_type : '';
-  if ($type =~ m!(?:x-application|application/x-www-form)-urlencoded!i) {
+  if ($type =~ m!application/x-www-form-urlencoded!i) {
     $params->parse($self->content->asset->slurp);
   }
 
-  # "multipart/formdata"
+  # "multipart/form-data"
   elsif ($type =~ m!multipart/form-data!i) {
-    for my $data (@{$self->_parse_formdata}) {
-      $params->append($data->[0], $data->[2]) unless defined $data->[1];
-    }
+    $params->append(@$_[0, 1]) for @{$self->_parse_formdata};
   }
 
   return $params;
@@ -69,13 +67,8 @@ sub cookies { croak 'Method "cookies" not implemented by subclass' }
 
 sub dom {
   my $self = shift;
-
   return undef if $self->content->is_multipart;
-  my $html    = $self->body;
-  my $charset = $self->content->charset;
-  $html = do { my $tmp = decode($charset, $html); defined $tmp ? $tmp : $html } if $charset;
-  my $dom = $self->{dom} ||= Mojo::DOM->new($html);
-
+  my $dom = $self->{dom} ||= Mojo::DOM->new($self->text);
   return @_ ? $dom->find(@_) : $dom;
 }
 
@@ -160,8 +153,9 @@ sub parse {
   my ($self, $chunk) = @_;
 
   # Check message size
+  my $max = $self->max_message_size;
   return $self->_limit('Maximum message size exceeded', 413)
-    if ($self->{raw_size} += length($chunk = defined $chunk ? $chunk : '')) > $self->max_message_size;
+    if $max && ($self->{raw_size} += length($chunk = defined $chunk ? $chunk : '')) > $max;
 
   $self->{buffer} .= $chunk;
 
@@ -195,6 +189,13 @@ sub parse {
 
 sub start_line_size { length shift->build_start_line }
 
+sub text {
+  my $self    = shift;
+  my $body    = $self->body;
+  my $charset = $self->content->charset;
+  return $charset ? do {my $decoded = decode($charset, $body); defined $decoded ? $decoded : $body} : $body;
+}
+
 sub to_string {
   my $self = shift;
   return $self->build_start_line . $self->build_headers . $self->build_body;
@@ -206,17 +207,12 @@ sub uploads {
   my $self = shift;
 
   my @uploads;
-  for my $data (@{$self->_parse_formdata}) {
-
-    # Just a form value
-    next unless defined $data->[1];
-
-    # Uploaded file
+  for my $data (@{$self->_parse_formdata(1)}) {
     my $upload = Mojo::Upload->new(
       name     => $data->[0],
-      filename => $data->[1],
-      asset    => $data->[2]->asset,
-      headers  => $data->[2]->headers
+      filename => $data->[2],
+      asset    => $data->[1]->asset,
+      headers  => $data->[1]->headers
     );
     push @uploads, $upload;
   }
@@ -264,41 +260,37 @@ sub _limit {
 }
 
 sub _parse_formdata {
-  my $self = shift;
+  my ($self, $upload) = @_;
 
-  # Check for multipart content
   my @formdata;
   my $content = $self->content;
   return \@formdata unless $content->is_multipart;
   my $charset = $content->charset || $self->default_charset;
 
-  # Check all parts for form data
+  # Check all parts recursively
   my @parts = ($content);
   while (my $part = shift @parts) {
 
-    # Nested multipart content
     if ($part->is_multipart) {
       unshift @parts, @{$part->parts};
       next;
     }
 
-    # Extract information from Content-Disposition header
     next unless my $disposition = $part->headers->content_disposition;
-    my ($name)     = $disposition =~ /[; ]name="?([^";]+)"?/;
-    my ($filename) = $disposition =~ /[; ]filename="?([^"]*)"?/;
+    my ($filename) = $disposition =~ /[; ]filename\s*=\s*"?((?:\\"|[^"])*)"?/i;
+    next if ($upload && !defined $filename) || (!$upload && defined $filename);
+    my ($name) = $disposition =~ /[; ]name\s*=\s*"?((?:\\"|[^";])+)"?/i;
     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;
     }
 
-    # 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;
+    unless ($upload) {
+      $part = $part->asset->slurp;
+      $part = do {my $decoded = decode($charset, $part); defined $decoded ? $decoded : $part} if $charset;
     }
 
-    push @formdata, [$name, $filename, $value];
+    push @formdata, [$name, $part, $filename];
   }
 
   return \@formdata;
@@ -306,6 +298,8 @@ sub _parse_formdata {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Message - HTTP message base class
@@ -383,7 +377,7 @@ Message content, defaults to a L<Mojo::Content::Single> object.
   my $charset = $msg->default_charset;
   $msg        = $msg->default_charset('UTF-8');
 
-Default charset used for form data parsing, defaults to C<UTF-8>.
+Default charset used for form-data parsing, defaults to C<UTF-8>.
 
 =head2 max_line_size
 
@@ -399,10 +393,11 @@ MOJO_MAX_LINE_SIZE environment variable or C<10240>.
   $msg     = $msg->max_message_size(1024);
 
 Maximum message size in bytes, defaults to the value of the
-MOJO_MAX_MESSAGE_SIZE environment variable or C<5242880>. Note that 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.
+MOJO_MAX_MESSAGE_SIZE environment variable or C<10485760>. Setting the value
+to C<0> will allow messages of indefinite size. Note that increasing this
+value can also drastically increase memory usage, should you for example
+attempt to parse an excessively large message body with the L</"body_params">,
+L</"dom"> or L</"json"> methods.
 
 =head2 version
 
@@ -421,16 +416,19 @@ implements the following new ones.
   my $bytes = $msg->body;
   $msg      = $msg->body('Hello!');
 
-Slurp or replace C<content>.
+Slurp or replace L</"content">, L<Mojo::Content::MultiPart> will be
+automatically downgraded to L<Mojo::Content::Single>.
 
 =head2 body_params
 
   my $params = $msg->body_params;
 
-C<POST> parameters extracted from C<x-application-urlencoded>,
-C<application/x-www-form-urlencoded> or C<multipart/form-data> message body,
-usually a L<Mojo::Parameters> object. Note that this method caches all data,
-so it should not be called before the entire message body has been received.
+POST parameters extracted from C<application/x-www-form-urlencoded> or
+C<multipart/form-data> message body, usually a L<Mojo::Parameters> object.
+Note that this method caches all data, so it should not be called before the
+entire message body has been received. Parts of the message body need to be
+loaded into memory to parse POST parameters, so you have to make sure it is
+not excessively large.
 
   # Get POST parameter value
   say $msg->body_params->param('foo');
@@ -485,14 +483,16 @@ Access message cookies. Meant to be overloaded in a subclass.
 Turns message body into a L<Mojo::DOM> object and takes an optional selector
 to perform a C<find> on it right away, which returns a L<Mojo::Collection>
 object. Note that this method caches all data, so it should not be called
-before the entire message body has been received.
+before the entire message body has been received. The whole message body needs
+to be loaded into memory to parse it, so you have to make sure it is not
+excessively large.
 
   # Perform "find" right away
-  say $msg->dom('h1, h2, h3')->pluck('text');
+  say $msg->dom('h1, h2, h3')->text;
 
   # Use everything else Mojo::DOM has to offer
   say $msg->dom->at('title')->text;
-  say $msg->dom->html->body->children->pluck('type')->uniq;
+  say $msg->dom->html->body->children->type->uniq;
 
 =head2 error
 
@@ -505,7 +505,7 @@ Error and code.
 
 =head2 extract_start_line
 
-  my $success = $msg->extract_start_line(\$str);
+  my $bool = $msg->extract_start_line(\$str);
 
 Extract start line from string. Meant to be overloaded in a subclass.
 
@@ -554,15 +554,15 @@ Message headers, usually a L<Mojo::Headers> object.
 
 =head2 is_finished
 
-  my $success = $msg->is_finished;
+  my $bool = $msg->is_finished;
 
 Check if message parser/generator is finished.
 
 =head2 is_limit_exceeded
 
-  my $success = $msg->is_limit_exceeded;
+  my $bool = $msg->is_limit_exceeded;
 
-Check if message has exceeded C<max_line_size> or C<max_message_size>.
+Check if message has exceeded L</"max_line_size"> or L</"max_message_size">.
 
 =head2 json
 
@@ -574,6 +574,8 @@ Decode JSON message body directly using L<Mojo::JSON> if possible, returns
 C<undef> otherwise. An optional JSON Pointer can be used to extract a specific
 value with L<Mojo::JSON::Pointer>. Note that this method caches all data, so
 it should not be called before the entire message body has been received.
+The whole message body needs to be loaded into memory to parse it, so you have
+to make sure it is not excessively large.
 
   # Extract JSON values
   say $msg->json->{foo}{bar}[23];
@@ -585,8 +587,10 @@ it should not be called before the entire message body has been received.
   my $foo   = $msg->param('foo');
   my @foo   = $msg->param('foo');
 
-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.
+Access POST parameters. Note that this method caches all data, so it should
+not be called before the entire message body has been received. Parts of the
+message body need to be loaded into memory to parse POST parameters, so you
+have to make sure it is not excessively large.
 
 =head2 parse
 
@@ -600,6 +604,13 @@ Parse message chunk.
 
 Size of the start line in bytes.
 
+=head2 text
+
+  my $str = $msg->text;
+
+Retrieve L</"body"> and try to decode it if a charset could be extracted with
+L<Mojo::Content/"charset">.
+
 =head2 to_string
 
   my $str = $msg->to_string;

+23 -17

mojo/lib/Mojo/Message/Request.pm

View

@@ -9,14 +9,14 @@ has env => sub { {} };
 has method => 'GET';
 has url => sub { Mojo::URL->new };
 
-my $START_LINE_RE = qr|
+my $START_LINE_RE = qr/
   ^
-  ([a-zA-Z]+)                                  # Method
+  ([a-zA-Z]+)                                            # Method
   \s+
-  ([0-9a-zA-Z\-._~:/?#[\]\@!\$&'()*+,;=\%]+)   # Path
-  (?:\s+HTTP/(\d\.\d))?                        # Version
+  ([0-9a-zA-Z!#\$\%&'()*+,\-.\/:;=?\@[\\\]^_`\{|\}~]+)   # URL
+  (?:\s+HTTP\/(\d\.\d))?                                 # Version
   $
-|x;
+/x;
 
 sub clone {
   my $self = shift;
@@ -260,6 +260,8 @@ sub _parse_env {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Message::Request - HTTP request
@@ -270,9 +272,9 @@ Mojo::Message::Request - HTTP request
 
   # Parse
   my $req = Mojo::Message::Request->new;
-  $req->parse("GET /foo HTTP/1.0\x0a\x0d");
-  $req->parse("Content-Length: 12\x0a\x0d\x0a\x0d");
-  $req->parse("Content-Type: text/plain\x0a\x0d\x0a\x0d");
+  $req->parse("GET /foo HTTP/1.0\x0d\x0a");
+  $req->parse("Content-Length: 12\x0d\x0a");
+  $req->parse("Content-Type: text/plain\x0d\x0a\x0d\x0a");
   $req->parse('Hello World!');
   say $req->method;
   say $req->headers->content_type;
@@ -351,7 +353,7 @@ Access request cookies, usually L<Mojo::Cookie::Request> objects.
 
 =head2 extract_start_line
 
-  my $success = $req->extract_start_line(\$str);
+  my $bool = $req->extract_start_line(\$str);
 
 Extract request line from string.
 
@@ -369,13 +371,13 @@ Get a chunk of request line data starting from a specific position.
 
 =head2 is_secure
 
-  my $success = $req->is_secure;
+  my $bool = $req->is_secure;
 
 Check if connection is secure.
 
 =head2 is_xhr
 
-  my $success = $req->is_xhr;
+  my $bool = $req->is_xhr;
 
 Check C<X-Requested-With> header for C<XMLHttpRequest> value.
 
@@ -385,16 +387,20 @@ Check C<X-Requested-With> header for C<XMLHttpRequest> value.
   my $foo   = $req->param('foo');
   my @foo   = $req->param('foo');
 
-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.
+Access GET and POST parameters. Note that this method caches all data, so it
+should not be called before the entire request body has been received. Parts
+of the request body need to be loaded into memory to parse POST parameters, so
+you have to make sure it is not excessively large.
 
 =head2 params
 
   my $params = $req->params;
 
-All C<GET> and C<POST> parameters, usually a L<Mojo::Parameters> object. Note
-that this method caches all data, so it should not be called before the entire
-request body has been received.
+All GET and POST parameters, usually a L<Mojo::Parameters> object. Note that
+this method caches all data, so it should not be called before the entire
+request body has been received. Parts of the request body need to be loaded
+into memory to parse POST parameters, so you have to make sure it is not
+excessively large.
 
   # Get parameter value
   say $req->params->param('foo');
@@ -422,7 +428,7 @@ Proxy URL for request.
 
   my $params = $req->query_params;
 
-All C<GET> parameters, usually a L<Mojo::Parameters> object.
+All GET parameters, usually a L<Mojo::Parameters> object.
 
   # Turn GET parameters to hash and extract value
   say $req->query_params->to_hash->{foo};

+9 -7

mojo/lib/Mojo/Message/Response.pm

View

@@ -140,6 +140,8 @@ sub is_status_class {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Message::Response - HTTP response
@@ -149,10 +151,10 @@ Mojo::Message::Response - HTTP response
   use Mojo::Message::Response;
 
   # Parse
-  my $res = Mojo::Message::Reponse->new;
-  $res->parse("HTTP/1.0 200 OK\x0a\x0d");
-  $res->parse("Content-Length: 12\x0a\x0d\x0a\x0d");
-  $res->parse("Content-Type: text/plain\x0a\x0d\x0a\x0d");
+  my $res = Mojo::Message::Response->new;
+  $res->parse("HTTP/1.0 200 OK\x0d\x0a");
+  $res->parse("Content-Length: 12\x0d\x0a");
+  $res->parse("Content-Type: text/plain\x0d\x0a\x0d\x0a");
   $res->parse('Hello World!');
   say $res->code;
   say $res->headers->content_type;
@@ -214,7 +216,7 @@ Generate default response message for code.
 
 =head2 extract_start_line
 
-  my $success = $res->extract_start_line(\$str);
+  my $bool = $res->extract_start_line(\$str);
 
 Extract status line from string.
 
@@ -232,13 +234,13 @@ Get a chunk of status line data starting from a specific position.
 
 =head2 is_empty
 
-  my $success = $res->is_empty;
+  my $bool = $res->is_empty;
 
 Check if this is a C<1xx>, C<204> or C<304> response.
 
 =head2 is_status_class
 
-  my $success = $res->is_status_class(200);
+  my $bool = $res->is_status_class(200);
 
 Check response status class.
 

+2 -2

mojo/lib/Mojo/Parameters.pm

View

@@ -2,7 +2,7 @@ package Mojo::Parameters;
 use Mojo::Base -base;
 use overload
   '@{}'    => sub { shift->params },
-  'bool'   => sub {1},
+  bool     => sub {1},
   '""'     => sub { shift->to_string },
   fallback => 1;
 
@@ -230,7 +230,7 @@ following new ones.
   my $params = Mojo::Parameters->new(foo => ['ba;r', 'b;az']);
   my $params = Mojo::Parameters->new(foo => ['ba;r', 'b;az'], bar => 23);
 
-Construct a new L<Mojo::Parameters> object and C<parse> parameters if
+Construct a new L<Mojo::Parameters> object and L</"parse"> parameters if
 necessary.
 
 =head2 append

+16 -13

mojo/lib/Mojo/Path.pm

View

@@ -2,7 +2,7 @@ package Mojo::Path;
 use Mojo::Base -base;
 use overload
   '@{}'    => sub { shift->parts },
-  'bool'   => sub {1},
+  bool     => sub {1},
   '""'     => sub { shift->to_string },
   fallback => 1;
 
@@ -67,7 +67,7 @@ sub merge {
 sub parse {
   my $self = shift;
   $self->{path} = shift;
-  delete $self->{$_} for qw(leading_slash parts trailing_slash);
+  delete @$self{qw(leading_slash parts trailing_slash)};
   return $self;
 }
 
@@ -81,7 +81,7 @@ sub to_abs_string {
 sub to_dir {
   my $clone = shift->clone;
   pop @{$clone->parts} unless $clone->trailing_slash;
-  return $clone->trailing_slash(@{$clone->parts} ? 1 : 0);
+  return $clone->trailing_slash(!!@{$clone->parts});
 }
 
 sub to_route {
@@ -118,10 +118,10 @@ sub _parse {
   unless ($self->{parts}) {
     my $path = url_unescape do { my $tmp = delete($self->{path}); defined $tmp ? $tmp : '' };
     my $charset = $self->charset;
-    $path = do { my $tmp = decode($charset, $path); defined $tmp ? $tmp : $path } if $charset;
-    $self->{leading_slash}  = $path =~ s!^/!! ? 1 : undef;
-    $self->{trailing_slash} = $path =~ s!/$!! ? 1 : undef;
-    $self->{parts} = [split '/', $path, -1];
+    $path = do {my $decoded = decode($charset, $path); defined $decoded ? $decoded : $path} if $charset;
+    $self->{leading_slash}  = $path =~ s!^/!!;
+    $self->{trailing_slash} = $path =~ s!/$!!;
+    $self->{parts}          = [split '/', $path, -1];
   }
 
   return $self->{$name} unless @_;
@@ -178,7 +178,7 @@ following new ones.
   my $path = Mojo::Path->new;
   my $path = Mojo::Path->new('/foo%2Fbar%3B/baz.html');
 
-Construct a new L<Mojo::Path> object and C<parse> path if necessary.
+Construct a new L<Mojo::Path> object and L</"parse"> path if necessary.
 
 =head2 canonicalize
 
@@ -189,6 +189,9 @@ Canonicalize path.
   # "/foo/baz"
   Mojo::Path->new('/foo/./bar/../baz')->canonicalize;
 
+  # "/../baz"
+  Mojo::Path->new('/foo/../bar/../../baz')->canonicalize;
+
 =head2 clone
 
   my $clone = $path->clone;
@@ -197,7 +200,7 @@ Clone path.
 
 =head2 contains
 
-  my $success = $path->contains('/i/♥/mojolicious');
+  my $bool = $path->contains('/i/♥/mojolicious');
 
 Check if path contains given prefix.
 
@@ -213,8 +216,8 @@ Check if path contains given prefix.
 
 =head2 leading_slash
 
-  my $slash = $path->leading_slash;
-  $path     = $path->leading_slash(1);
+  my $bool = $path->leading_slash;
+  $path    = $path->leading_slash($bool);
 
 Path has a leading slash. Note that this method will normalize the path and
 that C<%2F> will be treated as C</> for security reasons.
@@ -301,8 +304,8 @@ Turn path into a string.
 
 =head2 trailing_slash
 
-  my $slash = $path->trailing_slash;
-  $path     = $path->trailing_slash(1);
+  my $bool = $path->trailing_slash;
+  $path    = $path->trailing_slash($bool);
 
 Path has a trailing slash. Note that this method will normalize the path and
 that C<%2F> will be treated as C</> for security reasons.

+10 -6

mojo/lib/Mojo/Reactor.pm

View

@@ -37,6 +37,8 @@ sub watch      { croak 'Method "watch" not implemented by subclass' }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Reactor - Low level event reactor base class
@@ -75,7 +77,9 @@ the following new ones.
     ...
   });
 
-Emitted safely for exceptions caught in callbacks.
+Emitted for exceptions caught in callbacks, fatal if unhandled. Note that if
+this event is unhandled or fails it might kill your program, so you need to be
+careful.
 
   $reactor->on(error => sub {
     my ($reactor, $err) = @_;
@@ -119,14 +123,14 @@ readable or writable. Meant to be overloaded in a subclass.
 
 =head2 is_readable
 
-  my $success = $reactor->is_readable($handle);
+  my $bool = $reactor->is_readable($handle);
 
 Quick non-blocking check if a handle is readable, useful for identifying
 tainted sockets.
 
 =head2 is_running
 
-  my $success = $reactor->is_running;
+  my $bool = $reactor->is_running;
 
 Check if reactor is running. Meant to be overloaded in a subclass.
 
@@ -154,8 +158,8 @@ amount of time in seconds. Meant to be overloaded in a subclass.
 
 =head2 remove
 
-  my $success = $reactor->remove($handle);
-  my $success = $reactor->remove($id);
+  my $bool = $reactor->remove($handle);
+  my $bool = $reactor->remove($id);
 
 Remove handle or timer. Meant to be overloaded in a subclass.
 
@@ -163,7 +167,7 @@ Remove handle or timer. Meant to be overloaded in a subclass.
 
   $reactor->start;
 
-Start watching for I/O and timer events, this will block until C<stop> is
+Start watching for I/O and timer events, this will block until L</"stop"> is
 called. Note that some reactors stop automatically if there are no events
 being watched anymore. Meant to be overloaded in a subclass.
 

+4 -2

mojo/lib/Mojo/Reactor/EV.pm

View

@@ -72,6 +72,8 @@ sub _timer {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Reactor::EV - Low level event reactor with libev support
@@ -127,7 +129,7 @@ Restart active timer.
 
 =head2 is_running
 
-  my $success = $reactor->is_running;
+  my $bool = $reactor->is_running;
 
 Check if reactor is running.
 
@@ -149,7 +151,7 @@ amount of time in seconds.
 
   $reactor->start;
 
-Start watching for I/O and timer events, this will block until C<stop> is
+Start watching for I/O and timer events, this will block until L</"stop"> is
 called or no events are being watched anymore.
 
 =head2 stop

+8 -6

mojo/lib/Mojo/Reactor/Poll.pm

View

@@ -105,8 +105,8 @@ sub watch {
 sub _poll { shift->{poll} ||= IO::Poll->new }
 
 sub _sandbox {
-  my ($self, $desc, $cb) = (shift, shift, shift);
-  eval { $self->$cb(@_); 1 } or $self->emit_safe(error => "$desc failed: $@");
+  my ($self, $event, $cb) = (shift, shift, shift);
+  eval { $self->$cb(@_); 1 } or $self->emit(error => "$event failed: $@");
 }
 
 sub _timer {
@@ -124,6 +124,8 @@ sub _timer {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Reactor::Poll - Low level event reactor with poll support
@@ -180,7 +182,7 @@ readable or writable.
 
 =head2 is_running
 
-  my $success = $reactor->is_running;
+  my $bool = $reactor->is_running;
 
 Check if reactor is running.
 
@@ -200,8 +202,8 @@ amount of time in seconds.
 
 =head2 remove
 
-  my $success = $reactor->remove($handle);
-  my $success = $reactor->remove($id);
+  my $bool = $reactor->remove($handle);
+  my $bool = $reactor->remove($id);
 
 Remove handle or timer.
 
@@ -209,7 +211,7 @@ Remove handle or timer.
 
   $reactor->start;
 
-Start watching for I/O and timer events, this will block until C<stop> is
+Start watching for I/O and timer events, this will block until L</"stop"> is
 called or no events are being watched anymore.
 
 =head2 stop

+6 -4

mojo/lib/Mojo/Server.pm

View

@@ -2,7 +2,6 @@ package Mojo::Server;
 use Mojo::Base 'Mojo::EventEmitter';
 
 use Carp 'croak';
-use FindBin;
 use Mojo::Loader;
 use Mojo::Util 'md5_sum';
 use Scalar::Util 'blessed';
@@ -27,9 +26,10 @@ sub build_tx { shift->app->build_tx }
 sub load_app {
   my ($self, $path) = @_;
 
-  # Clean environment (reset FindBin)
+  # Clean environment (reset FindBin defensively)
   {
     local $0 = $path;
+    require FindBin;
     FindBin->again;
     local $ENV{MOJO_APP_LOADER} = 1;
     local $ENV{MOJO_EXE};
@@ -55,6 +55,8 @@ sub run { croak 'Method "run" not implemented by subclass' }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Server - HTTP server base class
@@ -121,8 +123,8 @@ the following new ones.
 
   my $server = Mojo::Server->new;
 
-Construct a new L<Mojo::Server> object and subscribe to C<request> event with
-default request handling.
+Construct a new L<Mojo::Server> object and subscribe to L</"request"> event
+with default request handling.
 
 =head2 build_app
 

+9 -4

mojo/lib/Mojo/Server/CGI.pm

View

@@ -10,11 +10,14 @@ sub run {
   my $req = $tx->req->parse(\%ENV);
   $tx->local_port($ENV{SERVER_PORT})->remote_address($ENV{REMOTE_ADDR});
 
-  # Request body
+  # Request body (may block if we try to read too much)
   binmode STDIN;
+  my $len = $req->headers->content_length;
   until ($req->is_finished) {
-    last unless my $read = STDIN->read(my $buffer, 131072, 0);
+    my $chunk = ($len && $len < 131072) ? $len : 131072;
+    last unless my $read = STDIN->read(my $buffer, $chunk, 0);
     $req->parse($buffer);
+    last if ($len -= $read) <= 0;
   }
 
   # Handle request
@@ -65,6 +68,8 @@ sub _write {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Server::CGI - CGI server
@@ -109,8 +114,8 @@ implements the following new ones.
 
 =head2 nph
 
-  my $nph = $cgi->nph;
-  $cgi    = $cgi->nph(1);
+  my $bool = $cgi->nph;
+  $cgi     = $cgi->nph($bool);
 
 Activate non-parsed header mode.
 

+61 -27

mojo/lib/Mojo/Server/Daemon.pm

View

@@ -9,6 +9,7 @@ use Scalar::Util 'weaken';
 
 use constant DEBUG => $ENV{MOJO_DAEMON_DEBUG} || 0;
 
+has acceptors => sub { [] };
 has [qw(backlog group silent user)];
 has inactivity_timeout => sub { defined $ENV{MOJO_INACTIVITY_TIMEOUT} ? $ENV{MOJO_INACTIVITY_TIMEOUT} : 15 };
 has ioloop => sub { Mojo::IOLoop->singleton };
@@ -20,7 +21,7 @@ sub DESTROY {
   my $self = shift;
   return unless my $loop = $self->ioloop;
   $self->_remove($_) for keys %{$self->{connections} || {}};
-  $loop->remove($_) for @{$self->{acceptors} || []};
+  $loop->remove($_) for @{$self->acceptors};
 }
 
 sub run {
@@ -54,9 +55,9 @@ sub start {
 
   # Resume accepting connections
   my $loop = $self->ioloop;
-  if (my $acceptors = $self->{acceptors}) {
-    push @$acceptors, $loop->acceptor(delete $self->{servers}{$_})
-      for keys %{$self->{servers}};
+  if (my $servers = $self->{servers}) {
+    push @{$self->acceptors}, $loop->acceptor(delete $servers->{$_})
+      for keys %$servers;
   }
 
   # Start listening
@@ -71,7 +72,7 @@ sub stop {
 
   # Suspend accepting connections but keep listen sockets open
   my $loop = $self->ioloop;
-  while (my $id = shift @{$self->{acceptors}}) {
+  while (my $id = shift @{$self->acceptors}) {
     my $server = $self->{servers}{$id} = $loop->acceptor($id);
     $loop->remove($id);
     $server->stop;
@@ -162,20 +163,19 @@ sub _listen {
   my $url     = Mojo::URL->new($listen);
   my $query   = $url->query;
   my $options = {
-    address  => $url->host,
-    backlog  => $self->backlog,
-    port     => $url->port,
-    tls_ca   => scalar $query->param('ca'),
-    tls_cert => scalar $query->param('cert'),
-    tls_key  => scalar $query->param('key')
+    address => $url->host,
+    backlog => $self->backlog,
+    port    => $url->port,
+    reuse   => scalar $query->param('reuse'),
   };
+  $options->{"tls_$_"} = scalar $query->param($_) for qw(ca cert ciphers key);
   my $verify = $query->param('verify');
   $options->{tls_verify} = hex $verify if defined $verify;
   delete $options->{address} if $options->{address} eq '*';
-  my $tls = $options->{tls} = $url->protocol eq 'https' ? 1 : undef;
+  my $tls = $options->{tls} = $url->protocol eq 'https';
 
   weaken $self;
-  my $id = $self->ioloop->server(
+  push @{$self->acceptors}, $self->ioloop->server(
     $options => sub {
       my ($loop, $stream, $id) = @_;
 
@@ -196,12 +196,12 @@ sub _listen {
           sub { $self->app->log->debug('Inactivity timeout.') if $c->{tx} });
     }
   );
-  push @{$self->{acceptors} ||= []}, $id;
 
   return if $self->silent;
-  $self->app->log->info(qq{Listening at "$listen".});
-  $listen =~ s!//\*!//127.0.0.1!i;
-  say "Server available at $listen.";
+  $self->app->log->info(qq{Listening at "$url".});
+  $query->params([]);
+  $url->host('127.0.0.1') if $url->host eq '*';
+  say "Server available at $url.";
 }
 
 sub _read {
@@ -260,6 +260,8 @@ sub _write {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Server::Daemon - Non-blocking I/O HTTP and WebSocket server
@@ -290,14 +292,15 @@ Mojo::Server::Daemon - Non-blocking I/O HTTP and WebSocket server
 =head1 DESCRIPTION
 
 L<Mojo::Server::Daemon> is a full featured, highly portable non-blocking I/O
-HTTP and WebSocket server, with C<IPv6>, C<TLS>, C<Comet> (long polling),
-C<keep-alive>, connection pooling, timeout, cookie, multipart and multiple
-event loop support.
+HTTP and WebSocket server, with IPv6, TLS, Comet (long polling), keep-alive,
+connection pooling, timeout, cookie, multipart and multiple event loop
+support.
 
-Optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.16+) and
-L<IO::Socket::SSL> (1.75+) are supported transparently through
-L<Mojo::IOLoop>, and used if installed. Individual features can also be
-disabled with the MOJO_NO_IPV6 and MOJO_NO_TLS environment variables.
+For better scalability (epoll, kqueue) and to provide IPv6 as well as TLS
+support, the optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.16+) and
+L<IO::Socket::SSL> (1.75+) will be used automatically by L<Mojo::IOLoop> if
+they are installed. Individual features can also be disabled with the
+MOJO_NO_IPV6 and MOJO_NO_TLS environment variables.
 
 See L<Mojolicious::Guides::Cookbook> for more.
 
@@ -310,6 +313,13 @@ 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 acceptors
+
+  my $acceptors = $daemon->acceptors;
+  $daemon       = $daemon->acceptors([]);
+
+Active acceptors.
+
 =head2 backlog
 
   my $backlog = $daemon->backlog;
@@ -350,6 +360,9 @@ L<Mojo::IOLoop> singleton.
 List of one or more locations to listen on, defaults to the value of the
 MOJO_LISTEN environment variable or C<http://*:3000>.
 
+  # Allow multiple servers to use the same port (SO_REUSEPORT)
+  $daemon->listen(['http://*:8080?reuse=1']);
+
   # Listen on IPv6 interface
   $daemon->listen(['http://[::1]:4000']);
 
@@ -365,22 +378,43 @@ MOJO_LISTEN environment variable or C<http://*:3000>.
 
 These parameters are currently available:
 
-=over 4
+=over 2
 
 =item ca
 
+  ca=/etc/tls/ca.crt
+
 Path to TLS certificate authority file.
 
 =item cert
 
+  cert=/etc/tls/server.crt
+
 Path to the TLS cert file, defaults to a built-in test certificate.
 
+=item ciphers
+
+  ciphers=AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH
+
+Cipher specification string.
+
 =item key
 
+  key=/etc/tls/server.key
+
 Path to the TLS key file, defaults to a built-in test key.
 
+=item reuse
+
+  reuse=1
+
+Allow multiple servers to use the same port with the C<SO_REUSEPORT> socket
+option.
+
 =item verify
 
+  verify=0x00
+
 TLS verification mode, defaults to C<0x03>.
 
 =back
@@ -401,8 +435,8 @@ Maximum number of keep-alive requests per connection, defaults to C<25>.
 
 =head2 silent
 
-  my $silent = $daemon->silent;
-  $daemon    = $daemon->silent(1);
+  my $bool = $daemon->silent;
+  $daemon  = $daemon->silent($bool);
 
 Disable console messages.
 

+35 -37

mojo/lib/Mojo/Server/Hypnotoad.pm

View

@@ -56,7 +56,7 @@ sub run {
     exit 0 if $pid;
     setsid or die "Can't start a new session: $!";
 
-    # Close file handles
+    # Close filehandles
     open STDIN,  '</dev/null';
     open STDOUT, '>/dev/null';
     open STDERR, '>&STDOUT';
@@ -134,7 +134,7 @@ sub _reap {
   # Clean up failed upgrade
   return unless ($self->{new} || '') eq $pid;
   $self->{prefork}->app->log->info('Zero downtime software upgrade failed.');
-  delete $self->{$_} for qw(new upgrade);
+  delete @$self{qw(new upgrade)};
 }
 
 sub _stop {
@@ -146,6 +146,8 @@ sub _stop {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Server::Hypnotoad - ALL GLORY TO THE HYPNOTOAD!
@@ -161,13 +163,15 @@ 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::Prefork>, with C<IPv6>, C<TLS>, C<Comet> (long
-polling), C<keep-alive>, connection pooling, timeout, cookie, multipart,
-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.
-
-To start applications with it you can use the L<hypnotoad> script.
+and reliable L<Mojo::Server::Prefork>, with IPv6, TLS, Comet (long polling),
+keep-alive, connection pooling, timeout, cookie, multipart, 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.
+
+To start applications with it you can use the L<hypnotoad> script, for
+L<Mojolicious> and L<Mojolicious::Lite> applications it will default to
+C<production> mode.
 
   $ hypnotoad myapp.pl
   Server available at http://127.0.0.1:8080.
@@ -177,42 +181,39 @@ You can run the same command again for automatic hot deployment.
   $ hypnotoad myapp.pl
   Starting hot deployment for Hypnotoad server 31841.
 
-For L<Mojolicious> and L<Mojolicious::Lite> applications it will default to
-C<production> mode.
+This second invocation will load the application again, detect the process id
+file with it, and send a L</"USR2"> signal to the already running server.
 
-Optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.16+) and
-L<IO::Socket::SSL> (1.75+) are supported transparently through
-L<Mojo::IOLoop>, and used if installed. Individual features can also be
-disabled with the MOJO_NO_IPV6 and MOJO_NO_TLS environment variables.
+For better scalability (epoll, kqueue) and to provide IPv6 as well as TLS
+support, the optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.16+) and
+L<IO::Socket::SSL> (1.75+) will be used automatically by L<Mojo::IOLoop> if
+they are installed. Individual features can also be disabled with the
+MOJO_NO_IPV6 and MOJO_NO_TLS environment variables.
 
 See L<Mojolicious::Guides::Cookbook> for more.
 
-=head1 SIGNALS
+=head1 MANAGER SIGNALS
 
-L<Mojo::Server::Hypnotoad> can be controlled at runtime with the following
-signals.
+The L<Mojo::Server::Hypnotoad> manager process can be controlled at runtime
+with the following signals.
 
-=head2 Manager
-
-=over 2
-
-=item INT, TERM
+=head2 INT, TERM
 
 Shutdown server immediately.
 
-=item QUIT
+=head2 QUIT
 
 Shutdown server gracefully.
 
-=item TTIN
+=head2 TTIN
 
 Increase worker pool by one.
 
-=item TTOU
+=head2 TTOU
 
 Decrease worker pool by one.
 
-=item USR2
+=head2 USR2
 
 Attempt zero downtime software upgrade (hot deployment) without losing any
 incoming connections.
@@ -228,25 +229,22 @@ incoming connections.
      |- Worker [3]
      +- Worker [4]
 
-The new manager will automatically send a C<QUIT> signal to the old manager
+The new manager will automatically send a L</"QUIT"> signal to the old manager
 and take over serving requests after starting up successfully.
 
-=back
+=head1 WORKER SIGNALS
 
-=head2 Worker
+L<Mojo::Server::Hypnotoad> worker processes can be controlled at runtime with
+the following signals.
 
-=over 2
-
-=item INT, TERM
+=head2 INT, TERM
 
 Stop worker immediately.
 
-=item QUIT
+=head2 QUIT
 
 Stop worker gracefully.
 
-=back
-
 =head1 SETTINGS
 
 L<Mojo::Server::Hypnotoad> can be configured with the following settings, see
@@ -282,7 +280,7 @@ Listen backlog size, defaults to C<SOMAXCONN>.
 
 Maximum number of parallel client connections per worker process, defaults to
 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
+want to decrease this value and increase L</"workers"> instead for better
 performance.
 
 =head2 graceful_timeout

+12 -9

mojo/lib/Mojo/Server/Morbo.pm

View

@@ -100,6 +100,8 @@ sub _spawn {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Server::Morbo - DOOOOOOOOOOOOOOOOOOM!
@@ -115,20 +117,21 @@ Mojo::Server::Morbo - DOOOOOOOOOOOOOOOOOOM!
 
 L<Mojo::Server::Morbo> is a full featured, self-restart capable 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 polling),
-C<keep-alive>, connection pooling, timeout, cookie, multipart and multiple
-event loop support. Note that the server uses signals for process management,
-so you should avoid modifying signal handlers in your applications.
+L<Mojo::Server::Daemon>, with IPv6, TLS, Comet (long polling), keep-alive,
+connection pooling, timeout, cookie, multipart and multiple event loop
+support. Note that the server uses signals for process management, so you
+should avoid modifying signal handlers in your applications.
 
 To start applications with it you can use the L<morbo> script.
 
   $ morbo myapp.pl
   Server available at http://127.0.0.1:3000.
 
-Optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.16+) and
-L<IO::Socket::SSL> (1.75+) are supported transparently through
-L<Mojo::IOLoop>, and used if installed. Individual features can also be
-disabled with the MOJO_NO_IPV6 and MOJO_NO_TLS environment variables.
+For better scalability (epoll, kqueue) and to provide IPv6 as well as TLS
+support, the optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.16+) and
+L<IO::Socket::SSL> (1.75+) will be used automatically by L<Mojo::IOLoop> if
+they are installed. Individual features can also be disabled with the
+MOJO_NO_IPV6 and MOJO_NO_TLS environment variables.
 
 See L<Mojolicious::Guides::Cookbook> for more.
 
@@ -152,7 +155,7 @@ the following new ones.
 
 =head2 check_file
 
-  my $success = $morbo->check_file('/home/sri/lib/MyApp.pm');
+  my $bool = $morbo->check_file('/home/sri/lib/MyApp.pm');
 
 Check if file has been modified since last check.
 

+3 -1

mojo/lib/Mojo/Server/PSGI.pm

View

@@ -8,7 +8,7 @@ sub run {
   my $req = $tx->req->parse($env);
   $tx->local_port($env->{SERVER_PORT})->remote_address($env->{REMOTE_ADDR});
 
-  # Request body
+  # Request body (may block if we try to read too much)
   my $len = $env->{CONTENT_LENGTH};
   until ($req->is_finished) {
     my $chunk = ($len && $len < 131072) ? $len : 131072;
@@ -66,6 +66,8 @@ sub getline {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Server::PSGI - PSGI server

+37 -46

mojo/lib/Mojo/Server/Prefork.pm

View

@@ -64,7 +64,10 @@ sub run {
   # Clean manager environment
   local $SIG{INT} = local $SIG{TERM} = sub { $self->_term };
   local $SIG{CHLD} = sub {
-    while ((my $pid = waitpid -1, WNOHANG) > 0) { $self->_reap($pid) }
+    while ((my $pid = waitpid -1, WNOHANG) > 0) {
+      $self->app->log->debug("Worker $pid stopped.")
+        if delete $self->emit(reap => $pid)->{pool}{$pid};
+    }
   };
   local $SIG{QUIT} = sub { $self->_term(1) };
   local $SIG{TTIN} = sub { $self->workers($self->workers + 1) };
@@ -110,7 +113,8 @@ sub _manage {
   # Manage workers
   $self->emit('wait')->_heartbeat;
   my $log = $self->app->log;
-  while (my ($pid, $w) = each %{$self->{pool}}) {
+  for my $pid (keys %{$self->{pool}}) {
+    next unless my $w = $self->{pool}{$pid};
 
     # No heartbeat (graceful stop)
     my $interval = $self->heartbeat_interval;
@@ -151,14 +155,6 @@ sub _pid_file {
   print $handle $$;
 }
 
-sub _reap {
-  my ($self, $pid) = @_;
-
-  # Clean up dead worker
-  $self->app->log->debug("Worker $pid stopped.")
-    if delete $self->emit(reap => $pid)->{pool}{$pid};
-}
-
 sub _spawn {
   my $self = shift;
 
@@ -179,21 +175,21 @@ sub _spawn {
     sub {
 
       # Blocking ("ualarm" can't be imported on Windows)
-      my $l;
+      my $lock;
       if ($_[1]) {
         eval {
           local $SIG{ALRM} = sub { die "alarm\n" };
           my $old = Time::HiRes::ualarm $self->lock_timeout * 1000000;
-          $l = flock $handle, LOCK_EX;
+          $lock = flock $handle, LOCK_EX;
           Time::HiRes::ualarm $old;
         };
-        if ($@) { $l = $@ eq "alarm\n" ? 0 : die($@) }
+        if ($@) { $lock = $@ eq "alarm\n" ? 0 : die($@) }
       }
 
       # Non blocking
-      else { $l = flock $handle, LOCK_EX | LOCK_NB }
+      else { $lock = flock $handle, LOCK_EX | LOCK_NB }
 
-      return $l;
+      return $lock;
     }
   );
   $loop->unlock(sub { flock $handle, LOCK_UN });
@@ -210,7 +206,7 @@ sub _spawn {
   # Clean worker environment
   $SIG{$_} = 'DEFAULT' for qw(INT TERM CHLD TTIN TTOU);
   $SIG{QUIT} = sub { $loop->max_connections(0) };
-  delete $self->{$_} for qw(poll reader);
+  delete @$self{qw(poll reader)};
 
   $self->app->log->debug("Worker $$ started.");
   $loop->start;
@@ -225,6 +221,8 @@ sub _term {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Server::Prefork - Preforking non-blocking I/O HTTP and WebSocket server
@@ -256,60 +254,53 @@ Mojo::Server::Prefork - Preforking non-blocking I/O HTTP and WebSocket server
 
 L<Mojo::Server::Prefork> 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
-polling), C<keep-alive>, connection pooling, timeout, cookie, multipart and
-multiple event loop support. Note that the server uses signals for process
-management, so you should avoid modifying signal handlers in your
-applications.
+and reliable L<Mojo::Server::Daemon>, with IPv6, TLS, Comet (long polling),
+keep-alive, connection pooling, timeout, cookie, multipart and multiple event
+loop support. Note that the server uses signals for process management, so you
+should avoid modifying signal handlers in your applications.
 
-Optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.16+) and
-L<IO::Socket::SSL> (1.75+) are supported transparently through
-L<Mojo::IOLoop>, and used if installed. Individual features can also be
-disabled with the MOJO_NO_IPV6 and MOJO_NO_TLS environment variables.
+For better scalability (epoll, kqueue) and to provide IPv6 as well as TLS
+support, the optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.16+) and
+L<IO::Socket::SSL> (1.75+) will be used automatically by L<Mojo::IOLoop> if
+they are installed. Individual features can also be disabled with the
+MOJO_NO_IPV6 and MOJO_NO_TLS environment variables.
 
 See L<Mojolicious::Guides::Cookbook> for more.
 
-=head1 SIGNALS
+=head1 MANAGER SIGNALS
 
-L<Mojo::Server::Prefork> can be controlled at runtime with the following
-signals.
+The L<Mojo::Server::Prefork> manager process can be controlled at runtime with
+the following signals.
 
-=head2 Manager
-
-=over 2
-
-=item INT, TERM
+=head2 INT, TERM
 
 Shutdown server immediately.
 
-=item QUIT
+=head2 QUIT
 
 Shutdown server gracefully.
 
-=item TTIN
+=head2 TTIN
 
 Increase worker pool by one.
 
-=item TTOU
+=head2 TTOU
 
 Decrease worker pool by one.
 
-=back
+=head1 WORKER SIGNALS
 
-=head2 Worker
+L<Mojo::Server::Prefork> worker processes can be controlled at runtime with
+the following signals.
 
-=over 2
-
-=item INT, TERM
+=head2 INT, TERM
 
 Stop worker immediately.
 
-=item QUIT
+=head2 QUIT
 
 Stop worker gracefully.
 
-=back
-
 =head1 EVENTS
 
 L<Mojo::Server::Prefork> inherits all events from L<Mojo::Server::Daemon> and
@@ -482,8 +473,8 @@ implements the following new ones.
 
   my $pid = $prefork->check_pid;
 
-Get process id for running server from C<pid_file> or delete it if server is
-not running.
+Get process id for running server from L</"pid_file"> or delete it if server
+is not running.
 
   say 'Server is not running' unless $prefork->check_pid;
 

+6 -4

mojo/lib/Mojo/Template.pm

View

@@ -317,6 +317,8 @@ sub _wrap {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Template - Perl-ish templates!
@@ -382,8 +384,8 @@ automatically enabled.
   %# Comment line, useful for debugging
   %% Replaced with "%", useful for generating templates
 
-Escaping behavior can be reversed with the C<auto_escape> attribute, this is
-the default in L<Mojolicious> C<.ep> templates for example.
+Escaping behavior can be reversed with the L</"auto_escape"> attribute, this
+is the default in L<Mojolicious> C<.ep> templates for example.
 
   <%= Perl expression, replaced with XML escaped result %>
   <%== Perl expression, replaced with result %>
@@ -452,8 +454,8 @@ L<Mojo::Template> implements the following attributes.
 
 =head2 auto_escape
 
-  my $escape = $mt->auto_escape;
-  $mt        = $mt->auto_escape(1);
+  my $bool = $mt->auto_escape;
+  $mt      = $mt->auto_escape($bool);
 
 Activate automatic escaping.
 

+25 -22

mojo/lib/Mojo/Transaction.pm

View

@@ -5,13 +5,25 @@ use Carp 'croak';
 use Mojo::Message::Request;
 use Mojo::Message::Response;
 
-has [qw(kept_alive local_address local_port previous remote_port)];
+has [qw(kept_alive local_address local_port remote_port)];
 has req => sub { Mojo::Message::Request->new };
 has res => sub { Mojo::Message::Response->new };
 
 sub client_close {
-  my $self = shift;
-  $self->res->finish;
+  my ($self, $close) = @_;
+
+  # Remove code from parser errors
+  my $res = $self->res->finish;
+  if (my $err = $res->error) { $res->error($err) }
+
+  # Premature connection close
+  elsif ($close && !$res->code) { $res->error('Premature connection close') }
+
+  # 400/500
+  elsif ($res->is_status_class(400) || $res->is_status_class(500)) {
+    $res->error($res->message, $res->code);
+  }
+
   return $self->server_close;
 }
 
@@ -73,6 +85,8 @@ sub _state {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Transaction - Transaction base class
@@ -148,16 +162,6 @@ Local interface address.
 
 Local interface port.
 
-=head2 previous
-
-  my $previous = $tx->previous;
-  $tx          = $tx->previous(Mojo::Transaction->new);
-
-Previous transaction that triggered this followup transaction.
-
-  # Path of previous request
-  say $tx->previous->req->url->path;
-
 =head2 remote_port
 
   my $port = $tx->remote_port;
@@ -187,8 +191,10 @@ implements the following new ones.
 =head2 client_close
 
   $tx->client_close;
+  $tx->client_close(1);
 
-Transaction closed client-side, used to implement user agents.
+Transaction closed client-side, no actual connection close is assumed by
+default, used to implement user agents.
 
 =head2 client_read
 
@@ -220,7 +226,7 @@ Error and code.
 
 =head2 is_finished
 
-  my $success = $tx->is_finished;
+  my $bool = $tx->is_finished;
 
 Check if transaction is finished.
 
@@ -232,7 +238,7 @@ False.
 
 =head2 is_writing
 
-  my $success = $tx->is_writing;
+  my $bool = $tx->is_writing;
 
 Check if transaction is writing.
 
@@ -273,9 +279,9 @@ in a subclass.
 
   my $res = $tx->success;
 
-Returns the L<Mojo::Message::Response> object (C<res>) if transaction was
-successful or C<undef> otherwise. Connection and parser errors have only a
-message in C<error>, 400 and 500 responses also a code.
+Returns the L<Mojo::Message::Response> object from L</"res"> if transaction
+was successful or C<undef> otherwise. Connection and parser errors have only a
+message in L</"error">, 400 and 500 responses also a code.
 
   # Sensible exception handling
   if (my $res = $tx->success) { say $res->body }
@@ -284,9 +290,6 @@ message in C<error>, 400 and 500 responses also a code.
     say $code ? "$code response: $err" : "Connection error: $err";
   }
 
-Error messages can be accessed with the C<error> method of the transaction
-object.
-
 =head1 SEE ALSO
 
 L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicio.us>.

+36 -3

mojo/lib/Mojo/Transaction/HTTP.pm

View

@@ -3,6 +3,8 @@ use Mojo::Base 'Mojo::Transaction';
 
 use Mojo::Transaction::WebSocket;
 
+has 'previous';
+
 sub client_read {
   my ($self, $chunk) = @_;
 
@@ -40,6 +42,13 @@ sub keep_alive {
   return !($req->version eq '1.0' || $res->version eq '1.0');
 }
 
+sub redirects {
+  my $previous = shift;
+  my @redirects;
+  unshift @redirects, $previous while $previous = $previous->previous;
+  return \@redirects;
+}
+
 sub server_read {
   my ($self, $chunk) = @_;
 
@@ -162,6 +171,8 @@ sub _write {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Transaction::HTTP - HTTP transaction
@@ -245,7 +256,19 @@ object.
 
 =head1 ATTRIBUTES
 
-L<Mojo::Transaction::HTTP> inherits all attributes from L<Mojo::Transaction>.
+L<Mojo::Transaction::HTTP> inherits all attributes from L<Mojo::Transaction>
+and implements the following new ones.
+
+=head2 previous
+
+  my $previous = $tx->previous;
+  $tx          = $tx->previous(Mojo::Transaction->new);
+
+Previous transaction that triggered this followup transaction.
+
+  # Paths of previous requests
+  say $tx->previous->previous->req->url->path;
+  say $tx->previous->req->url->path;
 
 =head1 METHODS
 
@@ -266,16 +289,26 @@ Write data client-side, used to implement user agents.
 
 =head2 is_empty
 
-  my $success = $tx->is_empty;
+  my $bool = $tx->is_empty;
 
 Check transaction for C<HEAD> request and C<1xx>, C<204> or C<304> response.
 
 =head2 keep_alive
 
-  my $success = $tx->keep_alive;
+  my $bool = $tx->keep_alive;
 
 Check if connection can be kept alive.
 
+=head2 redirects
+
+  my $redirects = $tx->redirects;
+
+Return a list of all previous transactions that preceded this followup
+transaction.
+
+  # Paths of all previous requests
+  say $_->req->url->path for @{$tx->redirects};
+
 =head2 server_read
 
   $tx->server_read($bytes);

+14 -13

mojo/lib/Mojo/Transaction/WebSocket.pm

View

@@ -69,12 +69,12 @@ sub build_frame {
     warn "-- Extended 64bit payload ($len)\n$payload\n" if DEBUG;
     vec($prefix, 0, 8) = $masked ? (127 | 0b10000000) : 127;
     $frame .= $prefix;
-    $frame .= pack('NN', 0, $len & 0xFFFFFFFF);
+    $frame .= pack('NN', 0, $len & 0xffffffff);
   }
 
   # Mask payload
   if ($masked) {
-    my $mask = pack 'N', int(rand 9999999);
+    my $mask = pack 'N', int(rand 9 x 7);
     $payload = $mask . xor_encode($payload, $mask x 128);
   }
 
@@ -95,9 +95,9 @@ sub client_handshake {
   $headers->connection('Upgrade')     unless $headers->connection;
   $headers->sec_websocket_version(13) unless $headers->sec_websocket_version;
 
-  # Generate WebSocket challenge
-  $headers->sec_websocket_key(b64_encode(pack('N*', int(rand 9999999)), ''))
-    unless $headers->sec_websocket_key;
+  # Generate 16 byte WebSocket challenge
+  my $challenge = b64_encode sprintf('%16u', int(rand 9 x 16)), '';
+  $headers->sec_websocket_key($challenge) unless $headers->sec_websocket_key;
 }
 
 sub client_read  { shift->server_read(@_) }
@@ -211,8 +211,8 @@ sub send {
       : [1, 0, 0, 0, BINARY, $frame->{binary}];
   }
 
-  # Text or object (forcing stringification)
-  $frame = [1, 0, 0, 0, TEXT, encode('UTF-8', "$frame")]
+  # Text
+  $frame = [1, 0, 0, 0, TEXT, encode('UTF-8', $frame)]
     if ref $frame ne 'ARRAY';
 
   $self->once(drain => $cb) if $cb;
@@ -302,6 +302,8 @@ sub _message {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Transaction::WebSocket - WebSocket transaction
@@ -451,8 +453,8 @@ object.
 
 =head2 masked
 
-  my $masked = $ws->masked;
-  $ws        = $ws->masked(1);
+  my $bool = $ws->masked;
+  $ws      = $ws->masked($bool);
 
 Mask outgoing frames with XOR cipher and a random 32bit key.
 
@@ -474,7 +476,7 @@ L<Mojo::Transaction> and implements the following new ones.
   my $ws = Mojo::Transaction::WebSocket->new;
 
 Construct a new L<Mojo::Transaction::WebSocket> object and subscribe to
-C<frame> event with default message parser, which also handles C<PING> and
+L</"frame"> event with default message parser, which also handles C<PING> and
 C<CLOSE> frames automatically.
 
 =head2 build_frame
@@ -503,7 +505,7 @@ Build WebSocket frame.
 
 =head2 client_challenge
 
-  my $success = $ws->client_challenge;
+  my $bool = $ws->client_challenge;
 
 Check WebSocket handshake challenge client-side, used to implement user
 agents.
@@ -607,7 +609,7 @@ Handshake response, usually a L<Mojo::Message::Response> object.
 
   $ws = $ws->resume;
 
-Resume C<handshake> transaction.
+Resume L</"handshake"> transaction.
 
 =head2 send
 
@@ -615,7 +617,6 @@ Resume C<handshake> transaction.
   $ws = $ws->send({text   => $bytes});
   $ws = $ws->send({json   => {test => [1, 2, 3]}});
   $ws = $ws->send([$fin, $rsv1, $rsv2, $rsv3, $op, $bytes]);
-  $ws = $ws->send(Mojo::ByteStream->new($chars));
   $ws = $ws->send($chars);
   $ws = $ws->send($chars => sub {...});
 

+33 -12

mojo/lib/Mojo/URL.pm

View

@@ -1,9 +1,6 @@
 package Mojo::URL;
 use Mojo::Base -base;
-use overload
-  'bool'   => sub {1},
-  '""'     => sub { shift->to_string },
-  fallback => 1;
+use overload bool => sub {1}, '""' => sub { shift->to_string }, fallback => 1;
 
 use Mojo::Parameters;
 use Mojo::Path;
@@ -179,8 +176,7 @@ sub to_rel {
   my @base_parts = @{$base_path->parts};
   pop @base_parts unless $base_path->trailing_slash;
   while (@parts && @base_parts && $parts[0] eq $base_parts[0]) {
-    shift @parts;
-    shift @base_parts;
+    shift @$_ for \@parts, \@base_parts;
   }
   my $path = $rel->path(Mojo::Path->new)->path;
   $path->leading_slash(1) if $rel->authority;
@@ -243,7 +239,6 @@ Mojo::URL - Uniform Resource Locator
   $url->host('example.com');
   $url->port(3000);
   $url->path('/foo/bar');
-  $url->path('baz');
   $url->query->param(foo => 'bar');
   $url->fragment(23);
   say "$url";
@@ -309,7 +304,7 @@ following new ones.
   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 and C<parse> URL if necessary.
+Construct a new L<Mojo::URL> object and L</"parse"> URL if necessary.
 
 =head2 authority
 
@@ -336,7 +331,7 @@ Host part of this URL in punycode format.
 
 =head2 is_abs
 
-  my $success = $url->is_abs;
+  my $bool = $url->is_abs;
 
 Check if URL is absolute.
 
@@ -378,7 +373,7 @@ defaults to a L<Mojo::Path> object.
 
   my $proto = $url->protocol;
 
-Normalized version of C<scheme>.
+Normalized version of L</"scheme">.
 
   # "http"
   Mojo::URL->new('HtTp://example.com')->protocol;
@@ -417,14 +412,40 @@ appended, defaults to a L<Mojo::Parameters> object.
   my $abs = $url->to_abs;
   my $abs = $url->to_abs(Mojo::URL->new('http://example.com/foo'));
 
-Clone relative URL and turn it into an absolute one.
+Clone relative URL and turn it into an absolute one using L</"base"> or
+provided base URL.
+
+  # "http://example.com/foo/baz.xml?test=123"
+  Mojo::URL->new('baz.xml?test=123')
+    ->to_abs(Mojo::URL->new('http://example.com/foo/bar.html'));
+
+  # "http://example.com/baz.xml?test=123"
+  Mojo::URL->new('/baz.xml?test=123')
+    ->to_abs(Mojo::URL->new('http://example.com/foo/bar.html'));
+
+  # "http://example.com/foo/baz.xml?test=123"
+  Mojo::URL->new('//example.com/foo/baz.xml?test=123')
+    ->to_abs(Mojo::URL->new('http://example.com/foo/bar.html'));
 
 =head2 to_rel
 
   my $rel = $url->to_rel;
   my $rel = $url->to_rel(Mojo::URL->new('http://example.com/foo'));
 
-Clone absolute URL and turn it into a relative one.
+Clone absolute URL and turn it into a relative one using L</"base"> or
+provided base URL.
+
+  # "foo/bar.html?test=123"
+  Mojo::URL->new('http://example.com/foo/bar.html?test=123')
+    ->to_rel(Mojo::URL->new('http://example.com'));
+
+  # "bar.html?test=123"
+  Mojo::URL->new('http://example.com/foo/bar.html?test=123')
+    ->to_rel(Mojo::URL->new('http://example.com/foo/'));
+
+  # "//example.com/foo/bar.html?test=123"
+  Mojo::URL->new('http://example.com/foo/bar.html?test=123')
+    ->to_rel(Mojo::URL->new('http://'));
 
 =head2 to_string
 

mojo/lib/Mojo/Upload.pm

View

@@ -19,6 +19,8 @@ sub slurp { shift->asset->slurp }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Upload - Upload

+201 -260

mojo/lib/Mojo/UserAgent.pm

View

@@ -4,12 +4,12 @@ use Mojo::Base 'Mojo::EventEmitter';
 # "Fry: Since when is the Internet about robbing people of their privacy?
 #  Bender: August 6, 1991."
 use Carp 'croak';
-use List::Util 'first';
 use Mojo::IOLoop;
-use Mojo::Server::Daemon;
 use Mojo::URL;
-use Mojo::Util 'monkey_patch';
+use Mojo::Util qw(deprecated monkey_patch);
 use Mojo::UserAgent::CookieJar;
+use Mojo::UserAgent::Proxy;
+use Mojo::UserAgent::Server;
 use Mojo::UserAgent::Transactor;
 use Scalar::Util 'weaken';
 
@@ -19,14 +19,15 @@ has ca              => sub { $ENV{MOJO_CA_FILE} };
 has cert            => sub { $ENV{MOJO_CERT_FILE} };
 has connect_timeout => sub { $ENV{MOJO_CONNECT_TIMEOUT} || 10 };
 has cookie_jar      => sub { Mojo::UserAgent::CookieJar->new };
-has [qw(http_proxy https_proxy local_address no_proxy)];
+has 'local_address';
 has inactivity_timeout => sub { defined $ENV{MOJO_INACTIVITY_TIMEOUT} ? $ENV{MOJO_INACTIVITY_TIMEOUT} : 20 };
 has ioloop             => sub { Mojo::IOLoop->new };
 has key                => sub { $ENV{MOJO_KEY_FILE} };
 has max_connections    => 5;
 has max_redirects => sub { $ENV{MOJO_MAX_REDIRECTS} || 0 };
-has name => 'Mojolicious (Perl)';
+has proxy => sub { Mojo::UserAgent::Proxy->new };
 has request_timeout => sub { defined $ENV{MOJO_REQUEST_TIMEOUT} ? $ENV{MOJO_REQUEST_TIMEOUT} : 0 };
+has server => sub { Mojo::UserAgent::Server->new(ioloop => shift->ioloop) };
 has transactor => sub { Mojo::UserAgent::Transactor->new };
 
 # Common HTTP methods
@@ -40,51 +41,89 @@ for my $name (qw(DELETE GET HEAD OPTIONS PATCH POST PUT)) {
 
 sub DESTROY { shift->_cleanup }
 
-our $singleton_app;
-sub app {
-  my ($self, $app) = @_;
-
-  # Singleton application
-  return $singleton_app = $app ? $app : $singleton_app unless ref $self;
-
-  # Default to singleton application
-  return $self->{app} || $singleton_app unless $app;
-  $self->{app} = $app;
+# DEPRECATED in Top Hat!
+sub new {
+  my $self = shift->SUPER::new;
+  while (my $name = shift) { $self->$name(shift) }
   return $self;
 }
 
+# DEPRECATED in Top Hat!
+sub app {
+  deprecated "Mojo::UserAgent::app is DEPRECATED in favor of"
+    . " Mojo::UserAgent::Server::app";
+  shift->_delegate('server', 'app', @_);
+}
+
+# DEPRECATED in Top Hat!
 sub app_url {
-  my $self = shift;
-  $self->_server(@_);
-  return Mojo::URL->new("$self->{proto}://localhost:$self->{port}/");
+  deprecated "Mojo::UserAgent::app_url is DEPRECATED in favor of"
+    . " Mojo::UserAgent::Server::url";
+  shift->_delegate('server', 'url', @_);
 }
 
 sub build_tx           { shift->transactor->tx(@_) }
 sub build_websocket_tx { shift->transactor->websocket(@_) }
 
+# DEPRECATED in Top Hat!
 sub detect_proxy {
-  my $self = shift;
-  $self->http_proxy($ENV{HTTP_PROXY}   || $ENV{http_proxy});
-  $self->https_proxy($ENV{HTTPS_PROXY} || $ENV{https_proxy});
-  return $self->no_proxy([split /,/, $ENV{NO_PROXY} || $ENV{no_proxy} || '']);
+  deprecated "Mojo::UserAgent::detect_proxy is DEPRECATED in favor of"
+    . " Mojo::UserAgent::Proxy::detect";
+  shift->tap(sub { $_->proxy->detect });
 }
 
+# DEPRECATED in Top Hat!
+sub http_proxy {
+  deprecated "Mojo::UserAgent::http_proxy is DEPRECATED in favor of"
+    . " Mojo::UserAgent::Proxy::http";
+  shift->_delegate('proxy', 'http', @_);
+}
+
+# DEPRECATED in Top Hat!
+sub https_proxy {
+  deprecated "Mojo::UserAgent::https_proxy is DEPRECATED in favor of"
+    . " Mojo::UserAgent::Proxy::https";
+  shift->_delegate('proxy', 'https', @_);
+}
+
+# DEPRECATED in Top Hat!
+sub name {
+  deprecated "Mojo::UserAgent::name is DEPRECATED in favor of"
+    . " Mojo::UserAgent::Transactor::name";
+  shift->_delegate('transactor', 'name', @_);
+}
+
+# DEPRECATED in Top Hat!
+sub no_proxy {
+  deprecated "Mojo::UserAgent::no_proxy is DEPRECATED in favor of"
+    . " Mojo::UserAgent::Proxy::not";
+  shift->_delegate('proxy', 'not', @_);
+}
+
+# DEPRECATED in Top Hat!
 sub need_proxy {
-  my ($self, $host) = @_;
-  return !first { $host =~ /\Q$_\E$/ } @{$self->no_proxy || []};
+  deprecated "Mojo::UserAgent::need_proxy is DEPRECATED in favor of"
+    . " Mojo::UserAgent::Proxy::is_needed";
+  shift->proxy->is_needed(@_);
 }
 
 sub start {
   my ($self, $tx, $cb) = @_;
 
+  # Fork safety
+  unless (($self->{pid} = defined $self->{pid} ? $self->{pid} : $$) eq $$) {
+    delete $self->_cleanup->{pid};
+    $self->server->restart;
+  }
+
   # Non-blocking
   if ($cb) {
     warn "-- Non-blocking request (@{[$tx->req->url->to_abs]})\n" if DEBUG;
     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->server->ioloop(Mojo::IOLoop->singleton);
+      $self->_cleanup->{nb}++;
     }
     return $self->_start($tx, $cb);
   }
@@ -94,8 +133,8 @@ sub start {
   if ($self->{nb}) {
     croak 'Non-blocking requests in progress' if keys %{$self->{connections}};
     warn "-- Switching to blocking mode\n" if DEBUG;
-    $self->_cleanup;
-    delete $self->{nb};
+    $self->server->ioloop($self->ioloop);
+    delete $self->_cleanup->{nb};
   }
   $self->_start($tx => sub { shift->ioloop->stop; $tx = shift });
   $self->ioloop->start;
@@ -109,50 +148,17 @@ sub websocket {
   $self->start($self->build_websocket_tx(@_), $cb);
 }
 
-sub _cache {
-  my ($self, $name, $id) = @_;
-
-  # Enqueue and enforce connection limit
-  my $old = $self->{cache} ||= [];
-  if ($id) {
-    my $max = $self->max_connections;
-    $self->_remove(shift(@$old)->[1]) while @$old > $max;
-    push @$old, [$name, $id] if $max;
-    return undef;
-  }
-
-  # Dequeue
-  my $found;
-  my $loop = $self->_loop;
-  my $new = $self->{cache} = [];
-  for my $cached (@$old) {
-
-    # Search for id/name and remove corrupted connections
-    if (!$found && ($cached->[1] eq $name || $cached->[0] eq $name)) {
-      my $stream = $loop->stream($cached->[1]);
-      if ($stream && !$stream->is_readable) { $found = $cached->[1] }
-      else                                  { $loop->remove($cached->[1]) }
-    }
-
-    # Requeue
-    else { push @$new, $cached }
-  }
-
-  return $found;
-}
-
 sub _cleanup {
   my $self = shift;
   return unless my $loop = $self->_loop;
 
   # Clean up active connections (by closing them)
-  $self->_handle($_ => 1) for keys %{$self->{connections} || {}};
+  $self->_handle($_, 1) for keys %{$self->{connections} || {}};
 
   # Clean up keep-alive connections
-  $loop->remove($_->[1]) for @{delete $self->{cache} || []};
+  $loop->remove($_->[1]) for @{delete $self->{queue} || []};
 
-  # Stop server
-  delete $self->{server};
+  return $self;
 }
 
 sub _connect {
@@ -166,7 +172,7 @@ sub _connect {
     local_address => $self->local_address,
     port          => $port,
     timeout       => $self->connect_timeout,
-    tls           => $proto eq 'https' ? 1 : 0,
+    tls           => $proto eq 'https',
     tls_ca        => $self->ca,
     tls_cert      => $self->cert,
     tls_key       => $self->key,
@@ -178,10 +184,11 @@ sub _connect {
       return $self->_error($id, $err) if $err;
 
       # Connection established
-      $stream->on(timeout => sub { $self->_error($id, 'Inactivity timeout') });
-      $stream->on(close => sub { $self->_handle($id => 1) });
-      $stream->on(error => sub { $self && $self->_error($id, pop, 1) });
-      $stream->on(read => sub { $self->_read($id => pop) });
+      $stream->on(
+        timeout => sub { $self->_error($id, 'Inactivity timeout', 1) });
+      $stream->on(close => sub { $self->_handle($id, 1) });
+      $stream->on(error => sub { $self && $self->_error($id, pop) });
+      $stream->on(read => sub { $self->_read($id, pop) });
       $cb->();
     }
   );
@@ -196,19 +203,19 @@ sub _connect_proxy {
     $new => sub {
       my ($self, $tx) = @_;
 
-      # CONNECT failed
-      unless ((defined $tx->res->code ? $tx->res->code : '') eq '200') {
+      # CONNECT failed (connection needs to be kept alive)
+      unless ($tx->keep_alive && $tx->res->is_status_class(200)) {
         $old->req->error('Proxy connection failed');
-        return $self->_finish($old, $cb);
+        return $self->$cb($old);
       }
 
       # Prevent proxy reassignment and start real transaction
       $old->req->proxy(0);
-      return $self->_start($old->connection($tx->connection), $cb)
+      my $id = $tx->connection;
+      return $self->_start($old->connection($id), $cb)
         unless $tx->req->url->protocol eq 'https';
 
       # TLS upgrade
-      return unless my $id = $tx->connection;
       my $loop   = $self->_loop;
       my $handle = $loop->stream($id)->steal_handle;
       my $c      = delete $self->{connections}{$id};
@@ -245,7 +252,7 @@ sub _connection {
   # Reuse connection
   my $id = $tx->connection;
   my ($proto, $host, $port) = $self->transactor->endpoint($tx);
-  $id ||= $self->_cache("$proto:$host:$port");
+  $id ||= $self->_dequeue("$proto:$host:$port", 1);
   if ($id && !ref $id) {
     warn "-- Reusing connection ($proto:$host:$port)\n" if DEBUG;
     $self->{connections}{$id} = {cb => $cb, tx => $tx};
@@ -268,32 +275,47 @@ sub _connection {
   return $id;
 }
 
-sub _error {
-  my ($self, $id, $err, $emit) = @_;
-  if (my $tx = $self->{connections}{$id}{tx}) { $tx->res->error($err) }
-  $self->emit(error => $err) if $emit;
-  $self->_handle($id => $err);
+# DEPRECATED in Top Hat!
+sub _delegate {
+  my ($self, $attr, $name) = (shift, shift, shift);
+  return $self->$attr->$name unless @_;
+  $self->$attr->$name(@_);
+  return $self;
 }
 
-sub _finish {
-  my ($self, $tx, $cb, $close) = @_;
+sub _dequeue {
+  my ($self, $name, $test) = @_;
 
-  # Remove code from parser errors
-  my $res = $tx->res;
-  if (my $err = $res->error) { $res->error($err) }
+  my $found;
+  my $loop = $self->_loop;
+  my $old  = $self->{queue} || [];
+  my $new  = $self->{queue} = [];
+  for my $queued (@$old) {
+    push @$new, $queued and next if $found || !grep { $_ eq $name } @$queued;
+
+    # Search for id/name and sort out corrupted connections if necessary
+    next unless my $stream = $loop->stream($queued->[1]);
+    $test && $stream->is_readable ? $stream->close : ($found = $queued->[1]);
+  }
 
-  else {
+  return $found;
+}
 
-    # Premature connection close
-    if ($close && !$res->code) { $res->error('Premature connection close') }
+sub _enqueue {
+  my ($self, $name, $id) = @_;
 
-    # 400/500
-    elsif ($res->is_status_class(400) || $res->is_status_class(500)) {
-      $res->error($res->message, $res->code);
-    }
-  }
+  # Enforce connection limit
+  my $queue = $self->{queue} ||= [];
+  my $max = $self->max_connections;
+  $self->_remove(shift(@$queue)->[1]) while @$queue > $max;
+  push @$queue, [$name, $id] if $max;
+}
 
-  $self->$cb($tx);
+sub _error {
+  my ($self, $id, $err, $timeout) = @_;
+  if (my $tx = $self->{connections}{$id}{tx}) { $tx->res->error($err) }
+  elsif (!$timeout) { return $self->emit(error => $err) }
+  $self->_handle($id, 1);
 }
 
 sub _handle {
@@ -316,7 +338,7 @@ sub _handle {
   elsif ($old && (my $new = $self->_upgrade($id))) {
     if (my $jar = $self->cookie_jar) { $jar->extract($old) }
     $old->client_close;
-    $self->_finish($new, $c->{cb});
+    $c->{cb}->($self, $new);
     $new->client_read($old->res->content->leftovers);
   }
 
@@ -325,11 +347,10 @@ sub _handle {
     $self->_remove($id, $close);
     return unless $old;
     if (my $jar = $self->cookie_jar) { $jar->extract($old) }
-    $old->client_close;
+    $old->client_close($close);
 
     # Handle redirects
-    $self->_finish($new || $old, $c->{cb}, $close)
-      unless $self->_redirect($c, $old);
+    $c->{cb}->($self, $new || $old) unless $self->_redirect($c, $old);
   }
 }
 
@@ -354,77 +375,34 @@ sub _remove {
 
   # Close connection
   my $tx = (delete($self->{connections}{$id}) || {})->{tx};
-  unless (!$close && $tx && $tx->keep_alive && !$tx->error) {
-    $self->_cache($id);
+  if ($close || !$tx || !$tx->keep_alive || $tx->error) {
+    $self->_dequeue($id);
     return $self->_loop->remove($id);
   }
 
-  # Keep connection alive
-  $self->_cache(join(':', $self->transactor->endpoint($tx)), $id)
-    unless uc $tx->req->method eq 'CONNECT' && (defined $tx->res->code ? $tx->res->code : '') eq '200';
+  # Keep connection alive (CONNECT requests get upgraded)
+  $self->_enqueue(join(':', $self->transactor->endpoint($tx)), $id)
+    unless uc $tx->req->method eq 'CONNECT';
 }
 
 sub _redirect {
   my ($self, $c, $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;
-}
-
-sub _server {
-  my ($self, $proto) = @_;
-
-  # Reuse server
-  return $self->{server} if $self->{server} && !$proto;
-
-  # Start application server
-  my $loop   = $self->_loop;
-  my $server = $self->{server}
-    = Mojo::Server::Daemon->new(ioloop => $loop, silent => 1);
-  my $port = $self->{port} ||= $loop->generate_port;
-  die "Couldn't find a free TCP port for application.\n" unless $port;
-  $self->{proto} = $proto ||= 'http';
-  $server->listen(["$proto://127.0.0.1:$port"])->start;
-  warn "-- Application server started ($proto://127.0.0.1:$port)\n" if DEBUG;
-  return $server;
+  return undef unless @{$old->redirects} < $self->max_redirects;
+  return $self->_start($new, delete $c->{cb});
 }
 
 sub _start {
   my ($self, $tx, $cb) = @_;
 
-  # Embedded server (update application if necessary)
-  my $req = $tx->req;
-  my $url = $req->url;
-  if ($self->{port} || !$url->is_abs) {
-    if (my $app = $self->app) { $self->_server->app($app) }
-    my $base = $self->app_url;
-    $url->scheme($base->scheme)->authority($base->authority)
-      unless $url->is_abs;
+  # Application server
+  my $url = $tx->req->url;
+  unless ($url->is_abs) {
+    my $base = $self->server->url;
+    $url->scheme($base->scheme)->authority($base->authority);
   }
 
-  # Proxy
-  $self->detect_proxy if $ENV{MOJO_PROXY};
-  my $proto = $url->protocol;
-  if ($self->need_proxy($url->host)) {
-
-    # HTTP proxy
-    my $http = $self->http_proxy;
-    $req->proxy($http) if $http && !defined $req->proxy && $proto eq 'http';
-
-    # HTTPS proxy
-    my $https = $self->https_proxy;
-    $req->proxy($https) if $https && !defined $req->proxy && $proto eq 'https';
-  }
-
-  # We identify ourselves and accept gzip compression
-  my $headers = $req->headers;
-  $headers->user_agent($self->name) unless $headers->user_agent;
-  $headers->accept_encoding('gzip') if (! $headers->accept_encoding && $Compress::Raw::Zlib::VERSION);
+  $self->proxy->inject($tx);
   if (my $jar = $self->cookie_jar) { $jar->inject($tx) }
 
   # Connect and add request timeout if necessary
@@ -432,7 +410,7 @@ sub _start {
   if (my $timeout = $self->request_timeout) {
     weaken $self;
     $self->{connections}{$id}{timeout} = $self->_loop->timer(
-      $timeout => sub { $self->_error($id => 'Request timeout') });
+      $timeout => sub { $self->_error($id, 'Request timeout') });
   }
 
   return $id;
@@ -494,15 +472,14 @@ Mojo::UserAgent - Non-blocking I/O HTTP and WebSocket user agent
   }
 
   # Quick JSON API request with Basic authentication
-  say $ua->get('https://sri:s3cret@search.twitter.com/search.json?q=perl')
-    ->res->json('/results/0/text');
+  say $ua->get('https://sri:s3cret@example.com/search.json?q=perl')
+    ->res->json('/results/0/title');
 
   # Extract data from HTML and XML resources
-  say $ua->get('mojolicio.us')->res->dom->html->head->title->text;
+  say $ua->get('www.perl.org')->res->dom->html->head->title->text;
 
   # Scrape the latest headlines from a news site
-  say $ua->max_redirects(5)->get('www.reddit.com/r/perl/')
-    ->res->dom('p.title > a.title')->pluck('text')->shuffle;
+  say $ua->get('perlnews.org')->res->dom('h2 > a')->text->shuffle;
 
   # IPv6 PUT request with content
   my $tx
@@ -514,7 +491,7 @@ Mojo::UserAgent - Non-blocking I/O HTTP and WebSocket user agent
 
   # TLS certificate authentication and JSON POST
   my $tx = $ua->cert('tls.crt')->key('tls.key')
-    ->post('https://mojolicio.us' => json => {top => 'secret'});
+    ->post('https://example.com' => json => {top => 'secret'});
 
   # Blocking parallel requests (does not work inside a running event loop)
   my $delay = Mojo::IOLoop->delay;
@@ -557,14 +534,19 @@ Mojo::UserAgent - Non-blocking I/O HTTP and WebSocket user agent
 =head1 DESCRIPTION
 
 L<Mojo::UserAgent> is a full featured non-blocking I/O HTTP and WebSocket user
-agent, with C<IPv6>, C<TLS>, C<SNI>, C<IDNA>, C<Comet> (long polling),
-C<keep-alive>, connection pooling, timeout, cookie, multipart, proxy, C<gzip>
-compression and multiple event loop support.
+agent, with IPv6, TLS, SNI, IDNA, Comet (long polling), keep-alive, connection
+pooling, timeout, cookie, multipart, proxy, gzip compression and multiple
+event loop support.
+
+All connections will be reset automatically if a new process has been forked,
+this allows multiple processes to share the same L<Mojo::UserAgent> object
+safely.
 
-Optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.16+) and
-L<IO::Socket::SSL> (1.75+) are supported transparently through
-L<Mojo::IOLoop>, and used if installed. Individual features can also be
-disabled with the MOJO_NO_IPV6 and MOJO_NO_TLS environment variables.
+For better scalability (epoll, kqueue) and to provide IPv6 as well as TLS
+support, the optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.16+) and
+L<IO::Socket::SSL> (1.75+) will be used automatically by L<Mojo::IOLoop> if
+they are installed. Individual features can also be disabled with the
+MOJO_NO_IPV6 and MOJO_NO_TLS environment variables.
 
 See L<Mojolicious::Guides::Cookbook> for more.
 
@@ -580,7 +562,8 @@ the following new ones.
     ...
   });
 
-Emitted if an error occurs that can't be associated with a transaction.
+Emitted if an error occurs that can't be associated with a transaction, fatal
+if unhandled.
 
   $ua->on(error => sub {
     my ($ua, $err) = @_;
@@ -646,20 +629,6 @@ L<Mojo::UserAgent::CookieJar> object.
   # Disable cookie jar
   $ua->cookie_jar(0);
 
-=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 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 inactivity_timeout
 
   my $timeout = $ua->inactivity_timeout;
@@ -699,7 +668,7 @@ Local address to bind to.
   $ua     = $ua->max_connections(5);
 
 Maximum number of keep-alive connections that the user agent will retain
-before it starts closing the oldest cached ones, defaults to C<5>.
+before it starts closing the oldest ones, defaults to C<5>.
 
 =head2 max_redirects
 
@@ -709,19 +678,15 @@ before it starts closing the oldest cached ones, defaults to C<5>.
 Maximum number of redirects the user agent will follow before it fails,
 defaults to the value of the MOJO_MAX_REDIRECTS environment variable or C<0>.
 
-=head2 name
-
-  my $name = $ua->name;
-  $ua      = $ua->name('Mojolicious');
-
-Value for C<User-Agent> request header, defaults to C<Mojolicious (Perl)>.
+=head2 proxy
 
-=head2 no_proxy
+  my $proxy = $ua->proxy;
+  $ua       = $ua->proxy(Mojo::UserAgent::Proxy->new);
 
-  my $no_proxy = $ua->no_proxy;
-  $ua          = $ua->no_proxy([qw(localhost intranet.mojolicio.us)]);
+Proxy manager, defaults to a L<Mojo::UserAgent::Proxy> object.
 
-Domains that don't require a proxy server to be used.
+  # Detect proxy servers from environment
+  $ua->proxy->detect;
 
 =head2 request_timeout
 
@@ -737,47 +702,37 @@ 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 transactor
+=head2 server
 
-  my $t = $ua->transactor;
-  $ua   = $ua->transactor(Mojo::UserAgent::Transactor->new);
+  my $server = $ua->server;
+  $ua        = $ua->server(Mojo::UserAgent::Server->new);
 
-Transaction builder, defaults to a L<Mojo::UserAgent::Transactor> object.
-
-=head1 METHODS
-
-L<Mojo::UserAgent> inherits all methods from L<Mojo::EventEmitter> and
-implements the following new ones.
-
-=head2 app
-
-  my $app = Mojo::UserAgent->app;
-            Mojo::UserAgent->app(MyApp->new);
-  my $app = $ua->app;
-  $ua     = $ua->app(MyApp->new);
-
-Application relative URLs will be processed with, instance specific
-applications override the global default.
+Application server relative URLs will be processed with, defaults to a
+L<Mojo::UserAgent::Server> object.
 
   # Introspect
-  say $ua->app->secret;
+  say $ua->server->app->secret;
 
   # Change log level
-  $ua->app->log->level('fatal');
+  $ua->server->app->log->level('fatal');
+
+  # Port currently used for processing relative URLs
+  say $ua->server->url->port;
 
-  # Change application behavior
-  $ua->app->defaults(testing => 'oh yea!');
+=head2 transactor
 
-=head2 app_url
+  my $t = $ua->transactor;
+  $ua   = $ua->transactor(Mojo::UserAgent::Transactor->new);
 
-  my $url = $ua->app_url;
-  my $url = $ua->app_url('http');
-  my $url = $ua->app_url('https');
+Transaction builder, defaults to a L<Mojo::UserAgent::Transactor> object.
 
-Get absolute L<Mojo::URL> object for C<app> and switch protocol if necessary.
+  # Change name of user agent
+  $ua->transactor->name('MyUA 1.0');
 
-  # Port currently used for processing relative URLs
-  say $ua->app_url->port;
+=head1 METHODS
+
+L<Mojo::UserAgent> inherits all methods from L<Mojo::EventEmitter> and
+implements the following new ones.
 
 =head2 build_tx
 
@@ -814,7 +769,7 @@ L<Mojo::UserAgent::Transactor/"websocket">.
   my $tx = $ua->delete(
     'http://example.com' => {DNT => 1} => json => {a => 'b'});
 
-Perform blocking HTTP C<DELETE> request and return resulting
+Perform blocking DELETE request and return resulting
 L<Mojo::Transaction::HTTP> object, takes the same arguments as
 L<Mojo::UserAgent::Transactor/"tx"> (except for the method). You can also
 append a callback to perform requests non-blocking.
@@ -825,14 +780,6 @@ append a callback to perform requests non-blocking.
   });
   Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
 
-=head2 detect_proxy
-
-  $ua = $ua->detect_proxy;
-
-Check environment variables HTTP_PROXY, http_proxy, HTTPS_PROXY, https_proxy,
-NO_PROXY and no_proxy for proxy information. Automatic proxy detection can be
-enabled with the MOJO_PROXY environment variable.
-
 =head2 get
 
   my $tx = $ua->get('example.com');
@@ -840,10 +787,10 @@ enabled with the MOJO_PROXY environment variable.
   my $tx = $ua->get('http://example.com' => {DNT => 1} => form => {a => 'b'});
   my $tx = $ua->get('http://example.com' => {DNT => 1} => json => {a => 'b'});
 
-Perform blocking HTTP C<GET> request and return resulting
-L<Mojo::Transaction::HTTP> object, takes the same arguments as
-L<Mojo::UserAgent::Transactor/"tx"> (except for the method). You can also
-append a callback to perform requests non-blocking.
+Perform blocking GET request and return resulting L<Mojo::Transaction::HTTP>
+object, takes the same arguments as L<Mojo::UserAgent::Transactor/"tx">
+(except for the method). You can also append a callback to perform requests
+non-blocking.
 
   $ua->get('http://example.com' => sub {
     my ($ua, $tx) = @_;
@@ -860,10 +807,10 @@ append a callback to perform requests non-blocking.
   my $tx = $ua->head(
     'http://example.com' => {DNT => 1} => json => {a => 'b'});
 
-Perform blocking HTTP C<HEAD> request and return resulting
-L<Mojo::Transaction::HTTP> object, takes the same arguments as
-L<Mojo::UserAgent::Transactor/"tx"> (except for the method). You can also
-append a callback to perform requests non-blocking.
+Perform blocking HEAD request and return resulting L<Mojo::Transaction::HTTP>
+object, takes the same arguments as L<Mojo::UserAgent::Transactor/"tx">
+(except for the method). You can also append a callback to perform requests
+non-blocking.
 
   $ua->head('http://example.com' => sub {
     my ($ua, $tx) = @_;
@@ -871,12 +818,6 @@ append a callback to perform requests non-blocking.
   });
   Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
 
-=head2 need_proxy
-
-  my $success = $ua->need_proxy('intranet.example.com');
-
-Check if request for domain would use a proxy server.
-
 =head2 options
 
   my $tx = $ua->options('example.com');
@@ -886,7 +827,7 @@ Check if request for domain would use a proxy server.
   my $tx = $ua->options(
     'http://example.com' => {DNT => 1} => json => {a => 'b'});
 
-Perform blocking HTTP C<OPTIONS> request and return resulting
+Perform blocking OPTIONS request and return resulting
 L<Mojo::Transaction::HTTP> object, takes the same arguments as
 L<Mojo::UserAgent::Transactor/"tx"> (except for the method). You can also
 append a callback to perform requests non-blocking.
@@ -906,10 +847,10 @@ append a callback to perform requests non-blocking.
   my $tx = $ua->patch(
     'http://example.com' => {DNT => 1} => json => {a => 'b'});
 
-Perform blocking HTTP C<PATCH> request and return resulting
-L<Mojo::Transaction::HTTP> object, takes the same arguments as
-L<Mojo::UserAgent::Transactor/"tx"> (except for the method). You can also
-append a callback to perform requests non-blocking.
+Perform blocking PATCH request and return resulting L<Mojo::Transaction::HTTP>
+object, takes the same arguments as L<Mojo::UserAgent::Transactor/"tx">
+(except for the method). You can also append a callback to perform requests
+non-blocking.
 
   $ua->patch('http://example.com' => sub {
     my ($ua, $tx) = @_;
@@ -926,10 +867,10 @@ append a callback to perform requests non-blocking.
   my $tx = $ua->post(
     'http://example.com' => {DNT => 1} => json => {a => 'b'});
 
-Perform blocking HTTP C<POST> request and return resulting
-L<Mojo::Transaction::HTTP> object, takes the same arguments as
-L<Mojo::UserAgent::Transactor/"tx"> (except for the method). You can also
-append a callback to perform requests non-blocking.
+Perform blocking POST request and return resulting L<Mojo::Transaction::HTTP>
+object, takes the same arguments as L<Mojo::UserAgent::Transactor/"tx">
+(except for the method). You can also append a callback to perform requests
+non-blocking.
 
   $ua->post('http://example.com' => sub {
     my ($ua, $tx) = @_;
@@ -944,10 +885,10 @@ append a callback to perform requests non-blocking.
   my $tx = $ua->put('http://example.com' => {DNT => 1} => form => {a => 'b'});
   my $tx = $ua->put('http://example.com' => {DNT => 1} => json => {a => 'b'});
 
-Perform blocking HTTP C<PUT> request and return resulting
-L<Mojo::Transaction::HTTP> object, takes the same arguments as
-L<Mojo::UserAgent::Transactor/"tx"> (except for the method). You can also
-append a callback to perform requests non-blocking.
+Perform blocking PUT request and return resulting L<Mojo::Transaction::HTTP>
+object, takes the same arguments as L<Mojo::UserAgent::Transactor/"tx">
+(except for the method). You can also append a callback to perform requests
+non-blocking.
 
   $ua->put('http://example.com' => sub {
     my ($ua, $tx) = @_;

+20 -11

mojo/lib/Mojo/UserAgent/CookieJar.pm

View

@@ -19,12 +19,13 @@ sub add {
     next if length(defined $cookie->value ? $cookie->value : '') > $size;
 
     # Replace cookie
-    my $domain = $cookie->domain;
+    my $origin = defined $cookie->origin ? $cookie->origin : '';
+    next unless my $domain = lc(defined $cookie->domain ? $cookie->domain : $origin);
     $domain =~ s/^\.//;
-    my $path = $cookie->path;
-    my $name = $cookie->name;
-    my $jar  = $self->{jar}{$domain} ||= [];
-    @$jar = (grep({$_->path ne $path || $_->name ne $name} @$jar), $cookie);
+    next unless my $path = $cookie->path;
+    next unless length(my $name = defined $cookie->name ? $cookie->name : '');
+    my $jar = $self->{jar}{$domain} ||= [];
+    @$jar = (grep({_compare($_, $path, $name, $origin)} @$jar), $cookie);
   }
 
   return $self;
@@ -44,11 +45,10 @@ sub extract {
 
     # Validate domain
     my $host = $url->ihost;
-    my $domain = lc(defined $cookie->domain ? $cookie->domain : $host);
+    my $domain = lc(defined $cookie->domain ? $cookie->domain : $cookie->origin($host)->origin);
     $domain =~ s/^\.//;
     next
       if $host ne $domain && ($host !~ /\Q.$domain\E$/ || $host =~ /\.\d+$/);
-    $cookie->domain($domain);
 
     # Validate path
     my $path = defined $cookie->path ? $cookie->path : $url->path->to_dir->to_abs_string;
@@ -61,7 +61,7 @@ sub extract {
 sub find {
   my ($self, $url) = @_;
 
-  return unless my $domain = $url->ihost;
+  return unless my $domain = my $host = $url->ihost;
   my $path = $url->path->to_abs_string;
   my @found;
   while ($domain =~ /[^.]+\.[^.]+|localhost$/) {
@@ -70,6 +70,7 @@ sub find {
     # Grab cookies
     my $new = $self->{jar}{$domain} = [];
     for my $cookie (@$old) {
+      next unless $cookie->domain || $host eq $cookie->origin;
 
       # Check if cookie has expired
       my $expires = $cookie->expires;
@@ -98,10 +99,18 @@ sub inject {
   $req->cookies($self->find($req->url));
 }
 
+sub _compare {
+  my ($cookie, $path, $name, $origin) = @_;
+  return 1 if $cookie->path ne $path || $cookie->name ne $name;
+  return (defined $cookie->origin ? $cookie->origin : '') ne $origin;
+}
+
 sub _path { $_[0] eq '/' || $_[0] eq $_[1] || $_[1] =~ m!^\Q$_[0]/! }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::UserAgent::CookieJar - Cookie jar for HTTP user agents
@@ -169,19 +178,19 @@ Empty the jar.
 
 =head2 extract
 
-  $jar->extract($tx);
+  $jar->extract(Mojo::Transaction::HTTP->new);
 
 Extract response cookies from transaction.
 
 =head2 find
 
-  my @cookies = $jar->find($url);
+  my @cookies = $jar->find(Mojo::URL->new);
 
 Find L<Mojo::Cookie::Request> objects in the jar for L<Mojo::URL> object.
 
 =head2 inject
 
-  $jar->inject($tx);
+  $jar->inject(Mojo::Transaction::HTTP->new);
 
 Inject request cookies into transaction.
 

+109

mojo/lib/Mojo/UserAgent/Proxy.pm

View

...	...	@@ -0,0 +1,109 @@
	1	+package Mojo::UserAgent::Proxy;
	2	+use Mojo::Base -base;
	3	+
	4	+has [qw(http https not)];
	5	+
	6	+sub detect {
	7	+ my $self = shift;
	8	+ $self->http($ENV{HTTP_PROXY} \|\| $ENV{http_proxy});
	9	+ $self->https($ENV{HTTPS_PROXY} \|\| $ENV{https_proxy});
	10	+ return $self->not([split /,/, $ENV{NO_PROXY} \|\| $ENV{no_proxy} \|\| '']);
	11	+}
	12	+
	13	+sub inject {
	14	+ my ($self, $tx) = @_;
	15	+
	16	+ $self->detect if $ENV{MOJO_PROXY};
	17	+ my $req = $tx->req;
	18	+ my $url = $req->url;
	19	+ return if !$self->is_needed($url->host) \|\| defined $req->proxy;
	20	+
	21	+ # HTTP proxy
	22	+ my $proto = $url->protocol;
	23	+ my $http = $self->http;
	24	+ $req->proxy($http) if $http && $proto eq 'http';
	25	+
	26	+ # HTTPS proxy
	27	+ my $https = $self->https;
	28	+ $req->proxy($https) if $https && $proto eq 'https';
	29	+}
	30	+
	31	+sub is_needed {
	32	+ !grep { $_[1] =~ /\Q$_\E$/ } @{$_[0]->not \|\| []};
	33	+}
	34	+
	35	+1;
	36	+
	37	+=encoding utf8
	38	+
	39	+=head1 NAME
	40	+
	41	+Mojo::UserAgent::Proxy - User agent proxy manager
	42	+
	43	+=head1 SYNOPSIS
	44	+
	45	+ use Mojo::UserAgent::Proxy;
	46	+
	47	+ my $proxy = Mojo::UserAgent::Proxy->new;
	48	+ $proxy->detect;
	49	+ say $proxy->http;
	50	+
	51	+=head1 DESCRIPTION
	52	+
	53	+L<Mojo::UserAgent::Proxy> manages proxy servers for L<Mojo::UserAgent>.
	54	+
	55	+=head1 ATTRIBUTES
	56	+
	57	+L<Mojo::UserAgent::Proxy> implements the following attributes.
	58	+
	59	+=head2 http
	60	+
	61	+ my $http = $ua->http;
	62	+ $ua = $ua->http('http://sri:secret@127.0.0.1:8080');
	63	+
	64	+Proxy server to use for HTTP and WebSocket requests.
	65	+
	66	+=head2 https
	67	+
	68	+ my $https = $ua->https;
	69	+ $ua = $ua->https('http://sri:secret@127.0.0.1:8080');
	70	+
	71	+Proxy server to use for HTTPS and WebSocket requests.
	72	+
	73	+=head2 not
	74	+
	75	+ my $not = $proxy->not;
	76	+ $ua = $proxy->not([qw(localhost intranet.mojolicio.us)]);
	77	+
	78	+Domains that don't require a proxy server to be used.
	79	+
	80	+=head1 METHODS
	81	+
	82	+L<Mojo::UserAgent::Proxy> inherits all methods from L<Mojo::Base> and
	83	+implements the following new ones.
	84	+
	85	+=head2 detect
	86	+
	87	+ $proxy = $proxy->detect;
	88	+
	89	+Check environment variables HTTP_PROXY, http_proxy, HTTPS_PROXY, https_proxy,
	90	+NO_PROXY and no_proxy for proxy information. Automatic proxy detection can be
	91	+enabled with the MOJO_PROXY environment variable.
	92	+
	93	+=head2 inject
	94	+
	95	+ $proxy->inject(Mojo::Transaction::HTTP->new);
	96	+
	97	+Inject proxy server information into transaction.
	98	+
	99	+=head2 is_needed
	100	+
	101	+ my $bool = $proxy->is_needed('intranet.example.com');
	102	+
	103	+Check if request for domain would use a proxy server.
	104	+
	105	+=head1 SEE ALSO
	106	+
	107	+L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicio.us>.
	108	+
	109	+=cut

+115

mojo/lib/Mojo/UserAgent/Server.pm

View

...	...	@@ -0,0 +1,115 @@
	1	+package Mojo::UserAgent::Server;
	2	+use Mojo::Base -base;
	3	+
	4	+use Mojo::IOLoop;
	5	+use Mojo::Server::Daemon;
	6	+
	7	+has ioloop => sub { Mojo::IOLoop->singleton };
	8	+
	9	+sub app {
	10	+ my ($self, $app) = @_;
	11	+
	12	+ # Singleton application
	13	+ our $state_singleton;
	14	+ return $state_singleton = $app ? $app : $state_singleton unless ref $self;
	15	+
	16	+ # Default to singleton application
	17	+ return $self->{app} \|\| $state_singleton unless $app;
	18	+ $self->{app} = $app;
	19	+ return $self;
	20	+}
	21	+
	22	+sub restart { shift->_restart(1) }
	23	+
	24	+sub url {
	25	+ my $self = shift;
	26	+ $self->_restart(0, @_)
	27	+ if !$self->{server} \|\| $self->{server}->ioloop ne $self->ioloop \|\| @_;
	28	+ return Mojo::URL->new("$self->{proto}://localhost:$self->{port}/");
	29	+}
	30	+
	31	+sub _restart {
	32	+ my ($self, $full, $proto) = @_;
	33	+
	34	+ my $server = $self->{server} = Mojo::Server::Daemon->new(
	35	+ app => $self->app,
	36	+ ioloop => $self->ioloop,
	37	+ silent => 1
	38	+ );
	39	+ delete $self->{port} if $full;
	40	+ die "Couldn't find a free TCP port for application.\n"
	41	+ unless my $port = $self->{port} \|\|= Mojo::IOLoop->generate_port;
	42	+ $self->{proto} = $proto \|\|= 'http';
	43	+ $server->listen(["$proto://127.0.0.1:$port"])->start;
	44	+}
	45	+
	46	+1;
	47	+
	48	+=encoding utf8
	49	+
	50	+=head1 NAME
	51	+
	52	+Mojo::UserAgent::Server - Application server
	53	+
	54	+=head1 SYNOPSIS
	55	+
	56	+ use Mojo::UserAgent::Server;
	57	+
	58	+ my $server = Mojo::UserAgent::Server->new;
	59	+ say $server->url;
	60	+
	61	+=head1 DESCRIPTION
	62	+
	63	+L<Mojo::UserAgent::Server> is an embedded web server based on
	64	+L<Mojo::Server::Daemon> that processes requests for L<Mojo::UserAgent>.
	65	+
	66	+=head1 ATTRIBUTES
	67	+
	68	+L<Mojo::UserAgent::Server> implements the following attributes.
	69	+
	70	+=head2 ioloop
	71	+
	72	+ my $loop = $server->ioloop;
	73	+ $server = $server->ioloop(Mojo::IOLoop->new);
	74	+
	75	+Event loop object to use for I/O operations, defaults to the global
	76	+L<Mojo::IOLoop> singleton.
	77	+
	78	+=head1 METHODS
	79	+
	80	+L<Mojo::UserAgent::Server> inherits all methods from L<Mojo::Base> and
	81	+implements the following new ones.
	82	+
	83	+=head2 app
	84	+
	85	+ my $app = Mojo::UserAgent::Server->app;
	86	+ Mojo::UserAgent::Server->app(MyApp->new);
	87	+ my $app = $server->app;
	88	+ $server = $server->app(MyApp->new);
	89	+
	90	+Application this server handles, instance specific applications override the
	91	+global default.
	92	+
	93	+ # Change application behavior
	94	+ $server->defaults(testing => 'oh yea!');
	95	+
	96	+=head2 restart
	97	+
	98	+ $server->restart;
	99	+
	100	+Restart server with new port.
	101	+
	102	+=head2 url
	103	+
	104	+ my $url = $ua->url;
	105	+ my $url = $ua->url('http');
	106	+ my $url = $ua->url('https');
	107	+
	108	+Get absolute L<Mojo::URL> object for L</"app"> and switch protocol if
	109	+necessary.
	110	+
	111	+=head1 SEE ALSO
	112	+
	113	+L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicio.us>.
	114	+
	115	+=cut

+59 -37

mojo/lib/Mojo/UserAgent/Transactor.pm

View

@@ -13,12 +13,8 @@ use Mojo::Transaction::WebSocket;
 use Mojo::URL;
 use Mojo::Util 'encode';
 
-has generators => sub { {} };
-
-sub new {
-  my $self = shift->SUPER::new(@_);
-  return $self->add_generator(form => \&_form)->add_generator(json => \&_json);
-}
+has generators => sub { {form => \&_form, json => \&_json} };
+has name => 'Mojolicious (Perl)';
 
 sub add_generator {
   my ($self, $name, $cb) = @_;
@@ -107,8 +103,11 @@ sub tx {
   $url = "http://$url" unless $url =~ m!^/|://!;
   ref $url ? $req->url($url) : $req->url->parse($url);
 
-  # Headers
-  $req->headers->from_hash(shift) if ref $_[0] eq 'HASH';
+  # Headers (we identify ourselves and accept gzip compression)
+  my $headers = $req->headers;
+  $headers->from_hash(shift) if ref $_[0] eq 'HASH';
+  $headers->user_agent($self->name) unless $headers->user_agent;
+  $headers->accept_encoding('gzip') unless $headers->accept_encoding;
 
   # Generator
   if (@_ > 1) {
@@ -253,6 +252,8 @@ sub _proxy {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::UserAgent::Transactor - User agent transactor
@@ -268,7 +269,7 @@ Mojo::UserAgent::Transactor - User agent transactor
   # PATCH request with "Do Not Track" header and content
   say $t->tx(PATCH => 'example.com' => {DNT => 1} => 'Hi!')->req->to_string;
 
-  # POST request with form data
+  # POST request with form-data
   say $t->tx(POST => 'example.com' => form => {a => 'b'})->req->to_string;
 
   # PUT request with JSON data
@@ -288,19 +289,21 @@ L<Mojo::UserAgent::Transactor> implements the following attributes.
   my $generators = $t->generators;
   $t             = $t->generators({foo => sub {...}});
 
-Registered content generators.
+Registered content generators, by default only C<form> and C<json> are already
+defined.
 
-=head1 METHODS
+=head2 name
 
-L<Mojo::UserAgent::Transactor> inherits all methods from L<Mojo::Base> and
-implements the following new ones.
+  my $name = $t->name;
+  $t       = $t->name('Mojolicious');
 
-=head2 new
+Value for C<User-Agent> request header of generated transactions, defaults to
+C<Mojolicious (Perl)>.
 
-  my $t = Mojo::UserAgent::Transactor->new;
+=head1 METHODS
 
-Construct a new transactor and register C<form> and C<json> content
-generators.
+L<Mojo::UserAgent::Transactor> inherits all methods from L<Mojo::Base> and
+implements the following new ones.
 
 =head2 add_generator
 
@@ -351,51 +354,70 @@ C<307> or C<308> redirect response if possible.
 Versatile general purpose L<Mojo::Transaction::HTTP> transaction builder for
 requests, with support for content generators.
 
-  # Inspect generated request
+  # Generate and inspect custom GET request with DNT header and content
   say $t->tx(GET => 'example.com' => {DNT => 1} => 'Bye!')->req->to_string;
 
-  # Streaming response
+  # Use a custom socket for processing this transaction
   my $tx = $t->tx(GET => 'http://example.com');
-  $tx->res->content->unsubscribe('read')->on(read => sub { say $_[1] });
+  $tx->connection($sock);
 
-  # Custom socket
+  # Stream response content to STDOUT
   my $tx = $t->tx(GET => 'http://example.com');
-  $tx->connection($sock);
+  $tx->res->content->unsubscribe('read')->on(read => sub { say $_[1] });
 
-  # Generate query parameters
+  # PUT request with content streamed from file
+  my $tx = $t->tx(PUT => 'http://example.com');
+  $tx->req->content->asset(Mojo::Asset::File->new(path => '/foo.txt'));
+
+  # GET request with query parameters
   my $tx = $t->tx(GET => 'http://example.com' => form => {a => 'b'});
 
-  # Use form generator with custom charset
+  # POST request with "application/json" content
   my $tx = $t->tx(
-    PUT => 'http://example.com' => form => {a => 'b'} => charset => 'UTF-8');
+    POST => 'http://example.com' => json => {a => 'b', c => [1, 2, 3]});
 
-  # Multiple form values with the same name
-  my $tx = $t->tx(PUT => 'http://example.com' => form => {a => [qw(b c d)]});
+  # POST request with "application/x-www-form-urlencoded" content
+  my $tx = $t->tx(
+    POST => 'http://example.com' => form => {a => 'b', c => 'd'});
 
-  # Multipart upload streamed from file
+  # PUT request with UTF-8 encoded form values
   my $tx = $t->tx(
-    PUT => 'http://example.com' => form => {mytext => {file => '/foo.txt'}});
+    PUT => 'http://example.com' => form => {a => 'b'} => charset => 'UTF-8');
+
+  # POST request with form values sharing the same name
+  my $tx = $t->tx(POST => 'http://example.com' => form => {a => [qw(b c d)]});
 
-  # Multipart upload with in-memory content
+  # POST request with "multipart/form-data" content
   my $tx = $t->tx(
     POST => 'http://example.com' => form => {mytext => {content => 'lala'}});
 
-  # Upload multiple files with same name
+  # POST request with upload streamed from file
+  my $tx = $t->tx(
+    POST => 'http://example.com' => form => {mytext => {file => '/foo.txt'}});
+
+  # POST request with upload streamed from asset
+  my $asset = Mojo::Asset::Memory->new->add_chunk('lalala');
+  my $tx    = $t->tx(
+    POST => 'http://example.com' => form => {mytext => {file => $asset}});
+
+  # POST request with multiple files sharing the same name
   my $tx = $t->tx(POST => 'http://example.com' =>
     form => {mytext => [{content => 'first'}, {content => 'second'}]});
 
-  # Customized upload with filename and header
+  # POST request with form values and customized upload (filename and header)
   my $tx = $t->tx(POST => 'http://example.com' => form => {
-    myzip => {
-      file           => Mojo::Asset::Memory->new->add_chunk('lalala'),
-      filename       => 'foo.zip',
+    a      => 'b',
+    c      => 'd',
+    mytext => {
+      content        => 'lalala',
+      filename       => 'foo.txt',
       'Content-Type' => 'text/plain'
     }
   });
 
 The C<form> content generator will automatically use query parameters for
-C<GET>/C<HEAD> requests and the "application/x-www-form-urlencoded" content
-type for everything else. Both get upgraded automatically to using the
+GET/HEAD requests and the "application/x-www-form-urlencoded" content type for
+everything else. Both get upgraded automatically to using the
 "multipart/form-data" content type when necessary or when the header has been
 set manually.
 

+108 -78

mojo/lib/Mojo/Util.pm

View

@@ -2,8 +2,9 @@ package Mojo::Util;
 use Mojo::Base 'Exporter';
 
 use Carp qw(carp croak);
+use Data::Dumper ();
 use Digest::MD5 qw(md5 md5_hex);
-BEGIN {eval {require Digest::SHA; import Digest::SHA qw(sha1 sha1_hex)}}
+BEGIN {eval {require Digest::SHA; import Digest::SHA qw(hmac_sha1 sha1 sha1_hex)}}
 use Encode 'find_encoding';
 use File::Basename 'dirname';
 use File::Spec::Functions 'catfile';
@@ -25,7 +26,7 @@ use constant {
   PC_INITIAL_N    => 128
 };
 
-# To update HTML5 entities run this command
+# To update HTML entities run this command
 # perl examples/entities.pl > lib/Mojo/entities.txt
 my %ENTITIES;
 for my $line (split "\x0a", slurp(catfile dirname(__FILE__), 'entities.txt')) {
@@ -38,10 +39,10 @@ my %CACHE;
 
 our @EXPORT_OK = (
   qw(b64_decode b64_encode camelize class_to_file class_to_path decamelize),
-  qw(decode deprecated encode get_line hmac_sha1_sum html_unescape md5_bytes),
-  qw(md5_sum monkey_patch punycode_decode punycode_encode quote),
-  qw(secure_compare sha1_bytes sha1_sum slurp spurt squish steady_time trim),
-  qw(unquote url_escape url_unescape xml_escape xor_encode)
+  qw(decode deprecated dumper encode get_line 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 split_header spurt squish),
+  qw(steady_time trim unquote url_escape url_unescape xml_escape xor_encode)
 );
 
 sub b64_decode { decode_base64($_[0]) }
@@ -51,7 +52,7 @@ sub camelize {
   my $str = shift;
   return $str if $str =~ /^[A-Z]/;
 
-  # Camel case words
+  # CamelCase words
   return join '::', map {
     join '', map { ucfirst lc } split /_/, $_
   } split /-/, $str;
@@ -74,7 +75,7 @@ sub decamelize {
   my @parts;
   for my $part (split /::/, $str) {
 
-    # Snake case words
+    # snake_case words
     my @words;
     push @words, lc $1 while $part =~ s/([A-Z]{1}[^A-Z]*)//;
     push @parts, join '_', @words;
@@ -95,6 +96,8 @@ sub deprecated {
   $ENV{MOJO_FATAL_DEPRECATIONS} ? croak(@_) : carp(@_);
 }
 
+sub dumper { Data::Dumper->new([@_])->Indent(1)->Sortkeys(1)->Terse(1)->Dump }
+
 sub encode { _encoding($_[0])->encode("$_[1]") }
 
 sub get_line {
@@ -109,21 +112,12 @@ sub get_line {
   return $line;
 }
 
-sub hmac_sha1_sum {
-  my ($str, $secret) = @_;
-  $secret = $secret ? "$secret" : 'Very insecure!';
-  $secret = sha1 $secret if length $secret > 64;
-
-  my $ipad = $secret ^ (chr(0x36) x 64);
-  my $opad = $secret ^ (chr(0x5c) x 64);
-  return unpack 'H*', sha1($opad . sha1($ipad . $str));
-}
+sub hmac_sha1_sum { unpack 'H*', hmac_sha1(@_) }
 
 sub html_unescape {
   my $str = shift;
   return $str if index($str, '&') == -1;
-  $str
-    =~ s/&(?:\#((?:\d{1,7}|x[[:xdigit:]]{1,6}));|(\w+;?))/_decode($1, $2)/ge;
+  $str =~ s/&(?:\#((?:\d{1,7}|x[0-9a-fA-F]{1,6}));|(\w+;?))/_decode($1, $2)/ge;
   return $str;
 }
 
@@ -142,36 +136,32 @@ sub punycode_decode {
   my $input = shift;
   use integer;
 
-  # 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;
+
+  # Consume all code points before the last delimiter
+  push @output, split //, $1 if $input =~ s/(.*)\x2d//s;
+
   while (length $input) {
     my $oldi = $i;
     my $w    = 1;
 
     # Base to infinity in steps of base
     for (my $k = PC_BASE; 1; $k += PC_BASE) {
-
-      # Digit
       my $digit = ord substr $input, 0, 1, '';
       $digit = $digit < 0x40 ? $digit + (26 - 0x30) : ($digit & 0x1f) - 1;
       $i += $digit * $w;
       my $t = $k - $bias;
       $t = $t < PC_TMIN ? PC_TMIN : $t > PC_TMAX ? PC_TMAX : $t;
       last if $digit < $t;
-
-      $w *= (PC_BASE - $t);
+      $w *= PC_BASE - $t;
     }
 
-    # Bias
     $bias = _adapt($i - $oldi, @output + 1, $oldi == 0);
     $n += $i / (@output + 1);
     $i = $i % (@output + 1);
-
     splice @output, $i++, 0, chr $n;
   }
 
@@ -183,35 +173,28 @@ sub punycode_encode {
   my $output = shift;
   use integer;
 
-  # Split input
+  my $n     = PC_INITIAL_N;
+  my $delta = 0;
+  my $bias  = PC_INITIAL_BIAS;
+
+  # Extract basic code points
   my $len   = length $output;
   my @input = map {ord} split //, $output;
   my @chars = sort grep { $_ >= PC_INITIAL_N } @input;
-
-  # Handle non-basic characters
   $output =~ s/[^\x00-\x7f]+//gs;
   my $h = my $b = length $output;
   $output .= "\x2d" if $b > 0;
 
-  my $n     = PC_INITIAL_N;
-  my $delta = 0;
-  my $bias  = PC_INITIAL_BIAS;
   for my $m (@chars) {
-
-    # Basic character
     next if $m < $n;
-
-    # Walk all code points in order
     $delta += ($m - $n) * ($h + 1);
     $n = $m;
+
     for (my $i = 0; $i < $len; $i++) {
       my $c = $input[$i];
 
-      # Basic character
-      $delta++ if $c < $n;
-
-      # Non basic character
-      if ($c == $n) {
+      if ($c < $n) { $delta++ }
+      elsif ($c == $n) {
         my $q = $delta;
 
         # Base to infinity in steps of base
@@ -219,18 +202,12 @@ sub punycode_encode {
           my $t = $k - $bias;
           $t = $t < PC_TMIN ? PC_TMIN : $t > PC_TMAX ? PC_TMAX : $t;
           last if $q < $t;
-
-          # Code point for digit "t"
           my $o = $t + (($q - $t) % (PC_BASE - $t));
           $output .= chr $o + ($o < 26 ? 0x61 : 0x30 - 26);
-
           $q = ($q - $t) / (PC_BASE - $t);
         }
 
-        # Code point for digit "q"
         $output .= chr $q + ($q < 26 ? 0x61 : 0x30 - 26);
-
-        # Bias
         $bias = _adapt($delta, $h + 1, $h == $b);
         $delta = 0;
         $h++;
@@ -269,6 +246,26 @@ sub slurp {
   return $content;
 }
 
+sub split_header {
+  my $str = shift;
+
+  my (@tree, @token);
+  while ($str =~ s/^[,;\s]*([^=;, ]+)\s*//) {
+    push @token, $1, undef;
+    $token[-1] = unquote($1)
+      if $str =~ s/^=\s*("(?:\\\\|\\"|[^"])*"|[^;, ]*)\s*//;
+
+    # Separator
+    $str =~ s/^;\s*//;
+    next unless $str =~ s/^,\s*//;
+    push @tree, [@token];
+    @token = ();
+  }
+
+  # Take care of final token
+  return [@token ? (@tree, \@token) : @tree];
+}
+
 sub spurt {
   my ($content, $path) = @_;
   croak qq{Can't open file "$path": $!} unless open my $file, '>', $path;
@@ -313,7 +310,7 @@ sub url_escape {
 sub url_unescape {
   my $str = shift;
   return $str if index($str, '%') == -1;
-  $str =~ s/%([[:xdigit:]]{2})/chr(hex($1))/ge;
+  $str =~ s/%([0-9a-fA-F]{2})/chr(hex($1))/ge;
   return $str;
 }
 
@@ -342,8 +339,8 @@ sub xor_encode {
 
 sub _adapt {
   my ($delta, $numpoints, $firsttime) = @_;
-
   use integer;
+
   $delta = $firsttime ? $delta / PC_DAMP : $delta / 2;
   $delta += $delta / $numpoints;
   my $k = 0;
@@ -376,6 +373,8 @@ sub _encoding {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojo::Util - Portable utility functions
@@ -399,22 +398,22 @@ L<Mojo::Util> implements the following functions.
 
 =head2 b64_decode
 
-  my $str = b64_decode $b64;
+  my $bytes = b64_decode $b64;
 
-Base64 decode string.
+Base64 decode bytes.
 
 =head2 b64_encode
 
-  my $b64 = b64_encode $str;
-  my $b64 = b64_encode $str, "\n";
+  my $b64 = b64_encode $bytes;
+  my $b64 = b64_encode $bytes, "\n";
 
-Base64 encode string, the line ending defaults to a newline.
+Base64 encode bytes, the line ending defaults to a newline.
 
 =head2 camelize
 
   my $camelcase = camelize $snakecase;
 
-Convert snake case string to camel case and replace C<-> with C<::>.
+Convert snake_case string to CamelCase and replace C<-> with C<::>.
 
   # "FooBar"
   camelize 'foo_bar';
@@ -431,10 +430,17 @@ Convert snake case string to camel case and replace C<-> with C<::>.
 
 Convert a class name to a file.
 
-  Foo::Bar -> foo_bar
-  FOO::Bar -> foobar
-  FooBar   -> foo_bar
-  FOOBar   -> foobar
+  # "foo_bar"
+  class_to_file 'Foo::Bar';
+
+  # "foobar"
+  class_to_file 'FOO::Bar';
+
+  # "foo_bar"
+  class_to_file 'FooBar';
+
+  # "foobar"
+  class_to_file 'FOOBar';
 
 =head2 class_to_path
 
@@ -442,14 +448,17 @@ Convert a class name to a file.
 
 Convert class name to path.
 
-  Foo::Bar -> Foo/Bar.pm
-  FooBar   -> FooBar.pm
+  # "Foo/Bar.pm"
+  class_to_path 'Foo::Bar';
+
+  # "FooBar.pm"
+  class_to_path 'FooBar';
 
 =head2 decamelize
 
   my $snakecase = decamelize $camelcase;
 
-Convert camel case string to snake case and replace C<::> with C<->.
+Convert CamelCase string to snake_case and replace C<::> with C<->.
 
   # "foo_bar"
   decamelize 'FooBar';
@@ -473,6 +482,12 @@ Decode bytes to characters and return C<undef> if decoding failed.
 Warn about deprecated feature from perspective of caller. You can also set the
 MOJO_FATAL_DEPRECATIONS environment variable to make them die instead.
 
+=head2 dumper
+
+  my $perl = dumper {some => 'data'};
+
+Dump a Perl data structure with L<Data::Dumper>.
+
 =head2 encode
 
   my $bytes = encode 'UTF-8', $chars;
@@ -488,9 +503,9 @@ with C<0x0d 0x0a> or C<0x0a>.
 
 =head2 hmac_sha1_sum
 
-  my $checksum = hmac_sha1_sum $str, 'passw0rd';
+  my $checksum = hmac_sha1_sum $bytes, 'passw0rd';
 
-Generate HMAC-SHA1 checksum for string.
+Generate HMAC-SHA1 checksum for bytes.
 
 =head2 html_unescape
 
@@ -500,15 +515,15 @@ Unescape all HTML entities in string.
 
 =head2 md5_bytes
 
-  my $checksum = md5_bytes $str;
+  my $checksum = md5_bytes $bytes;
 
-Generate binary MD5 checksum for string.
+Generate binary MD5 checksum for bytes.
 
 =head2 md5_sum
 
-  my $checksum = md5_sum $str;
+  my $checksum = md5_sum $bytes;
 
-Generate MD5 checksum for string.
+Generate MD5 checksum for bytes.
 
 =head2 monkey_patch
 
@@ -542,31 +557,46 @@ Quote string.
 
 =head2 secure_compare
 
-  my $success = secure_compare $str1, $str2;
+  my $bool = secure_compare $str1, $str2;
 
 Constant time comparison algorithm to prevent timing attacks.
 
 =head2 sha1_bytes
 
-  my $checksum = sha1_bytes $str;
+  my $checksum = sha1_bytes $bytes;
 
-Generate binary SHA1 checksum for string.
+Generate binary SHA1 checksum for bytes.
 
 =head2 sha1_sum
 
-  my $checksum = sha1_sum $str;
+  my $checksum = sha1_sum $bytes;
 
-Generate SHA1 checksum for string.
+Generate SHA1 checksum for bytes.
 
 =head2 slurp
 
-  my $content = slurp '/etc/passwd';
+  my $bytes = slurp '/etc/passwd';
 
 Read all data at once from file.
 
+=head2 split_header
+
+   my $tree = split_header 'foo="bar baz"; test=123, yada';
+
+Split HTTP header value.
+
+  # "one"
+  split_header('one; two="three four", five=six')->[0][0];
+
+  # "three four"
+  split_header('one; two="three four", five=six')->[0][3];
+
+  # "five"
+  split_header('one; two="three four", five=six')->[1][0];
+
 =head2 spurt
 
-  $content = spurt $content, '/etc/passwd';
+  $bytes = spurt $bytes, '/etc/passwd';
 
 Write all data at once to file.
 

+181 -150

mojo/lib/Mojolicious.pm

View

@@ -4,7 +4,7 @@ use Mojo::Base 'Mojo';
 # "Fry: Shut up and take my money!"
 use Carp 'croak';
 use Mojo::Exception;
-use Mojo::Util 'decamelize';
+use Mojo::Util qw(decamelize deprecated);
 use Mojolicious::Commands;
 use Mojolicious::Controller;
 use Mojolicious::Plugins;
@@ -13,6 +13,7 @@ use Mojolicious::Routes;
 use Mojolicious::Sessions;
 use Mojolicious::Static;
 use Mojolicious::Types;
+use Mojolicious::Validator;
 use Scalar::Util qw(blessed weaken);
 use Time::HiRes 'gettimeofday';
 
@@ -36,12 +37,13 @@ has secret   => sub {
   # Default to moniker
   return $self->moniker;
 };
-has sessions => sub { Mojolicious::Sessions->new };
-has static   => sub { Mojolicious::Static->new };
-has types    => sub { Mojolicious::Types->new };
+has sessions  => sub { Mojolicious::Sessions->new };
+has static    => sub { Mojolicious::Static->new };
+has types     => sub { Mojolicious::Types->new };
+has validator => sub { Mojolicious::Validator->new };
 
 our $CODENAME = 'Top Hat';
-our $VERSION  = '4.07';
+our $VERSION  = '4.57';
 
 sub AUTOLOAD {
   my $self = shift;
@@ -69,11 +71,11 @@ sub new {
   my $r = $self->routes->namespaces([ref $self]);
 
   # Hide controller attributes/methods and "handler"
-  $r->hide(qw(AUTOLOAD DESTROY app cookie finish flash handler on param));
-  $r->hide(qw(redirect_to render render_exception render_maybe));
+  $r->hide(qw(app continue cookie finish flash handler match on param));
+  $r->hide(qw(redirect_to render render_exception render_later render_maybe));
   $r->hide(qw(render_not_found render_static rendered req res respond_to));
-  $r->hide(qw(send session signed_cookie stash tx ua url_for write));
-  $r->hide('write_chunk');
+  $r->hide(qw(send session signed_cookie stash tx url_for validation write));
+  $r->hide(qw(write_chunk));
 
   # Check if we have a log directory
   my $mode = $self->mode;
@@ -89,9 +91,13 @@ sub new {
   # Reduced log output outside of development mode
   $self->log->level('info') unless $mode eq 'development';
 
-  # Run mode before startup
-  if (my $sub = $self->can("${mode}_mode")) { $self->$sub(@_) }
-  $self->startup(@_);
+  # DEPRECATED in Top Hat!
+  if (my $sub = $self->can("${mode}_mode")) {
+    deprecated qq{"sub ${mode}_mode {...}" in application class is DEPRECATED};
+    $self->$sub;
+  }
+
+  $self->startup;
 
   return $self;
 }
@@ -154,6 +160,7 @@ sub handler {
 
   # Dispatcher has to be last in the chain
   ++$self->{dispatch}
+    and $self->hook(around_action   => sub { $_[2]->($_[1]) })
     and $self->hook(around_dispatch => sub { $_[1]->app->dispatch($_[1]) })
     unless $self->{dispatch};
 
@@ -162,7 +169,7 @@ sub handler {
 
   # Delayed response
   $self->log->debug('Nothing has been rendered, expecting delayed response.')
-    unless $stash->{'mojo.rendered'} || $tx->is_writing;
+    unless $tx->is_writing;
 }
 
 sub helper {
@@ -193,6 +200,8 @@ sub _exception {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious - Real-time web framework
@@ -223,6 +232,131 @@ Mojolicious - Real-time web framework
 
 Take a look at our excellent documentation in L<Mojolicious::Guides>!
 
+=head1 HOOKS
+
+L<Mojolicious> will emit the following hooks in the listed order.
+
+=head2 after_build_tx
+
+Emitted right after the transaction is built and before the HTTP request gets
+parsed.
+
+  $app->hook(after_build_tx => sub {
+    my ($tx, $app) = @_;
+    ...
+  });
+
+This is a very powerful hook and should not be used lightly, it makes some
+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)
+
+=head2 before_dispatch
+
+Emitted right before the static file server and router start their work.
+
+  $app->hook(before_dispatch => sub {
+    my $c = shift;
+    ...
+  });
+
+Very useful for rewriting incoming requests and other preprocessing tasks.
+(Passed the default controller object)
+
+=head2 after_static
+
+Emitted after a static file response has been generated by the static file
+server.
+
+  $app->hook(after_static => sub {
+    my $c = shift;
+    ...
+  });
+
+Mostly used for post-processing static file responses. (Passed the default
+controller object)
+
+=head2 before_routes
+
+Emitted after the static file server determined 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)
+
+=head2 around_action
+
+Emitted right before an action gets invoked and wraps around it, so you have
+to manually forward to the next hook if you want to continue the chain.
+Default action dispatching is the last hook in the chain, yours will run
+before it.
+
+  $app->hook(around_action => sub {
+    my ($next, $c, $action, $last) = @_;
+    ...
+    return $next->();
+  });
+
+This is a very powerful hook and should not be used lightly, it allows you for
+example to pass additional arguments to actions or handle return values
+differently. (Passed a callback leading to the next hook, the current
+controller object, the action callback and a flag indicating if this action is
+an endpoint)
+
+=head2 after_render
+
+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)
+
+=head2 after_dispatch
+
+Emitted in reverse order after a response has been rendered. 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_dispatch => sub {
+    my $c = shift;
+    ...
+  });
+
+Useful for rewriting outgoing responses and other post-processing tasks.
+(Passed the current controller object)
+
+=head2 around_dispatch
+
+Emitted right before the L</"before_dispatch"> hook and wraps around the whole
+dispatch process, so you have to manually forward to the next hook if you want
+to continue the chain. Default exception handling with
+L<Mojolicious::Controller/"render_exception"> is the first hook in the chain
+and a call to L</"dispatch"> the last, yours will be in between.
+
+  $app->hook(around_dispatch => sub {
+    my ($next, $c) = @_;
+    ...
+    $next->();
+    ...
+  });
+
+This is a very powerful hook and should not be used lightly, it allows you for
+example to customize application wide exception handling, consider it the
+sledgehammer in your toolbox. (Passed a callback leading to the next hook and
+the default controller object)
+
 =head1 ATTRIBUTES
 
 L<Mojolicious> inherits all attributes from L<Mojo> and implements the
@@ -253,24 +387,10 @@ L<Mojolicious::Controller>.
   $app     = $app->mode('production');
 
 The operating mode for your application, defaults to a value from the
-MOJO_MODE and PLACK_ENV environment variables or C<development>. You can also
-add per mode logic to your application by defining methods named
-C<${mode}_mode> in the application class, which will be called right before
-C<startup>.
-
-  sub development_mode {
-    my $self = shift;
-    ...
-  }
-
-  sub production_mode {
-    my $self = shift;
-    ...
-  }
-
-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>.
+MOJO_MODE and PLACK_ENV environment variables or C<development>. Right before
+calling L</"startup">, 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 moniker
 
@@ -287,7 +407,7 @@ L<Mojo::Util/"decamelize">.
   $app        = $app->plugins(Mojolicious::Plugins->new);
 
 The plugin manager, defaults to a L<Mojolicious::Plugins> object. See the
-C<plugin> method below if you want to load a plugin.
+L</"plugin"> method below if you want to load a plugin.
 
   # Add another namespace to load plugins from
   push @{$app->plugins->namespaces}, 'MyApp::Plugin';
@@ -330,8 +450,8 @@ startup method to define the url endpoints for your application.
   $app       = $app->secret('passw0rd');
 
 A secret passphrase used for signed cookies and the like, defaults to the
-C<moniker> of this application, which is not very secure, so you should change
-it!!! As long as you are using the insecure default there will be debug
+L</"moniker"> of this application, 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 sessions
@@ -372,6 +492,13 @@ L<Mojolicious::Types> object.
   # Add custom MIME type
   $app->types->type(twt => 'text/tweet');
 
+=head2 validator
+
+  my $validator = $app->validator;
+  $app          = $app->validator(Mojolicious::Validator->new);
+
+Validate form data, defaults to a L<Mojolicious::Validator> object.
+
 =head1 METHODS
 
 L<Mojolicious> inherits all methods from L<Mojo> and implements the following
@@ -382,10 +509,10 @@ new ones.
   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
+L</"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 file server, a default set of plugins and an
-C<around_dispatch> hook with the default exception handling.
+L</"around_dispatch"> hook with the default exception handling.
 
 =head2 build_tx
 
@@ -411,9 +538,9 @@ request.
 
   $app->dispatch(Mojolicious::Controller->new);
 
-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.
+The heart of every L<Mojolicious> application, calls the L</"static"> and
+L</"routes"> dispatchers for every request and passes them a
+L<Mojolicious::Controller> object.
 
 =head2 handler
 
@@ -445,7 +572,7 @@ and the application object, as well as a function in C<ep> templates.
   $app->hook(after_dispatch => sub {...});
 
 Extend L<Mojolicious> with hooks, which allow code to be shared with all
-requests indiscriminately.
+requests indiscriminately, for a full list of available hooks see L</"HOOKS">.
 
   # Dispatchers will not run if there's already a response code defined
   $app->hook(before_dispatch => sub {
@@ -454,114 +581,6 @@ requests indiscriminately.
       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 after_build_tx
-
-Emitted right after the transaction is built and before the HTTP request gets
-parsed.
-
-  $app->hook(after_build_tx => sub {
-    my ($tx, $app) = @_;
-    ...
-  });
-
-This is a very powerful hook and should not be used lightly, it makes some
-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 before_dispatch
-
-Emitted right before the static file server and router start their work.
-
-  $app->hook(before_dispatch => sub {
-    my $c = shift;
-    ...
-  });
-
-Very useful for rewriting incoming requests and other preprocessing tasks.
-(Passed the default controller object)
-
-=item after_static
-
-Emitted after a static file response has been generated by the static file
-server.
-
-  $app->hook(after_static => sub {
-    my $c = shift;
-    ...
-  });
-
-Mostly used for post-processing static file responses. (Passed the default
-controller object)
-
-=item before_routes
-
-Emitted after the static file server determined 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
-
-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 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;
-    ...
-  });
-
-Useful for rewriting outgoing responses and other post-processing tasks.
-(Passed the current controller object)
-
-=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
-to continue the chain. Default exception handling with
-L<Mojolicious::Controller/"render_exception"> is the first hook in the chain
-and a call to C<dispatch> the last, yours will be in between.
-
-  $app->hook(around_dispatch => sub {
-    my ($next, $c) = @_;
-    ...
-    $next->();
-    ...
-  });
-
-This is a very powerful hook and should not be used lightly, it allows you to
-customize application wide exception handling for example, consider it the
-sledgehammer in your toolbox. (Passed a callback leading to the next hook and
-the default controller object)
-
-=back
-
 =head2 plugin
 
   $app->plugin('some_thing');
@@ -674,7 +693,7 @@ Sebastian Riedel, C<sri@cpan.org>
 
 Current members of the core team in alphabetical order:
 
-=over 4
+=over 2
 
 Abhijit Menon-Sen, C<ams@cpan.org>
 
@@ -698,6 +717,8 @@ Adriano Ferreira
 
 Al Newkirk
 
+Alex Efros
+
 Alex Salimon
 
 Alexey Likhatskiy
@@ -734,6 +755,8 @@ Breno G. de Oliveira
 
 Brian Duggan
 
+Brian Medley
+
 Burak Gursoy
 
 Ch Lamprecht
@@ -780,10 +803,14 @@ Henry Tang
 
 Hideki Yamamura
 
+Ian Goodacre
+
 Ilya Chesnokov
 
 James Duncan
 
+Jan Henning Thorsen
+
 Jan Jona Javorsek
 
 Jan Schmidt
@@ -798,6 +825,8 @@ John Kingsley
 
 Jonathan Yu
 
+Josh Leder
+
 Kazuhiro Shibuya
 
 Kevin Old
@@ -846,6 +875,8 @@ Paul Evans
 
 Paul Tomlin
 
+Pavel Shaydo
+
 Pedro Melo
 
 Peter Edwards

+6 -4

mojo/lib/Mojolicious/Command.pm

View

@@ -88,13 +88,15 @@ sub write_rel_file {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command - Command base class
 
 =head1 SYNOPSIS
 
-  # Lower case command name
+  # Lowercase command name
   package Mojolicious::Command::mycommand;
   use Mojo::Base 'Mojolicious::Command';
 
@@ -102,7 +104,7 @@ Mojolicious::Command - Command base class
   has description => "My first Mojo command.\n";
 
   # Short usage message
-  has usage => <<"EOF";
+  has usage => <<EOF;
   usage: $0 mycommand [OPTIONS]
 
   These options are available:
@@ -145,8 +147,8 @@ Short description of command, used for the command list.
 
 =head2 quiet
 
-  my $quiet = $command->quiet;
-  $command  = $command->quiet(1);
+  my $bool = $command->quiet;
+  $command = $command->quiet($bool);
 
 Limited command output.
 

+3 -1

mojo/lib/Mojolicious/Command/cgi.pm

View

@@ -5,7 +5,7 @@ use Getopt::Long qw(GetOptionsFromArray :config no_auto_abbrev no_ignore_case);
 use Mojo::Server::CGI;
 
 has description => "Start application with CGI.\n";
-has usage       => <<"EOF";
+has usage       => <<EOF;
 usage: $0 cgi [OPTIONS]
 
 These options are available:
@@ -21,6 +21,8 @@ sub run {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::cgi - CGI command

+4 -2

mojo/lib/Mojolicious/Command/cpanify.pm

View

@@ -6,7 +6,7 @@ use Getopt::Long qw(GetOptionsFromArray :config no_auto_abbrev no_ignore_case);
 use Mojo::UserAgent;
 
 has description => "Upload distribution to CPAN.\n";
-has usage       => <<"EOF";
+has usage       => <<EOF;
 usage: $0 cpanify [OPTIONS] [FILE]
 
   mojo cpanify -u sri -p secr3t Mojolicious-Plugin-MyPlugin-0.01.tar.gz
@@ -24,7 +24,7 @@ sub run {
     'u|user=s'     => \(my $user     = '');
   die $self->usage unless my $file = shift @args;
 
-  my $tx = Mojo::UserAgent->new->detect_proxy->post(
+  my $tx = Mojo::UserAgent->new->tap(sub { $_->proxy->detect })->post(
     "https://$user:$password\@pause.perl.org/pause/authenquery" => form => {
       HIDDENNAME                        => $user,
       CAN_MULTIPART                     => 1,
@@ -48,6 +48,8 @@ sub run {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::cpanify - Cpanify command

+3 -1

mojo/lib/Mojolicious/Command/daemon.pm

View

@@ -5,7 +5,7 @@ use Getopt::Long qw(GetOptionsFromArray :config no_auto_abbrev no_ignore_case);
 use Mojo::Server::Daemon;
 
 has description => "Start application with HTTP and WebSocket server.\n";
-has usage       => <<"EOF";
+has usage       => <<EOF;
 usage: $0 daemon [OPTIONS]
 
 These options are available:
@@ -45,6 +45,8 @@ sub run {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::daemon - Daemon command

+9 -5

mojo/lib/Mojolicious/Command/eval.pm

View

@@ -4,32 +4,36 @@ use Mojo::Base 'Mojolicious::Command';
 use Getopt::Long qw(GetOptionsFromArray :config no_auto_abbrev no_ignore_case);
 
 has description => "Run code against application.\n";
-has usage       => <<"EOF";
+has usage       => <<EOF;
 usage: $0 eval [OPTIONS] CODE
 
   mojo eval 'say app->ua->get("/")->res->body'
   mojo eval -v 'app->home'
+  mojo eval -V 'app->renderer->paths'
 
 These options are available:
   -v, --verbose   Print return value to STDOUT.
+  -V              Print returned data structure to STDOUT.
 EOF
 
 sub run {
   my ($self, @args) = @_;
 
-  GetOptionsFromArray \@args, 'v|verbose' => \my $verbose;
+  GetOptionsFromArray \@args, 'v|verbose' => \my $v1, 'V' => \my $v2;
   my $code = shift @args || '';
 
   # Run code against application
   my $app = $self->app;
   no warnings;
-  my $result = eval "package main; sub app { \$app }; $code";
-  say $result if $verbose && defined $result;
-  return $@ ? die $@ : $result;
+  my $result = eval "package main; sub app; local *app = sub { \$app }; $code";
+  return $@ ? die $@ : $result unless defined $result && ($v1 || $v2);
+  $v2 ? print($app->dumper($result)) : say $result;
 }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::eval - Eval command

+4 -2

mojo/lib/Mojolicious/Command/generate.pm

View

@@ -2,11 +2,11 @@ package Mojolicious::Command::generate;
 use Mojo::Base 'Mojolicious::Commands';
 
 has description => "Generate files and directories from templates.\n";
-has hint        => <<"EOF";
+has hint        => <<EOF;
 
 See '$0 generate help GENERATOR' for more information on a specific generator.
 EOF
-has message => <<"EOF";
+has message => <<EOF;
 usage: $0 generate GENERATOR [OPTIONS]
 
 These generators are currently available:
@@ -18,6 +18,8 @@ sub help { shift->run(@_) }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::generate - Generator command

+7 -5

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

View

@@ -8,11 +8,11 @@ has usage       => "usage: $0 generate app [NAME]\n";
 
 sub run {
   my ($self, $class) = @_;
-  $class ||= 'MyMojoliciousApp';
+  $class ||= 'MyApp';
 
   # Prevent bad applications
   die <<EOF unless $class =~ /^[A-Z](?:\w|::)+$/;
-Your application name has to be a well formed (camel case) Perl module name
+Your application name has to be a well formed (CamelCase) Perl module name
 like "MyApp".
 EOF
 
@@ -94,8 +94,7 @@ sub welcome {
   my $self = shift;
 
   # Render template "example/welcome.html.ep" with message
-  $self->render(
-    message => 'Welcome to the Mojolicious real-time web framework!');
+  $self->render(msg => 'Welcome to the Mojolicious real-time web framework!');
 }
 
 1;
@@ -135,13 +134,16 @@ done_testing();
 @@ welcome
 %% layout 'default';
 %% title 'Welcome';
-<h2><%%= $message %></h2>
+<h2><%%= $msg %></h2>
 This page was generated from the template "templates/example/welcome.html.ep"
 and the layout "templates/layouts/default.html.ep",
 <a href="<%%== url_for %>">click here</a> to reload the page or
 <a href="/index.html">here</a> to move forward to a static page.
 
 __END__
+
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::generate::app - App generator command

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

View

@@ -42,6 +42,9 @@ Welcome to the Mojolicious real-time web framework!
 </html>
 
 __END__
+
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::generate::lite_app - Lite app generator command

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

View

@@ -24,6 +24,9 @@ WriteMakefile(
 );
 
 __END__
+
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::generate::makefile - Makefile generator command

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

View

@@ -41,6 +41,8 @@ sub register {
 1;
 <% %>__END__
 
+<% %>=encoding utf8
+
 <% %>=head1 NAME
 
 <%= $class %> - Mojolicious Plugin
@@ -110,6 +112,9 @@ WriteMakefile(
 );
 
 __END__
+
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::generate::plugin - Plugin generator command

+6 -4

mojo/lib/Mojolicious/Command/get.pm

View

@@ -11,7 +11,7 @@ use Mojo::Util qw(decode encode);
 use Scalar::Util 'weaken';
 
 has description => "Perform HTTP request.\n";
-has usage       => <<"EOF";
+has usage       => <<EOF;
 usage: $0 get [OPTIONS] URL [SELECTOR|JSON-POINTER] [COMMANDS]
 
   mojo get /
@@ -24,7 +24,7 @@ usage: $0 get [OPTIONS] URL [SELECTOR|JSON-POINTER] [COMMANDS]
   mojo get mojolicio.us a attr href
   mojo get mojolicio.us '*' attr id
   mojo get mojolicio.us 'h1, h2, h3' 3 text
-  mojo get http://search.twitter.com/search.json /error
+  mojo get https://api.metacpan.org/v0/author/SRI /name
 
 These options are available:
   -C, --charset <charset>     Charset of HTML/XML content, defaults to auto
@@ -57,7 +57,7 @@ sub run {
 
   # Detect proxy for absolute URLs
   my $ua = Mojo::UserAgent->new(ioloop => Mojo::IOLoop->singleton);
-  $url !~ m!^/! ? $ua->detect_proxy : $ua->app($self->app);
+  $url !~ m!^/! ? $ua->proxy->detect : $ua->server->app($self->app);
   $ua->max_redirects(10) if $redirect;
 
   my $buffer = '';
@@ -135,7 +135,7 @@ sub _select {
     # Attribute
     elsif ($command eq 'attr') {
       next unless my $name = shift @args;
-      _say($_->attrs->{$name}) for @$results;
+      _say($_->attr->{$name}) for @$results;
     }
 
     # Unknown
@@ -148,6 +148,8 @@ sub _select {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::get - Get command

+12 -6

mojo/lib/Mojolicious/Command/inflate.pm

View

@@ -14,19 +14,25 @@ sub run {
   my %all;
   my $app    = $self->app;
   my $loader = Mojo::Loader->new;
-  %all = (%{$loader->data($_)}, %all)
-    for @{$app->renderer->classes}, @{$app->static->classes};
+  for my $class (@{$app->renderer->classes}, @{$app->static->classes}) {
+    for my $name (keys %{$loader->data($class)}) {
+      my $data = $loader->data($class, $name);
+      $all{$name}
+        = $loader->is_binary($class, $name) ? $data : encode('UTF-8', $data);
+    }
+  }
 
   # Turn them into real files
-  for my $file (keys %all) {
-    my $prefix = $file =~ /\.\w+\.\w+$/ ? 'templates' : 'public';
-    my $path = $self->rel_file("$prefix/$file");
-    $self->write_file($path, encode('UTF-8', $all{$file}));
+  for my $name (keys %all) {
+    my $prefix = $name =~ /\.\w+\.\w+$/ ? 'templates' : 'public';
+    $self->write_file($self->rel_file("$prefix/$name"), $all{$name});
   }
 }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::inflate - Inflate command

+3 -1

mojo/lib/Mojolicious/Command/prefork.pm

View

@@ -6,7 +6,7 @@ use Mojo::Server::Prefork;
 
 has description =>
   "Start application with preforking HTTP and WebSocket server.\n";
-has usage => <<"EOF";
+has usage => <<EOF;
 usage: $0 prefork [OPTIONS]
 
 These options are available:
@@ -72,6 +72,8 @@ sub run {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::prefork - Prefork command

mojo/lib/Mojolicious/Command/psgi.pm

View

@@ -10,6 +10,8 @@ sub run { Mojo::Server::PSGI->new(app => shift->app)->to_psgi_app }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::psgi - PSGI command

+5 -2

mojo/lib/Mojolicious/Command/routes.pm

View

@@ -6,7 +6,7 @@ use Getopt::Long qw(GetOptionsFromArray :config no_auto_abbrev no_ignore_case);
 use Mojo::Util 'encode';
 
 has description => "Show available routes.\n";
-has usage       => <<"EOF";
+has usage       => <<EOF;
 usage: $0 routes [OPTIONS]
 
 These options are available:
@@ -51,7 +51,8 @@ sub _draw {
     my $format = (regexp_pattern($pattern->format_regex || ''))[0];
     my $optional
       = !$pattern->constraints->{format} || $pattern->defaults->{format};
-    $regex .= $optional ? "(?:$format)?" : $format if $format;
+    $regex .= $optional ? "(?:$format)?" : $format
+      if $format && !$node->[0]->partial;
     push @parts, $regex if $verbose;
 
     say encode('UTF-8', join('  ', @parts));
@@ -76,6 +77,8 @@ sub _walk {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::routes - Routes command

+3 -1

mojo/lib/Mojolicious/Command/test.pm

View

@@ -8,7 +8,7 @@ use Getopt::Long qw(GetOptionsFromArray :config no_auto_abbrev no_ignore_case);
 use Mojo::Home;
 
 has description => "Run unit tests.\n";
-has usage       => <<"EOF";
+has usage       => <<EOF;
 usage: $0 test [OPTIONS] [TESTS]
 
 These options are available:
@@ -42,6 +42,8 @@ sub run {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::test - Test command

+5 -2

mojo/lib/Mojolicious/Command/version.pm

View

@@ -17,7 +17,7 @@ sub run {
   my $tls
     = Mojo::IOLoop::Server::TLS ? $IO::Socket::SSL::VERSION : 'not installed';
 
-  print <<"EOF";
+  print <<EOF;
 CORE
   Perl        ($^V, $^O)
   Mojolicious ($Mojolicious::VERSION, $Mojolicious::CODENAME)
@@ -31,7 +31,8 @@ EOF
 
   # Check latest version on CPAN
   my $latest = eval {
-    my $ua = Mojo::UserAgent->new(max_redirects => 10)->detect_proxy;
+    my $ua = Mojo::UserAgent->new(max_redirects => 10);
+    $ua->proxy->detect;
     $ua->get('api.metacpan.org/v0/release/Mojolicious')->res->json->{version};
   };
 
@@ -46,6 +47,8 @@ EOF
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Command::version - Version command

+6 -4

mojo/lib/Mojolicious/Commands.pm

View

@@ -5,18 +5,18 @@ use Getopt::Long 'GetOptions';
 use List::Util 'max';
 use Mojo::Server;
 
-has hint => <<"EOF";
+has hint => <<EOF;
 
 These options are available for all commands:
     -h, --help          Get more information on a specific command.
         --home <path>   Path to your applications home directory, defaults to
                         the value of MOJO_HOME or auto detection.
-    -m, --mode <name>   Run mode of your application, defaults to the value of
-                        MOJO_MODE/PLACK_ENV or "development".
+    -m, --mode <name>   Operating mode for your application, defaults to the
+                        value of MOJO_MODE/PLACK_ENV or "development".
 
 See '$0 help COMMAND' for more information on a specific command.
 EOF
-has message => <<"EOF";
+has message => <<EOF;
 usage: $0 COMMAND [OPTIONS]
 
 Tip: CGI and PSGI environments can be automatically detected very often and
@@ -117,6 +117,8 @@ sub _command {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Commands - Command line interface

+105 -84

mojo/lib/Mojolicious/Controller.pm

View

@@ -39,6 +39,8 @@ sub AUTOLOAD {
 
 sub DESTROY { }
 
+sub continue { $_[0]->app->routes->continue($_[0]) }
+
 sub cookie {
   my ($self, $name) = (shift, shift);
 
@@ -374,15 +376,13 @@ sub stash {
   return $self;
 }
 
-sub ua { shift->app->ua }
-
 sub url_for {
   my $self = shift;
   my $target = shift; $target = defined $target ? $target : '';
 
   # Absolute URL
   return $target if Scalar::Util::blessed $target && $target->isa('Mojo::URL');
-  return Mojo::URL->new($target) if $target =~ m!^\w+://!;
+  return Mojo::URL->new($target) if $target =~ m!^(?:[^:/?#]+:|//)!;
 
   # Base
   my $url  = Mojo::URL->new;
@@ -404,12 +404,6 @@ sub url_for {
   else {
     my ($generated, $ws) = $self->match->path_for($target, @_);
     $path->parse($generated) if $generated;
-
-    # Fix trailing slash
-    $path->trailing_slash(1)
-      if (!$target || $target eq 'current') && $req->url->path->trailing_slash;
-
-    # Fix scheme for WebSockets
     $base->scheme($base->protocol eq 'https' ? 'wss' : 'ws') if $ws;
   }
 
@@ -421,6 +415,12 @@ sub url_for {
   return $url;
 }
 
+sub validation {
+  my $self = shift;
+  return $self->stash->{'mojo.validation'}
+    ||= $self->app->validator->validation->input($self->req->params->to_hash);
+}
+
 sub write {
   my ($self, $chunk, $cb) = @_;
   ($cb, $chunk) = ($chunk, undef) if ref $chunk eq 'CODE';
@@ -449,7 +449,7 @@ sub _fallbacks {
   # Inline template
   my $stash = $self->stash;
   return undef unless $stash->{format} eq 'html';
-  delete $stash->{$_} for qw(extends layout);
+  delete @$stash{qw(extends layout)};
   return $self->render_maybe(%$options, inline => $inline, handler => 'ep');
 }
 
@@ -478,8 +478,8 @@ Mojolicious::Controller - Controller base class
 =head1 DESCRIPTION
 
 L<Mojolicious::Controller> is the base class for your L<Mojolicious>
-controllers. It is also the default controller class for L<Mojolicious>
-unless you set C<controller_class> in your application.
+controllers. It is also the default controller class unless you set
+L<Mojolicious/"controller_class">.
 
 =head1 ATTRIBUTES
 
@@ -497,6 +497,9 @@ defaults to a L<Mojolicious> object.
   # Use application logger
   $c->app->log->debug('Hello Mojo!');
 
+  # Generate path
+  my $path = $c->app->home->rel_file('templates/foo/bar.html.ep');
+
 =head2 match
 
   my $m = $c->match;
@@ -507,6 +510,7 @@ L<Mojolicious::Routes::Match> object.
 
   # Introspect
   my $foo = $c->match->endpoint->pattern->defaults->{foo};
+  my $bar = $c->match->stack->[-1]{bar};
 
 =head2 tx
 
@@ -514,16 +518,32 @@ L<Mojolicious::Routes::Match> object.
   $c     = $c->tx(Mojo::Transaction::HTTP->new);
 
 The transaction that is currently being processed, usually a
-L<Mojo::Transaction::HTTP> or L<Mojo::Transaction::WebSocket> object.
+L<Mojo::Transaction::HTTP> or L<Mojo::Transaction::WebSocket> object. Note
+that this reference is usually weakened, so the object needs to be referenced
+elsewhere as well when you're performing non-blocking operations and the
+underlying connection might get closed early.
 
   # Check peer information
   my $address = $c->tx->remote_address;
+  my $port    = $c->tx->remote_port;
+
+  # Perform non-blocking operation without knowing the connection status
+  my $tx = $c->tx;
+  Mojo::IOLoop->timer(2 => sub {
+    $c->app->log->debug($tx->is_finished ? 'Finished.' : 'In progress.');
+  });
 
 =head1 METHODS
 
 L<Mojolicious::Controller> inherits all methods from L<Mojo::Base> and
 implements the following new ones.
 
+=head2 continue
+
+  $c->continue;
+
+Continue dispatch chain.
+
 =head2 cookie
 
   my $value  = $c->cookie('foo');
@@ -551,7 +571,8 @@ Close WebSocket connection or long poll stream gracefully.
   $c      = $c->flash({foo => 'bar'});
   $c      = $c->flash(foo => 'bar');
 
-Data storage persistent only for the next request, stored in the C<session>.
+Data storage persistent only for the next request, stored in the
+L</"session">.
 
   # Show message after redirect
   $c->flash(message => 'User created successfully!');
@@ -561,8 +582,10 @@ Data storage persistent only for the next request, stored in the C<session>.
 
   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.
+Subscribe to events of L</"tx">, which is usually a L<Mojo::Transaction::HTTP>
+or L<Mojo::Transaction::WebSocket> object. Note that this method will
+automatically respond to WebSocket handshake requests with a C<101> response
+status.
 
   # Do something after the transaction has been finished
   $c->on(finish => sub {
@@ -598,10 +621,12 @@ L<Mojo::Transaction::WebSocket> object.
   $c              = $c->param(foo => 'ba;r');
   $c              = $c->param(foo => qw(ba;r ba;z));
 
-Access GET/POST parameters, file uploads and route placeholder values that are
-not reserved stash values. Note that this method is context sensitive in some
-cases and therefore needs to be used with care, there can always be multiple
-values, which might have unexpected consequences.
+Access route placeholder values that are not reserved stash values, file
+uploads and GET/POST parameters, in that order. Note that this method is
+context sensitive in some cases and therefore needs to be used with care,
+there can always be multiple values, which might have unexpected consequences.
+Parts of the request body need to be loaded into memory to parse POST
+parameters, so you have to make sure it is not excessively large.
 
   # List context is ambiguous and should be avoided
   my $hash = {foo => $self->param('foo')};
@@ -625,12 +650,12 @@ For more control you can also access request information directly.
 
 =head2 redirect_to
 
-  $c = $c->redirect_to('named');
   $c = $c->redirect_to('named', foo => 'bar');
-  $c = $c->redirect_to('/path');
-  $c = $c->redirect_to('http://127.0.0.1/foo/bar');
+  $c = $c->redirect_to('named', {foo => 'bar'});
+  $c = $c->redirect_to('/perldoc');
+  $c = $c->redirect_to('http://mojolicio.us/perldoc');
 
-Prepare a C<302> redirect response, takes the same arguments as C<url_for>.
+Prepare a C<302> redirect response, takes the same arguments as L</"url_for">.
 
   # Conditional redirect
   return $c->redirect_to('login') unless $c->session('user');
@@ -641,21 +666,21 @@ Prepare a C<302> redirect response, takes the same arguments as C<url_for>.
 
 =head2 render
 
-  my $success = $c->render;
-  my $success = $c->render(controller => 'foo', action => 'bar');
-  my $success = $c->render(template => 'foo/index');
-  my $success = $c->render(template => 'index', format => 'html');
-  my $success = $c->render(data => $bytes);
-  my $success = $c->render(text => 'Hello!');
-  my $success = $c->render(json => {foo => 'bar'});
-  my $success = $c->render(handler => 'something');
-  my $success = $c->render('foo/index');
+  my $bool    = $c->render;
+  my $bool    = $c->render(controller => 'foo', action => 'bar');
+  my $bool    = $c->render(template => 'foo/index');
+  my $bool    = $c->render(template => 'index', format => 'html');
+  my $bool    = $c->render(data => $bytes);
+  my $bool    = $c->render(text => 'Hello!');
+  my $bool    = $c->render(json => {foo => 'bar'});
+  my $bool    = $c->render(handler => 'something');
+  my $bool    = $c->render('foo/index');
   my $output  = $c->render('foo/index', partial => 1);
 
-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>.
+Render content using L<Mojolicious::Renderer/"render"> and emit hook
+L<Mojolicious/"after_render"> 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 L</"stash">.
 
 =head2 render_exception
 
@@ -665,7 +690,7 @@ generated, 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>. Also sets
 the stash values C<exception> to a L<Mojo::Exception> object and C<snapshot>
-to a copy of the C<stash> for use in the templates.
+to a copy of the L</"stash"> for use in the templates.
 
 =head2 render_later
 
@@ -682,12 +707,12 @@ automatic rendering would result in a response.
 
 =head2 render_maybe
 
-  my $success = $c->render_maybe;
-  my $success = $c->render_maybe(controller => 'foo', action => 'bar');
-  my $success = $c->render_maybe('foo/index', format => 'html');
+  my $bool = $c->render_maybe;
+  my $bool = $c->render_maybe(controller => 'foo', action => 'bar');
+  my $bool = $c->render_maybe('foo/index', format => 'html');
 
-Try to render content but do not call C<render_not_found> if no response could
-be generated, takes the same arguments as C<render>.
+Try to render content but do not call L</"render_not_found"> if no response
+could be generated, takes the same arguments as L</"render">.
 
   # Render template "index_local" only if it exists
   $self->render_maybe('index_local') or $self->render('index');
@@ -701,8 +726,8 @@ C<not_found.$format.*> and set the response status code to C<404>.
 
 =head2 render_static
 
-  my $success = $c->render_static('images/logo.png');
-  my $success = $c->render_static('../lib/MyApp.pm');
+  my $bool = $c->render_static('images/logo.png');
+  my $bool = $c->render_static('../lib/MyApp.pm');
 
 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
@@ -713,8 +738,8 @@ method does not protect from traversing to parent directories.
   $c = $c->rendered;
   $c = $c->rendered(302);
 
-Finalize response and emit C<after_dispatch> hook, defaults to using a C<200>
-response code.
+Finalize response and emit hook L<Mojolicious/"after_dispatch">, defaults to
+using a C<200> response code.
 
 =head2 req
 
@@ -730,8 +755,11 @@ Get L<Mojo::Message::Request> object from L<Mojo::Transaction/"req">.
   my $userinfo = $c->req->url->to_abs->userinfo;
   my $host     = $c->req->url->to_abs->host;
   my $agent    = $c->req->headers->user_agent;
-  my $body     = $c->req->body;
+  my $bytes    = $c->req->body;
+  my $str      = $c->req->text;
+  my $hash     = $c->req->json;
   my $foo      = $c->req->json('/23/foo');
+  my $dom      = $c->req->dom;
   my $bar      = $c->req->dom('div.bar')->first->text;
 
 =head2 res
@@ -773,12 +801,13 @@ is set to the value C<XMLHttpRequest>.
   $c = $c->send({text   => $bytes});
   $c = $c->send({json   => {test => [1, 2, 3]}});
   $c = $c->send([$fin, $rsv1, $rsv2, $rsv3, $op, $bytes]);
-  $c = $c->send(Mojo::ByteStream->new($chars));
   $c = $c->send($chars);
   $c = $c->send($chars => sub {...});
 
 Send message or frame non-blocking via WebSocket, the optional drain callback
-will be invoked once all data has been written.
+will be invoked once all data has been written. Note that this method will
+automatically respond to WebSocket handshake requests with a C<101> response
+status.
 
   # Send "Text" message
   $c->send('I ♥ Mojolicious!');
@@ -793,6 +822,12 @@ will be invoked once all data has been written.
   # Send "Ping" frame
   $c->send([1, 0, 0, 0, 9, 'Hello World!']);
 
+  # Make sure previous message has been written before continuing
+  $c->send('First message!' => sub {
+    my $c = shift;
+    $c->send('Second message!');
+  });
+
 For mostly idle WebSockets you might also want to increase the inactivity
 timeout, which usually defaults to C<15> seconds.
 
@@ -843,7 +878,7 @@ discarded.
   $c       = $c->stash(foo => 'bar');
 
 Non persistent data storage and exchange, application wide default values can
-be set with L<Mojolicious/"defaults">. Many stash values have a special
+be set with L<Mojolicious/"defaults">. Some stash values have a special
 meaning and are reserved, the full list is currently C<action>, C<app>, C<cb>,
 C<controller>, C<data>, C<extends>, C<format>, C<handler>, C<json>, C<layout>,
 C<namespace>, C<partial>, C<path>, C<status>, C<template> and C<text>. Note
@@ -852,38 +887,6 @@ that all stash values with a C<mojo.*> prefix are reserved for internal use.
   # Remove value
   my $foo = delete $c->stash->{foo};
 
-=head2 ua
-
-  my $ua = $c->ua;
-
-Get L<Mojo::UserAgent> object from L<Mojo/"ua">.
-
-  # Longer version
-  my $ua = $c->app->ua;
-
-  # Blocking
-  my $tx = $c->ua->get('http://example.com');
-  my $tx = $c->ua->post('example.com/login' => form => {user => 'mojo'});
-
-  # Non-blocking
-  $c->ua->get('http://example.com' => sub {
-    my ($ua, $tx) = @_;
-    $c->render(data => $tx->res->body);
-  });
-
-  # Parallel non-blocking
-  my $delay = Mojo::IOLoop->delay(sub {
-    my ($delay, @titles) = @_;
-    $c->render(json => \@titles);
-  });
-  for my $url ('http://mojolicio.us', 'https://metacpan.org') {
-    my $end = $delay->begin(0);
-    $c->ua->get($url => sub {
-      my ($ua, $tx) = @_;
-      $end->($tx->res->dom->html->head->title->text);
-    });
-  }
-
 =head2 url_for
 
   my $url = $c->url_for;
@@ -892,10 +895,15 @@ Get L<Mojo::UserAgent> object from L<Mojo/"ua">.
   my $url = $c->url_for('test', name => 'sebastian');
   my $url = $c->url_for('test', {name => 'sebastian'});
   my $url = $c->url_for('/perldoc');
+  my $url = $c->url_for('//mojolicio.us/perldoc');
   my $url = $c->url_for('http://mojolicio.us/perldoc');
+  my $url = $c->url_for('mailto:sri@example.com');
 
 Generate a portable L<Mojo::URL> object with base for a route, path or URL.
 
+  # "http://127.0.0.1:3000/perldoc" if application has been started with Morbo
+  $c->url_for('/perldoc')->to_abs;
+
   # "/perldoc?foo=bar" if application is deployed under "/"
   $c->url_for('/perldoc')->query(foo => 'bar');
 
@@ -908,6 +916,19 @@ 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 validation
+
+  my $validation = $c->validation;
+
+Get L<Mojolicious::Validator::Validation> object for current request to
+validate GET/POST parameters. Parts of the request body need to be loaded into
+memory to parse POST parameters, so you have to make sure it is not
+excessively large.
+
+  my $validation = $c->validation;
+  $validation->required('title')->size(3, 50);
+  my $title = $validation->param('title');
+
 =head2 write
 
   $c = $c->write;
@@ -959,7 +980,7 @@ optional drain callback will be invoked once all data has been written.
     });
   });
 
-You can call C<finish> at any time to end the stream.
+You can call L</"finish"> at any time to end the stream.
 
   2
   He

+16 -7

mojo/lib/Mojolicious/Guides.pod

View

@@ -1,4 +1,6 @@
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Guides - Mojolicious guide to the galaxy
@@ -20,12 +22,6 @@ 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
@@ -122,7 +118,20 @@ Test driven development toolkit for web applications.
 
 =item L<ojo>
 
-Fun oneliners using everything above.
+Fun one-liners using everything above.
+
+=back
+
+=head1 SPIN-OFFS
+
+These modules are not part of the L<Mojolicious> distribution, but have been
+designed to be used with it and are being developed under the same umbrella.
+
+=over 2
+
+=item L<Mango>
+
+Pure-Perl non-blocking I/O MongoDB driver.
 
 =back
 

+5 -3

mojo/lib/Mojolicious/Guides/Contributing.pod

View

@@ -1,4 +1,6 @@
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Guides::Contributing - Contributing to Mojolicious
@@ -100,8 +102,8 @@ All components should be reusable in other projects, and in a UNIXish way only
 loosely coupled.
 
 Especially for people new to Perl it should be as easy as possible to install
-Mojolicious and get started. Writing web applications can be one of the most
-fun ways to learn a language!
+L<Mojolicious> and get started. Writing web applications can be one of the
+most fun ways to learn a language!
 
 For developers of other web frameworks, it should be possible to reuse all the
 infrastructure and just consider the higher levels of the L<Mojolicious>
@@ -164,7 +166,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.
 
-Methods and functions should be as short as possible, no spaghetti code.
+Functions and methods 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.

+188 -169

mojo/lib/Mojolicious/Guides/Cookbook.pod

View

...	...	@@ -1,4 +1,6 @@
1	1
	2	+=encoding utf8
	3	+
2	4	=head1 NAME
3	5
4	6	Mojolicious::Guides::Cookbook - Cookbook
...	...	@@ -32,7 +34,8 @@ works on.
32	34
33	35	Another huge advantage is that it supports TLS and WebSockets out of the box,
34	36	a development certificate for testing purposes is built right in, so it just
35		-works.
	37	+works, but you can specify all listen locations supported by
	38	+L<Mojo::Server::Daemon/"listen">.
36	39
37	40	$ ./script/myapp daemon -l https://*:3000
38	41	Server available at https://127.0.0.1:3000.
...	...	@@ -51,6 +54,20 @@ concurrent connections each worker is allowed to handle.
51	54	$ ./script/myapp prefork -m production -w 10 -c 1
52	55	Server available at http://127.0.0.1:3000.
53	56
	57	+Your application is preloaded in the manager process during startup, to run
	58	+code whenever a new worker process has been forked you can use L<Mojo::IOLoop>
	59	+timers.
	60	+
	61	+ use Mojolicious::Lite;
	62	+
	63	+ Mojo::IOLoop->timer(0 => sub {
	64	+ app->log->info("Worker $$ star...ALL GLORY TO THE HYPNOTOAD!");
	65	+ });
	66	+
	67	+ get '/' => {text => 'Hello Wor...ALL GLORY TO THE HYPNOTOAD!'};
	68	+
	69	+ app->start;
	70	+
54	71	=head2 Morbo
55	72
56	73	After reading the L<Mojolicious::Lite> tutorial, you should already be
...	...	@@ -85,8 +102,9 @@ environments out of the box.
85	102	$ hypnotoad script/myapp
86	103	Server available at http://127.0.0.1:8080.
87	104
88		-You can tweak many configuration settings right from within your application,
89		-for a full list see L<Mojo::Server::Hypnotoad/"SETTINGS">.
	105	+You can tweak many configuration settings right from within your application
	106	+with L<Mojo/"config">, for a full list see
	107	+L<Mojo::Server::Hypnotoad/"SETTINGS">.
90	108
91	109	use Mojolicious::Lite;
92	110
...	...	@@ -108,9 +126,9 @@ L<Mojolicious::Plugin::JSONConfig> configuration file.
108	126	};
109	127
110	128	But one of its biggest advantages is the support for effortless zero downtime
111		-software upgrades. That means you can upgrade L<Mojolicious>, Perl or even
112		-system libraries at runtime without ever stopping the server or losing a
113		-single incoming connection, just by running the command above again.
	129	+software upgrades (hot deployment). That means you can upgrade L<Mojolicious>,
	130	+Perl or even system libraries at runtime without ever stopping the server or
	131	+losing a single incoming connection, just by running the command above again.
114	132
115	133	$ hypnotoad script/myapp
116	134	Starting hot deployment for Hypnotoad server 31841.
...	...	@@ -122,19 +140,25 @@ C<X-Forwarded-For> and C<X-Forwarded-HTTPS> headers.
122	140	# myapp.conf
123	141	{hypnotoad => {proxy => 1}};
124	142
125		-Your application is preloaded in the manager process during startup, to run
126		-code whenever a new worker process has been forked you can use L<Mojo::IOLoop>
127		-timers.
	143	+=head2 Zero downtime software upgrades
128	144
129		- use Mojolicious::Lite;
	145	+Hypnotoad makes zero downtime software upgrades (hot deployment) very simple,
	146	+as you can see above, but on modern operating systems that support the
	147	+C<SO_REUSEPORT> socket option, there is also another method available that
	148	+works with all built-in web servers.
130	149
131		- Mojo::IOLoop->timer(0 => sub {
132		- app->log->info("Worker $$ star...ALL GLORY TO THE HYPNOTOAD!");
133		- });
	150	+ $ ./script/myapp prefork -P /tmp/first.pid -l http://*:8080?reuse=1
	151	+ Server available at http://127.0.0.1:8080.
134	152
135		- get '/' => {text => 'Hello Wor...ALL GLORY TO THE HYPNOTOAD!'};
	153	+All you have to do is start a second web server listening to the same port and
	154	+stop the first web server gracefully afterwards.
136	155
137		- app->start;
	156	+ $ ./script/myapp prefork -P /tmp/second.pid -l http://*:8080?reuse=1
	157	+ Server available at http://127.0.0.1:8080.
	158	+ $ kill -s TERM `cat /tmp/first.pid`
	159	+
	160	+Just remember that both web servers need to be started with the C<reuse>
	161	+parameter.
138	162
139	163	=head2 Nginx
140	164
...	...	@@ -242,30 +266,37 @@ But you could even use middleware right in your application.
242	266	Sometimes you might have to deploy your application in a blackbox environment
243	267	where you can't just change the server configuration or behind a reverse proxy
244	268	that passes along additional information with C<X-*> headers. In such cases
245		-you can use a C<before_dispatch> hook to rewrite incoming requests.
	269	+you can use the hook L<Mojolicious/"before_dispatch"> to rewrite incoming
	270	+requests.
246	271
247	272	# Change scheme if "X-Forwarded-Protocol" header is set to "https"
248	273	app->hook(before_dispatch => sub {
249		- my $self = shift;
250		- $self->req->url->base->scheme('https')
251		- if $self->req->headers->header('X-Forwarded-Protocol') eq 'https';
	274	+ my $c = shift;
	275	+ $c->req->url->base->scheme('https')
	276	+ if $c->req->headers->header('X-Forwarded-Protocol') eq 'https';
252	277	});
253	278
254	279	Since reverse proxies generally don't pass along information about path
255	280	prefixes your application might be deployed under, rewriting the base path of
256	281	incoming requests is also quite common.
257	282
258		- # Move first part from path to base path in production mode
	283	+ # Move first part and slash from path to base path in production mode
259	284	app->hook(before_dispatch => sub {
260		- my $self = shift;
261		- push @{$self->req->url->base->path}, shift @{$self->req->url->path};
	285	+ my $c = shift;
	286	+ push @{$c->req->url->base->path->trailing_slash(1)},
	287	+ shift @{$c->req->url->path->leading_slash(0)};
262	288	}) if app->mode eq 'production';
263	289
	290	+L<Mojo::URL> objects are very easy to manipulate, just make sure that the URL
	291	+(C<foo/bar?baz=yada>), which represents the routing destination, is always
	292	+relative to the base URL (C<http://example.com/myapp/>), which represents the
	293	+deployment location of your application.
	294	+
264	295	=head2 Application embedding
265	296
266	297	From time to time you might want to reuse parts of L<Mojolicious> applications
267	298	like configuration files, database connection or helpers for other scripts,
268		-with this little mock server you can just embed them.
	299	+with this little L<Mojo::Server> based mock server you can just embed them.
269	300
270	301	use Mojo::Server;
271	302
...	...	@@ -280,8 +311,9 @@ with this little mock server you can just embed them.
280	311
281	312	=head2 Web server embedding
282	313
283		-You can also use the built-in web server to embed L<Mojolicious> applications
284		-into alien environments like foreign event loops.
	314	+You can also use L<Mojo::IOLoop/"one_tick"> to embed the built-in web server
	315	+L<Mojo::Server::Daemon> into alien environments like foreign event loops that
	316	+for some reason can't just be integrated with a new reactor backend.
285	317
286	318	use Mojolicious::Lite;
287	319	use Mojo::IOLoop;
...	...	@@ -316,37 +348,37 @@ latency backend web services.
316	348
317	349	use Mojolicious::Lite;
318	350
319		- # Search Twitter for "perl"
	351	+ # Search MetaCPAN for "mojolicious"
320	352	get '/' => sub {
321	353	my $self = shift;
322		- $self->ua->get('http://search.twitter.com/search.json?q=perl' => sub {
	354	+ $self->ua->get('api.metacpan.org/v0/module/_search?q=mojolicious' => sub {
323	355	my ($ua, $tx) = @_;
324		- $self->render('twitter', results => $tx->res->json->{results});
	356	+ $self->render('metacpan', hits => $tx->res->json->{hits}{hits});
325	357	});
326	358	};
327	359
328	360	app->start;
329	361	__DATA__
330	362
331		- @@ twitter.html.ep
	363	+ @@ metacpan.html.ep
332	364	<!DOCTYPE html>
333	365	<html>
334		- <head><title>Twitter results for "perl"</title></head>
	366	+ <head><title>MetaCPAN results for "mojolicious"</title></head>
335	367	<body>
336		- % for my $result (@$results) {
337		- <p><%= $result->{text} %></p>
	368	+ % for my $hit (@$hits) {
	369	+ <p><%= $hit->{_source}{release} %></p>
338	370	% }
339	371	</body>
340	372	</html>
341	373
342		-Multiple events such as parallel requests can be easily synchronized with a
343		-L<Mojo::IOLoop> delay.
	374	+Multiple events such as parallel requests can be easily synchronized with
	375	+L<Mojo::IOLoop/"delay">.
344	376
345	377	use Mojolicious::Lite;
346	378	use Mojo::IOLoop;
347	379	use Mojo::URL;
348	380
349		- # Search Twitter for "perl" and "python"
	381	+ # Search MetaCPAN for "mojo" and "mango"
350	382	get '/' => sub {
351	383	my $self = shift;
352	384
...	...	@@ -356,17 +388,18 @@ L<Mojo::IOLoop> delay.
356	388	# Parallel requests
357	389	sub {
358	390	my $delay = shift;
359		- my $url = Mojo::URL->new('http://search.twitter.com/search.json');
360		- $self->ua->get($url->clone->query({q => 'perl'}) => $delay->begin);
361		- $self->ua->get($url->clone->query({q => 'python'}) => $delay->begin);
	391	+ my $url = Mojo::URL->new('api.metacpan.org/v0/module/_search');
	392	+ $url->query({sort => 'date:desc'});
	393	+ $self->ua->get($url->clone->query({q => 'mojo'}) => $delay->begin);
	394	+ $self->ua->get($url->clone->query({q => 'mango'}) => $delay->begin);
362	395	},
363	396
364	397	# Delayed rendering
365	398	sub {
366		- my ($delay, $perl, $python) = @_;
	399	+ my ($delay, $mojo, $mango) = @_;
367	400	$self->render(json => {
368		- perl => $perl->res->json('/results/0/text'),
369		- python => $python->res->json('/results/0/text')
	401	+ mojo => $mojo->res->json('/hits/hits/0/_source/release'),
	402	+ mango => $mango->res->json('/hits/hits/0/_source/release')
370	403	});
371	404	}
372	405	);
...	...	@@ -543,11 +576,11 @@ L<Test::Mojo> API to be used.
543	576
544	577	=head2 EventSource web service
545	578
546		-EventSource is a special form of long-polling where you can directly send DOM
547		-events from servers to clients. It is uni-directional, that means you will
548		-have to use Ajax requests for sending data from clients to servers, the
549		-advantage however is low infrastructure requirements, since it reuses the HTTP
550		-protocol for transport.
	579	+EventSource is a special form of long-polling where you can use
	580	+L<Mojolicious::Controller/"write"> to directly send DOM events from servers to
	581	+clients. It is uni-directional, that means you will have to use Ajax requests
	582	+for sending data from clients to servers, the advantage however is low
	583	+infrastructure requirements, since it reuses the HTTP protocol for transport.
551	584
552	585	use Mojolicious::Lite;
553	586	use Mojo::IOLoop;
...	...	@@ -666,27 +699,7 @@ which can be combined to solve some of hardest problems in web development.
666	699
667	700	Internally the L<Mojo::IOLoop> event loop can use multiple reactor backends,
668	701	L<EV> for example will be automatically used if installed. Which in turn
669		-allows other event loops like L<IO::Async> to just work.
670		-
671		- use Mojolicious::Lite;
672		- use EV;
673		- use IO::Async::Loop::EV;
674		- use IO::Async::Timer::Absolute;
675		-
676		- my $loop = IO::Async::Loop::EV->new;
677		-
678		- # Wait 3 seconds before rendering a response
679		- get '/' => sub {
680		- my $self = shift;
681		- $loop->add(IO::Async::Timer::Absolute->new(
682		- time => time + 3,
683		- on_expire => sub { $self->render(text => 'Delayed by 3 seconds!') }
684		- ));
685		- };
686		-
687		- app->start;
688		-
689		-Same for L<AnyEvent>.
	702	+allows other event loops like L<AnyEvent> to just work.
690	703
691	704	use Mojolicious::Lite;
692	705	use EV;
...	...	@@ -710,12 +723,12 @@ Who actually controls the event loop backend is not important.
710	723	use EV;
711	724	use AnyEvent;
712	725
713		- # Search Twitter for "perl"
	726	+ # Search MetaCPAN for "mojolicious"
714	727	my $cv = AE::cv;
715	728	my $ua = Mojo::UserAgent->new;
716		- $ua->get('http://search.twitter.com/search.json?q=perl' => sub {
	729	+ $ua->get('api.metacpan.org/v0/module/_search?q=mojolicious' => sub {
717	730	my ($ua, $tx) = @_;
718		- $cv->send($tx->res->json('/results/0/text'));
	731	+ $cv->send($tx->res->json('/hits/hits/0/_source/release'));
719	732	});
720	733	say $cv->recv;
721	734
...	...	@@ -745,8 +758,10 @@ When we say L<Mojolicious> is a web framework we actually mean it.
745	758	=head2 Web scraping
746	759
747	760	Scraping information from web sites has never been this much fun before. The
748		-built-in HTML/XML parser L<Mojo::DOM> supports all CSS selectors that make
749		-sense for a standalone parser.
	761	+built-in HTML/XML parser L<Mojo::DOM> is accessible through
	762	+L<Mojo::Message/"dom"> and supports all CSS selectors that make sense for a
	763	+standalone parser, it can be a very powerful tool especially for unit testing
	764	+web application.
750	765
751	766	use Mojo::UserAgent;
752	767
...	...	@@ -776,33 +791,26 @@ sense for a standalone parser.
776	791	print $e->text_after(0) unless $e->next;
777	792	}
778	793
779		-Especially for unit testing your L<Mojolicious> applications this can be a
780		-very powerful tool.
	794	+For a full list of available CSS selectors see L<Mojo::DOM::CSS/"SELECTORS">.
781	795
782	796	=head2 JSON web services
783	797
784	798	Most web services these days are based on the JSON data-interchange format.
785	799	That's why L<Mojolicious> comes with the possibly fastest pure-Perl
786		-implementation L<Mojo::JSON> built right in.
	800	+implementation L<Mojo::JSON> built right in, it is accessible through
	801	+L<Mojo::Message/"json">.
787	802
788	803	use Mojo::UserAgent;
789		- use Mojo::Util 'encode';
	804	+ use Mojo::URL;
790	805
791	806	# Fresh user agent
792	807	my $ua = Mojo::UserAgent->new;
793	808
794		- # Fetch the latest news about Mojolicious from Twitter
795		- my $search = 'http://search.twitter.com/search.json?q=Mojolicious';
796		- for $tweet (@{$ua->get($search)->res->json->{results}}) {
797		-
798		- # Tweet text
799		- my $text = $tweet->{text};
800		-
801		- # Twitter user
802		- my $user = $tweet->{from_user};
803		-
804		- # Show both
805		- say encode('UTF-8', "$text --$user");
	809	+ # Search MetaCPAN for "mojolicious" and list latest releases
	810	+ my $url = Mojo::URL->new('http://api.metacpan.org/v0/release/_search');
	811	+ $url->query({q => 'mojolicious', sort => 'date:desc'});
	812	+ for my $hit (@{$ua->get($url)->res->json->{hits}{hits}}) {
	813	+ say "$hit->{_source}{name} ($hit->{_source}{author})";
806	814	}
807	815
808	816	=head2 Basic authentication
...	...	@@ -840,7 +848,9 @@ This even works for proxy C<CONNECT> requests.
840	848
841	849	=head2 Content generators
842	850
843		-Generate the same type of content repeatedly for multiple requests.
	851	+Content generators can be registered with
	852	+L<Mojo::UserAgent::Transactor/"add_generator"> to generate the same type of
	853	+content repeatedly for multiple requests.
844	854
845	855	use Mojo::UserAgent;
846	856	use Mojo::Asset::File;
...	...	@@ -860,20 +870,58 @@ The C<json> and C<form> content generators are always available.
860	870
861	871	use Mojo::UserAgent;
862	872
863		- # Send JSON content via PATCH
	873	+ # Send "application/json" content via PATCH
864	874	my $ua = Mojo::UserAgent->new;
865	875	my $tx = $ua->patch('http://api.example.com' => json => {foo => 'bar'});
866	876
	877	+ # Send query parameters via GET
	878	+ my $tx2 = $ua->get('http://search.example.com' => form => {q => 'test'});
	879	+
867	880	# Send "application/x-www-form-urlencoded" content via POST
868		- my $tx2 = $ua->post('http://search.example.com' => form => {q => 'test'});
	881	+ my $tx3 = $ua->post('http://search.example.com' => form => {q => 'test'});
869	882
870	883	# Send "multipart/form-data" content via PUT
871		- my $tx3 = $ua->put('http://upload.example.com' =>
	884	+ my $tx4 = $ua->put('http://upload.example.com' =>
872	885	form => {test => {content => 'Hello World!'}});
873	886
874	887	For more information about available content generators see also
875	888	L<Mojo::UserAgent::Transactor/"tx">.
876	889
	890	+=head2 Large file downloads
	891	+
	892	+When downloading large files with L<Mojo::UserAgent> you don't have to worry
	893	+about memory usage at all, because it will automatically stream everything
	894	+above C<250KB> into a temporary file, which can then be moved into a permanent
	895	+file with L<Mojo::Asset::File/"move_to">.
	896	+
	897	+ use Mojo::UserAgent;
	898	+
	899	+ # Lets fetch the latest Mojolicious tarball
	900	+ my $ua = Mojo::UserAgent->new(max_redirects => 5);
	901	+ my $tx = $ua->get('latest.mojolicio.us');
	902	+ $tx->res->content->asset->move_to('mojo.tar.gz');
	903	+
	904	+To protect you from excessively large files there is also a limit of C<10MB>
	905	+by default, which you can tweak with the MOJO_MAX_MESSAGE_SIZE environment
	906	+variable.
	907	+
	908	+ # Increase limit to 1GB
	909	+ $ENV{MOJO_MAX_MESSAGE_SIZE} = 1073741824;
	910	+
	911	+=head2 Large file upload
	912	+
	913	+Uploading a large file is even easier.
	914	+
	915	+ use Mojo::UserAgent;
	916	+
	917	+ # Upload file via POST and "multipart/form-data"
	918	+ my $ua = Mojo::UserAgent->new;
	919	+ $ua->post('example.com/upload' =>
	920	+ form => {image => {file => '/home/sri/hello.png'}});
	921	+
	922	+And once again you don't have to worry about memory usage, all data will be
	923	+streamed directly from the file.
	924	+
877	925	=head2 Streaming response
878	926
879	927	Receiving a streaming response can be really tricky in most HTTP clients, but
...	...	@@ -885,6 +933,9 @@ L<Mojo::UserAgent> makes it actually easy.
885	933	my $ua = Mojo::UserAgent->new;
886	934	my $tx = $ua->build_tx(GET => 'http://example.com');
887	935
	936	+ # Accept response of indefinite size
	937	+ $tx->res->max_message_size(0);
	938	+
888	939	# Replace "read" events to disable default content parser
889	940	$tx->res->content->unsubscribe('read')->on(read => sub {
890	941	my ($content, $bytes) = @_;
...	...	@@ -908,60 +959,26 @@ Sending a streaming request is almost just as easy.
908	959	my $ua = Mojo::UserAgent->new;
909	960	my $tx = $ua->build_tx(GET => 'http://example.com');
910	961
911		- # Prepare content
912		- my $content = 'Hello world!';
913		- $tx->req->headers->content_length(length $content);
	962	+ # Prepare body
	963	+ my $body = 'Hello world!';
	964	+ $tx->req->headers->content_length(length $body);
914	965
915	966	# Start writing directly with a drain callback
916	967	my $drain;
917	968	$drain = sub {
918		- my $req = shift;
919		- my $chunk = substr $content, 0, 1, '';
920		- $drain = undef unless length $content;
921		- $req->write($chunk, $drain);
	969	+ my $content = shift;
	970	+ my $chunk = substr $body, 0, 1, '';
	971	+ $drain = undef unless length $body;
	972	+ $content->write($chunk, $drain);
922	973	};
923		- $tx->req->$drain;
	974	+ $tx->req->content->$drain;
924	975
925	976	# Process transaction
926	977	$ua->start($tx);
927	978
928		-The drain callback passed to L<Mojo::Message/"write"> will be invoked whenever
	979	+The drain callback passed to L<Mojo::Content/"write"> will be invoked whenever
929	980	the entire previous chunk has actually been written.
930	981
931		-=head2 Large file downloads
932		-
933		-When downloading large files with L<Mojo::UserAgent> you don't have to worry
934		-about memory usage at all, because it will automatically stream everything
935		-above C<250KB> into a temporary file.
936		-
937		- use Mojo::UserAgent;
938		-
939		- # Lets fetch the latest Mojolicious tarball
940		- my $ua = Mojo::UserAgent->new(max_redirects => 5);
941		- my $tx = $ua->get('latest.mojolicio.us');
942		- $tx->res->content->asset->move_to('mojo.tar.gz');
943		-
944		-To protect you from excessively large files there is also a limit of C<5MB> by
945		-default, which you can tweak with the MOJO_MAX_MESSAGE_SIZE environment
946		-variable.
947		-
948		- # Increase limit to 1GB
949		- $ENV{MOJO_MAX_MESSAGE_SIZE} = 1073741824;
950		-
951		-=head2 Large file upload
952		-
953		-Uploading a large file is even easier.
954		-
955		- use Mojo::UserAgent;
956		-
957		- # Upload file via POST and "multipart/form-data"
958		- my $ua = Mojo::UserAgent->new;
959		- $ua->post('example.com/upload' =>
960		- form => {image => {file => '/home/sri/hello.png'}});
961		-
962		-And once again you don't have to worry about memory usage, all data will be
963		-streamed directly from the file.
964		-
965	982	=head2 Non-blocking
966	983
967	984	L<Mojo::UserAgent> has been designed from the ground up to be non-blocking,
...	...	@@ -974,12 +991,12 @@ can keep many parallel connections active at the same time.
974	991
975	992	# Parallel non-blocking requests
976	993	my $ua = Mojo::UserAgent->new;
977		- $ua->get('http://mojolicio.us' => sub {
978		- my ($ua, $tx) = @_;
	994	+ $ua->get('http://metacpan.org/search?q=mojo' => sub {
	995	+ my ($ua, $mojo) = @_;
979	996	...
980	997	});
981		- $ua->get('http://mojolicio.us/perldoc' => sub {
982		- my ($ua, $tx) = @_;
	998	+ $ua->get('http://metacpan.org/search?q=mango' => sub {
	999	+ my ($ua, $mango) = @_;
983	1000	...
984	1001	});
985	1002
...	...	@@ -990,34 +1007,34 @@ You can take full control of the L<Mojo::IOLoop> event loop.
990	1007
991	1008	=head2 Parallel blocking requests
992	1009
993		-You can emulate blocking behavior by using a L<Mojo::IOLoop> delay to
994		-synchronize multiple non-blocking requests. Just be aware that the resulting
995		-transactions will be in random order.
	1010	+You can emulate blocking behavior by using L<Mojo::IOLoop/"delay"> to
	1011	+synchronize multiple non-blocking requests.
996	1012
997	1013	use Mojo::UserAgent;
998	1014	use Mojo::IOLoop;
999	1015
1000		- # Synchronize non-blocking requests and capture result
	1016	+ # Synchronize non-blocking requests and capture results
1001	1017	my $ua = Mojo::UserAgent->new;
1002	1018	my $delay = Mojo::IOLoop->delay;
1003		- $ua->get('http://mojolicio.us' => $delay->begin);
1004		- $ua->get('http://mojolicio.us/perldoc' => $delay->begin);
1005		- my ($tx, $tx2) = $delay->wait;
	1019	+ $ua->get('http://metacpan.org/search?q=mojo' => $delay->begin);
	1020	+ $ua->get('http://metacpan.org/search?q=mango' => $delay->begin);
	1021	+ my ($mojo, $mango) = $delay->wait;
1006	1022
1007	1023	The event L<Mojo::IOLoop::Delay/"finish"> can be used for code that needs to
1008		-be able to work standalone as well as inside L<Mojolicious> applications.
	1024	+be able to work standalone as well as inside an already running event loop.
1009	1025
1010	1026	use Mojo::UserAgent;
1011	1027	use Mojo::IOLoop;
1012	1028
1013	1029	# Synchronize non-blocking requests portably
1014	1030	my $ua = Mojo::UserAgent->new;
1015		- my $delay = Mojo::IOLoop->delay(sub {
1016		- my ($delay, $tx, $tx2) = @_;
	1031	+ my $delay = Mojo::IOLoop->delay;
	1032	+ $delay->on(finish => sub {
	1033	+ my ($delay, $mojo, $mango) = @_;
1017	1034	...
1018	1035	});
1019		- $ua->get('http://mojolicio.us' => $delay->begin);
1020		- $ua->get('http://mojolicio.us/perldoc' => $delay->begin);
	1036	+ $ua->get('http://metacpan.org/search?q=mojo' => $delay->begin);
	1037	+ $ua->get('http://metacpan.org/search?q=mango' => $delay->begin);
1021	1038	$delay->wait unless Mojo::IOLoop->is_running;
1022	1039
1023	1040	=head2 Command line
...	...	@@ -1052,19 +1069,19 @@ The request can be customized as well.
1052	1069
1053	1070	You can follow redirects and view the headers for all messages.
1054	1071
1055		- $ mojo get -r -v http://reddit.com 'head > title'
	1072	+ $ mojo get -r -v http://google.com 'head > title'
1056	1073
1057	1074	Extract just the information you really need from JSON data structures.
1058	1075
1059		- $ mojo get http://search.twitter.com/search.json /error
	1076	+ $ mojo get https://api.metacpan.org/v0/author/SRI /name
1060	1077
1061	1078	This can be an invaluable tool for testing your applications.
1062	1079
1063	1080	$ ./myapp.pl get /welcome 'head > title'
1064	1081
1065		-=head2 Oneliners
	1082	+=head2 One-liners
1066	1083
1067		-For quick hacks and especially testing, L<ojo> oneliners are also a great
	1084	+For quick hacks and especially testing, L<ojo> one-liners are also a great
1068	1085	choice.
1069	1086
1070	1087	$ perl -Mojo -E 'say g("mojolicio.us")->dom->html->head->title->text'
...	...	@@ -1097,7 +1114,7 @@ that they will be picked up automatically by the command line interface?
1097	1114
1098	1115	1;
1099	1116
1100		-There are many more useful methods and attributes in L<Mojolicious::Command>
	1117	+There are many more useful attributes and methods in L<Mojolicious::Command>
1101	1118	that you can use or overload.
1102	1119
1103	1120	$ mojo spy secret
...	...	@@ -1124,32 +1141,34 @@ namespace.
1124	1141
1125	1142	=head2 Running code against your application
1126	1143
1127		-Ever thought about running a quick oneliner against your L<Mojolicious>
	1144	+Ever thought about running a quick one-liner against your L<Mojolicious>
1128	1145	application to test something? Thanks to the C<eval> command you can do just
1129	1146	that, the application object itself can be accessed via C<app>.
1130	1147
1131		- $ mojo generate lite_app
	1148	+ $ mojo generate lite_app myapp.pl
1132	1149	$ ./myapp.pl eval 'say for @{app->static->paths}'
1133	1150
1134		-The C<verbose> option will automatically print the return value to C<STDOUT>.
	1151	+The C<verbose> options will automatically print the return value or returned
	1152	+data structure to C<STDOUT>.
1135	1153
1136	1154	$ ./myapp.pl eval -v 'app->static->paths->[0]'
	1155	+ $ ./myapp.pl eval -V 'app->static->paths'
1137	1156
1138	1157	=head2 Making your application installable
1139	1158
1140	1159	Ever thought about releasing your L<Mojolicious> application to CPAN? It's
1141	1160	actually much easier than you might think.
1142	1161
1143		- $ mojo generate app
1144		- $ cd my_mojolicious_app
1145		- $ mv public lib/MyMojoliciousApp/
1146		- $ mv templates lib/MyMojoliciousApp/
	1162	+ $ mojo generate app MyApp
	1163	+ $ cd my_app
	1164	+ $ mv public lib/MyApp/
	1165	+ $ mv templates lib/MyApp/
1147	1166
1148	1167	The trick is to move the C<public> and C<templates> directories so they can
1149	1168	get automatically installed with the modules.
1150	1169
1151	1170	# Application
1152		- package MyMojoliciousApp;
	1171	+ package MyApp;
1153	1172	use Mojo::Base 'Mojolicious';
1154	1173
1155	1174	use File::Basename 'dirname';
...	...	@@ -1162,7 +1181,7 @@ get automatically installed with the modules.
1162	1181	my $self = shift;
1163	1182
1164	1183	# Switch to installable home directory
1165		- $self->home->parse(catdir(dirname(__FILE__), 'MyMojoliciousApp'));
	1184	+ $self->home->parse(catdir(dirname(__FILE__), 'MyApp'));
1166	1185
1167	1186	# Switch to installable "public" directory
1168	1187	$self->static->paths->[0] = $self->home->rel_dir('public');
...	...	@@ -1181,7 +1200,7 @@ get automatically installed with the modules.
1181	1200	That's really everything, now you can package your application like any other
1182	1201	CPAN module.
1183	1202
1184		- $ ./script/my_mojolicious_app generate makefile
	1203	+ $ ./script/my_app generate makefile
1185	1204	$ perl Makefile.PL
1186	1205	$ make test
1187	1206	$ make manifest
...	...	@@ -1190,7 +1209,7 @@ CPAN module.
1190	1209	And if you have a C<PAUSE> account (which can be requested at
1191	1210	L<http://pause.perl.org>) even upload it.
1192	1211
1193		- $ mojo cpanify -u USER -p PASS MyMojoliciousApp-0.01.tar.gz
	1212	+ $ mojo cpanify -u USER -p PASS MyApp-0.01.tar.gz
1194	1213
1195	1214	=head2 Hello World
1196	1215
...	...	@@ -1206,10 +1225,10 @@ rendering kicks in even if no actual code gets executed by the router. The
1206	1225	renderer just picks up the C<text> value from the stash and generates a
1207	1226	response.
1208	1227
1209		-=head2 Hello World oneliners
	1228	+=head2 Hello World one-liners
1210	1229
1211	1230	The C<Hello World> example above can get even a little bit shorter in an
1212		-L<ojo> oneliner.
	1231	+L<ojo> one-liner.
1213	1232
1214	1233	$ perl -Mojo -E 'a({text => "Hello World!"})->start' daemon
1215	1234

+3 -1

mojo/lib/Mojolicious/Guides/FAQ.pod

View

@@ -1,4 +1,6 @@
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Guides::FAQ - Frequently Asked Questions
@@ -62,7 +64,7 @@ which we already have done in the past.
 To protect your applications from excessively large requests and responses,
 our HTTP parser has a cap after which it will automatically stop accepting new
 data, and in most cases force the connection to be closed. This limit is
-around C<5MB> by default, you can use the MOJO_MAX_MESSAGE_SIZE environment
+around C<10MB> by default, you can use the MOJO_MAX_MESSAGE_SIZE environment
 variable to change this value.
 
 =head2 What does the error "Maximum line size exceeded" mean?

+6 -5

mojo/lib/Mojolicious/Guides/Growing.pod

View

@@ -1,4 +1,6 @@
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Guides::Growing - Growing
@@ -77,9 +79,8 @@ all session state is kept client-side.
   |         | <-    200 OK        <- |            |
   +---------+                        +------------+
 
-While HTTP methods such as C<PUT>, C<GET> and C<DELETE> are not directly part
-of REST they go very well with it and are commonly used to manipulate
-C<resources>.
+While HTTP methods such as PUT, GET and DELETE are not directly part of REST
+they go very well with it and are commonly used to manipulate C<resources>.
 
 =head2 Sessions
 
@@ -163,8 +164,8 @@ organized CPAN distribution to maximize maintainability.
 
 Both application skeletons can be automatically generated.
 
-  $ mojo generate lite_app
-  $ mojo generate app
+  $ mojo generate lite_app myapp.pl
+  $ mojo generate app MyApp
 
 =head2 Foundation
 

+201 -20

mojo/lib/Mojolicious/Guides/Rendering.pod

View

@@ -167,21 +167,37 @@ There is one big difference though, by calling it manually you can make sure
 that templates use the current controller object, and not the default
 controller specified with the attribute L<Mojolicious/"controller_class">.
 
+  $self->render_later;
+
+You can also disable automatic rendering with the method
+L<Mojolicious::Controller/"render_later">, which can be very useful to delay
+rendering when a non-blocking operation has to be performed first.
+
 =head2 Rendering templates
 
-The renderer will always try to detect the right template but you can also
-use the C<template> stash value to render a specific one.
+The renderer will always try to detect the right template, but you can also
+use the C<template> stash value to render a specific one. Everything before
+the last slash will be interpreted as the subdirectory path in which to find
+the template.
 
-  $self->render(template => 'foo/bar');
+  # foo/bar/baz.*.*
+  $self->render(template => 'foo/bar/baz');
 
 Choosing a specific C<format> and C<handler> is just as easy.
 
-  $self->render(template => 'foo/bar', format => 'txt', handler => 'epl');
+  # foo/bar/baz.txt.epl
+  $self->render(template => 'foo/bar/baz', format => 'txt', handler => 'epl');
 
 Because rendering a specific template is the most common task it also has a
 shortcut.
 
-  $self->render('foo/bar');
+  $self->render('foo/bar/baz');
+
+If you're not sure in advance if a template actually exists, you can also use
+the method L<Mojolicious::Controller/"render_maybe"> to try multiple
+alternatives.
+
+  $self->render_maybe('localized/baz') or $self->render('foo/bar/baz');
 
 =head2 Rendering inline templates
 
@@ -199,7 +215,7 @@ too.
 Characters can be rendered to bytes with the C<text> stash value, the given
 content will be automatically encoded to bytes.
 
-  $self->render(text => 'Hello Wörld!');
+  $self->render(text => 'I ♥ Mojolicious!');
 
 =head2 Rendering data
 
@@ -226,7 +242,8 @@ C<partial> stash value.
 No encoding will be performed, making it easy to reuse the result in other
 templates or to generate binary data.
 
-  $self->render(data => $self->render('pdf_invoice', partial => 1));
+  my $pdf = $self->render('invoice', format => 'pdf', partial => 1);
+  $self->render(data => $pdf, format => 'pdf');
 
 =head2 Status code
 
@@ -239,8 +256,12 @@ Response status codes can be changed with the C<status> stash value.
 The C<Content-Type> header of the response is actually based on the MIME type
 mapping of the C<format> stash value.
 
+  # Content-Type: text/plain
   $self->render(text => 'Hello.', format => 'txt');
 
+  # Content-Type: image/png
+  $self->render(data => $bytes, format => 'png');
+
 These mappings can be easily extended or changed with L<Mojolicious/"types">.
 
   # Application
@@ -299,12 +320,14 @@ L<Mojolicious::Controller/"render">.
 
 The best possible representation will be automatically selected from the
 C<Accept> request header, C<format> stash value or C<format> GET/POST
-parameter.
+parameter and stored in the C<format> stash value. To change MIME type
+mappings for the C<Accept> request header or the C<Content-Type> response
+header you can use L<Mojolicious/"types">.
 
   $self->respond_to(
     json => {json => {hello => 'world'}},
     html => sub {
-      $self->content_for(head => '<meta name="author" content="sri" />');
+      $self->content_for(head => '<meta name="author" content="sri">');
       $self->render(template => 'hello', message => 'world')
     }
   );
@@ -591,6 +614,135 @@ template with named blocks that child templates can override.
 
 This chain could go on and on to allow a very high level of template reuse.
 
+=head2 Form validation
+
+You can use L<Mojolicious::Controller/"validation"> to validate GET/POST
+parameters submitted to your application. All unknown fields will be ignored
+by default, so you have to decide which should be required or optional before
+you can perform checks on their values. Every check is performed right away,
+so you can use the results immediately to build more advanced validation logic
+with methods like L<Mojolicious::Validator::Validation/"is_valid">.
+
+  use Mojolicious::Lite;
+
+  get '/' => sub {
+    my $self = shift;
+
+    # Check if parameters have been submitted
+    my $validation = $self->validation;
+    return $self->render unless $validation->has_data;
+
+    # Validate parameters ("pass_again" depends on "pass")
+    $validation->required('user')->size(1, 20)->like(qr/^[e-t]+$/);
+    $validation->required('pass_again')->equal_to('pass')
+      if $validation->optional('pass')->size(7, 500)->is_valid;
+
+    # Render confirmation if validation was successful
+    $self->render('thanks') unless $validation->has_error;
+  } => 'index';
+
+  app->start;
+  __DATA__
+
+  @@ index.html.ep
+  <!DOCTYPE html>
+  <html>
+    <head>
+      %= stylesheet begin
+        label.field-with-error { color: #dd7e5e }
+        input.field-with-error { background-color: #fd9e7e }
+      % end
+    </head>
+    <body>
+      %= form_for index => begin
+        %= label_for user => 'Username (required, 1-20 characters, only e-t)'
+        <br>
+        %= text_field 'user'
+        %= submit_button
+        <br>
+        %= label_for pass => 'Password (optional, 7-500 characters)'
+        <br>
+        %= password_field 'pass'
+        <br>
+        %= label_for pass_again => 'Password again (equal to the value above)'
+        <br>
+        %= password_field 'pass_again'
+      % end
+    </body>
+  </html>
+
+  @@ thanks.html.ep
+  <!DOCTYPE html>
+  <html><body>Thank you <%= validation->param('user') %>.</body></html>
+
+Form elements generated with tag helpers from
+L<Mojolicious::Plugin::TagHelpers> will automatically remember their previous
+values and add the class C<field-with-error> for fields that failed validation
+to make styling with CSS easier.
+
+  <label class="field-with-error" for="user">
+    Username (required, only characters e-t)
+  </label>
+  <input class="field-with-error" type="text" name="user" value="sri" />
+
+For a full list of available checks see also
+L<Mojolicious::Validator/"CHECKS">.
+
+=head2 Adding form validation checks
+
+Validation checks can be registered with L<Mojolicious::Validator/"add_check">
+and return a false value if they were successful. A true value may be used to
+pass along additional information which can then be retrieved with
+L<Mojolicious::Validator::Validation/"error">.
+
+  use Mojolicious::Lite;
+
+  # Add "range" check
+  app->validator->add_check(range => sub {
+    my ($validation, $name, $value, $min, $max) = @_;
+    return $value < $min || $value > $max;
+  });
+
+  get '/' => 'form';
+
+  post '/test' => sub {
+    my $self = shift;
+
+    # Validate parameters with custom check
+    my $validation = $self->validation;
+    $validation->required('number')->range(3, 23);
+
+    # Render form again if validation failed
+    return $self->render('form') if $validation->has_error;
+
+    # Prevent double submit with redirect
+    $self->flash(number => $validation->param('number'));
+    $self->redirect_to('form');
+  };
+
+  app->start;
+  __DATA__
+
+  @@ form.html.ep
+  <!DOCTYPE html>
+  <html>
+    <body>
+      % if (my $number = flash 'number') {
+        <p>Thanks, the number <%= $number %> was valid.</p>
+      % }
+      %= form_for test => begin
+        % if (my $err = validation->error('number')) {
+          <p>
+            %= 'Value is required.' if $err->[0] eq 'required'
+            %= 'Value needs to be between 3 and 23.' if $err->[0] eq 'range'
+          </p>
+        % }
+        %= text_field 'number'
+        %= submit_button
+      % end
+    </html>
+  </html>
+
 =head2 Adding helpers
 
 Adding and redefining helpers is very easy, you can use them to do pretty much
@@ -660,7 +812,8 @@ applications, plugins make that very simple.
 
   1;
 
-The C<register> method will be called when you load the plugin.
+The C<register> method will be called when you load the plugin and to add your
+helper to the application you can use L<Mojolicious/"helper">.
 
   use Mojolicious::Lite;
 
@@ -800,16 +953,17 @@ C<after_render>.
   use IO::Compress::Gzip 'gzip';
 
   hook after_render => sub {
-    my ($self, $output, $format) = @_;
+    my ($c, $output, $format) = @_;
 
     # Check if "gzip => 1" has been set in the stash
-    return unless $self->stash->{gzip};
+    return unless $c->stash->{gzip};
 
     # Check if user agent accepts GZip compression
-    return unless ($self->req->headers->accept_encoding // '') =~ /gzip/i;
+    return unless ($c->req->headers->accept_encoding // '') =~ /gzip/i;
+    $c->res->headers->append(Vary => 'Accept-Encoding');
 
     # Compress content with GZip
-    $self->res->headers->content_encoding('gzip');
+    $c->res->headers->content_encoding('gzip');
     gzip $output, \my $compressed;
     $$output = $compressed;
   };
@@ -829,10 +983,10 @@ C<after_render>.
 =head2 Chunked transfer encoding
 
 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.
+advance, that's where the C<chunked> transfer encoding and
+L<Mojolicious::Controller/"write_chunk"> come 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.
 
   $self->write_chunk('<html><head><title>Example</title></head>' => sub {
     my $self = shift;
@@ -856,7 +1010,7 @@ might not work perfectly in all deployment environments.
 =head2 Encoding
 
 Templates stored in files are expected to be C<UTF-8> by default, but that can
-be easily changed.
+be easily changed with L<Mojolicious::Renderer/"encoding">.
 
   # Application
   package MyApp;
@@ -931,7 +1085,8 @@ L<Mojo::Template> contains the whole list of available options.
 
 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.
+a new C<handler> with L<Mojolicious::Renderer/"add_handler"> when C<register>
+is called.
 
   package Mojolicious::Plugin::MyRenderer;
   use Mojo::Base 'Mojolicious::Plugin';
@@ -983,6 +1138,32 @@ the renderer provides methods to help you with that.
   @@ index.html.mine
   ...
 
+=head2 Adding a handler to generate binary data
+
+By default the renderer assumes that every C<handler> generates characters
+that need to be automatically encoded, but this can be be easily disabled if
+you're generating bytes instead.
+
+  use Mojolicious::Lite;
+  use Mango::BSON ':bson';
+
+  # Add "bson" handler
+  app->renderer->add_handler(bson => sub {
+    my ($renderer, $c, $output, $options) = @_;
+
+    # Disable automatic encoding
+    delete $options->{encoding};
+
+    # Encode BSON data from stash value
+    $$output = bson_encode delete $c->stash->{bson};
+
+    return 1;
+  });
+
+  get '/' => {bson => {i => '♥ mojolicious'}, handler => 'bson'};
+
+  app->start;
+
 =head1 MORE
 
 You can continue with L<Mojolicious::Guides> now or take a look at the

+130 -40

mojo/lib/Mojolicious/Guides/Routing.pod

View

@@ -87,10 +87,12 @@ any time.
   /sebastian -> /:name -> {name => 'sebastian'}
   {name => 'sebastian'} -> /:name -> /sebastian
 
+Every placeholder has a name, even if it's just an empty string.
+
 =head2 Generic placeholders
 
-Generic placeholders are the simplest form of placeholders and match all
-characters except C</> and C<.>.
+Generic placeholders are the simplest form of placeholders, they use a colon
+prefix and match all characters except C</> and C<.>.
 
   /hello              -> /:name/hello -> undef
   /sebastian/23/hello -> /:name/hello -> undef
@@ -109,10 +111,15 @@ surrounding text.
   /sebastian23hello  -> /(:name)hello -> {name => 'sebastian23'}
   /sebastian 23hello -> /(:name)hello -> {name => 'sebastian 23'}
 
+The colon prefix is optional for generic placeholders that are surrounded by
+parentheses.
+
+  /i♥mojolicious -> /(one)♥(two) -> {one => 'i', two => 'mojolicious'}
+
 =head2 Relaxed placeholders
 
-Relaxed placeholders are just like generic placeholders, but match all
-characters except C</>.
+Relaxed placeholders are just like generic placeholders, but use a hash prefix
+and match all characters except C</>.
 
   /hello              -> /#name/hello -> undef
   /sebastian/23/hello -> /#name/hello -> undef
@@ -123,8 +130,8 @@ characters except C</>.
 
 =head2 Wildcard placeholders
 
-Wildcard placeholders are just like the two placeholders above, but match
-absolutely everything, including C</> and C<.>.
+Wildcard placeholders are just like the two placeholders above, but use an
+asterisk prefix and match absolutely everything, including C</> and C<.>.
 
   /hello              -> /*name/hello -> undef
   /sebastian/23/hello -> /*name/hello -> {name => 'sebastian/23'}
@@ -139,8 +146,9 @@ Most commonly used features every L<Mojolicious> developer should know about.
 
 =head2 Minimal route
 
-Every L<Mojolicious> application has a router object you can use to generate
-route structures, that match in the same order in which they were defined.
+The attribute L<Mojolicious/"routes"> contains a router you can use to
+generate route structures, they match in the same order in which they were
+defined.
 
   # Application
   package MyApp;
@@ -158,8 +166,8 @@ route structures, that match in the same order in which they were defined.
 
   1;
 
-The minimal static route above will load and instantiate the class
-C<MyApp::Foo> and call its C<welcome> method.
+The minimal route above will load and instantiate the class C<MyApp::Foo> and
+call its C<welcome> method.
 
   # Controller
   package MyApp::Foo;
@@ -359,7 +367,17 @@ separated by other characters than C</>.
     ->to(controller => 'foo', action => 'bar');
 
 Special stash values like C<controller> and C<action> can also be
-placeholders, this allows for extremely flexible routes constructs.
+placeholders, which is very convenient especially during development, but
+should only be used very carefully, because every controller method becomes a
+potential route. All uppercase methods as well as those starting with an
+underscore are automatically hidden from the router and you can use
+L<Mojolicious::Routes/"hide"> to add additional ones.
+
+  # Hide "create" method in all controllers
+  $r->hide('create');
+
+This has already been done for all attributes and methods from
+L<Mojolicious::Controller>.
 
 =head2 More restrictive placeholders
 
@@ -448,6 +466,9 @@ L<Mojolicious::Controller/"url_for"> for this.
   # Generate URL "/foo/sebastian" for route "test"
   my $url = $self->url_for('test', name => 'sebastian');
 
+  # Generate URL "http://127.0.0.1:3000/foo/sebastian" for route "test"
+  my $url = $self->url_for('test', name => 'sebastian')->to_abs;
+
 Nameless routes get an automatically generated one assigned that is simply
 equal to the route itself without non-word characters.
 
@@ -489,7 +510,7 @@ methods to pass.
   $r->route('/bye')->via('GET', 'POST')
     ->to(controller => 'foo', action => 'bye');
 
-With one small exception, C<HEAD> requests are considered equal to C<GET> and
+With one small exception, HEAD requests are considered equal to GET and
 content will not be sent with the response.
 
   # GET /test  -> {controller => 'bar', action => 'test'}
@@ -500,7 +521,7 @@ content will not be sent with the response.
 =head2 WebSockets
 
 With the method L<Mojolicious::Routes::Route/"websocket"> you can restrict
-access to WebSocket handshakes, which are normal C<GET> requests with some
+access to WebSocket handshakes, which are normal GET requests with some
 additional information.
 
   # /echo (WebSocket handshake)
@@ -521,11 +542,16 @@ additional information.
 
   1;
 
+The connection gets established when you respond to the WebSocket handshake
+request with a C<101> response status, which happens automatically if you
+subscribe to an event with L<Mojolicious::Controller/"on"> or send a message
+with L<Mojolicious::Controller/"send"> right away.
+
 =head2 Bridges
 
-Bridge routes can be used to share code with multiple nested routes, because
-unlike normal nested routes, they always match and result in additional
-dispatch cycles.
+Bridge routes created with the method L<Mojolicious::Routes::Route/"bridge">
+can be used to share code with multiple nested routes, because unlike normal
+nested routes, they always match and result in additional dispatch cycles.
 
   # /foo     -> undef
   # /foo/bar -> {controller => 'foo', action => 'baz'}
@@ -551,11 +577,36 @@ be broken, this makes bridges a very powerful tool for authentication.
   });
   $foo->route('/bar')->to(controller => 'foo', action => 'bar');
 
+Broken dispatch chains can be continued by calling the method
+L<Mojolicious::Controller/"continue">, this allows for example non-blocking
+operations to finish before reaching the next dispatch cycle.
+
+  # /foo     -> undef
+  # /foo/bar -> {cb => sub {...}}
+  #          -> {controller => 'foo', action => 'bar'}
+  my $foo = $r->bridge('/foo')->to(cb => sub {
+    my $self = shift;
+
+    # Wait 3 seconds and then give visitors a 50% chance to continue
+    Mojo::IOLoop->timer(3 => sub {
+
+      # Loser
+      return $self->render(text => 'No luck.') unless int rand 2;
+
+      # Winner
+      $self->continue;
+    });
+
+    return undef;
+  });
+  $foo->route('/bar')->to(controller => 'foo', action => 'bar');
+
 =head2 More convenient routes
 
 From the tutorial you should already know L<Mojolicious::Lite> routes, which
 are in fact just a small convenience layer around everything described above
-and also part of the normal router.
+and accessible through methods like L<Mojolicious::Routes::Route/"get"> as
+part of the normal router.
 
   # POST /foo -> {controller => 'foo', action => 'abc'}
   $r->post('/foo')->to(controller => 'foo', action => 'abc');
@@ -570,11 +621,13 @@ and also part of the normal router.
   # * /yada.json -> {controller => 'foo', action => 'yada', format => 'json'}
   $r->any('/yada' => [format => [qw(txt json)]])->to('foo#yada');
 
-  # GET /foo/bar  -> {controller => 'foo', action => 'bar'}
-  # PUT /foo/baz  -> {controller => 'foo', action => 'baz'}
+  # GET   /foo/bar  -> {controller => 'foo', action => 'bar'}
+  # PUT   /foo/baz  -> {controller => 'foo', action => 'baz'}
+  # PATCH /foo      -> {controller => 'foo', action => 'yada'}
   my $foo = $r->any('/foo')->to('foo#');
   $foo->get('/bar')->to('#bar');
   $foo->put('/baz')->to('#baz');
+  $foo->patch->to('#yada');
 
 This makes the process of growing your L<Mojolicious::Lite> prototypes into
 full L<Mojolicious> applications very straightforward.
@@ -585,7 +638,8 @@ full L<Mojolicious> applications very straightforward.
     $self->render(text => 'Just like a Mojolicious::Lite action.');
   });
 
-Even the more abstract concepts are available.
+Even the more abstract concepts are available with methods like
+L<Mojolicious::Routes::Route/"under">.
 
   # GET  /yada
   # POST /yada
@@ -602,8 +656,9 @@ Even the more abstract concepts are available.
 =head2 Hooks
 
 Hooks operate outside the routing system and allow you to extend
-L<Mojolicious> itself by sharing code with all requests indiscriminately,
-which makes them a very powerful tool especially for plugins.
+the framework itself by sharing code with all requests indiscriminately
+through L<Mojolicious/"hook">, which makes them a very powerful tool
+especially for plugins.
 
   # Application
   package MyApp;
@@ -614,9 +669,9 @@ which makes them a very powerful tool especially for plugins.
 
     # Check all requests for a "/test" prefix
     $self->hook(before_dispatch => sub {
-      my $self = shift;
-      $self->render(text => 'This request did not reach the router.')
-        if $self->req->url->path->contains('/test');
+      my $c = shift;
+      $c->render(text => 'This request did not reach the router.')
+        if $c->req->url->path->contains('/test');
     });
 
     # These will not be reached if the hook above renders a response
@@ -627,29 +682,53 @@ which makes them a very powerful tool especially for plugins.
 
   1;
 
-Post-processing tasks such as setting additional response headers are a very
-common use.
+Post-processing the response to set additional headers is a very common use.
 
   # Make sure static files are cached
   $self->hook(after_static => sub {
-    my $self = shift;
-    $self->res->headers->cache_control('max-age=3600, must-revalidate');
+    my $c = shift;
+    $c->res->headers->cache_control('max-age=3600, must-revalidate');
   });
 
-Same for monitoring tasks.
+Same for pre-processing the request.
+
+  # Allow "_method" query parameter to override request method
+  $self->hook(before_dispatch => sub {
+    my $c = shift;
+    return unless my $method = $c->req->url->query->param('_method');
+    $c->req->method($method);
+  });
+
+Or more advanced extensions to add monitoring to your application.
 
   # Forward exceptions to a web service
   $self->hook(after_dispatch => sub {
-    my $self = shift;
-    return unless my $e = $self->stash('exception');
-    $self->ua->post('https://example.com/bugs' => form => {exception => $e});
+    my $c = shift;
+    return unless my $e = $c->stash('exception');
+    $c->ua->post('https://example.com/bugs' => form => {exception => $e});
   });
 
-For a full list of available hooks see L<Mojolicious/"hook">.
+You can even extend much of the core functionality.
+
+  # Make controller object available to actions as $_
+  $self->hook(around_action => sub {
+    my ($next, $c, $action, $last) = @_;
+    local $_ = $c;
+    return $next->();
+  });
+
+  # Pass route name as argument to actions
+  $self->hook(around_action => sub {
+    my ($next, $c, $action, $last) = @_;
+    return $c->$action($c->current_route);
+  });
+
+For a full list of available hooks see L<Mojolicious/"HOOKS">.
 
 =head2 Shortcuts
 
-You can also add your own shortcuts to make route generation more expressive.
+You can also add your own shortcuts with L<Mojolicious::Routes/"add_shortcut">
+to make route generation more expressive.
 
   # Simple "resource" shortcut
   $r->add_shortcut(resource => sub {
@@ -664,11 +743,19 @@ You can also add your own shortcuts to make route generation more expressive.
     # Handle GET requests
     $resource->get->to('#show')->name("show_$name");
 
+    # Handle OPTIONS requests
+    $resource->options(sub {
+      my $self = shift;
+      $self->res->headers->allow('POST, GET, OPTIONS');
+      $self->render(data => '', status => 204);
+    });
+
     return $resource;
   });
 
-  # POST /user -> {controller => 'user', action => 'create'}
-  # GET  /user -> {controller => 'user', action => 'show'}
+  # POST    /user -> {controller => 'user', action => 'create'}
+  # GET     /user -> {controller => 'user', action => 'show'}
+  # OPTIONS /user
   $r->resource('user');
 
 Shortcuts can lead to anything, routes, bridges or maybe even both. And watch
@@ -698,8 +785,9 @@ unescaped and decoded from bytes to characters.
 =head2 Rearranging routes
 
 Until the first request has been handled, all routes can still be moved around
-or even removed. Especially for rearranging routes created by plugins this can
-be very useful.
+or even removed with methods like L<Mojolicious::Routes::Route/"add_child">
+and L<Mojolicious::Routes::Route/"remove">. Especially for rearranging routes
+created by plugins this can be very useful.
 
   # GET /example/show -> {controller => 'example', action => 'show'}
   my $show = $r->get('/show')->to('example#show');
@@ -709,6 +797,8 @@ be very useful.
   $r->get('/secrets/show')->to('secrets#show')->name('show_secrets');
   $r->find('show_secrets')->remove;
 
+To find routes by their name you can use L<Mojolicious::Routes::Route/"find">.
+
 =head2 Conditions
 
 Sometimes you might need a little more power, for example to check the
@@ -756,7 +846,7 @@ You can also package your conditions as reusable plugins.
     $app->routes->add_condition(werewolf => sub {
       my ($route, $c, $captures, $days) = @_;
 
-      # Keep the werewolfs out!
+      # Keep the werewolves out!
       return undef if abs(14 - (phase(time))[2]) > ($days / 2);
 
       # It's ok, no werewolf

+80 -36

mojo/lib/Mojolicious/Lite.pm

View

@@ -4,7 +4,7 @@ use Mojo::Base 'Mojolicious';
 # "Bender: Bite my shiny metal ass!"
 use File::Basename qw(basename dirname);
 use File::Spec::Functions 'catdir';
-use Mojo::UserAgent;
+use Mojo::UserAgent::Server;
 use Mojo::Util 'monkey_patch';
 
 sub import {
@@ -20,17 +20,14 @@ sub import {
   my $caller = caller;
   no strict 'refs';
   push @{"${caller}::ISA"}, 'Mojo';
-  my $app = shift->new;
 
   # Generate moniker based on filename
   my $moniker = basename $ENV{MOJO_EXE};
   $moniker =~ s/\.(?:pl|pm|t)$//i;
-  $app->moniker($moniker);
+  my $app = shift->new(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;
 
   # The Mojolicious::Lite DSL
@@ -42,8 +39,8 @@ sub import {
     for qw(new app);
   monkey_patch $caller, del => sub { $routes->delete(@_) };
   monkey_patch $caller, group => sub (&) {
-    my $old = $root;
-    $_[0]->($root = $routes);
+    (my $old, $root) = ($root, $routes);
+    shift->();
     ($routes, $root) = ($root, $old);
   };
   monkey_patch $caller,
@@ -53,7 +50,7 @@ sub import {
     under  => sub { $routes = $root->under(@_) };
 
   # Make sure there's a default application for testing
-  Mojo::UserAgent->app($app) unless Mojo::UserAgent->app;
+  Mojo::UserAgent::Server->app($app) unless Mojo::UserAgent::Server->app;
 
   # Lite apps are strict!
   Mojo::Base->import(-strict);
@@ -112,7 +109,7 @@ featured web application.
 
 There is also a helper command to generate a small example application.
 
-  $ mojo generate lite_app
+  $ mojo generate lite_app myapp.pl
 
 =head2 Commands
 
@@ -147,6 +144,9 @@ every change.
   $ morbo myapp.pl
   Server available at http://127.0.0.1:3000.
 
+For more information about how to deploy your application see also
+L<Mojolicious::Guides::Cookbook/"DEPLOYMENT">.
+
 =head2 Routes
 
 Routes are basically just fancy paths that can contain different kinds of
@@ -169,7 +169,7 @@ L<Mojolicious::Controller/"render">, but more about that later.
 
 =head2 GET/POST parameters
 
-All C<GET> and C<POST> parameters sent with the request are accessible via
+All GET and POST parameters sent with the request are accessible via
 L<Mojolicious::Controller/"param">.
 
   use Mojolicious::Lite;
@@ -213,15 +213,21 @@ full access to all HTTP features and information.
 
   use Mojolicious::Lite;
 
-  # Access request and reponse information
+  # Access request information
   get '/agent' => sub {
     my $self = shift;
     my $host = $self->req->url->to_abs->host;
     my $ua   = $self->req->headers->user_agent;
-    $self->res->headers->header('X-Bender' => 'Bite my shiny metal ass!');
     $self->render(text => "Request by $ua reached $host.");
   };
 
+  # Echo the request body and send custom header with response
+  get '/echo' => sub {
+    my $self = shift;
+    $self->res->headers->header('X-Bender' => 'Bite my shiny metal ass!');
+    $self->render(data => $self->req->body);
+  };
+
   app->start;
 
 =head2 Route names
@@ -280,6 +286,9 @@ L<Mojolicious::Plugin::DefaultHelpers/"content">.
     <body><%= content %></body>
   </html>
 
+The stash or helpers like L<Mojolicious::Plugin::DefaultHelpers/"title"> can
+be used to pass additional data to the layout.
+
 =head2 Blocks
 
 Template blocks can be used like normal Perl functions and are always
@@ -464,7 +473,8 @@ Routes can be restricted to specific request methods with different keywords.
 
 =head2 Optional placeholders
 
-Routes allow default values to make placeholders optional.
+All placeholders require a value, but by assigning them default values you can
+make capturing optional.
 
   use Mojolicious::Lite;
 
@@ -520,8 +530,8 @@ is fine though.
 =head2 Under
 
 Authentication and code shared between multiple routes can be realized easily
-with bridge routes generated by the C<under> statement. All following routes
-are only evaluated if the callback returned a true value.
+with bridge routes generated by the L</"under"> statement. All following
+routes are only evaluated if the callback returned a true value.
 
   use Mojolicious::Lite;
 
@@ -550,7 +560,7 @@ are only evaluated if the callback returned a true value.
   @@ index.html.ep
   Hi Bender.
 
-Prefixing multiple routes is another good use for C<under>.
+Prefixing multiple routes is another good use for L</"under">.
 
   use Mojolicious::Lite;
 
@@ -564,15 +574,15 @@ Prefixing multiple routes is another good use for C<under>.
   get '/baz' => {text => 'foo baz'};
 
   # / (reset)
-  under '/' => {message => 'whatever'};
+  under '/' => {msg => 'whatever'};
 
   # /bar
-  get '/bar' => {inline => '<%= $message %> works'};
+  get '/bar' => {inline => '<%= $msg %> works'};
 
   app->start;
 
-You can also C<group> related routes, which allows nesting of multiple
-C<under> statements.
+You can also L</"group"> related routes, which allows nesting of multiple
+L</"under"> statements.
 
   use Mojolicious::Lite;
 
@@ -830,8 +840,8 @@ temporary file.
     </body>
   </html>
 
-To protect you from excessively large files there is also a limit of C<5MB> by
-default, which you can tweak with the MOJO_MAX_MESSAGE_SIZE environment
+To protect you from excessively large files there is also a limit of C<10MB>
+by default, which you can tweak with the MOJO_MAX_MESSAGE_SIZE environment
 variable.
 
   # Increase limit to 1GB
@@ -839,21 +849,51 @@ variable.
 
 =head2 User agent
 
-With L<Mojolicious::Controller/"ua"> there's a full featured HTTP and
+With L<Mojo::UserAgent>, which is available through the helper
+L<Mojolicious::Plugin::DefaultHelpers/"ua">, there's a full featured HTTP and
 WebSocket user agent built right in. Especially in combination with
 L<Mojo::JSON> and L<Mojo::DOM> this can be a very powerful tool.
 
   use Mojolicious::Lite;
 
+  # Blocking
   get '/headers' => sub {
     my $self = shift;
     my $url  = $self->param('url') || 'http://mojolicio.us';
     my $dom  = $self->ua->get($url)->res->dom;
-    $self->render(json => [$dom->find('h1, h2, h3')->pluck('text')->each]);
+    $self->render(json => [$dom->find('h1, h2, h3')->text->each]);
+  };
+
+  # Non-blocking
+  get '/title' => sub {
+    my $self = shift;
+    $self->ua->get('mojolicio.us' => sub {
+      my ($ua, $tx) = @_;
+      $self->render(data => $tx->res->dom->at('title')->text);
+    });
+  };
+
+  # Parallel non-blocking
+  get '/titles' => sub {
+    my $self = shift;
+    my $delay = Mojo::IOLoop->delay(sub {
+      my ($delay, @titles) = @_;
+      $self->render(json => \@titles);
+    });
+    for my $url ('http://mojolicio.us', 'https://metacpan.org') {
+      my $end = $delay->begin(0);
+      $self->ua->get($url => sub {
+        my ($ua, $tx) = @_;
+        $end->($tx->res->dom->html->head->title->text);
+      });
+    }
   };
 
   app->start;
 
+For more information about the user agent see also
+L<Mojolicious::Guides::Cookbook/"USER AGENT">.
+
 =head2 WebSockets
 
 WebSocket applications have never been this simple before. Just receive
@@ -901,14 +941,18 @@ L<Mojolicious::Guides::Cookbook/"REAL-TIME WEB">.
 
 You can use the L<Mojo::Log> object from L<Mojo/"log"> to portably collect
 debug messages and automatically disable them later in a production setup by
-changing the L<Mojolicious> operating mode.
+changing the L<Mojolicious> operating mode, which can also be retrieved from
+the attribute L<Mojolicious/"mode">.
 
   use Mojolicious::Lite;
 
+  # Prepare mode specific message during startup
+  my $msg = app->mode eq 'development' ? 'Development!' : 'Something else!';
+
   get '/' => sub {
     my $self = shift;
-    $self->app->log->debug('Rendering "Hello World!" message.');
-    $self->render(text => 'Hello World!');
+    $self->app->log->debug('Rendering mode specific message.');
+    $self->render(text => $msg);
   };
 
   app->log->debug('Starting application.');
@@ -926,7 +970,7 @@ C<log> directory exists.
 
   $ mkdir log
 
-Mode changes also affects a few other aspects of the framework, such as mode
+Mode changes also affect a few other aspects of the framework, such as mode
 specific C<exception> and C<not_found> templates.
 
 =head2 Testing
@@ -980,13 +1024,13 @@ The L<Mojolicious::Lite> application.
   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.
+DELETE requests. See also the tutorial above for more argument variations.
 
 =head2 get
 
   my $route = get '/:foo' => sub {...};
 
-Generate route with L<Mojolicious::Routes::Route/"get">, matching only C<GET>
+Generate route with L<Mojolicious::Routes::Route/"get">, matching only GET
 requests. See also the tutorial above for more argument variations.
 
 =head2 group
@@ -1012,7 +1056,7 @@ Share code with L<Mojolicious/"hook">.
   my $route = options '/:foo' => sub {...};
 
 Generate route with L<Mojolicious::Routes::Route/"options">, matching only
-C<OPTIONS> requests. See also the tutorial above for more argument
+OPTIONS requests. See also the tutorial above for more argument
 variations.
 
 =head2 patch
@@ -1020,7 +1064,7 @@ variations.
   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.
+PATCH requests. See also the tutorial above for more argument variations.
 
 =head2 plugin
 
@@ -1033,19 +1077,19 @@ Load a plugin with L<Mojolicious/"plugin">.
   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.
+POST requests. See also the tutorial above for more argument variations.
 
 =head2 put
 
   my $route = put '/:foo' => sub {...};
 
-Generate route with L<Mojolicious::Routes::Route/"put">, matching only C<PUT>
+Generate route with L<Mojolicious::Routes::Route/"put">, matching only PUT
 requests. See also the tutorial above for more argument variations.
 
 =head2 under
 
-  my $route = under sub {...};
-  my $route = under '/:foo';
+  my $bridge = under sub {...};
+  my $bridge = under '/:foo';
 
 Generate bridge route with L<Mojolicious::Routes::Route/"under">, to which all
 following routes are automatically appended. See also the tutorial above for

+3 -1

mojo/lib/Mojolicious/Plugin.pm

View

@@ -7,13 +7,15 @@ sub register { croak 'Method "register" not implemented by subclass' }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Plugin - Plugin base class
 
 =head1 SYNOPSIS
 
-  # Camel case plugin name
+  # CamelCase plugin name
   package Mojolicious::Plugin::MyPlugin;
   use Mojo::Base 'Mojolicious::Plugin';
 

+4 -2

mojo/lib/Mojolicious/Plugin/Charset.pm

View

@@ -13,6 +13,8 @@ sub register {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Plugin::Charset - Charset plugin
@@ -53,8 +55,8 @@ L<Mojolicious::Plugin> and implements the following new ones.
 
   $plugin->register(Mojolicious->new, {charset => 'Shift_JIS'});
 
-Register C<before_dispatch> hook in L<Mojolicious> application and change a
-few defaults.
+Register hook L<Mojolicious/"before_dispatch"> in application and change a few
+defaults.
 
 =head1 SEE ALSO
 

+6 -3

mojo/lib/Mojolicious/Plugin/Config.pm

View

@@ -14,8 +14,9 @@ sub parse {
   my ($self, $content, $file, $conf, $app) = @_;
 
   # Run Perl code
-  my $config = eval 'package Mojolicious::Plugin::Config::Sandbox;'
-    . "no warnings; sub app { \$app }; use Mojo::Base -strict; $content";
+  my $config
+    = eval 'package Mojolicious::Plugin::Config::Sandbox; no warnings;'
+    . "sub app; local *app = sub { \$app }; use Mojo::Base -strict; $content";
   die qq{Couldn't load configuration from file "$file": $@} if !$config && $@;
   die qq{Config file "$file" did not return a hash reference.\n}
     unless ref $config eq 'HASH';
@@ -58,6 +59,8 @@ sub register {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Plugin::Config - Perl-ish configuration plugin
@@ -137,7 +140,7 @@ L<Mojolicious::Plugin> and implements the following new ones.
 
   $plugin->load($file, $conf, $app);
 
-Loads configuration file and passes the content to C<parse>.
+Loads configuration file and passes the content to L</"parse">.
 
   sub load {
     my ($self, $file, $conf, $app) = @_;

+34 -22

mojo/lib/Mojolicious/Plugin/DefaultHelpers.pm

View

@@ -1,14 +1,14 @@
 package Mojolicious::Plugin::DefaultHelpers;
 use Mojo::Base 'Mojolicious::Plugin';
 
-use Data::Dumper ();
 use Mojo::ByteStream;
+use Mojo::Util 'dumper';
 
 sub register {
   my ($self, $app) = @_;
 
   # Controller alias helpers
-  for my $name (qw(app flash param stash session url_for)) {
+  for my $name (qw(app flash param stash session url_for validation)) {
     $app->helper($name => sub { shift->$name(@_) });
   }
 
@@ -26,13 +26,13 @@ sub register {
   }
 
   $app->helper(config => sub { shift->app->config(@_) });
-
   $app->helper(content       => \&_content);
   $app->helper(content_for   => \&_content_for);
   $app->helper(current_route => \&_current_route);
-  $app->helper(dumper        => \&_dumper);
+  $app->helper(dumper        => sub { shift; dumper(@_) });
   $app->helper(include       => \&_include);
-  $app->helper(url_with      => \&_url_with);
+  $app->helper(ua => sub { shift->app->ua });
+  $app->helper(url_with => \&_url_with);
 }
 
 sub _content {
@@ -41,7 +41,7 @@ sub _content {
 
   # Set (first come)
   my $c = $self->stash->{'mojo.content'} ||= {};
-  $c->{$name} ||= ref $content eq 'CODE' ? $content->() : $content
+  $c->{$name} = defined $c->{$name} ? $c->{$name} : ref $content eq 'CODE' ? $content->() : $content
     if defined $content;
 
   # Get
@@ -61,16 +61,10 @@ sub _current_route {
   return $endpoint->name eq shift;
 }
 
-sub _dumper {
-  my $self = shift;
-  return Data::Dumper->new([@_])->Indent(1)->Sortkeys(1)->Terse(1)->Dump;
-}
-
 sub _include {
   my $self     = shift;
   my $template = @_ % 2 ? shift : undef;
-  my $args     = {@_};
-  $args->{template} = $template if defined $template;
+  my $args     = {@_, defined $template ? (template => $template) : ()};
 
   # "layout" and "extends" can't be localized
   my $layout  = delete $args->{layout};
@@ -80,7 +74,7 @@ sub _include {
   my @keys = keys %$args;
   local @{$self->stash}{@keys} = @{$args}{@keys};
 
-  return $self->render(partial => 1, layout => $layout, extend => $extends);
+  return $self->render(partial => 1, layout => $layout, extends => $extends);
 }
 
 sub _url_with {
@@ -90,6 +84,8 @@ sub _url_with {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Plugin::DefaultHelpers - Default helpers plugin
@@ -136,7 +132,10 @@ Alias for L<Mojo/"config">.
   %= content 'bar'
   %= content
 
-Store partial rendered content in named buffer and retrieve it.
+Store partial rendered content in named buffer and retrieve it, defaults to
+retrieving the named buffer C<content>, which is commonly used for the
+renderers C<layout> and C<extends> features. Note that new content will be
+ignored if the named buffer is already in use.
 
 =head2 content_for
 
@@ -145,7 +144,8 @@ Store partial rendered content in named buffer and retrieve it.
   % end
   %= content_for 'foo'
 
-Append partial rendered content to named buffer and retrieve it.
+Append partial rendered content to named buffer and retrieve it. Note that
+named buffers are shared with the L</"content"> helper.
 
   % content_for message => begin
     Hello
@@ -168,14 +168,14 @@ Check or get name of current route.
 
   %= dumper {some => 'data'}
 
-Dump a Perl data structure with L<Data::Dumper>.
+Dump a Perl data structure with L<Mojo::Util/"dumper">.
 
 =head2 extends
 
   % extends 'blue';
   % extends 'blue', title => 'Blue!';
 
-Extend a template. All additional values get merged into the C<stash>.
+Extend a template. All additional values get merged into the L</"stash">.
 
 =head2 flash
 
@@ -197,7 +197,7 @@ only available in the partial template.
   % layout 'green', title => 'Green!';
 
 Render this template with a layout. All additional values get merged into the
-C<stash>.
+L</"stash">.
 
 =head2 param
 
@@ -218,7 +218,7 @@ Alias for L<Mojolicious::Controller/"session">.
 
 Alias for L<Mojolicious::Controller/"stash">.
 
-  %= stash 'name' // 'Somebody'
+  %= stash('name') // 'Somebody'
 
 =head2 title
 
@@ -226,7 +226,13 @@ Alias for L<Mojolicious::Controller/"stash">.
   % title 'Welcome!', foo => 'bar';
   %= title
 
-Page title. All additional values get merged into the C<stash>.
+Page title. All additional values get merged into the L</"stash">.
+
+=head2 ua
+
+  %= ua->get('mojolicio.us')->res->dom->at('title')->text
+
+Alias for L<Mojo/"ua">.
 
 =head2 url_for
 
@@ -238,11 +244,17 @@ Alias for L<Mojolicious::Controller/"url_for">.
 
   %= url_with 'named', controller => 'bar', action => 'baz'
 
-Does the same as C<url_for>, but inherits query parameters from the current
+Does the same as L</"url_for">, but inherits query parameters from the current
 request.
 
   %= url_with->query([page => 2])
 
+=head2 validation
+
+  %= validation->param('foo')
+
+Alias for L<Mojolicious::Controller/"validation">.
+
 =head1 METHODS
 
 L<Mojolicious::Plugin::DefaultHelpers> inherits all methods from

mojo/lib/Mojolicious/Plugin/EPLRenderer.pm

View

@@ -64,6 +64,8 @@ sub _epl {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Plugin::EPLRenderer - Embedded Perl Lite renderer plugin

+28 -22

mojo/lib/Mojolicious/Plugin/EPRenderer.pm

View

@@ -2,8 +2,7 @@ package Mojolicious::Plugin::EPRenderer;
 use Mojo::Base 'Mojolicious::Plugin';
 
 use Mojo::Template;
-use Mojo::Util qw(encode md5_sum);
-use Scalar::Util ();
+use Mojo::Util qw(encode md5_sum monkey_patch);
 
 sub register {
   my ($self, $app, $conf) = @_;
@@ -19,43 +18,50 @@ sub register {
       # Generate name
       my $path = $options->{inline} || $renderer->template_path($options);
       return undef unless defined $path;
-      my $id = encode 'UTF-8', join(', ', $path, sort keys %{$c->stash});
+      my @keys = sort grep {/^\w+$/} keys %{$c->stash};
+      my $id = encode 'UTF-8', join(',', $path, @keys);
       my $key = $options->{cache} = md5_sum $id;
 
-      # Compile helpers and stash values
+      # Cache template for "epl" handler
       my $cache = $renderer->cache;
-      unless ($cache->get($key)) {
-        my $mt = Mojo::Template->new($template);
+      my $mt    = $cache->get($key);
+      unless ($mt) {
+        $mt = Mojo::Template->new($template);
 
-        # Be a bit more relaxed for helpers
-        my $prepend = 'my $self = shift; Scalar::Util::weaken $self;'
-          . q[no strict 'refs'; no warnings 'redefine';];
+        # Helpers (only once)
+        ++$self->{helpers} and _helpers($mt->namespace, $renderer->helpers)
+          unless $self->{helpers};
 
-        # Helpers
-        $prepend .= 'my $_H = $self->app->renderer->helpers;';
-        $prepend .= "sub $_; *$_ = sub { \$_H->{'$_'}->(\$self, \@_) };"
-          for grep {/^\w+$/} keys %{$renderer->helpers};
+        # Stash values (every time)
+        my $prepend = 'my $self = shift; my $_S = $self->stash;';
+        $prepend .= " my \$$_ = \$_S->{'$_'};" for @keys;
 
-        # Be less relaxed for everything else
-        $prepend .= 'use strict;';
-
-        # Stash values
-        $prepend .= 'my $_S = $self->stash;';
-        $prepend .= " my \$$_ = \$_S->{'$_'};"
-          for grep {/^\w+$/} keys %{$c->stash};
-
-        # Cache
         $cache->set($key => $mt->prepend($prepend . $mt->prepend));
       }
 
+      # Make current controller available
+      no strict 'refs';
+      no warnings 'redefine';
+      local *{"@{[$mt->namespace]}::_C"} = sub {$c};
+
       # Render with "epl" handler
       return $renderer->handlers->{epl}->($renderer, $c, $output, $options);
     }
   );
 }
 
+sub _helpers {
+  my ($namespace, $helpers) = @_;
+  for my $name (grep {/^\w+$/} keys %$helpers) {
+    monkey_patch $namespace, $name,
+      sub { $helpers->{$name}->($namespace->_C, @_) };
+  }
+}
+
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Plugin::EPRenderer - Embedded Perl renderer plugin

+3 -1

mojo/lib/Mojolicious/Plugin/HeaderCondition.pm

View

@@ -15,7 +15,7 @@ sub _check {
   my ($value, $pattern) = @_;
   return 1
     if $value && $pattern && ref $pattern eq 'Regexp' && $value =~ $pattern;
-  return $value && defined $pattern && $pattern eq $value ? 1 : undef;
+  return $value && defined $pattern && $pattern eq $value;
 }
 
 sub _headers {
@@ -32,6 +32,8 @@ sub _headers {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Plugin::HeaderCondition - Header condition plugin

+4 -2

mojo/lib/Mojolicious/Plugin/JSONConfig.pm

View

@@ -24,7 +24,7 @@ sub render {
 
   # Application instance and helper
   my $prepend = q[my $app = shift; no strict 'refs'; no warnings 'redefine';];
-  $prepend .= q[sub app; *app = sub { $app }; use Mojo::Base -strict;];
+  $prepend .= q[sub app; local *app = sub { $app }; use Mojo::Base -strict;];
 
   # Render and encode for JSON decoding
   my $mt = Mojo::Template->new($conf->{template} || {})->name($file);
@@ -34,6 +34,8 @@ sub render {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Plugin::JSONConfig - JSON configuration plugin
@@ -99,7 +101,7 @@ L<Mojolicious::Plugin::Config> and implements the following new ones.
 
   $plugin->parse($content, $file, $conf, $app);
 
-Process content with C<render> and parse it with L<Mojo::JSON>.
+Process content with L</"render"> and parse it with L<Mojo::JSON>.
 
   sub parse {
     my ($self, $content, $file, $conf, $app) = @_;

mojo/lib/Mojolicious/Plugin/Mount.pm

View

@@ -24,6 +24,8 @@ sub register {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Plugin::Mount - Application mount plugin

+53 -60

mojo/lib/Mojolicious/Plugin/PODRenderer.pm

View

@@ -4,13 +4,11 @@ use Mojo::Base 'Mojolicious::Plugin';
 use Mojo::Asset::File;
 use Mojo::ByteStream 'b';
 use Mojo::DOM;
-use Mojo::Util qw'slurp url_escape';
+use Mojo::URL;
+use Mojo::Util qw(slurp url_escape);
 BEGIN {eval {require Pod::Simple::HTML; import Pod::Simple::HTML}}
 BEGIN {eval {require Pod::Simple::Search; import Pod::Simple::Search}}
 
-# Paths to search
-my @PATHS = map { $_, "$_/pods" } @INC;
-
 sub register {
   my ($self, $app, $conf) = @_;
 
@@ -30,71 +28,50 @@ sub register {
   $app->helper(pod_to_html => sub { shift; b(_pod_to_html(@_)) });
 
   # Perldoc browser
-  return if $conf->{no_perldoc};
+  return undef if $conf->{no_perldoc};
+  my $defaults = {module => 'Mojolicious/Guides', format => 'html'};
   return $app->routes->any(
-    '/perldoc/*module' => {module => 'Mojolicious/Guides'} => \&_perldoc);
+    '/perldoc/:module' => $defaults => [module => qr/[^.]+/] => \&_perldoc);
 }
 
-sub _perldoc {
-  my $self = shift;
-
-  # Find module or redirect to CPAN
-  my $module = $self->param('module');
-  $module =~ s!/!::!g;
-  my $path = Pod::Simple::Search->new->find($module, @PATHS);
-  return $self->redirect_to("http://metacpan.org/module/$module")
-    unless $path && -r $path;
-  my $html = _pod_to_html(slurp $path);
+sub _html {
+  my ($self, $src) = @_;
 
   # Rewrite links
-  my $dom     = Mojo::DOM->new("$html");
+  my $dom     = Mojo::DOM->new(_pod_to_html($src));
   my $perldoc = $self->url_for('/perldoc/');
-  $dom->find('a[href]')->each(
-    sub {
-      my $attrs = shift->attrs;
-      $attrs->{href} =~ s!%3A%3A!/!gi
-        if $attrs->{href} =~ s!^http://search\.cpan\.org/perldoc\?!$perldoc!;
-    }
-  );
+  for my $e ($dom->find('a[href]')->each) {
+    my $attrs = $e->attr;
+    $attrs->{href} =~ s!%3A%3A!/!gi
+      if $attrs->{href} =~ s!^http://search\.cpan\.org/perldoc\?!$perldoc!;
+  }
 
   # Rewrite code blocks for syntax highlighting
-  $dom->find('pre')->each(
-    sub {
-      my $e = shift;
-      return if $e->all_text =~ /^\s*\$\s+/m;
-      my $attrs = $e->attrs;
-      my $class = $attrs->{class};
-      $attrs->{class} = defined $class ? "$class prettyprint" : 'prettyprint';
-    }
-  );
+  for my $e ($dom->find('pre')->each) {
+    next if $e->all_text =~ /^\s*\$\s+/m;
+    my $attrs = $e->attr;
+    my $class = $attrs->{class};
+    $attrs->{class} = defined $class ? "$class prettyprint" : 'prettyprint';
+  }
 
   # Rewrite headers
-  my $url = $self->req->url->clone;
+  my $toc = Mojo::URL->new->fragment('toc');
   my (%anchors, @parts);
-  $dom->find('h1, h2, h3')->each(
-    sub {
-      my $e = shift;
-
-      # Anchor and text
-      my $name = my $text = $e->all_text;
-      $name =~ s/\s+/_/g;
-      $name =~ s/[^\w\-]//g;
-      my $anchor = $name;
-      my $i      = 1;
-      $anchor = $name . $i++ while $anchors{$anchor}++;
-
-      # Rewrite
-      push @parts, [] if $e->type eq 'h1' || !@parts;
-      push @{$parts[-1]}, $text, $url->fragment($anchor)->to_abs;
-      $e->replace_content(
-        $self->link_to(
-          $text => $url->fragment('toc')->to_abs,
-          class => 'mojoscroll',
-          id    => $anchor
-        )
-      );
-    }
-  );
+  for my $e ($dom->find('h1, h2, h3')->each) {
+
+    # Anchor and text
+    my $name = my $text = $e->all_text;
+    $name =~ s/\s+/_/g;
+    $name =~ s/[^\w\-]//g;
+    my $anchor = $name;
+    my $i      = 1;
+    $anchor = $name . $i++ while $anchors{$anchor}++;
+
+    # Rewrite
+    push @parts, [] if $e->type eq 'h1' || !@parts;
+    push @{$parts[-1]}, $text, Mojo::URL->new->fragment($anchor);
+    $e->replace_content($self->link_to($text => $toc, id => $anchor));
+  }
 
   # Try to find a title
   my $title = 'Perldoc';
@@ -104,11 +81,25 @@ sub _perldoc {
   $self->content_for(perldoc => "$dom");
   my $template = $self->app->renderer->_bundled('perldoc');
   $self->render(inline => $template, title => $title, parts => \@parts);
-  $self->res->headers->content_type('text/html;charset="UTF-8"');
+}
+
+sub _perldoc {
+  my $self = shift;
+
+  # Find module or redirect to CPAN
+  my $module = $self->param('module');
+  $module =~ s!/!::!g;
+  my $path
+    = Pod::Simple::Search->new->find($module, map { $_, "$_/pods" } @INC);
+  return $self->redirect_to("http://metacpan.org/module/$module")
+    unless $path && -r $path;
+
+  my $src = slurp $path;
+  $self->respond_to(txt => {data => $src}, html => sub { _html($self, $src) });
 }
 
 sub _pod_to_html {
-  return undef unless defined(my $pod = shift);
+  return '' unless defined(my $pod = shift);
 
   # Block
   $pod = $pod->() if ref $pod eq 'CODE';
@@ -130,6 +121,8 @@ sub _pod_to_html {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Plugin::PODRenderer - POD renderer plugin

+130 -78

mojo/lib/Mojolicious/Plugin/TagHelpers.pm

View

@@ -23,10 +23,10 @@ sub register {
   $app->helper(image => sub { _tag('img', src => shift->url_for(shift), @_) });
   $app->helper(input_tag => sub { _input(@_) });
   $app->helper(javascript => \&_javascript);
+  $app->helper(label_for  => \&_label_for);
   $app->helper(link_to    => \&_link_to);
 
-  $app->helper(password_field =>
-      sub { shift; _tag('input', name => shift, @_, type => 'password') });
+  $app->helper(password_field => \&_password_field);
   $app->helper(radio_button =>
       sub { _input(shift, shift, value => shift, @_, type => 'radio') });
 
@@ -37,7 +37,8 @@ sub register {
   # "t" is just a shortcut for the "tag" helper
   $app->helper($_ => sub { shift; _tag(@_) }) for qw(t tag);
 
-  $app->helper(text_area => \&_text_area);
+  $app->helper(tag_with_error => \&_tag_with_error);
+  $app->helper(text_area      => \&_text_area);
 }
 
 sub _form_for {
@@ -46,7 +47,7 @@ sub _form_for {
 
   # POST detection
   my @post;
-  if (my $r = $self->app->routes->find($url[0])) {
+  if (my $r = $self->app->routes->lookup($url[0])) {
     my %methods = (GET => 1, POST => 1);
     do {
       my @via = @{$r->via || []};
@@ -82,12 +83,9 @@ sub _input {
 
     # Others
     else { $attrs{value} = $values[0] }
-
-    return _tag('input', name => $name, %attrs);
   }
 
-  # Empty tag
-  return _tag('input', name => $name, %attrs);
+  return _validation($self, $name, 'input', %attrs, name => $name);
 }
 
 sub _javascript {
@@ -95,8 +93,7 @@ sub _javascript {
 
   # CDATA
   my $cb = sub {''};
-  if (ref $_[-1] eq 'CODE') {
-    my $old = pop;
+  if (ref $_[-1] eq 'CODE' && (my $old = pop)) {
     $cb = sub { "//<![CDATA[\n" . $old->() . "\n//]]>" }
   }
 
@@ -106,12 +103,18 @@ sub _javascript {
   return _tag('script', @_, $src ? (src => $src) : (), $cb);
 }
 
+sub _label_for {
+  my ($self, $name) = (shift, shift);
+  my $content = ref $_[-1] eq 'CODE' ? pop : shift;
+  return _validation($self, $name, 'label', for => $name, @_, $content);
+}
+
 sub _link_to {
   my ($self, $content) = (shift, shift);
   my @url = ($content);
 
   # Content
-  unless (defined $_[-1] && ref $_[-1] eq 'CODE') {
+  unless (ref $_[-1] eq 'CODE') {
     @url = (shift);
     push @_, $content;
   }
@@ -122,47 +125,45 @@ sub _link_to {
   return _tag('a', href => $self->url_for(@url), @_);
 }
 
-sub _select_field {
-  my ($self, $name, $options, %attrs) = (shift, shift, shift, @_);
+sub _option {
+  my ($values, $pair) = @_;
+  $pair = [$pair => $pair] unless ref $pair eq 'ARRAY';
 
-  # "option" callback
-  my %values = map { $_ => 1 } $self->param($name);
-  my $option = sub {
-
-    # Pair
-    my $pair = shift;
-    $pair = [$pair => $pair] unless ref $pair eq 'ARRAY';
+  # Attributes
+  my %attrs = (value => $pair->[1]);
+  $attrs{selected} = 'selected' if exists $values->{$pair->[1]};
+  %attrs = (%attrs, @$pair[2 .. $#$pair]);
 
-    # Attributes
-    my %attrs = (value => $pair->[1]);
-    $attrs{selected} = 'selected' if exists $values{$pair->[1]};
-    %attrs = (%attrs, @$pair[2 .. $#$pair]);
+  return _tag('option', %attrs, sub { xml_escape $pair->[0] });
+}
 
-    return _tag('option', %attrs, sub { xml_escape $pair->[0] });
-  };
+sub _password_field {
+  my ($self, $name) = (shift, shift);
+  return _validation($self, $name, 'input', @_, name => $name,
+    type => 'password');
+}
 
-  # "optgroup" callback
-  my $optgroup = sub {
+sub _select_field {
+  my ($self, $name, $options, %attrs) = (shift, shift, shift, @_);
 
-    # Parts
-    my $parts = '';
-    for my $group (@$options) {
+  my %values = map { $_ => 1 } $self->param($name);
 
-      # "optgroup" tag
-      if (ref $group eq 'HASH') {
-        my ($label, $values) = each %$group;
-        my $content = join '', map { $option->($_) } @$values;
-        $parts .= _tag('optgroup', label => $label, sub {$content});
-      }
+  my $groups = '';
+  for my $group (@$options) {
 
-      # "option" tag
-      else { $parts .= $option->($group) }
+    # "optgroup" tag
+    if (ref $group eq 'HASH') {
+      my ($label, $values) = each %$group;
+      my $content = join '', map { _option(\%values, $_) } @$values;
+      $groups .= _tag('optgroup', label => $label, sub {$content});
     }
 
-    return $parts;
-  };
+    # "option" tag
+    else { $groups .= _option(\%values, $group) }
+  }
 
-  return _tag('select', name => $name, %attrs, $optgroup);
+  return _validation($self, $name, 'select', %attrs, name => $name,
+    sub {$groups});
 }
 
 sub _stylesheet {
@@ -170,15 +171,14 @@ sub _stylesheet {
 
   # CDATA
   my $cb;
-  if (ref $_[-1] eq 'CODE') {
-    my $old = pop;
+  if (ref $_[-1] eq 'CODE' && (my $old = pop)) {
     $cb = sub { "/*<![CDATA[*/\n" . $old->() . "\n/*]]>*/" }
   }
 
   # "link" or "style" tag
   my $href = @_ % 2 ? $self->url_for(shift) : undef;
   return $href
-    ? _tag('link', rel => 'stylesheet', href => $href, media => 'screen', @_)
+    ? _tag('link', rel => 'stylesheet', href => $href, @_)
     : _tag('style', @_, $cb);
 }
 
@@ -199,39 +199,47 @@ sub _tag {
 
   # Attributes
   my %attrs = @_;
-  for my $key (sort keys %attrs) {
-    $tag .= qq{ $key="} . xml_escape(defined $attrs{$key} ? $attrs{$key} : '') . '"';
-  }
-
-  # End tag
-  if ($cb || defined $content) {
-    $tag .= '>' . ($cb ? $cb->() : xml_escape($content)) . "</$name>";
-  }
+  $tag .= qq{ $_="} . xml_escape(defined $attrs{$_} ? $attrs{$_} : '') . '"' for sort keys %attrs;
 
   # Empty element
-  else { $tag .= ' />' }
+  unless ($cb || defined $content) { $tag .= ' />' }
+
+  # End tag
+  else { $tag .= '>' . ($cb ? $cb->() : xml_escape($content)) . "</$name>" }
 
   # Prevent escaping
   return Mojo::ByteStream->new($tag);
 }
 
+sub _tag_with_error {
+  my ($self, $tag) = (shift, shift);
+  my ($content, %attrs) = (@_ % 2 ? pop : undef, @_);
+  $attrs{class} .= $attrs{class} ? ' field-with-error' : 'field-with-error';
+  return _tag($tag, %attrs, defined $content ? $content : ());
+}
+
 sub _text_area {
   my ($self, $name) = (shift, shift);
 
-  # Content
+  # Make sure content is wrapped
   my $cb = ref $_[-1] eq 'CODE' ? pop : sub {''};
   my $content = @_ % 2 ? shift : undef;
+  $cb = sub { xml_escape $content }
+    if defined($content = defined $self->param($name) ? $self->param($name) : $content);
 
-  # Make sure content is wrapped
-  if (defined($content = defined $self->param($name) ? $self->param($name) : $content)) {
-    $cb = sub { xml_escape $content }
-  }
+  return _validation($self, $name, 'textarea', @_, name => $name, $cb);
+}
 
-  return _tag('textarea', name => $name, @_, $cb);
+sub _validation {
+  my ($self, $name) = (shift, shift);
+  return _tag(@_) unless $self->validation->has_error($name);
+  return $self->tag_with_error(@_);
 }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Plugin::TagHelpers - Tag helpers plugin
@@ -259,6 +267,12 @@ necessary attributes always be generated automatically.
   <%= radio_button country => 'france'  %> France
   <%= radio_button country => 'uk'      %> UK
 
+For fields that failed validation with L<Mojolicious::Controller/"validation">
+the C<field-with-error> class will be automatically added through the
+C<tag_with_error> helper, to make styling with CSS easier.
+
+  <input class="field-with-error" name="age" type="text" value="250" />
+
 This is a core plugin, that means it is always enabled and its code a good
 example for learning how to build new plugins, you're welcome to fork it.
 
@@ -358,8 +372,8 @@ Generate file input element.
     %= submit_button
   % end
 
-Generate portable form for route, path or URL. For routes that allow C<POST>
-but not C<GET>, a C<method> attribute will be automatically added.
+Generate portable form tag for route, path or URL. For routes that allow POST
+but not GET, a C<method> attribute will be automatically added.
 
   <form action="/path/to/login">
     <input name="first_name" />
@@ -369,7 +383,7 @@ but not C<GET>, a C<method> attribute will be automatically added.
     <input name="first_name" />
     <input value="Ok" type="submit" />
   </form>
-  <form action="/login" method="POST">
+  <form action="/path/to/login" method="POST">
     <input name="first_name" />
     <input value="Ok" type="submit" />
   </form>
@@ -393,10 +407,10 @@ Generate hidden input element.
   %= image '/images/foo.png'
   %= image '/images/foo.png', alt => 'Foo'
 
-Generate image tag.
+Generate portable img tag.
 
-  <img src="/images/foo.png" />
-  <img alt="Foo" src="/images/foo.png" />
+  <img src="/path/to/images/foo.png" />
+  <img alt="Foo" src="/path/to/images/foo.png" />
 
 =head2 input_tag
 
@@ -420,21 +434,43 @@ picked up and shown as default.
 
 Generate portable script tag for C<Javascript> asset.
 
-  <script src="/script.js" />
+  <script src="/path/to/script.js" />
   <script><![CDATA[
     var a = 'b';
   ]]></script>
 
+=head2 label_for
+
+  %= label_for first_name => 'First name'
+  %= label_for first_name => 'First name', class => 'user'
+  %= label_for first_name => begin
+    First name
+  % end
+  %= label_for first_name => (class => 'user') => begin
+    First name
+  % end
+
+Generate label.
+
+  <label for="first_name">First name</label>
+  <label class="user" for="first_name">First name</label>
+  <label for="first_name">
+    First name
+  </label>
+  <label class="user" for="first_name">
+    First name
+  </label>
+
 =head2 link_to
 
   %= link_to Home => 'index'
-  %= link_to Home => 'index' => {format => 'txt'} => (class => 'links')
-  %= link_to index => {format => 'txt'} => (class => 'links') => begin
+  %= link_to Home => 'index' => {format => 'txt'} => (class => 'menu')
+  %= link_to index => {format => 'txt'} => (class => 'menu') => begin
     Home
   % end
-  %= link_to Contact => Mojo::URL->new('mailto:sri@example.com')
+  %= link_to Contact => 'mailto:sri@example.com'
   <%= link_to index => begin %>Home<% end %>
-  <%= link_to '/path/to/file' => begin %>File<% end %>
+  <%= link_to '/file.txt' => begin %>File<% end %>
   <%= link_to 'http://mojolicio.us' => begin %>Mojolicious<% end %>
   <%= link_to url_for->query(foo => 'bar')->to_abs => begin %>Retry<% end %>
 
@@ -442,13 +478,13 @@ Generate portable link to route, path or URL, defaults to using the
 capitalized link target as content.
 
   <a href="/path/to/index">Home</a>
-  <a class="links" href="/path/to/index.txt">Home</a>
-  <a class="links" href="/path/to/index.txt">
+  <a class="menu" href="/path/to/index.txt">Home</a>
+  <a class="menu" href="/path/to/index.txt">
     Home
   </a>
   <a href="mailto:sri@example.com">Contact</a>
   <a href="/path/to/index">Home</a>
-  <a href="/path/to/file">File</a>
+  <a href="/path/to/file.txt">File</a>
   <a href="http://mojolicio.us">Mojolicious</a>
   <a href="http://127.0.0.1:3000/current/path?foo=bar">Retry</a>
 
@@ -568,7 +604,7 @@ automatically get picked up and shown as default.
 
 Generate portable style or link tag for C<CSS> asset.
 
-  <link href="/foo.css" media="screen" rel="stylesheet" />
+  <link href="/path/to/foo.css" rel="stylesheet" />
   <style><![CDATA[
     body {color: #000}
   ]]></style>
@@ -587,7 +623,7 @@ Generate submit input element.
 
   %=t div => 'some & content'
 
-Alias for C<tag>.
+Alias for L</"tag">.
 
   <div>some &amp; content</div>
 
@@ -596,14 +632,22 @@ Alias for C<tag>.
   %= tag 'div'
   %= tag 'div', id => 'foo'
   %= tag div => 'some & content'
-  <%= tag div => begin %>some & content<% end %>
+  %= tag div => (id => 'foo') => 'some & content'
+  %= tag div => begin
+    some & content
+  % end
+  <%= tag div => (id => 'foo') => begin %>some & content<% end %>
 
 HTML tag generator.
 
   <div />
   <div id="foo" />
   <div>some &amp; content</div>
-  <div>some & content</div>
+  <div id="foo">some &amp; content</div>
+  <div>
+    some & content
+  </div>
+  <div id="foo">some & content</div>
 
 Very useful for reuse in more specific tag helpers.
 
@@ -614,6 +658,14 @@ Very useful for reuse in more specific tag helpers.
 Results are automatically wrapped in L<Mojo::ByteStream> objects to prevent
 accidental double escaping.
 
+=head2 tag_with_error
+
+  %= tag_with_error 'input', class => 'foo'
+
+Same as L</"tag">, but adds the class C<field-with-error>.
+
+  <input class="foo field-with-error" />
+
 =head2 tel_field
 
   %= tel_field 'work'

+6 -5

mojo/lib/Mojolicious/Plugins.pm

View

@@ -19,9 +19,8 @@ sub emit_chain {
     my $next = $wrapper;
     $wrapper = sub { $cb->($next, @args) };
   }
-  $wrapper->();
 
-  return $self;
+  !$wrapper ? return : return $wrapper->();
 }
 
 sub emit_hook_reverse {
@@ -56,11 +55,13 @@ sub _load {
   if (my $e = Mojo::Loader->new->load($module)) {
     ref $e ? die $e : return undef;
   }
-  return $module->isa('Mojolicious::Plugin') ? 1 : undef;
+  return $module->isa('Mojolicious::Plugin');
 }
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Plugins - Plugin manager
@@ -151,8 +152,8 @@ implements the following new ones.
 
 =head2 emit_chain
 
-  $plugins = $plugins->emit_chain('foo');
-  $plugins = $plugins->emit_chain(foo => 123);
+  $plugins->emit_chain('foo');
+  $plugins->emit_chain(foo => 123);
 
 Emit events as chained hooks.
 

+21 -24

mojo/lib/Mojolicious/Renderer.pm

View

@@ -13,8 +13,15 @@ has classes => sub { ['main'] };
 has default_format => 'html';
 has 'default_handler';
 has encoding => 'UTF-8';
-has [qw(handlers helpers)] => sub { {} };
-has paths => sub { [] };
+has handlers => sub {
+  {
+    data => sub { ${$_[2]} = $_[3]{data} },
+    text => sub { ${$_[2]} = $_[3]{text} },
+    json => sub { ${$_[2]} = Mojo::JSON->new->encode($_[3]{json}) }
+  };
+};
+has helpers => sub { {} };
+has paths   => sub { [] };
 
 # Bundled templates
 my $HOME = Mojo::Home->new;
@@ -22,14 +29,6 @@ $HOME->parse(
   $HOME->parse($HOME->mojo_lib_dir)->rel_dir('Mojolicious/templates'));
 my %TEMPLATES = map { $_ => slurp $HOME->rel_file($_) } @{$HOME->list_files};
 
-sub new {
-  my $self = shift->SUPER::new(@_);
-  $self->add_handler(data => sub { ${$_[2]} = $_[3]{data} });
-  $self->add_handler(text => sub { ${$_[2]} = $_[3]{text} });
-  return $self->add_handler(
-    json => sub { ${$_[2]} = Mojo::JSON->new->encode($_[3]{json}) });
-}
-
 sub add_handler { shift->_add(handlers => @_) }
 sub add_helper  { shift->_add(helpers  => @_) }
 
@@ -54,11 +53,11 @@ sub render {
   my ($self, $c, $args) = @_;
   $args ||= {};
 
-  # Localize "extends" and "layout"
-  my $partial = $args->{partial};
-  my $stash   = $c->stash;
-  local $stash->{layout}  = $partial ? undef : $stash->{layout};
-  local $stash->{extends} = $partial ? undef : $stash->{extends};
+  # Localize "extends" and "layout" to allow argument overrides
+  my $stash = $c->stash;
+  local $stash->{layout}  = $stash->{layout}  if exists $stash->{layout};
+  local $stash->{extends} = $stash->{extends} if exists $stash->{extends};
+  delete @{$stash}{qw(layout extends)} if my $partial = $args->{partial};
 
   # Merge stash and arguments
   @{$stash}{keys %$args} = values %$args;
@@ -209,6 +208,8 @@ sub _render_template {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Renderer - Generate dynamic content
@@ -269,14 +270,17 @@ detection doesn't work, like for C<inline> templates.
   my $encoding = $renderer->encoding;
   $renderer    = $renderer->encoding('koi8-r');
 
-Will encode the content if set, defaults to C<UTF-8>.
+Will encode generated content if set, defaults to C<UTF-8>. Note that many
+renderers such as L<Mojolicious::Plugin::EPRenderer> also use this value to
+determine if template files should be decoded before processing.
 
 =head2 handlers
 
   my $handlers = $renderer->handlers;
   $renderer    = $renderer->handlers({epl => sub {...}});
 
-Registered handlers.
+Registered handlers, by default only C<data>, C<text> and C<json> are already
+defined.
 
 =head2 helpers
 
@@ -300,13 +304,6 @@ Directories to look for templates in, first one has the highest precedence.
 L<Mojolicious::Renderer> inherits all methods from L<Mojo::Base> and
 implements the following new ones.
 
-=head2 new
-
-  my $renderer = Mojolicious::Renderer->new;
-
-Construct a new renderer and register C<data>, C<json> as well as C<text>
-handlers.
-
 =head2 add_handler
 
   $renderer = $renderer->add_handler(epl => sub {...});

+71 -80

mojo/lib/Mojolicious/Routes.pm

View

...	...	@@ -24,6 +24,27 @@ sub auto_render {
24	24	$c->render_maybe or $stash->{'mojo.routed'} or $c->render_not_found;
25	25	}
26	26
	27	+sub continue {
	28	+ my ($self, $c) = @_;
	29	+
	30	+ my $match = $c->match;
	31	+ my $stack = $match->stack;
	32	+ my $current = $match->current;
	33	+ return $self->auto_render($c) unless my $field = $stack->[$current];
	34	+
	35	+ # Merge captures into stash
	36	+ my @keys = keys %$field;
	37	+ my $stash = $c->stash;
	38	+ @{$stash}{@keys} = @{$stash->{'mojo.captures'}}{@keys} = values %$field;
	39	+
	40	+ my $continue;
	41	+ my $last = !$stack->[++$current];
	42	+ if (my $cb = $field->{cb}) { $continue = $self->_callback($c, $cb, $last) }
	43	+ else { $continue = $self->_controller($c, $field, $last) }
	44	+ $match->current($current);
	45	+ $self->continue($c) if $last \|\| $continue;
	46	+}
	47	+
27	48	sub dispatch {
28	49	my ($self, $c) = @_;
29	50
...	...	@@ -59,9 +80,8 @@ sub dispatch {
59	80	}
60	81	}
61	82
62		- # Dispatch
63		- return undef unless $self->_walk($c);
64		- $self->auto_render($c);
	83	+ return undef unless @{$c->match->stack};
	84	+ $self->continue($c);
65	85	return 1;
66	86	}
67	87
...	...	@@ -69,8 +89,8 @@ sub hide { push @{shift->hidden}, @_ }
69	89
70	90	sub is_hidden {
71	91	my ($self, $method) = @_;
72		- my $hiding = $self->{hiding} \|\|= {map { $_ => 1 } @{$self->hidden}};
73		- return !!($hiding->{$method} \|\| index($method, '_') == 0);
	92	+ my $h = $self->{hiding} \|\|= {map { $_ => 1 } @{$self->hidden}};
	93	+ return !!($h->{$method} \|\| index($method, '_') == 0 \|\| $method !~ /[a-z]/);
74	94	}
75	95
76	96	sub lookup {
...	...	@@ -85,6 +105,8 @@ sub route {
85	105	shift->add_child(Mojolicious::Routes::Route->new(@_))->children->[-1];
86	106	}
87	107
	108	+sub _action { shift->plugins->emit_chain(around_action => @_) }
	109	+
88	110	sub _add {
89	111	my ($self, $attr, $name, $cb) = @_;
90	112	$self->$attr->{$name} = $cb;
...	...	@@ -92,11 +114,11 @@ sub _add {
92	114	}
93	115
94	116	sub _callback {
95		- my ($self, $c, $field, $nested) = @_;
96		- $c->stash->{'mojo.routed'}++;
97		- $c->app->log->debug('Routing to a callback.');
98		- my $continue = $field->{cb}->($c);
99		- return !$nested \|\| $continue ? 1 : undef;
	117	+ my ($self, $c, $cb, $last) = @_;
	118	+ $c->stash->{'mojo.routed'}++ if $last;
	119	+ my $app = $c->app;
	120	+ $app->log->debug('Routing to a callback.');
	121	+ return _action($app, $c, $cb, $last);
100	122	}
101	123
102	124	sub _class {
...	...	@@ -131,7 +153,9 @@ sub _class {
131	153	}
132	154
133	155	# Success
134		- return $class->new($c);
	156	+ my $new = $class->new(%$c);
	157	+ weaken $new->{$_} for qw(app tx);
	158	+ return $new;
135	159	}
136	160
137	161	# Nothing found
...	...	@@ -140,43 +164,44 @@ sub _class {
140	164	}
141	165
142	166	sub _controller {
143		- my ($self, $c, $field, $nested) = @_;
	167	+ my ($self, $old, $field, $last) = @_;
144	168
145	169	# Load and instantiate controller/application
146		- my $app;
147		- unless ($app = $self->_class($c, $field)) { return defined $app ? 1 : undef }
	170	+ my $new;
	171	+ unless ($new = $self->_class($old, $field)) { return !!defined $new }
148	172
149	173	# Application
150		- my $continue;
151		- my $class = ref $app;
152		- my $log = $c->app->log;
153		- if (my $sub = $app->can('handler')) {
	174	+ my $class = ref $new;
	175	+ my $app = $old->app;
	176	+ my $log = $app->log;
	177	+ if (my $sub = $new->can('handler')) {
154	178	$log->debug(qq{Routing to application "$class".});
155	179
156	180	# Try to connect routes
157		- if (my $sub = $app->can('routes')) {
158		- my $r = $app->$sub;
159		- weaken $r->parent($c->match->endpoint)->{parent} unless $r->parent;
	181	+ if (my $sub = $new->can('routes')) {
	182	+ my $r = $new->$sub;
	183	+ weaken $r->parent($old->match->endpoint)->{parent} unless $r->parent;
160	184	}
161		- $app->$sub($c);
162		- $c->stash->{'mojo.routed'}++;
	185	+ $new->$sub($old);
	186	+ $old->stash->{'mojo.routed'}++;
163	187	}
164	188
165	189	# Action
166		- elsif (my $method = $self->_method($c, $field)) {
167		- $log->debug(qq{Routing to controller "$class" and action "$method".});
	190	+ elsif (my $method = $field->{action}) {
	191	+ if (!$self->is_hidden($method)) {
	192	+ $log->debug(qq{Routing to controller "$class" and action "$method".});
168	193
169		- # Try to call action
170		- if (my $sub = $app->can($method)) {
171		- $c->stash->{'mojo.routed'}++ unless $nested;
172		- $continue = $app->$sub;
173		- }
	194	+ if (my $sub = $new->can($method)) {
	195	+ $old->stash->{'mojo.routed'}++ if $last;
	196	+ return 1 if _action($app, $new, $sub, $last);
	197	+ }
174	198
175		- # Action not found
176		- else { $log->debug('Action not found in controller.') }
	199	+ else { $log->debug('Action not found in controller.') }
	200	+ }
	201	+ else { $log->debug(qq{Action "$method" is not allowed.}) }
177	202	}
178	203
179		- return !$nested \|\| $continue ? 1 : undef;
	204	+ return undef;
180	205	}
181	206
182	207	sub _load {
...	...	@@ -191,50 +216,10 @@ sub _load {
191	216	return ++$self->{loaded}{$app};
192	217	}
193	218
194		-sub _method {
195		- my ($self, $c, $field) = @_;
196		-
197		- # Hidden
198		- return undef unless my $method = $field->{action};
199		- $c->app->log->debug(qq{Action "$method" is not allowed.}) and return undef
200		- if $self->is_hidden($method);
201		-
202		- # Invalid
203		- $c->app->log->debug(qq{Action "$method" is invalid.}) and return undef
204		- unless $method =~ /^[a-zA-Z0-9_:]+$/;
205		-
206		- return $method;
207		-}
208		-
209		-sub _walk {
210		- my ($self, $c) = @_;
211		-
212		- my $stack = $c->match->stack;
213		- return undef unless my $nested = @$stack;
214		- my $stash = $c->stash;
215		- $stash->{'mojo.captures'} \|\|= {};
216		- for my $field (@$stack) {
217		- $nested--;
218		-
219		- # Merge captures into stash
220		- my @keys = keys %$field;
221		- @{$stash}{@keys} = @{$stash->{'mojo.captures'}}{@keys} = values %$field;
222		-
223		- # Dispatch
224		- my $continue
225		- = $field->{cb}
226		- ? $self->_callback($c, $field, $nested)
227		- : $self->_controller($c, $field, $nested);
228		-
229		- # Break the chain
230		- return undef if $nested && !$continue;
231		- }
232		-
233		- return 1;
234		-}
235		-
236	219	1;
237	220
	221	+=encoding utf8
	222	+
238	223	=head1 NAME
239	224
240	225	Mojolicious::Routes - Always find your destination with routes!
...	...	@@ -294,7 +279,7 @@ Contains all available conditions.
294	279	my $hidden = $r->hidden;
295	280	$r = $r->hidden([qw(attr has new)]);
296	281
297		-Controller methods and attributes that are hidden from router, defaults to
	282	+Controller attributes and methods that are hidden from router, defaults to
298	283	C<attr>, C<has>, C<new> and C<tap>.
299	284
300	285	=head2 namespaces
...	...	@@ -337,9 +322,15 @@ Add a new shortcut.
337	322
338	323	Automatic rendering.
339	324
	325	+=head2 continue
	326	+
	327	+ $r->continue(Mojolicious::Controller->new);
	328	+
	329	+Continue dispatch chain.
	330	+
340	331	=head2 dispatch
341	332
342		- my $success = $r->dispatch(Mojolicious::Controller->new);
	333	+ my $bool = $r->dispatch(Mojolicious::Controller->new);
343	334
344	335	Match routes with L<Mojolicious::Routes::Match> and dispatch.
345	336
...	...	@@ -347,13 +338,13 @@ Match routes with L<Mojolicious::Routes::Match> and dispatch.
347	338
348	339	$r = $r->hide(qw(foo bar));
349	340
350		-Hide controller methods and attributes from router.
	341	+Hide controller attributes and methods from router.
351	342
352	343	=head2 is_hidden
353	344
354		- my $success = $r->is_hidden('foo');
	345	+ my $bool = $r->is_hidden('foo');
355	346
356		-Check if controller method or attribute is hidden from router.
	347	+Check if controller attribute or method is hidden from router.
357	348
358	349	=head2 lookup
359	350

+13 -2

mojo/lib/Mojolicious/Routes/Match.pm

View

@@ -1,6 +1,7 @@
 package Mojolicious::Routes::Match;
 use Mojo::Base -base;
 
+has current => 0;
 has [qw(endpoint root)];
 has stack => sub { [] };
 
@@ -71,7 +72,7 @@ sub _match {
   if (($endpoint && $empty) || $r->inline) {
     push @{$self->stack}, {%$captures};
     return $self->endpoint($r) if $endpoint && $empty;
-    delete $captures->{$_} for qw(app cb);
+    delete @$captures{qw(app cb)};
   }
 
   # Match children
@@ -102,6 +103,8 @@ sub _values {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Routes::Match - Find routes
@@ -137,6 +140,13 @@ structures.
 
 L<Mojolicious::Routes::Match> implements the following attributes.
 
+=head2 current
+
+  my $current = $match->current;
+  $match      = $match->current(2);
+
+Current position on the L</"stack">, defaults to C<0>.
+
 =head2 endpoint
 
   my $endpoint = $match->endpoint;
@@ -167,7 +177,8 @@ implements the following new ones.
 
   $match->match(Mojolicious::Controller->new, {method => 'GET', path => '/'});
 
-Match controller and options against C<root> to find appropriate C<endpoint>.
+Match controller and options against L</"root"> to find appropriate
+L</"endpoint">.
 
 =head2 path_for
 

+9 -13

mojo/lib/Mojolicious/Routes/Pattern.pm

View

@@ -28,7 +28,7 @@ sub match_partial {
 
   # Match
   return undef unless my @captures = $$pathref =~ $regex;
-  $$pathref =~ s/$regex//;
+  $$pathref = pop(@captures);
 
   # Merge captures
   my $captures = {%{$self->defaults}};
@@ -152,7 +152,7 @@ sub _compile {
   # Not rooted with a slash
   $regex = "$block$regex" if $block;
 
-  return $self->regex(qr/^$regex/s)->regex;
+  return $self->regex(qr/^$regex(.*)/s)->regex;
 }
 
 sub _compile_format {
@@ -189,16 +189,14 @@ sub _tokenize {
   my $pattern = $self->pattern;
   my $state   = 'text';
   my (@tree, $quoted);
-  while (length(my $char = substr $pattern, 0, 1, '')) {
-
-    # Inside a placeholder
+  for my $char (split '', $pattern) {
     my $inside = !!grep { $_ eq $state } qw(placeholder relaxed wildcard);
 
     # Quote start
     if ($char eq $quote_start) {
       $quoted = 1;
-      $state  = 'placeholder';
       push @tree, ['placeholder', ''];
+      $state = 'placeholder';
     }
 
     # Placeholder start
@@ -230,13 +228,9 @@ sub _tokenize {
 
     # Text
     else {
-      $state = 'text';
-
-      # New text element
       push @tree, ['text', $char] and next unless $tree[-1][0] eq 'text';
-
-      # More text
       $tree[-1][-1] .= $char;
+      $state = 'text';
     }
   }
 
@@ -245,6 +239,8 @@ sub _tokenize {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Routes::Pattern - Routes pattern engine
@@ -365,8 +361,8 @@ implements the following new ones.
     = Mojolicious::Routes::Pattern->new('/:action', action => qr/\w+/);
   my $pattern = Mojolicious::Routes::Pattern->new(format => 0);
 
-Construct a new L<Mojolicious::Routes::Pattern> object and C<parse> pattern if
-necessary.
+Construct a new L<Mojolicious::Routes::Pattern> object and L</"parse"> pattern
+if necessary.
 
 =head2 match
 

+29 -26

mojo/lib/Mojolicious/Routes/Route.pm

View

@@ -136,7 +136,7 @@ sub render {
 
 sub root {
   my $root = my $parent = shift;
-  while ($parent = $parent->parent) { $root = $parent }
+  $root = $parent while $parent = $parent->parent;
   return $root;
 }
 
@@ -249,6 +249,8 @@ sub _generate_route {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Routes::Route - Route
@@ -277,10 +279,10 @@ The children of this route, used for nesting routes.
 
 =head2 inline
 
-  my $inline = $r->inline;
-  $r         = $r->inline(1);
+  my $bool = $r->inline;
+  $r       = $r->inline($bool);
 
-Allow C<bridge> semantics for this route.
+Allow L</"bridge"> semantics for this route.
 
 =head2 parent
 
@@ -291,8 +293,8 @@ The parent of this route, used for nesting routes.
 
 =head2 partial
 
-  my $partial = $r->partial;
-  $r          = $r->partial(1);
+  my $bool = $r->partial;
+  $r       = $r->partial($bool);
 
 Route has no specific end, remaining characters will be captured in C<path>.
 
@@ -343,7 +345,7 @@ also the L<Mojolicious::Lite> tutorial for more argument variations.
   my $bridge = $r->bridge('/:action', action => qr/\w+/);
   my $bridge = $r->bridge(format => 0);
 
-Generate bridge route.
+Generate bridge route with optional pattern and restrictive placeholders.
 
   my $auth = $r->bridge('/user')->to('user#auth');
   $auth->get('/show')->to('#show');
@@ -353,7 +355,7 @@ Generate bridge route.
 
   my $route = $r->delete('/:foo' => sub {...});
 
-Generate route matching only C<DELETE> requests. See also the
+Generate route matching only DELETE requests. See also the
 L<Mojolicious::Lite> tutorial for more argument variations.
 
   $r->delete('/user')->to('user#remove');
@@ -366,7 +368,7 @@ L<Mojolicious::Lite> tutorial for more argument variations.
   $r = $r->detour('MyApp', {foo => 'bar'});
 
 Set default parameters for this route and allow partial matching to simplify
-application embedding, takes the same arguments as C<to>.
+application embedding, takes the same arguments as L</"to">.
 
 =head2 find
 
@@ -381,38 +383,38 @@ generated ones.
 
   my $route = $r->get('/:foo' => sub {...});
 
-Generate route matching only C<GET> requests. See also the
-L<Mojolicious::Lite> tutorial for more argument variations.
+Generate route matching only GET requests. See also the L<Mojolicious::Lite>
+tutorial for more argument variations.
 
   $r->get('/user')->to('user#show');
 
 =head2 has_conditions
 
-  my $success = $r->has_conditions;
+  my $bool = $r->has_conditions;
 
 Check if this route has active conditions.
 
 =head2 has_custom_name
 
-  my $success = $r->has_custom_name;
+  my $bool = $r->has_custom_name;
 
 Check if this route has a custom name.
 
 =head2 has_websocket
 
-  my $success = $r->has_websocket;
+  my $bool = $r->has_websocket;
 
 Check if this route has a WebSocket ancestor.
 
 =head2 is_endpoint
 
-  my $success = $r->is_endpoint;
+  my $bool = $r->is_endpoint;
 
 Check if this route qualifies as an endpoint.
 
 =head2 is_websocket
 
-  my $success = $r->is_websocket;
+  my $bool = $r->is_websocket;
 
 Check if this route is a WebSocket.
 
@@ -431,7 +433,7 @@ the current route.
 
   my $route = $r->options('/:foo' => sub {...});
 
-Generate route matching only C<OPTIONS> requests. See also the
+Generate route matching only OPTIONS requests. See also the
 L<Mojolicious::Lite> tutorial for more argument variations.
 
   $r->options('/user')->to('user#overview');
@@ -460,8 +462,8 @@ Parse pattern.
 
   my $route = $r->patch('/:foo' => sub {...});
 
-Generate route matching only C<PATCH> requests. See also the
-L<Mojolicious::Lite> tutorial for more argument variations.
+Generate route matching only PATCH requests. See also the L<Mojolicious::Lite>
+tutorial for more argument variations.
 
   $r->patch('/user')->to('user#update');
 
@@ -469,8 +471,8 @@ L<Mojolicious::Lite> tutorial for more argument variations.
 
   my $route = $r->post('/:foo' => sub {...});
 
-Generate route matching only C<POST> requests. See also the
-L<Mojolicious::Lite> tutorial for more argument variations.
+Generate route matching only POST requests. See also the L<Mojolicious::Lite>
+tutorial for more argument variations.
 
   $r->post('/user')->to('user#create');
 
@@ -478,8 +480,8 @@ L<Mojolicious::Lite> tutorial for more argument variations.
 
   my $route = $r->put('/:foo' => sub {...});
 
-Generate route matching only C<PUT> requests. See also the
-L<Mojolicious::Lite> tutorial for more argument variations.
+Generate route matching only PUT requests. See also the L<Mojolicious::Lite>
+tutorial for more argument variations.
 
   $r->put('/user')->to('user#replace');
 
@@ -517,7 +519,8 @@ The L<Mojolicious::Routes> object this route is an descendent of.
   my $route = $r->route('/:action', action => qr/\w+/);
   my $route = $r->route(format => 0);
 
-Generate route matching all HTTP request methods.
+Generate route matching all HTTP request methods with optional pattern and
+restrictive placeholders.
 
 =head2 to
 
@@ -544,8 +547,8 @@ Stringify the whole route.
 
 =head2 under
 
-  my $route = $r->under(sub {...});
-  my $route = $r->under('/:foo');
+  my $bridge = $r->under(sub {...});
+  my $bridge = $r->under('/:foo');
 
 Generate bridge route. See also the L<Mojolicious::Lite> tutorial for more
 argument variations.

+5 -3

mojo/lib/Mojolicious/Sessions.pm

View

@@ -61,6 +61,8 @@ sub store {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Sessions - Signed cookie based session manager
@@ -127,8 +129,8 @@ C<expiration> and C<expires> session values.
 
 =head2 secure
 
-  my $secure = $sessions->secure;
-  $sessions  = $sessions->secure(1);
+  my $bool  = $sessions->secure;
+  $sessions = $sessions->secure($bool);
 
 Set the secure flag on all session cookies, so that browsers send them only
 over HTTPS connections.
@@ -136,7 +138,7 @@ over HTTPS connections.
 =head1 METHODS
 
 L<Mojolicious::Sessions> inherits all methods from L<Mojo::Base> and
-implements the following ones.
+implements the following new ones.
 
 =head2 load
 

+11 -5

mojo/lib/Mojolicious/Static.pm

View

@@ -121,6 +121,8 @@ sub _get_file {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Static - Serve static files
@@ -170,24 +172,28 @@ the following new ones.
 
 =head2 dispatch
 
-  my $success = $static->dispatch(Mojolicious::Controller->new);
+  my $bool = $static->dispatch(Mojolicious::Controller->new);
 
 Serve static file for L<Mojolicious::Controller> object.
 
 =head2 file
 
-  my $asset = $static->file('foo/bar.html');
+  my $asset = $static->file('images/logo.png');
+  my $asset = $static->file('../lib/MyApp.pm');
 
 Get L<Mojo::Asset::File> or L<Mojo::Asset::Memory> object for a file, relative
-to C<paths> or from C<classes>.
+to L</"paths"> or from L</"classes">. Note that this method does not protect
+from traversing to parent directories.
 
   my $content = $static->file('foo/bar.html')->slurp;
 
 =head2 serve
 
-  my $success = $static->serve(Mojolicious::Controller->new, 'foo/bar.html');
+  my $bool = $static->serve(Mojolicious::Controller->new, 'images/logo.png');
+  my $bool = $static->serve(Mojolicious::Controller->new, '../lib/MyApp.pm');
 
-Serve a specific file, relative to C<paths> or from C<classes>.
+Serve a specific file, relative to L</"paths"> or from L</"classes">. Note
+that this method does not protect from traversing to parent directories.
 
 =head2 serve_asset
 

+5 -3

mojo/lib/Mojolicious/Types.pm

View

@@ -24,7 +24,7 @@ has types => sub {
     png      => ['image/png'],
     rss      => ['application/rss+xml'],
     svg      => ['image/svg+xml'],
-    txt      => ['text/plain'],
+    txt      => ['text/plain;charset=UTF-8'],
     webm     => ['video/webm'],
     woff     => ['application/font-woff'],
     xml      => ['application/xml', 'text/xml'],
@@ -37,7 +37,7 @@ sub detect {
 
   # Extract and prioritize MIME types
   my %types;
-  /^\s*([^,; ]+)(?:\s*\;\s*q=(\d+(?:\.\d+)?))?\s*$/i
+  /^\s*([^,; ]+)(?:\s*\;\s*q\s*=\s*(\d+(?:\.\d+)?))?\s*$/i
     and $types{lc $1} = defined $2 ? $2 : 1
     for split /,/, defined $accept ? $accept : '';
   my @detected = sort { $types{$b} <=> $types{$a} } sort keys %types;
@@ -62,6 +62,8 @@ sub type {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
 Mojolicious::Types - MIME types
@@ -99,7 +101,7 @@ L<Mojolicious::Types> manages MIME types for L<Mojolicious>.
   png      -> image/png
   rss      -> application/rss+xml
   svg      -> image/svg+xml
-  txt      -> text/plain
+  txt      -> text/plain;charset=UTF-8
   webm     -> video/webm
   woff     -> application/font-woff
   xml      -> application/xml,text/xml

+128

mojo/lib/Mojolicious/Validator.pm

View

...	...	@@ -0,0 +1,128 @@
	1	+package Mojolicious::Validator;
	2	+use Mojo::Base -base;
	3	+
	4	+use Mojolicious::Validator::Validation;
	5	+
	6	+has checks => sub {
	7	+ {equal_to => \&_equal_to, in => \&_in, like => \&_like, size => \&_size};
	8	+};
	9	+
	10	+sub add_check {
	11	+ my ($self, $name, $cb) = @_;
	12	+ $self->checks->{$name} = $cb;
	13	+ return $self;
	14	+}
	15	+
	16	+sub validation {
	17	+ Mojolicious::Validator::Validation->new(validator => shift);
	18	+}
	19	+
	20	+sub _equal_to {
	21	+ my ($validation, $name, $value, $to) = @_;
	22	+ return 1 unless defined(my $other = $validation->input->{$to});
	23	+ return $value ne $other;
	24	+}
	25	+
	26	+sub _in {
	27	+ my ($validation, $name, $value) = (shift, shift, shift);
	28	+ $value eq $_ && return undef for @_;
	29	+ return 1;
	30	+}
	31	+
	32	+sub _like { $_[2] !~ $_[3] }
	33	+
	34	+sub _size {
	35	+ my ($validation, $name, $value, $min, $max) = @_;
	36	+ my $len = length $value;
	37	+ return $len < $min \|\| $len > $max;
	38	+}
	39	+
	40	+1;
	41	+
	42	+=encoding utf8
	43	+
	44	+=head1 NAME
	45	+
	46	+Mojolicious::Validator - Validate form data
	47	+
	48	+=head1 SYNOPSIS
	49	+
	50	+ use Mojolicious::Validator;
	51	+
	52	+ my $validator = Mojolicious::Validator->new;
	53	+ my $validation = $validator->validation;
	54	+ $validation->input({foo => 'bar'});
	55	+ $validation->required('foo')->like(qr/ar$/);
	56	+ say $validation->param('foo');
	57	+
	58	+=head1 DESCRIPTION
	59	+
	60	+L<Mojolicious::Validator> validates form data for L<Mojolicious>.
	61	+
	62	+=head1 CHECKS
	63	+
	64	+These validation checks are available by default.
	65	+
	66	+=head2 equal_to
	67	+
	68	+ $validation->equal_to('foo');
	69	+
	70	+Value needs to be equal to the value of another field.
	71	+
	72	+=head2 in
	73	+
	74	+ $validation->in(qw(foo bar baz));
	75	+
	76	+Value needs to match one of the values in the list.
	77	+
	78	+=head2 like
	79	+
	80	+ $validation->like(qr/^[A-Z]/);
	81	+
	82	+Value needs to match the regular expression.
	83	+
	84	+=head2 size
	85	+
	86	+ $validation->size(2, 5);
	87	+
	88	+Value length in characters needs to be between these two values.
	89	+
	90	+=head1 ATTRIBUTES
	91	+
	92	+L<Mojolicious::Validator> implements the following attributes.
	93	+
	94	+=head2 checks
	95	+
	96	+ my $checks = $validator->checks;
	97	+ $validator = $validator->checks({size => sub {...}});
	98	+
	99	+Registered validation checks, by default only L</"equal_to">, L</"in">,
	100	+L</"like"> and L</"size"> are already defined.
	101	+
	102	+=head1 METHODS
	103	+
	104	+L<Mojolicious::Validator> inherits all methods from L<Mojo::Base> and
	105	+implements the following new ones.
	106	+
	107	+=head2 add_check
	108	+
	109	+ $validator = $validator->add_check(size => sub {...});
	110	+
	111	+Register a new validation check.
	112	+
	113	+=head2 validation
	114	+
	115	+ my $validation = $validator->validation;
	116	+
	117	+Build L<Mojolicious::Validator::Validation> object to perform validations.
	118	+
	119	+ my $validation = $validator->validation;
	120	+ $validation->input({foo => 'bar'});
	121	+ $validation->required('foo')->size(1, 5);
	122	+ say $validation->param('foo');
	123	+
	124	+=head1 SEE ALSO
	125	+
	126	+L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicio.us>.
	127	+
	128	+=cut

+216

mojo/lib/Mojolicious/Validator/Validation.pm

View

...	...	@@ -0,0 +1,216 @@
	1	+package Mojolicious::Validator::Validation;
	2	+use Mojo::Base -base;
	3	+
	4	+use Carp 'croak';
	5	+use Scalar::Util 'blessed';
	6	+
	7	+has [qw(input output)] => sub { {} };
	8	+has [qw(topic validator)];
	9	+
	10	+sub AUTOLOAD {
	11	+ my $self = shift;
	12	+
	13	+ my ($package, $method) = our $AUTOLOAD =~ /^([\w:]+)::(\w+)$/;
	14	+ croak "Undefined subroutine &${package}::$method called"
	15	+ unless blessed $self && $self->isa(__PACKAGE__);
	16	+
	17	+ croak qq{Can't locate object method "$method" via package "$package"}
	18	+ unless $self->validator->checks->{$method};
	19	+ return $self->check($method => @_);
	20	+}
	21	+
	22	+sub DESTROY { }
	23	+
	24	+sub check {
	25	+ my ($self, $check) = (shift, shift);
	26	+
	27	+ return $self unless $self->is_valid;
	28	+
	29	+ my $cb = $self->validator->checks->{$check};
	30	+ my $name = $self->topic;
	31	+ my $input = $self->input->{$name};
	32	+ for my $value (ref $input eq 'ARRAY' ? @$input : $input) {
	33	+ next unless my $result = $self->$cb($name, $value, @_);
	34	+ delete $self->output->{$name};
	35	+ $self->{error}{$name} = [$check, $result, @_];
	36	+ last;
	37	+ }
	38	+
	39	+ return $self;
	40	+}
	41	+
	42	+sub error { shift->{error}{shift()} }
	43	+
	44	+sub has_data { !!keys %{shift->input} }
	45	+
	46	+sub has_error { $_[1] ? exists $_[0]{error}{$_[1]} : !!keys %{$_[0]{error}} }
	47	+
	48	+sub is_valid { exists $_[0]->output->{defined $_[1] ? $_[1] : $_[0]->topic} }
	49	+
	50	+sub optional {
	51	+ my ($self, $name) = @_;
	52	+
	53	+ my $input = $self->input->{$name};
	54	+ my @input = ref $input eq 'ARRAY' ? @$input : $input;
	55	+ $self->output->{$name} = $input
	56	+ unless grep { !defined($_) \|\| !length($_) } @input;
	57	+
	58	+ return $self->topic($name);
	59	+}
	60	+
	61	+sub param {
	62	+ my ($self, $name) = @_;
	63	+
	64	+ # Multiple names
	65	+ return map { scalar $self->param($_) } @$name if ref $name eq 'ARRAY';
	66	+
	67	+ # List names
	68	+ return sort keys %{$self->output} unless defined $name;
	69	+
	70	+ my $value = $self->output->{$name};
	71	+ my @values = ref $value eq 'ARRAY' ? @$value : ($value);
	72	+ return wantarray ? @values : $values[0];
	73	+}
	74	+
	75	+sub required {
	76	+ my ($self, $name) = @_;
	77	+ $self->{error}{$name} = ['required'] unless $self->optional($name)->is_valid;
	78	+ return $self;
	79	+}
	80	+
	81	+1;
	82	+
	83	+=encoding utf8
	84	+
	85	+=head1 NAME
	86	+
	87	+Mojolicious::Validator::Validation - Perform validations
	88	+
	89	+=head1 SYNOPSIS
	90	+
	91	+ use Mojolicious::Validator;
	92	+ use Mojolicious::Validator::Validation;
	93	+
	94	+ my $validator = Mojolicious::Validator->new;
	95	+ my $validation
	96	+ = Mojolicious::Validator::Validation->new(validator => $validator);
	97	+ $validation->input({foo => 'bar'});
	98	+ $validation->required('foo')->in(qw(bar baz));
	99	+ say $validation->param('foo');
	100	+
	101	+=head1 DESCRIPTION
	102	+
	103	+L<Mojolicious::Validator::Validation> performs L<Mojolicious::Validator>
	104	+validation checks.
	105	+
	106	+=head1 ATTRIBUTES
	107	+
	108	+L<Mojolicious::Validator::Validation> implements the following attributes.
	109	+
	110	+=head2 input
	111	+
	112	+ my $input = $validation->input;
	113	+ $validation = $validation->input({foo => 'bar', baz => [123, 'yada']});
	114	+
	115	+Data to be validated.
	116	+
	117	+=head2 output
	118	+
	119	+ my $output = $validation->output;
	120	+ $validation = $validation->output({});
	121	+
	122	+Validated data.
	123	+
	124	+=head2 topic
	125	+
	126	+ my $topic = $validation->topic;
	127	+ $validation = $validation->topic('foo');
	128	+
	129	+Name of field currently being validated.
	130	+
	131	+=head2 validator
	132	+
	133	+ my $validator = $validation->validator;
	134	+ $validation = $validation->validator(Mojolicious::Validator->new);
	135	+
	136	+L<Mojolicious::Validator> object this validation belongs to.
	137	+
	138	+=head1 METHODS
	139	+
	140	+L<Mojolicious::Validator::Validation> inherits all methods from L<Mojo::Base>
	141	+and implements the following new ones.
	142	+
	143	+=head2 check
	144	+
	145	+ $validation = $validation->check('size', 2, 7);
	146	+
	147	+Perform validation check on all values of the current L</"topic">, no more
	148	+checks will be performend on them after the first one failed.
	149	+
	150	+=head2 error
	151	+
	152	+ my $err = $validation->error('foo');
	153	+
	154	+Return details about failed validation check, at any given time there can only
	155	+be one per field.
	156	+
	157	+ my ($check, $result, @args) = @{$validation->error('foo')};
	158	+
	159	+=head2 has_data
	160	+
	161	+ my $bool = $validation->has_data;
	162	+
	163	+Check if L</"input"> is available for validation.
	164	+
	165	+=head2 has_error
	166	+
	167	+ my $bool = $validation->has_error;
	168	+ my $bool = $validation->has_error('foo');
	169	+
	170	+Check if validation resulted in errors, defaults to checking all fields.
	171	+
	172	+=head2 is_valid
	173	+
	174	+ my $bool = $validation->is_valid;
	175	+ my $bool = $validation->is_valid('foo');
	176	+
	177	+Check if validation was successful and field has a value, defaults to checking
	178	+the current L</"topic">.
	179	+
	180	+=head2 optional
	181	+
	182	+ $validation = $validation->optional('foo');
	183	+
	184	+Change validation L</"topic">.
	185	+
	186	+=head2 param
	187	+
	188	+ my @names = $c->param;
	189	+ my $foo = $c->param('foo');
	190	+ my @foo = $c->param('foo');
	191	+ my ($foo, $bar) = $c->param(['foo', 'bar']);
	192	+
	193	+Access validated parameters, similar to L<Mojolicious::Controller/"param">.
	194	+
	195	+=head2 required
	196	+
	197	+ $validation = $validation->required('foo');
	198	+
	199	+Change validation L</"topic"> and make sure a value is present and not an
	200	+empty string.
	201	+
	202	+=head1 CHECKS
	203	+
	204	+In addition to the methods above, you can also call validation checks provided
	205	+by L<Mojolicious::Validator> on L<Mojolicious::Validator::Validation> objects,
	206	+similar to L</"check">.
	207	+
	208	+ $validation->required('foo')->size(2, 5)->like(qr/^[A-Z]/);
	209	+ $validation->optional('bar')->equal_to('foo');
	210	+ $validation->optional('baz')->in(qw(test 123));
	211	+
	212	+=head1 SEE ALSO
	213	+
	214	+L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicio.us>.
	215	+
	216	+=cut

+5 -5

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

View

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

BIN

mojo/lib/Mojolicious/public/mojo/pinstripe-dark.png

View

BIN

mojo/lib/Mojolicious/public/mojo/pinstripe-light.png

View

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

View

...

@@ -0,0 +1 @@

+.str,.atv{color:#9daa7e}.kwd,.tag{color:#d5b57c}.com{color:#726d73}.typ,.atn,.dec{color:#dd7e5e}.lit{color:#fcf0a4}.pun,.opn,.clo{color:#a78353}.pln{color:#889dbc}pre.prettyprint{border:0;padding-bottom:0.75em;padding-top:0.75em}

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

View

...

@@ -0,0 +1 @@

+.str{color:#718c00}.kwd{color:#8959a8}.com{color:#8e908c}.typ,.dec{color:#f5871f}.lit,.atn{color:#eab700}.pun,.opn,.clo,.pln{color:#4d4d4c}.tag,.var,.fun{color:#c82829}.atv{color:#3e999f}pre.prettyprint{border:1px solid #d1d1d1;padding:0;padding-bottom:1.5em;padding-top:1.5em}

BIN

mojo/lib/Mojolicious/public/mojo/stripes.png

View

+6 -12

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

View

@@ -6,11 +6,11 @@
     <meta http-equiv="Expires" content="-1">
     %= javascript '/mojo/jquery/jquery.js'
     %= javascript '/mojo/prettify/run_prettify.js'
-    %= stylesheet '/mojo/prettify/prettify-mojo.css'
+    %= stylesheet '/mojo/prettify/prettify-mojo-dark.css'
     %= stylesheet begin
       a img { border: 0 }
       body {
-        background-color: #f5f6f8;
+        background: url(<%= url_for '/mojo/pinstripe-light.png' %>);
         color: #445555;
         font: 0.9em 'Helvetica Neue', Helvetica, sans-serif;
         font-weight: normal;
@@ -18,7 +18,7 @@
         margin: 0;
       }
       pre {
-        font: 0.8em Consolas, Menlo, Monaco, Courier, monospace;
+        font: 0.9em Consolas, Menlo, Monaco, Courier, monospace;
         margin: 0;
         white-space: pre-wrap;
       }
@@ -31,15 +31,13 @@
       td { padding: 0.5em }
       .box {
         background-color: #fff;
-        -moz-box-shadow: 0px 0px 2px #ccc;
-        -webkit-box-shadow: 0px 0px 2px #ccc;
-        box-shadow: 0px 0px 2px #ccc;
+        box-shadow: 0px 0px 2px #999;
         overflow: hidden;
         padding: 1em;
       }
       .code {
         background-color: #1a1a1a;
-        background: url(<%= url_for '/mojo/pinstripe.gif' %>);
+        background: url(<%= url_for '/mojo/pinstripe-dark.png' %>);
         color: #eee;
         text-shadow: #333 0 1px 0;
       }
@@ -78,16 +76,12 @@
       }
       #showcase .key { padding-right: 0 }
       #more, #trace {
-        -moz-border-radius-bottomleft: 5px;
         border-bottom-left-radius: 5px;
-        -moz-border-radius-bottomright: 5px;
         border-bottom-right-radius: 5px;
       }
       #more .tap, #trace .tap { text-shadow: #ddd 0 1px 0 }
       #request {
-        -moz-border-radius-topleft: 5px;
         border-top-left-radius: 5px;
-        -moz-border-radius-topright: 5px;
         border-top-right-radius: 5px;
         margin-top: 1em;
       }
@@ -193,7 +187,7 @@
           %= $kv->(Stash => dumper $snapshot)
           %= $kv->(Session => dumper session)
           %= $kv->(Version => $req->version)
-          % for my $name (@{$self->req->headers->names}) {
+          % for my $name (sort @{$self->req->headers->names}) {
             % my $value = $self->req->headers->header($name);
             %= $kv->($name, $value)
           % }

+18 -21

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

View

@@ -3,21 +3,9 @@
   %= stylesheet scoped => 'scoped', begin
     #mojobar {
       background-color: #1a1a1a;
-      background: -webkit-gradient(
-        linear,
-        0% 0%,
-        0% 100%,
-        color-stop(0%, #2a2a2a),
-        color-stop(100%, #000)
-      );
-      background: -moz-linear-gradient(
-        top,
-        #2a2a2a 0%,
-        #000 100%
-      );
+      background: -webkit-linear-gradient(top, #2a2a2a 0%, #000 100%);
+      background: -moz-linear-gradient(top, #2a2a2a 0%, #000 100%);
       background: linear-gradient(top, #2a2a2a 0%, #000 100%);
-      -moz-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.6);
-      -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.6);
       box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.6);
       height: 46px;
       overflow: hidden;
@@ -37,22 +25,26 @@
       float: right;
       height: 60px;
       margin-right: 5em;
-      margin-top: 1em;
+      margin-top: 0.8em;
     }
     #mojobar-links a {
       color: #ccc;
       font: 1em 'Helvetica Neue', Helvetica, sans-serif;
       font-weight: 300;
       margin-left: 0.5em;
-      padding-bottom: 1em;
-      padding-top: 1em;
       text-decoration: none;
-      -webkit-transition: all 200ms ease-in-out;
-      -moz-transition: all 200ms ease-in-out;
-      -o-transition: all 200ms ease-in-out;
       transition: all 200ms ease-in-out;
     }
     #mojobar-links a:hover { color: #fff }
+    #mojobar-links input {
+      border: 0;
+      border-radius: 10px;
+      display: inline;
+      margin-left: 1em;
+      padding: 3px;
+    }
+    #mojobar-links input:focus { outline: 0 }
+    #mojobar-links form { display: inline }
   % end
   <div id="mojobar-logo">
     %= link_to 'http://mojolicio.us' => begin
@@ -61,13 +53,17 @@
   </div>
   <div id="mojobar-links">
     %= link_to Documentation => 'http://mojolicio.us/perldoc'
-    %= link_to Screencasts => 'http://mojocasts.com'
     %= link_to Wiki => 'https://github.com/kraih/mojo/wiki'
     %= link_to GitHub => 'https://github.com/kraih/mojo'
     %= link_to CPAN => 'http://metacpan.org/release/Mojolicious/'
     %= link_to MailingList => 'http://groups.google.com/group/mojolicious'
     %= link_to Blog => 'http://blog.kraih.com'
     %= link_to Twitter => 'http://twitter.com/kraih'
+    %= form_for 'http://google.com/cse' => (target => '_blank') => begin
+      %= hidden_field cx => '014527573091551588235:pwfplkjpgbi'
+      %= hidden_field ie => 'UTF-8'
+      %= search_field 'q', placeholder => 'Search'
+    %= end
   </div>
 </div>
 %= javascript begin
@@ -92,6 +88,7 @@
     });
   });
   $(document).ready(function() {
+    $('a[href^="#"]').addClass('mojoscroll');
     $(".mojoscroll").click(function(e) {
       e.preventDefault();
       e.stopPropagation();

+4 -11

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

View

@@ -2,11 +2,9 @@
 <html>
   <head>
     <title>Page not found</title>
-    %= javascript '/mojo/prettify/run_prettify.js'
-    %= stylesheet '/mojo/prettify/prettify-mojo.css'
     %= stylesheet begin
       body {
-        background-color: #f5f6f8;
+        background: url(<%= url_for '/mojo/pinstripe-light.png' %>);
         color: #445555;
         font: 0.9em 'Helvetica Neue', Helvetica, sans-serif;
         font-weight: normal;
@@ -16,10 +14,9 @@
       code {
         background-color: #eef9ff;
         border: solid #cce4ff 1px;
-        -moz-border-radius: 5px;
         border-radius: 5px;
         color: #333;
-        font: 0.8em Consolas, Menlo, Monaco, Courier, monospace;
+        font: 0.9em Consolas, Menlo, Monaco, Courier, monospace;
         padding: 0.4em;
       }
       h1 {
@@ -28,7 +25,7 @@
         margin: 0;
       }
       pre {
-        font: 0.8em Consolas, Menlo, Monaco, Courier, monospace;
+        font: 0.9em Consolas, Menlo, Monaco, Courier, monospace;
         margin: 0;
         white-space: pre-wrap;
       }
@@ -55,13 +52,9 @@
       }
       #routes {
         background-color: #fff;
-        -moz-border-radius-bottomleft: 5px;
         border-bottom-left-radius: 5px;
-        -moz-border-radius-bottomright: 5px;
         border-bottom-right-radius: 5px;
-        -moz-box-shadow: 0px 0px 2px #ccc;
-        -webkit-box-shadow: 0px 0px 2px #ccc;
-        box-shadow: 0px 0px 2px #ccc;
+        box-shadow: 0px 0px 2px #999;
         margin-left: 5em;
         margin-right: 5em;
         padding: 1em;

+23 -21

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

View

@@ -3,13 +3,13 @@
   <head>
     <title><%= $title %></title>
     %= javascript '/mojo/prettify/run_prettify.js'
-    %= stylesheet '/mojo/prettify/prettify-mojo.css'
+    %= stylesheet '/mojo/prettify/prettify-mojo-light.css'
     %= stylesheet begin
       a { color: inherit }
       a:hover { color: #2a2a2a }
       a img { border: 0 }
       body {
-        background-color: #f5f6f8;
+        background: url(<%= url_for '/mojo/pinstripe-light.png' %>);
         color: #445555;
         font: 0.9em 'Helvetica Neue', Helvetica, sans-serif;
         font-weight: normal;
@@ -23,17 +23,16 @@
       }
       h1 a, h2 a, h3 a { text-decoration: none }
       pre {
-        background-color: #eee;
-        background: url(<%= url_for '/mojo/pinstripe.gif' %>);
-        -moz-border-radius: 5px;
-        border-radius: 5px;
-        color: #eee;
-        font: 0.8em Consolas, Menlo, Monaco, Courier, monospace;
-        line-height: 1.7em;
-        text-align: left;
-        text-shadow: #333 0 1px 0;
+        background: url(<%= url_for '/mojo/stripes.png' %>);
+        border: 1px solid #d1d1d1;
+        box-shadow: 0 1px #fff, inset -1px 1px 4px rgba(0, 0, 0, 0.1);
+        color: #4d4d4c;
+        font: 0.9em Consolas, Menlo, Monaco, Courier, monospace;
+        line-height: 1.5em;
         padding-bottom: 1.5em;
         padding-top: 1.5em;
+        text-align: left;
+        text-shadow: #eee 0 1px 0;
         white-space: pre-wrap;
       }
       #footer {
@@ -42,19 +41,16 @@
       }
       #perldoc {
         background-color: #fff;
-        -moz-border-radius-bottomleft: 5px;
         border-bottom-left-radius: 5px;
-        -moz-border-radius-bottomright: 5px;
         border-bottom-right-radius: 5px;
-        -moz-box-shadow: 0px 0px 2px #ccc;
-        -webkit-box-shadow: 0px 0px 2px #ccc;
-        box-shadow: 0px 0px 2px #ccc;
+        box-shadow: 0px 0px 2px #999;
         margin-left: 5em;
         margin-right: 5em;
         padding: 3em;
         padding-top: 70px;
       }
       #perldoc > ul:first-of-type a { text-decoration: none }
+      #source { padding-bottom: 1em }
       #wrapperlicious {
         max-width: 1000px;
         margin: 0 auto;
@@ -63,20 +59,26 @@
   </head>
   <body>
     %= include inline => app->renderer->_bundled('mojobar')
-    % my $link = begin
-      %= link_to shift, shift, class => "mojoscroll"
-    % end
     <div id="wrapperlicious">
       <div id="perldoc">
+        <div id="source">
+          % my $path;
+          % for my $part (split '/', $module) {
+            %= '::' if $path
+            % $path .= "/$part";
+            %= link_to $part => url_for("/perldoc$path")
+          % }
+          (<%= link_to 'source' => url_for("/perldoc$path.txt") %>)
+        </div>
         <h1><a id="toc">TABLE OF CONTENTS</a></h1>
         <ul>
           % for my $part (@$parts) {
             <li>
-              %= $link->(splice @$part, 0, 2)
+              %= link_to splice(@$part, 0, 2)
               % if (@$part) {
                 <ul>
                   % while (@$part) {
-                    <li><%= $link->(splice @$part, 0, 2) %></li>
+                    <li><%= link_to splice(@$part, 0, 2) %></li>
                   % }
                 </ul>
               % }

+35 -40

mojo/lib/Test/Mojo.pm

View

@@ -30,33 +30,33 @@ sub new {
 
 sub app {
   my ($self, $app) = @_;
-  return $self->ua->app unless $app;
-  $self->ua->app($app);
+  return $self->ua->server->app unless $app;
+  $self->ua->server->app($app);
   return $self;
 }
 
 sub content_is {
   my ($self, $value, $desc) = @_;
   $desc ||= 'exact match for content';
-  return $self->_test('is', $self->_get_content($self->tx), $value, $desc);
+  return $self->_test('is', $self->tx->res->text, $value, $desc);
 }
 
 sub content_isnt {
   my ($self, $value, $desc) = @_;
   $desc ||= 'no match for content';
-  return $self->_test('isnt', $self->_get_content($self->tx), $value, $desc);
+  return $self->_test('isnt', $self->tx->res->text, $value, $desc);
 }
 
 sub content_like {
   my ($self, $regex, $desc) = @_;
   $desc ||= 'content is similar';
-  return $self->_test('like', $self->_get_content($self->tx), $regex, $desc);
+  return $self->_test('like', $self->tx->res->text, $regex, $desc);
 }
 
 sub content_unlike {
   my ($self, $regex, $desc) = @_;
   $desc ||= 'content is not similar';
-  return $self->_test('unlike', $self->_get_content($self->tx), $regex, $desc);
+  return $self->_test('unlike', $self->tx->res->text, $regex, $desc);
 }
 
 sub content_type_is {
@@ -301,13 +301,6 @@ sub websocket_ok {
   return $self->_test('ok', $self->tx->res->code eq 101, $desc);
 }
 
-sub _get_content {
-  my ($self, $tx) = @_;
-  my $content = $tx->res->body;
-  my $charset = $tx->res->content->charset;
-  return $charset ? decode($charset, $content) : $content;
-}
-
 sub _json {
   my ($self, $method, $p) = @_;
   return Mojo::JSON::Pointer->new->$method(
@@ -442,7 +435,7 @@ User agent used for testing, defaults to a L<Mojo::UserAgent> object.
   $t->ua->max_redirects(10);
 
   # Use absolute URL for request with Basic authentication
-  my $url = $t->ua->app_url->userinfo('sri:secr3t')->path('/secrets.json');
+  my $url = $t->ua->server->url->userinfo('sri:secr3t')->path('/secrets.json');
   $t->post_ok($url => json => {limit => 10})
     ->status_is(200)
     ->json_is('/1/content', 'Mojo rocks!');
@@ -482,9 +475,9 @@ Access application with L<Mojo::UserAgent/"app">.
 
   # Change application behavior
   $t->app->hook(before_dispatch => sub {
-    my $self = shift;
-    $self->render(text => 'This request did not reach the router.')
-      if $self->req->url->path->contains('/user');
+    my $c = shift;
+    $c->render(text => 'This request did not reach the router.')
+      if $c->req->url->path->contains('/user');
   });
 
   # Extract additional information
@@ -496,28 +489,30 @@ Access application with L<Mojo::UserAgent/"app">.
   $t = $t->content_is('working!');
   $t = $t->content_is('working!', 'right content');
 
-Check response content for exact match.
+Check response content for exact match after retrieving it from
+L<Mojo::Message/"text">.
 
 =head2 content_isnt
 
   $t = $t->content_isnt('working!');
   $t = $t->content_isnt('working!', 'different content');
 
-Opposite of C<content_is>.
+Opposite of L</"content_is">.
 
 =head2 content_like
 
   $t = $t->content_like(qr/working!/);
   $t = $t->content_like(qr/working!/, 'right content');
 
-Check response content for similar match.
+Check response content for similar match after retrieving it from
+L<Mojo::Message/"text">.
 
 =head2 content_unlike
 
   $t = $t->content_unlike(qr/working!/);
   $t = $t->content_unlike(qr/working!/, 'different content');
 
-Opposite of C<content_like>.
+Opposite of L</"content_like">.
 
 =head2 content_type_is
 
@@ -531,7 +526,7 @@ Check response C<Content-Type> header for exact match.
   $t = $t->content_type_isnt('text/html');
   $t = $t->content_type_isnt('text/html', 'different content type');
 
-Opposite of C<content_type_is>.
+Opposite of L</"content_type_is">.
 
 =head2 content_type_like
 
@@ -545,7 +540,7 @@ Check response C<Content-Type> header for similar match.
   $t = $t->content_type_unlike(qr/text/);
   $t = $t->content_type_unlike(qr/text/, 'different content type');
 
-Opposite of C<content_type_like>.
+Opposite of L</"content_type_like">.
 
 =head2 delete_ok
 
@@ -554,7 +549,7 @@ Opposite of C<content_type_like>.
   $t = $t->delete_ok('/foo' => {DNT => 1} => form => {a => 'b'});
   $t = $t->delete_ok('/foo' => {DNT => 1} => json => {a => 'b'});
 
-Perform a C<DELETE> request and check for transport errors, takes the same
+Perform a DELETE request and check for transport errors, takes the same
 arguments as L<Mojo::UserAgent/"delete">, except for the callback.
 
 =head2 element_exists
@@ -570,7 +565,7 @@ L<Mojo::DOM>.
   $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>.
+Opposite of L</"element_exists">.
 
 =head2 finish_ok
 
@@ -593,7 +588,7 @@ Wait for WebSocket connection to be closed gracefully and check status.
   $t = $t->get_ok('/foo' => {DNT => 1} => form => {a => 'b'});
   $t = $t->get_ok('/foo' => {DNT => 1} => json => {a => 'b'});
 
-Perform a C<GET> request and check for transport errors, takes the same
+Perform a GET request and check for transport errors, takes the same
 arguments as L<Mojo::UserAgent/"get">, except for the callback.
 
 =head2 head_ok
@@ -603,7 +598,7 @@ arguments as L<Mojo::UserAgent/"get">, except for the callback.
   $t = $t->head_ok('/foo' => {DNT => 1} => form => {a => 'b'});
   $t = $t->head_ok('/foo' => {DNT => 1} => json => {a => 'b'});
 
-Perform a C<HEAD> request and check for transport errors, takes the same
+Perform a HEAD request and check for transport errors, takes the same
 arguments as L<Mojo::UserAgent/"head">, except for the callback.
 
 =head2 header_is
@@ -618,7 +613,7 @@ Check response header for exact match.
   $t = $t->header_isnt(Expect => 'fun');
   $t = $t->header_isnt(Expect => 'fun', 'different header');
 
-Opposite of C<header_is>.
+Opposite of L</"header_is">.
 
 =head2 header_like
 
@@ -632,7 +627,7 @@ Check response header for similar match.
   $t = $t->header_like(Expect => qr/fun/);
   $t = $t->header_like(Expect => qr/fun/, 'different header');
 
-Opposite of C<header_like>.
+Opposite of L</"header_like">.
 
 =head2 json_has
 
@@ -647,7 +642,7 @@ JSON Pointer with L<Mojo::JSON::Pointer>.
   $t = $t->json_hasnt('/foo');
   $t = $t->json_hasnt('/minibar', 'no minibar');
 
-Opposite of C<json_has>.
+Opposite of L</"json_has">.
 
 =head2 json_is
 
@@ -672,7 +667,7 @@ the given JSON Pointer with L<Mojo::JSON::Pointer>.
   $t = $t->json_message_hasnt('/foo');
   $t = $t->json_message_hasnt('/minibar', 'no minibar');
 
-Opposite of C<json_message_has>.
+Opposite of L</"json_message_has">.
 
 =head2 json_message_is
 
@@ -701,7 +696,7 @@ Check WebSocket message for exact match.
   $t = $t->message_isnt('working!');
   $t = $t->message_isnt('working!', 'different message');
 
-Opposite of C<message_is>.
+Opposite of L</"message_is">.
 
 =head2 message_like
 
@@ -733,7 +728,7 @@ Wait for next WebSocket message to arrive.
   $t = $t->message_unlike(qr/working!/);
   $t = $t->message_unlike(qr/working!/, 'different message');
 
-Opposite of C<message_like>.
+Opposite of L</"message_like">.
 
 =head2 options_ok
 
@@ -742,7 +737,7 @@ Opposite of C<message_like>.
   $t = $t->options_ok('/foo' => {DNT => 1} => form => {a => 'b'});
   $t = $t->options_ok('/foo' => {DNT => 1} => json => {a => 'b'});
 
-Perform a C<OPTIONS> request and check for transport errors, takes the same
+Perform a OPTIONS request and check for transport errors, takes the same
 arguments as L<Mojo::UserAgent/"options">, except for the callback.
 
 =head2 or
@@ -762,7 +757,7 @@ Invoke callback if previous test failed.
   $t = $t->patch_ok('/foo' => {DNT => 1} => form => {a => 'b'});
   $t = $t->patch_ok('/foo' => {DNT => 1} => json => {a => 'b'});
 
-Perform a C<PATCH> request and check for transport errors, takes the same
+Perform a PATCH request and check for transport errors, takes the same
 arguments as L<Mojo::UserAgent/"patch">, except for the callback.
 
 =head2 post_ok
@@ -772,7 +767,7 @@ arguments as L<Mojo::UserAgent/"patch">, except for the callback.
   $t = $t->post_ok('/foo' => {DNT => 1} => form => {a => 'b'});
   $t = $t->post_ok('/foo' => {DNT => 1} => json => {a => 'b'});
 
-Perform a C<POST> request and check for transport errors, takes the same
+Perform a POST request and check for transport errors, takes the same
 arguments as L<Mojo::UserAgent/"post">, except for the callback.
 
   # Test file upload
@@ -791,7 +786,7 @@ arguments as L<Mojo::UserAgent/"post">, except for the callback.
   $t = $t->put_ok('/foo' => {DNT => 1} => form => {a => 'b'});
   $t = $t->put_ok('/foo' => {DNT => 1} => json => {a => 'b'});
 
-Perform a C<PUT> request and check for transport errors, takes the same
+Perform a PUT request and check for transport errors, takes the same
 arguments as L<Mojo::UserAgent/"put">, except for the callback.
 
 =head2 request_ok
@@ -841,7 +836,7 @@ Check response status for exact match.
   $t = $t->status_isnt(200);
   $t = $t->status_isnt(200, 'different status');
 
-Opposite of C<status_is>.
+Opposite of L</"status_is">.
 
 =head2 text_is
 
@@ -856,7 +851,7 @@ exact match with L<Mojo::DOM>.
   $t = $t->text_isnt('div.foo[x=y]' => 'Hello!');
   $t = $t->text_isnt('html head title' => 'Hello!', 'different title');
 
-Opposite of C<text_is>.
+Opposite of L</"text_is">.
 
 =head2 text_like
 
@@ -871,7 +866,7 @@ similar match with L<Mojo::DOM>.
   $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>.
+Opposite of L</"text_like">.
 
 =head2 websocket_ok
 

+29 -25

mojo/lib/ojo.pm

View

@@ -6,12 +6,12 @@ use Mojo::Collection 'c';
 use Mojo::DOM;
 use Mojo::JSON 'j';
 use Mojo::UserAgent;
-use Mojo::Util 'monkey_patch';
+use Mojo::Util qw(dumper monkey_patch);
 
-# Silent oneliners
+# Silent one-liners
 $ENV{MOJO_LOG_LEVEL} ||= 'fatal';
 
-# Singleton user agent for oneliners
+# Singleton user agent for one-liners
 my $UA = Mojo::UserAgent->new;
 
 sub import {
@@ -19,14 +19,15 @@ sub import {
   # Mojolicious::Lite
   my $caller = caller;
   eval "package $caller; use Mojolicious::Lite;";
-  $UA->app($caller->app);
+  my $server = $UA->server->app($caller->app);
+  $server->app->hook(around_action => sub { local $_ = $_[1]; $_[0]->() });
 
   $UA->max_redirects(10) unless defined $ENV{MOJO_MAX_REDIRECTS};
-  $UA->detect_proxy unless defined $ENV{MOJO_PROXY};
+  $UA->proxy->detect unless defined $ENV{MOJO_PROXY};
 
   # The ojo DSL
   monkey_patch $caller,
-    a => sub { $caller->can('any')->(@_) and return $UA->app },
+    a => sub { $caller->can('any')->(@_) and return $UA->server->app },
     b => \&b,
     c => \&c,
     d => sub { _request($UA->build_tx(DELETE  => @_)) },
@@ -35,9 +36,9 @@ sub import {
     j => \&j,
     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 => @_)) },
+    r => \&dumper,
+    t => sub { _request($UA->build_tx(PATCH   => @_)) },
+    u => sub { _request($UA->build_tx(PUT     => @_)) },
     x => sub { Mojo::DOM->new(@_) };
 }
 
@@ -51,9 +52,11 @@ sub _request {
 
 1;
 
+=encoding utf8
+
 =head1 NAME
 
-ojo - Fun oneliners with Mojo!
+ojo - Fun one-liners with Mojo!
 
 =head1 SYNOPSIS
 
@@ -61,7 +64,7 @@ ojo - Fun oneliners with Mojo!
 
 =head1 DESCRIPTION
 
-A collection of automatically exported functions for fun Perl oneliners. Ten
+A collection of automatically exported functions for fun Perl one-liners. Ten
 redirects will be followed by default, you can change this behavior with the
 MOJO_MAX_REDIRECTS environment variable.
 
@@ -78,11 +81,12 @@ L<ojo> implements the following functions.
 
 =head2 a
 
-  my $app = a('/hello' => sub { shift->render(json => {hello => 'world'}) });
+  my $app = a('/hello' => sub { $_->render(json => {hello => 'world'}) });
 
 Create a route with L<Mojolicious::Lite/"any"> and return the current
-L<Mojolicious::Lite> object. See also the L<Mojolicious::Lite> tutorial for
-more argument variations.
+L<Mojolicious::Lite> object. The current controller object is also available
+to actions as C<$_>. See also the L<Mojolicious::Lite> tutorial for more
+argument variations.
 
   $ perl -Mojo -E 'a("/hello" => {text => "Hello Mojo!"})->start' daemon
 
@@ -105,25 +109,25 @@ Turn list into a L<Mojo::Collection> object.
   my $res = d('example.com');
   my $res = d('http://example.com' => {DNT => 1} => 'Hi!');
 
-Perform C<DELETE> request with L<Mojo::UserAgent/"delete"> and return
-resulting L<Mojo::Message::Response> object.
+Perform DELETE request with L<Mojo::UserAgent/"delete"> and return resulting
+L<Mojo::Message::Response> object.
 
 =head2 g
 
   my $res = g('example.com');
   my $res = g('http://example.com' => {DNT => 1} => 'Hi!');
 
-Perform C<GET> request with L<Mojo::UserAgent/"get"> and return resulting
+Perform GET request with L<Mojo::UserAgent/"get"> and return resulting
 L<Mojo::Message::Response> object.
 
-  $ perl -Mojo -E 'say g("mojolicio.us")->dom("h1, h2, h3")->pluck("text")'
+  $ perl -Mojo -E 'say g("mojolicio.us")->dom("h1, h2, h3")->text'
 
 =head2 h
 
   my $res = h('example.com');
   my $res = h('http://example.com' => {DNT => 1} => 'Hi!');
 
-Perform C<HEAD> request with L<Mojo::UserAgent/"head"> and return resulting
+Perform HEAD request with L<Mojo::UserAgent/"head"> and return resulting
 L<Mojo::Message::Response> object.
 
 =head2 j
@@ -141,22 +145,22 @@ Encode Perl data structure or decode JSON with L<Mojo::JSON>.
   my $res = o('example.com');
   my $res = o('http://example.com' => {DNT => 1} => 'Hi!');
 
-Perform C<OPTIONS> request with L<Mojo::UserAgent/"options"> and return
-resulting L<Mojo::Message::Response> object.
+Perform OPTIONS request with L<Mojo::UserAgent/"options"> and return resulting
+L<Mojo::Message::Response> object.
 
 =head2 p
 
   my $res = p('example.com');
   my $res = p('http://example.com' => {DNT => 1} => 'Hi!');
 
-Perform C<POST> request with L<Mojo::UserAgent/"post"> and return resulting
+Perform POST request with L<Mojo::UserAgent/"post"> and return resulting
 L<Mojo::Message::Response> object.
 
 =head2 r
 
   my $perl = r({data => 'structure'});
 
-Dump a Perl data structure with L<Data::Dumper>.
+Dump a Perl data structure with L<Mojo::Util/"dumper">.
 
   perl -Mojo -E 'say r(g("example.com")->headers->to_hash)'
 
@@ -165,7 +169,7 @@ Dump a Perl data structure with L<Data::Dumper>.
   my $res = t('example.com');
   my $res = t('http://example.com' => {DNT => 1} => 'Hi!');
 
-Perform C<PATCH> request with L<Mojo::UserAgent/"patch"> and return resulting
+Perform PATCH request with L<Mojo::UserAgent/"patch"> and return resulting
 L<Mojo::Message::Response> object.
 
 =head2 u
@@ -173,7 +177,7 @@ L<Mojo::Message::Response> object.
   my $res = u('example.com');
   my $res = u('http://example.com' => {DNT => 1} => 'Hi!');
 
-Perform C<PUT> request with L<Mojo::UserAgent/"put"> and return resulting
+Perform PUT request with L<Mojo::UserAgent/"put"> and return resulting
 L<Mojo::Message::Response> object.
 
 =head2 x

+5 -4

mojo/script/hypnotoad

View

@@ -8,14 +8,13 @@ BEGIN { unshift @INC, "$FindBin::Bin/../lib" }
 
 use Getopt::Long qw(GetOptions :config no_auto_abbrev no_ignore_case);
 
-GetOptions(
+GetOptions
   'f|foreground' => sub { $ENV{HYPNOTOAD_FOREGROUND} = 1 },
   'h|help'       => \my $help,
   's|stop'       => sub { $ENV{HYPNOTOAD_STOP}       = 1 },
-  't|test'       => sub { $ENV{HYPNOTOAD_TEST}       = 1 }
-);
+  't|test'       => sub { $ENV{HYPNOTOAD_TEST}       = 1 };
 
-die <<"EOF" if $help || !(my $app = shift || $ENV{HYPNOTOAD_APP});
+die <<EOF if $help || !(my $app = shift || $ENV{HYPNOTOAD_APP});
 usage: $0 [OPTIONS] [APPLICATION]
 
   hypnotoad script/myapp
@@ -32,6 +31,8 @@ EOF
 require Mojo::Server::Hypnotoad;
 Mojo::Server::Hypnotoad->new->run($app);
 
+=encoding utf8
+
 =head1 NAME
 
 hypnotoad - Hypnotoad HTTP and WebSocket server

mojo/script/mojo

View

@@ -9,6 +9,8 @@ BEGIN { unshift @INC, "$FindBin::Bin/../lib" }
 require Mojolicious::Commands;
 Mojolicious::Commands->start_app('Mojo::HelloWorld');
 
+=encoding utf8
+
 =head1 NAME
 
 mojo - The Mojolicious command system

+10 -4

mojo/script/morbo

View

@@ -8,18 +8,19 @@ BEGIN { unshift @INC, "$FindBin::Bin/../lib" }
 
 use Getopt::Long qw(GetOptions :config no_auto_abbrev no_ignore_case);
 
-GetOptions(
+GetOptions
   'h|help'     => \my $help,
   'l|listen=s' => \my @listen,
+  'm|mode=s'   => sub { $ENV{MOJO_MODE} = $_[1] },
   'v|verbose'  => sub { $ENV{MORBO_VERBOSE} = 1 },
-  'w|watch=s'  => \my @watch
-);
+  'w|watch=s'  => \my @watch;
 
-die <<"EOF" if $help || !(my $app = shift);
+die <<EOF if $help || !(my $app = shift);
 usage: $0 [OPTIONS] [APPLICATION]
 
   morbo script/myapp
   morbo myapp.pl
+  morbo -m production -l https://*:443
   morbo -w /usr/local/lib -w public myapp.pl
 
 These options are available:
@@ -27,6 +28,9 @@ These options are available:
   -l, --listen <location>        Set one or more locations you want to listen
                                  on, defaults to the value of MOJO_LISTEN or
                                  "http://*:3000".
+  -m, --mode <name>              Operating mode for your application, defaults
+                                 to the value of MOJO_MODE/PLACK_ENV or
+                                 "development".
   -v, --verbose                  Print details about what files changed to
                                  STDOUT.
   -w, --watch <directory/file>   Set one or more directories and files to
@@ -42,6 +46,8 @@ my $morbo = Mojo::Server::Morbo->new;
 $morbo->watch(\@watch) if @watch;
 $morbo->run($app);
 
+=encoding utf8
+
 =head1 NAME
 
 morbo - Morbo HTTP and WebSocket development server

...	...	@@ -15,10 +15,10 @@ has log => sub { Mojo::Log->new };
15	15	has ua => sub {
16	16	my $self = shift;
17	17
18		- my $ua = Mojo::UserAgent->new->app($self);
	18	+ my $ua = Mojo::UserAgent->new;
	19	+ weaken $ua->server->app($self)->{app};
19	20	weaken $self;
20	21	$ua->on(error => sub { $self->log->error($_[1]) });
21		- weaken $ua->{app};
22	22
23	23	return $ua;
24	24	};
...	...	@@ -27,7 +27,8 @@ sub new {
27	27	my $self = shift->SUPER::new(@_);
28	28
29	29	# Check if we have a log directory
30		- my $home = $self->home->detect(ref $self);
	30	+ my $home = $self->home;
	31	+ $home->detect(ref $self) unless @{$home->parts};
31	32	$self->log->path($home->rel_file('log/mojo.log'))
32	33	if -w $home->rel_file('log');
33	34
...	...	@@ -58,6 +59,8 @@ sub _dict {
58	59
59	60	1;
60	61
	62	+=encoding utf8
	63	+
61	64	=head1 NAME
62	65
63	66	Mojo - Duct tape for the HTML5 web!
...	...	@@ -92,7 +95,7 @@ frameworks. It provides all the basic tools and helpers needed to write
92	95	simple web applications and higher level web frameworks, such as
93	96	L<Mojolicious>.
94	97
95		-See L<Mojolicious> for more!
	98	+See L<Mojolicious::Guides> for more!
96	99
97	100	=head1 ATTRIBUTES
98	101
...	...	@@ -130,7 +133,7 @@ plugins, since non-blocking requests that are already in progress will
130	133	interfere with new blocking ones.
131	134
132	135	# Perform blocking request
133		- my $body = $app->ua->get('example.com')->res->body;
	136	+ say $app->ua->get('example.com')->res->body;
134	137
135	138	=head1 METHODS
136	139
...	...	@@ -142,7 +145,8 @@ new ones.
142	145	my $app = Mojo->new;
143	146
144	147	Construct a new L<Mojo> application. Will automatically detect your home
145		-directory and set up logging to C<log/mojo.log> if there's a C<log> directory.
	148	+directory if necessary and set up logging to C<log/mojo.log> if there's a
	149	+C<log> directory.
146	150
147	151	=head2 build_tx
148	152

...	...	@@ -20,6 +20,8 @@ sub slurp { croak 'Method "slurp" not implemented by subclass' }
20	20
21	21	1;
22	22
	23	+=encoding utf8
	24	+
23	25	=head1 NAME
24	26
25	27	Mojo::Asset - HTTP content storage base class
...	...	@@ -58,7 +60,7 @@ Pretend file ends earlier.
58	60	=head2 start_range
59	61
60	62	my $start = $asset->start_range;
61		- $asset = $asset->start_range(0);
	63	+ $asset = $asset->start_range(3);
62	64
63	65	Pretend file starts later.
64	66
...	...	@@ -96,9 +98,9 @@ False.
96	98
97	99	=head2 is_range
98	100
99		- my $success = $asset->is_range;
	101	+ my $bool = $asset->is_range;
100	102
101		-Check if asset has a C<start_range> or C<end_range>.
	103	+Check if asset has a L</"start_range"> or L</"end_range">.
102	104
103	105	=head2 move_to
104	106

...	...	@@ -26,7 +26,7 @@ has handle => sub {
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};
29		- $name = "$base." . md5_sum(time . $$ . rand 9999999);
	29	+ $name = "$base." . md5_sum(time . $$ . rand 9 x 7);
30	30	}
31	31	$self->path($name);
32	32
...	...	@@ -140,6 +140,8 @@ sub slurp {
140	140
141	141	1;
142	142
	143	+=encoding utf8
	144	+
143	145	=head1 NAME
144	146
145	147	Mojo::Asset::File - File storage for HTTP content
...	...	@@ -174,8 +176,8 @@ implements the following new ones.
174	176
175	177	=head2 cleanup
176	178
177		- my $cleanup = $file->cleanup;
178		- $file = $file->cleanup(1);
	179	+ my $bool = $file->cleanup;
	180	+ $file = $file->cleanup($bool);
179	181
180	182	Delete file automatically once it's not used anymore.
181	183
...	...	@@ -184,14 +186,14 @@ Delete file automatically once it's not used anymore.
184	186	my $handle = $file->handle;
185	187	$file = $file->handle(IO::File->new);
186	188
187		-File handle, created on demand.
	189	+Filehandle, created on demand.
188	190
189	191	=head2 path
190	192
191	193	my $path = $file->path;
192	194	$file = $file->path('/home/sri/foo.txt');
193	195
194		-File path used to create C<handle>, can also be automatically generated if
	196	+File path used to create L</"handle">, can also be automatically generated if
195	197	necessary.
196	198
197	199	=head2 tmpdir
...	...	@@ -199,7 +201,7 @@ necessary.
199	201	my $tmpdir = $file->tmpdir;
200	202	$file = $file->tmpdir('/tmp');
201	203
202		-Temporary directory used to generate C<path>, defaults to the value of the
	204	+Temporary directory used to generate L</"path">, defaults to the value of the
203	205	MOJO_TMPDIR environment variable or auto detection.
204	206
205	207	=head1 METHODS
...	...	@@ -237,7 +239,7 @@ True.
237	239
238	240	$file = $file->move_to('/home/sri/bar.txt');
239	241
240		-Move asset data into a specific file and disable C<cleanup>.
	242	+Move asset data into a specific file and disable L</"cleanup">.
241	243
242	244	=head2 size
243	245

...	...	@@ -55,6 +55,8 @@ sub slurp { shift->{content} }
55	55
56	56	1;
57	57
	58	+=encoding utf8
	59	+
58	60	=head1 NAME
59	61
60	62	Mojo::Asset::Memory - In-memory storage for HTTP content
...	...	@@ -97,10 +99,10 @@ implements the following new ones.
97	99
98	100	=head2 auto_upgrade
99	101
100		- my $upgrade = $mem->auto_upgrade;
101		- $mem = $mem->auto_upgrade(1);
	102	+ my $bool = $mem->auto_upgrade;
	103	+ $mem = $mem->auto_upgrade($bool);
102	104
103		-Try to detect if content size exceeds C<max_memory_size> limit and
	105	+Try to detect if content size exceeds L</"max_memory_size"> limit and
104	106	automatically upgrade to a L<Mojo::Asset::File> object.
105	107
106	108	=head2 max_memory_size

...	...	@@ -14,7 +14,6 @@ use IO::Handle ();
14	14	sub import {
15	15	my $class = shift;
16	16	return unless my $flag = shift;
17		- no strict 'refs';
18	17
19	18	# Base
20	19	if ($flag eq '-base') { $flag = $class }
...	...	@@ -23,21 +22,24 @@ sub import {
23	22	elsif ($flag eq '-strict') { $flag = undef }
24	23
25	24	# Module
26		- else {
27		- my $file = $flag;
28		- $file =~ s/::\|'/\//g;
29		- require "$file.pm" unless $flag->can('new');
	25	+ elsif ((my $file = $flag) && !$flag->can('new')) {
	26	+ $file =~ s!::\|'!/!g;
	27	+ require "$file.pm";
30	28	}
31	29
32	30	# ISA
33	31	if ($flag) {
34	32	my $caller = caller;
	33	+ no strict 'refs';
35	34	push @{"${caller}::ISA"}, $flag;
36	35	*{"${caller}::has"} = sub { attr($caller, @_) };
37	36	}
38	37
39	38	my $caller = caller;
40		- *{"${caller}::say"} = sub { say(@_) };
	39	+ {
	40	+ no strict 'refs';
	41	+ *{"${caller}::say"} = sub { say(@_) };
	42	+ }
41	43
42	44	# Mojo modules are strict!
43	45	strict->import;
...	...	@@ -51,9 +53,6 @@ sub new {
51	53	bless @_ ? @_ > 1 ? {@_} : {%{$_[0]}} : {}, ref $class \|\| $class;
52	54	}
53	55
54		-# Performance is very important for something as often used as accessors,
55		-# so we optimize them by compiling our own code, don't be scared, we have
56		-# tests for every single case
57	56	sub attr {
58	57	my ($class, $attrs, $default) = @_;
59	58	return unless ($class = ref $class \|\| $class) && $attrs;
...	...	@@ -61,7 +60,6 @@ sub attr {
61	60	Carp::croak 'Default has to be a code reference or constant value'
62	61	if ref $default && ref $default ne 'CODE';
63	62
64		- # Compile attributes
65	63	for my $attr (@{ref $attrs eq 'ARRAY' ? $attrs : [$attrs]}) {
66	64	Carp::croak qq{Attribute "$attr" invalid} unless $attr =~ /^[a-zA-Z_]\w*$/;
67	65
...	...	@@ -89,8 +87,6 @@ sub attr {
89	87	# Footer (return invocant)
90	88	$code .= " \$_[0];\n}";
91	89
92		- # We compile custom attribute code for speed
93		- no strict 'refs';
94	90	warn "-- Attribute $attr in $class\n$code\n\n" if $ENV{MOJO_BASE_DEBUG};
95	91	Carp::croak "Mojo::Base error: $@" unless eval "$code;1";
96	92	}
...	...	@@ -104,6 +100,8 @@ sub tap {
104	100
105	101	1;
106	102
	103	+=encoding utf8
	104	+
107	105	=head1 NAME
108	106
109	107	Mojo::Base - Minimal base class for Mojo projects
...	...	@@ -185,7 +183,7 @@ flag or a base class.
185	183	has [qw(name1 name2 name3)] => 'foo';
186	184	has [qw(name1 name2 name3)] => sub {...};
187	185
188		-Create attributes for hash-based objects, just like the C<attr> method.
	186	+Create attributes for hash-based objects, just like the L</"attr"> method.
189	187
190	188	=head1 METHODS
191	189
...	...	@@ -222,8 +220,8 @@ argument.
222	220	$object = $object->tap(sub {...});
223	221
224	222	K combinator, tap into a method chain to perform operations on an object
225		-within the chain. The object will be the first argument passed to the closure
226		-and is also available via C<$_>.
	223	+within the chain. The object will be the first argument passed to the callback
	224	+and is also available as C<$_>.
227	225
228	226	=head2 C<say>
229	227

...	...	@@ -1,5 +1,5 @@
1	1	package Mojo::ByteStream;
2		-use Mojo::Base -base;
	2	+use Mojo::Base -strict;
3	3	use overload '""' => sub { shift->to_string }, fallback => 1;
4	4
5	5	use Exporter 'import';
...	...	@@ -63,10 +63,14 @@ sub split {
63	63	return Mojo::Collection->new(map { $self->new($_) } split $pattern, $$self);
64	64	}
65	65
	66	+sub tap { shift->Mojo::Base::tap(@_) }
	67	+
66	68	sub to_string { ${$_[0]} }
67	69
68	70	1;
69	71
	72	+=encoding utf8
	73	+
70	74	=head1 NAME
71	75
72	76	Mojo::ByteStream - ByteStream
...	...	@@ -104,8 +108,7 @@ Construct a new scalar-based L<Mojo::ByteStream> object.
104	108
105	109	=head1 METHODS
106	110
107		-L<Mojo::ByteStream> inherits all methods from L<Mojo::Base> and implements the
108		-following new ones.
	111	+L<Mojo::ByteStream> implements the following methods.
109	112
110	113	=head2 new
111	114
...	...	@@ -219,7 +222,7 @@ Print bytestream to handle and append a newline, defaults to C<STDOUT>.
219	222
220	223	=head2 secure_compare
221	224
222		- my $success = $stream->secure_compare($str);
	225	+ my $bool = $stream->secure_compare($str);
223	226
224	227	Compare bytestream with L<Mojo::Util/"secure_compare">.
225	228
...	...	@@ -263,9 +266,10 @@ Write all data from bytestream at once to file with L<Mojo::Util/"spurt">.
263	266
264	267	my $collection = $stream->split(',');
265	268
266		-Turn bytestream into L<Mojo::Collection>.
	269	+Turn bytestream into L<Mojo::Collection> object containing L<Mojo::ByteStream>
	270	+objects.
267	271
268		- b('a,b,c')->split(',')->pluck('quote')->join(',')->say;
	272	+ b('a,b,c')->split(',')->quote->join(',')->say;
269	273
270	274	=head2 squish
271	275
...	...	@@ -275,6 +279,12 @@ Trim whitespace characters from both ends of bytestream and then change all
275	279	consecutive groups of whitespace into one space each with
276	280	L<Mojo::Util/"squish">.
277	281
	282	+=head2 tap
	283	+
	284	+ $stream = $stream->tap(sub {...});
	285	+
	286	+Alias for L<Mojo::Base/"tap">.
	287	+
278	288	=head2 to_string
279	289
280	290	my $str = $stream->to_string;
...	...	@@ -327,6 +337,12 @@ bytestream with L<Mojo::Util/"xml_escape">.
327	337
328	338	XOR encode bytestream with L<Mojo::Util/"xor_encode">.
329	339
	340	+=head1 BYTESTREAM
	341	+
	342	+Direct scalar reference access to the bytestream is also possible.
	343	+
	344	+ $$stream .= 'foo';
	345	+
330	346	=head1 SEE ALSO
331	347
332	348	L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicio.us>.

...	...	@@ -19,6 +19,8 @@ sub set {
19	19
20	20	1;
21	21
	22	+=encoding utf8
	23	+
22	24	=head1 NAME
23	25
24	26	Mojo::Cache - Naive in-memory cache

...	...	@@ -1,16 +1,29 @@
1	1	package Mojo::Collection;
2		-use Mojo::Base -base;
3		-use overload
4		- 'bool' => sub {1},
5		- '""' => sub { shift->join("\n") },
6		- fallback => 1;
	2	+use Mojo::Base -strict;
	3	+use overload bool => sub {1}, '""' => sub { shift->join("\n") }, fallback => 1;
7	4
	5	+use Carp 'croak';
8	6	use Exporter 'import';
9	7	use List::Util;
10	8	use Mojo::ByteStream;
	9	+use Scalar::Util 'blessed';
11	10
12	11	our @EXPORT_OK = ('c');
13	12
	13	+sub AUTOLOAD {
	14	+ my $self = shift;
	15	+
	16	+ my ($package, $method) = our $AUTOLOAD =~ /^([\w:]+)::(\w+)$/;
	17	+ croak "Undefined subroutine &${package}::$method called"
	18	+ unless blessed $self && $self->isa(__PACKAGE__);
	19	+
	20	+ croak qq{Can't locate object method "$method" via package "$package"}
	21	+ unless @$self;
	22	+ return $self->pluck($method, @_);
	23	+}
	24	+
	25	+sub DESTROY { }
	26	+
14	27	sub new {
15	28	my $class = shift;
16	29	return bless [@_], ref $class \|\| $class;
...	...	@@ -18,6 +31,10 @@ sub new {
18	31
19	32	sub c { __PACKAGE__->new(@_) }
20	33
	34	+sub compact {
	35	+ shift->grep(sub { length(defined $_ ? $_ : '') });
	36	+}
	37	+
21	38	sub each {
22	39	my ($self, $cb) = @_;
23	40	return @$self unless $cb;
...	...	@@ -33,16 +50,15 @@ sub first {
33	50	return List::Util::first { $_ =~ $cb } @$self;
34	51	}
35	52
	53	+sub flatten { $_[0]->new(_flatten(@{$_[0]})) }
	54	+
36	55	sub grep {
37	56	my ($self, $cb) = @_;
38	57	return $self->new(grep { $cb->($_) } @$self) if ref $cb eq 'CODE';
39	58	return $self->new(grep { $_ =~ $cb } @$self);
40	59	}
41	60
42		-sub join {
43		- my ($self, $expr) = @_;
44		- return Mojo::ByteStream->new(join $expr, map({"$_"} @$self));
45		-}
	61	+sub join { Mojo::ByteStream->new(join $_[1], map({"$_"} @{$_[0]})) }
46	62
47	63	sub map {
48	64	my ($self, $cb) = @_;
...	...	@@ -54,15 +70,9 @@ sub pluck {
54	70	return $self->map(sub { $_->$method(@args) });
55	71	}
56	72
57		-sub reverse {
58		- my $self = shift;
59		- return $self->new(reverse @$self);
60		-}
	73	+sub reverse { $_[0]->new(reverse @{$_[0]}) }
61	74
62		-sub shuffle {
63		- my $self = shift;
64		- return $self->new(List::Util::shuffle @$self);
65		-}
	75	+sub shuffle { $_[0]->new(List::Util::shuffle @{$_[0]}) }
66	76
67	77	sub size { scalar @{$_[0]} }
68	78
...	...	@@ -76,14 +86,24 @@ sub sort {
76	86	return $self->new($cb ? sort { $a->$cb($b) } @$self : sort @$self);
77	87	}
78	88
	89	+sub tap { shift->Mojo::Base::tap(@_) }
	90	+
79	91	sub uniq {
80	92	my $self = shift;
81	93	my %seen;
82	94	return $self->grep(sub { !$seen{$_}++ });
83	95	}
84	96
	97	+sub _flatten {
	98	+ map { _ref($_) ? _flatten(@$_) : $_ } @_;
	99	+}
	100	+
	101	+sub _ref { ref $_[0] && (ref $_[0] eq 'ARRAY' \|\| $_[0]->isa(__PACKAGE__)) }
	102	+
85	103	1;
86	104
	105	+=encoding utf8
	106	+
87	107	=head1 NAME
88	108
89	109	Mojo::Collection - Collection
...	...	@@ -119,8 +139,7 @@ Construct a new array-based L<Mojo::Collection> object.
119	139
120	140	=head1 METHODS
121	141
122		-L<Mojo::Collection> inherits all methods from L<Mojo::Base> and implements the
123		-following new ones.
	142	+L<Mojo::Collection> implements the following methods.
124	143
125	144	=head2 new
126	145
...	...	@@ -128,12 +147,21 @@ following new ones.
128	147
129	148	Construct a new array-based L<Mojo::Collection> object.
130	149
	150	+=head2 compact
	151	+
	152	+ my $new = $collection->compact;
	153	+
	154	+Create a new collection with all elements that are defined and not an empty
	155	+string.
	156	+
131	157	=head2 each
132	158
133	159	my @elements = $collection->each;
134	160	$collection = $collection->each(sub {...});
135	161
136		-Evaluate callback for each element in collection.
	162	+Evaluate callback for each element in collection or return all elements as a
	163	+list if none has been provided. The element will be the first argument passed
	164	+to the callback and is also available as C<$_>.
137	165
138	166	$collection->each(sub {
139	167	my ($e, $count) = @_;
...	...	@@ -148,10 +176,18 @@ Evaluate callback for each element in collection.
148	176
149	177	Evaluate regular expression or callback for each element in collection and
150	178	return the first one that matched the regular expression, or for which the
151		-callback returned true.
	179	+callback returned true. The element will be the first argument passed to the
	180	+callback and is also available as C<$_>.
152	181
153	182	my $five = $collection->first(sub { $_ == 5 });
154	183
	184	+=head2 flatten
	185	+
	186	+ my $new = $collection->flatten;
	187	+
	188	+Flatten nested collections/arrays recursively and create a new collection with
	189	+all elements.
	190	+
155	191	=head2 grep
156	192
157	193	my $new = $collection->grep(qr/foo/);
...	...	@@ -159,7 +195,8 @@ callback returned true.
159	195
160	196	Evaluate regular expression or callback for each element in collection and
161	197	create a new collection with all elements that matched the regular expression,
162		-or for which the callback returned true.
	198	+or for which the callback returned true. The element will be the first
	199	+argument passed to the callback and is also available as C<$_>.
163	200
164	201	my $interesting = $collection->grep(qr/mojo/i);
165	202
...	...	@@ -176,7 +213,8 @@ Turn collection into L<Mojo::ByteStream>.
176	213	my $new = $collection->map(sub {...});
177	214
178	215	Evaluate callback for each element in collection and create a new collection
179		-from the results.
	216	+from the results. The element will be the first argument passed to the
	217	+callback and is also available as C<$_>.
180	218
181	219	my $doubled = $collection->map(sub { $_ * 2 });
182	220
...	...	@@ -225,12 +263,27 @@ from the results.
225	263
226	264	my $insensitive = $collection->sort(sub { uc(shift) cmp uc(shift) });
227	265
	266	+=head2 tap
	267	+
	268	+ $collection = $collection->tap(sub {...});
	269	+
	270	+Alias for L<Mojo::Base/"tap">.
	271	+
228	272	=head2 uniq
229	273
230	274	my $new = $collection->uniq;
231	275
232	276	Create a new collection without duplicate elements.
233	277
	278	+=head1 ELEMENT METHODS
	279	+
	280	+In addition to the methods above, you can also call methods provided by all
	281	+elements in the collection directly and create a new collection from the
	282	+results, similar to L</"pluck">.
	283	+
	284	+ push @$collection, Mojo::DOM->new("<div><h1>$_</h1></div>") for 1 .. 9;
	285	+ say $collection->at('h1')->type('h2')->prepend_content('Test ')->root;
	286	+
234	287	=head1 ELEMENTS
235	288
236	289	Direct array reference access to elements is also possible.

...	...	@@ -18,7 +18,7 @@ sub body_size { croak 'Method "body_size" not implemented by subclass' }
18	18
19	19	sub boundary {
20	20	return undef unless my $type = shift->headers->content_type;
21		- $type =~ m!multipart.*boundary=(?:"([^"]+)"\|([\w'(),.:?\-+/]+))!i
	21	+ $type =~ m!multipart.boundary\s=\s*(?:"([^"]+)"\|([\w'(),.:?\-+/]+))!i
22	22	and return defined $1 ? $1 : $2;
23	23	return undef;
24	24	}
...	...	@@ -27,8 +27,8 @@ sub build_body { shift->_build('get_body_chunk') }
27	27	sub build_headers { shift->_build('get_header_chunk') }
28	28
29	29	sub charset {
30		- my $type = do {my $tmp = shift->headers->content_type; defined $tmp ? $tmp : ''};
31		- return $type =~ /charset="?([^"\s;]+)"?/i ? $1 : undef;
	30	+ my $type = do { my $type = shift->headers->content_type; defined $type ? $type : ''};
	31	+ return $type =~ /charset\s=\s"?([^"\s;]+)"?/i ? $1 : undef;
32	32	}
33	33
34	34	sub clone {
...	...	@@ -220,7 +220,7 @@ sub _parse_chunked {
220	220	# Start new chunk (ignore the chunk extension)
221	221	unless ($self->{chunk_len}) {
222	222	last
223		- unless $self->{pre_buffer} =~ s/^(?:\x0d?\x0a)?([[:xdigit:]]+).*\x0a//;
	223	+ unless $self->{pre_buffer} =~ s/^(?:\x0d?\x0a)?([0-9a-fA-F]+).*\x0a//;
224	224	next if $self->{chunk_len} = hex $1;
225	225
226	226	# Last chunk
...	...	@@ -306,6 +306,8 @@ sub _uncompress {
306	306
307	307	1;
308	308
	309	+=encoding utf8
	310	+
309	311	=head1 NAME
310	312
311	313	Mojo::Content - HTTP content base class
...	...	@@ -378,8 +380,8 @@ L<Mojo::Content> implements the following attributes.
378	380
379	381	=head2 auto_relax
380	382
381		- my $relax = $content->auto_relax;
382		- $content = $content->auto_relax(1);
	383	+ my $bool = $content->auto_relax;
	384	+ $content = $content->auto_relax($bool);
383	385
384	386	Try to detect when relaxed parsing is necessary.
385	387
...	...	@@ -408,16 +410,16 @@ value of the MOJO_MAX_LEFTOVER_SIZE environment variable or C<262144>.
408	410
409	411	=head2 relaxed
410	412
411		- my $relaxed = $content->relaxed;
412		- $content = $content->relaxed(1);
	413	+ my $bool = $content->relaxed;
	414	+ $content = $content->relaxed($bool);
413	415
414	416	Activate relaxed parsing for responses that are terminated with a connection
415	417	close.
416	418
417	419	=head2 skip_body
418	420
419		- my $skip = $content->skip_body;
420		- $content = $content->skip_body(1);
	421	+ my $bool = $content->skip_body;
	422	+ $content = $content->skip_body($bool);
421	423
422	424	Skip body parsing and finish after headers.
423	425
...	...	@@ -428,7 +430,7 @@ implements the following new ones.
428	430
429	431	=head2 body_contains
430	432
431		- my $success = $content->body_contains('foo bar baz');
	433	+ my $bool = $content->body_contains('foo bar baz');
432	434
433	435	Check if content contains a specific string. Meant to be overloaded in a
434	436	subclass.
...	...	@@ -496,34 +498,34 @@ Size of headers in bytes.
496	498
497	499	=head2 is_chunked
498	500
499		- my $success = $content->is_chunked;
	501	+ my $bool = $content->is_chunked;
500	502
501	503	Check if content is chunked.
502	504
503	505	=head2 is_compressed
504	506
505		- my $success = $content->is_compressed;
	507	+ my $bool = $content->is_compressed;
506	508
507	509	Check if content is C<gzip> compressed.
508	510
509	511	=head2 is_dynamic
510	512
511		- my $success = $content->is_dynamic;
	513	+ my $bool = $content->is_dynamic;
512	514
513		-Check if content will be dynamically generated, which prevents C<clone> from
514		-working.
	515	+Check if content will be dynamically generated, which prevents L</"clone">
	516	+from working.
515	517
516	518	=head2 is_finished
517	519
518		- my $success = $content->is_finished;
	520	+ my $bool = $content->is_finished;
519	521
520	522	Check if parser is finished.
521	523
522	524	=head2 is_limit_exceeded
523	525
524		- my $success = $content->is_limit_exceeded;
	526	+ my $bool = $content->is_limit_exceeded;
525	527
526		-Check if buffer has exceeded C<max_buffer_size>.
	528	+Check if buffer has exceeded L</"max_buffer_size">.
527	529
528	530	=head2 is_multipart
529	531
...	...	@@ -533,7 +535,7 @@ False.
533	535
534	536	=head2 is_parsing_body
535	537
536		- my $success = $content->is_parsing_body;
	538	+ my $bool = $content->is_parsing_body;
537	539
538	540	Check if body parsing started yet.
539	541

...	...	@@ -45,7 +45,7 @@ sub build_boundary {
45	45	my $boundary;
46	46	my $size = 1;
47	47	while (1) {
48		- $boundary = b64_encode join('', map chr(rand(256)), 1 .. $size++ * 3);
	48	+ $boundary = b64_encode join('', map chr(rand 256), 1 .. $size++ * 3);
49	49	$boundary =~ s/\W/X/g;
50	50	last unless $self->body_contains($boundary);
51	51	}
...	...	@@ -199,6 +199,8 @@ sub _read {
199	199
200	200	1;
201	201
	202	+=encoding utf8
	203	+
202	204	=head1 NAME
203	205
204	206	Mojo::Content::MultiPart - HTTP multipart content
...	...	@@ -258,12 +260,12 @@ implements the following new ones.
258	260
259	261	my $multi = Mojo::Content::MultiPart->new;
260	262
261		-Construct a new L<Mojo::Content::MultiPart> object and subscribe to C<read>
	263	+Construct a new L<Mojo::Content::MultiPart> object and subscribe to L</"read">
262	264	event with default content parser.
263	265
264	266	=head2 body_contains
265	267
266		- my $success = $multi->body_contains('foobarbaz');
	268	+ my $bool = $multi->body_contains('foobarbaz');
267	269
268	270	Check if content parts contain a specific string.
269	271

...	...	@@ -46,13 +46,15 @@ sub parse {
46	46
47	47	# Content needs to be upgraded to multipart
48	48	$self->unsubscribe(read => $self->{read});
49		- my $multi = Mojo::Content::MultiPart->new($self);
	49	+ my $multi = Mojo::Content::MultiPart->new(%$self);
50	50	$self->emit(upgrade => $multi);
51	51	return $multi->parse;
52	52	}
53	53
54	54	1;
55	55
	56	+=encoding utf8
	57	+
56	58	=head1 NAME
57	59
58	60	Mojo::Content::Single - HTTP content
...	...	@@ -120,12 +122,12 @@ implements the following new ones.
120	122
121	123	my $single = Mojo::Content::Single->new;
122	124
123		-Construct a new L<Mojo::Content::Single> object and subscribe to C<read> event
124		-with default content parser.
	125	+Construct a new L<Mojo::Content::Single> object and subscribe to L</"read">
	126	+event with default content parser.
125	127
126	128	=head2 body_contains
127	129
128		- my $success = $single->body_contains('1234567');
	130	+ my $bool = $single->body_contains('1234567');
129	131
130	132	Check if content contains a specific string.
131	133

...	...	@@ -1,47 +1,18 @@
1	1	package Mojo::Cookie;
2	2	use Mojo::Base -base;
3		-use overload
4		- 'bool' => sub {1},
5		- '""' => sub { shift->to_string },
6		- fallback => 1;
	3	+use overload bool => sub {1}, '""' => sub { shift->to_string }, fallback => 1;
7	4
8	5	use Carp 'croak';
9		-use Mojo::Util 'unquote';
10	6
11	7	has [qw(name value)];
12	8
13	9	sub parse { croak 'Method "parse" not implemented by subclass' }
14	10	sub to_string { croak 'Method "to_string" not implemented by subclass' }
15	11
16		-sub _tokenize {
17		- my ($self, $str) = @_;
18		-
19		- # Nibbling parser
20		- my (@tree, @token);
21		- while ($str =~ s/^\s([^=;,]+)\s=?\s*//) {
22		- my $name = $1;
23		-
24		- # "expires" is a special case, thank you Netscape...
25		- $str =~ s/^([^;,]+,?[^;,]+)/"$1"/ if $name =~ /^expires$/i;
26		-
27		- # Value
28		- my $value;
29		- $value = unquote $1 if $str =~ s/^("(?:\\\\\|\\"\|[^"])+"\|[^;,]+)\s*//;
30		- push @token, [$name, $value];
31		-
32		- # Separator
33		- $str =~ s/^\s;\s//;
34		- next unless $str =~ s/^\s,\s//;
35		- push @tree, [@token];
36		- @token = ();
37		- }
38		-
39		- # Take care of final token
40		- return @token ? (@tree, \@token) : @tree;
41		-}
42		-
43	12	1;
44	13
	14	+=encoding utf8
	15	+
45	16	=head1 NAME
46	17
47	18	Mojo::Cookie - HTTP cookie base class

...	...	@@ -1,14 +1,15 @@
1	1	package Mojo::Cookie::Request;
2	2	use Mojo::Base 'Mojo::Cookie';
3	3
4		-use Mojo::Util 'quote';
	4	+use Mojo::Util qw(quote split_header);
5	5
6	6	sub parse {
7	7	my ($self, $str) = @_;
8	8
9	9	my @cookies;
10		- for my $token (map {@$_} $self->_tokenize(defined $str ? $str : '')) {
11		- my ($name, $value) = @$token;
	10	+ my @pairs = map {@$_} @{split_header(defined $str? $str: '')};
	11	+ while (@pairs) {
	12	+ my ($name, $value) = (shift @pairs, shift @pairs);
12	13	next if $name =~ /^\$/;
13	14	push @cookies, $self->new(name => $name, value => defined $value ? $value : '');
14	15	}
...	...	@@ -18,14 +19,15 @@ sub parse {
18	19
19	20	sub to_string {
20	21	my $self = shift;
21		- return '' unless my $name = $self->name;
	22	+ return '' unless length(my $name = defined $self->name ? $self->name : '');
22	23	my $value = defined $self->value ? $self->value : '';
23		- $value = $value =~ /[,;"]/ ? quote($value) : $value;
24		- return "$name=$value";
	24	+ return join '=', $name, $value =~ /[,;" ]/ ? quote($value) : $value;
25	25	}
26	26
27	27	1;
28	28
	29	+=encoding utf8
	30	+
29	31	=head1 NAME
30	32
31	33	Mojo::Cookie::Request - HTTP request cookie

...	...	@@ -2,9 +2,9 @@ package Mojo::Cookie::Response;
2	2	use Mojo::Base 'Mojo::Cookie';
3	3
4	4	use Mojo::Date;
5		-use Mojo::Util 'quote';
	5	+use Mojo::Util qw(quote split_header);
6	6
7		-has [qw(domain httponly max_age path secure)];
	7	+has [qw(domain httponly max_age origin path secure)];
8	8
9	9	sub expires {
10	10	my $self = shift;
...	...	@@ -22,21 +22,29 @@ sub parse {
22	22	my ($self, $str) = @_;
23	23
24	24	my @cookies;
25		- for my $token ($self->_tokenize(defined $str ? $str : '')) {
26		- for my $i (0 .. $#$token) {
27		- my ($name, $value) = @{$token->[$i]};
	25	+ my $tree = split_header(defined $str ? $str : '');
	26	+ while (my $pairs = shift @$tree) {
	27	+ my $i = 0;
	28	+ while (@$pairs) {
	29	+ my ($name, $value) = (shift @$pairs, shift @$pairs);
	30	+
	31	+ # "expires" is a special case, thank you Netscape...
	32	+ if ($name =~ /^expires$/i) {
	33	+ push @$pairs, @{my $elem = shift @$tree; defined $elem ? $elem : []};
	34	+ my $len = (defined $pairs->[0] ? $pairs->[0] : '') =~ /-/ ? 6 : 10;
	35	+ $value .= join ' ', ',', grep {defined} splice @$pairs, 0, $len;
	36	+ }
28	37
29	38	# This will only run once
30	39	push @cookies, $self->new(name => $name, value => defined $value ? $value : '') and next
31		- unless $i;
	40	+ unless $i++;
32	41
33	42	# Attributes (Netscape and RFC 6265)
34		- my @match
35		- = $name =~ /^(expires\|domain\|path\|secure\|Max-Age\|HttpOnly)$/msi;
36		- next unless @match;
37		- my $attr = lc $match[0];
38		- $attr =~ tr/-/_/;
39		- $cookies[-1]->$attr($attr =~ /(?:secure\|HttpOnly)/i ? 1 : $value);
	43	+ next unless $name =~ /^(expires\|domain\|path\|secure\|max-age\|httponly)$/i;
	44	+ my $attr = lc $1;
	45	+ $attr = 'max_age' if $attr eq 'max-age';
	46	+ $cookies[-1]
	47	+ ->$attr($attr eq 'secure' \|\| $attr eq 'httponly' ? 1 : $value);
40	48	}
41	49	}
42	50
...	...	@@ -47,10 +55,9 @@ sub to_string {
47	55	my $self = shift;
48	56
49	57	# Name and value (Netscape)
50		- return '' unless my $name = $self->name;
	58	+ return '' unless length(my $name = defined $self->name ? $self->name : '');
51	59	my $value = defined $self->value ? $self->value : '';
52		- $value = $value =~ /[,;"]/ ? quote($value) : $value;
53		- my $cookie = "$name=$value";
	60	+ my $cookie = join '=', $name, $value =~ /[,;" ]/ ? quote($value) : $value;
54	61
55	62	# "expires" (Netscape)
56	63	if (defined(my $e = $self->expires)) { $cookie .= "; expires=$e" }
...	...	@@ -62,19 +69,21 @@ sub to_string {
62	69	if (my $path = $self->path) { $cookie .= "; path=$path" }
63	70
64	71	# "secure" (Netscape)
65		- if (my $secure = $self->secure) { $cookie .= "; secure" }
	72	+ $cookie .= "; secure" if $self->secure;
66	73
67	74	# "Max-Age" (RFC 6265)
68		- if (defined(my $m = $self->max_age)) { $cookie .= "; Max-Age=$m" }
	75	+ if (defined(my $max = $self->max_age)) { $cookie .= "; Max-Age=$max" }
69	76
70	77	# "HttpOnly" (RFC 6265)
71		- if (my $httponly = $self->httponly) { $cookie .= "; HttpOnly" }
	78	+ $cookie .= "; HttpOnly" if $self->httponly;
72	79
73	80	return $cookie;
74	81	}
75	82
76	83	1;
77	84
	85	+=encoding utf8
	86	+
78	87	=head1 NAME
79	88
80	89	Mojo::Cookie::Response - HTTP response cookie
...	...	@@ -107,8 +116,8 @@ Cookie domain.
107	116
108	117	=head2 httponly
109	118
110		- my $httponly = $cookie->httponly;
111		- $cookie = $cookie->httponly(1);
	119	+ my $bool = $cookie->httponly;
	120	+ $cookie = $cookie->httponly($bool);
112	121
113	122	HttpOnly flag, which can prevent client-side scripts from accessing this
114	123	cookie.
...	...	@@ -120,6 +129,13 @@ cookie.
120	129
121	130	Max age for cookie.
122	131
	132	+=head2 origin
	133	+
	134	+ my $origin = $cookie->origin;
	135	+ $cookie = $cookie->origin('mojolicio.us');
	136	+
	137	+Origin of the cookie.
	138	+
123	139	=head2 path
124	140
125	141	my $path = $cookie->path;
...	...	@@ -129,8 +145,8 @@ Cookie path.
129	145
130	146	=head2 secure
131	147
132		- my $secure = $cookie->secure;
133		- $cookie = $cookie->secure(1);
	148	+ my $bool = $cookie->secure;
	149	+ $cookie = $cookie->secure($bool);
134	150
135	151	Secure flag, which instructs browsers to only send this cookie over HTTPS
136	152	connections.

...	...	@@ -3,14 +3,14 @@ use Mojo::Base -base;
3	3
4	4	has 'tree';
5	5
6		-my $ESCAPE_RE = qr/\\[^[:xdigit:]]\|\\[[:xdigit:]]{1,6}/;
	6	+my $ESCAPE_RE = qr/\\[^0-9a-fA-F]\|\\[0-9a-fA-F]{1,6}/;
7	7	my $ATTR_RE = qr/
8	8	\[
9		- ((?:$ESCAPE_RE\|[\w\-])+) # Key
	9	+ ((?:$ESCAPE_RE\|[\w\-])+) # Key
10	10	(?:
11		- (\W)? # Operator
	11	+ (\W)? # Operator
12	12	=
13		- (?:"((?:\\"\|[^"])+)"\|(\S+)) # Value
	13	+ (?:"((?:\\"\|[^"])*)"\|([^\]]+)) # Value
14	14	)?
15	15	\]
16	16	/x;
...	...	@@ -33,6 +33,13 @@ my $TOKEN_RE = qr/
33	33	)?
34	34	/x;
35	35
	36	+sub match {
	37	+ my $self = shift;
	38	+ my $tree = $self->tree;
	39	+ return undef if $tree->[0] eq 'root';
	40	+ return $self->_match($self->_compile(shift), $tree, $tree);
	41	+}
	42	+
36	43	sub select {
37	44	my $self = shift;
38	45
...	...	@@ -43,19 +50,14 @@ sub select {
43	50	while (my $current = shift @queue) {
44	51	my $type = $current->[0];
45	52
46		- # Root
47		- if ($type eq 'root') { unshift @queue, @$current[1 .. $#$current] }
48		-
49	53	# Tag
50		- elsif ($type eq 'tag') {
	54	+ if ($type eq 'tag') {
51	55	unshift @queue, @$current[4 .. $#$current];
52		-
53		- # Try all selectors with element
54		- for my $part (@$pattern) {
55		- push @results, $current and last
56		- if $self->_combinator([reverse @$part], $current, $tree);
57		- }
	56	+ push @results, $current if $self->_match($pattern, $current, $tree);
58	57	}
	58	+
	59	+ # Root
	60	+ elsif ($type eq 'root') { unshift @queue, @$current[1 .. $#$current] }
59	61	}
60	62
61	63	return \@results;
...	...	@@ -125,7 +127,6 @@ sub _compile {
125	127	my ($separator, $element, $pc, $attrs, $combinator)
126	128	= ($1, defined $2 ? $2 : '', $3, $6, $11);
127	129
128		- # Trash
129	130	next unless $separator \|\| $element \|\| $pc \|\| $attrs \|\| $combinator;
130	131
131	132	# New selector
...	...	@@ -149,12 +150,8 @@ sub _compile {
149	150
150	151	# Class or ID
151	152	while ($element =~ /$CLASS_ID_RE/g) {
152		-
153		- # Class
154	153	push @$selector, ['attr', 'class', $self->_regex('~', $1)] if defined $1;
155		-
156		- # ID
157		- push @$selector, ['attr', 'id', $self->_regex('', $2)] if defined $2;
	154	+ push @$selector, ['attr', 'id', $self->_regex('', $2)] if defined $2;
158	155	}
159	156
160	157	# Pseudo classes
...	...	@@ -187,28 +184,33 @@ sub _equation {
187	184	my ($self, $equation) = @_;
188	185
189	186	# "even"
190		- my $num = [1, 1];
191		- if ($equation =~ /^even$/i) { $num = [2, 2] }
	187	+ return [2, 2] if $equation =~ /^even$/i;
192	188
193	189	# "odd"
194		- elsif ($equation =~ /^odd$/i) { $num = [2, 1] }
	190	+ return [2, 1] if $equation =~ /^odd$/i;
195	191
196	192	# Equation
197		- elsif ($equation =~ /(?:(-?(?:\d+)?)?(n))?\s\+?\s(-?\s\d+)?\s$/i) {
198		- $num->[0] = defined($1) && length($1) ? $1 : $2 ? 1 : 0;
199		- $num->[0] = -1 if $num->[0] eq '-';
200		- $num->[1] = defined $3 ? $3 : 0;
201		- $num->[1] =~ s/\s+//g;
202		- }
203		-
	193	+ my $num = [1, 1];
	194	+ return $num if $equation !~ /(?:(-?(?:\d+)?)?(n))?\s\+?\s(-?\s\d+)?\s$/i;
	195	+ $num->[0] = defined($1) && length($1) ? $1 : $2 ? 1 : 0;
	196	+ $num->[0] = -1 if $num->[0] eq '-';
	197	+ $num->[1] = defined $3 ? $3 : 0;
	198	+ $num->[1] =~ s/\s+//g;
204	199	return $num;
205	200	}
206	201
	202	+sub _match {
	203	+ my ($self, $pattern, $current, $tree) = @_;
	204	+ $self->_combinator([reverse @$_], $current, $tree) and return 1
	205	+ for @$pattern;
	206	+ return undef;
	207	+}
	208	+
207	209	sub _parent {
208	210	my ($self, $selectors, $current, $tree) = @_;
209	211	return undef unless my $parent = $current->[3];
210	212	return undef if $parent->[0] eq 'root';
211		- return $self->_combinator($selectors, $parent, $tree) ? 1 : undef;
	213	+ return $self->_combinator($selectors, $parent, $tree);
212	214	}
213	215
214	216	sub _pc {
...	...	@@ -251,10 +253,9 @@ sub _pc {
251	253
252	254	# Siblings
253	255	my $parent = $current->[3];
254		- my $start = $parent->[0] eq 'root' ? 1 : 4;
255	256	my @siblings;
256	257	my $type = $class =~ /of-type$/ ? $current->[1] : undef;
257		- for my $i ($start .. $#$parent) {
	258	+ for my $i (($parent->[0] eq 'root' ? 1 : 4) .. $#$parent) {
258	259	my $sibling = $parent->[$i];
259	260	next unless $sibling->[0] eq 'tag';
260	261	next if defined $type && $type ne $sibling->[1];
...	...	@@ -279,8 +280,7 @@ sub _pc {
279	280
280	281	# Siblings
281	282	my $parent = $current->[3];
282		- my $start = $parent->[0] eq 'root' ? 1 : 4;
283		- for my $i ($start .. $#$parent) {
	283	+ for my $i (($parent->[0] eq 'root' ? 1 : 4) .. $#$parent) {
284	284	my $sibling = $parent->[$i];
285	285	next if $sibling->[0] ne 'tag' \|\| $sibling eq $current;
286	286	return undef unless defined $type && $sibling->[1] ne $type;
...	...	@@ -345,8 +345,7 @@ sub _sibling {
345	345
346	346	my $parent = $current->[3];
347	347	my $found;
348		- my $start = $parent->[0] eq 'root' ? 1 : 4;
349		- for my $e (@$parent[$start .. $#$parent]) {
	348	+ for my $e (@$parent[($parent->[0] eq 'root' ? 1 : 4) .. $#$parent]) {
350	349	return $found if $e eq $current;
351	350	next unless $e->[0] eq 'tag';
352	351
...	...	@@ -367,7 +366,7 @@ sub _unescape {
367	366	$value =~ s/\\\n//g;
368	367
369	368	# Unescape Unicode characters
370		- $value =~ s/\\([[:xdigit:]]{1,6})\s?/pack('U', hex $1)/ge;
	369	+ $value =~ s/\\([0-9a-fA-F]{1,6})\s?/pack('U', hex $1)/ge;
371	370
372	371	# Remove backslash
373	372	$value =~ s/\\//g;
...	...	@@ -377,6 +376,8 @@ sub _unescape {
377	376
378	377	1;
379	378
	379	+=encoding utf8
	380	+
380	381	=head1 NAME
381	382
382	383	Mojo::DOM::CSS - CSS selector engine
...	...	@@ -591,7 +592,7 @@ Elements of type C<E>, C<F> and C<G>.
591	592
592	593	An C<E> element whose attributes match all following attribute selectors.
593	594
594		- my $links = $css->select('a[foo^="b"][foo$="ar"]');
	595	+ my $links = $css->select('a[foo^=b][foo$=ar]');
595	596
596	597	=head1 ATTRIBUTES
597	598
...	...	@@ -610,11 +611,17 @@ carefully since it is very dynamic.
610	611	L<Mojo::DOM::CSS> inherits all methods from L<Mojo::Base> and implements the
611	612	following new ones.
612	613
	614	+=head2 match
	615	+
	616	+ my $bool = $css->match('head > title');
	617	+
	618	+Match CSS selector against first node in L</"tree">.
	619	+
613	620	=head2 select
614	621
615	622	my $results = $css->select('head > title');
616	623
617		-Run CSS selector against C<tree>.
	624	+Run CSS selector against L</"tree">.
618	625
619	626	=head1 SEE ALSO
620	627

...	...	@@ -8,7 +8,7 @@ has 'xml';
8	8	has tree => sub { ['root'] };
9	9
10	10	my $ATTR_RE = qr/
11		- ([^=\s>]+) # Key
	11	+ ([^<>=\s]+) # Key
12	12	(?:
13	13	\s=\s
14	14	(?:
...	...	@@ -40,50 +40,52 @@ my $TOKEN_RE = qr/
40	40	\|
41	41	<(
42	42	\s*
43		- [^>\s]+ # Tag
	43	+ [^<>\s]+ # Tag
44	44	\s*
45	45	(?:$ATTR_RE)* # Attributes
46	46	)>
	47	+ \|
	48	+ (<) # Runaway "<"
47	49	)??
48	50	/xis;
49	51
50		-# Optional HTML elements
51		-my %OPTIONAL = map { $_ => 1 }
52		- qw(body colgroup dd head li optgroup option p rt rp tbody td tfoot th);
53		-
54		-# Elements that break HTML paragraphs
	52	+# HTML elements that break paragraphs
55	53	my %PARAGRAPH = map { $_ => 1 } (
56	54	qw(address article aside blockquote dir div dl fieldset footer form h1 h2),
57		- qw(h3 h4 h5 h6 header hgroup hr menu nav ol p pre section table ul)
	55	+ qw(h3 h4 h5 h6 header hr main menu nav ol p pre section table ul)
58	56	);
59	57
60		-# HTML table elements
61		-my %TABLE = map { $_ => 1 } qw(col colgroup tbody td th thead tr);
	58	+# HTML table elements with optional end tags
	59	+my %TABLE = map { $_ => 1 } qw(colgroup tbody td tfoot th thead tr);
62	60
63		-# HTML void elements
	61	+# HTML elements without end tags
64	62	my %VOID = map { $_ => 1 } (
65		- qw(area base br col command embed hr img input keygen link meta param),
	63	+ qw(area base br col embed hr img input keygen link menuitem meta param),
66	64	qw(source track wbr)
67	65	);
68	66
69		-# HTML inline elements
70		-my %INLINE = map { $_ => 1 } (
71		- qw(a abbr acronym applet b basefont bdo big br button cite code del dfn em),
72		- qw(font i iframe img ins input kbd label map object q s samp script select),
73		- qw(small span strike strong sub sup textarea tt u var)
	67	+# HTML elements categorized as phrasing content (and obsolete inline elements)
	68	+my @PHRASING = (
	69	+ qw(a abbr area audio b bdi bdo br button canvas cite code data datalist),
	70	+ qw(del dfn em embed i iframe img input ins kbd keygen label link map mark),
	71	+ qw(math meta meter noscript object output progress q ruby s samp script),
	72	+ qw(select small span strong sub sup svg template textarea time u var video),
	73	+ qw(wbr)
74	74	);
	75	+my @OBSOLETE = qw(acronym applet basefont big font strike tt);
	76	+my %PHRASING = map { $_ => 1 } @OBSOLETE, @PHRASING;
75	77
76	78	sub parse {
77	79	my ($self, $html) = @_;
78	80
79		- my $tree = ['root'];
80		- my $current = $tree;
	81	+ my $current = my $tree = ['root'];
81	82	while ($html =~ m/\G$TOKEN_RE/gcs) {
82		- my ($text, $pi, $comment, $cdata, $doctype, $tag)
83		- = ($1, $2, $3, $4, $5, $6);
	83	+ my ($text, $pi, $comment, $cdata, $doctype, $tag, $runaway)
	84	+ = ($1, $2, $3, $4, $5, $6, $11);
84	85
85		- # Text
86		- if (length $text) { push @$current, ['text', html_unescape($text)] }
	86	+ # Text (and runaway "<")
	87	+ $text .= '<' if defined $runaway;
	88	+ push @$current, ['text', html_unescape $text] if length $text;
87	89
88	90	# DOCTYPE
89	91	if ($doctype) { push @$current, ['doctype', $doctype] }
...	...	@@ -124,7 +126,7 @@ sub parse {
124	126	# Tag
125	127	$self->_start($start, \%attrs, \$current);
126	128
127		- # Empty element
	129	+ # Element without end tag
128	130	$self->_end($start, \$current)
129	131	if (!$self->xml && $VOID{$start}) \|\| $attr =~ m!/\s*$!;
130	132
...	...	@@ -144,18 +146,12 @@ sub parse {
144	146	sub render { $_[0]->_render($_[0]->tree) }
145	147
146	148	sub _close {
147		- my ($self, $current, $tags, $stop) = @_;
148		- $tags \|\|= \%TABLE;
149		- $stop \|\|= 'table';
	149	+ my ($self, $current, $allowed, $scope) = @_;
150	150
151		- # Check if parents need to be closed
	151	+ # Close allowed parent elements in scope
152	152	my $parent = $$current;
153		- while ($parent->[0] ne 'root' && $parent->[1] ne $stop) {
154		-
155		- # Close
156		- $tags->{$parent->[1]} and $self->_end($parent->[1], $current);
157		-
158		- # Try next
	153	+ while ($parent->[0] ne 'root' && $parent->[1] ne $scope) {
	154	+ $self->_end($parent->[1], $current) if $allowed->{$parent->[1]};
159	155	$parent = $parent->[3];
160	156	}
161	157	}
...	...	@@ -171,10 +167,9 @@ sub _end {
171	167	# Right tag
172	168	++$found and last if $next->[1] eq $end;
173	169
174		- # Inline elements can only cross other inline elements
175		- return if !$self->xml && $INLINE{$end} && !$INLINE{$next->[1]};
	170	+ # Phrasing content can only cross phrasing content
	171	+ return if !$self->xml && $PHRASING{$end} && !$PHRASING{$next->[1]};
176	172
177		- # Parent
178	173	$next = $next->[3];
179	174	}
180	175
...	...	@@ -189,11 +184,8 @@ sub _end {
189	184	# Match
190	185	if ($end eq $$current->[1]) { return $$current = $$current->[3] }
191	186
192		- # Optional elements
193		- elsif ($OPTIONAL{$$current->[1]}) { $self->_end($$current->[1], $current) }
194		-
195	187	# Table
196		- elsif ($end eq 'table') { $self->_close($current) }
	188	+ elsif ($end eq 'table') { $self->_close($current, \%TABLE, $end) }
197	189
198	190	# Missing end tag
199	191	$self->_end($$current->[1], $current);
...	...	@@ -211,19 +203,19 @@ sub _render {
211	203	return $tree->[1] if $e eq 'raw';
212	204
213	205	# DOCTYPE
214		- return "<!DOCTYPE" . $tree->[1] . ">" if $e eq 'doctype';
	206	+ return '<!DOCTYPE' . $tree->[1] . '>' if $e eq 'doctype';
215	207
216	208	# Comment
217		- return "<!--" . $tree->[1] . "-->" if $e eq 'comment';
	209	+ return '<!--' . $tree->[1] . '-->' if $e eq 'comment';
218	210
219	211	# CDATA
220		- return "<![CDATA[" . $tree->[1] . "]]>" if $e eq 'cdata';
	212	+ return '<![CDATA[' . $tree->[1] . ']]>' if $e eq 'cdata';
221	213
222	214	# Processing instruction
223		- return "<?" . $tree->[1] . "?>" if $e eq 'pi';
	215	+ return '<?' . $tree->[1] . '?>' if $e eq 'pi';
224	216
225	217	# Start tag
226		- my $start = $e eq 'root' ? 1 : 2;
	218	+ my $start = 1;
227	219	my $content = '';
228	220	if ($e eq 'tag') {
229	221	$start = 4;
...	...	@@ -246,7 +238,7 @@ sub _render {
246	238	my $attrs = join ' ', @attrs;
247	239	$content .= " $attrs" if $attrs;
248	240
249		- # Empty tag
	241	+ # Element without end tag
250	242	return $self->xml \|\| $VOID{$tag} ? "$content />" : "$content></$tag>"
251	243	unless $tree->[4];
252	244
...	...	@@ -269,40 +261,40 @@ sub _start {
269	261	# Autoclose optional HTML elements
270	262	if (!$self->xml && $$current->[0] ne 'root') {
271	263
272		- # "<li>"
	264	+ # "li"
273	265	if ($start eq 'li') { $self->_close($current, {li => 1}, 'ul') }
274	266
275		- # "<p>"
	267	+ # "p"
276	268	elsif ($PARAGRAPH{$start}) { $self->_end('p', $current) }
277	269
278		- # "<head>"
	270	+ # "head"
279	271	elsif ($start eq 'body') { $self->_end('head', $current) }
280	272
281		- # "<optgroup>"
	273	+ # "optgroup"
282	274	elsif ($start eq 'optgroup') { $self->_end('optgroup', $current) }
283	275
284		- # "<option>"
	276	+ # "option"
285	277	elsif ($start eq 'option') { $self->_end('option', $current) }
286	278
287		- # "<colgroup>", "<thead>", "tbody" and "tfoot"
	279	+ # "colgroup", "thead", "tbody" and "tfoot"
288	280	elsif (grep { $_ eq $start } qw(colgroup thead tbody tfoot)) {
289		- $self->_close($current);
	281	+ $self->_close($current, \%TABLE, 'table');
290	282	}
291	283
292		- # "<tr>"
293		- elsif ($start eq 'tr') { $self->_close($current, {tr => 1}) }
	284	+ # "tr"
	285	+ elsif ($start eq 'tr') { $self->_close($current, {tr => 1}, 'table') }
294	286
295		- # "<th>" and "<td>"
	287	+ # "th" and "td"
296	288	elsif ($start eq 'th' \|\| $start eq 'td') {
297		- $self->_close($current, {$_ => 1}) for qw(th td);
	289	+ $self->_close($current, {$_ => 1}, 'table') for qw(th td);
298	290	}
299	291
300		- # "<dt>" and "<dd>"
	292	+ # "dt" and "dd"
301	293	elsif ($start eq 'dt' \|\| $start eq 'dd') {
302	294	$self->_end($_, $current) for qw(dt dd);
303	295	}
304	296
305		- # "<rt>" and "<rp>"
	297	+ # "rt" and "rp"
306	298	elsif ($start eq 'rt' \|\| $start eq 'rp') {
307	299	$self->_end($_, $current) for qw(rt rp);
308	300	}
...	...	@@ -317,6 +309,8 @@ sub _start {
317	309
318	310	1;
319	311
	312	+=encoding utf8
	313	+
320	314	=head1 NAME
321	315
322	316	Mojo::DOM::HTML - HTML/XML engine
...	...	@@ -348,8 +342,8 @@ carefully since it is very dynamic.
348	342
349	343	=head2 xml
350	344
351		- my $xml = $html->xml;
352		- $html = $html->xml(1);
	345	+ my $bool = $html->xml;
	346	+ $html = $html->xml($bool);
353	347
354	348	Disable HTML semantics in parser and activate case sensitivity, defaults to
355	349	auto detection based on processing instructions.
...	...	@@ -363,7 +357,7 @@ following new ones.
363	357
364	358	$html = $html->parse('<foo bar="baz">test</foo>');
365	359
366		-Parse HTML/XML document.
	360	+Parse HTML/XML fragment.
367	361
368	362	=head2 render
369	363

...	...	@@ -1,9 +1,6 @@
1	1	package Mojo::Date;
2	2	use Mojo::Base -base;
3		-use overload
4		- 'bool' => sub {1},
5		- '""' => sub { shift->to_string },
6		- fallback => 1;
	3	+use overload bool => sub {1}, '""' => sub { shift->to_string }, fallback => 1;
7	4
8	5	use Time::Local 'timegm';
9	6
...	...	@@ -63,6 +60,8 @@ sub to_string {
63	60
64	61	1;
65	62
	63	+=encoding utf8
	64	+
66	65	=head1 NAME
67	66
68	67	Mojo::Date - HTTP date
...	...	@@ -109,7 +108,7 @@ following new ones.
109	108	my $date = Mojo::Date->new;
110	109	my $date = Mojo::Date->new('Sun Nov 6 08:49:37 1994');
111	110
112		-Construct a new L<Mojo::Date> object and C<parse> date if necessary.
	111	+Construct a new L<Mojo::Date> object and L</"parse"> date if necessary.
113	112
114	113	=head2 parse
115	114

...	...	@@ -9,12 +9,12 @@ sub emit {
9	9	my ($self, $name) = (shift, shift);
10	10
11	11	if (my $s = $self->{events}{$name}) {
12		- warn "-- Emit $name in @{[blessed($self)]} (@{[scalar(@$s)]})\n" if DEBUG;
	12	+ warn "-- Emit $name in @{[blessed $self]} (@{[scalar @$s]})\n" if DEBUG;
13	13	for my $cb (@$s) { $self->$cb(@_) }
14	14	}
15	15	else {
16		- warn "-- Emit $name in @{[blessed($self)]} (0)\n" if DEBUG;
17		- warn $_[0] if $name eq 'error';
	16	+ warn "-- Emit $name in @{[blessed $self]} (0)\n" if DEBUG;
	17	+ die "@{[blessed $self]}: $_[0]" if $name eq 'error';
18	18	}
19	19
20	20	return $self;
...	...	@@ -24,22 +24,16 @@ sub emit_safe {
24	24	my ($self, $name) = (shift, shift);
25	25
26	26	if (my $s = $self->{events}{$name}) {
27		- warn "-- Emit $name in @{[blessed($self)]} safely (@{[scalar(@$s)]})\n"
	27	+ warn "-- Emit $name in @{[blessed $self]} safely (@{[scalar @$s]})\n"
28	28	if DEBUG;
29	29	for my $cb (@$s) {
30		- unless (eval { $self->$cb(@_); 1 }) {
31		-
32		- # Error event failed
33		- if ($name eq 'error') { warn qq{Event "error" failed: $@} }
34		-
35		- # Normal event failed
36		- else { $self->emit_safe('error', qq{Event "$name" failed: $@}) }
37		- }
	30	+ $self->emit(error => qq{Event "$name" failed: $@})
	31	+ unless eval { $self->$cb(@_); 1 };
38	32	}
39	33	}
40	34	else {
41		- warn "-- Emit $name in @{[blessed($self)]} safely (0)\n" if DEBUG;
42		- warn $_[0] if $name eq 'error';
	35	+ warn "-- Emit $name in @{[blessed $self]} safely (0)\n" if DEBUG;
	36	+ die "@{[blessed $self]}: $_[0]" if $name eq 'error';
43	37	}
44	38
45	39	return $self;
...	...	@@ -76,6 +70,7 @@ sub unsubscribe {
76	70	# One
77	71	if ($cb) {
78	72	$self->{events}{$name} = [grep { $cb ne $_ } @{$self->{events}{$name}}];
	73	+ delete $self->{events}{$name} unless @{$self->{events}{$name}};
79	74	}
80	75
81	76	# All
...	...	@@ -86,6 +81,8 @@ sub unsubscribe {
86	81
87	82	1;
88	83
	84	+=encoding utf8
	85	+
89	86	=head1 NAME
90	87
91	88	Mojo::EventEmitter - Event emitter base class
...	...	@@ -126,7 +123,7 @@ L<Mojo::EventEmitter> can emit the following events.
126	123	...
127	124	});
128	125
129		-Emitted safely for event errors.
	126	+Emitted for event errors, fatal if unhandled.
130	127
131	128	$e->on(error => sub {
132	129	my ($e, $err) = @_;
...	...	@@ -150,11 +147,11 @@ Emit event.
150	147	$e = $e->emit_safe('foo');
151	148	$e = $e->emit_safe('foo', 123);
152	149
153		-Emit event safely and emit C<error> event on failure.
	150	+Emit event safely and emit L</"error"> event on failure.
154	151
155	152	=head2 has_subscribers
156	153
157		- my $success = $e->has_subscribers('foo');
	154	+ my $bool = $e->has_subscribers('foo');
158	155
159	156	Check if event has subscribers.
160	157

...	...	@@ -1,9 +1,6 @@
1	1	package Mojo::Exception;
2	2	use Mojo::Base -base;
3		-use overload
4		- 'bool' => sub {1},
5		- '""' => sub { shift->to_string },
6		- fallback => 1;
	3	+use overload bool => sub {1}, '""' => sub { shift->to_string }, fallback => 1;
7	4
8	5	use Scalar::Util 'blessed';
9	6
...	...	@@ -46,40 +43,36 @@ sub trace {
46	43	}
47	44
48	45	sub _context {
49		- my ($self, $line, $lines) = @_;
50		-
51		- # Wrong file
52		- return unless defined $lines->[0][$line - 1];
	46	+ my ($self, $num, $lines) = @_;
53	47
54	48	# Line
55		- $self->line([$line]);
56		- for my $l (@$lines) {
57		- chomp(my $code = $l->[$line - 1]);
	49	+ return unless defined $lines->[0][$num - 1];
	50	+ $self->line([$num]);
	51	+ for my $line (@$lines) {
	52	+ chomp(my $code = $line->[$num - 1]);
58	53	push @{$self->line}, $code;
59	54	}
60	55
61	56	# Before
62	57	for my $i (2 .. 6) {
63		- last if ((my $previous = $line - $i) < 0);
64		- if (defined $lines->[0][$previous]) {
65		- unshift @{$self->lines_before}, [$previous + 1];
66		- for my $l (@$lines) {
67		- chomp(my $code = $l->[$previous]);
68		- push @{$self->lines_before->[0]}, $code;
69		- }
	58	+ last if ((my $previous = $num - $i) < 0);
	59	+ next unless defined $lines->[0][$previous];
	60	+ unshift @{$self->lines_before}, [$previous + 1];
	61	+ for my $line (@$lines) {
	62	+ chomp(my $code = $line->[$previous]);
	63	+ push @{$self->lines_before->[0]}, $code;
70	64	}
71	65	}
72	66
73	67	# After
74	68	for my $i (0 .. 4) {
75		- next if ((my $next = $line + $i) < 0);
76		- if (defined $lines->[0][$next]) {
77		- push @{$self->lines_after}, [$next + 1];
78		- for my $l (@$lines) {
79		- next unless defined(my $code = $l->[$next]);
80		- chomp $code;
81		- push @{$self->lines_after->[-1]}, $code;
82		- }
	69	+ next if ((my $next = $num + $i) < 0);
	70	+ next unless defined $lines->[0][$next];
	71	+ push @{$self->lines_after}, [$next + 1];
	72	+ for my $line (@$lines) {
	73	+ last unless defined(my $code = $line->[$next]);
	74	+ chomp $code;
	75	+ push @{$self->lines_after->[-1]}, $code;
83	76	}
84	77	}
85	78	}
...	...	@@ -113,6 +106,8 @@ sub _detect {
113	106
114	107	1;
115	108
	109	+=encoding utf8
	110	+
116	111	=head1 NAME
117	112
118	113	Mojo::Exception - Exceptions with context
...	...	@@ -172,8 +167,8 @@ Exception message.
172	167
173	168	=head2 verbose
174	169
175		- my $verbose = $e->verbose;
176		- $e = $e->verbose(1);
	170	+ my $bool = $e->verbose;
	171	+ $e = $e->verbose($bool);
177	172
178	173	Render exception with context.
179	174

...	...	@@ -8,13 +8,13 @@ has max_line_size => sub { $ENV{MOJO_MAX_LINE_SIZE} \|\| 10240 };
8	8	# Common headers
9	9	my @HEADERS = (
10	10	qw(Accept Accept-Charset Accept-Encoding Accept-Language Accept-Ranges),
11		- qw(Authorization Cache-Control Connection Content-Disposition),
	11	+ qw(Allow Authorization Cache-Control Connection Content-Disposition),
12	12	qw(Content-Encoding Content-Length Content-Range Content-Type Cookie DNT),
13		- qw(Date ETag Expect Expires Host If-Modified-Since Last-Modified Location),
14		- qw(Origin Proxy-Authenticate Proxy-Authorization Range),
	13	+ qw(Date ETag Expect Expires Host If-Modified-Since Last-Modified Link),
	14	+ qw(Location Origin Proxy-Authenticate Proxy-Authorization Range),
15	15	qw(Sec-WebSocket-Accept Sec-WebSocket-Extensions Sec-WebSocket-Key),
16	16	qw(Sec-WebSocket-Protocol Sec-WebSocket-Version Server Set-Cookie Status),
17		- qw(TE Trailer Transfer-Encoding Upgrade User-Agent WWW-Authenticate)
	17	+ qw(TE Trailer Transfer-Encoding Upgrade User-Agent Vary WWW-Authenticate)
18	18	);
19	19	for my $header (@HEADERS) {
20	20	my $name = lc $header;
...	...	@@ -22,7 +22,7 @@ for my $header (@HEADERS) {
22	22	monkey_patch __PACKAGE__, $name, sub { scalar shift->header($header => @_) };
23	23	}
24	24
25		-# Lower case headers
	25	+# Lowercase headers
26	26	my %NORMALCASE = map { lc($_) => $_ } @HEADERS;
27	27
28	28	sub add {
...	...	@@ -38,6 +38,12 @@ sub add {
38	38	return $self;
39	39	}
40	40
	41	+sub append {
	42	+ my ($self, $name, $value) = @_;
	43	+ my $old = $self->header($name);
	44	+ return $self->header($name => defined $old ? "$old, $value" : $value);
	45	+}
	46	+
41	47	sub clone {
42	48	my $self = shift;
43	49	return $self->new->from_hash($self->to_hash(1));
...	...	@@ -149,6 +155,8 @@ sub to_string {
149	155
150	156	1;
151	157
	158	+=encoding utf8
	159	+
152	160	=head1 NAME
153	161
154	162	Mojo::Headers - Headers
...	...	@@ -234,6 +242,29 @@ Shortcut for the C<Accept-Ranges> header.
234	242
235	243	Add one or more header values with one or more lines.
236	244
	245	+ # "Vary: Accept"
	246	+ # "Vary: Accept-Encoding"
	247	+ $headers->vary('Accept')->add(Vary => 'Accept-Encoding')->to_string;
	248	+
	249	+=head2 allow
	250	+
	251	+ my $allow = $headers->allow;
	252	+ $headers = $headers->allow('GET, POST');
	253	+
	254	+Shortcut for the C<Allow> header.
	255	+
	256	+=head2 append
	257	+
	258	+ $headers = $headers->append(Vary => 'Accept-Encoding');
	259	+
	260	+Append value to header and flatten it if necessary.
	261	+
	262	+ # "Vary: Accept"
	263	+ $headers->append(Vary => 'Accept')->to_string;
	264	+
	265	+ # "Vary: Accept, Accept-Encoding"
	266	+ $headers->vary('Accept')->append(Vary => 'Accept-Encoding')->to_string;
	267	+
237	268	=head2 authorization
238	269
239	270	my $authorization = $headers->authorization;
...	...	@@ -380,13 +411,13 @@ Shortcut for the C<If-Modified-Since> header.
380	411
381	412	=head2 is_finished
382	413
383		- my $success = $headers->is_finished;
	414	+ my $bool = $headers->is_finished;
384	415
385	416	Check if header parser is finished.
386	417
387	418	=head2 is_limit_exceeded
388	419
389		- my $success = $headers->is_limit_exceeded;
	420	+ my $bool = $headers->is_limit_exceeded;
390	421
391	422	Check if a header has exceeded C<max_line_size>.
392	423
...	...	@@ -403,6 +434,13 @@ Shortcut for the C<Last-Modified> header.
403	434
404	435	Get leftover data from header parser.
405	436
	437	+=head2 link
	438	+
	439	+ my $link = $headers->link;
	440	+ $headers = $headers->link('<http://127.0.0.1/foo/3>; rel="next"');
	441	+
	442	+Shortcut for the C<Link> header from RFC 5988.
	443	+
406	444	=head2 location
407	445
408	446	my $location = $headers->location;
...	...	@@ -414,7 +452,10 @@ Shortcut for the C<Location> header.
414	452
415	453	my $names = $headers->names;
416	454
417		-Generate a list of all currently defined headers.
	455	+Return a list of all currently defined headers.
	456	+
	457	+ # Names of all headers
	458	+ say for @{$headers->names};
418	459
419	460	=head2 origin
420	461
...	...	@@ -571,6 +612,13 @@ Shortcut for the C<Upgrade> header.
571	612
572	613	Shortcut for the C<User-Agent> header.
573	614
	615	+=head2 vary
	616	+
	617	+ my $vary = $headers->vary;
	618	+ $headers = $headers->vary('*');
	619	+
	620	+Shortcut for the C<Vary> header.
	621	+
574	622	=head2 www_authenticate
575	623
576	624	my $authenticate = $headers->www_authenticate;

...	...	@@ -7,6 +7,8 @@ any '/*whatever' => {whatever => '', text => 'Your Mojo is working!'};
7	7
8	8	1;
9	9
	10	+=encoding utf8
	11	+
10	12	=head1 NAME
11	13
12	14	Mojo::HelloWorld - Hello World!

...	...	@@ -1,9 +1,6 @@
1	1	package Mojo::Home;
2	2	use Mojo::Base -base;
3		-use overload
4		- 'bool' => sub {1},
5		- '""' => sub { shift->to_string },
6		- fallback => 1;
	3	+use overload bool => sub {1}, '""' => sub { shift->to_string }, fallback => 1;
7	4
8	5	use Cwd 'abs_path';
9	6	use File::Basename 'dirname';
...	...	@@ -12,16 +9,15 @@ use File::Spec::Functions qw(abs2rel catdir catfile splitdir);
12	9	use FindBin;
13	10	use Mojo::Util qw(class_to_path slurp);
14	11
	12	+has parts => sub { [] };
	13	+
15	14	sub new { shift->SUPER::new->parse(@_) }
16	15
17	16	sub detect {
18	17	my $self = shift;
19	18
20	19	# Environment variable
21		- if ($ENV{MOJO_HOME}) {
22		- $self->{parts} = [splitdir(abs_path $ENV{MOJO_HOME})];
23		- return $self;
24		- }
	20	+ return $self->parts([splitdir(abs_path $ENV{MOJO_HOME})]) if $ENV{MOJO_HOME};
25	21
26	22	# Try to find home from lib directory
27	23	if (my $class = @_ ? shift : 'Mojo::HelloWorld') {
...	...	@@ -34,28 +30,23 @@ sub detect {
34	30	pop @home while @home && ($home[-1] =~ /^b?lib$/ \|\| $home[-1] eq '');
35	31
36	32	# Turn into absolute path
37		- $self->{parts} = [splitdir(abs_path(catdir(@home) \|\| '.'))];
	33	+ return $self->parts([splitdir(abs_path(catdir(@home) \|\| '.'))]);
38	34	}
39	35	}
40	36
41	37	# FindBin fallback
42		- $self->{parts} = [split /\//, $FindBin::Bin] unless $self->{parts};
43		-
44		- return $self;
	38	+ return $self->parts([split /\//, $FindBin::Bin]);
45	39	}
46	40
47	41	sub lib_dir {
48		- my $path = catdir @{shift->{parts} \|\| []}, 'lib';
	42	+ my $path = catdir @{shift->parts}, 'lib';
49	43	return -d $path ? $path : undef;
50	44	}
51	45
52	46	sub list_files {
53	47	my ($self, $dir) = @_;
54	48
55		- # Files relative to directory
56		- my $parts = $self->{parts} \|\| [];
57		- my $root = catdir @$parts;
58		- $dir = catdir $root, split '/', ($dir \|\| '');
	49	+ $dir = catdir @{$self->parts}, split '/', (defined $dir ? $dir : '');
59	50	return [] unless -d $dir;
60	51	my @files;
61	52	find {
...	...	@@ -73,17 +64,18 @@ sub mojo_lib_dir { catdir(dirname(__FILE__), '..') }
73	64
74	65	sub parse {
75	66	my ($self, $path) = @_;
76		- $self->{parts} = [splitdir $path] if defined $path;
77		- return $self;
	67	+ return defined $path ? $self->parts([splitdir $path]) : $self;
78	68	}
79	69
80		-sub rel_dir { catdir(@{shift->{parts} \|\| []}, split '/', shift) }
81		-sub rel_file { catfile(@{shift->{parts} \|\| []}, split '/', shift) }
	70	+sub rel_dir { catdir(@{shift->parts}, split '/', shift) }
	71	+sub rel_file { catfile(@{shift->parts}, split '/', shift) }
82	72
83		-sub to_string { catdir(@{shift->{parts} \|\| []}) }
	73	+sub to_string { catdir(@{shift->parts}) }
84	74
85	75	1;
86	76
	77	+=encoding utf8
	78	+
87	79	=head1 NAME
88	80
89	81	Mojo::Home - Home sweet home!
...	...	@@ -103,6 +95,17 @@ Mojo::Home - Home sweet home!
103	95
104	96	L<Mojo::Home> is a container for home directories.
105	97
	98	+=head1 ATTRIBUTES
	99	+
	100	+L<Mojo::Home> implements the following attributes.
	101	+
	102	+=head2 parts
	103	+
	104	+ my $parts = $home->parts;
	105	+ $home = $home->parts([]);
	106	+
	107	+Home directory parts.
	108	+
106	109	=head1 METHODS
107	110
108	111	L<Mojo::Home> inherits all methods from L<Mojo::Base> and implements the
...	...	@@ -113,7 +116,8 @@ following new ones.
113	116	my $home = Mojo::Home->new;
114	117	my $home = Mojo::Home->new('/home/sri/myapp');
115	118
116		-Construct a new L<Mojo::Home> object and C<parse> home directory if necessary.
	119	+Construct a new L<Mojo::Home> object and L</"parse"> home directory if
	120	+necessary.
117	121
118	122	=head2 detect
119	123

...	...	@@ -10,7 +10,7 @@ use Mojo::IOLoop::Server;
10	10	use Mojo::IOLoop::Stream;
11	11	use Mojo::Reactor::Poll;
12	12	use Mojo::Util qw(md5_sum steady_time);
13		-use Scalar::Util 'weaken';
	13	+use Scalar::Util qw(blessed weaken);
14	14
15	15	use constant DEBUG => $ENV{MOJO_IOLOOP_DEBUG} \|\| 0;
16	16
...	...	@@ -22,7 +22,9 @@ has multi_accept => 50;
22	22	has reactor => sub {
23	23	my $class = Mojo::Reactor::Poll->detect;
24	24	warn "-- Reactor initialized ($class)\n" if DEBUG;
25		- return $class->new;
	25	+ my $reactor = $class->new;
	26	+ $reactor->on(error => sub { warn "@{[blessed $_[0]]}: $_[1]" });
	27	+ return $reactor;
26	28	};
27	29
28	30	# Ignore PIPE signal
...	...	@@ -32,8 +34,7 @@ $SIG{PIPE} = 'IGNORE';
32	34	__PACKAGE__->singleton->reactor;
33	35
34	36	sub acceptor {
35		- my ($self, $acceptor) = @_;
36		- $self = $self->singleton unless ref $self;
	37	+ my ($self, $acceptor) = (_instance(shift), @_);
37	38
38	39	# Find acceptor for id
39	40	return $self->{acceptors}{$acceptor} unless ref $acceptor;
...	...	@@ -44,35 +45,28 @@ sub acceptor {
44	45	weaken $acceptor->reactor($self->reactor)->{reactor};
45	46	$self->{accepts} = $self->max_accepts if $self->max_accepts;
46	47
47		- # Stop accepting so new acceptor can get picked up
	48	+ # Allow new acceptor to get picked up
48	49	$self->_not_accepting;
49	50
50	51	return $id;
51	52	}
52	53
53	54	sub client {
54		- my ($self, $cb) = (shift, pop);
55		- $self = $self->singleton unless ref $self;
	55	+ my ($self, $cb) = (_instance(shift), pop);
56	56
57	57	# Make sure timers are running
58		- $self->_timers;
	58	+ $self->_recurring;
59	59
60		- my $id = $self->_id;
61		- my $c = $self->{connections}{$id} \|\|= {};
62		- my $client = $c->{client} = Mojo::IOLoop::Client->new;
	60	+ my $id = $self->_id;
	61	+ my $client = $self->{connections}{$id}{client} = Mojo::IOLoop::Client->new;
63	62	weaken $client->reactor($self->reactor)->{reactor};
64	63
65	64	weaken $self;
66	65	$client->on(
67	66	connect => sub {
68		- my $handle = pop;
69		-
70		- # Turn handle into stream
71		- my $c = $self->{connections}{$id};
72		- delete $c->{client};
73		- my $stream = $c->{stream} = Mojo::IOLoop::Stream->new($handle);
	67	+ delete $self->{connections}{$id}{client};
	68	+ my $stream = Mojo::IOLoop::Stream->new(pop);
74	69	$self->_stream($stream => $id);
75		-
76	70	$self->$cb(undef, $stream);
77	71	}
78	72	);
...	...	@@ -88,8 +82,7 @@ sub client {
88	82	}
89	83
90	84	sub delay {
91		- my $self = shift;
92		- $self = $self->singleton unless ref $self;
	85	+ my $self = _instance(shift);
93	86
94	87	my $delay = Mojo::IOLoop::Delay->new;
95	88	weaken $delay->ioloop($self)->{ioloop};
...	...	@@ -103,42 +96,24 @@ sub generate_port { Mojo::IOLoop::Server->generate_port }
103	96	sub is_running { (ref $_[0] ? $_[0] : $_[0]->singleton)->reactor->is_running }
104	97	sub one_tick { (ref $_[0] ? $_[0] : $_[0]->singleton)->reactor->one_tick }
105	98
106		-sub recurring {
107		- my ($self, $after, $cb) = @_;
108		- $self = $self->singleton unless ref $self;
109		- weaken $self;
110		- return $self->reactor->recurring($after => sub { $self->$cb });
111		-}
	99	+sub recurring { shift->_timer(recurring => @_) }
112	100
113	101	sub remove {
114		- my ($self, $id) = @_;
115		- $self = $self->singleton unless ref $self;
	102	+ my ($self, $id) = (_instance(shift), @_);
116	103	my $c = $self->{connections}{$id};
117	104	if ($c && (my $stream = $c->{stream})) { return $stream->close_gracefully }
118	105	$self->_remove($id);
119	106	}
120	107
121	108	sub server {
122		- my ($self, $cb) = (shift, pop);
123		- $self = $self->singleton unless ref $self;
	109	+ my ($self, $cb) = (_instance(shift), pop);
124	110
125	111	my $server = Mojo::IOLoop::Server->new;
126	112	weaken $self;
127	113	$server->on(
128	114	accept => sub {
129		- my $handle = pop;
130		-
131		- # Turn handle into stream
132		- my $stream = Mojo::IOLoop::Stream->new($handle);
	115	+ my $stream = Mojo::IOLoop::Stream->new(pop);
133	116	$self->$cb($stream, $self->stream($stream));
134		-
135		- # Enforce connection limit (randomize to improve load balancing)
136		- $self->max_connections(0)
137		- if defined $self->{accepts}
138		- && ($self->{accepts} -= int(rand 2) + 1) <= 0;
139		-
140		- # Stop accepting to release accept mutex
141		- $self->_not_accepting;
142	117	}
143	118	);
144	119	$server->listen(@_);
...	...	@@ -158,24 +133,23 @@ sub start {
158	133	sub stop { (ref $_[0] ? $_[0] : $_[0]->singleton)->reactor->stop }
159	134
160	135	sub stream {
161		- my ($self, $stream) = @_;
162		- $self = $self->singleton unless ref $self;
163		-
164		- # Connect stream with reactor
165		- return $self->_stream($stream, $self->_id) if ref $stream;
	136	+ my ($self, $stream) = (_instance(shift), @_);
166	137
167	138	# Find stream for id
168		- return undef unless my $c = $self->{connections}{$stream};
169		- return $c->{stream};
170		-}
	139	+ return ($self->{connections}{$stream} \|\| {})->{stream} unless ref $stream;
171	140
172		-sub timer {
173		- my ($self, $after, $cb) = @_;
174		- $self = $self->singleton unless ref $self;
175		- weaken $self;
176		- return $self->reactor->timer($after => sub { $self->$cb });
	141	+ # Release accept mutex
	142	+ $self->_not_accepting;
	143	+
	144	+ # Enforce connection limit (randomize to improve load balancing)
	145	+ $self->max_connections(0)
	146	+ if defined $self->{accepts} && ($self->{accepts} -= int(rand 2) + 1) <= 0;
	147	+
	148	+ return $self->_stream($stream, $self->_id);
177	149	}
178	150
	151	+sub timer { shift->_timer(timer => @_) }
	152	+
179	153	sub _accepting {
180	154	my $self = shift;
181	155
...	...	@@ -206,11 +180,13 @@ sub _id {
206	180	return $id;
207	181	}
208	182
	183	+sub _instance { ref $_[0] ? $_[0] : $_[0]->singleton }
	184	+
209	185	sub _not_accepting {
210	186	my $self = shift;
211	187
212	188	# Make sure timers are running
213		- $self->_timers;
	189	+ $self->_recurring;
214	190
215	191	# Release accept mutex
216	192	return unless delete $self->{accepting};
...	...	@@ -220,6 +196,12 @@ sub _not_accepting {
220	196	$_->stop for values %{$self->{acceptors} \|\| {}};
221	197	}
222	198
	199	+sub _recurring {
	200	+ my $self = shift;
	201	+ $self->{accept} \|\|= $self->recurring($self->accept_interval => \&_accepting);
	202	+ $self->{stop} \|\|= $self->recurring(1 => \&_stop);
	203	+}
	204	+
223	205	sub _remove {
224	206	my ($self, $id) = @_;
225	207
...	...	@@ -246,7 +228,7 @@ sub _stream {
246	228	my ($self, $stream, $id) = @_;
247	229
248	230	# Make sure timers are running
249		- $self->_timers;
	231	+ $self->_recurring;
250	232
251	233	# Connect stream with reactor
252	234	$self->{connections}{$id}{stream} = $stream;
...	...	@@ -258,14 +240,16 @@ sub _stream {
258	240	return $id;
259	241	}
260	242
261		-sub _timers {
262		- my $self = shift;
263		- $self->{accept} \|\|= $self->recurring($self->accept_interval => \&_accepting);
264		- $self->{stop} \|\|= $self->recurring(1 => \&_stop);
	243	+sub _timer {
	244	+ my ($self, $method, $after, $cb) = (_instance(shift), @_);
	245	+ weaken $self;
	246	+ return $self->reactor->$method($after => sub { $self->$cb });
265	247	}
266	248
267	249	1;
268	250
	251	+=encoding utf8
	252	+
269	253	=head1 NAME
270	254
271	255	Mojo::IOLoop - Minimalistic event loop
...	...	@@ -319,17 +303,18 @@ L<Mojo::IOLoop> is a very minimalistic event loop based on L<Mojo::Reactor>,
319	303	it has been reduced to the absolute minimal feature set required to build
320	304	solid and scalable non-blocking TCP clients and servers.
321	305
322		-Optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.16+) and
323		-L<IO::Socket::SSL> (1.75+) are supported transparently, and used if installed.
324		-Individual features can also be disabled with the MOJO_NO_IPV6 and MOJO_NO_TLS
325		-environment variables.
326		-
327	306	The event loop will be resilient to time jumps if a monotonic clock is
328	307	available through L<Time::HiRes>. A TLS certificate and key are also built
329	308	right in, to make writing test servers as easy as possible. Also note that for
330	309	convenience the C<PIPE> signal will be set to C<IGNORE> when L<Mojo::IOLoop>
331	310	is loaded.
332	311
	312	+For better scalability (epoll, kqueue) and to provide IPv6 as well as TLS
	313	+support, the optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.16+) and
	314	+L<IO::Socket::SSL> (1.75+) will be used automatically if they are installed.
	315	+Individual features can also be disabled with the MOJO_NO_IPV6 and MOJO_NO_TLS
	316	+environment variables.
	317	+
333	318	See L<Mojolicious::Guides::Cookbook> for more.
334	319
335	320	=head1 ATTRIBUTES
...	...	@@ -396,7 +381,7 @@ Number of connections to accept at once, defaults to C<50>.
396	381	$loop = $loop->reactor(Mojo::Reactor->new);
397	382
398	383	Low level event reactor, usually a L<Mojo::Reactor::Poll> or
399		-L<Mojo::Reactor::EV> object.
	384	+L<Mojo::Reactor::EV> object with a default C<error> event.
400	385
401	386	# Watch if handle becomes readable or writable
402	387	$loop->reactor->io($handle => sub {
...	...	@@ -464,6 +449,7 @@ event, and multiple ones as a chain of steps.
464	449	$end->();
465	450	});
466	451	}
	452	+ $delay->wait unless Mojo::IOLoop->is_running;
467	453
468	454	# Sequentialize multiple events
469	455	my $delay = Mojo::IOLoop->delay(
...	...	@@ -486,8 +472,6 @@ event, and multiple ones as a chain of steps.
486	472	# Third step (the end)
487	473	sub { say 'And done after 5 seconds total.' }
488	474	);
489		-
490		- # Wait for events if necessary
491	475	$delay->wait unless Mojo::IOLoop->is_running;
492	476
493	477	=head2 generate_port
...	...	@@ -499,8 +483,8 @@ Find a free TCP port, this is a utility function primarily used for tests.
499	483
500	484	=head2 is_running
501	485
502		- my $success = Mojo::IOLoop->is_running;
503		- my $success = $loop->is_running;
	486	+ my $bool = Mojo::IOLoop->is_running;
	487	+ my $bool = $loop->is_running;
504	488
505	489	Check if event loop is running.
506	490
...	...	@@ -514,6 +498,11 @@ Check if event loop is running.
514	498	Run event loop until an event occurs. Note that this method can recurse back
515	499	into the reactor, so you need to be careful.
516	500
	501	+ # Don't block longer than 0.5 seconds
	502	+ my $id = Mojo::IOLoop->timer(0.5 => sub {});
	503	+ Mojo::IOLoop->one_tick;
	504	+ Mojo::IOLoop->remove($id);
	505	+
517	506	=head2 recurring
518	507
519	508	my $id = Mojo::IOLoop->recurring(0.5 => sub {...});
...	...	@@ -559,13 +548,17 @@ loop object from everywhere inside the process.
559	548	Mojo::IOLoop->timer(2 => sub { Mojo::IOLoop->stop });
560	549	Mojo::IOLoop->start;
561	550
	551	+ # Restart active timer
	552	+ my $id = Mojo::IOLoop->timer(3 => sub { say 'Timeout!' });
	553	+ Mojo::IOLoop->singleton->reactor->again($id);
	554	+
562	555	=head2 start
563	556
564	557	Mojo::IOLoop->start;
565	558	$loop->start;
566	559
567		-Start the event loop, this will block until C<stop> is called. Note that some
568		-reactors stop automatically if there are no events being watched anymore.
	560	+Start the event loop, this will block until L</"stop"> is called. Note that
	561	+some reactors stop automatically if there are no events being watched anymore.
569	562
570	563	# Start event loop only if it is not running already
571	564	Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
...	...	@@ -576,7 +569,7 @@ reactors stop automatically if there are no events being watched anymore.
576	569	$loop->stop;
577	570
578	571	Stop the event loop, this will not interrupt any existing connections and the
579		-event loop can be restarted by running C<start> again.
	572	+event loop can be restarted by running L</"start"> again.
580	573
581	574	=head2 stream
582	575

...	...	@@ -34,7 +34,7 @@ sub connect {
34	34
35	35	sub _cleanup {
36	36	my $self = shift;
37		- return $self unless my $reactor = $self->{reactor};
	37	+ return $self unless my $reactor = $self->reactor;
38	38	$self->{$_} && $reactor->remove(delete $self->{$_})
39	39	for qw(delay timer handle);
40	40	return $self;
...	...	@@ -50,18 +50,17 @@ sub _connect {
50	50	my %options = (
51	51	Blocking => 0,
52	52	PeerAddr => $address eq 'localhost' ? '127.0.0.1' : $address,
53		- PeerPort => $args->{port} \|\| ($args->{tls} ? 443 : 80),
54		- Proto => 'tcp'
	53	+ PeerPort => $args->{port} \|\| ($args->{tls} ? 443 : 80)
55	54	);
56	55	$options{LocalAddr} = $args->{local_address} if $args->{local_address};
57	56	$options{PeerAddr} =~ s/[\[\]]//g if $options{PeerAddr};
58	57	my $class = IPV6 ? 'IO::Socket::IP' : 'IO::Socket::INET';
59		- return $self->emit_safe(error => "Couldn't connect")
	58	+ return $self->emit(error => "Couldn't connect: $@")
60	59	unless $self->{handle} = $handle = $class->new(%options);
61	60
62	61	# Timeout
63	62	$self->{timer} = $reactor->timer($args->{timeout} \|\| 10,
64		- sub { $self->emit_safe(error => 'Connect timeout') });
	63	+ sub { $self->emit(error => 'Connect timeout') });
65	64	}
66	65	$handle->blocking(0);
67	66
...	...	@@ -73,16 +72,15 @@ sub _connect {
73	72	sub _tls {
74	73	my $self = shift;
75	74
76		- # Switch between reading and writing
	75	+ # Connected
77	76	my $handle = $self->{handle};
78		- if ($self->{tls} && !$handle->connect_SSL) {
79		- my $err = $IO::Socket::SSL::SSL_ERROR;
80		- if ($err == TLS_READ) { $self->reactor->watch($handle, 1, 0) }
81		- elsif ($err == TLS_WRITE) { $self->reactor->watch($handle, 1, 1) }
82		- return;
83		- }
	77	+ return $self->_cleanup->emit_safe(connect => $handle)
	78	+ if $handle->connect_SSL;
84	79
85		- $self->_cleanup->emit_safe(connect => $handle);
	80	+ # Switch between reading and writing
	81	+ my $err = $IO::Socket::SSL::SSL_ERROR;
	82	+ if ($err == TLS_READ) { $self->reactor->watch($handle, 1, 0) }
	83	+ elsif ($err == TLS_WRITE) { $self->reactor->watch($handle, 1, 1) }
86	84	}
87	85
88	86	sub _try {
...	...	@@ -90,47 +88,44 @@ sub _try {
90	88
91	89	# Retry or handle exceptions
92	90	my $handle = $self->{handle};
93		- return $! == EINPROGRESS ? undef : $self->emit_safe(error => $!)
	91	+ return $! == EINPROGRESS ? undef : $self->emit(error => $!)
94	92	if IPV6 && !$handle->connect;
95		- return $self->emit_safe(error => $! = $handle->sockopt(SO_ERROR))
	93	+ return $self->emit(error => $! = $handle->sockopt(SO_ERROR))
96	94	if !IPV6 && !$handle->connected;
97	95
98	96	# Disable Nagle's algorithm
99	97	setsockopt $handle, IPPROTO_TCP, TCP_NODELAY, 1;
100	98
101		- # TLS
102		- if ($args->{tls} && !$handle->isa('IO::Socket::SSL')) {
103		- return $self->emit_safe(
104		- error => 'IO::Socket::SSL 1.75 required for TLS support')
105		- unless TLS;
106		-
107		- # Upgrade
108		- weaken $self;
109		- my %options = (
110		- SSL_ca_file => $args->{tls_ca}
111		- && -T $args->{tls_ca} ? $args->{tls_ca} : undef,
112		- SSL_cert_file => $args->{tls_cert},
113		- SSL_error_trap => sub { $self->_cleanup->emit_safe(error => $_[1]) },
114		- SSL_hostname => $args->{address},
115		- SSL_key_file => $args->{tls_key},
116		- SSL_startHandshake => 0,
117		- SSL_verify_mode => $args->{tls_ca} ? 0x01 : 0x00,
118		- SSL_verifycn_name => $args->{address},
119		- SSL_verifycn_scheme => $args->{tls_ca} ? 'http' : undef
120		- );
121		- $self->{tls} = 1;
122		- my $reactor = $self->reactor;
123		- $reactor->remove($handle);
124		- return $self->emit_safe(error => 'TLS upgrade failed')
125		- unless $handle = IO::Socket::SSL->start_SSL($handle, %options);
126		- return $reactor->io($handle => sub { $self->_tls })->watch($handle, 0, 1);
127		- }
	99	+ return $self->_cleanup->emit_safe(connect => $handle)
	100	+ if !$args->{tls} \|\| $handle->isa('IO::Socket::SSL');
	101	+ return $self->emit(error => 'IO::Socket::SSL 1.75 required for TLS support')
	102	+ unless TLS;
128	103
129		- $self->_cleanup->emit_safe(connect => $handle);
	104	+ # Upgrade
	105	+ weaken $self;
	106	+ my %options = (
	107	+ SSL_ca_file => $args->{tls_ca}
	108	+ && -T $args->{tls_ca} ? $args->{tls_ca} : undef,
	109	+ SSL_cert_file => $args->{tls_cert},
	110	+ SSL_error_trap => sub { $self->_cleanup->emit(error => $_[1]) },
	111	+ SSL_hostname => $args->{address},
	112	+ SSL_key_file => $args->{tls_key},
	113	+ SSL_startHandshake => 0,
	114	+ SSL_verify_mode => $args->{tls_ca} ? 0x01 : 0x00,
	115	+ SSL_verifycn_name => $args->{address},
	116	+ SSL_verifycn_scheme => $args->{tls_ca} ? 'http' : undef
	117	+ );
	118	+ my $reactor = $self->reactor;
	119	+ $reactor->remove($handle);
	120	+ return $self->emit(error => 'TLS upgrade failed')
	121	+ unless $handle = IO::Socket::SSL->start_SSL($handle, %options);
	122	+ $reactor->io($handle => sub { $self->_tls })->watch($handle, 0, 1);
130	123	}
131	124
132	125	1;
133	126
	127	+=encoding utf8
	128	+
134	129	=head1 NAME
135	130
136	131	Mojo::IOLoop::Client - Non-blocking TCP client
...	...	@@ -179,7 +174,7 @@ Emitted safely once the connection is established.
179	174	...
180	175	});
181	176
182		-Emitted safely if an error occurs on the connection.
	177	+Emitted if an error occurs on the connection, fatal if unhandled.
183	178
184	179	=head1 ATTRIBUTES
185	180
...	...	@@ -211,39 +206,57 @@ These options are currently available:
211	206
212	207	=item address
213	208
	209	+ address => 'mojolicio.us'
	210	+
214	211	Address or host name of the peer to connect to, defaults to C<localhost>.
215	212
216	213	=item handle
217	214
	215	+ handle => $handle
	216	+
218	217	Use an already prepared handle.
219	218
220	219	=item local_address
221	220
	221	+ local_address => '127.0.0.1'
	222	+
222	223	Local address to bind to.
223	224
224	225	=item port
225	226
226		-Port to connect to.
	227	+ port => 80
	228	+
	229	+Port to connect to, defaults to C<80> or C<443> with C<tls> option.
227	230
228	231	=item timeout
229	232
	233	+ timeout => 15
	234	+
230	235	Maximum amount of time in seconds establishing connection may take before
231	236	getting canceled, defaults to C<10>.
232	237
233	238	=item tls
234	239
	240	+ tls => 1
	241	+
235	242	Enable TLS.
236	243
237	244	=item tls_ca
238	245
	246	+ tls_ca => '/etc/tls/ca.crt'
	247	+
239	248	Path to TLS certificate authority file. Also activates hostname verification.
240	249
241	250	=item tls_cert
242	251
	252	+ tls_cert => '/etc/tls/client.crt'
	253	+
243	254	Path to the TLS certificate file.
244	255
245	256	=item tls_key
246	257
	258	+ tls_key => '/etc/tls/client.key'
	259	+
247	260	Path to the TLS key file.
248	261
249	262	=back

...	...	@@ -15,36 +15,44 @@ sub begin {
15	15	sub steps {
16	16	my $self = shift;
17	17	$self->{steps} = [@_];
18		- $self->begin->();
	18	+ $self->ioloop->timer(0 => $self->begin);
19	19	return $self;
20	20	}
21	21
22	22	sub wait {
23	23	my $self = shift;
	24	+
24	25	my @args;
	26	+ $self->once(error => \&_die);
25	27	$self->once(finish => sub { shift->ioloop->stop; @args = @_ });
26	28	$self->ioloop->start;
	29	+
27	30	return wantarray ? @args : $args[0];
28	31	}
29	32
	33	+sub _die { $_[0]->has_subscribers('error') ? $_[0]->ioloop->stop : die $_[1] }
	34	+
30	35	sub _step {
31	36	my ($self, $id) = (shift, shift);
32	37
33	38	$self->{args}[$id] = [@_];
34		- return $self->{pending} if --$self->{pending} \|\| $self->{lock};
	39	+ return if $self->{fail} \|\| --$self->{pending} \|\| $self->{lock};
35	40	local $self->{lock} = 1;
36	41	my @args = map {@$_} @{delete $self->{args}};
37	42
38	43	$self->{counter} = 0;
39		- if (my $cb = shift @{$self->{steps} \|\|= []}) { $self->$cb(@args) }
	44	+ if (my $cb = shift @{$self->{steps} \|\|= []}) {
	45	+ eval { $self->$cb(@args); 1 } or return $self->emit(error => $@)->{fail}++;
	46	+ }
40	47
41		- if (!$self->{counter}) { $self->emit(finish => @args) }
42		- elsif (!$self->{pending}) { $self->ioloop->timer(0 => $self->begin) }
43		- return 0;
	48	+ return $self->emit(finish => @args) unless $self->{counter};
	49	+ $self->ioloop->timer(0 => $self->begin) unless $self->{pending};
44	50	}
45	51
46	52	1;
47	53
	54	+=encoding utf8
	55	+
48	56	=head1 NAME
49	57
50	58	Mojo::IOLoop::Delay - Manage callbacks and control the flow of events
...	...	@@ -63,6 +71,7 @@ Mojo::IOLoop::Delay - Manage callbacks and control the flow of events
63	71	$end->();
64	72	});
65	73	}
	74	+ $delay->wait unless Mojo::IOLoop->is_running;
66	75
67	76	# Sequentialize multiple events
68	77	my $delay = Mojo::IOLoop::Delay->new;
...	...	@@ -89,8 +98,6 @@ Mojo::IOLoop::Delay - Manage callbacks and control the flow of events
89	98	say 'And done after 5 seconds total.';
90	99	}
91	100	);
92		-
93		- # Wait for events if necessary
94	101	$delay->wait unless Mojo::IOLoop->is_running;
95	102
96	103	=head1 DESCRIPTION
...	...	@@ -103,6 +110,16 @@ L<Mojo::IOLoop>.
103	110	L<Mojo::IOLoop::Delay> inherits all events from L<Mojo::EventEmitter> and can
104	111	emit the following new ones.
105	112
	113	+=head2 error
	114	+
	115	+ $delay->on(error => sub {
	116	+ my ($delay, $err) = @_;
	117	+ ...
	118	+ });
	119	+
	120	+Emitted if an error occurs in one of the steps, breaking the chain, fatal if
	121	+unhandled.
	122	+
106	123	=head2 finish
107	124
108	125	$delay->on(finish => sub {
...	...	@@ -132,13 +149,13 @@ implements the following new ones.
132	149
133	150	=head2 begin
134	151
135		- my $cb = $delay->begin;
136		- my $cb = $delay->begin(0);
	152	+ my $without_first_arg = $delay->begin;
	153	+ my $with_first_arg = $delay->begin(0);
137	154
138	155	Increment active event counter, the returned callback can be used to decrement
139	156	the active event counter again. Arguments passed to the callback are queued in
140		-the right order for the next step or C<finish> event and C<wait> method, the
141		-first argument will be ignored by default.
	157	+the right order for the next step or L</"finish"> event and L</"wait"> method,
	158	+the first argument will be ignored by default.
142	159
143	160	# Capture all arguments
144	161	my $delay = Mojo::IOLoop->delay;
...	...	@@ -150,16 +167,17 @@ first argument will be ignored by default.
150	167	$delay = $delay->steps(sub {...}, sub {...});
151	168
152	169	Sequentialize multiple events, the first callback will run right away, and the
153		-next one once the active event counter reaches zero, this chain will continue
154		-until there are no more callbacks or a callback does not increment the active
155		-event counter.
	170	+next one once the active event counter reaches zero. This chain will continue
	171	+until there are no more callbacks, a callback does not increment the active
	172	+event counter or an error occurs in a callback.
156	173
157	174	=head2 wait
158	175
	176	+ my $arg = $delay->wait;
159	177	my @args = $delay->wait;
160	178
161		-Start C<ioloop> and stop it again once the C<finish> event gets emitted, only
162		-works when C<ioloop> is not running already.
	179	+Start L</"ioloop"> and stop it again once an L</"error"> or L</"finish"> event
	180	+gets emitted, only works when L</"ioloop"> is not running already.
163	181
164	182	# Use the "finish" event to synchronize portably
165	183	$delay->on(finish => sub {

...	...	@@ -34,11 +34,17 @@ has reactor => sub {
34	34	sub DESTROY {
35	35	my $self = shift;
36	36	if (my $port = $self->{port}) { $ENV{MOJO_REUSE} =~ s/(?:^\|\,)${port}:\d+// }
37		- return unless my $reactor = $self->{reactor};
	37	+ return unless my $reactor = $self->reactor;
38	38	$self->stop if $self->{handle};
39	39	$reactor->remove($_) for values %{$self->{handles}};
40	40	}
41	41
	42	+sub generate_port {
	43	+ IO::Socket::INET->new(Listen => 5, LocalAddr => '127.0.0.1')->sockport;
	44	+}
	45	+
	46	+sub handle { shift->{handle} }
	47	+
42	48	sub listen {
43	49	my $self = shift;
44	50	my $args = ref $_[0] ? $_[0] : {@_};
...	...	@@ -56,8 +62,8 @@ sub listen {
56	62	my $handle;
57	63	my $class = IPV6 ? 'IO::Socket::IP' : 'IO::Socket::INET';
58	64	if (defined $fd) {
59		- $handle = $class->new;
60		- $handle->fdopen($fd, 'r') or croak "Can't open file descriptor $fd: $!";
	65	+ $handle = $class->new_from_fd($fd, 'r')
	66	+ or croak "Can't open file descriptor $fd: $!";
61	67	}
62	68
63	69	# New socket
...	...	@@ -66,12 +72,12 @@ sub listen {
66	72	Listen => defined $args->{backlog} ? $args->{backlog} : SOMAXCONN,
67	73	LocalAddr => $args->{address} \|\| '0.0.0.0',
68	74	LocalPort => $port,
69		- Proto => 'tcp',
70	75	ReuseAddr => 1,
	76	+ ReusePort => $args->{reuse},
71	77	Type => SOCK_STREAM
72	78	);
73	79	$options{LocalAddr} =~ s/[\[\]]//g;
74		- $handle = $class->new(%options) or croak "Can't create listen socket: $!";
	80	+ $handle = $class->new(%options) or croak "Can't create listen socket: $@";
75	81	$fd = fileno $handle;
76	82	$ENV{MOJO_REUSE} .= length $ENV{MOJO_REUSE} ? ",$reuse:$fd" : "$reuse:$fd";
77	83	}
...	...	@@ -81,25 +87,18 @@ sub listen {
81	87	return unless $args->{tls};
82	88	croak "IO::Socket::SSL 1.75 required for TLS support" unless TLS;
83	89
84		- # Options (Prioritize RC4 to mitigate BEAST attack)
85		- my $options = $self->{tls} = {
	90	+ # Prioritize RC4 to mitigate BEAST attack
	91	+ $self->{tls} = {
	92	+ SSL_ca_file => $args->{tls_ca}
	93	+ && -T $args->{tls_ca} ? $args->{tls_ca} : undef,
86	94	SSL_cert_file => $args->{tls_cert} \|\| $CERT,
87		- SSL_cipher_list =>
88		- '!aNULL:!eNULL:!EXPORT:!DSS:!DES:!SSLv2:!LOW:RC4-SHA:RC4-MD5:ALL',
	95	+ SSL_cipher_list => defined $args->{tls_ciphers} ? $args->{tls_ciphers}
	96	+ : 'ECDHE-RSA-AES128-SHA256:AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH',
89	97	SSL_honor_cipher_order => 1,
90	98	SSL_key_file => $args->{tls_key} \|\| $KEY,
91	99	SSL_startHandshake => 0,
92		- SSL_verify_mode => 0x00
	100	+ SSL_verify_mode => defined $args->{tls_verify} ? $args->{tls_verify} : $args->{tls_ca} ? 0x03 : 0x00
93	101	};
94		- return unless $args->{tls_ca};
95		- $options->{SSL_ca_file} = -T $args->{tls_ca} ? $args->{tls_ca} : undef;
96		- $options->{SSL_verify_mode}
97		- = defined $args->{tls_verify} ? $args->{tls_verify} : 0x03;
98		-}
99		-
100		-sub generate_port {
101		- IO::Socket::INET->new(Listen => 5, LocalAddr => '127.0.0.1', Proto => 'tcp')
102		- ->sockport;
103	102	}
104	103
105	104	sub start {
...	...	@@ -139,8 +138,7 @@ sub _tls {
139	138	# Accepted
140	139	if ($handle->accept_SSL) {
141	140	$self->reactor->remove($handle);
142		- delete $self->{handles}{$handle};
143		- return $self->emit_safe(accept => $handle);
	141	+ return $self->emit_safe(accept => delete $self->{handles}{$handle});
144	142	}
145	143
146	144	# Switch between reading and writing
...	...	@@ -151,6 +149,8 @@ sub _tls {
151	149
152	150	1;
153	151
	152	+=encoding utf8
	153	+
154	154	=head1 NAME
155	155
156	156	Mojo::IOLoop::Server - Non-blocking TCP server
...	...	@@ -216,6 +216,18 @@ global L<Mojo::IOLoop> singleton.
216	216	L<Mojo::IOLoop::Server> inherits all methods from L<Mojo::EventEmitter> and
217	217	implements the following new ones.
218	218
	219	+=head2 generate_port
	220	+
	221	+ my $port = $server->generate_port;
	222	+
	223	+Find a free TCP port, this is a utility function primarily used for tests.
	224	+
	225	+=head2 handle
	226	+
	227	+ my $handle = $server->handle;
	228	+
	229	+Get handle for server.
	230	+
219	231	=head2 listen
220	232
221	233	$server->listen(port => 3000);
...	...	@@ -229,44 +241,67 @@ These options are currently available:
229	241
230	242	=item address
231	243
	244	+ address => '127.0.0.1'
	245	+
232	246	Local address to listen on, defaults to all.
233	247
234	248	=item backlog
235	249
	250	+ backlog => 128
	251	+
236	252	Maximum backlog size, defaults to C<SOMAXCONN>.
237	253
238	254	=item port
239	255
	256	+ port => 80
	257	+
240	258	Port to listen on.
241	259
	260	+=item reuse
	261	+
	262	+ reuse => 1
	263	+
	264	+Allow multiple servers to use the same port with the C<SO_REUSEPORT> socket
	265	+option.
	266	+
242	267	=item tls
243	268
	269	+ tls => 1
	270	+
244	271	Enable TLS.
245	272
246	273	=item tls_ca
247	274
	275	+ tls_ca => '/etc/tls/ca.crt'
	276	+
248	277	Path to TLS certificate authority file.
249	278
250	279	=item tls_cert
251	280
	281	+ tls_cert => '/etc/tls/server.crt'
	282	+
252	283	Path to the TLS cert file, defaults to a built-in test certificate.
253	284
	285	+=item tls_ciphers
	286	+
	287	+ tls_ciphers => 'AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH'
	288	+
	289	+Cipher specification string.
	290	+
254	291	=item tls_key
255	292
	293	+ tls_key => '/etc/tls/server.key'
	294	+
256	295	Path to the TLS key file, defaults to a built-in test key.
257	296
258	297	=item tls_verify
259	298
	299	+ tls_verify => 0x00
	300	+
260	301	TLS verification mode, defaults to C<0x03>.
261	302
262	303	=back
263	304
264		-=head2 generate_port
265		-
266		- my $port = $server->generate_port;
267		-
268		-Find a free TCP port, this is a utility function primarily used for tests.
269		-
270	305	=head2 start
271	306
272	307	$server->start;

...	...	@@ -11,16 +11,14 @@ has reactor => sub {
11	11
12	12	sub DESTROY { shift->close }
13	13
14		-sub new { shift->SUPER::new(handle => shift, buffer => '') }
	14	+sub new { shift->SUPER::new(handle => shift, buffer => '', timeout => 15) }
15	15
16	16	sub close {
17	17	my $self = shift;
18	18
19		- # Cleanup
20		- return unless my $reactor = $self->{reactor};
	19	+ return unless my $reactor = $self->reactor;
21	20	return unless my $handle = delete $self->timeout(0)->{handle};
22	21	$reactor->remove($handle);
23		-
24	22	close $handle;
25	23	$self->emit_safe('close');
26	24	}
...	...	@@ -48,14 +46,14 @@ sub is_writing {
48	46	sub start {
49	47	my $self = shift;
50	48
51		- my $reactor = $self->reactor;
52		- $reactor->io($self->timeout(15)->{handle},
53		- sub { pop() ? $self->_write : $self->_read })
54		- unless $self->{timer};
55		-
56	49	# Resume
57		- $reactor->watch($self->{handle}, 1, $self->is_writing)
	50	+ my $reactor = $self->reactor;
	51	+ return $reactor->watch($self->{handle}, 1, $self->is_writing)
58	52	if delete $self->{paused};
	53	+
	54	+ weaken $self;
	55	+ my $cb = sub { pop() ? $self->_write : $self->_read };
	56	+ $reactor->io($self->timeout($self->{timeout})->{handle} => $cb);
59	57	}
60	58
61	59	sub stop {
...	...	@@ -109,7 +107,7 @@ sub _error {
109	107	return $self->close if $! == ECONNRESET \|\| $! == EPIPE;
110	108
111	109	# Error
112		- $self->emit_safe(error => $!)->close;
	110	+ $self->emit(error => $!)->close;
113	111	}
114	112
115	113	sub _read {
...	...	@@ -139,6 +137,8 @@ sub _write {
139	137
140	138	1;
141	139
	140	+=encoding utf8
	141	+
142	142	=head1 NAME
143	143
144	144	Mojo::IOLoop::Stream - Non-blocking I/O stream
...	...	@@ -204,7 +204,7 @@ Emitted safely once all data has been written.
204	204	...
205	205	});
206	206
207		-Emitted safely if an error occurs on the stream.
	207	+Emitted if an error occurs on the stream, fatal if unhandled.
208	208
209	209	=head2 read
210	210
...	...	@@ -277,14 +277,14 @@ Get handle for stream.
277	277
278	278	=head2 is_readable
279	279
280		- my $success = $stream->is_readable;
	280	+ my $bool = $stream->is_readable;
281	281
282	282	Quick non-blocking check if stream is readable, useful for identifying tainted
283	283	sockets.
284	284
285	285	=head2 is_writing
286	286
287		- my $success = $stream->is_writing;
	287	+ my $bool = $stream->is_writing;
288	288
289	289	Check if stream is writing.
290	290

...	...	@@ -19,23 +19,23 @@ my %ESCAPE = (
19	19	'"' => '"',
20	20	'\\' => '\\',
21	21	'/' => '/',
22		- 'b' => "\x07",
23		- 'f' => "\x0C",
24		- 'n' => "\x0A",
25		- 'r' => "\x0D",
	22	+ 'b' => "\x08",
	23	+ 'f' => "\x0c",
	24	+ 'n' => "\x0a",
	25	+ 'r' => "\x0d",
26	26	't' => "\x09",
27	27	'u2028' => "\x{2028}",
28	28	'u2029' => "\x{2029}"
29	29	);
30	30	my %REVERSE = map { $ESCAPE{$_} => "\\$_" } keys %ESCAPE;
31		-for (0x00 .. 0x1F, 0x7F) { $REVERSE{pack 'C', $_} = do {my $tmp = $REVERSE{pack 'C', $_}; defined $tmp ? $tmp : sprintf '\u%.4X', $_} }
	31	+for (0x00 .. 0x1f, 0x7f) {$REVERSE{pack 'C', $_} = defined $REVERSE{pack 'C', $_} ? $REVERSE{pack 'C', $_} : sprintf '\u%.4X', $_}
32	32
33	33	# Unicode encoding detection
34	34	my $UTF_PATTERNS = {
35		- 'UTF-32BE' => qr/^\0\0\0[^\0]/,
36		- 'UTF-16BE' => qr/^\0[^\0]\0[^\0]/,
37		- 'UTF-32LE' => qr/^[^\0]\0\0\0/,
38		- 'UTF-16LE' => qr/^[^\0]\0[^\0]\0/
	35	+ 'UTF-32BE' => qr/^\x00{3}[^\x00]/,
	36	+ 'UTF-32LE' => qr/^[^\x00]\x00{3}/,
	37	+ 'UTF-16BE' => qr/^(?:\x00[^\x00]){2}/,
	38	+ 'UTF-16LE' => qr/^(?:[^\x00]\x00){2}/
39	39	};
40	40
41	41	my $WHITESPACE_RE = qr/[\x20\x09\x0a\x0d]*/;
...	...	@@ -75,7 +75,7 @@ sub decode {
75	75	# Object
76	76	elsif (m/\G\{/gc) { $ref = _decode_object() }
77	77
78		- # Unexpected
	78	+ # Invalid character
79	79	else { _exception('Expected array or object') }
80	80
81	81	# Leftover data
...	...	@@ -166,13 +166,13 @@ sub _decode_string {
166	166	my $pos = pos;
167	167
168	168	# Extract string with escaped characters
169		- m#\G(((?:[^\x00-\x1F\\"]\|\\(?:["\\/bfnrt]\|u[[:xdigit:]]{4})){0,32766})*)#gc;
	169	+ m!\G((?:(?:[^\x00-\x1f\\"]\|\\(?:["\\/bfnrt]\|u[0-9a-fA-F]{4})){0,32766})*)!gc;
170	170	my $str = $1;
171	171
172		- # Missing quote
	172	+ # Invalid character
173	173	unless (m/\G"/gc) {
174	174	_exception('Unexpected character or invalid escape while parsing string')
175		- if m/\G[\x00-\x1F\\]/;
	175	+ if m/\G[\x00-\x1f\\]/;
176	176	_exception('Unterminated string');
177	177	}
178	178
...	...	@@ -195,18 +195,17 @@ sub _decode_string {
195	195	my $ord = hex $3;
196	196
197	197	# Surrogate pair
198		- if (($ord & 0xF800) == 0xD800) {
	198	+ if (($ord & 0xf800) == 0xd800) {
199	199
200	200	# High surrogate
201		- ($ord & 0xFC00) == 0xD800
	201	+ ($ord & 0xfc00) == 0xd800
202	202	or pos($_) = $pos + pos($str), _exception('Missing high-surrogate');
203	203
204	204	# Low surrogate
205	205	$str =~ m/\G\\u([Dd][C-Fc-f]..)/gc
206	206	or pos($_) = $pos + pos($str), _exception('Missing low-surrogate');
207	207
208		- # Pair
209		- $ord = 0x10000 + ($ord - 0xD800) * 0x400 + (hex($1) - 0xDC00);
	208	+ $ord = 0x10000 + ($ord - 0xd800) * 0x400 + (hex($1) - 0xdc00);
210	209	}
211	210
212	211	# Character
...	...	@@ -245,7 +244,7 @@ sub _decode_value {
245	244	# Null
246	245	return undef if m/\Gnull/gc;
247	246
248		- # Invalid data
	247	+ # Invalid character
249	248	_exception('Expected string, array, object, number, boolean or null');
250	249	}
251	250
...	...	@@ -263,7 +262,7 @@ sub _encode_object {
263	262
264	263	sub _encode_string {
265	264	my $str = shift;
266		- $str =~ s!([\x00-\x1F\x7F\x{2028}\x{2029}\\"/\b\f\n\r\t])!$REVERSE{$1}!gs;
	265	+ $str =~ s!([\x00-\x1f\x7f\x{2028}\x{2029}\\"/\b\f\n\r\t])!$REVERSE{$1}!gs;
267	266	return "\"$str\"";
268	267	}
269	268
...	...	@@ -322,6 +321,8 @@ use overload '0+' => sub { ${$_[0]} }, '""' => sub { ${$_[0]} }, fallback => 1;
322	321
323	322	1;
324	323
	324	+=encoding utf8
	325	+
325	326	=head1 NAME
326	327
327	328	Mojo::JSON - Minimalistic JSON
...	...	@@ -352,19 +353,28 @@ it for validation.
352	353
353	354	It supports normal Perl data types like C<Scalar>, C<Array> reference, C<Hash>
354	355	reference and will try to call the C<TO_JSON> method on blessed references, or
355		-stringify them if it doesn't exist.
	356	+stringify them if it doesn't exist. Differentiating between strings and
	357	+numbers in Perl is hard, depending on how it has been used, a C<Scalar> can be
	358	+both at the same time. Since numeric comparisons on strings are very unlikely
	359	+to happen intentionally, the numeric value always gets priority, so any
	360	+C<Scalar> that has been used in numeric context is considered a number.
356	361
357	362	[1, -2, 3] -> [1, -2, 3]
358	363	{"foo": "bar"} -> {foo => 'bar'}
359	364
360	365	Literal names will be translated to and from L<Mojo::JSON> constants or a
361		-similar native Perl value. In addition C<Scalar> references will be used to
362		-generate booleans, based on if their values are true or false.
	366	+similar native Perl value.
363	367
364	368	true -> Mojo::JSON->true
365	369	false -> Mojo::JSON->false
366	370	null -> undef
367	371
	372	+In addition C<Scalar> references will be used to generate booleans, based on
	373	+if their values are true or false.
	374	+
	375	+ \1 -> true
	376	+ \0 -> false
	377	+
368	378	Decoding UTF-16 (LE/BE) and UTF-32 (LE/BE) will be handled transparently,
369	379	encoding will only generate UTF-8. The two Unicode whitespace characters
370	380	C<u2028> and C<u2029> will always be escaped to make JSONP easier.

...	...	@@ -53,7 +53,7 @@ L<Mojo::JSON::Pointer> is a relaxed implementation of RFC 6901.
53	53
54	54	=head2 contains
55	55
56		- my $success = $pointer->contains($data, '/foo/1');
	56	+ my $bool = $pointer->contains($data, '/foo/1');
57	57
58	58	Check if data structure contains a value that can be identified with the given
59	59	JSON Pointer.

...	...	@@ -6,12 +6,11 @@ use File::Spec::Functions qw(catdir catfile splitdir);
6	6	use Mojo::Exception;
7	7	use Mojo::Util qw(b64_decode class_to_path);
8	8
9		-my %CACHE;
	9	+my (%BIN, %CACHE);
10	10
11		-sub data {
12		- my ($self, $class, $data) = @_;
13		- return $class ? $data ? _all($class)->{$data} : _all($class) : undef;
14		-}
	11	+sub data { $_[1] ? $_[2] ? _all($_[1])->{$_[2]} : _all($_[1]) : undef }
	12	+
	13	+sub is_binary { keys %{_all($_[1])} ? !!$BIN{$_[1]}{$_[2]} : undef }
15	14
16	15	sub load {
17	16	my ($self, $module) = @_;
...	...	@@ -23,8 +22,7 @@ sub load {
23	22	return undef if $module->can('new') \|\| eval "require $module; 1";
24	23
25	24	# Exists
26		- my $path = class_to_path $module;
27		- return 1 if $@ =~ /^Can't locate $path in \@INC/;
	25	+ return 1 if $@ =~ /^Can't locate \Q@{[class_to_path $module]}\E in \@INC/;
28	26
29	27	# Real error
30	28	return Mojo::Exception->new($@);
...	...	@@ -52,29 +50,26 @@ sub search {
52	50	sub _all {
53	51	my $class = shift;
54	52
55		- # Refresh or use cached data
56	53	my $handle = do { no strict 'refs'; \*{"${class}::DATA"} };
57		- return $CACHE{$class} \|\| {} unless fileno $handle;
	54	+ return $CACHE{$class} \|\| {} if $CACHE{$class} \|\| !fileno $handle;
58	55	seek $handle, 0, 0;
59		- my $content = join '', <$handle>;
60		- close $handle;
	56	+ my $data = join '', <$handle>;
61	57
62	58	# Ignore everything before __DATA__ (Windows will seek to start of file)
63		- $content =~ s/^.*\n__DATA__\r?\n/\n/s;
	59	+ $data =~ s/^.*\n__DATA__\r?\n/\n/s;
64	60
65	61	# Ignore everything after __END__
66		- $content =~ s/\n__END__\r?\n.*$/\n/s;
	62	+ $data =~ s/\n__END__\r?\n.*$/\n/s;
67	63
68	64	# Split files
69		- my @data = split /^@@\s(.+?)\s\r?\n/m, $content;
70		- shift @data;
	65	+ (undef, my @files) = split /^@@\s(.+?)\s\r?\n/m, $data;
71	66
72	67	# Find data
73	68	my $all = $CACHE{$class} = {};
74		- while (@data) {
75		- my ($name, $content) = splice @data, 0, 2;
76		- $content = b64_decode $content if $name =~ s/\s\(\sbase64\s*\)$//;
77		- $all->{$name} = $content;
	69	+ while (@files) {
	70	+ my ($name, $data) = splice @files, 0, 2;
	71	+ $all->{$name} = $name =~ s/\s\(\sbase64\s*\)$//
	72	+ && ++$BIN{$class}{$name} ? b64_decode($data) : $data;
78	73	}
79	74
80	75	return $all;
...	...	@@ -82,6 +77,8 @@ sub _all {
82	77
83	78	1;
84	79
	80	+=encoding utf8
	81	+
85	82	=head1 NAME
86	83
87	84	Mojo::Loader - Loader
...	...	@@ -120,6 +117,12 @@ Extract embedded file from the C<DATA> section of a class.
120	117
121	118	say for keys %{$loader->data('Foo::Bar')};
122	119
	120	+=head2 is_binary
	121	+
	122	+ my $bool = $loader->is_binary('Foo::Bar', 'test.png');
	123	+
	124	+Check if embedded file from the C<DATA> section of a class was Base64 encoded.
	125	+
123	126	=head2 load
124	127
125	128	my $e = $loader->load('Foo::Bar');
...	...	@@ -128,7 +131,7 @@ Load a class and catch exceptions. Note that classes are checked for a C<new>
128	131	method to see if they are already loaded.
129	132
130	133	if (my $e = $loader->load('Foo::Bar')) {
131		- die ref $e ? "Exception: $e" : 'Already loaded!';
	134	+ die ref $e ? "Exception: $e" : 'Not found!';
132	135	}
133	136
134	137	=head2 search