com 0.3.1 → 0.4.0

data/lib/com.rb

@@ -6,14 +6,6 @@ WIN32OLE.codepage = WIN32OLE::CP_UTF8
 # COM is an object-oriented wrapper around WIN32OLE.  COM makes it easy to add
 # behavior to WIN32OLE objects, making them easier to work with from Ruby.
 module COM
-  autoload :Error, 'com/error'
-  autoload :Events, 'com/events'
-  autoload :Instantiable, 'com/instantiable'
-  autoload :Object, 'com/object'
-  autoload :PatternError, 'com/patternerror'
-  autoload :Version, 'com/version'
-  autoload :Wrapper, 'com/wrapper'
-
   class << self
     # Gets the iconv character set equivalent of the current COM code page.
     #
@@ -59,15 +51,24 @@ module COM
     end
   end
 
-private
-
   # @private
   COMCodePageToIconvCharset = {
     WIN32OLE::CP_UTF8 => 'UTF-8'
   }.freeze
-end
 
-require 'com/methodinvocationerror'
-require 'com/pathname'
-require 'com/standarderror'
-require 'com/win32ole'
+  %w'com/error.rb
+     com/object.rb
+     com/patternerror.rb
+
+     com/events.rb
+     com/instantiable.rb
+     com/methodinvocationerror.rb
+     com/pathname.rb
+     com/standarderror.rb
+     com/win32ole.rb
+     com/wrapper.rb'.each do |file|
+    load File.expand_path('../%s' % file, __FILE__)
+  end
+
+  autoload :Version, 'com/version.rb'
+end

data/lib/com/instantiable.rb

@@ -64,6 +64,13 @@ class COM::Instantiable < COM::Object
       @constants
     end
 
+    # Typelib to use for loading constants, if it can’t be determined
+    # automatically.
+    def typelib(typelib = nil)
+      @typelib = typelib if typelib
+      @typelib ||= nil
+    end
+
     # Loads constants associated with COM object _com_.  This is an internal
     # method that shouldn’t be called outside of this class.
     #
@@ -72,7 +79,7 @@ class COM::Instantiable < COM::Object
     def load_constants(com)
       return if constants_loaded?
       modul = nesting[-2]
-      com.load_constants modul
+      com.load_constants modul, typelib
       @constants_loaded = true
     end
 

data/lib/com/methodinvocationerror.rb

@@ -9,7 +9,7 @@ class COM::MethodInvocationError < COM::Error
               \s+in\s+([^\n]+)\n
               \s*([^\n]+)\n
               \s*HRESULT\serror\scode:0x([0-9a-fA-F]+)[^\n]*\n
-              \s*(.+)$}xu
+              \s*(.+)$}x
 
   class << self
     # This is an internal method used by COM::Error.

data/lib/com/standarderror.rb

@@ -11,7 +11,7 @@ module COM::StandardError
       Class.new(COM::Error) do
         extend COM::PatternError
 
-        pattern %r{^\s*(.*)\n\s*HRESULT\serror\scode:(0x(?i:#{code.to_s(16)}))}xu
+        pattern %r{^\s*(.*)\n\s*HRESULT\serror\scode:(0x(?i:#{code.to_s(16)}))}x
 
         (class << self; self; end).class_eval do
           define_method :replace do |error|
@@ -44,7 +44,7 @@ module COM::HResultError
       COM.const_set error, Class.new(COM::Error){
         extend COM::PatternError
 
-        pattern %r{^\s*(.*)\n\s*HRESULT\serror\scode:(0x(?i:#{code.to_s(16)}))}xu
+        pattern %r{^\s*(.*)\n\s*HRESULT\serror\scode:(0x(?i:#{code.to_s(16)}))}x
 
         (class << self; self; end).class_eval do
           define_method :replace do |e|

data/lib/com/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module COM
-  Version = '0.3.1'
+  Version = '0.4.0'
 end

data/lib/com/wrapper.rb

@@ -42,13 +42,18 @@ class COM::Wrapper
     raise COM::Wrapper.raise_in('%s=' % property, e)
   end
 
-  def load_constants(into)
+  def load_constants(into, typelib = nil)
     saved_verbose, $VERBOSE = $VERBOSE, nil
     begin
       begin
         WIN32OLE.const_load @ole, into
       rescue RuntimeError
-        WIN32OLE_TYPE.enums(program_id).each do |enum|
+        begin
+          @ole.ole_typelib
+        rescue RuntimeError
+          raise unless typelib
+          WIN32OLE_TYPELIB.new(typelib)
+        end.ole_types.select{ |e| e.visible? and e.ole_type == 'Enum' }.each do |enum|
           enum.constants.each do |constant|
             into.const_set constant.const_name, constant.value
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: com
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-17 00:00:00.000000000 Z
+date: 2012-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lookout
-  requirement: &2865252 !ruby/object:Gem::Requirement
+  requirement: &15646116 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2865252
+  version_requirements: *15646116
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2864676 !ruby/object:Gem::Requirement
+  requirement: &15645576 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2864676
+  version_requirements: *15645576
 description: ! "# COM #\n\nCOM is an object-oriented wrapper around WIN32OLE.  COM
   makes it easy to add\nbehavior to WIN32OLE objects, making them easier to work with
   from Ruby.\n\n\n## Usage ##\n\nUsing COM is rather straightforward.  There’s basically