jarib-celerity 0.0.6.12 → 0.0.6.14

data/lib/celerity.rb

@@ -44,6 +44,7 @@ require "celerity/element_locator"
 require "celerity/identifier"
 require "celerity/short_inspect"
 require "celerity/container"
+require "celerity/xpath_support"
 require "celerity/element"
 require "celerity/input_element"
 require "celerity/elements/non_control_elements"

data/lib/celerity/browser.rb

@@ -1,6 +1,7 @@
 module Celerity
   class Browser
     include Container
+    include XpathSupport
 
     attr_accessor :page, :object, :charset
     attr_reader :webclient, :viewer, :options
@@ -238,33 +239,6 @@ module Celerity
       super
     end
 
-    #
-    # Get the first element found matching the given XPath.
-    #
-    # @param [String] xpath
-    # @return [Celerity::Element] An element subclass (or Element if none is found)
-    #
-
-    def element_by_xpath(xpath)
-      assert_exists
-      obj = @page.getFirstByXPath(xpath)
-      element_from_dom_node(obj)
-    end
-
-    #
-    # Get all the elements matching the given XPath.
-    #
-    # @param [String] xpath
-    # @return [Array<Celerity::Element>] array of elements
-    #
-
-    def elements_by_xpath(xpath)
-      assert_exists
-      objects = @page.getByXPath(xpath)
-      # should use an ElementCollection here?
-      objects.map { |o| element_from_dom_node(o) }.compact
-    end
-
     #
     # @return [HtmlUnit::HtmlHtml] the underlying HtmlUnit document.
     #
@@ -312,7 +286,7 @@ module Celerity
 
     def refresh
       assert_exists
-      self.page = @page.refresh
+      @page.refresh
     end
 
     #
@@ -719,6 +693,7 @@ module Celerity
     #
 
     def page=(value)
+      return if @page == value
       @page = value
 
       if @page.respond_to?("getDocumentElement")
@@ -752,6 +727,37 @@ module Celerity
       element_from_dom_node(page.getFocusedElement())
     end
 
+    #
+    # Enable Celerity's internal WebWindowEventListener
+    #
+    # @api private
+    #
+
+    def enable_event_listener
+      @event_listener ||= lambda do |event|
+        self.page = @page ? @page.getEnclosingWindow.getEnclosedPage : event.getNewPage
+      end
+
+      listener.add_listener(:web_window_event, &@event_listener)
+    end
+
+    #
+    # Disable Celerity's internal WebWindowEventListener
+    #
+    # @api private
+    #
+
+    def disable_event_listener
+      listener.remove_listener(:web_window_event, @event_listener)
+
+      if block_given?
+        result = yield
+        enable_event_listener
+
+        result
+      end
+    end
+
     private
 
     #
@@ -803,6 +809,7 @@ module Celerity
       self.ignore_pattern         = opts.delete(:ignore_pattern) if opts[:ignore_pattern]
 
       @webclient.setAjaxController(::HtmlUnit::NicelyResynchronizingAjaxController.new) if opts.delete(:resynchronize)
+      enable_event_listener
     end
 
     #
@@ -851,15 +858,6 @@ module Celerity
       @viewer = DefaultViewer
     end
 
-    #
-    # Convert the given HtmlUnit object to a Celerity object
-    #
-
-    def element_from_dom_node(obj)
-      element_class = Celerity::Util.htmlunit2celerity(obj.class) || Element
-      element_class.new(self, :object, obj)
-    end
-
     def listener
       @listener ||= Celerity::Listener.new(@webclient)
     end

data/lib/celerity/clickable_element.rb

@@ -7,7 +7,7 @@ module Celerity
 
     def click
       assert_exists_and_enabled
-      rescue_status_code_exception { @container.update_page(@object.click) }
+      rescue_status_code_exception { @object.click }
     end
 
     #
@@ -16,7 +16,7 @@ module Celerity
 
     def double_click
       assert_exists_and_enabled
-      rescue_status_code_exception { @container.update_page(@object.dblClick) }
+      rescue_status_code_exception { @object.dblClick }
     end
 
     #
@@ -25,7 +25,7 @@ module Celerity
 
     def right_click
       assert_exists_and_enabled
-      rescue_status_code_exception { @container.update_page(@object.rightClick) }
+      rescue_status_code_exception { @object.rightClick }
     end
 
     #
@@ -42,7 +42,9 @@ module Celerity
         @browser.webclient.get_cookie_manager
       ) # hirobumi: we do want cookies as well.
 
-      rescue_status_code_exception { browser.update_page(@object.click) }
+      @browser.disable_event_listener do
+        rescue_status_code_exception { browser.page = @object.click }
+      end
 
       browser
     end
@@ -56,7 +58,9 @@ module Celerity
 
     def download
       assert_exists_and_enabled
-      @object.click.getWebResponse.getContentAsStream.to_io
+      @browser.disable_event_listener do
+        @object.click.getWebResponse.getContentAsStream.to_io
+      end
     end
 
     private

data/lib/celerity/container.rb

@@ -75,15 +75,6 @@ module Celerity
       container
     end
 
-    #
-    # Used internally to update the page object.
-    # @api private
-    #
-
-    def update_page(page)
-      @browser.page = page
-    end
-
     #--
     # below methods sorted alphabetically
     #++

data/lib/celerity/elements/button.rb

@@ -14,7 +14,7 @@ module Celerity
 
     # Attribute list is a little weird due to this class covering both <button>
     # and <input type="submit|reset|image|button" />
-    ATTRIBUTES = BASE_ATTRIBUTES | [:type, :disabled, :tabindex, :accesskey, :onfocus, :onblur] | [:src, :usemap, :ismap]
+    ATTRIBUTES = ATTRIBUTES | [:type, :disabled, :tabindex, :accesskey, :onfocus, :onblur] | [:src, :usemap, :ismap]
     DEFAULT_HOW = :value
 
     #

data/lib/celerity/elements/file_field.rb

@@ -15,10 +15,14 @@ module Celerity
     def set(path)
       assert_exists
       path = path.to_s
-      @container.update_page @object.setValueAttribute(path)
+
+      @object.setValueAttribute path
+
       unless @object.getContentType
         @object.setContentType(Celerity::Util.content_type_for(path))
       end
+
+      path
     end
 
   end # FileField

data/lib/celerity/elements/form.rb

@@ -16,7 +16,7 @@ module Celerity
 
     def submit
       assert_exists
-      @container.update_page @object.submit(nil)
+      @object.submit(nil)
     end
 
   end # Form

data/lib/celerity/elements/frame.rb

@@ -1,6 +1,8 @@
 module Celerity
   class Frame < Element
     include Container
+    include XpathSupport
+
     attr_accessor :page
 
     TAGS = [Identifier.new('frame'), Identifier.new('iframe')]
@@ -72,4 +74,4 @@ module Celerity
     end
 
   end # Frame
-end # Celerity
+end # Celerity

data/lib/celerity/elements/radio_check.rb

@@ -71,7 +71,7 @@ module Celerity
     def set(value = true)
       assert_exists
       assert_enabled
-      @container.update_page(value ? @object.click : @object.setChecked(value))
+      value ? @object.click : @object.setChecked(value)
     end
 
   end
@@ -107,7 +107,7 @@ module Celerity
 
       if (value && !set?) || (!value && set?)
         Log.debug(@object.inspect)
-        @container.update_page(@object.click)
+        @object.click
       end
     end
   end

data/lib/celerity/elements/select_list.rb

@@ -52,7 +52,7 @@ module Celerity
         next unless matches_option?(option, value)
 
         selected ||= option.asText
-        @container.update_page option.click
+        option.click
       end
 
       selected

data/lib/celerity/elements/text_field.rb

@@ -134,7 +134,7 @@ module Celerity
 
     def type_string(value)
       java.lang.String.new(value.to_java_bytes, @browser.page.getPageEncoding).toCharArray.each do |char|
-        @container.update_page @object.type(char)
+        @object.type(char)
       end
     end
 

data/lib/celerity/version.rb

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

data/lib/celerity/xpath_support.rb

@@ -0,0 +1,48 @@
+module Celerity
+
+  #
+  # Module to search by xpath
+  #
+
+  module XpathSupport
+
+    #
+    # Get the first element found matching the given XPath.
+    #
+    # @param [String] xpath
+    # @return [Celerity::Element] An element subclass (or Element if none is found)
+    #
+
+    def element_by_xpath(xpath)
+      assert_exists
+      obj = @page.getFirstByXPath(xpath)
+      element_from_dom_node(obj)
+    end
+
+    #
+    # Get all the elements matching the given XPath.
+    #
+    # @param [String] xpath
+    # @return [Array<Celerity::Element>] array of elements
+    #
+
+    def elements_by_xpath(xpath)
+      assert_exists
+      objects = @page.getByXPath(xpath)
+      # should use an ElementCollection here?
+      objects.map { |o| element_from_dom_node(o) }.compact
+    end
+
+    #
+    # Convert the given HtmlUnit DomNode to a Celerity object
+    #
+
+    def element_from_dom_node(obj)
+      element_class = Util.htmlunit2celerity(obj.class) || Element
+      element_class.new(self, :object, obj)
+    end
+
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jarib-celerity
 version: !ruby/object:Gem::Version 
-  version: 0.0.6.12
+  version: 0.0.6.14
 platform: ruby
 authors: 
 - Jari Bakken
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-28 00:00:00 -07:00
+date: 2009-07-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,7 @@ files:
 - lib/celerity/util.rb
 - lib/celerity/version.rb
 - lib/celerity/watir_compatibility.rb
+- lib/celerity/xpath_support.rb
 - lib/celerity.rb
 - lib/celerity/htmlunit/commons-codec-1.3.jar
 - lib/celerity/htmlunit/commons-collections-3.2.1.jar