jarib-celerity 0.0.5.4 → 0.0.5.5

data/lib/celerity/browser.rb

@@ -179,10 +179,10 @@ module Celerity
       goto(@last_url) if @last_url
     end
 
-    # Wait for ajax calls to finish
-    def join_threads
+    # Wait for javascript jobs to finish
+    def wait
       assert_exists
-      @page.getEnclosingWindow.getThreadManager.joinAll(10000)
+      @page.getEnclosingWindow.getJobManager.waitForAllJobsToFinish(10000)
     end
 
     # Refresh the current page
@@ -191,12 +191,24 @@ module Celerity
       self.page = @page.refresh
     end
 
-    # Clears all cookies. (Celerity-specific API)
+    # Clears all cookies. (Celerity only)
     def clear_cookies
       @webclient.getCookieManager.clearCookies
     end
 
-    # Execute the given JavaScript on the current page. (Celerity-specific API)
+    # Get the cookies for this session. (Celerity only)
+    def cookies
+      result = {}
+      
+      cookies = @webclient.getCookieManager.getCookies.to_a
+      cookies.each do |cookie|
+        result[cookie.getName] = cookie.getValue
+      end
+      
+      result
+    end
+
+    # Execute the given JavaScript on the current page. (Celerity only)
     # @return [Object] The resulting Object
     def execute_script(source)
       assert_exists
@@ -219,7 +231,7 @@ module Celerity
       end
     end
 
-    # Wait until the given block evaluates to true (Celerity-specific API)
+    # Wait until the given block evaluates to true (Celerity only)
     #
     # @param [Fixnum] timeout Number of seconds to wait before timing out (default: 30).
     # @yieldparam [Celerity::Browser] browser The browser instance.
@@ -233,7 +245,7 @@ module Celerity
       end
     end
 
-    # Wait while the given block evaluates to true (Celerity-specific API)
+    # Wait while the given block evaluates to true (Celerity only)
     #
     # @param [Fixnum] timeout Number of seconds to wait before timing out (default: 30).
     # @yieldparam [Celerity::Browser] browser The browser instance.

data/lib/celerity/clickable_element.rb

@@ -1,26 +1,53 @@
 module Celerity
   module ClickableElement
 
-    # clicks the element
-    def click
-      assert_exists
-      assert_enabled if respond_to?(:assert_enabled)
+    #
+    # click the element
+    #
 
+    def click
+      assert_exists_and_enabled
       @container.update_page(@object.click)
     end
 
+    #
+    # double click the element (Celerity only)
+    #
+
+    def double_click
+      assert_exists_and_enabled
+      @container.update_page(@object.dblClick)
+    end
+
+    #
+    # right click the element (Celerity only)
+    #
+
+    def right_click
+      assert_exists_and_enabled
+      @container.update_page(@object.rightClick)
+    end
+
+    #
     # Click the element and return a new Browser instance with the resulting page.
     # This is useful for elements that trigger popups when clicked.
     #
     # @return [Celerity::Browser]
-    def click_and_attach
-      assert_exists
-      assert_enabled if respond_to?(:assert_enabled)
+    #
 
+    def click_and_attach
+      assert_exists_and_enabled
       browser = Browser.new(:log_level => @browser.log_level)
       browser.update_page(@object.click)
 
       browser
     end
+
+    private
+
+    def assert_exists_and_enabled
+      assert_exists
+      assert_enabled if respond_to?(:assert_enabled)
+    end
   end
 end

data/lib/celerity/element_collections.rb

@@ -49,6 +49,20 @@ module Celerity
       end
     end
 
+    # Get the first element in this collection. (Celerity-specific)
+    #
+    # @return [Celerity::Element] Returns a subclass of Celerity::Element
+    def first
+      self[INDEX_OFFSET]
+    end
+
+    # Get the last element in this collection. (Celerity-specific)
+    #
+    # @return [Celerity::Element] Returns a subclass of Celerity::Element
+    def last
+      self[INDEX_OFFSET - 1]
+    end
+
     # Note: This can be quite useful in irb:
     #
     #   puts browser.text_fields

data/lib/celerity/elements/label.rb

@@ -1,6 +1,8 @@
 module Celerity
 
   class Label < Element
+    include ClickableElement
+    
     TAGS = [ Identifier.new('label') ]
     ATTRIBUTES = BASE_ATTRIBUTES | [:for, :accesskey, :onfocus, :onblur]
     DEFAULT_HOW = :text

data/lib/celerity/elements/table.rb

@@ -1,6 +1,7 @@
 module Celerity
 
   class Table < Element
+    include ClickableElement
     include Enumerable
     include Container
 

data/lib/celerity/elements/table_cell.rb

@@ -1,6 +1,7 @@
 module Celerity
 
   class TableCell < Element
+    include ClickableElement
     include Celerity::Exception
     include Container
 

data/lib/celerity/elements/table_elements.rb

@@ -1,6 +1,7 @@
 module Celerity
   class TableElement < Element
     include Enumerable
+    include ClickableElement
 
     ATTRIBUTES = BASE_ATTRIBUTES | CELLHALIGN_ATTRIBUTES | CELLVALIGN_ATTRIBUTES
     DEFAULT_HOW = :id

data/lib/celerity/elements/table_row.rb

@@ -1,6 +1,7 @@
 module Celerity
   class TableRow < Element
     include Enumerable
+    include ClickableElement
 
     TAGS = [ Identifier.new('tr') ]
     DEFAULT_HOW = :id

data/lib/celerity/util.rb

@@ -3,45 +3,48 @@ module Celerity
     module_function
 
     HtmlUnit2CelerityElement = {
-      HtmlUnit::Html::HtmlAnchor           => Celerity::Link,
-      HtmlUnit::Html::HtmlArea             => Celerity::Area,
-      HtmlUnit::Html::HtmlButton           => Celerity::Button,
-      HtmlUnit::Html::HtmlButtonInput      => Celerity::Button,
-      HtmlUnit::Html::HtmlCaption          => Celerity::Button, # ?
-      HtmlUnit::Html::HtmlCheckBoxInput    => Celerity::CheckBox,
-      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::Area,
-      HtmlUnit::Html::HtmlTextInput        => Celerity::TextField,
-      HtmlUnit::Html::HtmlUnorderedList    => Celerity::Ul
+      HtmlUnit::Html::HtmlAnchor                => Celerity::Link,
+      HtmlUnit::Html::HtmlArea                  => Celerity::Area,
+      HtmlUnit::Html::HtmlButton                => 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)
@@ -71,7 +74,7 @@ module Celerity
 
     def normalize_text(string)
       string.gsub("\302\240", ' '). # non-breaking space 00A0
-             gsub(/\n|\t/, '' ).    # get rid of newlines/tabs ( could switch back to asText()? )
+             gsub(/\n|\t/, '').     # get rid of newlines/tabs
              strip
     end
 

data/lib/celerity/version.rb

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

data/lib/celerity/watir_compatibility.rb

@@ -25,8 +25,6 @@ module Celerity
     # Added for Watir compatability - 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 compatability - not in use by Celerity
     def status; '' end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jarib-celerity
 version: !ruby/object:Gem::Version 
-  version: 0.0.5.4
+  version: 0.0.5.5
 platform: ruby
 authors: 
 - Jari Bakken
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-04 00:00:00 -08:00
+date: 2009-02-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
+        version: 1.8.2
     version: 
 description: "Celerity is a JRuby wrapper around HtmlUnit \xE2\x80\x93 a headless Java browser with JavaScript support. It provides a simple API for programmatic navigation through web applications. Celerity aims at being API compatible with Watir."
 email: jari.bakken@finn.no