xpath 0.1.3 → 0.1.4

data/lib/xpath/html.rb

@@ -14,8 +14,8 @@ module XPath
     end
 
     def button(locator)
-      button = descendant(:input)[attr(:type).one_of('submit', 'image', 'button')][attr(:id).equals(locator) | attr(:value).is(locator)]
-      button += descendant(:button)[attr(:id).equals(locator) | attr(:value).is(locator) | string.n.is(locator)]
+      button = descendant(:input)[attr(:type).one_of('submit', 'image', 'button')][attr(:id).equals(locator) | attr(:value).is(locator) | attr(:title).is(locator)]
+      button += descendant(:button)[attr(:id).equals(locator) | attr(:value).is(locator) | string.n.is(locator) | attr(:title).is(locator)]
       button += descendant(:input)[attr(:type).equals('image')][attr(:alt).is(locator)]
     end
 

data/lib/xpath/union.rb

@@ -12,6 +12,10 @@ module XPath
       expressions.each(&block)
     end
 
+    def to_s
+      to_xpaths.join(' | ')
+    end
+
     def to_xpath(predicate=nil)
       expressions.map { |e| e.to_xpath(predicate) }.join(' | ')
     end

data/lib/xpath/version.rb

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

data/spec/fixtures/form.html

@@ -25,17 +25,26 @@
   <input type="submit" value="submit-with-value" data="value-submit"/>
   <input type="submit" value="not exact value submit" data="not-exact-value-submit"/>
   <input type="submit" value="exact value submit" data="exact-value-submit"/>
+  <input type="submit" title="My submit title" value="submit-with-title" data="title-submit">
+  <input type="submit" title="Exact submit title" value="exact title submit" data="exact-title-submit">
+  <input type="submit" title="Not Exact submit title" value="exact title submit" data="not-exact-title-submit">
 
   <input type="button" id="button-with-id" data="id-button" value="Has ID"/>
   <input type="button" value="button-with-value" data="value-button"/>
   <input type="button" value="not exact value button" data="not-exact-value-button"/>
   <input type="button" value="exact value button" data="exact-value-button"/>
+  <input type="button" title="My button title" value="button-with-title" data="title-button">
+  <input type="button" title="Not Exact button title" value="not exact title button" data="not-exact-title-button">
+  <input type="button" title="Exact button title" value="exact title button" data="exact-title-button">
 
   <input type="image" id="imgbut-with-id" data="id-imgbut" value="Has ID"/>
   <input type="image" value="imgbut-with-value" data="value-imgbut"/>
   <input type="image" alt="imgbut-with-alt" data="alt-imgbut"/>
   <input type="image" value="not exact value imgbut" data="not-exact-value-imgbut"/>
   <input type="image" value="exact value imgbut" data="exact-value-imgbut"/>
+  <input type="image" title="My imgbut title" value="imgbut-with-title" data="title-imgbut">
+  <input type="image" title="Not Exact imgbut title" value="not exact title imgbut" data="not-exact-title-imgbut">
+  <input type="image" title="Exact imgbut title" value="exact title imgbut" data="exact-title-imgbut">
 
   <button id="btag-with-id" data="id-btag" value="Has ID"/>
   <button value="btag-with-value" data="value-btag"/>
@@ -45,6 +54,9 @@
   <button data="text-btag">btag-with-text</button>
   <button data="not-exact-text-btag">not exact text btag</button>
   <button data="exact-text-btag">exact text btag</button>
+  <button title="My btag title" data="title-btag">btag-with-title</button>
+  <button title="Not Exact btag title" data="not-exact-title-btag">not exact title btag</button>
+  <button title="Exact btag title" data="exact-title-btag">exact title btag</button>
 
   <button data="btag-with-whitespace">    My
 
@@ -84,3 +96,51 @@
     </tr>
   </table>
 </p>
+
+<p>
+  <h2>Fields</h2>
+
+  <h4>With id</h4>
+  <input id="input-with-id" value="correct-value" data="input-with-id-data"/>
+  <input type="text" id="input-text-with-id" data="input-text-with-id-data"/>
+  <input type="password" id="input-password-with-id" data="input-password-with-id-data"/>
+  <input type="custom" id="input-custom-with-id" data="input-custom-with-id-data"/>
+  <textarea id="textarea-with-id" data="textarea-with-id-data">Correct value</textarea>
+  <select id="select-with-id" data="select-with-id-data"></select>
+  <input type="submit" id="input-submit-with-id" data="input-submit-with-id-data"/>
+  <input type="image" id="input-image-with-id" data="input-image-with-id-data"/>
+  <input type="hidden" id="input-hidden-with-id" data="input-hidden-with-id-data"/>
+
+  <h4>With name</h4>
+  <input name="input-with-name" data="input-with-name-data"/>
+  <input type="text" name="input-text-with-name" data="input-text-with-name-data"/>
+  <input type="password" name="input-password-with-name" data="input-password-with-name-data"/>
+  <input type="custom" name="input-custom-with-name" data="input-custom-with-name-data"/>
+  <textarea name="textarea-with-name" data="textarea-with-name-data"></textarea>
+  <select name="select-with-name" data="select-with-name-data"></select>
+  <input type="submit" name="input-submit-with-name" data="input-submit-with-name-data"/>
+  <input type="image" name="input-image-with-name" data="input-image-with-name-data"/>
+  <input type="hidden" name="input-hidden-with-name" data="input-hidden-with-name-data"/>
+
+  <h4>With referenced label</h4>
+  <label for="input-with-label">Input with label</label><input id="input-with-label" data="input-with-label-data"/>
+  <label for="input-text-with-label">Input text with label</label><input type="text" id="input-text-with-label" data="input-text-with-label-data"/>
+  <label for="input-password-with-label">Input password with label</label><input type="password" id="input-password-with-label" data="input-password-with-label-data"/>
+  <label for="input-custom-with-label">Input custom with label</label><input type="custom" id="input-custom-with-label" data="input-custom-with-label-data"/>
+  <label for="textarea-with-label">Textarea with label</label><textarea id="textarea-with-label" data="textarea-with-label-data"></textarea>
+  <label for="select-with-label">Select with label</label><select id="select-with-label" data="select-with-label-data"></select>
+  <label for="input-submit-with-label">Input submit with label</label><input type="submit" id="input-submit-with-label" data="input-submit-with-label-data"/>
+  <label for="input-image-with-label">Input image with label</label><input type="image" id="input-image-with-label" data="input-image-with-label-data"/>
+  <label for="input-hidden-with-label">Input hidden with label</label><input type="hidden" id="input-hidden-with-label" data="input-hidden-with-label-data"/>
+
+  <h4>With parent label</h4>
+  <label>Input with parent label<input data="input-with-parent-label-data"/></label>
+  <label>Input text with parent label<input type="text" data="input-text-with-parent-label-data"/></label>
+  <label>Input password with parent label<input type="password" data="input-password-with-parent-label-data"/></label>
+  <label>Input custom with parent label<input type="custom" data="input-custom-with-parent-label-data"/></label>
+  <label>Textarea with parent label<textarea data="textarea-with-parent-label-data"></textarea></label>
+  <label>Select with parent label<select data="select-with-parent-label-data"></select></label>
+  <label>Input submit with parent label<input type="submit" data="input-submit-with-parent-label-data"/></label>
+  <label>Input image with parent label<input type="image" data="input-image-with-parent-label-data"/></label>
+  <label>Input hidden with parent label<input type="hidden" data="input-hidden-with-parent-label-data"/></label>
+</p>

data/spec/html_spec.rb

@@ -45,6 +45,9 @@ describe XPath::HTML do
       it("finds buttons by value")             { get('submit-with-value').should == 'value-submit' }
       it("finds buttons by approximate value") { get('mit-with-val').should == 'value-submit' }
       it("prefers buttons with exact value")   { all('exact value submit').should == ['exact-value-submit', 'not-exact-value-submit'] }
+      it("finds buttons by title")             { get('My submit title').should == 'title-submit' }
+      it("finds buttons by approximate title") { get('submit title').should == 'title-submit' }
+      it("prefers exact matches of title")     { all('Exact submit title').should == ['exact-title-submit', 'not-exact-title-submit'] }
     end
 
     context "with button type" do
@@ -52,6 +55,9 @@ describe XPath::HTML do
       it("finds buttons by value")             { get('button-with-value').should == 'value-button' }
       it("finds buttons by approximate value") { get('ton-with-val').should == 'value-button' }
       it("prefers buttons with exact value")   { all('exact value button').should == ['exact-value-button', 'not-exact-value-button'] }
+      it("finds buttons by title")             { get('My button title').should == 'title-button' }
+      it("finds buttons by approximate title") { get('button title').should == 'title-button' }
+      it("prefers exact matches of title")     { all('Exact button title').should == ['exact-title-button', 'not-exact-title-button'] }
     end
 
     context "with image type" do
@@ -60,6 +66,9 @@ describe XPath::HTML do
       it("finds buttons by approximate value") { get('gbut-with-val').should == 'value-imgbut' }
       it("finds buttons by alt attribute")     { get('imgbut-with-alt').should == 'alt-imgbut' }
       it("prefers buttons with exact value")   { all('exact value imgbut').should == ['exact-value-imgbut', 'not-exact-value-imgbut'] }
+      it("finds buttons by title")             { get('My imgbut title').should == 'title-imgbut' }
+      it("finds buttons by approximate title") { get('imgbut title').should == 'title-imgbut' }
+      it("prefers exact matches of title")     { all('Exact imgbut title').should == ['exact-title-imgbut', 'not-exact-title-imgbut'] }
     end
 
     context "with button tag" do
@@ -73,6 +82,9 @@ describe XPath::HTML do
       it("finds buttons with child tags by text")     { get('An emphatic button').should == 'btag-with-children' }
       it("finds buttons by text of their children")   { get('emphatic').should == 'btag-with-children' }
       it("prefers buttons with exact text")           { all('exact text btag').should == ['exact-text-btag', 'not-exact-text-btag'] }
+      it("finds buttons by title")                    { get('My btag title').should == 'title-btag' }
+      it("finds buttons by approximate title")        { get('btag title').should == 'title-btag' }
+      it("prefers exact matches of title")            { all('Exact btag title').should == ['exact-title-btag', 'not-exact-title-btag'] }
     end
 
     context "with unkown type" do
@@ -94,55 +106,58 @@ describe XPath::HTML do
     subject { :field }
 
     context "by id" 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 no type")       { get('input-with-id').should == 'input-with-id-data' }
+      it("finds inputs with text type")     { get('input-text-with-id').should == 'input-text-with-id-data' }
+      it("finds inputs with password type") { get('input-password-with-id').should == 'input-password-with-id-data' }
+      it("finds inputs with custom type")   { get('input-custom-with-id').should == 'input-custom-with-id-data' }
+      it("finds textareas")                 { get('textarea-with-id').should == 'textarea-with-id-data' }
+      it("finds select boxes")              { get('select-with-id').should == 'select-with-id-data' }
+      it("does not find submit buttons")    { get('input-submit-with-id').should be_nil }
+      it("does not find image buttons")     { get('input-image-with-id').should be_nil }
+      it("does not find hidden fields")     { get('input-hidden-with-id').should be_nil }
     end
 
     context "by name" 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 no type")       { get('input-with-name').should == 'input-with-name-data' }
+      it("finds inputs with text type")     { get('input-text-with-name').should == 'input-text-with-name-data' }
+      it("finds inputs with password type") { get('input-password-with-name').should == 'input-password-with-name-data' }
+      it("finds inputs with custom type")   { get('input-custom-with-name').should == 'input-custom-with-name-data' }
+      it("finds textareas")                 { get('textarea-with-name').should == 'textarea-with-name-data' }
+      it("finds select boxes")              { get('select-with-name').should == 'select-with-name-data' }
+      it("does not find submit buttons")    { get('input-submit-with-name').should be_nil }
+      it("does not find image buttons")     { get('input-image-with-name').should be_nil }
+      it("does not find hidden fields")     { get('input-hidden-with-name').should be_nil }
     end
 
     context "by referenced 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 no type")       { get('Input with label').should == 'input-with-label-data' }
+      it("finds inputs with text type")     { get('Input text with label').should == 'input-text-with-label-data' }
+      it("finds inputs with password type") { get('Input password with label').should == 'input-password-with-label-data' }
+      it("finds inputs with custom type")   { get('Input custom with label').should == 'input-custom-with-label-data' }
+      it("finds textareas")                 { get('Textarea with label').should == 'textarea-with-label-data' }
+      it("finds select boxes")              { get('Select with label').should == 'select-with-label-data' }
+      it("does not find submit buttons")    { get('Input submit with label').should be_nil }
+      it("does not find image buttons")     { get('Input image with label').should be_nil }
+      it("does not find hidden fields")     { get('Input hidden with label').should be_nil }
     end
 
     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' }
-      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 no type")       { get('Input with parent label').should == 'input-with-parent-label-data' }
+      it("finds inputs with text type")     { get('Input text with parent label').should == 'input-text-with-parent-label-data' }
+      it("finds inputs with password type") { get('Input password with parent label').should == 'input-password-with-parent-label-data' }
+      it("finds inputs with custom type")   { get('Input custom with parent label').should == 'input-custom-with-parent-label-data' }
+      it("finds textareas")                 { get('Textarea with parent label').should == 'textarea-with-parent-label-data' }
+      it("finds select boxes")              { get('Select with parent label').should == 'select-with-parent-label-data' }
+      it("does not find submit buttons")    { get('Input submit with parent label').should be_nil }
+      it("does not find image buttons")     { get('Input image with parent label').should be_nil }
+      it("does not find hidden fields")     { get('Input hidden with parent label').should be_nil }
     end
 
     context "with :with option" do
-      it("finds inputs that match option")          {}
-      it("omits inputs that don't match option")    {}
-      it("finds textareas that match option")       {}
-      it("omits textareas that don't match option") {}
+      it("finds inputs that match option")          { get('input-with-id', :with => 'correct-value').should == 'input-with-id-data' }
+      it("omits inputs that don't match option")    { get('input-with-id', :with => 'wrong-value').should be_nil }
+      it("finds textareas that match option")       { get('textarea-with-id', :with => 'Correct value').should == 'textarea-with-id-data' }
+      it("omits textareas that don't match option") { get('textarea-with-id', :with => 'Wrong value').should be_nil }
     end
 
     context "with :checked option" do
@@ -170,6 +185,26 @@ describe XPath::HTML do
 
   end
 
+  describe '#select' do
+
+  end
+
+  describe '#checkbox' do
+
+  end
+
+  describe '#radio_button' do
+
+  end
+
+  describe '#file_field' do
+
+  end
+
+  describe '#option' do
+
+  end
+
   describe "#optgroup" do
     subject { :optgroup }
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-09 00:00:00 +01:00
+date: 2011-04-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,13 +37,12 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 0
+        version: "2.0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency