xpath 0.1.2 → 0.1.3

data/README.rdoc

@@ -1,6 +1,7 @@
 = XPath
 
-XPath is a Ruby DSL around a subset of XPath 1.0. It's primary purpose is to facilitate writing complex XPath queries from Ruby code.
+XPath is a Ruby DSL around a subset of XPath 1.0. It's primary purpose is to
+facilitate writing complex XPath queries from Ruby code.
 
 == Generating expressions
 
@@ -8,7 +9,8 @@ To create quick, one of expressions, XPath.generate can be used:
 
     XPath.generate { |x| x.descendant(:ul)[x.attr(:id) == 'foo'] }
 
-However for more complex expressions, it is probably ore convenient to include the XPath module into your own class or module:
+However for more complex expressions, it is probably ore convenient to include
+the XPath module into your own class or module:
 
     module MyXPaths
       include XPath
@@ -22,8 +24,33 @@ However for more complex expressions, it is probably ore convenient to include t
       end
     end
 
-Both ways return an XPath::Expression instance, which can be further modified. To convert the expression to a string, just call #to_s on it.
+Both ways return an XPath::Expression instance, which can be further modified.
+To convert the expression to a string, just call #to_s on it.
 
 == HTML
 
 XPath comes with a set of premade XPaths for use with HTML documents.
+
+== License
+
+(The MIT License)
+
+Copyright © 2010 Jonas Nicklas
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the ‘Software’), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/lib/xpath/expression.rb

@@ -126,14 +126,15 @@ module XPath
       end
 
       def to_xpath(predicate=nil)
-        @expression = @expression.to_xpath(predicate) unless @expression.is_a?(String)
-        if @expression.include?("'")
-          @expression = @expression.split("'", -1).map do |substr|
+        string = @expression
+        string = @expression.to_xpath(predicate) unless @expression.is_a?(String)
+        if string.include?("'")
+          string = string.split("'", -1).map do |substr|
             "'#{substr}'"
           end.join(%q{,"'",})
-          "concat(#{@expression})"
+          "concat(#{string})"
         else
-          "'#{@expression}'"
+          "'#{string}'"
         end
       end
     end

data/lib/xpath/html.rb

@@ -3,8 +3,9 @@ module XPath
     include XPath
     extend self
 
-    def link(locator)
-      link = descendant(:a)[attr(:href)]
+    def link(locator, options={})
+      href = options[:href]
+      link = descendant(:a)[href ? attr(:href).equals(href) : attr(:href)]
       link[attr(:id).equals(locator) | string.n.is(locator) | attr(:title).is(locator) | descendant(:img)[attr(:alt).is(locator)]]
     end
 
@@ -23,7 +24,7 @@ module XPath
     end
 
     def fieldset(locator)
-      descendant(:fieldset)[attr(:id).equals(locator) | descendant(:legend)[text.is(locator)]]
+      descendant(:fieldset)[attr(:id).equals(locator) | descendant(:legend)[string.n.is(locator)]]
     end
 
     def field(locator, options={})
@@ -46,11 +47,11 @@ module XPath
       xpath = locate_field(descendant(:select), locator)
 
       options[:options].each do |option|
-        xpath = xpath[descendant(:option).text.equals(option)]
+        xpath = xpath[descendant(:option).equals(option)]
       end if options[:options]
 
       [options[:selected]].flatten.each do |option|
-        xpath = xpath[descendant(:option)[attr(:selected)].text.equals(option)]
+        xpath = xpath[descendant(:option)[attr(:selected)].equals(option)]
       end if options[:selected]
 
       xpath
@@ -68,8 +69,12 @@ module XPath
       locate_field(descendant(:input)[attr(:type).equals('file')], locator)
     end
 
+    def optgroup(name)
+      descendant(:optgroup)[attr(:label).is(name)]
+    end
+
     def option(name)
-      descendant(:option)[text.n.is(name)]
+      descendant(:option)[string.n.is(name)]
     end
 
     def table(locator, options={})
@@ -87,9 +92,9 @@ module XPath
     end
 
     def table_row(cells)
-      cell_conditions = child(:td, :th)[text.equals(cells.first)]
+      cell_conditions = child(:td, :th)[string.n.equals(cells.first)]
       cells.drop(1).each do |cell|
-        cell_conditions = cell_conditions.next_sibling(:td, :th)[text.equals(cell)]
+        cell_conditions = cell_conditions.next_sibling(:td, :th)[string.n.equals(cell)]
       end
       cell_conditions
     end
@@ -97,12 +102,12 @@ module XPath
   protected
 
     def locate_field(xpath, locator)
-      locate_field = xpath[attr(:id).equals(locator) | attr(:name).equals(locator) | attr(:id).equals(anywhere(:label)[text.is(locator)].attr(:for))]
-      locate_field += descendant(:label)[text.is(locator)].descendant(xpath)
+      locate_field = xpath[attr(:id).equals(locator) | attr(:name).equals(locator) | attr(:id).equals(anywhere(:label)[string.n.is(locator)].attr(:for))]
+      locate_field += descendant(:label)[string.n.is(locator)].descendant(xpath)
     end
 
     def field_value(value)
-      (text.is(value) & tag(:textarea)) | (attr(:value).equals(value) & ~tag(:textarea))
+      (string.n.is(value) & tag(:textarea)) | (attr(:value).equals(value) & ~tag(:textarea))
     end
 
   end

data/lib/xpath/version.rb

@@ -1,3 +1,3 @@
 module XPath
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/fixtures/form.html

@@ -9,6 +9,7 @@
   <a title="This title" data="link-exact" href="#foo">A link</a>
   <a href="#bar" data="link-img-fuzzy"><img src="foo.png" alt="An image that is beautiful"/></a>
   <a href="#foo" data="link-img-exact"><img src="foo.ong" alt="An image"/></a>
+  <a href="http://www.example.com" data="link-href">Href-ed link</a>
   <a>Wrong Link</a>
   <a href="#spacey" data="link-whitespace">    My
 
@@ -54,15 +55,32 @@
   </button>
 
   <input type="schmoo" value="schmoo button" data="schmoo"/>
+  <label for="text-with-id">Label text <input type="text" id="text-with-id" data="id-text" value="monkey"/></label>
+  <label for="problem-text-with-id">Label text's got an apostrophe <input type="text" id="problem-text-with-id" data="id-problem-text" value="monkey"/></label>
 </p>
 
 <p>
   <fieldset id="some-fieldset-id" data="fieldset-id"></fieldset>
   <fieldset data="fieldset-legend"><legend>Some Legend</legend></fieldset>
+  <fieldset data="fieldset-legend-span"><legend><span>Span Legend</span></legend></fieldset>
   <fieldset data="fieldset-fuzzy"><legend>Long legend yo</legend></fieldset>
   <fieldset data="fieldset-exact"><legend>Long legend</legend></fieldset>
 </p>
 
 <p>
+  <select>
+    <optgroup label="Group A" data="optgroup-a"></optgroup>
+    <optgroup label="Group B" data="optgroup-b"></optgroup>
+  </select>
+</p>
 
+<p>
+  <table id="whitespaced-table" data="table-with-whitespace">
+    <tr>
+      <td data="cell-whitespaced">I have
+        <span>nested whitespace</span>
+      </td>
+      <td>I don't</td>
+    </tr>
+  </table>
 </p>

data/spec/fixtures/simple.html

@@ -27,6 +27,6 @@ A     lot
 
 <div id="moar">
   <p id="impchay">chimp</p>
-  <p id="amingoflay">flamingo</p>
   <div id="elephantay">elephant</div>
+  <p id="amingoflay">flamingo</p>
 </div>

data/spec/html_spec.rb

@@ -33,6 +33,8 @@ describe XPath::HTML do
     it("finds links by image's approximate alt attribute") { get('Alt').should == 'link-img' }
     it("prefers exact matches of image's alt attribute")   { all('An image').should == ['link-img-exact', 'link-img-fuzzy'] }
     it("does not find links without href attriutes")       { get('Wrong Link').should be_nil }
+    it("finds links with an href")                         { get("Href-ed link", :href => 'http://www.example.com').should == 'link-href' }
+    it("does not find links with an incorrect href")       { get("Href-ed link", :href => 'http://www.somewhere.com').should be_nil }
   end
 
   describe '#button' do
@@ -81,10 +83,11 @@ describe XPath::HTML do
   describe '#fieldset' do
     subject { :fieldset }
 
-    it("finds fieldsets by id")       { get('some-fieldset-id').should == 'fieldset-id' }
-    it("finds fieldsets by legend")   { get('Some Legend').should == 'fieldset-legend' }
-    it("accepts approximate legends") { get('Legend').should == 'fieldset-legend' }
-    it("prefers exact legend")        { all('Long legend').should == ['fieldset-exact', 'fieldset-fuzzy'] }
+    it("finds fieldsets by id")                  { get('some-fieldset-id').should == 'fieldset-id' }
+    it("finds fieldsets by legend")              { get('Some Legend').should == 'fieldset-legend' }
+    it("finds fieldsets by legend child tags")   { get('Span Legend').should == 'fieldset-legend-span' }
+    it("accepts approximate legends")            { get('Legend').should == 'fieldset-legend' }
+    it("prefers exact legend")                   { all('Long legend').should == ['fieldset-exact', 'fieldset-fuzzy'] }
   end
 
   describe '#field' do
@@ -124,14 +127,15 @@ describe XPath::HTML do
     end
 
     context "by parent label" do
-      it("finds inputs with text type")     {}
-      it("finds inputs with password type") {}
-      it("finds inputs with custom type")   {}
-      it("finds textareas")                 {}
-      it("finds select boxes")              {}
-      it("does not find submit buttons")    {}
-      it("does not find image buttons")     {}
-      it("does not find hidden fields")     {}
+      it("finds inputs with text type")                    { get('Label text').should == 'id-text' }
+      it("finds inputs where label has problem chars")     { get("Label text's got an apostrophe").should == 'id-problem-text' }
+      it("finds inputs with password type")                {}
+      it("finds inputs with custom type")                  {}
+      it("finds textareas")                                {}
+      it("finds select boxes")                             {}
+      it("does not find submit buttons")                   {}
+      it("does not find image buttons")                    {}
+      it("does not find hidden fields")                    {}
     end
 
     context "with :with option" do
@@ -158,6 +162,23 @@ describe XPath::HTML do
   end
 
   describe '#fillable_field' do
+    subject{ :fillable_field }
+    context "by parent label" do
+      it("finds inputs with text type")                    { get('Label text').should == 'id-text' }
+      it("finds inputs where label has problem chars")     { get("Label text's got an apostrophe").should == 'id-problem-text' }
+    end
+
+  end
+
+  describe "#optgroup" do
+    subject { :optgroup }
+
+    it("finds optgroups by label") { get('Group A').should == 'optgroup-a' }
+  end
+
+  describe "#table" do
+    subject {:table}
 
+    it("finds cell content regardless of whitespace") {get('whitespaced-table', :rows => [["I have nested whitespace", "I don't"]]).should == 'table-with-whitespace'}
   end
 end

data/spec/xpath_spec.rb

@@ -265,11 +265,17 @@ describe XPath do
       @results[1].text.should == 'flamingo'
     end
 
+    it "should be composable" do
+      @results = xpath { |x| x.css('#moar').descendant(:p) }
+      @results[0].text.should == 'chimp'
+      @results[1].text.should == 'flamingo'
+    end
+
     it "should allow comma separated selectors" do
       @results = xpath { |x| x.descendant[x.attr(:id) == 'moar'].css('div, p') }
       @results[0].text.should == 'chimp'
-      @results[1].text.should == 'flamingo'
-      @results[2].text.should == 'elephant'
+      @results[1].text.should == 'elephant'
+      @results[2].text.should == 'flamingo'
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 +02:00
+date: 2011-01-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency