jarib-celerity 0.0.6.2 → 0.0.6.3

data/lib/celerity/browser.rb

@@ -275,7 +275,7 @@ module Celerity
 
     def wait
       assert_exists
-      @page.getEnclosingWindow.getJobManager.waitForJobs(10000)
+      @webclient.waitForBackgroundJavaScript(10000);
     end
 
     #
@@ -485,8 +485,25 @@ module Celerity
     # 
 
     def add_listener(type, &block)
-      @listener ||= Celerity::Listener.new(@webclient)
-      @listener.add_listener(type, &block)
+      listener.add_listener(type, &block)
+    end
+    
+    #
+    # Specify a boolean value to click either 'OK' or 'Cancel' in any confirm
+    # dialogs that might show up during the duration of the given block. 
+    # 
+    # (Celerity only)
+    #
+    # @param [Boolean] bool true to click 'OK', false to click 'cancel'
+    # @param [Proc] block A block that will trigger the confirm() call(s).
+    #
+    
+    def confirm(bool, &block)
+      blk = lambda { bool }
+      
+      listener.add_listener(:confirm, &blk)
+      yield
+      listener.remove_listener(:confirm, blk)
     end
     
     #
@@ -523,7 +540,7 @@ module Celerity
     # 
 
     def log_level
-      java.util.logging.Logger.getLogger('com.gargoylesoftware.htmlunit').level.to_s.downcase.to_sym
+      logger_for('com.gargoylesoftware.htmlunit').level.to_s.downcase.to_sym
     end
 
     #
@@ -533,7 +550,15 @@ module Celerity
     # 
 
     def log_level=(level)
-      java.util.logging.Logger.getLogger('com.gargoylesoftware.htmlunit').level = java.util.logging.Level.const_get(level.to_s.upcase)
+      log_level = java.util.logging.Level.const_get(level.to_s.upcase)
+
+      # loggers = [
+      #   logger_for('com.gargoylesoftware.htmlunit'), 
+      #   logger_for("com.gargoylesoftware.htmlunit.html.HtmlElement")
+      # ]
+      # loggers.each { |logger| logger.level = log_level }
+
+      logger_for('com.gargoylesoftware.htmlunit').level = log_level
     end
 
     #
@@ -574,8 +599,6 @@ module Celerity
       @webclient.throwExceptionOnFailingStatusCode
     end
     
-
-
     #
     # Sets the current page object for the browser
     #
@@ -637,10 +660,10 @@ module Celerity
     #
 
     def setup_webclient(opts)
-      browser = (opts.delete(:browser) || :internet_explorer).to_sym
+      browser = (opts.delete(:browser) || :firefox).to_sym
 
       case browser
-      when :firefox
+      when :firefox, :ff
         browser_version = ::HtmlUnit::BrowserVersion::FIREFOX_2
       when :internet_explorer, :ie
         browser_version = ::HtmlUnit::BrowserVersion::INTERNET_EXPLORER_7_0
@@ -717,5 +740,13 @@ module Celerity
       end
     end
 
+    def logger_for(class_string)
+      java.util.logging.Logger.getLogger(class_string)
+    end
+    
+    def listener
+      @listener ||= Celerity::Listener.new(@webclient)
+    end
+
   end # Browser
 end # Celerity

data/lib/celerity/element.rb

@@ -126,14 +126,8 @@ module Celerity
     # 
 
     def visible?
-      obj = self
-      while obj
-        return false if obj.respond_to?(:type) && obj.type == 'hidden'
-        return false if obj.style =~ /display\s*:\s*none|visibility\s*:\s*hidden/
-        obj = obj.parent
-      end
-
-      return true
+      assert_exists
+      @object.isVisible
     end
 
     #

data/lib/celerity/elements/form.rb

@@ -11,6 +11,8 @@ module Celerity
     #
     # Submits the form.
     # 
+    # This method should be avoided - invoke the user interface element that triggers the submit instead.
+    # 
     
     def submit
       assert_exists

data/lib/celerity/elements/text_field.rb

@@ -13,6 +13,10 @@ module Celerity
              Identifier.new('input', :type => ["text", "password", /^(?!(#{ Regexp.union(*NON_TEXT_TYPES) })$)/])  ]
     DEFAULT_HOW = :name
     
+    def visible?
+      type == 'hidden' ? false : super
+    end
+    
     #
     # Clear the text field.
     #
@@ -129,7 +133,7 @@ module Celerity
     private
 
     def type_string(value)
-      java.lang.String.new(value.to_java_bytes, @container.page.getPageEncoding).toCharArray.each do |char|
+      java.lang.String.new(value.to_java_bytes, @browser.page.getPageEncoding).toCharArray.each do |char|
         @container.update_page @object.type(char)
       end
     end
@@ -157,6 +161,7 @@ module Celerity
     DEFAULT_HOW = :name
     
     def visible?
+      assert_exists
       false
     end
   end

data/lib/celerity/htmlunit.rb

@@ -5,8 +5,6 @@ module Celerity
   include_class org.apache.commons.httpclient.Cookie
 end
 
-
-
 module HtmlUnit
   include_package 'com.gargoylesoftware.htmlunit'
 
@@ -17,7 +15,6 @@ module HtmlUnit
   module Util
     include_package 'com.gargoylesoftware.htmlunit.util'
   end
-  
 end
 
 module Java::OrgW3cDom::NamedNodeMap
@@ -38,12 +35,10 @@ 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]
   end
 end
-

data/lib/celerity/listener.rb

@@ -83,10 +83,15 @@ module Celerity
     #
     # interface ConfirmHandler
     #
+    # The returned value is determined by the last registered :confirm listener proc.
+    # If it is nil, return true, otherwise return that value as a boolean.
+    #
+    # @see Browser#confirm
+    # 
     
     def handleConfirm(page, message)
-      @procs[:confirm].each { |h| h.call(page, message) }
-      true # TODO: let user specify this somehow
+      val = @procs[:confirm].map { |h| h.call(page, message) }.last
+      val.nil? || !!val
     end
 
     #

data/lib/celerity/version.rb

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

metadata

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