[WIP] Fix WIN32OLE deprecated constants warnings

eregon · eregon · commit a65b6fbc58a1 · 2025-05-28T23:20:25.000+02:00
diff --git a/.mspec.constants b/.mspec.constants
@@ -220,14 +220,11 @@ Vector
 WEBrick
 WIN32OLE
 WIN32OLEQueryInterfaceError
-WIN32OLERuntimeError
 WIN32OLE_EVENT
-WIN32OLE_METHOD
 WIN32OLE_PARAM
 WIN32OLE_RECORD
 WIN32OLE_RUBYSPEC
 WIN32OLE_TYPE
-WIN32OLE_TYPELIB
 WIN32OLE_VARIABLE
 WIN32OLE_VARIANT
 WeakRef
diff --git a/library/win32ole/fixtures/classes.rb b/library/win32ole/fixtures/classes.rb
@@ -1,14 +1,14 @@
 require 'win32ole'
 
 module WIN32OLESpecs
-  MSXML_AVAILABLE = WIN32OLE_TYPELIB.typelibs.any? { |t| t.name.start_with?('Microsoft XML') }
-  SYSTEM_MONITOR_CONTROL_AVAILABLE = WIN32OLE_TYPELIB.typelibs.any? { |t| t.name.start_with?('System Monitor Control') }
+  MSXML_AVAILABLE = WIN32OLE::TypeLib.typelibs.any? { |t| t.name.start_with?('Microsoft XML') }
+  SYSTEM_MONITOR_CONTROL_AVAILABLE = WIN32OLE::TypeLib.typelibs.any? { |t| t.name.start_with?('System Monitor Control') }
 
   def self.new_ole(name)
     tries = 0
     begin
       WIN32OLE.new(name)
-    rescue WIN32OLERuntimeError => e
+    rescue WIN32OLE::RuntimeError => e
       if tries < 3
         tries += 1
         $stderr.puts "WIN32OLESpecs#new_ole retry (#{tries}): #{e.class}: #{e.message}"
diff --git a/library/win32ole/win32ole/locale_spec.rb b/library/win32ole/win32ole/locale_spec.rb
@@ -13,14 +13,14 @@
       begin
         begin
           WIN32OLE.locale = 1041
-        rescue WIN32OLERuntimeError
+        rescue WIN32OLE::RuntimeError
           STDERR.puts("\n#{__FILE__}:#{__LINE__}:#{self.class.name}.test_s_locale_set is skipped(Japanese locale is not installed)")
           return
         end
 
         WIN32OLE.locale.should == 1041
         WIN32OLE.locale = WIN32OLE::LOCALE_SYSTEM_DEFAULT
-        -> { WIN32OLE.locale = 111 }.should raise_error WIN32OLERuntimeError
+        -> { WIN32OLE.locale = 111 }.should raise_error WIN32OLE::RuntimeError
         WIN32OLE.locale.should == WIN32OLE::LOCALE_SYSTEM_DEFAULT
       ensure
         WIN32OLE.locale.should == WIN32OLE::LOCALE_SYSTEM_DEFAULT
diff --git a/library/win32ole/win32ole/new_spec.rb b/library/win32ole/win32ole/new_spec.rb
@@ -17,8 +17,8 @@
       -> { WIN32OLESpecs.new_ole(42) }.should raise_error( TypeError )
     end
 
-    it "raises WIN32OLERuntimeError if invalid string is given" do
-      -> { WIN32OLE.new('foo') }.should raise_error( WIN32OLERuntimeError )
+    it "raises WIN32OLE::RuntimeError if invalid string is given" do
+      -> { WIN32OLE.new('foo') }.should raise_error( WIN32OLE::RuntimeError )
     end
 
   end
diff --git a/library/win32ole/win32ole/ole_func_methods_spec.rb b/library/win32ole/win32ole/ole_func_methods_spec.rb
@@ -11,8 +11,8 @@
       -> { @dict.ole_func_methods(1) }.should raise_error ArgumentError
     end
 
-    it "returns an array of WIN32OLE_METHODs" do
-      @dict.ole_func_methods.all? { |m| m.kind_of? WIN32OLE_METHOD }.should be_true
+    it "returns an array of WIN32OLE::Methods" do
+      @dict.ole_func_methods.all? { |m| m.kind_of? WIN32OLE::Method }.should be_true
     end
 
     it "contains a 'AddRef' method for Scripting Dictionary" do
diff --git a/library/win32ole/win32ole/ole_get_methods_spec.rb b/library/win32ole/win32ole/ole_get_methods_spec.rb
@@ -8,8 +8,8 @@
       @win32ole = WIN32OLESpecs.new_ole('Shell.Application')
     end
 
-    it "returns an array of WIN32OLE_METHOD objects" do
-      @win32ole.ole_get_methods.all? {|m| m.kind_of? WIN32OLE_METHOD}.should be_true
+    it "returns an array of WIN32OLE::Method objects" do
+      @win32ole.ole_get_methods.all? {|m| m.kind_of? WIN32OLE::Method}.should be_true
     end
 
   end
diff --git a/library/win32ole/win32ole/ole_methods_spec.rb b/library/win32ole/win32ole/ole_methods_spec.rb
@@ -11,8 +11,8 @@
       -> { @dict.ole_methods(1) }.should raise_error ArgumentError
     end
 
-    it "returns an array of WIN32OLE_METHODs" do
-      @dict.ole_methods.all? { |m| m.kind_of? WIN32OLE_METHOD }.should be_true
+    it "returns an array of WIN32OLE::Methods" do
+      @dict.ole_methods.all? { |m| m.kind_of? WIN32OLE::Method }.should be_true
     end
 
     it "contains a 'AddRef' method for Scripting Dictionary" do
diff --git a/library/win32ole/win32ole/ole_put_methods_spec.rb b/library/win32ole/win32ole/ole_put_methods_spec.rb
@@ -11,8 +11,8 @@
       -> { @dict.ole_put_methods(1) }.should raise_error ArgumentError
     end
 
-    it "returns an array of WIN32OLE_METHODs" do
-      @dict.ole_put_methods.all? { |m| m.kind_of? WIN32OLE_METHOD }.should be_true
+    it "returns an array of WIN32OLE::Methods" do
+      @dict.ole_put_methods.all? { |m| m.kind_of? WIN32OLE::Method }.should be_true
     end
 
     it "contains a 'Key' method for Scripting Dictionary" do
diff --git a/library/win32ole/win32ole/shared/ole_method.rb b/library/win32ole/win32ole/shared/ole_method.rb
@@ -10,9 +10,9 @@
       -> { @dict.send(@method) }.should raise_error ArgumentError
     end
 
-    it "returns the WIN32OLE_METHOD 'Add' if given 'Add'" do
+    it "returns the WIN32OLE::Method 'Add' if given 'Add'" do
       result = @dict.send(@method, "Add")
-      result.kind_of?(WIN32OLE_METHOD).should be_true
+      result.kind_of?(WIN32OLE::Method).should be_true
       result.name.should == 'Add'
     end
   end
diff --git a/library/win32ole/win32ole_method/dispid_spec.rb b/library/win32ole/win32ole_method/dispid_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#dispid" do
+  describe "WIN32OLE::Method#dispid" do
     before :each do
       ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      @m = WIN32OLE_METHOD.new(ole_type, "namespace")
+      @m = WIN32OLE::Method.new(ole_type, "namespace")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/event_interface_spec.rb b/library/win32ole/win32ole_method/event_interface_spec.rb
@@ -3,12 +3,12 @@
   require_relative '../fixtures/classes'
   guard -> { WIN32OLESpecs::SYSTEM_MONITOR_CONTROL_AVAILABLE } do
 
-    describe "WIN32OLE_METHOD#event_interface" do
+    describe "WIN32OLE::Method#event_interface" do
       before :each do
         ole_type = WIN32OLE_TYPE.new("System Monitor Control", "SystemMonitor")
-        @on_dbl_click_method = WIN32OLE_METHOD.new(ole_type, "OnDblClick")
+        @on_dbl_click_method = WIN32OLE::Method.new(ole_type, "OnDblClick")
         ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-        @namespace_method = WIN32OLE_METHOD.new(ole_type, "namespace")
+        @namespace_method = WIN32OLE::Method.new(ole_type, "namespace")
       end
 
       it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/event_spec.rb b/library/win32ole/win32ole_method/event_spec.rb
@@ -3,10 +3,10 @@
   require_relative '../fixtures/classes'
   guard -> { WIN32OLESpecs::SYSTEM_MONITOR_CONTROL_AVAILABLE } do
 
-    describe "WIN32OLE_METHOD#event?" do
+    describe "WIN32OLE::Method#event?" do
       before :each do
         ole_type = WIN32OLE_TYPE.new("System Monitor Control", "SystemMonitor")
-        @on_dbl_click_method = WIN32OLE_METHOD.new(ole_type, "OnDblClick")
+        @on_dbl_click_method = WIN32OLE::Method.new(ole_type, "OnDblClick")
       end
 
       it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/helpcontext_spec.rb b/library/win32ole/win32ole_method/helpcontext_spec.rb
@@ -2,12 +2,12 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#helpcontext" do
+  describe "WIN32OLE::Method#helpcontext" do
     before :each do
       ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "FileSystemObject")
-      @get_file_version = WIN32OLE_METHOD.new(ole_type, "GetFileVersion")
+      @get_file_version = WIN32OLE::Method.new(ole_type, "GetFileVersion")
       ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/helpfile_spec.rb b/library/win32ole/win32ole_method/helpfile_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#helpfile" do
+  describe "WIN32OLE::Method#helpfile" do
     before :each do
       ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/helpstring_spec.rb b/library/win32ole/win32ole_method/helpstring_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#helpstring" do
+  describe "WIN32OLE::Method#helpstring" do
     before :each do
       ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/invkind_spec.rb b/library/win32ole/win32ole_method/invkind_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#invkind" do
+  describe "WIN32OLE::Method#invkind" do
     before :each do
       ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/invoke_kind_spec.rb b/library/win32ole/win32ole_method/invoke_kind_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#invoke_kind" do
+  describe "WIN32OLE::Method#invoke_kind" do
     before :each do
       ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/name_spec.rb b/library/win32ole/win32ole_method/name_spec.rb
@@ -4,8 +4,8 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#name" do
-    it_behaves_like :win32ole_method_name, :name
+  describe "WIN32OLE::Method#name" do
+    it_behaves_like :WIN32OLE::Method_name, :name
 
   end
 
diff --git a/library/win32ole/win32ole_method/new_spec.rb b/library/win32ole/win32ole_method/new_spec.rb
@@ -2,31 +2,31 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD.new" do
+  describe "WIN32OLE::Method.new" do
     before :each do
       @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     it "raises TypeError when given non-strings" do
-      -> { WIN32OLE_METHOD.new(1, 2) }.should raise_error TypeError
+      -> { WIN32OLE::Method.new(1, 2) }.should raise_error TypeError
     end
 
     it "raises ArgumentError if only 1 argument is given" do
-      -> { WIN32OLE_METHOD.new("hello") }.should raise_error ArgumentError
-      -> { WIN32OLE_METHOD.new(@ole_type) }.should raise_error ArgumentError
+      -> { WIN32OLE::Method.new("hello") }.should raise_error ArgumentError
+      -> { WIN32OLE::Method.new(@ole_type) }.should raise_error ArgumentError
     end
 
-    it "returns a valid WIN32OLE_METHOD object" do
-      WIN32OLE_METHOD.new(@ole_type, "Open").should be_kind_of WIN32OLE_METHOD
-      WIN32OLE_METHOD.new(@ole_type, "open").should be_kind_of WIN32OLE_METHOD
+    it "returns a valid WIN32OLE::Method object" do
+      WIN32OLE::Method.new(@ole_type, "Open").should be_kind_of WIN32OLE::Method
+      WIN32OLE::Method.new(@ole_type, "open").should be_kind_of WIN32OLE::Method
     end
 
-    it "raises WIN32OLERuntimeError if the method does not exist" do
-      -> { WIN32OLE_METHOD.new(@ole_type, "NonexistentMethod") }.should raise_error WIN32OLERuntimeError
+    it "raises WIN32OLE::RuntimeError if the method does not exist" do
+      -> { WIN32OLE::Method.new(@ole_type, "NonexistentMethod") }.should raise_error WIN32OLE::RuntimeError
     end
 
     it "raises TypeError if second argument is not a String" do
-      -> { WIN32OLE_METHOD.new(@ole_type, 5) }.should raise_error TypeError
+      -> { WIN32OLE::Method.new(@ole_type, 5) }.should raise_error TypeError
     end
 
   end
diff --git a/library/win32ole/win32ole_method/offset_vtbl_spec.rb b/library/win32ole/win32ole_method/offset_vtbl_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#offset_vtbl" do
+  describe "WIN32OLE::Method#offset_vtbl" do
     before :each do
       ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/params_spec.rb b/library/win32ole/win32ole_method/params_spec.rb
@@ -2,12 +2,12 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#params" do
+  describe "WIN32OLE::Method#params" do
     before :each do
       ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
       ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      @m_browse_for_folder = WIN32OLE_METHOD.new(ole_type, "BrowseForFolder")
+      @m_browse_for_folder = WIN32OLE::Method.new(ole_type, "BrowseForFolder")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/return_type_detail_spec.rb b/library/win32ole/win32ole_method/return_type_detail_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#return_type_detail" do
+  describe "WIN32OLE::Method#return_type_detail" do
     before :each do
       ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      @m_browse_for_folder = WIN32OLE_METHOD.new(ole_type, "BrowseForFolder")
+      @m_browse_for_folder = WIN32OLE::Method.new(ole_type, "BrowseForFolder")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/return_type_spec.rb b/library/win32ole/win32ole_method/return_type_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#return_type" do
+  describe "WIN32OLE::Method#return_type" do
     before :each do
       ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/return_vtype_spec.rb b/library/win32ole/win32ole_method/return_vtype_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#return_vtype" do
+  describe "WIN32OLE::Method#return_vtype" do
     before :each do
       ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      @m_browse_for_folder = WIN32OLE_METHOD.new(ole_type, "BrowseForFolder")
+      @m_browse_for_folder = WIN32OLE::Method.new(ole_type, "BrowseForFolder")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/shared/name.rb b/library/win32ole/win32ole_method/shared/name.rb
@@ -4,7 +4,7 @@
   describe :win32ole_method_name, shared: true do
     before :each do
       ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/size_opt_params_spec.rb b/library/win32ole/win32ole_method/size_opt_params_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#size_opt_params" do
+  describe "WIN32OLE::Method#size_opt_params" do
     before :each do
       ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      @m_browse_for_folder = WIN32OLE_METHOD.new(ole_type, "BrowseForFolder")
+      @m_browse_for_folder = WIN32OLE::Method.new(ole_type, "BrowseForFolder")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/size_params_spec.rb b/library/win32ole/win32ole_method/size_params_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#size_params" do
+  describe "WIN32OLE::Method#size_params" do
     before :each do
       ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      @m_browse_for_folder = WIN32OLE_METHOD.new(ole_type, "BrowseForFolder")
+      @m_browse_for_folder = WIN32OLE::Method.new(ole_type, "BrowseForFolder")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/library/win32ole/win32ole_method/to_s_spec.rb b/library/win32ole/win32ole_method/to_s_spec.rb
@@ -4,8 +4,8 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#name" do
-    it_behaves_like :win32ole_method_name, :to_s
+  describe "WIN32OLE::Method#name" do
+    it_behaves_like :WIN32OLE::Method_name, :to_s
 
   end
 
diff --git a/library/win32ole/win32ole_method/visible_spec.rb b/library/win32ole/win32ole_method/visible_spec.rb
diff --git a/library/win32ole/win32ole_param/default_spec.rb b/library/win32ole/win32ole_param/default_spec.rb
diff --git a/library/win32ole/win32ole_param/input_spec.rb b/library/win32ole/win32ole_param/input_spec.rb
diff --git a/library/win32ole/win32ole_param/ole_type_detail_spec.rb b/library/win32ole/win32ole_param/ole_type_detail_spec.rb
diff --git a/library/win32ole/win32ole_param/ole_type_spec.rb b/library/win32ole/win32ole_param/ole_type_spec.rb
diff --git a/library/win32ole/win32ole_param/optional_spec.rb b/library/win32ole/win32ole_param/optional_spec.rb
diff --git a/library/win32ole/win32ole_param/retval_spec.rb b/library/win32ole/win32ole_param/retval_spec.rb
diff --git a/library/win32ole/win32ole_param/shared/name.rb b/library/win32ole/win32ole_param/shared/name.rb
diff --git a/library/win32ole/win32ole_type/new_spec.rb b/library/win32ole/win32ole_type/new_spec.rb
diff --git a/library/win32ole/win32ole_type/ole_methods_spec.rb b/library/win32ole/win32ole_type/ole_methods_spec.rb
