jarib-celerity 0.0.6.10 → 0.0.6.11

data/lib/celerity.rb

@@ -18,9 +18,18 @@ module Celerity
 
   @index_offset = 1
   class << self
-    attr_accessor :index_offset
+
+    #
+    # This index_offset attribute controls the indexing used when locating
+    # elements by :index or fetching from Celerity::ElementCollections.
+    #
+    # By default it is set to 1 for Watir compatibility, but users who use
+    # Celerity exlusively may want it set to 0 to make Celerity more consistent with Ruby.
+    #
+    def index_offset=(n) @index_offset = n end
+    def index_offset() @index_offset end
   end
-  
+
   DIR = File.expand_path(File.dirname(__FILE__) + "/celerity")
 end
 

data/lib/celerity/browser.rb

@@ -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"
@@ -407,12 +408,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 +429,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 +480,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
 
     #
@@ -722,8 +728,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/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: jarib-celerity
 version: !ruby/object:Gem::Version 
-  version: 0.0.6.10
+  version: 0.0.6.11
 platform: ruby
 authors: 
 - Jari Bakken
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-13 00:00:00 -07:00
+date: 2009-06-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -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