celerity 0.0.6 → 0.0.7

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,15 +63,15 @@ module Celerity
     # @raise [Celerity::Exception::UnknownRowException]
     # @return [Celerity::TableRow]
     #
-    
+
     def child_row(index)
       assert_exists
 
-      if (index - INDEX_OFFSET) >= @rows.length
+      if (index - Celerity.index_offset) >= @rows.length
         raise UnknownRowException, "Unable to locate a row at index #{index}"
       end
 
-      TableRow.new(self, :object, @rows[index - INDEX_OFFSET])
+      TableRow.new(self, :object, @rows[index - Celerity.index_offset])
     end
     alias_method :[], :child_row
 
@@ -82,43 +84,44 @@ module Celerity
     # @raise [Celerity::Exception::UnknownCellException]
     # @return [Celerity::TableCell]
     #
-    
+
     def child_cell(index)
       assert_exists
 
-      if (index - INDEX_OFFSET) >= @cells.length
+      if (index - Celerity.index_offset) >= @cells.length
         raise UnknownCellException, "Unable to locate a cell at index #{index}"
       end
-      TableCell.new(self, :object, @cells[index - INDEX_OFFSET])
+
+      TableCell.new(self, :object, @cells[index - Celerity.index_offset])
     end
 
     #
     # 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)
+
+    def column_count(index = Celerity.index_offset)
       assert_exists
-      @object.getRow(index - INDEX_OFFSET).getCells.length
+      @object.getRow(index - Celerity.index_offset).getCells.length
     end
 
     #
     # 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_cell.rb

@@ -15,7 +15,7 @@ module Celerity
 
     def colspan
       assert_exists
-      attribute_value = @object.getAttributeValue('colspan').to_i
+      attribute_value = @object.getAttribute('colspan').to_i
       attribute_value > 0 ? attribute_value : 1
     end
 

data/lib/celerity/elements/table_elements.rb

@@ -13,7 +13,7 @@ module Celerity
 
     def [](index)
       assert_exists
-      TableRow.new(self, :object, @rows[index - INDEX_OFFSET])
+      TableRow.new(self, :object, @rows[index - Celerity.index_offset])
     end
 
     def length

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,22 +23,22 @@ module Celerity
     #
     # Get the child cell at the given index
     #
-    
+
     def child_cell(index)
       assert_exists
 
-      if (index - INDEX_OFFSET) >= @cells.length
+      if (index - Celerity.index_offset) >= @cells.length
         raise UnknownCellException, "Unable to locate a cell at index #{index}"
       end
 
-      TableCell.new(self, :object, @cells[index - INDEX_OFFSET])
+      TableCell.new(self, :object, @cells[index - Celerity.index_offset])
     end
     alias_method :[], :child_cell
 
     #
     # Number of cells in this row.
     #
-    
+
     def column_count
       assert_exists
       @cells.length

data/lib/celerity/elements/text_field.rb

@@ -1,44 +1,51 @@
 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)
+
+      value
     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
@@ -48,11 +55,11 @@ module Celerity
 
       value
     end
-    
+
     #
     # Returns the text in the text field.
     #
-    
+
     def value
       assert_exists
       case @object.getTagName
@@ -63,34 +70,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)
+      type_string value
     end
 
-    
+
     def type
       assert_exists
-      type = @object.getAttributeValue('type')
+      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
@@ -101,7 +104,7 @@ module Celerity
     #
     # Check if the given text fields contains the given String or Regexp.
     #
-    
+
     def contains_text(expected_text)
       assert_exists
 
@@ -117,10 +120,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)
@@ -129,8 +133,8 @@ module Celerity
     private
 
     def type_string(value)
-      java.lang.String.new(value.to_java_bytes, @container.page.getPageEncoding).toCharArray.each do |char|
-        @container.update_page @object.type(char)
+      java.lang.String.new(value.to_java_bytes, @browser.page.getPageEncoding).toCharArray.each do |char|
+        @object.type(char)
       end
     end
 
@@ -144,19 +148,20 @@ 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
     end
   end

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,18 @@ module Celerity
     #
 
     class NavigationException < CelerityException; end
-    
+
     #
     # This exception is thrown if an unexpected content type is returned by the server.
     #
 
     class UnexpectedPageException < CelerityException; end
-    
+
+    #
+    # This exception is thrown if an unexpected content type is returned by the server.
+    #
+
+    class CookieNotFoundError < CelerityException; end
+
   end # Exception
 end # Celerity

data/lib/celerity/htmlunit.rb

@@ -1,23 +1,27 @@
 module Celerity
   Jars = Dir[File.dirname(__FILE__) + '/htmlunit/*.jar']
   Jars.each { |jar| require(jar) }
-  
+
   include_class org.apache.commons.httpclient.Cookie
+  
+  module JsxHelper
+    def method_missing(meth, *args, &blk)
+      m = ["jsxGet_#{meth}", "jsx_get_#{meth}"].find { |m| respond_to?(m) }
+      m ? __send__(m) : super
+    end
+  end
 end
 
-
-
 module HtmlUnit
   include_package 'com.gargoylesoftware.htmlunit'
 
   module Html
     include_package 'com.gargoylesoftware.htmlunit.html'
   end
-  
+
   module Util
     include_package 'com.gargoylesoftware.htmlunit.util'
   end
-  
 end
 
 module Java::OrgW3cDom::NamedNodeMap
@@ -38,12 +42,24 @@ module Java::JavaLang::Iterable
     yield it.next while it.hasNext
   end
 
-end
-
+end unless Java::JavaLang::Iterable < Enumerable # depends on JRuby version
 
 class Java::ComGargoylesoftwareHtmlunitHtml::HtmlPage
   def inspect
-    '#<HtmlPage:0x%s(%s)>' % [self.hash.to_s(16), getWebResponse.getUrl.toString]
+    '#<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
+
+class Java::ComGargoylesoftwareHtmlunitJavascriptHostHtml::HTMLElement
+  include Celerity::JsxHelper
+end
+
+class Java::ComGargoylesoftwareHtmlunitJavascriptHostCss::CSSStyleDeclaration
+  include Celerity::JsxHelper
+end