watir-classic 4.2.0 → 4.3.0

data/CHANGES

@@ -1,3 +1,9 @@
+== 4.3.0 - 2016/04/21
+
+* Add Element#inner_html and Element#outer_html
+* Bump win32screenshot dependency version
+* Fix LoadError for dl/import in Ruby 2.2
+
 == 4.2.0 - 2015/06/28
 
 * Bump win32screenshot dependency version

data/VERSION

@@ -1 +1 @@
-4.2.0
+4.3.0

data/lib/watir-classic/element.rb

@@ -36,7 +36,9 @@ module Watir
     attr_ole :title
     attr_ole :class_name, :className
     attr_ole :unique_number, :uniqueNumber
-    attr_ole :html, :outerHTML
+    attr_ole :inner_html, :innerHTML
+    attr_ole :outer_html, :outerHTML
+    alias_method :html, :outer_html
 
     # number of spaces that separate the property from the value in the to_s method
     # @private

data/lib/watir-classic/win32.rb

@@ -1,5 +1,9 @@
-require 'dl/import'
-require 'dl/struct'
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.0')
+  require 'fiddle/import'
+else
+  require 'dl/import'
+  require 'dl/struct'
+end
 require 'Win32API'
 
 module Watir
@@ -8,8 +12,14 @@ module Watir
     # this will find the IEDialog.dll file in its build location
     @@iedialog_file = (File.expand_path(File.dirname(__FILE__) + '/..') + "/watir-classic/IEDialog/Release/IEDialog.dll").gsub('/', '\\')
 
-    GetUnknown = Win32API.new(@@iedialog_file, 'GetUnknown', ['l', 'p'], 'v')    
-    User32 = DL.dlopen('user32')
+    GetUnknown = Win32API.new(@@iedialog_file, 'GetUnknown', ['l', 'p'], 'V')
+
+
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.0')
+      User32 = Fiddle.dlopen('user32')
+    else
+      User32 = DL.dlopen('user32')
+    end
     if RUBY_VERSION =~ /^1\.8/
       FindWindowEx = User32['FindWindowEx', 'LLLpp']
       # method for this found in wet-winobj/wet/winobjects/WinUtils.rb
@@ -20,7 +30,7 @@ module Watir
         raise NotImplementedError, "1.9's DL API not compatible with 1.8, see http://www.ruby-forum.com/topic/138277"
       end
     end
-    
+
     ## GetWindows Constants
     GW_HWNDFIRST = 0
     GW_HWNDLAST = 1
@@ -38,4 +48,4 @@ module Watir
       rtn == 1
     end
   end
-end  
+end

data/lib/watir-classic/win32ole.rb

@@ -8,6 +8,10 @@ elsif RUBY_VERSION =~ /^1\.9/
   $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'watir-classic', 'win32ole', '1.9.3'))
 elsif RUBY_VERSION =~ /^2\.0/
   $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'watir-classic', 'win32ole', '2.0.0'))
+elsif RUBY_VERSION =~ /^2\.1/
+  $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'watir-classic', 'win32ole', '2.1.0'))
+elsif RUBY_VERSION =~ /^2\.2/
+  $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'watir-classic', 'win32ole', '2.2.0'))
 else
   # loading win32ole from stdlib
 end

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

@@ -0,0 +1,64 @@
+From 00a7fb5e218b730337bf19afb6afe5a5ba6e8161 Mon Sep 17 00:00:00 2001
+From: Justin Ko <jkotests@gmail.com>
+Date: Tue, 1 Mar 2016 13:22:19 -0500
+Subject: [PATCH 1/1] Patch for Watir-Classic
+
+---
+ ext/win32ole/win32ole.c | 34 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 34 insertions(+)
+
+diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
+index 57da91c..8636514 100644
+--- a/ext/win32ole/win32ole.c
++++ b/ext/win32ole/win32ole.c
+@@ -9112,6 +9112,39 @@ free_enc2cp(void)
+     st_free_table(enc2cp_table);
+ }
+ 
++/*
++ * WIN32OLE.connect_unknown( pUnknown ) --> aWIN32OLE
++ * ----
++ * Returns running OLE Automation object or WIN32OLE object from an IUnknown pointer
++ * the IUnknown pointer is passed in as a FIXNUM
++ */
++static VALUE
++fole_s_connect_unknown(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, eWIN32OLERuntimeError,
++                  "Failed to connect to WIN32OLE server `%d'",
++                  FIX2INT(iUnknown));
++    }
++
++    OLE_RELEASE(pUnknown);
++
++    return create_win32ole_object(self, pDispatch, 0,0);
++}
++
+ void
+ Init_win32ole(void)
+ {
+@@ -9145,6 +9178,7 @@ Init_win32ole(void)
+     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);
+-- 
+2.5.3.windows.1
+

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

@@ -0,0 +1,64 @@
+From ef7d00ae15f4ffa46595cb3c3838d0369d9ae754 Mon Sep 17 00:00:00 2001
+From: Justin Ko <jkotests@gmail.com>
+Date: Tue, 1 Mar 2016 11:10:09 -0500
+Subject: [PATCH 1/1] Patch for Watir-Classic
+
+---
+ ext/win32ole/win32ole.c | 34 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 34 insertions(+)
+
+diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
+index 4d664e8..0be255c 100644
+--- a/ext/win32ole/win32ole.c
++++ b/ext/win32ole/win32ole.c
+@@ -3879,6 +3879,39 @@ free_enc2cp(void)
+     st_free_table(enc2cp_table);
+ }
+ 
++/*
++ * WIN32OLE.connect_unknown( pUnknown ) --> aWIN32OLE
++ * ----
++ * Returns running OLE Automation object or WIN32OLE object from an IUnknown pointer
++ * the IUnknown pointer is passed in as a FIXNUM
++ */
++static VALUE
++fole_s_connect_unknown(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, eWIN32OLERuntimeError,
++                  "Failed to connect to WIN32OLE server `%d'",
++                  FIX2INT(iUnknown));
++    }
++
++    OLE_RELEASE(pUnknown);
++
++    return create_win32ole_object(self, pDispatch, 0,0);
++}
++
+ static void
+ com_hash_free(void *ptr)
+ {
+@@ -3931,6 +3964,7 @@ Init_win32ole(void)
+     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);
+-- 
+1.9.5.github.0
+

data/watir-classic.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'ffi', '~>1.0'
   s.add_dependency 'rautomation', '~>0.7'
   s.add_dependency 'multi_json'
-  s.add_dependency 'win32screenshot', "~> 2.0.0"
+  s.add_dependency 'win32screenshot', "~> 2.1.0"
 
   s.add_development_dependency("rspec", "~>2.3")
   s.add_development_dependency("syntax")

metadata

@@ -1,60 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: watir-classic
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Bret Pettichord
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-process
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: windows-pr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.7.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.7.rc3
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rautomation
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,34 +94,39 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: win32screenshot
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,83 +142,91 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: syntax
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      WATIR is "Web Application Testing in Ruby". Watir (pronounced water) is a free,
-      open-source functional testing tool for automating browser-based tests of web applications.
-      It works with applications written in any language.
-      Watir drives the Internet Explorer browser the same way an end user would.
-      It clicks links, fills in forms, presses buttons.
-      Watir also checks results, such as whether expected text appears on the
-      page, or whether a control is enabled.
-      Watir can test web applications written in any language.
-      Watir is a Ruby library that works with Internet Explorer on Windows.
+description: ! "    WATIR is \"Web Application Testing in Ruby\". Watir (pronounced
+  water) is a free,\n    open-source functional testing tool for automating browser-based
+  tests of web applications.\n    It works with applications written in any language.\n
+  \   Watir drives the Internet Explorer browser the same way an end user would.\n
+  \   It clicks links, fills in forms, presses buttons.\n    Watir also checks results,
+  such as whether expected text appears on the\n    page, or whether a control is
+  enabled.\n    Watir can test web applications written in any language.\n    Watir
+  is a Ruby library that works with Internet Explorer on Windows.\n"
 email: watir-general@groups.google.com
 executables: []
 extensions: []
@@ -266,6 +291,10 @@ files:
 - lib/watir-classic/win32ole/1.9.3/win32ole.so
 - lib/watir-classic/win32ole/2.0.0/win32ole.patch
 - lib/watir-classic/win32ole/2.0.0/win32ole.so
+- lib/watir-classic/win32ole/2.1.0/win32ole.patch
+- lib/watir-classic/win32ole/2.1.0/win32ole.so
+- lib/watir-classic/win32ole/2.2.0/win32ole.patch
+- lib/watir-classic/win32ole/2.2.0/win32ole.so
 - lib/watir-classic/win32ole/build_notes.txt
 - lib/watir-classic/win32ole/history.txt
 - lib/watir-classic/window.rb
@@ -281,27 +310,28 @@ files:
 - watir-classic.gemspec
 homepage: http://watir.com/
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - Microsoft Windows running Internet Explorer 5.5 or later.
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 1.8.29
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Automated testing tool for web applications.
 test_files:
 - spec/browser_spec.rb
@@ -311,4 +341,3 @@ test_files:
 - spec/implementation.rb
 - spec/link_spec.rb
 - spec/select_list_spec.rb
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: d515d68ee3ed07f5ae44f7be7d6409fa79cf8256
-  data.tar.gz: a70a618ce992d5cd37fe571fe1c62f0bfc17cae2
-SHA512:
-  metadata.gz: 0bcad52aef6aef6a0d3c8f0d71e477a78cef7544adbb1103ee951e13771d32d7c9b871e7702605eb8d8fc6f08a93c220d9bbee9010e4485708578b53f2a1940c
-  data.tar.gz: 9d1a9d982b922c4df51a0e456cc839fa269a9da9a8953cc8c3848da14d244482f4d7917f145881dadc293a209037ad5927a1480e31b12bbcbe0f6df4d22f9d97