celerity 0.0.6 → 0.0.7

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 { @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 { @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 { @object.rightClick }
     end
 
     #
@@ -37,12 +37,32 @@ module Celerity
 
     def click_and_attach
       assert_exists_and_enabled
-      browser = Browser.new(:log_level => @browser.log_level)
-      browser.update_page(@object.click)
+      browser = Browser.new(@browser.options.dup)
+      browser.webclient.set_cookie_manager(
+        @browser.webclient.get_cookie_manager
+      ) # hirobumi: we do want cookies as well.
+
+      @browser.disable_event_listener do
+        rescue_status_code_exception { browser.page = @object.click }
+      end
 
       browser
     end
 
+    #
+    # Click the element and just return the content as IO. Current page stays unchanged.
+    # This can be used to download content that normally isn't rendered in a browser.
+    #
+    # @return [IO]
+    #
+
+    def download
+      assert_exists_and_enabled
+      @browser.disable_event_listener do
+        @object.click.getWebResponse.getContentAsStream.to_io
+      end
+    end
+
     private
 
     def assert_exists_and_enabled

data/lib/celerity/collections.rb

@@ -51,7 +51,7 @@ module Celerity
   class Dts < ElementCollection
     def element_class; Dt; end
   end
-  
+
   class Ems < ElementCollection
     def element_class; Em; end
   end
@@ -113,7 +113,7 @@ module Celerity
   class Spans < ElementCollection
     def element_class; Span; end
   end
-  
+
   class Strongs < ElementCollection
     def element_class; Strong; end
   end

data/lib/celerity/container.rb

@@ -1,5 +1,5 @@
 module Celerity
-  
+
   #
   # This class contains methods for accessing elements inside a container,
   # usually the Browser object, meaning the current page.
@@ -30,6 +30,7 @@ module Celerity
 
   module Container
     include Celerity::Exception
+    include Celerity::ShortInspect
 
     # Points back to the Browser instance that contains this element
     attr_reader :browser
@@ -39,8 +40,8 @@ module Celerity
     #
     # @param  [String, Regexp] expected_text The text to look for.
     # @return [Fixnum, nil]  The index of the matched text, or nil if it doesn't match.
-    # 
-    
+    #
+
     def contains_text(expected_text)
       assert_exists
       return nil unless respond_to? :text
@@ -54,41 +55,26 @@ module Celerity
         raise TypeError, "expected String or Regexp, got #{expected_text.inspect}:#{expected_text.class}"
       end
     end
-    
+
+    #
+    # Override inspect for readability
+    #
+
+    def inspect
+      short_inspect :include => %w[@conditions @object]
+    end
+
     #
     # Used internally to update the container object.
     # @api private
     #
-    
+
     def container=(container)
       @container = container
       @browser = container.browser
       container
     end
 
-    #
-    # Used internally to update the page object.
-    # @api private
-    #
-    
-    def update_page(page)
-      @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
     #++
@@ -96,23 +82,23 @@ module Celerity
     #
     # @return [Celerity::Area]
     #
-    
+
     def area(*args)
       Area.new(self, *args)
     end
-    
+
     #
     # @return [Celerity::Areas]
     #
-    
+
     def areas
       Areas.new(self)
     end
-    
+
     #
     # @return [Celerity::Button]
     #
-    
+
     def button(*args)
       Button.new(self, *args)
     end
@@ -120,23 +106,23 @@ module Celerity
     #
     # @return [Celerity::Buttons]
     #
-    
+
     def buttons
       Buttons.new(self)
     end
-    
+
     #
     # @return [Celerity::TableCell]
     #
-    
+
     def cell(*args)
       TableCell.new(self, *args)
     end
-    
+
     #
     # @return [Celerity::TableCells]
     #
-    
+
     def cells
       TableCells.new(self)
     end
@@ -172,7 +158,7 @@ module Celerity
     def dd(*args)
       Dd.new(self, *args)
     end
-    
+
     #
     # @return [Celerity::Dds]
     #
@@ -180,7 +166,7 @@ module Celerity
     def dds
       Dds.new(self)
     end
-    
+
     #
     # @return [Celerity::Div]
     #
@@ -188,7 +174,7 @@ module Celerity
     def div(*args)
       Div.new(self, *args)
     end
-    
+
     #
     # @return [Celerity::Divs]
     #
@@ -196,7 +182,7 @@ module Celerity
     def divs
       Divs.new(self)
     end
-    
+
     #
     # @return [Celerity::Dl]
     #
@@ -212,7 +198,7 @@ module Celerity
     def dls
       Dls.new(self)
     end
-    
+
     #
     # @return [Celerity::Dt]
     #
@@ -228,19 +214,19 @@ module Celerity
     def dts
       Dts.new(self)
     end
-    
+
     #
     # @return [Celerity::Em]
-    # 
-    
+    #
+
     def em(*args)
       Em.new(self, *args)
     end
-    
+
     #
     # @return [Celerity::Ems]
-    # 
-    
+    #
+
     def ems
       Ems.new(self)
     end
@@ -284,7 +270,7 @@ module Celerity
     def frame(*args)
       Frame.new(self, *args)
     end
-    
+
     #
     # @return [Celerity::Frames]
     #
@@ -300,7 +286,7 @@ module Celerity
     def h1(*args)
       H1.new(self, *args)
     end
-    
+
     #
     # @return [Celerity::H1s]
     #
@@ -340,7 +326,7 @@ module Celerity
     def h3s
       H3s.new(self)
     end
-    
+
     #
     # @return [Celerity::H4]
     #
@@ -356,7 +342,7 @@ module Celerity
     def h4s
       H4s.new(self)
     end
-    
+
     #
     # @return [Celerity::H5]
     #
@@ -372,7 +358,7 @@ module Celerity
     def h5s
       H5s.new(self)
     end
-    
+
     #
     # @return [Celerity::H6]
     #
@@ -568,7 +554,7 @@ module Celerity
     #
     # @return [Celerity::Radio]
     #
-    
+
     def radio(*args)
       Radio.new(self, *args)
     end
@@ -612,7 +598,7 @@ module Celerity
     def select_lists
       SelectLists.new(self)
     end
-    
+
     #
     # @return [Celerity::Span]
     #
@@ -676,7 +662,7 @@ module Celerity
     def tbodies
       TableBodies.new(self)
     end
-    
+
     #
     # @return [Celerity::TextField]
     #
@@ -692,7 +678,7 @@ module Celerity
     def text_fields
       TextFields.new(self)
     end
-    
+
     #
     # @return [Celerity::TableFooter]
     #
@@ -709,14 +695,14 @@ module Celerity
       TableFooters.new(self)
     end
     alias_method :tfeet, :tfoots # :-)
-    
+
     #
     # Watir's cells() won't find <th> elements.
     # This is a workaround.
     #
     # @return [Celerity::Th]
     #
-    
+
     def th(*args)
       Th.new(self, *args)
     end
@@ -729,7 +715,7 @@ module Celerity
     def ths
       raise NotImplementedError
     end
-    
+
     #
     # @return [Celerity::TableHeader]
     #
@@ -762,5 +748,32 @@ module Celerity
       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/default_viewer.rb

@@ -1,10 +1,14 @@
 module Celerity
   class DefaultViewer
     IMAGE = "#{Celerity::DIR}/resources/no_viewer.png"
-    
-    def self.save(path = nil)
-      return unless path
-      FileUtils.copy(IMAGE, path)
+
+    class << self
+      def save(path = nil)
+        return unless path
+        FileUtils.copy(IMAGE, path)
+      end
+
+      def close; end
     end
   end
 end

data/lib/celerity/disabled_element.rb

@@ -1,12 +1,12 @@
 module Celerity
-  
+
   #
   # Mixed in to all elements that can have the 'disabled' attribute.
   #
 
   module DisabledElement
     include Celerity::Exception
-    
+
     #
     # Returns false if the element is disabled.
     #
@@ -17,14 +17,14 @@ module Celerity
 
     #
     # Returns true if the element is disabled.
-    # 
-    
+    #
+
     def disabled?
       assert_exists unless defined?(@object) && @object
       @object.isDisabled
     end
     alias_method :disabled, :disabled?
-    
+
     #
     # Used internally.
     # @api private