Fix WIN32OLE deprecated constants warnings

Author: eregon

library/win32ole/fixtures/classes.rb

@@ -1,14 +1,25 @@
 require 'win32ole'
 
+# win32ole deprecated constants like WIN32OLE_TYPELIB in Ruby 3.4
+# but only added the replacements like WIN32OLE::TypeLib in Ruby 3.4.
+# So we use the new-style constants in specs to avoid deprecation warnings
+# and we define the new-style constants as the old ones if they don't exist yet.
+WIN32OLE::TypeLib ||= WIN32OLE_TYPELIB
+WIN32OLE::RuntimeError ||= WIN32OLERuntimeError
+WIN32OLE::Method ||= WIN32OLE_METHOD
+WIN32OLE::Type ||= WIN32OLE_TYPE
+WIN32OLE::Event ||= WIN32OLE_EVENT
+WIN32OLE::Param ||= WIN32OLE_PARAM
+
 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}"

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

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

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

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

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

library/win32ole/win32ole/ole_obj_help_spec.rb

@@ -12,8 +12,8 @@
  -> { @dict.ole_obj_help(1) }.should raise_error ArgumentError
  end
 
- it "returns an instance of WIN32OLE_TYPE" do
- @dict.ole_obj_help.kind_of?(WIN32OLE_TYPE).should be_true
+ it "returns an instance of WIN32OLE::Type" do
+ @dict.ole_obj_help.kind_of?(WIN32OLE::Type).should be_true
  end
  end
 end

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

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

library/win32ole/win32ole_event/new_spec.rb

@@ -3,7 +3,7 @@
  require_relative '../fixtures/classes'
 
  guard -> { WIN32OLESpecs::MSXML_AVAILABLE } do
- describe "WIN32OLE_EVENT.new" do
+ describe "WIN32OLE::Event.new" do
  before :all do
  @xml_dom = WIN32OLESpecs.new_ole('MSXML.DOMDocument')
  end
@@ -13,21 +13,21 @@
  end
 
  it "raises TypeError given invalid argument" do
- -> { WIN32OLE_EVENT.new "A" }.should raise_error TypeError
+ -> { WIN32OLE::Event.new "A" }.should raise_error TypeError
  end
 
  it "raises RuntimeError if event does not exist" do
- -> { WIN32OLE_EVENT.new(@xml_dom, 'A') }.should raise_error RuntimeError
+ -> { WIN32OLE::Event.new(@xml_dom, 'A') }.should raise_error RuntimeError
  end
 
  it "raises RuntimeError if OLE object has no events" do
  dict = WIN32OLESpecs.new_ole('Scripting.Dictionary')
- -> { WIN32OLE_EVENT.new(dict) }.should raise_error RuntimeError
+ -> { WIN32OLE::Event.new(dict) }.should raise_error RuntimeError
  end
 
- it "creates WIN32OLE_EVENT object" do
- ev = WIN32OLE_EVENT.new(@xml_dom)
- ev.should be_kind_of WIN32OLE_EVENT
+ it "creates WIN32OLE::Event object" do
+ ev = WIN32OLE::Event.new(@xml_dom)
+ ev.should be_kind_of WIN32OLE::Event
  end
  end
  end