celerity 0.0.4 → 0.0.6

data/lib/celerity/htmlunit.rb

@@ -0,0 +1,49 @@
+module Celerity
+  Jars = Dir[File.dirname(__FILE__) + '/htmlunit/*.jar']
+  Jars.each { |jar| require(jar) }
+  
+  include_class org.apache.commons.httpclient.Cookie
+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
+  include Enumerable
+
+  def each
+    0.upto(getLength - 1) do |idx|
+      yield item(idx)
+    end
+  end
+end
+
+module Java::JavaLang::Iterable
+  include Enumerable
+
+  def each
+    it = iterator
+    yield it.next while it.hasNext
+  end
+
+end
+
+
+class Java::ComGargoylesoftwareHtmlunitHtml::HtmlPage
+  def inspect
+    '#<HtmlPage:0x%s(%s)>' % [self.hash.to_s(16), getWebResponse.getUrl.toString]
+  end
+end
+

data/lib/celerity/identifier.rb

@@ -1,10 +1,11 @@
 module Celerity
 
-  class Identifier < Struct.new(:tag, :attributes)
+  Identifier = Struct.new(:tag, :attributes) do
     attr_accessor :text
-    
+
     def initialize(t, a={})
       super(t, a)
     end
   end
+
 end

data/lib/celerity/input_element.rb

@@ -3,10 +3,10 @@ module Celerity
     include ClickableElement
     include DisabledElement
 
-    ATTRIBUTES = BASE_ATTRIBUTES | [:type, :name, :value, :checked, :disabled, :readonly, :size, :maxlength, 
-                                    :src, :alt, :usemap, :ismap, :tabindex, :accesskey, :onfocus, :onblur, 
-                                    :onselect, :onchange, :accept, :align]    
-    
+    ATTRIBUTES = BASE_ATTRIBUTES | [:type, :name, :value, :checked, :disabled, :readonly, :size, :maxlength,
+                                    :src, :alt, :usemap, :ismap, :tabindex, :accesskey, :onfocus, :onblur,
+                                    :onselect, :onchange, :accept, :align]
+
     def readonly?
       assert_exists
       @object.isAttributeDefined('readonly')
@@ -17,7 +17,7 @@ module Celerity
     def assert_not_readonly
       if readonly?
         raise ObjectReadOnlyException,
-          "InputElement #{identifier_string()} is read only."
+          "InputElement #{identifier_string} is read only."
       end
     end
 

data/lib/celerity/listener.rb

@@ -0,0 +1,135 @@
+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
+    include com.gargoylesoftware.htmlunit.PromptHandler
+    include com.gargoylesoftware.htmlunit.html.HTMLParserListener
+    include com.gargoylesoftware.htmlunit.IncorrectnessListener
+    include com.gargoylesoftware.htmlunit.StatusHandler
+    include com.gargoylesoftware.htmlunit.WebWindowListener
+    include com.gargoylesoftware.htmlunit.attachment.AttachmentHandler
+
+    def initialize(webclient)
+      @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
+        @webclient.setStatusHandler(self)
+      when :alert
+        @webclient.setAlertHandler(self)
+      when :attachment
+        @webclient.setAttachmentHandler(self)
+      when :web_window_event
+        @webclient.addWebWindowListener(self)
+      when :html_parser
+        @webclient.setHTMLParserListener(self)
+      when :incorrectness
+        @webclient.setIncorrectnessListener(self)
+      when :confirm
+        @webclient.setConfirmHandler(self)
+      when :prompt
+        @webclient.setPromptHandler(self)
+      else
+        raise ArgumentError, "unknown listener type #{type.inspect}"
+      end
+
+      @procs[type] << block
+    end
+
+    def remove_listener(type, proc_or_index)
+      unless @procs.has_key?(type)
+        raise ArgumentError, "unknown listener type #{type.inspect}"
+      end
+
+      case proc_or_index
+      when Fixnum
+        @procs[type].delete_at proc_or_index
+      when Proc
+        @procs[type].delete proc_or_index
+      else
+        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
+    #
+    
+    def handleConfirm(page, message)
+      @procs[:confirm].each { |h| h.call(page, message) }
+    end
+
+    #
+    # 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
+    alias_method :webWindowOpened, :webWindowClosed
+    alias_method :webWindowContentChanged, :webWindowClosed
+
+    #
+    # interface HTMLParserListener
+    #
+    
+    def error(message, url, line, column, key)
+      @procs[:html_parser].each { |h| h.call(message, url, line, column, key) }
+    end
+    alias_method :warning, :error
+
+    #
+    # interface IncorrectnessListener
+    #
+    
+    def notify(message, origin)
+      @procs[:incorrectness].each { |h| h.call(message, origin) }
+    end
+
+  end # Listener
+end # Celerity

data/lib/celerity/util.rb

@@ -0,0 +1,88 @@
+module Celerity
+  module Util
+    module_function
+
+    HtmlUnit2CelerityElement = {
+      HtmlUnit::Html::HtmlAnchor                => Celerity::Link,
+      HtmlUnit::Html::HtmlArea                  => Celerity::Area,
+      HtmlUnit::Html::HtmlButton                => Celerity::Button,
+      HtmlUnit::Html::HtmlSubmitInput           => Celerity::Button,
+      HtmlUnit::Html::HtmlResetInput            => Celerity::Button,
+      HtmlUnit::Html::HtmlImageInput            => Celerity::Button,
+      HtmlUnit::Html::HtmlButtonInput           => Celerity::Button,
+      HtmlUnit::Html::HtmlCaption               => Celerity::Button, # ?
+      HtmlUnit::Html::HtmlCheckBoxInput         => Celerity::CheckBox,
+      HtmlUnit::Html::HtmlDefinitionDescription => Celerity::Dd,
+      HtmlUnit::Html::HtmlDefinitionList        => Celerity::Dl,
+      HtmlUnit::Html::HtmlDefinitionTerm        => Celerity::Dt,
+      HtmlUnit::Html::HtmlDivision              => Celerity::Div,
+      HtmlUnit::Html::HtmlFileInput             => Celerity::FileField,
+      HtmlUnit::Html::HtmlForm                  => Celerity::Form,
+      HtmlUnit::Html::HtmlFrame                 => Celerity::Frame,
+      HtmlUnit::Html::HtmlHeading1              => Celerity::H1,
+      HtmlUnit::Html::HtmlHeading2              => Celerity::H2,
+      HtmlUnit::Html::HtmlHeading3              => Celerity::H3,
+      HtmlUnit::Html::HtmlHeading4              => Celerity::H4,
+      HtmlUnit::Html::HtmlHeading5              => Celerity::H5,
+      HtmlUnit::Html::HtmlHeading6              => Celerity::H6,
+      HtmlUnit::Html::HtmlHiddenInput           => Celerity::Hidden,
+      HtmlUnit::Html::HtmlImage                 => Celerity::Image,
+      HtmlUnit::Html::HtmlLabel                 => Celerity::Label,
+      HtmlUnit::Html::HtmlLink                  => Celerity::Link,
+      HtmlUnit::Html::HtmlListItem              => Celerity::Li,
+      HtmlUnit::Html::HtmlMap                   => Celerity::Map,
+      HtmlUnit::Html::HtmlOption                => Celerity::Option,
+      HtmlUnit::Html::HtmlOrderedList           => Celerity::Ol,
+      HtmlUnit::Html::HtmlParagraph             => Celerity::P,
+      HtmlUnit::Html::HtmlPasswordInput         => Celerity::TextField,
+      HtmlUnit::Html::HtmlPreformattedText      => Celerity::Pre,
+      HtmlUnit::Html::HtmlRadioButtonInput      => Celerity::Radio,
+      HtmlUnit::Html::HtmlSelect                => Celerity::SelectList,
+      HtmlUnit::Html::HtmlSpan                  => Celerity::Span,
+      HtmlUnit::Html::HtmlTable                 => Celerity::Table,
+      HtmlUnit::Html::HtmlTableBody             => Celerity::TableBody,
+      HtmlUnit::Html::HtmlTableCell             => Celerity::TableCell,
+      HtmlUnit::Html::HtmlTableFooter           => Celerity::TableFooter,
+      HtmlUnit::Html::HtmlTableHeader           => Celerity::TableHeader,
+      HtmlUnit::Html::HtmlTableRow              => Celerity::TableRow,
+      HtmlUnit::Html::HtmlTextArea              => Celerity::TextField,
+      HtmlUnit::Html::HtmlTextInput             => Celerity::TextField,
+      HtmlUnit::Html::HtmlUnorderedList         => Celerity::Ul
+    }
+
+    def htmlunit2celerity(klass)
+      HtmlUnit2CelerityElement[klass]
+    end
+
+    #
+    # HtmlUnit will recognize most common file types, but custom ones can be added here.
+    # Used for FileField uploads.
+    #
+    
+    ContentTypes = {
+      ".bmp" => "image/x-ms-bmp",
+      ".doc" => "application/msword",
+      ".odg" => "application/vnd.oasis.opendocument.graphics",
+      ".odp" => "application/vnd.oasis.opendocument.presentation",
+      ".ods" => "application/vnd.oasis.opendocument.spreadsheet",
+      ".odt" => "application/vnd.oasis.opendocument.text",
+      ".ppt" => "application/vnd.ms-powerpoint",
+      ".xls" => "application/vnd.ms-excel",
+    }
+
+    def content_type_for(path)
+      if ct = java.net.URLConnection.getFileNameMap.getContentTypeFor(path)
+        return ct
+      else
+        ContentTypes[File.extname(path).downcase]
+      end
+    end
+
+    def normalize_text(string)
+      string.gsub("\302\240", ' '). # non-breaking space 00A0
+             gsub(/\n|\t/, '').     # get rid of newlines/tabs
+             strip
+    end
+
+  end
+end

data/lib/celerity/version.rb

@@ -2,8 +2,9 @@ module Celerity #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 4
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    TINY  = 6
+    PATCH = nil # Set to nil for official release
+    
+    STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end
 end

data/lib/celerity/watir_compatibility.rb

@@ -1,75 +1,85 @@
 module Celerity
   class Browser
     class << self
-      # added for Watir compatability - not in use by Celerity
+      
+      # Added for Watir compatibility - not in use by Celerity
       attr_accessor :speed, :attach_timeout, :visible
-      # added for Watir compatability - not in use by Celerity
+      # Added for Watir compatibility - not in use by Celerity
       alias_method :start_window, :start
-      # added for Watir compatability - not in use by Celerity
+      # Added for Watir compatibility - not in use by Celerity
       def reset_attach_timeout; @attach_timeout = 2.0; end
-      # added for Watir compatability - not in use by Celerity
+      # Added for Watir compatibility - not in use by Celerity
       def each; end
-      # added for Watir compatability - not in use by Celerity
+      # Added for Watir compatibility - not in use by Celerity
       def quit; end
-      # added for Watir compatability - not in use by Celerity
+      # Added for Watir compatibility - not in use by Celerity
       def set_fast_speed; @speed = :fast; end
-      # added for Watir compatability - not in use by Celerity
-      def set_slow_speed; @speed = :slow; end  
+      # Added for Watir compatibility - not in use by Celerity
+      def set_slow_speed; @speed = :slow; end
     end
 
-    # added for Watir compatability - not in use by Celerity
+    # Added for Watir compatibility - not in use by Celerity
     attr_accessor :visible
-   
-    # added for Watir compatability - not in use by Celerity
+
+    # Added for Watir compatibility - not in use by Celerity
     def bring_to_front; true; end
-    # added for Watir compatability - not in use by Celerity
+    # Added for Watir compatibility - not in use by Celerity
     def speed=(s); s end
-    # added for Watir compatability - not in use by Celerity
-    def wait; end
+    # Added for Watir compatibility - not in use by Celerity
+    def status; '' end
   end
-  
-  
+
+
   module ClickableElement
     alias_method :click_no_wait,    :click
   end
-  
+
   module Container
     alias_method :checkbox,         :check_box
     alias_method :checkBox,         :check_box
     alias_method :body,             :tbody
     alias_method :bodies,           :tbodies
   end
-    
+
+  class Element
+    alias_method :exists,           :exists?
+    alias_method :innerText,        :text
+    alias_method :inner_text,       :text
+  end
+
   class Image
     alias_method :hasLoaded?,       :loaded?
     alias_method :has_loaded?,      :loaded?
     alias_method :fileSize,         :file_size
     alias_method :fileCreatedDate,  :file_created_date
   end
-  
+
    class Link
      alias_method :click_no_wait,   :click
    end
-  
+
   class RadioCheckCommon
     alias_method :is_set?,          :set?
     alias_method :get_state,        :set?
     alias_method :isSet?,           :set?
     alias_method :getState,         :set?
   end
-  
+
   class SelectList
-    alias_method :getSelectedItems, :get_selected_items
-    alias_method :getAllContents,   :get_all_contents
-    alias_method :clearSelection,   :clear_selection
+    alias_method :getSelectedItems, :selected_options
+    alias_method :getAllContents,   :options
+    alias_method :clearSelection,   :clear
+    alias_method :clear_selection,  :clear
     alias_method :select_value,     :select
     alias_method :includes?,        :include?
   end
-  
+
   class TextField
     alias_method :dragContentsTo,   :drag_contents_to
     alias_method :getContents,      :value
     alias_method :get_contents,     :value
+    
+    def requires_typing; end
   end
 end