@@ -130,7 +130,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('mojolicio.us')->res->body;

+  my $body = $app->ua->get('example.com')->res->body;

 =head1 METHODS

@@ -153,17 +153,15 @@ object.

 =head2 config

-  my $config = $app->config;

-  my $foo    = $app->config('foo');

-  $app       = $app->config({foo => 'bar'});

-  $app       = $app->config(foo => 'bar');

+  my $hash = $app->config;

+  my $foo  = $app->config('foo');

+  $app     = $app->config({foo => 'bar'});

+  $app     = $app->config(foo => 'bar');

 Application configuration.

-  # Manipulate configuration

-  $app->config->{foo} = 'bar';

-  my $foo = $app->config->{foo};

-  delete $app->config->{foo};

+  # Remove value

+  my $foo = delete $app->config->{foo};

 =head2 handler

@@ -83,9 +83,10 @@ subclass.

 =head2 get_chunk

   my $bytes = $asset->get_chunk($offset);

+  my $bytes = $asset->get_chunk($offset, $max);

-Get chunk of data starting from a specific position. Meant to be overloaded

-in a subclass.

+Get chunk of data starting from a specific position, defaults to a maximum

+chunk size of C<131072> bytes. Meant to be overloaded in a subclass.

 =head2 is_file

@@ -22,7 +22,7 @@ has handle => sub {

   }

   # Open new or temporary file

-  my $base = catfile File::Spec::Functions::tmpdir, 'mojo.tmp';

+  my $base = catfile $self->tmpdir, 'mojo.tmp';

   my $name = defined $path ? $path : $base;

   until ($handle->open($name, O_CREAT | O_EXCL | O_RDWR)) {

     croak qq{Can't open file "$name": $!} if defined $path || $! != $!{EEXIST};

@@ -57,14 +57,14 @@ sub add_chunk {

 }

 sub contains {

-  my ($self, $string) = @_;

+  my ($self, $str) = @_;

   my $handle = $self->handle;

   $handle->sysseek($self->start_range, SEEK_SET);

   # Calculate window size

   my $end  = defined $self->end_range ? $self->end_range : $self->size;

-  my $len  = length $string;

+  my $len  = length $str;

   my $size = $len > 131072 ? $len : 131072;

   $size = $end - $self->start_range if $size > $end - $self->start_range;

@@ -79,7 +79,7 @@ sub contains {

     $window .= $buffer;

     # Search window

-    my $pos = index $window, $string;

+    my $pos = index $window, $str;

     return $offset + $pos if $pos >= 0;

     $offset += $read;

     return -1 if $read == 0 || $offset == $end;

@@ -92,19 +92,20 @@ sub contains {

 }

 sub get_chunk {

-  my ($self, $start) = @_;

+  my ($self, $offset, $max) = @_;

+  $max = defined $max ? $max : 131072;

-  $start += $self->start_range;

+  $offset += $self->start_range;

   my $handle = $self->handle;

-  $handle->sysseek($start, SEEK_SET);

+  $handle->sysseek($offset, SEEK_SET);

   my $buffer;

   if (defined(my $end = $self->end_range)) {

-    my $chunk = $end + 1 - $start;

+    my $chunk = $end + 1 - $offset;

     return '' if $chunk <= 0;

-    $handle->sysread($buffer, $chunk > 131072 ? 131072 : $chunk);

+    $handle->sysread($buffer, $chunk > $max ? $max : $chunk);

   }

-  else { $handle->sysread($buffer, 131072) }

+  else { $handle->sysread($buffer, $max) }

   return $buffer;

 }

@@ -199,7 +200,7 @@ necessary.

   $file      = $file->tmpdir('/tmp');

 Temporary directory used to generate C<path>, defaults to the value of the

-C<MOJO_TMPDIR> environment variable or auto detection.

+MOJO_TMPDIR environment variable or auto detection.

 =head1 METHODS

@@ -220,9 +221,11 @@ Check if asset contains a specific string.

 =head2 get_chunk

-  my $bytes = $file->get_chunk($start);

+  my $bytes = $file->get_chunk($offset);

+  my $bytes = $file->get_chunk($offset, $max);

-Get chunk of data starting from a specific position.

+Get chunk of data starting from a specific position, defaults to a maximum

+chunk size of C<131072> bytes.

 =head2 is_file

@@ -21,26 +21,26 @@ sub add_chunk {

 }

 sub contains {

-  my ($self, $string) = @_;

+  my ($self, $str) = @_;

   my $start = $self->start_range;

-  my $pos = index $self->{content}, $string, $start;

+  my $pos = index $self->{content}, $str, $start;

   $pos -= $start if $start && $pos >= 0;

   my $end = $self->end_range;

-  return $end && ($pos + length $string) >= $end ? -1 : $pos;

+  return $end && ($pos + length $str) >= $end ? -1 : $pos;

 }

 sub get_chunk {

-  my ($self, $start) = @_;

+  my ($self, $offset, $max) = @_;

+  $max = defined $max ? $max : 131072;

-  $start += $self->start_range;

-  my $size = 131072;

+  $offset += $self->start_range;

   if (my $end = $self->end_range) {

-    $size = $end + 1 - $start if ($start + $size) > $end;

+    $max = $end + 1 - $offset if ($offset + $max) > $end;

   }

-  return substr shift->{content}, $start, $size;

+  return substr shift->{content}, $offset, $max;

 }

 sub move_to {

@@ -110,7 +110,7 @@ automatically upgrade to a L<Mojo::Asset::File> object.

 Maximum size in bytes of data to keep in memory before automatically upgrading

 to a L<Mojo::Asset::File> object, defaults to the value of the

-C<MOJO_MAX_MEMORY_SIZE> environment variable or C<262144>.

+MOJO_MAX_MEMORY_SIZE environment variable or C<262144>.

 =head1 METHODS

@@ -139,8 +139,10 @@ Check if asset contains a specific string.

 =head2 get_chunk

   my $bytes = $mem->get_chunk($offset);

+  my $bytes = $mem->get_chunk($offset, $max);

-Get chunk of data starting from a specific position.

+Get chunk of data starting from a specific position, defaults to a maximum

+chunk size of C<131072> bytes.

 =head2 move_to

@@ -213,7 +213,7 @@ pass it either a hash or a hash reference with attribute values.

 Create attribute accessor for hash-based objects, an array reference can be

 used to create more than one at a time. Pass an optional second argument to

 set a default value, it should be a constant or a callback. The callback will

-be excuted at accessor read time if there's no set value. Accessors can be

+be executed at accessor read time if there's no set value. Accessors can be

 chained, that means they return their invocant when they are called with an

 argument.

@@ -222,7 +222,8 @@ argument.

   $object = $object->tap(sub {...});

 K combinator, tap into a method chain to perform operations on an object

-within the chain.

+within the chain. The object will be the first argument passed to the closure

+and is also available via C<$_>.

 =head2 C<say>

@@ -230,7 +231,7 @@ Backported from perl-5.10.1

 =head1 DEBUGGING

-You can set the C<MOJO_BASE_DEBUG> environment variable to get some advanced

+You can set the MOJO_BASE_DEBUG environment variable to get some advanced

 diagnostics information printed to C<STDERR>.

   MOJO_BASE_DEBUG=1

@@ -10,12 +10,11 @@ our @EXPORT_OK = ('b');

 # Turn most functions from Mojo::Util into methods

 my @UTILS = (

-  qw(b64_decode b64_encode camelize decamelize hmac_md5_sum hmac_sha1_sum),

-  qw(html_unescape md5_bytes md5_sum punycode_decode punycode_encode quote),

-  qw(sha1_bytes sha1_sum slurp spurt squish trim unquote url_escape),

-  qw(url_unescape xml_escape xor_encode)

+  qw(b64_decode b64_encode camelize decamelize hmac_sha1_sum html_unescape),

+  qw(md5_bytes md5_sum punycode_decode punycode_encode quote sha1_bytes),

+  qw(sha1_sum slurp spurt squish trim unquote url_escape url_unescape),

+  qw(xml_escape xor_encode)

 );

-push @UTILS, 'html_escape';    # DEPRECATED in Rainbow!

 for my $name (@UTILS) {

   my $sub = Mojo::Util->can($name);

   Mojo::Util::monkey_patch __PACKAGE__, $name, sub {

@@ -165,12 +164,6 @@ Encode bytestream with L<Mojo::Util/"encode">, defaults to C<UTF-8>.

   $stream->trim->quote->encode->say;

-=head2 hmac_md5_sum

-

-  $stream = $stream->hmac_md5_sum('passw0rd');

-

-Generate HMAC-MD5 checksum for bytestream with L<Mojo::Util/"hmac_md5_sum">.

-

 =head2 hmac_sha1_sum

   $stream = $stream->hmac_sha1_sum('passw0rd');

@@ -226,7 +219,7 @@ Print bytestream to handle and append a newline, defaults to C<STDOUT>.

 =head2 secure_compare

-  my $success = $stream->secure_compare($string);

+  my $success = $stream->secure_compare($str);

 Compare bytestream with L<Mojo::Util/"secure_compare">.

@@ -284,8 +277,8 @@ L<Mojo::Util/"squish">.

 =head2 to_string

-  my $string = $stream->to_string;

-  my $string = "$stream";

+  my $str = $stream->to_string;

+  my $str = "$stream";

 Stringify bytestream.

@@ -28,16 +28,15 @@ sub each {

 sub first {

   my ($self, $cb) = @_;

-  return $cb ? do { (ref $cb) eq 'CODE' ? List::Util::first { $cb->($_) } @$self : List::Util::first { $_ =~ $cb } @$self } : $self->[0];

+  return $self->[0] unless $cb;

+  return List::Util::first { $cb->($_) } @$self if ref $cb eq 'CODE';

+  return List::Util::first { $_ =~ $cb } @$self;

 }

 sub grep {

   my ($self, $cb) = @_;

-  if ((ref $cb) eq 'CODE') {

-    return $self->new(grep { $cb->($_) } @$self);

-  } else {

-    return $self->new(grep { $_ =~ $cb } @$self);

-  }

+  return $self->new(grep { $cb->($_) } @$self) if ref $cb eq 'CODE';

+  return $self->new(grep { $_ =~ $cb } @$self);

 }

 sub join {

@@ -232,6 +231,13 @@ from the results.

 Create a new collection without duplicate elements.

+=head1 ELEMENTS

+

+Direct array reference access to elements is also possible.

+

+  say $collection->[23];

+  say for @$collection;

+

 =head1 SEE ALSO

 L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicio.us>.

@@ -27,7 +27,7 @@ sub build_body    { shift->_build('get_body_chunk') }

 sub build_headers { shift->_build('get_header_chunk') }

 sub charset {

-  my $type = shift->headers->content_type || '';

+  my $type = do {my $tmp = shift->headers->content_type; defined $tmp ? $tmp : ''};

   return $type =~ /charset="?([^"\s;]+)"?/i ? $1 : undef;

 }

@@ -64,15 +64,13 @@ sub get_header_chunk {

   return substr $self->{header_buffer}, $offset, 131072;

 }

-sub has_leftovers { !!length shift->leftovers }

-

 sub header_size { length shift->build_headers }

 sub is_chunked { !!shift->headers->transfer_encoding }

-sub is_compressed { (shift->headers->content_encoding || '') =~ /^gzip$/i }

+sub is_compressed { (do {my $tmp = shift->headers->content_encoding; defined $tmp ? $tmp : ''}) =~ /^gzip$/i }

-sub is_dynamic { $_[0]->{dynamic} && !defined $_[0]->headers->content_length }

+sub is_dynamic { $_[0]{dynamic} && !defined $_[0]->headers->content_length }

 sub is_finished { my $tmp = shift->{state}; (defined $tmp ? $tmp : '') eq 'finished' }

@@ -117,8 +115,8 @@ sub parse {

   # Relaxed parsing

   my $headers = $self->headers;

   if ($self->auto_relax) {

-    my $connection = $headers->connection || '';

-    my $len = defined $headers->content_length ? $headers->content_length : '';

+    my $connection = defined $headers->connection ? $headers->connection : '';

+    my $len        = defined $headers->content_length ? $headers->content_length : '';

     $self->relaxed(1)

       if !length $len && ($connection =~ /close/i || $headers->content_type);

   }

@@ -155,7 +153,7 @@ sub parse_body {

 sub progress {

   my $self = shift;

   return 0 unless my $state = $self->{state};

-  return 0 unless grep { $_ eq $state } qw(body finished);

+  return 0 unless $state eq 'body' || $state eq 'finished';

   return $self->{raw_size} - ($self->{header_size} || 0);

 }

@@ -398,7 +396,7 @@ Content headers, defaults to a L<Mojo::Headers> object.

   $content = $content->max_buffer_size(1024);

 Maximum size in bytes of buffer for content parser, defaults to the value of

-the C<MOJO_MAX_BUFFER_SIZE> environment variable or C<262144>.

+the MOJO_MAX_BUFFER_SIZE environment variable or C<262144>.

 =head2 max_leftover_size

@@ -406,7 +404,7 @@ the C<MOJO_MAX_BUFFER_SIZE> environment variable or C<262144>.

   $content = $content->max_leftover_size(1024);

 Maximum size in bytes of buffer for pipelined HTTP requests, defaults to the

-value of the C<MOJO_MAX_LEFTOVER_SIZE> environment variable or C<262144>.

+value of the MOJO_MAX_LEFTOVER_SIZE environment variable or C<262144>.

 =head2 relaxed

@@ -449,13 +447,13 @@ Extract multipart boundary from C<Content-Type> header.

 =head2 build_body

-  my $string = $content->build_body;

+  my $str = $content->build_body;

 Render whole body.

 =head2 build_headers

-  my $string = $content->build_headers;

+  my $str = $content->build_headers;

 Render all headers.

@@ -481,20 +479,14 @@ Generate dynamic content.

   my $bytes = $content->get_body_chunk(0);

-Get a chunk of content starting from a specfic position. Meant to be

+Get a chunk of content starting from a specific position. Meant to be

 overloaded in a subclass.

 =head2 get_header_chunk

   my $bytes = $content->get_header_chunk(13);

-Get a chunk of the headers starting from a specfic position.

-

-=head2 has_leftovers

-

-  my $success = $content->has_leftovers;

-

-Check if there are leftovers.

+Get a chunk of the headers starting from a specific position.

 =head2 header_size

@@ -52,7 +52,7 @@ sub build_boundary {

   # Add boundary to Content-Type header

   my $headers = $self->headers;

-  ($headers->content_type || '') =~ m!^(.*multipart/[^;]+)(.*)$!;

+  (defined $headers->content_type ? $headers->content_type : '') =~ m!^(.*multipart/[^;]+)(.*)$!;

   my $before = $1 || 'multipart/mixed';

   my $after  = $2 || '';

   $headers->content_type("$before; boundary=$boundary$after");

@@ -289,7 +289,7 @@ Clone content if possible, otherwise return C<undef>.

   my $bytes = $multi->get_body_chunk(0);

-Get a chunk of content starting from a specfic position.

+Get a chunk of content starting from a specific position.

 =head2 is_multipart

@@ -145,7 +145,7 @@ Clone content if possible, otherwise return C<undef>.

   my $bytes = $single->get_body_chunk(0);

-Get a chunk of content starting from a specfic position.

+Get a chunk of content starting from a specific position.

 =head2 parse

@@ -154,7 +154,7 @@ Get a chunk of content starting from a specfic position.

     = $single->parse("Content-Type: multipart/form-data\x0d\x0a\x0d\x0a");

 Parse content chunk and upgrade to L<Mojo::Content::MultiPart> object if

-possible.

+necessary.

 =head1 SEE ALSO

@@ -14,30 +14,26 @@ sub parse     { croak 'Method "parse" not implemented by subclass' }

 sub to_string { croak 'Method "to_string" not implemented by subclass' }

 sub _tokenize {

-  my ($self, $string) = @_;

+  my ($self, $str) = @_;

   # Nibbling parser

   my (@tree, @token);

-  while ($string) {

-

-    # Name

-    last unless $string =~ s/^\s*([^=;,]+)\s*=?\s*//;

+  while ($str =~ s/^\s*([^=;,]+)\s*=?\s*//) {

     my $name = $1;

     # "expires" is a special case, thank you Netscape...

-    $string =~ s/^([^;,]+,?[^;,]+)/"$1"/ if $name =~ /^expires$/i;

+    $str =~ s/^([^;,]+,?[^;,]+)/"$1"/ if $name =~ /^expires$/i;

     # Value

     my $value;

-    $value = unquote $1 if $string =~ s/^("(?:\\\\|\\"|[^"])+"|[^;,]+)\s*//;

+    $value = unquote $1 if $str =~ s/^("(?:\\\\|\\"|[^"])+"|[^;,]+)\s*//;

     push @token, [$name, $value];

     # Separator

-    $string =~ s/^\s*;\s*//;

-    if ($string =~ s/^\s*,\s*//) {

-      push @tree, [@token];

-      @token = ();

-    }

+    $str =~ s/^\s*;\s*//;

+    next unless $str =~ s/^\s*,\s*//;

+    push @tree, [@token];

+    @token = ();

   }

   # Take care of final token

@@ -60,7 +56,8 @@ Mojo::Cookie - HTTP cookie base class

 =head1 DESCRIPTION

-L<Mojo::Cookie> is an abstract base class for HTTP cookies.

+L<Mojo::Cookie> is an abstract base class for HTTP cookies as described in RFC

+6265.

 =head1 ATTRIBUTES

@@ -87,14 +84,14 @@ following new ones.

 =head2 parse

-  my $cookies = $cookie->parse($string);

+  my $cookies = $cookie->parse($str);

 Parse cookies. Meant to be overloaded in a subclass.

 =head2 to_string

-  my $string = $cookie->to_string;

-  my $string = "$cookie";

+  my $str = $cookie->to_string;

+  my $str = "$cookie";

 Render cookie. Meant to be overloaded in a subclass.

@@ -4,14 +4,13 @@ use Mojo::Base 'Mojo::Cookie';

 use Mojo::Util 'quote';

 sub parse {

-  my ($self, $string) = @_;

+  my ($self, $str) = @_;

   my @cookies;

-  for my $token (map {@$_} $self->_tokenize($string)) {

+  for my $token (map {@$_} $self->_tokenize(defined $str ? $str : '')) {

     my ($name, $value) = @$token;

     next if $name =~ /^\$/;

-    push @cookies,

-      Mojo::Cookie::Request->new(name => $name, value => defined $value ? $value : '');

+    push @cookies, $self->new(name => $name, value => defined $value ? $value : '');

   }

   return \@cookies;

@@ -42,7 +41,8 @@ Mojo::Cookie::Request - HTTP request cookie

 =head1 DESCRIPTION

-L<Mojo::Cookie::Request> is a container for HTTP request cookies.

+L<Mojo::Cookie::Request> is a container for HTTP request cookies as described

+in RFC 6265.

 =head1 ATTRIBUTES

@@ -55,13 +55,13 @@ implements the following new ones.

 =head2 parse

-  my $cookies = $cookie->parse('f=b; g=a');

+  my $cookies = Mojo::Cookie::Request->parse('f=b; g=a');

 Parse cookies.

 =head2 to_string

-  my $string = $cookie->to_string;

+  my $str = $cookie->to_string;

 Render cookie.

@@ -10,10 +10,8 @@ sub expires {

   my $self = shift;

   # Upgrade

-  return $self->{expires}

-    = defined $self->{expires} && !ref $self->{expires}

-    ? Mojo::Date->new($self->{expires})

-    : $self->{expires}

+  my $e = $self->{expires};

+  return $self->{expires} = defined $e && !ref $e ? Mojo::Date->new($e) : $e

     unless @_;

   $self->{expires} = shift;

@@ -21,23 +19,21 @@ sub expires {

 }

 sub parse {

-  my ($self, $string) = @_;

+  my ($self, $str) = @_;

   my @cookies;

-  for my $token ($self->_tokenize($string)) {

+  for my $token ($self->_tokenize(defined $str ? $str : '')) {

     for my $i (0 .. $#$token) {

       my ($name, $value) = @{$token->[$i]};

       # This will only run once

-      push(@cookies,

-        Mojo::Cookie::Response->new(name => $name, value => defined $value ? $value : ''))

-        and next

+      push @cookies, $self->new(name => $name, value => defined $value ? $value : '') and next

         unless $i;

       # Attributes (Netscape and RFC 6265)

-      next

-        unless my @match

+      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);

@@ -94,12 +90,13 @@ Mojo::Cookie::Response - HTTP response cookie

 =head1 DESCRIPTION

-L<Mojo::Cookie::Response> is a container for HTTP response cookies.

+L<Mojo::Cookie::Response> is a container for HTTP response cookies as

+described in RFC 6265.

 =head1 ATTRIBUTES

 L<Mojo::Cookie::Response> inherits all attributes from L<Mojo::Cookie> and

-implements the followign new ones.

+implements the following new ones.

 =head2 domain

@@ -153,13 +150,13 @@ Expiration for cookie.

 =head2 parse

-  my $cookies = $cookie->parse('f=b; path=/');

+  my $cookies = Mojo::Cookie::Response->parse('f=b; path=/');

 Parse cookies.

 =head2 to_string

-  my $string = $cookie->to_string;

+  my $str = $cookie->to_string;

 Render cookie.

@@ -18,12 +18,11 @@ use Scalar::Util qw(blessed weaken);

 sub AUTOLOAD {

   my $self = shift;

-  # Method

   my ($package, $method) = our $AUTOLOAD =~ /^([\w:]+)::(\w+)$/;

   croak "Undefined subroutine &${package}::$method called"

     unless blessed $self && $self->isa(__PACKAGE__);

-  # Search children

+  # Search children of current element

   my $children = $self->children($method);

   return @$children > 1 ? $children : $children->[0] if @$children;

   croak qq{Can't locate object method "$method" via package "$package"};

@@ -38,9 +37,8 @@ sub new {

 }

 sub all_text {

-  my ($self, $trim) = @_;

-  my $tree = $self->tree;

-  return _text(_elements($tree), 1, _trim($tree, $trim));

+  my $tree = shift->tree;

+  return _text(_elements($tree), 1, _trim($tree, @_));

 }

 sub append { shift->_add(1, @_) }

@@ -71,21 +69,17 @@ sub attrs {

   return $self;

 }

-sub charset { shift->_html(charset => @_) }

-

 sub children {

   my ($self, $type) = @_;

   my @children;

-  my $charset = $self->charset;

-  my $xml     = $self->xml;

-  my $tree    = $self->tree;

+  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 unless $e->[0] eq 'tag';

-    next if defined $type && $e->[1] ne $type;

-    push @children, $self->new->charset($charset)->tree($e)->xml($xml);

+    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);

@@ -94,23 +88,20 @@ sub children {

 sub content_xml {

   my $self = shift;

-  # Render children

-  my $tree    = $self->tree;

-  my $charset = $self->charset;

-  my $xml     = $self->xml;

-  return join '', map {

-    Mojo::DOM::HTML->new(charset => $charset, tree => $_, xml => $xml)->render

-  } @$tree[($tree->[0] eq 'root' ? 1 : 4) .. $#$tree];

+  # 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];

 }

 sub find {

   my ($self, $selector) = @_;

-

-  my $charset = $self->charset;

-  my $xml     = $self->xml;

-  return Mojo::Collection->new(

-    map { $self->new->charset($charset)->tree($_)->xml($xml) }

-      @{Mojo::DOM::CSS->new(tree => $self->tree)->select($selector)});

+  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);

 }

 sub namespace {

@@ -119,8 +110,7 @@ sub namespace {

   # Extract namespace prefix and search parents

   return '' if (my $current = $self->tree)->[0] eq 'root';

   my $ns = $current->[1] =~ /^(.*?):/ ? "xmlns:$1" : undef;

-  while ($current) {

-    last if $current->[0] eq 'root';

+  while ($current->[0] ne 'root') {

     # Namespace for prefix

     my $attrs = $current->[2];

@@ -141,15 +131,10 @@ sub next { shift->_sibling(1) }

 sub parent {

   my $self = shift;

   return undef if (my $tree = $self->tree)->[0] eq 'root';

-  return $self->new->charset($self->charset)->tree($tree->[3])

-    ->xml($self->xml);

+  return $self->new->tree($tree->[3])->xml($self->xml);

 }

-sub parse {

-  my $self = shift;

-  $self->[0]->parse(@_);

-  return $self;

-}

+sub parse { shift->_html(parse => shift) }

 sub prepend { shift->_add(0, @_) }

@@ -168,12 +153,10 @@ sub remove { shift->replace('') }

 sub replace {

   my ($self, $new) = @_;

-  # Parse

   my $tree = $self->tree;

   if   ($tree->[0] eq 'root') { return $self->xml(undef)->parse($new) }

   else                        { $new = $self->_parse("$new") }

-  # Find and replace

   my $parent = $tree->[3];

   my $i = $parent->[0] eq 'root' ? 1 : 4;

   for my $e (@$parent[$i .. $#$parent]) {

@@ -202,13 +185,12 @@ sub root {

     $root = $parent;

   }

-  return $self->new->charset($self->charset)->tree($root)->xml($self->xml);

+  return $self->new->tree($root)->xml($self->xml);

 }

 sub text {

-  my ($self, $trim) = @_;

-  my $tree = $self->tree;

-  return _text(_elements($tree), 0, _trim($tree, $trim));

+  my $tree = shift->tree;

+  return _text(_elements($tree), 0, _trim($tree, @_));

 }

 sub text_after {

@@ -309,11 +291,7 @@ sub _parent {

   return \@new;

 }

-sub _parse {

-  my $self = shift;

-  Mojo::DOM::HTML->new(charset => $self->charset, xml => $self->xml)

-    ->parse(shift)->tree;

-}

+sub _parse { Mojo::DOM::HTML->new(xml => shift->xml)->parse(shift)->tree }

 sub _sibling {

   my ($self, $next) = @_;

@@ -410,7 +388,7 @@ Mojo::DOM - Minimalistic HTML/XML DOM parser with CSS selectors

   $dom->div->p->[1]->append('<p id="c">C</p>');

   # Render

-  say $dom;

+  say "$dom";

 =head1 DESCRIPTION

@@ -452,7 +430,8 @@ following new ones.

   my $dom = Mojo::DOM->new;

   my $dom = Mojo::DOM->new('<foo bar="baz">test</foo>');

-Construct a new array-based L<Mojo::DOM> object.

+Construct a new array-based L<Mojo::DOM> object and C<parse> HTML/XML document

+if necessary.

 =head2 all_text

@@ -472,7 +451,7 @@ enabled by default.

   $dom = $dom->append('<p>Hi!</p>');

-Append to element.

+Append HTML/XML to element.

   # "<div><h1>A</h1><h2>B</h2></div>"

   $dom->parse('<div><h1>A</h1></div>')->at('h1')->append('<h2>B</h2>')->root;

@@ -481,7 +460,7 @@ Append to element.

   $dom = $dom->append_content('<p>Hi!</p>');

-Append to element content.

+Append HTML/XML to element content.

   # "<div><h1>AB</h1></div>"

   $dom->parse('<div><h1>A</h1></div>')->at('h1')->append_content('B')->root;

@@ -490,8 +469,9 @@ Append to element content.

   my $result = $dom->at('html title');

-Find a single element with CSS selectors. All selectors from L<Mojo::DOM::CSS>

-are supported.

+Find first element matching the CSS selector and return it as a L<Mojo::DOM>

+object or return C<undef> if none could be found. All selectors from

+L<Mojo::DOM::CSS> are supported.

   # Find first element with "svg" namespace definition

   my $namespace = $dom->at('[xmlns\:svg]')->{'xmlns:svg'};

@@ -505,20 +485,13 @@ are supported.

 Element attributes.

-=head2 charset

-

-  my $charset = $dom->charset;

-  $dom        = $dom->charset('UTF-8');

-

-Charset used for decoding and encoding HTML/XML.

-

 =head2 children

   my $collection = $dom->children;

   my $collection = $dom->children('div');

-Return a L<Mojo::Collection> object containing the children of this element,

-similar to C<find>.

+Return a L<Mojo::Collection> object containing the children of this element as

+L<Mojo::DOM> objects, similar to C<find>.

   # Show type of random child element

   say $dom->children->shuffle->first->type;

@@ -527,8 +500,7 @@ similar to C<find>.

   my $xml = $dom->content_xml;

-Render content of this element to XML. Note that the XML will be encoded if a

-C<charset> has been defined.

+Render content of this element to XML.

   # "<b>test</b>"

   $dom->parse('<div><b>test</b></div>')->div->content_xml;

@@ -537,8 +509,9 @@ C<charset> has been defined.

   my $collection = $dom->find('html title');

-Find elements with CSS selectors and return a L<Mojo::Collection> object. All

-selectors from L<Mojo::DOM::CSS> are supported.

+Find all elements 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.

   # Find a specific element and extract information

   my $id = $dom->find('div')->[23]{id};

@@ -562,7 +535,8 @@ Find element namespace.

   my $sibling = $dom->next;

-Next sibling of element.

+Return L<Mojo::DOM> object for next sibling of element or C<undef> if there

+are no more siblings.

   # "<h2>B</h2>"

   $dom->parse('<div><h1>A</h1><h2>B</h2></div>')->at('h1')->next;

@@ -571,7 +545,8 @@ Next sibling of element.

   my $parent = $dom->parent;

-Parent of element.

+Return L<Mojo::DOM> object for parent of element or C<undef> if this element

+has no parent.

 =head2 parse

@@ -579,14 +554,14 @@ Parent of element.

 Parse HTML/XML document with L<Mojo::DOM::HTML>.

-  # Parse UTF-8 encoded XML

-  my $dom = Mojo::DOM->new->charset('UTF-8')->xml(1)->parse($xml);

+  # Parse XML

+  my $dom = Mojo::DOM->new->xml(1)->parse($xml);

 =head2 prepend

   $dom = $dom->prepend('<p>Hi!</p>');

-Prepend to element.

+Prepend HTML/XML to element.

   # "<div><h1>A</h1><h2>B</h2></div>"

   $dom->parse('<div><h2>B</h2></div>')->at('h2')->prepend('<h1>A</h1>')->root;

@@ -595,7 +570,7 @@ Prepend to element.

   $dom = $dom->prepend_content('<p>Hi!</p>');

-Prepend to element content.

+Prepend HTML/XML to element content.

   # "<div><h2>AB</h2></div>"

   $dom->parse('<div><h2>B</h2></div>')->at('h2')->prepend_content('A')->root;

@@ -604,7 +579,8 @@ Prepend to element content.

   my $sibling = $dom->previous;

-Previous sibling of element.

+Return L<Mojo::DOM> object for previous sibling of element or C<undef> if

+there are no more siblings.

   # "<h1>A</h1>"

   $dom->parse('<div><h1>A</h1><h2>B</h2></div>')->at('h2')->previous;

@@ -613,7 +589,7 @@ Previous sibling of element.

   my $old = $dom->remove;

-Remove element.

+Remove element and return it as a L<Mojo::DOM> object.

   # "<div></div>"

   $dom->parse('<div><h1>A</h1></div>')->at('h1')->remove->root;

@@ -622,7 +598,8 @@ Remove element.

   my $old = $dom->replace('<div>test</div>');

-Replace element.

+Replace element with HTML/XML and return the replaced element as a

+L<Mojo::DOM> object.

   # "<div><h2>B</h2></div>"

   $dom->parse('<div><h1>A</h1></div>')->at('h1')->replace('<h2>B</h2>')->root;

@@ -632,9 +609,9 @@ Replace element.

 =head2 replace_content

-  $dom = $dom->replace_content('test');

+  $dom = $dom->replace_content('<p>test</p>');

-Replace element content.

+Replace element content with HTML/XML.

   # "<div><h1>B</h1></div>"

   $dom->parse('<div><h1>A</h1></div>')->at('h1')->replace_content('B')->root;

@@ -646,7 +623,7 @@ Replace element content.

   my $root = $dom->root;

-Find root node.

+Return L<Mojo::DOM> object for root node.

 =head2 text

@@ -695,8 +672,7 @@ is enabled by default.

   my $xml = $dom->to_xml;

   my $xml = "$dom";

-Render this element and its content to XML. Note that the XML will be encoded

-if a C<charset> has been defined.

+Render this element and its content to XML.

   # "<b>test</b>"

   $dom->parse('<div><b>test</b></div>')->div->b->to_xml;

@@ -704,9 +680,10 @@ if a C<charset> has been defined.

 =head2 tree

   my $tree = $dom->tree;

-  $dom     = $dom->tree(['root', [qw(text lalala)]]);

+  $dom     = $dom->tree(['root', ['text', 'foo']]);

-Document Object Model.

+Document Object Model. Note that this structure should only be used very

+carefully since it is very dynamic.

 =head2 type

@@ -52,7 +52,7 @@ sub select {

       # Try all selectors with element

       for my $part (@$pattern) {

-        push(@results, $current) and last

+        push @results, $current and last

           if $self->_combinator([reverse @$part], $current, $tree);

       }

     }

@@ -600,9 +600,10 @@ L<Mojo::DOM::CSS> implements the following attributes.

 =head2 tree

   my $tree = $css->tree;

-  $css     = $css->tree(['root', [qw(text lalala)]]);

+  $css     = $css->tree(['root', ['text', 'foo']]);

-Document Object Model.

+Document Object Model. Note that this structure should only be used very

+carefully since it is very dynamic.

 =head1 METHODS

@@ -1,14 +1,13 @@

 package Mojo::DOM::HTML;

 use Mojo::Base -base;

-use Mojo::Util qw(decode encode html_unescape xml_escape);

+use Mojo::Util qw(html_unescape xml_escape);

 use Scalar::Util 'weaken';

-has [qw(charset xml)];

+has 'xml';

 has tree => sub { ['root'] };

 my $ATTR_RE = qr/

-  \s*

   ([^=\s>]+)       # Key

   (?:

     \s*=\s*

@@ -42,6 +41,7 @@ my $TOKEN_RE = qr/

     <(

       \s*

       [^>\s]+                                       # Tag

+      \s*

       (?:$ATTR_RE)*                                 # Attributes

     )>

   )??

@@ -76,9 +76,6 @@ my %INLINE = map { $_ => 1 } (

 sub parse {

   my ($self, $html) = @_;

-  my $charset = $self->charset;

-  defined ($html = decode($charset, $html)) || return $self->charset(undef) if $charset;

-

   my $tree    = ['root'];

   my $current = $tree;

   while ($html =~ m/\G$TOKEN_RE/gcs) {

@@ -86,22 +83,22 @@ sub parse {

       = ($1, $2, $3, $4, $5, $6);

     # Text

-    if (length $text) {

-      $text = html_unescape $text if (index $text, '&') >= 0;

-      $self->_text($text, \$current);

-    }

+    if (length $text) { push @$current, ['text', html_unescape($text)] }

     # DOCTYPE

-    if ($doctype) { $self->_doctype($doctype, \$current) }

+    if ($doctype) { push @$current, ['doctype', $doctype] }

     # Comment

-    elsif ($comment) { $self->_comment($comment, \$current) }

+    elsif ($comment) { push @$current, ['comment', $comment] }

     # CDATA

-    elsif ($cdata) { $self->_cdata($cdata, \$current) }

+    elsif ($cdata) { push @$current, ['cdata', $cdata] }

-    # Processing instruction

-    elsif ($pi) { $self->_pi($pi, \$current) }

+    # Processing instruction (try to detect XML)

+    elsif ($pi) {

+      $self->xml(1) if !defined $self->xml && $pi =~ /xml/i;

+      push @$current, ['pi', $pi];

+    }

     # End

     next unless $tag;

@@ -121,12 +118,10 @@ sub parse {

         # Empty tag

         next if $key eq '/';

-        # Add unescaped value

-        $value = html_unescape $value if $value && (index $value, '&') >= 0;

-        $attrs{$key} = $value;

+        $attrs{$key} = defined $value ? html_unescape($value) : $value;

       }

-      # Start

+      # Tag

       $self->_start($start, \%attrs, \$current);

       # Empty element

@@ -134,9 +129,9 @@ sub parse {

         if (!$self->xml && $VOID{$start}) || $attr =~ m!/\s*$!;

       # Relaxed "script" or "style"

-      if (grep { $_ eq $start } qw(script style)) {

+      if ($start eq 'script' || $start eq 'style') {

         if ($html =~ m!\G(.*?)<\s*/\s*$start\s*>!gcsi) {

-          $self->_raw($1, \$current);

+          push @$current, ['raw', $1];

           $self->_end($start, \$current);

         }

       }

@@ -146,17 +141,7 @@ sub parse {

   return $self->tree($tree);

 }

-sub render {

-  my $self    = shift;

-  my $content = $self->_render($self->tree);

-  my $charset = $self->charset;

-  return $charset ? encode($charset, $content) : $content;

-}

-

-sub _cdata {

-  my ($self, $cdata, $current) = @_;

-  push @$$current, ['cdata', $cdata];

-}

+sub render { $_[0]->_render($_[0]->tree) }

 sub _close {

   my ($self, $current, $tags, $stop) = @_;

@@ -165,8 +150,7 @@ sub _close {

   # Check if parents need to be closed

   my $parent = $$current;

-  while ($parent) {

-    last if $parent->[0] eq 'root' || $parent->[1] eq $stop;

+  while ($parent->[0] ne 'root' && $parent->[1] ne $stop) {

     # Close

     $tags->{$parent->[1]} and $self->_end($parent->[1], $current);

@@ -176,27 +160,13 @@ sub _close {

   }