Skip to content

Commit

Permalink
a few comment tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
kraih committed Jan 20, 2013
1 parent cf6b807 commit 38fd46d
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 38 deletions.
1 change: 0 additions & 1 deletion lib/Mojo/Cookie/Response.pm
Expand Up @@ -23,7 +23,6 @@ sub expires {
sub parse {
my ($self, $string) = @_;

# Walk tree
my @cookies;
for my $token ($self->_tokenize($string)) {
for my $i (0 .. $#$token) {
Expand Down
6 changes: 1 addition & 5 deletions lib/Mojo/DOM.pm
Expand Up @@ -76,7 +76,6 @@ sub charset { shift->_html(charset => @_) }
sub children {
my ($self, $type) = @_;

# Walk tree
my @children;
my $charset = $self->charset;
my $xml = $self->xml;
Expand Down Expand Up @@ -118,11 +117,9 @@ sub find {
sub namespace {
my $self = shift;

# Namespace prefix
# Extract namespace prefix and search parents
return '' if (my $current = $self->tree)->[0] eq 'root';
my $ns = $current->[1] =~ /^(.*?):/ ? "xmlns:$1" : undef;

# Walk tree
while ($current) {
last if $current->[0] eq 'root';

Expand Down Expand Up @@ -341,7 +338,6 @@ sub _sibling {
sub _text {
my ($elements, $recurse, $trim) = @_;

# Walk tree
my $text = '';
for my $e (@$elements) {
my $type = $e->[0];
Expand Down
2 changes: 1 addition & 1 deletion lib/Mojo/DOM/HTML.pm
Expand Up @@ -301,7 +301,7 @@ sub _render {
$content .= '>';
}

# Walk tree
# Render whole tree
$content .= $self->_render($tree->[$_]) for $start .. $#$tree;

# End tag
Expand Down
12 changes: 5 additions & 7 deletions lib/Mojo/Message.pm
Expand Up @@ -307,13 +307,13 @@ sub _nest {
sub _parse_formdata {
my $self = shift;

# Check content
# Check for multipart content
my @formdata;
my $content = $self->content;
return \@formdata unless $content->is_multipart;
my $charset = $content->charset || $self->default_charset;

# Walk tree
# Check all parts for form data
my @parts;
push @parts, $content;
while (my $part = shift @parts) {
Expand All @@ -324,20 +324,18 @@ sub _parse_formdata {
next;
}

# Content-Disposition header
# Extract information from Content-Disposition header
my $disposition = $part->headers->content_disposition;
next unless $disposition;
my ($name) = $disposition =~ /[; ]name="?([^";]+)"?/;
my ($filename) = $disposition =~ /[; ]filename="?([^"]*)"?/;
my $value = $part;

# Decode
if ($charset) {
$name = decode($charset, $name) // $name if $name;
$filename = decode($charset, $filename) // $filename if $filename;
}

# Form value
# Upload
my $value = $part;
unless (defined $filename) {
$value = $part->asset->slurp;
$value = decode($charset, $value) // $value if $charset;
Expand Down
1 change: 0 additions & 1 deletion lib/Mojo/Server/Daemon.pm
Expand Up @@ -169,7 +169,6 @@ sub _finish {
sub _listen {
my ($self, $listen) = @_;

# Options
my $url = Mojo::URL->new($listen);
my $query = $url->query;
my $options = {
Expand Down
1 change: 0 additions & 1 deletion lib/Mojolicious/Command/cpanify.pm
Expand Up @@ -19,7 +19,6 @@ EOF
sub run {
my ($self, @args) = @_;

# Check options
GetOptionsFromArray \@args,
'p|password=s' => \(my $password = ''),
'u|user=s' => \(my $user = '');
Expand Down
2 changes: 0 additions & 2 deletions lib/Mojolicious/Command/daemon.pm
Expand Up @@ -28,7 +28,6 @@ EOF
sub run {
my ($self, @args) = @_;

# Check options
my $daemon = Mojo::Server::Daemon->new(app => $self->app);
GetOptionsFromArray \@args,
'b|backlog=i' => sub { $daemon->backlog($_[1]) },
Expand All @@ -40,7 +39,6 @@ sub run {
'r|requests=i' => sub { $daemon->max_requests($_[1]) },
'u|user=s' => sub { $daemon->user($_[1]) };

# Start
$daemon->listen(\@listen) if @listen;
$daemon->run;
}
Expand Down
1 change: 0 additions & 1 deletion lib/Mojolicious/Command/eval.pm
Expand Up @@ -17,7 +17,6 @@ EOF
sub run {
my ($self, @args) = @_;

# Check options
GetOptionsFromArray \@args, 'v|verbose' => \my $verbose;
my $code = shift @args || '';

Expand Down
12 changes: 4 additions & 8 deletions lib/Mojolicious/Command/get.pm
Expand Up @@ -38,7 +38,6 @@ EOF
sub run {
my ($self, @args) = @_;

# Options
GetOptionsFromArray \@args,
'C|charset=s' => \my $charset,
'c|content=s' => \(my $content = ''),
Expand Down Expand Up @@ -66,7 +65,7 @@ sub run {
# Application
else { $ua->app($self->app) }

# Start
# Do the real work with "start" event
my $v = my $buffer = '';
$ua->on(
start => sub {
Expand Down Expand Up @@ -107,15 +106,13 @@ sub run {

# Ignore intermediate content
return if $redirect && $res->is_status_class(300);

# Chunk
$selector ? ($buffer .= pop) : print(pop);
}
);
}
);

# Get
# Perform request
STDOUT->autoflush(1);
my $tx = $ua->start($ua->build_tx($method, $url, \%headers, $content));

Expand Down Expand Up @@ -149,11 +146,11 @@ sub _say {
sub _select {
my ($buffer, $selector, $charset, @args) = @_;

# Find
# Find elements for selector
my $dom = Mojo::DOM->new->charset($charset)->parse($buffer);
my $results = $dom->find($selector);

# Commands
# Process commands
my $finished;
while (defined(my $command = shift @args)) {

Expand All @@ -180,7 +177,6 @@ sub _select {
$finished++;
}

# Render
unless ($finished) { _say($_) for @$results }
}

Expand Down
2 changes: 0 additions & 2 deletions lib/Mojolicious/Command/prefork.pm
Expand Up @@ -45,7 +45,6 @@ EOF
sub run {
my ($self, @args) = @_;

# Check options
my $prefork = Mojo::Server::Prefork->new(app => $self->app);
GetOptionsFromArray \@args,
'A|accepts=i' => sub { $prefork->accepts($_[1]) },
Expand All @@ -67,7 +66,6 @@ sub run {
'u|user=s' => sub { $prefork->user($_[1]) },
'w|workers=i' => sub { $prefork->workers($_[1]) };

# Start
$prefork->listen(\@listen) if @listen;
$prefork->run;
}
Expand Down
9 changes: 2 additions & 7 deletions lib/Mojolicious/Command/routes.pm
Expand Up @@ -15,10 +15,8 @@ EOF
sub run {
my ($self, @args) = @_;

# Check options
GetOptionsFromArray \@args, 'v|verbose' => \my $verbose;

# Walk and draw
my $routes = [];
$self->_walk($_, 0, $routes) for @{$self->app->routes->children};
$self->_draw($routes, $verbose);
Expand All @@ -27,7 +25,7 @@ sub run {
sub _draw {
my ($self, $routes, $verbose) = @_;

# Length
# Calculate length
my @length = (0, 0, 0);
for my $node (@$routes) {

Expand All @@ -46,7 +44,7 @@ sub _draw {
$length[2] = $len if $len > $length[2];
}

# Draw
# Draw all routes
for my $node (@$routes) {
my @parts;

Expand Down Expand Up @@ -75,20 +73,17 @@ sub _draw {
$format .= '?' if $format && $optional;
push @parts, $format ? "$regex$format" : $regex if $verbose;

# Route
say join(' ', @parts);
}
}

sub _walk {
my ($self, $node, $depth, $routes) = @_;

# Pattern
my $prefix = '';
if (my $i = $depth * 2) { $prefix .= ' ' x $i . '+' }
push @$routes, [$prefix . ($node->pattern->pattern || '/'), $node];

# Walk
$depth++;
$self->_walk($_, $depth, $routes) for @{$node->children};
$depth--;
Expand Down
1 change: 0 additions & 1 deletion lib/Mojolicious/Command/test.pm
Expand Up @@ -18,7 +18,6 @@ EOF
sub run {
my ($self, @args) = @_;

# Check options
GetOptionsFromArray \@args, 'v|verbose' => sub { $ENV{HARNESS_VERBOSE} = 1 };

# Search tests
Expand Down
1 change: 0 additions & 1 deletion lib/Mojolicious/Routes.pm
Expand Up @@ -222,7 +222,6 @@ sub _method {
sub _walk {
my ($self, $c) = @_;

# Walk stack
my $stack = $c->match->stack;
my $stash = $c->stash;
my $staging = @$stack;
Expand Down

0 comments on commit 38fd46d

Please sign in to comment.