jruby-win32ole 0.8.1 → 0.8.2

data/lib/jruby-win32ole/version.rb

@@ -1,5 +1,5 @@
 module JRuby
   module WIN32OLE
-    VERSION = "0.8.1"
+    VERSION = "0.8.2"
   end
 end

data/src/org/jruby/ext/win32ole/RubyWIN32OLE.java

@@ -5,6 +5,7 @@ import org.racob.com.EnumVariant;
 import org.racob.com.Variant;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -16,6 +17,7 @@ import org.jruby.runtime.Block;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.racob.com.SafeArray;
 import win32ole.Win32oleService;
 
 /**
@@ -165,6 +167,7 @@ public class RubyWIN32OLE extends RubyObject {
         Variant returnValue = Dispatch.invoke(dispatch, dispatchId, dispatchType,
                 objectArgs, errorArgs);
 
+        System.out.println("INVOKEINTERNAL: " + returnValue);
         return fromVariant(context.getRuntime(), returnValue);
     }
     private int[] makeErrorArgs(int size) {
@@ -232,14 +235,41 @@ public class RubyWIN32OLE extends RubyObject {
             return runtime.newFixnum(((Number) object).intValue());
         } else if (object instanceof String) {
             return runtime.newString((String) object);
+        } else if (object instanceof SafeArray) {
+            return listFromSafeArray(runtime, (SafeArray) object);
         }
 
         return JavaUtil.convertJavaToUsableRubyObject(runtime, object);
     }
 
+    private static IRubyObject listFromSafeArray(Ruby runtime, SafeArray list) {
+            RubyArray newArray = runtime.newArray();
+
+            for (int i = 0; i < list.size(); i++) {
+                Object element = list.get(i);
+                IRubyObject convertedElement = null;
+
+                if (element instanceof SafeArray) {
+                    convertedElement = null; //TODO: Borked
+                } else if (element instanceof Variant) {
+                    convertedElement = fromVariant(runtime, (Variant) element);
+                } else {
+                    throw runtime.newArgumentError("Unknown element found in SafeArray: " +
+                            element.getClass());
+                }
+                newArray.append(convertedElement);
+            }
+
+            return newArray;
+    }
+
     public static IRubyObject fromVariant(Ruby runtime, Variant variant) {
         if (variant == null) return runtime.getNil();
 
+        if (variant.isArray()) {
+            return listFromSafeArray(runtime, (SafeArray) variant.getArray());
+        }
+
         switch (variant.getType()) {
             case Variant.VariantBoolean:
                 return runtime.newBoolean(variant.getBoolean());

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 8
-    - 1
-  version: 0.8.1
+    - 2
+  version: 0.8.2
 platform: ruby
 authors: 
   - Thomas E. Enebo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -06:00
+date: 2010-12-19 00:00:00 -06:00
 default_executable: 
 dependencies: []