locator 0.0.2 → 0.0.3

data/lib/locator/dom/nokogiri/element.rb

@@ -13,6 +13,10 @@ module Locator
           to_s.length <=> other.to_s.length
         end
 
+        def name
+          @element.name
+        end
+
         def xpath
           element.path.to_s
         end
@@ -20,7 +24,7 @@ module Locator
         def css_path
           element.css_path.to_s
         end
-        
+
         def content
           element.content
         end
@@ -49,8 +53,16 @@ module Locator
           names.map { |name| attribute(name) }
         end
 
-        def elements_by_xpath(xpath)
-          element.xpath(xpath).map { |element| Element.new(element) }
+        def element_by_id(id)
+          elements_by_xpath("//*[@id='#{id}']").first
+        end
+
+        def elements_by_css(*rules)
+          element.css(*rules).map { |element| Element.new(element) }
+        end
+
+        def elements_by_xpath(*xpaths)
+          element.xpath(*xpaths).map { |element| Element.new(element) }
         end
       end
     end

data/lib/locator/dom/nokogiri/page.rb

@@ -1,27 +1,13 @@
 module Locator
   module Dom
     module Nokogiri
-      class Page
-        attr_reader :dom
-
+      class Page < Element
         def initialize(html)
-          @dom = ::Nokogiri::HTML::Document.parse(html)
+          super(::Nokogiri::HTML::Document.parse(html))
         end
-
-        def element_by_id(id)
-          elements_by_xpath("//*[@id='#{id}']").first
-        end
-
-        def elements_by_css(*rules)
-          @dom.css(*rules).map { |element| Element.new(element) }
-        end
-
-        def elements_by_xpath(*xpaths)
-          @dom.xpath(*xpaths).map { |element| Element.new(element) }
-        end
-
-        def to_s
-          @dom.to_s
+        
+        def dom
+          element
         end
       end
     end

data/lib/locator/element/area.rb

@@ -2,7 +2,7 @@ module Locator
   class Element
     class Area < Element
       def initialize
-        super('area', :equals => [:id], :matches => [:alt])
+        super(:area, :equals => [:id], :matches => [:alt])
       end
     end
   end

data/lib/locator/element/button.rb

@@ -2,8 +2,8 @@ module Locator
   class Element
     class Button < ElementsList
       def initialize
-        input  = Element.new('input', { :equals => [:id, :name], :matches => [:value] }, :type => %w(submit button image))
-        button = Element.new('button', :equals => [:id, :name], :matches => [:content])
+        input  = Element.new(:input, { :equals => [:id, :name], :matches => [:value] }, :type => %w(submit button image))
+        button = Element.new(:button, :equals => [:id, :name], :matches => [:content])
         super(input, button)
       end
     end

data/lib/locator/element/file.rb

@@ -2,7 +2,7 @@ module Locator
   class Element
     class File < Input
       def initialize
-        super('input', :type => :file)
+        super(:input, :type => :file)
       end
     end
   end

data/lib/locator/element/form.rb

@@ -2,7 +2,7 @@ module Locator
   class Element
     class Form < Element
       def initialize
-        super('form', :equals => [:id, :name])
+        super(:form, :equals => [:id, :name])
       end
     end
   end

data/lib/locator/element/input.rb

@@ -4,7 +4,7 @@ module Locator
       def initialize(attributes = {})
         attributes = { :type => [:text, :password , :email, :url, :search, :tel, :color] }.merge(attributes)
         matchables = { :equals => [:id, :name] }
-        super('input', { :equals => [:id, :name] }, attributes)
+        super(:input, { :equals => [:id, :name] }, attributes)
       end
     end
   end

data/lib/locator/element/label.rb

@@ -2,7 +2,7 @@ module Locator
   class Element
     class Label < Element
       def initialize
-        super('label', :equals => [:id, :content])
+        super(:label, :equals => [:id, :content])
       end
     end
   end

data/lib/locator/element/link.rb

@@ -2,7 +2,7 @@ module Locator
   class Element
     class Link < Element
       def initialize
-        super('a', nil, :href => true)
+        super(:a, nil, :href => true)
       end
     end
   end

data/lib/locator/element/select.rb

@@ -2,7 +2,7 @@ module Locator
   class Element
     class Select < FormElement
       def initialize
-        super('select', :equals => [:id, :name])
+        super(:select, :equals => [:id, :name])
       end
     end
   end

data/lib/locator/element/select_option.rb

@@ -2,7 +2,7 @@ module Locator
   class Element
     class SelectOption < Element
       def initialize
-        super('option', :equals => [:id, :value, :content])
+        super(:option, :equals => [:id, :value, :content])
       end
     end
   end

data/lib/locator/element/text_area.rb

@@ -2,7 +2,7 @@ module Locator
   class Element
     class TextArea < FormElement
       def initialize
-        super('textarea', :equals => [:id, :name])
+        super(:textarea, :equals => [:id, :name])
       end
     end
   end

data/lib/locator/element.rb

@@ -18,10 +18,10 @@ module Locator
     autoload :SelectOption,   'locator/element/select_option'
     autoload :TextArea,       'locator/element/text_area'
 
-    attr_reader :name, :locatables, :attributes
+    attr_reader :name, :css, :locatables, :attributes
 
     def initialize(name = nil, locatables = nil, attributes = nil)
-      @name = name || '*'
+      @name = name
       @locatables = { :equals => :id, :matches => :content }.merge(locatables || {})
       @attributes = attributes || {}
     end
@@ -30,22 +30,23 @@ module Locator
       all(*args).first
     end
 
-    def all(dom, *args)
+    def all(scope, *args)
       attributes, selector = args.last.is_a?(Hash) ? args.pop : {}, args.pop
-      result = lookup(dom, selector, attributes)
+      result = lookup(scope, selector, attributes)
       result.sort! if selector
       result
     end
 
     def xpath(attributes = {})
-      Xpath.new(name, self.attributes.merge(attributes)).to_s
+      @xpath ||= Xpath.new(name || '*', self.attributes.merge(attributes)).to_s
     end
 
     protected
 
-      def lookup(dom, selector, attributes = {})
-        dom = dom.respond_to?(:elements_by_xpath) ? dom : Locator::Dom.page(dom)
-        elements = dom.elements_by_xpath(xpath(attributes))
+      def lookup(scope, selector, attributes = {})
+        scope = scope.respond_to?(:elements_by_xpath) ? scope : Locator::Dom.page(scope)
+        xpath, css = attributes.delete(:xpath), attributes.delete(:css)
+        elements = css ? scope.elements_by_css(css) : scope.elements_by_xpath(xpath || xpath(attributes))
         Result.new(elements).filter!(selector, locatables)
       end
   end

data/lib/locator/version.rb

@@ -1,3 +1,3 @@
 module Locator
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/locator/xpath.rb

@@ -2,8 +2,14 @@ module Locator
   Boolean::Or.operator, Boolean::And.operator = ' | ', ''
 
   class Xpath < Array
+    class << self
+      def xpath?(string)
+        string =~ %r(^\.?//)
+      end
+    end
+    
     def initialize(name = nil, attributes = {})
-      super(Array(name || '*').map { |name| xpath?(name) ? name : ".//#{name}" })
+      super(Array(name || '*').map { |name| self.class.xpath?(name) ? name : ".//#{name}" })
 
       attributes.each do |name, value|
         case name
@@ -47,11 +53,7 @@ module Locator
     protected
 
       def quote(value)
-        xpath?(value) ? value : "\"#{value}\""
-      end
-
-      def xpath?(string)
-        string =~ %r(^\.?//)
+        self.class.xpath?(value) ? value : "\"#{value}\""
       end
   end
 end

data/test/locator/element_test.rb

@@ -2,56 +2,56 @@ require File.expand_path('../../test_helper', __FILE__)
 
 class LocatorElementTest < Test::Unit::TestCase
   include Locator
-  
+
   # xpath
-  
+
   test "xpath without further arguments given" do
     assert_equal './/*', Element.new.xpath
   end
-  
+
   test "xpath with a node name" do
     xpath = Element.new(:div).xpath
     assert_equal './/div', xpath
   end
-  
+
   test "xpath with attributes" do
     xpath = Element.new(nil, nil, :type => 'type', :class => 'class').xpath
     assert_equal ".//*[@type=\"type\"][contains(concat(' ', @class, ' '), concat(' ', \"class\", ' '))]", xpath
   end
-  
+
   test "xpath with node name and attributes" do
     xpath = Element.new(:div, nil, :type => 'type', :class => 'class').xpath
     assert_equal ".//div[@type=\"type\"][contains(concat(' ', @class, ' '), concat(' ', \"class\", ' '))]", xpath
   end
-  
+
   # all
-  
+
   test "all selects all elements when given no attributes" do
     html = '<a class="foo"></a><p class="bar"></p>'
     elements = Element.new.all(html)
     assert_equal %w(html body a p), elements.map { |element| element.tag_name }
   end
-  
+
   test "all selects all nodes with given node name" do
     html = '<a class="foo"></a><p class="bar"></p>'
     elements = Element.new('a').all(html)
     assert_equal %w(a), elements.map { |element| element.tag_name }
   end
-  
+
   test "all selects all nodes with attribute given to initialize" do
     html = '<a class="foo"></a><p class="bar"></p>'
     elements = Element.new(nil, nil, :class => 'foo').all(html)
     assert_equal %w(a), elements.map { |element| element.tag_name }
   end
-  
+
   test "all selects all nodes with attribute given to all" do
     html = '<a class="foo"></a><p class="bar"></p>'
     elements = Element.new.all(html, :class => 'foo')
     assert_equal %w(a), elements.map { |element| element.tag_name }
   end
-  
+
   # locate
-  
+
   test "locate selects an element based on the length of the matching value" do
     html = %(
       <a href="#">the link with extra text</a>
@@ -60,7 +60,7 @@ class LocatorElementTest < Test::Unit::TestCase
     element = Element.new.locate(html, 'the link')
     assert_equal 'the link ...', element.content
   end
-  
+
   test "locate selects an element containing whitespace" do
     html = %(
       <a href="#">
@@ -70,29 +70,39 @@ class LocatorElementTest < Test::Unit::TestCase
     )
     assert Element.new.locate(html, 'the link')
   end
-  
+
   test "locate selects an element containing extra tags" do
     html = '<a href="#">the <span>link</span></a>'
     assert Element.new.locate(html, 'the link')
   end
-  
+
   test "locate selects an element containing extra text (1)" do
     html = '<a href="#">the link &raquo;</label>'
     assert Element.new.locate(html, 'the link')
   end
-  
+
   test "locate selects an element containing extra text (2)" do
     html = '<a href="#">(the link)</label>'
     assert Element.new.locate(html, 'the link')
   end
-  
+
   test "does not find a link when id does not match" do
     html = '<a href="" id="bar"></a>'
     assert_nil Element.new.locate(html, :id => 'foo')
   end
-  
+
   test "does not find a link when class does not match" do
     html = '<a href="" class="bar"></a>'
     assert_nil Element.new.locate(html, :class => 'foo')
   end
+
+  test "locate using an xpath" do
+    html = '<a class="foo" href="#"></a><a class="bar" href="#"></a>'
+    assert_equal 'bar', Element::Link.new.locate(html, :xpath => '//a[@class="bar"]').attribute('class')
+  end
+
+  test "locate using a css selector" do
+    html = '<a class="foo" href="#"></a><a class="bar" href="#"></a>'
+    assert_equal 'bar', Element::Link.new.locate(html, :css => '.bar').attribute('class')
+  end
 end

data/test/locator_test.rb

@@ -18,12 +18,20 @@ class LocatorTest < Test::Unit::TestCase
     assert_equal './/form[@id="bar"]', xpath
   end
 
-  test "locates an element from html" do
-    html = '<html><body><p></p><form class="bar"></form></body></html>'
+  # locate
+
+  test "locates an element by node name" do
+    html = '<html><body><form></form></body></html>'
     element = Locator.locate(html, :form)
     assert_equal 'form', element.tag_name
   end
 
+  test "locates an element by xpath" do
+    html = '<html><body><form></form></body></html>'
+    element = Locator.locate(html, :xpath => '//form')
+    assert_equal 'form', element.tag_name
+  end
+
   # within
 
   test "within scopes to a locator" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: locator
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 +01:00
+date: 2010-02-13 00:00:00 +01:00
 default_executable: 
 dependencies: []