celerity 0.0.2 → 0.0.3

data/lib/celerity/elements/table.rb

@@ -1,10 +1,12 @@
 module Celerity
 
   class Table < Element
+    include Enumerable # specs for this?
     include Container
+    
     TAGS = [ Identifier.new('table') ]
     ATTRIBUTES = BASE_ATTRIBUTES | [:summary, :width, :border, :frame, :rules, :cellspacing, :cellpadding, :align, :bgcolor]
-    DEFAULT_HOW = :name
+    DEFAULT_HOW = :id
     
     def locate
       super
@@ -31,7 +33,7 @@ module Celerity
     
     def each
       assert_exists
-      0.upto(@object.getRowCount-1) { |index| yield TableRow.new(self, :object, @rows[index]) }
+      @rows.each { |row| yield TableRow.new(self, :object, row)  }
     end
     
     def [](index)
@@ -49,9 +51,8 @@ module Celerity
       @object.getRow(index-1).getCells.length
     end
     
-    # This method returns the table as a 2 dimensional array. Dont expect too much if there are nested tables, colspan etc.
+    # This method returns the table as a 2 dimensional array.
     # Raises an UnknownObjectException if the table doesn't exist.
-    # http://www.w3.org/TR/html4/struct/tables.html
     def to_a
       assert_exists
       y = []
@@ -66,29 +67,14 @@ module Celerity
       return y
     end
     
-    def table_body(index = 1)
-      return @object.getBodies.get(index)
-    end
-    private :table_body
-    
-    def body(how, what)
-      assert_exists
-      return TableBody.new(@container, how, what)
-    end
-    
-    def bodies
-      assert_exists
-      return TableBodies.new(self)
-    end
-    
     def column_values(columnnumber)
-      return (1..row_count).collect { |index| self[index][columnnumber].text }
+      (1..row_count).collect { |index| self[index][columnnumber].text }
     end
     
     def row_values(rownumber)
-      return (1..column_count(rownumber)).collect { |index| self[rownumber][index].text }
+      (1..column_count(rownumber)).collect { |index| self[rownumber][index].text }
     end
-    
+
   end
   
 end

data/lib/celerity/elements/table_body.rb

@@ -1,20 +1,14 @@
 module Celerity
-  
   class TableBody < Element
+    include Enumerable # specs for this? 
+    
     TAGS = [ Identifier.new('tbody') ]
+    ATTRIBUTES = BASE_ATTRIBUTES | CELLHALIGN_ATTRIBUTES | CELLVALIGN_ATTRIBUTES
+    DEFAULT_HOW = :id
 
     def locate
       super
-      # can't call the assert_exists here, as an exists? method call will fail
-      if @object 
-        @rows = @object.getRows
-        @cells = []
-        @rows.each do |row| 
-          row.getCells.each do |c|
-            @cells << c
-          end 
-        end
-      end
+      @rows = @object.getRows if @object 
     end
 
     def [](index)

data/lib/celerity/elements/table_cell.rb

@@ -6,6 +6,7 @@ module Celerity
 
     TAGS = [ Identifier.new('td') ]
     ATTRIBUTES = BASE_ATTRIBUTES | [:abbr, :axis, :headers, :scope, :rowspan, :colspan] | CELLHALIGN_ATTRIBUTES | CELLVALIGN_ATTRIBUTES
+    DEFAULT_HOW = :id
     
     alias_method :to_s, :text
 

data/lib/celerity/elements/table_footer.rb

@@ -0,0 +1,30 @@
+module Celerity
+  class TableFooter < Element
+    include Enumerable # specs for this? 
+    
+    TAGS = [ Identifier.new('tfoot') ]
+    ATTRIBUTES = BASE_ATTRIBUTES | CELLHALIGN_ATTRIBUTES | CELLVALIGN_ATTRIBUTES
+    DEFAULT_HOW = :id
+
+    def locate
+      super
+      @rows = @object.getRows if @object 
+    end
+
+    def [](index)
+      assert_exists
+      return TableRow.new(self, :object, @rows[index-1])
+    end
+
+    def length
+      assert_exists
+      return @object.getRows.length
+    end
+    
+    def each
+      assert_exists
+      @rows.each { |row| yield TableRow.new(self, :object, row) }
+    end
+
+  end
+end

data/lib/celerity/elements/table_header.rb

@@ -0,0 +1,30 @@
+module Celerity
+  class TableHeader < Element
+    include Enumerable # specs for this? 
+    
+    TAGS = [ Identifier.new('thead') ]
+    ATTRIBUTES = BASE_ATTRIBUTES | CELLHALIGN_ATTRIBUTES | CELLVALIGN_ATTRIBUTES
+    DEFAULT_HOW = :id
+
+    def locate
+      super
+      @rows = @object.getRows if @object 
+    end
+
+    def [](index)
+      assert_exists
+      return TableRow.new(self, :object, @rows[index-1])
+    end
+
+    def length
+      assert_exists
+      return @object.getRows.length
+    end
+    
+    def each
+      assert_exists
+      @rows.each { |row| yield TableRow.new(self, :object, row) }
+    end
+
+  end
+end

data/lib/celerity/elements/table_row.rb

@@ -1,7 +1,9 @@
 module Celerity
-  
   class TableRow < Element
+    include Enumerable # specs for this?
+    
     TAGS = [ Identifier.new('tr') ]
+    DEFAULT_HOW = :id
 
     def locate
       super
@@ -9,7 +11,7 @@ module Celerity
     end
 
     def each
-      locate
+      assert_exists
       @cells.each { |cell| yield TableCell.new(self, :object, cell) }
     end
 
@@ -20,7 +22,7 @@ module Celerity
     end
 
     def column_count
-      locate
+      assert_exists
       @cells.length
     end
 

data/lib/celerity/elements/text_field.rb

@@ -7,6 +7,7 @@ module Celerity
   class TextField < InputElement
     TAGS = [ Identifier.new('textarea'), 
              Identifier.new('input', :type => ["text", "password", /^(?!(file|radio|checkbox|submit|reset|image|button|hidden)$)/])  ]
+    DEFAULT_HOW = :name
 
     def clear
       assert_exists
@@ -22,14 +23,7 @@ module Celerity
       assert_enabled
       assert_not_readonly
       clear
-      # workaround for bug in HtmlPasswordInput - should be fixed soon (Jari - 2008-05-14)
-      if @object.class == com.gargoylesoftware.htmlunit.html.HtmlPasswordInput
-        @object.setValueAttribute(value.to_s)
-      else
-        java.lang.String.new(value.to_s).toCharArray.each do |char| 
-          @container.update_page @object.type(char) 
-        end
-      end
+      type_string(value.to_s)
     end
     
     def value=(value)
@@ -57,9 +51,13 @@ module Celerity
     def append(value)
       assert_enabled
       assert_not_readonly
-      java.lang.String.new(value.to_s).toCharArray.each do |char| 
-        @container.update_page @object.type(char) 
-      end
+      type_string(value)
+    end
+    
+    def type
+      assert_exists
+      type = @object.getAttributeValue('type')
+      return ['file', 'radio', 'checkbox', 'submit', 'reset', 'image', 'button', 'hidden'].include?(type) ? type : 'text'
     end
 
     # This bascially just moves the text to the other text field using TextField#append
@@ -70,23 +68,30 @@ module Celerity
       self.value = ''
       @container.text_field(how, what).append(val)
     end
-    alias_method :dragContentsTo, :drag_contents_to
   
     def get_contents
       self.value
     end
-    alias_method :getContents, :get_contents
 
     def verify_contains(expected)
       assert_exists
       !!contains_text(expected)
     end
+    
+    
+    private 
+    def type_string(value)
+      JavaString.new(value.to_java_bytes, @container.page.getPageEncoding).toCharArray.each do |char| 
+        @container.update_page @object.type(char) 
+      end
+    end
   end
   
   # this class can be used to access hidden field objects
   # Normally a user would not need to create this object as it is returned by the Watir::Container#hidden method
   class Hidden < TextField
     TAGS = [ Identifier.new('input', :type => %w(hidden)) ]
+    DEFAULT_HOW = :name
   end
   
 end

data/lib/celerity/exception.rb

@@ -35,14 +35,14 @@ module Celerity
     # This exception is thrown if an http error, such as a 404, 500 etc is encountered while navigating
     class NavigationException < CelerityException; end
       
-    # This exception is raised if a timeout is exceeded
-    class TimeOutException < CelerityException
-      def initialize(duration, timeout)
-        @duration, @timeout = duration, timeout
-        super
-      end 
-      attr_reader :duration, :timeout
-    end
+    # # This exception is raised if a timeout is exceeded
+    # class TimeOutException < CelerityException
+    #   def initialize(duration, timeout)
+    #     @duration, @timeout = duration, timeout
+    #     super
+    #   end 
+    #   attr_reader :duration, :timeout
+    # end
     
   end
 end

data/lib/celerity/extra/method_generator.rb

@@ -2,7 +2,10 @@ require "rubygems"
 require "uri"
 require "active_support"
 
+#--
 # http://api.rubyonrails.com/classes/Inflector.html#M001621
+#++
+
 class String
   def underscore
      gsub(/::/, '/').
@@ -123,8 +126,8 @@ module Celerity
   end # MethodGenerator
   
   class IE
-    def generate_method
-      MethodGenerator.new(self).parse
+    def generate_method(opts = {})
+      MethodGenerator.new(self, opts).parse
     end
   end
    

data/lib/celerity/ie.rb

@@ -1,141 +1,195 @@
-module Celerity
-  class IE
-    include Container
-    attr_accessor :page, :object, :webclient
-    
-    def self.start(uri)
-      browser = new
-      browser.goto(uri)
-      browser
-    end
-    
-    def initialize(opts = {})
-      @page_container  = self
-      @error_checkers  = []
-      @last_url, @page = nil
-
-      browser = RUBY_PLATFORM =~ /java/ ? ::HtmlUnit::BrowserVersion::FIREFOX_2 : ::HtmlUnit::BrowserVersion.FIREFOX_2
-      @webclient = ::HtmlUnit::WebClient.new(browser)
-      @webclient.setThrowExceptionOnScriptError(false) unless $DEBUG || opts[:enable_javascript_exceptions]
-      @webclient.setCssEnabled(false) if opts[:disable_css] 
-    end
-
-    def goto(uri)
-      uri = "http://#{uri}" unless uri =~ %r{^http://}
-      set_page @webclient.getPage(uri)
-      uri
-    end
-    
-    def close
-      @page = nil
-    end
-
-    def set_page(value)
-      @last_url = url() if exist?
-      @page = value
-      @object = @page.getDocumentElement
-      run_error_checks
-    end
-
-    def url
-      assert_exists
-      @page.getWebResponse.getUrl.toString
-    end
-    
-    def base_url
-      # FIXME: base_url HTTPS
-      "http://" + URI.parse( url() ).host
-    end
-
-    def title
-      @page ? @page.getTitleText : ''
-    end
-
-    def html
-      @page ? @page.getWebResponse.getContentAsString : ''
-    end
-
-    def text
-      # nicer way to do this?
-      @page ? @page.getFirstByXPath("//body").asText : ''
-    end
-    
-    def document
-      @object
-    end
-    
-    def back
-      # FIXME: this is naive, need capability from HtmlUnit  
-      goto(@last_url) if @last_url
-    end
-    
-    def refresh
-      assert_exists
-      set_page(@page.refresh)
-    end
-
-    def exist?
-      !!@page
-    end
-    alias_method :exists?, :exist?
-
-    # check that we have a @page object
-    # need to find a better way to handle this
-    def assert_exists
-      raise UnknownObjectException, "no page loaded" unless exist?
-    end
-    
-    def contains_text(expected_text)
-      return nil unless exist?
-      case expected_text
-      when Regexp
-        text().match(expected_text)
-      when String
-        text().index(expected_text)
-      else
-        raise ArgumentError, "Argument #{expected_text.inspect} should be a String or Regexp."
-      end
-    end
-    
-    def execute_script(source)
-      assert_exists
-      @page.executeJavaScript(source.to_s)
-    end
-    
-    def run_error_checks
-      @error_checkers.each { |e| e.call(self) }
-    end
-    
-    def add_checker(checker = nil, &block)
-      if block_given?
-        @error_checkers << block
-      elsif Proc === checker
-        @error_checkers << checker
-      else
-        raise ArgumentError, "argument must be a Proc or block"
-      end
-    end
-    
-    def disable_checker(checker)
-      @error_checkers.delete(checker)
-    end
-    
-    # these are just for Watir compatability - should we keep them?
-    class << self
-      attr_accessor :speed, :attach_timeout, :visible
-      alias_method :start_window, :start
-      def reset_attach_timeout; @attach_timeout = 2.0; end
-      def each; end
-      def quit; end
-      def set_fast_speed; @speed = :fast; end
-      def set_slow_speed; @speed = :slow; end  
-    end
-
-    attr_accessor :visible
-    def bring_to_front; true; end
-    def speed=(s); end
-    
-  end # IE
-end # Celerity
-
-Celerity::Browser = Celerity::IE
+module Celerity
+  class IE
+    include Container
+    attr_accessor :page, :object
+    attr_reader :charset, :webclient
+    
+    def self.start(uri)
+      browser = new
+      browser.goto(uri)
+      browser
+    end
+    
+    
+    # Creates a browser object. 
+    #
+    # ==== Options (opts)
+    # :javascript_exceptions<true, false, nil>::
+    #   Throw exceptions on script errors. Disabled by default.
+    # :status_code_exceptions<true, false, nil>::
+    #   Throw exceptions on failing status codes (404++). Disabled by default.
+    # :css<true, false, nil>::
+    #   Enable CSS. Disabled by default.
+    # :secure_ssl<true, false, nil>::
+    #   Disable secure SSL. Enabled by default.
+    # :log_level<:trace, :debug, :info, :warn, :error, or :fatal>::
+    #   Set the log level for Apache Jakarta commons logging system (used by HtmlUnit)
+    #   Defaults to :warn. (not working..)
+    # ==== Returns
+    # An instance of Celerity::IE
+    #
+    #-- 
+    # @public
+    def initialize(opts = {})
+      java.lang.System.getProperties.put("org.apache.commons.logging.simplelog.defaultlog", opts[:log_level] ? opts[:log_level].to_s : "warn")
+
+      browser = RUBY_PLATFORM =~ /java/ ? ::HtmlUnit::BrowserVersion::FIREFOX_2 : ::HtmlUnit::BrowserVersion.FIREFOX_2
+      @webclient = ::HtmlUnit::WebClient.new(browser)
+      @webclient.setThrowExceptionOnScriptError(false)       unless opts[:javascript_exceptions]
+      @webclient.setThrowExceptionOnFailingStatusCode(false) unless opts[:status_code_exceptions]
+      @webclient.setCssEnabled(false)                        unless opts[:css]
+      @webclient.setUseInsecureSSL(true)                     if opts[:secure_ssl] 
+
+      @last_url, @page = nil
+      @page_container  = self
+      @error_checkers  = []
+      find_viewer 
+    end
+
+    def goto(uri)
+      uri = "http://#{uri}" unless uri =~ %r{^https?://}
+      set_page @webclient.getPage(uri)
+      uri
+    end
+    
+    def close
+      @page = nil
+    end
+
+    def set_page(value)
+      @last_url = url() if exist?
+      @page = value
+      if @page.respond_to?("getDocumentElement")
+        @object = @page.getDocumentElement
+      end
+      render if @viewer
+      run_error_checks
+    end
+
+    def url
+      assert_exists
+      @page.getWebResponse.getUrl.toString
+    end
+    
+    def title
+      @page ? @page.getTitleText : ''
+    end
+
+    def html
+      @page ? @page.getWebResponse.getContentAsString : ''
+    end
+
+    def text
+      if @page.respond_to?("getContent")
+        @page.getContent
+      else
+        @page ? @page.getFirstByXPath("//body").asText : ''
+      end
+    end
+    
+    def document
+      @object
+    end
+    
+    def collection_string(collection_method)
+      collection = self.send collection_method
+      buffer = "Found #{collection.size} divs\n"
+      collection.each_with_index do |div, index|
+        buffer += "#{index+1}: #{div.attribute_string}\n"
+      end
+      return buffer
+    end
+    
+    def back
+      # FIXME: this is naive, need capability from HtmlUnit  
+      goto(@last_url) if @last_url
+    end
+    
+    def refresh
+      assert_exists
+      set_page(@page.refresh)
+    end
+
+    def exist?
+      !!@page
+    end
+    alias_method :exists?, :exist?
+
+    # check that we have a @page object
+    # need to find a better way to handle this
+    def assert_exists
+      raise UnknownObjectException, "no page loaded" unless exist?
+    end
+    
+    def contains_text(expected_text)
+      return nil unless exist?
+      case expected_text
+      when Regexp
+        text().match(expected_text)
+      when String
+        text().index(expected_text)
+      else
+        raise ArgumentError, "Argument #{expected_text.inspect} should be a String or Regexp."
+      end
+    end
+    
+    def execute_script(source)
+      assert_exists
+      @page.executeJavaScript(source.to_s)
+    end
+    
+    def run_error_checks
+      @error_checkers.each { |e| e.call(self) }
+    end
+    
+    def add_checker(checker = nil, &block)
+      if block_given?
+        @error_checkers << block
+      elsif Proc === checker
+        @error_checkers << checker
+      else
+        raise ArgumentError, "argument must be a Proc or block"
+      end
+    end
+    
+    def disable_checker(checker)
+      @error_checkers.delete(checker)
+    end
+    
+    def method_missing(meth, *args)
+      match_data = /^show_(.*)$/.match(meth.to_s)
+      if match_data
+        begin
+          puts collection_string(match_data[1])
+        rescue NoMethodError
+          super
+        end
+      else
+        super
+      end
+    end
+    
+    private
+    
+    def render
+      begin
+        @viewer.render_html(html, url) 
+      rescue Errno::ECONNREFUSED => e
+        puts e.message
+      end
+    end    
+    
+    def find_viewer
+      begin
+        if `uname`.chomp == "Darwin" && `ps ax`[/CelerityViewer/]
+          require "drb"
+          @viewer = DRbObject.new_with_uri("druby://127.0.0.1:1337")
+        end
+      rescue IOError, Errno::ENOENT
+      end
+    end
+    
+  end # IE
+end # Celerity
+
+Celerity::Browser = Celerity::IE