jarib-celerity 0.0.6.7 → 0.0.6.8

data/lib/celerity/elements/table.rb

@@ -21,31 +21,33 @@ module Celerity
           end
         end
       end
+
+      @object
     end
-    
+
     #
     # @return [Celerity::TableRows]
     #
-    
+
     def rows
       assert_exists
       TableRows.new(self, :object, @rows)
     end
-    
+
     #
     # @return [Celerity::TableCells]
     #
-    
+
     def cells
       assert_exists
       TableCells.new(self, :object, @cells)
     end
-    
+
     #
     # Iterates through each row in the table.
     # @yieldparam [Celerity::TableRow] row A row.
     #
-    
+
     def each
       assert_exists
       @rows.each { |row| yield TableRow.new(self, :object, row)  }
@@ -61,7 +63,7 @@ module Celerity
     # @raise [Celerity::Exception::UnknownRowException]
     # @return [Celerity::TableRow]
     #
-    
+
     def child_row(index)
       assert_exists
 
@@ -82,13 +84,14 @@ module Celerity
     # @raise [Celerity::Exception::UnknownCellException]
     # @return [Celerity::TableCell]
     #
-    
+
     def child_cell(index)
       assert_exists
 
       if (index - INDEX_OFFSET) >= @cells.length
         raise UnknownCellException, "Unable to locate a cell at index #{index}"
       end
+
       TableCell.new(self, :object, @cells[index - INDEX_OFFSET])
     end
 
@@ -96,19 +99,19 @@ module Celerity
     # The number of rows in the table
     # @return [Fixnum]
     #
-    
+
     def row_count
       assert_exists
       @object.getRowCount
     end
-    
+
     #
     # Returns the number of columns on the row at the given index. (1-indexed)
     # Default is the number of columns on the first row
     # @param [Fixnum] index An index, 1-indexed (optional).
     # @return [Fixnum]
     #
-    
+
     def column_count(index = INDEX_OFFSET)
       assert_exists
       @object.getRow(index - INDEX_OFFSET).getCells.length
@@ -118,7 +121,7 @@ module Celerity
     # Returns the text of each cell in the the table as a two-dimensional array.
     # @return [Array<Array<String>>]
     #
-    
+
     def to_a
       assert_exists
       # @object.getRows.map do |table_row|

data/lib/celerity/elements/table_row.rb

@@ -14,7 +14,7 @@ module Celerity
     #
     # Yields each TableCell in this row to the given block.
     #
-    
+
     def each
       assert_exists
       @cells.each { |cell| yield TableCell.new(self, :object, cell) }
@@ -23,7 +23,7 @@ module Celerity
     #
     # Get the child cell at the given index
     #
-    
+
     def child_cell(index)
       assert_exists
 
@@ -38,7 +38,7 @@ module Celerity
     #
     # Number of cells in this row.
     #
-    
+
     def column_count
       assert_exists
       @cells.length

data/lib/celerity/elements/text_field.rb

@@ -1,49 +1,49 @@
 module Celerity
-  
+
   #
   # Class representing text field elements
   #
   # This class is the main class for Text Fields
   # Normally a user would not need to create this object as it is returned by the Watir::Container#text_field method
   #
-  
+
   class TextField < InputElement
     NON_TEXT_TYPES = %w[file radio checkbox submit reset image button hidden]
     TAGS = [ Identifier.new('textarea'),
              Identifier.new('input', :type => ["text", "password", /^(?!(#{ Regexp.union(*NON_TEXT_TYPES) })$)/])  ]
     DEFAULT_HOW = :name
-    
+
     def visible?
       assert_exists
       type == 'hidden' ? false : super
     end
-    
+
     #
     # Clear the text field.
     #
-    
+
     def clear
       assert_exists
       insert_string ''
     end
-    
+
     #
     # Set the text field to the given value.
     # This ensures execution of JavaScript events (onkeypress etc.), but is slower than +value=+
     #
-    
+
     def set(value)
       assert_enabled
       assert_not_readonly
       clear
       type_string(value.to_s)
     end
-    
+
     #
     # This directly sets the text field to the given value, skipping exectuion of JavaScript events.
     # Use +set+ if you want to run events on text fields.
     #
-    
+
     def value=(value)
       assert_enabled
       assert_not_readonly
@@ -53,11 +53,11 @@ module Celerity
 
       value
     end
-    
+
     #
     # Returns the text in the text field.
     #
-    
+
     def value
       assert_exists
       case @object.getTagName
@@ -68,34 +68,30 @@ module Celerity
       end
     end
     alias_method :get_contents, :value
-    
+
     #
     # Append the given value to the text in the text field.
     #
-    
+
     def append(value)
       assert_enabled
       assert_not_readonly
       type_string(value)
     end
 
-    
+
     def type
       assert_exists
       type = @object.getAttribute 'type'
 
-      if NON_TEXT_TYPES.include?(type)
-        type
-      else
-        'text'
-      end
+      NON_TEXT_TYPES.include?(type) ? type : 'text'
     end
 
     #
     # This bascially just moves the text to the other text field using TextField#append
     # TODO: check if HtmlUnit supports some kind of dragging.
     #
-    
+
     def drag_contents_to(how, what)
       assert_exists # assert_enabled?
       val = self.value
@@ -106,7 +102,7 @@ module Celerity
     #
     # Check if the given text fields contains the given String or Regexp.
     #
-    
+
     def contains_text(expected_text)
       assert_exists
 
@@ -122,10 +118,11 @@ module Celerity
 
     #
     # A boolean version of TextField#contains_text
+    #
     # @param  [String, Regexp] expected_text The text to look for.
     # @return [boolean]
     #
-    
+
     def verify_contains(expected)
       # assert_exists called by contains_text
       !!contains_text(expected)
@@ -149,18 +146,18 @@ module Celerity
         raise "unknown tag name #{@object.getTagName.inspect} for #{self.class}"
       end
     end
-    
+
   end # TextField
 
   #
   # 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 Celerity::Container#hidden method
   #
-  
+
   class Hidden < TextField
     TAGS = [ Identifier.new('input', :type => %w[hidden]) ]
     DEFAULT_HOW = :name
-    
+
     def visible?
       assert_exists
       false

data/lib/celerity/exception.rb

@@ -1,6 +1,6 @@
 module Celerity
   module Exception
-    
+
     #
     # Superclass for all Celerity exceptions.
     #
@@ -12,7 +12,7 @@ module Celerity
     #
 
     class UnknownObjectException < CelerityException; end
-    
+
     #
     # This exception is thrown if an attempt is made to access an object that is in a disabled state
     #
@@ -54,7 +54,7 @@ module Celerity
     #
 
     class UnknownRowException < CelerityException; end
-    
+
     #
     # This exception is raised if an attempt is made to access a table cell that doesn't exist
     #
@@ -66,12 +66,12 @@ module Celerity
     #
 
     class NavigationException < CelerityException; end
-    
+
     #
     # This exception is thrown if an unexpected content type is returned by the server.
     #
 
     class UnexpectedPageException < CelerityException; end
-    
+
   end # Exception
 end # Celerity

data/lib/celerity/htmlunit.rb

@@ -1,7 +1,7 @@
 module Celerity
   Jars = Dir[File.dirname(__FILE__) + '/htmlunit/*.jar']
   Jars.each { |jar| require(jar) }
-  
+
   include_class org.apache.commons.httpclient.Cookie
 end
 
@@ -11,7 +11,7 @@ module HtmlUnit
   module Html
     include_package 'com.gargoylesoftware.htmlunit.html'
   end
-  
+
   module Util
     include_package 'com.gargoylesoftware.htmlunit.util'
   end
@@ -42,3 +42,9 @@ class Java::ComGargoylesoftwareHtmlunitHtml::HtmlPage
     '#<HtmlPage:0x%s(%s)>' % [self.hash.to_s(16), getWebResponse.getRequestUrl.toString]
   end
 end
+
+class Java::ComGargoylesoftwareHtmlunitHtml::HtmlElement
+  def inspect
+    '#<%s:0x%s>' % [self.class.name.split("::").last, self.hash.to_s(16)]
+  end
+end

data/lib/celerity/listener.rb

@@ -3,7 +3,7 @@ module Celerity
   #
   # This class is used to wrap some of the listeners available from HtmlUnit's WebClient.
   #
-  
+
   class Listener
     include com.gargoylesoftware.htmlunit.AlertHandler
     include com.gargoylesoftware.htmlunit.ConfirmHandler
@@ -18,12 +18,12 @@ module Celerity
       @webclient = webclient
       @procs = Hash.new { |h, k| h[k] = [] }
     end
-    
+
     #
     # Add a listener block for one of the available types.
     # @see Celerity::Browser#add_listener
     #
-    
+
     def add_listener(type, &block)
       case type
       when :status
@@ -63,23 +63,23 @@ module Celerity
         raise TypeError, "must give proc or index"
       end
     end
-    
+
     #
     # interface StatusHandler
     #
-    
+
     def statusMessageChanged(page, message)
       @procs[:status].each { |h| h.call(page, message) }
     end
-    
+
     #
     # interface AlertHandler
     #
-    
+
     def handleAlert(page, message)
       @procs[:alert].each { |h| h.call(page, message) }
     end
-    
+
     #
     # interface ConfirmHandler
     #
@@ -87,8 +87,8 @@ module Celerity
     # If it is nil, return true, otherwise return that value as a boolean.
     #
     # @see Browser#confirm
-    # 
-    
+    #
+
     def handleConfirm(page, message)
       val = @procs[:confirm].map { |h| h.call(page, message) }.last
       val.nil? || !!val
@@ -97,23 +97,23 @@ module Celerity
     #
     # interface AttachmentHandler
     #
-    
+
     def handleAttachment(page)
       @procs[:attachment].each { |h| h.call(page) }
     end
-    
+
     #
     # interface PromptHandler
     #
-    
+
     def handlePrompt(page, message)
       @procs[:prompt].each { |h| h.call(page, message) }
     end
-    
+
     #
     # interface WebWindowListener
     #
-    
+
     def webWindowClosed(web_window_event)
       @procs[:web_window_event].each { |h| h.call(web_window_event) }
     end
@@ -123,7 +123,7 @@ module Celerity
     #
     # interface HTMLParserListener
     #
-    
+
     def error(message, url, line, column, key)
       @procs[:html_parser].each { |h| h.call(message, url, line, column, key) }
     end
@@ -132,7 +132,7 @@ module Celerity
     #
     # interface IncorrectnessListener
     #
-    
+
     def notify(message, origin)
       @procs[:incorrectness].each { |h| h.call(message, origin) }
     end