walidhalabi-celerity 0.0.6.12 → 0.0.6.13

data/lib/celerity/browser.rb

@@ -32,7 +32,7 @@ module Celerity
     # @see Celerity::Container for an introduction to the main API.
     #
     # @option opts :log_level [Symbol] (:warning) @see log_level=
-    # @option opts :browser [:firefox, :internet_explorer] (:internet_explorer) Set the BrowserVersion used by HtmlUnit. Defaults to Internet Explorer.
+    # @option opts :browser [:internet_explorer, :firefox, :firefox3] (:firefox) Set the BrowserVersion used by HtmlUnit. Defaults to Firefox 2.
     # @option opts :css [Boolean] (false) Enable CSS.  Disabled by default.
     # @option opts :secure_ssl [Boolean] (true)  Disable secure SSL. Enabled by default.
     # @option opts :resynchronize [Boolean] (false) Use HtmlUnit::NicelyResynchronizingAjaxController to resynchronize Ajax calls.
@@ -56,8 +56,9 @@ module Celerity
       unless (render_types = [:html, :xml, nil]).include?(opts[:render])
         raise ArgumentError, "expected one of #{render_types.inspect} for key :render"
       end
-
-      @options = opts.dup # for ClickableElement#click_and_attach
+      
+      opts     = opts.dup # we'll delete from opts, so dup to avoid side effects
+      @options = opts.dup # keep the unmodified version around as well
 
       @render_type   = opts.delete(:render)    || :html
       @charset       = opts.delete(:charset)   || "UTF-8"
@@ -348,7 +349,7 @@ module Celerity
       max_age = opts.delete(:max_age) || (Time.now + 60*60*24) # not sure if this is correct
       secure  = opts.delete(:secure) || false
 
-      raise "unknown option: #{opts.inspect}" unless opts.empty?
+      raise(ArgumentError, "unknown option: #{opts.inspect}") unless opts.empty?
 
       cookie = Cookie.new(domain, name, value, path, max_age, secure)
       @webclient.getCookieManager.addCookie(cookie)
@@ -359,6 +360,8 @@ module Celerity
     #
     # @param [String] domain
     # @param [String] name
+    # 
+    # @raise [CookieNotFoundError] if the cookie doesn't exist
     #
 
     def remove_cookie(domain, name)
@@ -366,7 +369,7 @@ module Celerity
       cookie = cm.getCookies.find { |c| c.getDomain == domain && c.getName == name }
 
       if cookie.nil?
-        raise "no cookie with domain #{domain.inspect} and name #{name.inspect}"
+        raise CookieNotFoundError, "no cookie with domain #{domain.inspect} and name #{name.inspect}"
       end
 
       cm.removeCookie(cookie)
@@ -407,12 +410,16 @@ module Celerity
     #
 
     def wait_until(timeout = 30, &block)
+      returned = nil
+
       Timeout.timeout(timeout) do
-        until yield(self)
+        until returned = yield(self)
           refresh_page_from_window
           sleep 0.1
         end
       end
+
+      returned
     end
 
     #
@@ -424,12 +431,16 @@ module Celerity
     #
 
     def wait_while(timeout = 30, &block)
+      returned = nil
+
       Timeout.timeout(timeout) do
-        while yield(self)
+        while returned = yield(self)
           refresh_page_from_window
           sleep 0.1
         end
       end
+
+      returned
     end
 
     #
@@ -471,21 +482,18 @@ module Celerity
     # Start or stop HtmlUnit's DebuggingWebConnection. (Celerity only)
     # The output will go to /tmp/«name»
     #
-    # @param [Boolean] bool start or stop
-    # @param [String]  name required if bool is true
+    # @param [String]  name directory name
+    # @param [block]   blk block to execute
     #
 
-    def debug_web_connection(bool, name = nil)
-      if bool
-        raise "no name given" unless name
-        @old_webconnection = @webclient.getWebConnection
-        dwc = HtmlUnit::Util::DebuggingWebConnection.new(@old_webconnection, name)
-        @webclient.setWebConnection(dwc)
-        $stderr.puts "debug-webconnection on"
-      else
-        @webclient.setWebConnection(@old_webconnection) if @old_webconnection
-        $stderr.puts "debug-webconnection off"
-      end
+    def debug_web_connection(name, &blk)
+      old_wc = @webclient.getWebConnection
+
+      @webclient.setWebConnection HtmlUnit::Util::DebuggingWebConnection.new(old_wc, name)
+      res = yield
+      @webclient.setWebConnection old_wc
+
+      res
     end
 
     #
@@ -684,7 +692,7 @@ module Celerity
     #
     # Check that we have a @page object.
     #
-    # @raise [Celerity::Exception::UnknownObjectException] if no page is loaded.
+    # @raise [UnknownObjectException] if no page is loaded.
     # @api private
     #
 
@@ -722,8 +730,10 @@ module Celerity
       browser = (opts.delete(:browser) || :firefox).to_sym
 
       case browser
-      when :firefox, :ff
+      when :firefox, :ff, :ff2
         browser_version = ::HtmlUnit::BrowserVersion::FIREFOX_2
+      when :firefox3, :ff3
+        browser_version = ::HtmlUnit::BrowserVersion::FIREFOX_3
       when :internet_explorer, :ie
         browser_version = ::HtmlUnit::BrowserVersion::INTERNET_EXPLORER_7
       else

data/lib/celerity/element.rb

@@ -52,6 +52,7 @@ module Celerity
       end
 
       @conditions.freeze
+      @object = nil
     end
 
     #

data/lib/celerity/element_locator.rb

@@ -118,7 +118,7 @@ module Celerity
 
     def get_by_idents(meth, idents)
       with_nullpointer_retry do
-        @object.getAllHtmlChildElements.send(meth) do |e|
+        all_elements.send(meth) do |e|
           next unless @tags.include?(e.getTagName)
           idents.any? { |id| element_matches_ident?(e, id) }
         end
@@ -142,13 +142,22 @@ module Celerity
     def elements_by_tag_names(tags = @tags)
       with_nullpointer_retry do
         # HtmlUnit's getHtmlElementsByTagNames won't get elements in the correct
-        # order (making :index fail), so we're using getAllHtmlChildElements instead.
-        @object.getAllHtmlChildElements.select do |elem|
+        # order (making :index fail), so we're looping through all elements instead.
+        all_elements.select do |elem|
           tags.include?(elem.getTagName)
         end
       end
     end
 
+    def all_elements
+      unless @object
+        raise %{internal error in #{self.class}: @object=#{@object.inspect} @container=#{@container.inspect} @element_class=#{@element_class.inspect}
+          Please report this failure and the code/HTML that caused it at http://github.com/jarib/celerity/issues}
+      end
+
+      @object.getAllHtmlChildElements
+    end
+
     # HtmlUnit throws NPEs sometimes when we're locating elements
     # Retry seems to work fine.
     def with_nullpointer_retry(max_retries = 3)

data/lib/celerity/elements/button.rb

@@ -3,7 +3,9 @@ module Celerity
   #
   # Input: Button
   #
-  # Class representing button elements
+  # Class representing button elements.
+  #
+  # This class covers both <button> and <input type="submit|reset|image|button" /> elements.
   #
 
   class Button < InputElement

data/lib/celerity/elements/meta.rb

@@ -1,6 +1,7 @@
 module Celerity
   class Meta < Element
-    ATTRIBUTES = [:name, :id, :'http-equiv', :content, :scheme] | HTML_401_TRANSITIONAL[:i18n]
+    ATTRIBUTES  = [:name, :id, :'http-equiv', :content, :scheme] | HTML_401_TRANSITIONAL[:i18n]
+    DEFAULT_HOW = :id
     TAGS = [ Identifier.new('meta') ]
   end
 end

data/lib/celerity/exception.rb

@@ -73,5 +73,11 @@ module Celerity
 
     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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: walidhalabi-celerity
 version: !ruby/object:Gem::Version 
-  version: 0.0.6.12
+  version: 0.0.6.13
 platform: ruby
 authors: 
 - Jari Bakken
@@ -24,7 +24,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.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. This version has been modified slightly to include a workaround for a YUI issue by by Walid Halabi."
+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. This version has been modified slightly to include a workaround for a YUI issue by Walid Halabi."
 email: jari.bakken@finn.no
 executables: []
 
@@ -75,7 +75,7 @@ files:
 - lib/celerity/htmlunit/commons-logging-1.1.1.jar
 - lib/celerity/htmlunit/cssparser-0.9.5.jar
 - lib/celerity/htmlunit/htmlunit-2.6-SNAPSHOT.jar
-- lib/celerity/htmlunit/htmlunit-core-js-2.5.jar
+- lib/celerity/htmlunit/htmlunit-core-js-2.6-SNAPSHOT.jar
 - lib/celerity/htmlunit/nekohtml-1.9.13-20090507.082850-2.jar
 - lib/celerity/htmlunit/sac-1.3.jar
 - lib/celerity/htmlunit/serializer-2.7.1.jar