watir-classic 3.0.0 → 3.1.0

data/lib/watir-classic/ie-class.rb

@@ -74,8 +74,6 @@ module Watir
 
     # the OLE Internet Explorer object
     attr_accessor :ie
-    # access to the logger object
-    attr_accessor :logger
 
     # this contains the list of unique urls that have been visited
     attr_reader :url_list
@@ -176,9 +174,6 @@ module Watir
       @page_container = self
       @error_checkers = []
       @activeObjectHighLightColor = HIGHLIGHT_COLOR
-
-
-      @logger = DefaultLogger.new
       @url_list = []
     end
 
@@ -328,6 +323,10 @@ module Watir
     end
     attr_writer :hwnd
 
+    def name
+      :ie
+    end
+
     # Are we attached to an open browser?
     def exists?
       begin
@@ -338,15 +337,6 @@ module Watir
     end
     alias :exist? :exists?
 
-    # deprecated: use logger= instead
-    def set_logger(logger)
-      @logger = logger
-    end
-
-    def log(what)
-      @logger.debug(what) if @logger
-    end
-
     #
     # Accessing data outside the document
     #
@@ -493,6 +483,10 @@ module Watir
       return @ie.LocationURL
     end
 
+    def screenshot
+      Screenshot.new(hwnd)
+    end
+
     def window(specifiers={}, &blk)
       win = Window.new(self, specifiers, &blk)
       win.use &blk if blk
@@ -585,153 +579,6 @@ module Watir
       @error_checkers.delete(checker)
     end
 
-    #
-    # Show me state
-    #
-
-    # Show all forms displays all the forms that are on a web page.
-    def show_forms
-      if all_forms = self.forms
-        count = all_forms.length
-        puts "There are #{count} forms"
-        all_forms.each do |form|
-          puts "Form name: #{form.name}"
-          puts "       id: #{form.id}"
-          puts "   method: #{form.method}"
-          puts "   action: #{form.action}"
-        end
-      else
-        puts "No forms"
-      end
-    end
-
-    # this method shows all the images availble in the document
-    def show_images
-      doc = document
-      index = 1
-      doc.images.each do |l|
-        puts "image: name: #{l.name}"
-        puts "         id: #{l.invoke("id")}"
-        puts "        src: #{l.src}"
-        puts "      index: #{index}"
-        index += 1
-      end
-    end
-
-    # this method shows all the links availble in the document
-    def show_links
-      props = ["name", "id", "href"]
-      print_sizes = [12, 12, 60]
-      doc = document
-      index = 0
-      text_size = 60
-      # draw the table header
-      s = "index".ljust(6)
-      props.each_with_index do |p, i|
-        s += p.ljust(print_sizes[i])
-      end
-      s += "text/src".ljust(text_size)
-      s += "\n"
-
-      # now get the details of the links
-      doc.links.each do |n|
-        index += 1
-        s = s + index.to_s.ljust(6)
-        props.each_with_index do |prop, i|
-          printsize = print_sizes[i]
-          begin
-            p = n.invoke(prop)
-            temp_var = "#{p}".to_s.ljust(printsize)
-          rescue
-            # this object probably doesnt have this property
-            temp_var = "".to_s.ljust(printsize)
-          end
-          s += temp_var
-        end
-        s += n.innerText
-        if n.getElementsByTagName("IMG").length > 0
-          s += " / " + n.getElementsByTagName("IMG").item(0).src
-        end
-        s += "\n"
-      end
-      puts s
-    end
-
-    # this method shows the name, id etc of the object that is currently active - ie the element that has focus
-    # its mostly used in irb when creating a script
-    def show_active
-      s = ""
-
-      current = document.activeElement
-      begin
-        s += current.invoke("type").to_s.ljust(16)
-      rescue
-      end
-      props = ["name", "id", "value", "alt", "src", "innerText", "href"]
-      props.each do |prop|
-        begin
-          p = current.invoke(prop)
-          s += "  " + "#{prop}=#{p}".to_s.ljust(18)
-        rescue
-          #this object probably doesnt have this property
-        end
-      end
-      s += "\n"
-    end
-
-    # this method shows all the divs availble in the document
-    def show_divs
-      divs = document.getElementsByTagName("DIV")
-      puts "Found #{divs.length} div tags"
-      index = 1
-      divs.each do |d|
-        puts "#{index}  id=#{d.invoke('id')}      class=#{d.invoke("className")}"
-        index += 1
-      end
-    end
-
-    # this method is used to show all the tables that are available
-    def show_tables
-      tables = document.getElementsByTagName("TABLE")
-      puts "Found #{tables.length} tables"
-      index = 1
-      tables.each do |d|
-        puts "#{index}  id=#{d.invoke('id')}      rows=#{d.rows.length}   columns=#{begin d.rows["0"].cells.length; rescue; end}"
-        index += 1
-      end
-    end
-
-    def show_pres
-      pres = document.getElementsByTagName("PRE")
-      puts "Found #{ pres.length } pre tags"
-      index = 1
-      pres.each do |d|
-        puts "#{index}   id=#{d.invoke('id')}      class=#{d.invoke("className")}"
-        index+=1
-      end
-    end
-
-    # this method shows all the spans availble in the document
-    def show_spans
-      spans = document.getElementsByTagName("SPAN")
-      puts "Found #{spans.length} span tags"
-      index = 1
-      spans.each do |d|
-        puts "#{index}   id=#{d.invoke('id')}      class=#{d.invoke("className")}"
-        index += 1
-      end
-    end
-
-    def show_labels
-      labels = document.getElementsByTagName("LABEL")
-      puts "Found #{labels.length} label tags"
-      index = 1
-      labels.each do |d|
-        puts "#{index}  text=#{d.invoke('innerText')}      class=#{d.invoke("className")}  for=#{d.invoke("htmlFor")}"
-        index += 1
-      end
-    end
-
     # Gives focus to the frame
     def focus
       active_element = document.activeElement
@@ -750,13 +597,12 @@ module Watir
     end
 
     def attach_browser_window how, what
-      log "Seeking Window with #{how}: #{what}"
       ieTemp = nil
       begin
-        Watir::until_with_timeout do
+        Wait.until(IE.attach_timeout) do
           ieTemp = IE._find how, what
         end
-      rescue Watir::Wait::TimeoutError
+      rescue Wait::TimeoutError
         raise NoMatchingWindowFoundException,
         "Unable to locate a window with #{how} of #{what}"
       end

data/lib/watir-classic/ie.rb

@@ -2,6 +2,8 @@ require 'watir-classic'
 require 'watir-classic/core'
 require 'watir-classic/close_all'
 require 'watir-classic/ie-process'
+require 'watir-classic/screenshot'
+require 'yajl'      
 
 # these switches need to be deleted from ARGV to enable the Test::Unit
 # functionality that grabs

data/lib/watir-classic/input_elements.rb

@@ -232,6 +232,7 @@ module Watir
       dispatch_event("onSelect")
       dispatch_event("ondragstart")
       dispatch_event("ondrag")
+      destination.assert_exists
       destination.dispatch_event("onDragEnter")
       destination.dispatch_event("onDragOver")
       destination.dispatch_event("ondrop")
@@ -362,7 +363,6 @@ module Watir
       return value if @o.invoke('type') =~ /textarea/i # text areas don't have maxlength
       if value.length > maxlength
         value = value[0 .. maxlength - 1]
-        @container.log " Supplied string is #{value.length} chars, which exceeds the max length (#{maxlength}) of the field. Using value: #{value}"
       end
       value
     end

data/lib/watir-classic/modal_dialog.rb

@@ -1,9 +1,3 @@
-class WinClicker
-  def initialize
-    raise NotImplementedError, 'Watir no longer supports WinClicker. Please use click_no_wait and the javascript_dialog method.'
-  end
-end
-
 module Watir
   class ModalDialog
     include Container
@@ -19,7 +13,7 @@ module Watir
       @modal.wait_until_present rescue raise NoMatchingWindowFoundException
 
       intUnknown = 0
-      Watir::until_with_timeout do
+      Wait.until do
         intPointer = " " * 4 # will contain the int value of the IUnknown*
         GetUnknown.call(hwnd, intPointer)
         intArray = intPointer.unpack('L')

data/lib/watir-classic/module.rb

@@ -1,12 +1,3 @@
 module Watir
   include Watir::Exception
-
-# Directory containing the watir.rb file
-  @@dir = File.expand_path(File.dirname(__FILE__))
-
-# Like regular Ruby "until", except that a Wait::TimeoutError is raised
-# if the timeout is exceeded. Timeout is IE.attach_timeout.
-  def self.until_with_timeout # block
-    Wait.until(IE.attach_timeout) { yield }
-  end
-end
+end

data/lib/watir-classic/non_control_elements.rb

@@ -22,6 +22,17 @@ module Watir
     attr_ole :value
   end
 
+  class Dl < Element
+    def to_hash
+      dts.each_with_index.reduce({}) do |memo, item|
+        dt, i = *item
+        dd = dds[i]
+        memo[dt.text] = dd.present? ? dd.text : nil
+        memo
+      end
+    end
+  end
+
   class Embed < Element
     attr_ole :src
     attr_ole :type

data/lib/watir-classic/page-container.rb

@@ -37,17 +37,17 @@ module Watir
     def execute_script(source)
       result = nil
       begin
-        source = "(function() {#{source}})()"
+        source = with_json2_if_needed source
         result = document.parentWindow.eval(source)
       rescue WIN32OLERuntimeError, NoMethodError #if eval fails we need to use execScript(source.to_s) which does not return a value, hence the workaround
-        escaped_src = source.gsub(/[\r\n']/) {|m| "\\#{m}"}
+        escaped_src = source.gsub(/\r?\n/, "\\n").gsub("'", "\\\\'")
         wrapper = "_watir_helper_div_#{::Time.now.to_i + ::Time.now.usec}"
         cmd = "var e = document.createElement('DIV'); e.style.display='none'; e.id='#{wrapper}'; e.innerHTML = eval('#{escaped_src}'); document.body.appendChild(e);"
         document.parentWindow.execScript(cmd)
         result = document.getElementById(wrapper).innerHTML
       end
 
-      result == "undefined" ? nil : result
+      Yajl::Parser.parse(result) rescue nil
     end
 
     # The HTML of the current page
@@ -70,27 +70,6 @@ module Watir
       @page_container = self
     end
 
-    # This method is used to display the available html frames that Internet Explorer currently has loaded.
-    # This method is usually only used for debugging test scripts.
-    def show_frames
-      if allFrames = document.frames
-        count = allFrames.length
-        puts "there are #{count} frames"
-        for i in 0..count-1 do
-          begin
-            fname = allFrames.item(i).name.to_s
-            puts "frame  index: #{i + 1} name: #{fname}"
-          rescue => e
-            if e.to_s.match(/Access is denied/)
-              puts "frame  index: #{i + 1} Access Denied, see http://wiki.openqa.org/display/WTR/FAQ#access-denied"
-            end
-          end
-        end
-      else
-        puts "no frames"
-      end
-    end
-
     # Search the current page for specified text or regexp.
     # Returns the index if the specified text was found.
     # Returns matchdata object if the specified regexp was found.
@@ -110,5 +89,24 @@ module Watir
       end
     end
 
+    def with_json2_if_needed source
+      %Q[
+      (function() {
+        if (!window.JSON || !window.JSON.stringify) {
+          var json2=document.createElement('script');
+          json2.type='text/javascript';
+          json2.src='file:///#{File.expand_path(File.dirname(__FILE__) + "/ext/json2.js")}'; 
+          document.getElementsByTagName('head')[0].appendChild(json2)
+        } 
+
+        return JSON.stringify((function() {#{source}})());
+      })()
+      ]
+    end
+
+    private :with_json2_if_needed
+
   end # module
 end
+
+

data/lib/watir-classic/screenshot.rb

@@ -0,0 +1,33 @@
+require "tmpdir"
+require "base64"
+require "win32/screenshot"
+
+module Watir
+  class Screenshot
+    def initialize(browser_hwnd)
+      @hwnd = browser_hwnd
+    end
+
+    def save(path)
+      screenshot.write(path)
+    end
+
+    def png
+      path = File.expand_path "temporary-image-#{Time.now.to_i}.png", Dir.tmpdir
+      save path
+      File.open(path, "rb") {|file| file.read}
+    ensure
+      File.delete path rescue nil
+    end
+
+    def base64
+      Base64.encode64 png
+    end
+
+    private
+
+    def screenshot
+      ::Win32::Screenshot::Take.of(:window, :hwnd => @hwnd)
+    end
+  end
+end

data/lib/watir-classic/win32ole/1.8.7/win32ole.patch

@@ -0,0 +1,56 @@
+Index: win32ole.c
+===================================================================
+--- win32ole.c	(revision 29867)
++++ win32ole.c	(revision )
+@@ -6368,6 +6368,43 @@
+ }
+ 
+ 
++/*
++ * WIN32OLE.connect_unknown( pUnknown ) --> aWIN32OLE
++ * ----
++ * Returns running OLE Automation object or WIN32OLE object from a
++IUnknown pointer
++ * the IUnknown pointer is passed in as a FIXNUM
++ */
++static VALUE
++fole_s_connect_unknown(self, iUnknown)
++    VALUE self;
++    VALUE iUnknown;
++{
++ HRESULT hr;
++ IDispatch *pDispatch;
++    IUnknown *pUnknown;
++
++ /* initialize to use OLE */
++  ole_initialize();
++
++ //cast from int to IUnknown*
++ pUnknown = (IUnknown*)FIX2INT(iUnknown);
++
++ hr = pUnknown->lpVtbl->QueryInterface(pUnknown, &IID_IDispatch,
++                                              (void **)&pDispatch);
++     if(FAILED(hr)) {
++         OLE_RELEASE(pUnknown);
++         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
++                   "Failed to connect to WIN32OLE server `%d'",
++                   FIX2INT(iUnknown));
++     }
++
++ OLE_RELEASE(pUnknown);
++
++    return create_win32ole_object(self, pDispatch, Qnil, Qnil);
++}
++
++
+ void
+ Init_win32ole()
+ {
+@@ -6400,6 +6437,7 @@
+     rb_define_method(cWIN32OLE, "initialize", fole_initialize, -1);
+ 
+     rb_define_singleton_method(cWIN32OLE, "connect", fole_s_connect, -1);
++    rb_define_singleton_method(cWIN32OLE, "connect_unknown", fole_s_connect_unknown, 1);
+     rb_define_singleton_method(cWIN32OLE, "const_load", fole_s_const_load, -1);
+ 
+     rb_define_singleton_method(cWIN32OLE, "ole_free", fole_s_free, 1);