fixed small selector bug in get command

mojolicious · Jul 17, 2014 · 9e9ac56 · 9e9ac56
1 parent fbbafd9
commit 9e9ac56
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,7 @@
 
-5.15  2014-07-16
+5.15  2014-07-17
   - Improved Mojo::DOM::HTML performance slightly.
+  - Fixed small selector bug in get command.
 
 5.14  2014-07-14
   - Improved all_text performance in Mojo::DOM.

diff --git a/lib/Mojolicious/Command/get.pm b/lib/Mojolicious/Command/get.pm
@@ -91,32 +91,30 @@ sub _say { length && say encode('UTF-8', $_) for @_ }
 sub _select {
   my ($buffer, $selector, $charset, @args) = @_;
 
+  # Keep a strong reference to the root
   $buffer = decode($charset, $buffer) // $buffer if $charset;
-  my $results = Mojo::DOM->new($buffer)->find($selector);
+  my $dom     = Mojo::DOM->new($buffer);
+  my $results = $dom->find($selector);
 
   while (defined(my $command = shift @args)) {
 
     # Number
-    ($results = [$results->[$command]])->[0] ? next : return
-      if $command =~ /^\d+$/;
+    ($results = $results->slice($command)) and next if $command =~ /^\d+$/;
 
     # Text
-    return _say(map { $_->text } @$results) if $command eq 'text';
+    return _say($results->text) if $command eq 'text';
 
     # All text
-    return _say(map { $_->all_text } @$results) if $command eq 'all';
+    return _say($results->all_text) if $command eq 'all';
 
     # Attribute
-    if ($command eq 'attr') {
-      return unless my $name = shift @args;
-      return _say(map { $_->attr->{$name} } @$results);
-    }
+    return _say($results->attr($args[0] // '')->each) if $command eq 'attr';
 
     # Unknown
     die qq{Unknown command "$command".\n};
   }
 
-  _say(@$results);
+  _say($results);
 }
 
 1;