jarib-celerity 0.0.6 → 0.0.6.1

data/lib/celerity/browser.rb

@@ -89,7 +89,9 @@ module Celerity
       request = HtmlUnit::WebRequestSettings.new(::Java::JavaNet::URL.new(uri))
       request.setCharset(@charset)
 
-      self.page = @webclient.getPage(request)
+      rescue_status_code_exception do
+        self.page = @webclient.getPage(request)
+      end
 
       url()
     end
@@ -180,6 +182,14 @@ module Celerity
       
       Hash[*@page.getWebResponse.getResponseHeaders.map { |obj| [obj.name, obj.value] }.flatten]
     end
+    
+    #
+    # @return [Fixnum] status code of the last request
+    #
+    
+    def status_code
+      @page.getWebResponse.getStatusCode
+    end
 
     #
     # @return [String] content-type as in 'text/html'
@@ -190,7 +200,7 @@ module Celerity
       
       @page.getWebResponse.getContentType
     end
-
+    
     #
     # @return [IO, nil] page contents as an IO, returns nil if no page is loaded.
     # 
@@ -265,7 +275,7 @@ module Celerity
 
     def wait
       assert_exists
-      @page.getEnclosingWindow.getJobManager.waitForAllJobsToFinish(10000)
+      @page.getEnclosingWindow.getJobManager.waitForJobs(10000)
     end
 
     #
@@ -535,6 +545,36 @@ module Celerity
       !!@page
     end
     alias_method :exists?, :exist?
+    
+    #
+    # Turn on/off javascript exceptions
+    # 
+    # @param [Bool]
+    # 
+
+    def javascript_exceptions=(bool)
+      @webclient.throwExceptionOnScriptError = bool
+    end
+    
+    def javascript_exceptions
+      @webclient.throwExceptionOnScriptError
+    end
+    
+    #
+    # Turn on/off status code exceptions
+    # 
+    # @param [Bool]
+    # 
+    
+    def status_code_exceptions=(bool)
+      @webclient.throwExceptionOnFailingStatusCode = bool
+    end
+    
+    def status_code_exceptions
+      @webclient.throwExceptionOnFailingStatusCode
+    end
+    
+
 
     #
     # Sets the current page object for the browser
@@ -615,13 +655,13 @@ module Celerity
         @webclient = ::HtmlUnit::WebClient.new(browser_version)  
       end
       
-      @webclient.throwExceptionOnScriptError = false unless opts.delete(:javascript_exceptions)
-      @webclient.throwExceptionOnFailingStatusCode = false unless opts.delete(:status_code_exceptions)
-      @webclient.cssEnabled = false unless opts.delete(:css)
-      @webclient.useInsecureSSL = opts.delete(:secure_ssl) == false
+      self.javascript_exceptions  = false unless opts.delete(:javascript_exceptions)
+      self.status_code_exceptions = false unless opts.delete(:status_code_exceptions)
+      @webclient.cssEnabled       = false unless opts.delete(:css)
+      @webclient.useInsecureSSL   = opts.delete(:secure_ssl) == false
       @webclient.setAjaxController(::HtmlUnit::NicelyResynchronizingAjaxController.new) if opts.delete(:resynchronize)
     end
-
+    
     #
     # This *should* be unneccessary, but sometimes the page we get from the
     # window is different (ie. a different object) from our current @page

data/lib/celerity/clickable_element.rb

@@ -7,7 +7,7 @@ module Celerity
 
     def click
       assert_exists_and_enabled
-      @container.update_page(@object.click)
+      rescue_status_code_exception { @container.update_page(@object.click) }
     end
 
     #
@@ -16,7 +16,7 @@ module Celerity
 
     def double_click
       assert_exists_and_enabled
-      @container.update_page(@object.dblClick)
+      rescue_status_code_exception { @container.update_page(@object.dblClick) }
     end
 
     #
@@ -25,7 +25,7 @@ module Celerity
 
     def right_click
       assert_exists_and_enabled
-      @container.update_page(@object.rightClick)
+      rescue_status_code_exception { @container.update_page(@object.rightClick) }
     end
 
     #
@@ -38,7 +38,7 @@ module Celerity
     def click_and_attach
       assert_exists_and_enabled
       browser = Browser.new(:log_level => @browser.log_level)
-      browser.update_page(@object.click)
+      rescue_status_code_exception { browser.update_page(@object.click) }
 
       browser
     end

data/lib/celerity/container.rb

@@ -75,20 +75,6 @@ module Celerity
       @browser.page = page
     end
     
-    #
-    # Used internally.
-    #
-    # @param [String] string The string to match against.
-    # @param [Regexp, String, #to_s] what The match we're looking for.
-    # @return [Fixnum, true, false, nil]
-    #
-    # @api private
-    #
-    
-    def matches?(string, what)
-      Regexp === what ? string =~ what : string == what.to_s
-    end
-
     #--
     # below methods sorted alphabetically
     #++
@@ -761,6 +747,33 @@ module Celerity
     def uls
       Uls.new(self)
     end
+    
+    private
+    
+    #
+    # Used internally.
+    #
+    # @param [String] string The string to match against.
+    # @param [Regexp, String, #to_s] what The match we're looking for.
+    # @return [Fixnum, true, false, nil]
+    #
+    # @api private
+    #
+    
+    def matches?(string, what)
+      Regexp === what ? string =~ what : string == what.to_s
+    end
+    
+    #
+    # Rescues HtmlUnit::FailingHttpStatusCodeException and re-raises as 
+    # Celerity::NavigationException to avoid the huge JRuby backtrace
+    # 
+    
+    def rescue_status_code_exception(&blk)
+      yield
+    rescue HtmlUnit::FailingHttpStatusCodeException => e
+      raise NavigationException, e.message, caller
+    end
 
   end # Container
 end # Celerity

data/lib/celerity/listener.rb

@@ -86,6 +86,7 @@ module Celerity
     
     def handleConfirm(page, message)
       @procs[:confirm].each { |h| h.call(page, message) }
+      true # TODO: let user specify this somehow
     end
 
     #

data/lib/celerity/version.rb

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

data/lib/celerity.rb

@@ -2,13 +2,13 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) ||
 
 raise "Celerity only works on JRuby at the moment." unless RUBY_PLATFORM =~ /java/
 
-require 'java'
+require "java"
 require "logger"
 require "uri"
 require "pp"
 require "timeout"
 require "time"
-require 'drb'
+require "drb"
 require "fileutils"
 require "thread"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jarib-celerity
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.6.1
 platform: ruby
 authors: 
 - Jari Bakken
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-19 00:00:00 -07:00
+date: 2009-03-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.10.0
+        version: 1.11.0
     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