ruby-query 0.1.0 → 0.1.1

data/README.md

@@ -14,70 +14,59 @@
   Extract an attribute from a webpage:
 
 	  require 'open-uri'
-	  require 'ruby-query'
+	  require 'ruby_query'
 
-	  RQuery::Query.query(open("http://twitter.com"), "a#logo img", "attr", "alt")
+	  RubyQuery::Query.query(open("http://twitter.com"), "a#logo img", "attr", "alt")
 	  => "Twitter"
 
   Extract a form input value :
 
-	  require 'ruby-query'
+	  require 'ruby_query'
 
-	  RQuery::Query.query('<input type="text" value="tj@vision-media.ca"/>', "input", "val")
+	  RubyQuery::Query.query('<input type="text" value="tj@vision-media.ca"/>', "input", "val")
 	  => "tj@vision-media.ca"
 		
 ## Command Line Examples
 
   Twitter logo alt text:
   
-    $ curl http://twitter.com | query 'a#logo img' attr alt
+    $ curl http://twitter.com | rquery 'a#logo img' attr alt
     Twitter
 
   Alternately, since the output is simply more html, we can achieve this same result via pipes:
   
-    $ curl http://twitter.com | query 'a#logo' | query img attr alt
+    $ curl http://twitter.com | rquery 'a#logo' | rquery img attr alt
     Twitter
 
   Check if a class is present:
   
-    $ curl http://twitter.com | query .article '#timeline' hasClass statuses
+    $ curl http://twitter.com | rquery '.article #timeline' hasClass statuses
     true
-    
-    $ echo $?
-    0
-
-  Exit status for bools:
-  
-    $ echo '<div class="foo bar"></div>' | ./index.js div hasClass baz
-    false
-    
-    $ echo $?
-    1
 
   Grab width or height attributes:
   
-    $ echo '<div class="user" width="300"></div>' | query div.user width
+    $ echo '<div class="user" width="300"></div>' | rquery div.user width
     300
 
   Output element text:
   
-    $ echo '<p>very <em>slick</em></p>' | query p text
+    $ echo '<p>very <em>slick</em></p>' | rquery p text
     very slick
 
   Values:
   
-    $ echo '<input type="text" value="tj@vision-media.ca"/>' | query input val
+    $ echo '<input type="text" value="tj@vision-media.ca"/>' | rquery input val
     tj@vision-media.ca
   
   Get second li's text:
   
-    $ echo $list | query ul li get 1 text
-    two
+    $ echo '<ul><li>Apple</li><li>Orange</li><li>Cat</li></ul>' | rquery ul li get 1 text
+    Orange
   
   Get third li's text using `next`:
   
-    $ echo $list | query ul li get 1 next text
-    three
+    $ echo '<ul><li>Apple</li><li>Orange</li><li>Cat</li></ul>' | rquery ul li get 1 next text
+    Cat
 
   Get length:
   

data/lib/ruby_query.rb

@@ -35,7 +35,12 @@ module RubyQuery
       :next_sibling => {:type => 'traverse'},
       :previous_sibling => {:type => 'traverse'},
       :at => {:type => 'traverse', :arity => 1},
-      
+
+      :search => {:type => 'proc',
+        :proc => Proc.new {|context, param, query| 
+          context.css(param) 
+        }
+      },
       :attr => {:type => 'proc', 
         :arity => 1, 
         :proc => Proc.new {|context, param, query| 
@@ -58,21 +63,32 @@ module RubyQuery
     
     ALIAS = {
       :html => :to_html,
-      :len => :length,
+      :len => :size,
+      :length => :size,
       :count => :size,
       :get => :at,
       :"has-class" => :hasClass,
-      :val => :value
+      :val => :value,
+      :next => :next_sibling,
+      :previous => :previous_sibling
     }
 
     def self.query(html, *query)
-      doc = Nokogiri::HTML(html)
-      ctx = doc.search(query.shift)
+      ctx = Nokogiri::HTML(html)
 
       while method = query.shift
-        command = COMMANDS[method.to_sym] || COMMANDS[ALIAS[method.to_sym]] || COMMANDS[:to_html]
-        param = query.length > 0 ? (command[:arity] ? query.shift : nil) : nil
-        ctx = handle_command(ctx, ALIAS[method.to_sym] || method.to_sym, command[:type], param, query)
+        if COMMANDS.keys.include?(method.to_sym) || ALIAS.keys.include?(method.to_sym)
+          command = COMMANDS[method.to_sym] || COMMANDS[ALIAS[method.to_sym]]
+          param = query.length > 0 ? (command[:arity] ? query.shift : nil) : nil
+          ctx = handle_command(ctx, ALIAS[method.to_sym] || method.to_sym, command[:type], param, query)
+
+        elsif
+          command = COMMANDS[:search]
+          ctx = handle_command(ctx, :search, command[:type], method, query)
+
+        end
+        
+        ctx
       end
 
       if ctx.is_a?(Nokogiri::XML::Element) || ctx.is_a?(Nokogiri::XML::NodeSet)
@@ -116,7 +132,7 @@ module RubyQuery
           end
           context[param.to_i]
         else
-          if context.is_a?(Nokogiri::XML::Element) || context.is_a?(Nokogiri::XML::NodeSet)
+          if context.is_a?(Nokogiri::XML::Element) || context.is_a?(Nokogiri::XML::NodeSet) || context.is_a?(Nokogiri::HTML::Document)
             if param
               context.send(name, param)
             else

data/spec/rquery/rquery_spec.rb

@@ -44,11 +44,13 @@ describe RubyQuery do
 
   it "get second li's text" do
     RubyQuery::Query.query(HTML_LIST, "ul li", "get", "1", "text").should == "Orange"
+    RubyQuery::Query.query(HTML_LIST, "ul", "li", "get", "1", "text").should == "Orange"
     RubyQuery::Query.query(HTML_LIST, "ul li", "get", "10", "text").should be_nil
   end
 
   it "get third li's text using next" do
     RubyQuery::Query.query(HTML_LIST, "ul li", "get", "1", "next", "text").should == "Cat"
+    RubyQuery::Query.query(HTML_LIST, "ul", "li", "get", "1", "next", "text").should == "Cat"
   end
 
   it "get length" do
@@ -62,4 +64,8 @@ describe RubyQuery do
     RubyQuery::Query.query(HTML_LIST, "li", "html").should == "<li>Apple</li>\n<li>Orange</li>\n<li>Cat</li>"
   end
 
+  it "should return empty for strange query" do
+    RubyQuery::Query.query(HTML_LIST, "liaa").should be_empty
+    RubyQuery::Query.query(HTML_LIST, "lixaa", "len").should 0
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-query
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Francis Chong