capybara-page-object 0.3.0 → 0.5.0

data/lib/element/list_item.rb

@@ -0,0 +1,7 @@
+module CapybaraPageObject
+  class ListItem < CapybaraPageObject::Node
+    def text
+      source.text.strip
+    end
+  end
+end

data/lib/element/meta.rb

@@ -1,16 +1,11 @@
 module CapybaraPageObject
   class Meta < CapybaraPageObject::Node
-    
-    def element_names
-      ['meta']
-    end
-    
     def key
-      root_node[:name]
+      source[:name]
     end
     
     def value
-      root_node[:content]
+      source[:content]
     end
   end
 end

data/lib/element/select.rb

@@ -1,16 +1,4 @@
 module CapybaraPageObject
-  class Select < CapybaraPageObject::Node
-    
-    def element_names
-      ['select']
-    end
-    
-    def key
-      root_node[:name]
-    end
-    
-    def value
-      root_node.value
-    end
+  class Select < CapybaraPageObject::FormField
   end
 end

data/lib/element/table.rb

@@ -1,11 +1,18 @@
 module CapybaraPageObject
   class Table < CapybaraPageObject::Node
-    def rows(attr={})
-      extract('tr', attr)
+    def rows
+      all('tr').each_with_object({}) do |e, hash|
+        tr = CapybaraPageObject::TableRow.new(e)
+        next if tr.header?
+        hash[tr.key] = tr
+      end
     end
 
-    def headers(attr={})
-      extract('th', attr)
+    def headers
+      all('th').each_with_object({}) do |e, hash|
+        th = CapybaraPageObject::TableHeader.new(e)
+        hash[th.key] = th
+      end
     end
   end
 end

data/lib/element/table_header.rb

@@ -0,0 +1,4 @@
+module CapybaraPageObject
+  class TableHeader < CapybaraPageObject::Node
+  end
+end

data/lib/element/table_row.rb

@@ -0,0 +1,7 @@
+module CapybaraPageObject
+  class TableRow < CapybaraPageObject::Node
+    def header?
+      source.all('th').any?
+    end
+  end
+end

data/lib/element/text_based_input.rb

@@ -0,0 +1,16 @@
+# TODO where should this file be?
+module CapybaraPageObject
+  module TextBasedInput
+    def clear!
+      source.fill_in key, :with => ''
+    end
+
+    def value=(value)
+      source.fill_in key, :with => value
+    end
+
+    def key
+      source[:name]
+    end
+  end
+end

data/lib/element/textarea.rb

@@ -1,16 +1,10 @@
+require 'element/text_based_input'
+
 module CapybaraPageObject
   class Textarea < CapybaraPageObject::Node
-    
-    def element_names
-      ['textarea']
-    end
-    
-    def key
-      root_node[:name]
-    end
-    
-    def value
-      text
+    include TextBasedInput
+    def blank?
+      '' == text
     end
   end
 end

data/lib/html5_data.rb

@@ -1,14 +1,10 @@
 module CapybaraPageObject
   module HTML5Data
     def data
-      r = {}
-      if native.respond_to?(:attributes)
-        native.attributes.each do |k, v|
-          next unless k.start_with?('data-')
-          r[k.gsub('data-', '')] = v.value
-        end
+      source.native.attributes.each_with_object({}) do |(k, v), hash|
+        next unless k.start_with?('data-')
+        hash[k.gsub('data-', '')] = v.value
       end
-      r
     end
   end
 end

data/lib/key_value.rb

@@ -1,7 +1,7 @@
 module CapybaraPageObject
   module Collections
     def key
-      root_node[:id]
+      source[:id]
     end
 
     def value

data/lib/node.rb

@@ -1,18 +1,13 @@
-require File.dirname(__FILE__) + '/collections'
-require File.dirname(__FILE__) + '/navigation'
-require File.dirname(__FILE__) + '/key_value'
-require File.dirname(__FILE__) + '/html5_data'
-require File.dirname(__FILE__) + '/extractor/common'
-require File.dirname(__FILE__) + '/extractor/page_level'
+require 'collections'
+require 'key_value'
+require 'html5_data'
+require 'delegators'
 
 module CapybaraPageObject
-  class Node
-    include Extractor::Common
-    include Extractor::PageLevel
+  class Node < Capybara::Node::Element
+    include Delegators
     include CapybaraPageObject::Collections
-    include CapybaraPageObject::Navigation
     include CapybaraPageObject::HTML5Data
-    include Extractor::PageLevel
 
     attr_accessor :source
 
@@ -21,54 +16,14 @@ module CapybaraPageObject
       @source = source
     end
 
-    def self.from_string(string)
-      new(Capybara.string(string))
-    end
-    
-    def respond_to?(sym)
-      source.respond_to?(sym) || super(sym)
+    def self.from_string(string, target)
+      new(Capybara.string(string).find(target))
     end
 
-    def method_missing(sym, *args, &block)
-      if source.respond_to?(sym)
-        source.send(sym)
-      else
-        super(sym, *args, &block)
-      end
-    end
-    
     def classes
-      classes_list = root_node[:class] or return []
+      classes_list = source[:class] or return []
       classes_list.split(' ')
     end
-    
-    def children(opts={})
-      factory = opts[:factory]
-      return all(child_node) unless factory
-      r = []
-      all(child_node).each do |li|
-        r << factory.new(li)
-      end
-      r
-    end
-    
-    private
-    
-    def element_names
-      raise "You need to override element_names"
-    end
-    
-    def root_node
-      # TODO still don't fully understand why we need both approaches
-      element_names.each do |element_name|
-        if source.native.name == element_name
-          return source.native
-        elsif source.has_css?(element_name)
-          return find(element_name)
-        end
-      end
-      raise "No element matches for #{element_names.join(', ')}"
-    end
   end
 
   class MissingPath < RuntimeError

data/lib/page.rb

@@ -0,0 +1,40 @@
+module CapybaraPageObject
+  class Page < CapybaraPageObject::Node
+    
+    def initialize(attr={}, source=nil)
+      super(source)
+      @attr = attr
+      visit
+      self
+    end
+    
+    def path(*args)
+      raise MissingPath, "You need to override #path in #{self.class}"
+    end
+    
+    def refresh
+      visit
+    end
+
+    def prefix
+      ''
+    end
+
+    private
+
+    def visit
+      target = prefix + path
+      if @attr
+        pairs = []
+        @attr.each do |k, v|
+          pairs << "#{k}=#{v}"
+        end
+        target += '?' + pairs.join('&') if pairs.any?
+      end
+      if target == source.current_path
+        raise "Detected repeat of page load - use #reload instead"
+      end
+      source.visit target
+    end    
+  end
+end

data/spec/common_spec.rb

@@ -1,46 +1,38 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 describe "Page" do
   before do
     html = File.open(File.dirname(__FILE__) + '/fixtures/node.html').read
-    @page = CapybaraPageObject::Node.from_string html    
+    @page = CapybaraPageObject::Node.from_string html, 'body'
   end
 
   context "#tables" do
-    it "returns an array of Table objects" do
+    it "returns a hash of Tables keyed by ID" do
       tables = @page.tables
-      tables[0].class.should == CapybaraPageObject::Table
-      tables[0].class.should == CapybaraPageObject::Table
-    end
-
-    it "returns a hash of Tables keyed by id" do
-      tables = @page.tables(:by => 'id')
+      tables.keys.should == ['table_1', 'table_2']
       tables['table_1'].class.should == CapybaraPageObject::Table
-      tables['table_2'].class.should == CapybaraPageObject::Table
-      # TODO: support @page.tables[:table_1] ? perhaps have a default_key override?
     end
   end
 
   context "#forms" do
-    it "returns the ids for the forms" do
-      @page.forms(:keys => 'id').should =~ ['form_1', 'form_2']
+    pending "returns a hash of Forms keyed by ID" do
+      @page.forms.should == ['form_1', 'form_2']
+      @page.forms['form_1'].class.should == CapybaraPageObject::Form
     end
   end
 
-  it "return the elements as a hash" do
-    @page.tables(:keys => 'id').should =~ ['table_1', 'table_2']
-    @page.tables(:keys => 'class').should =~ ['table_1_class', 'table_2_class']
-  end
-
   context "#data" do
     it "returns an empty hash if the element has no HTML5 data attributes" do
-      e = Capybara.string('<foo/>')
-      e.data.should == {}
+      html = '<div foo="bar"/>'
+      @fragment = CapybaraPageObject::Node.from_string html, 'div'
+      @fragment.data.should == {}
     end
 
     it "returns a hash of the elements HTML5 data attributes" do
+      html = '<div id="data" data-foo="a" data-bar="b" data-cat>Some data</div>'
+      @fragment = CapybaraPageObject::Node.from_string html, 'div'
       h = {'foo' => 'a', 'bar' => 'b', 'cat' => ''}
-      @page.find('#data').data.should == h 
+      @fragment.data.should == h 
     end
   end
 end

data/spec/element/anchor_spec.rb

@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../helper'
+require 'helper'
 
 describe "Anchor" do
     
   before do
-    @anchor = CapybaraPageObject::Anchor.from_string '<a href="hello.html">'
+    @anchor = CapybaraPageObject::Anchor.from_string('<a href="hello.html">', 'a')
   end
 
   context "#link" do

data/spec/element/base_spec.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../helper'
+require 'helper'
 
 describe "Base" do
   before do
-    @tag = CapybaraPageObject::Anchor.from_string '<a id="bar">content</a>'
+    @tag = CapybaraPageObject::Anchor.from_string '<a id="bar">content</a>', 'a'
   end
 
   context "#key" do

data/spec/element/form_field_spec.rb

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../helper'
+require 'helper'
 
 describe "FormField" do
   before do
-    @input = CapybaraPageObject::FormField.from_string '<input value="hello">'
-    @textarea = CapybaraPageObject::FormField.from_string '<textarea>foo</textarea>'
-    @blank_textarea = CapybaraPageObject::FormField.from_string '<textarea></textarea>'
+    @input = CapybaraPageObject::FormField.from_string '<input value="hello">', 'input'
+    @textarea = CapybaraPageObject::FormField.from_string '<textarea>foo</textarea>', 'textarea'
+    @blank_textarea = CapybaraPageObject::FormField.from_string '<textarea></textarea>', 'textarea'
   end
 
   context "#value" do

data/spec/element/form_spec.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../helper'
+require 'helper'
 
 describe "Form" do
   before do
-    @form = CapybaraPageObject::Form.from_string <<-EOF
+    html = <<-EOF
     <form>
       <input name="input_1" value="value_1">
       <input type="text" name="text_input" value="text_input_value">
@@ -33,6 +33,7 @@ describe "Form" do
       <button>button 2</button>
     </form>
     EOF
+    @form = CapybaraPageObject::Form.from_string html, 'form'
   end
 
   context "#buttons" do
@@ -41,29 +42,29 @@ describe "Form" do
     end
   end
 
-  context "#fields" do
-    it "return the fields contained in the form - inputs, selects and textareas. Excludes button type inputs (submit, reset, etc.)" do
-      f = {
-        'input_1' => 'value_1',
-        'text_input' => 'text_input_value',
-        'password_input' => 'password',
-        'colour' => 'blue',
-        'essay' => 'hello world',
-        'checkbox_1' => false,
-        'checkbox_2' => true,
-        'radio_button_1' => false,
-        'radio_button_2' => true,
-        'countries' => ['spain', 'germany']
-      }
-      @form.fields.should == f 
-    end
-  end
+  # context "#fields" do
+  #   it "return the fields contained in the form - inputs, selects and textareas. Excludes button type inputs (submit, reset, etc.)" do
+  #     f = {
+  #       'input_1' => 'value_1',
+  #       'text_input' => 'text_input_value',
+  #       'password_input' => 'password',
+  #       'colour' => 'blue',
+  #       'essay' => 'hello world',
+  #       'checkbox_1' => false,
+  #       'checkbox_2' => true,
+  #       'radio_button_1' => false,
+  #       'radio_button_2' => true,
+  #       'countries' => ['spain', 'germany']
+  #     }
+  #     @form.fields.should == f 
+  #   end
+  # end
 
-  it "provides direct read access to form's fields" do
-    @form.essay.should == 'hello world'
-  end
+  # it "provides direct read access to form's fields" do
+  #   @form.essay.should == 'hello world'
+  # end
 
-  it "doesn't respond to nonexistant fields" do
-    @form.should_not respond_to(:nonexistant_field)
-  end
+  # it "doesn't respond to nonexistant fields" do
+  #   @form.should_not respond_to(:nonexistant_field)
+  # end
 end