jruby-win32ole 0.8.2 → 0.8.3

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.3

data/lib/jruby-win32ole/version.rb

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

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

@@ -5,7 +5,6 @@ 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;
@@ -73,23 +72,21 @@ public class RubyWIN32OLE extends RubyObject {
     @JRubyMethod(required = 3)
     public IRubyObject _getproperty(ThreadContext context, IRubyObject dispid,
             IRubyObject args, IRubyObject argTypes) {
-        RubyArray argsArray = args.convertToArray();
-        Object[] objectArgs = makeObjectArgs(argsArray);
-        int dispatchId = (int) RubyInteger.num2long(dispid);
+        Object[] objectArgs = makeObjectArgs(args.convertToArray());
+        int id = (int) RubyInteger.num2long(dispid);
+        Ruby runtime = context.getRuntime();
         
-        if (objectArgs.length == 0) {
-            return fromObject(context.getRuntime(), Dispatch.callO(dispatch, dispatchId));
-        } 
+        if (objectArgs.length == 0) return fromObject(runtime, dispatch.callO(id));
 
-        return fromVariant(context.getRuntime(),
-                Dispatch.call(dispatch, dispatchId, objectArgs));
+        return fromVariant(runtime, dispatch.call(id, objectArgs));
     }
 
     @JRubyMethod(required = 1, rest = true)
     public IRubyObject initialize(ThreadContext context, IRubyObject[] args) {
         String id = args[0].convertToString().asJavaString();
+        String progId = toProgID(id);
 
-        dispatch = new Dispatch(toProgID(id));
+        dispatch = new Dispatch(progId);
 
         return this;
     }
@@ -126,14 +123,15 @@ public class RubyWIN32OLE extends RubyObject {
     public IRubyObject op_aref(ThreadContext context, IRubyObject property) {
         String propertyName = property.asJavaString();
         
-        return fromVariant(context.getRuntime(), Dispatch.get(dispatch, propertyName));
+        return fromVariant(context.getRuntime(), dispatch.get(propertyName));
     }
 
     @JRubyMethod(name = "[]=", required = 2)
     public IRubyObject op_aset(ThreadContext context, IRubyObject property, IRubyObject value) {
         String propertyName = property.asJavaString();
 
-        Dispatch.put(dispatch, propertyName, toObject(value));
+        dispatch.put(propertyName, toObject(value));
+        
         return context.getRuntime().getNil();
     }
 
@@ -154,7 +152,7 @@ public class RubyWIN32OLE extends RubyObject {
         Object[] objectArgs = makeObjectArgs(args, 1);
         int[] errorArgs = new int[objectArgs.length];
 
-        Dispatch.invoke(dispatch, methodName, Dispatch.Put, objectArgs, errorArgs);
+        dispatch.invoke(methodName, Dispatch.Put, objectArgs, errorArgs);
         return context.getRuntime().getNil();
     }
 
@@ -164,10 +162,9 @@ public class RubyWIN32OLE extends RubyObject {
         int dispatchId = (int) RubyInteger.num2long(dispid);
         Object[] objectArgs = makeObjectArgs(argsArray);
         int[] errorArgs = makeErrorArgs(objectArgs.length);
-        Variant returnValue = Dispatch.invoke(dispatch, dispatchId, dispatchType,
+        Variant returnValue = dispatch.invoke(dispatchId, dispatchType,
                 objectArgs, errorArgs);
 
-        System.out.println("INVOKEINTERNAL: " + returnValue);
         return fromVariant(context.getRuntime(), returnValue);
     }
     private int[] makeErrorArgs(int size) {
@@ -201,10 +198,10 @@ public class RubyWIN32OLE extends RubyObject {
 
     private IRubyObject invokeMethodOrGet(ThreadContext context, String methodName, IRubyObject[] args) {
         if (args.length == 1) { // No-arg call
-            return fromObject(context.getRuntime(), Dispatch.callO(dispatch, methodName));
+            return fromObject(context.getRuntime(), dispatch.callO(methodName));
         } 
         return fromVariant(context.getRuntime(),
-                Dispatch.callN(dispatch, methodName, makeObjectArgs(args, 1)));
+                dispatch.callN(methodName, makeObjectArgs(args, 1)));
     }
 
     @Override
@@ -300,8 +297,8 @@ public class RubyWIN32OLE extends RubyObject {
     }
 
     public static String toProgID(String id) {
-        if (id != null && id.startsWith("{{") && id.endsWith("}}")) {
-            return id.substring(2, id.length() - 2);
+        if (id != null && id.startsWith("{") && id.endsWith("}")) {
+            return "clsid:" + id.substring(1, id.length() - 1);
         }
 
         return id;

metadata

@@ -1,80 +1,81 @@
 --- !ruby/object:Gem::Specification 
 name: jruby-win32ole
 version: !ruby/object:Gem::Version 
+  hash: 57
   prerelease: false
   segments: 
-    - 0
-    - 8
-    - 2
-  version: 0.8.2
+  - 0
+  - 8
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
-  - Thomas E. Enebo
+- Thomas E. Enebo
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-19 00:00:00 -06:00
+date: 2010-12-27 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
 description: A Gem for win32ole support on JRuby
 email: tom.enebo@gmail.com
 executables: 
-  - make_data.rb
-  - sample
+- make_data.rb
+- sample
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-  - .gitignore
-  - Gemfile
-  - README
-  - Rakefile
-  - VERSION
-  - bin/make_data.rb
-  - bin/sample
-  - build.xml
-  - jruby-win32ole.gemspec
-  - lib/jruby-win32ole.rb
-  - lib/jruby-win32ole/version.rb
-  - lib/racob-x64.dll
-  - lib/racob-x86.dll
-  - lib/racob.jar
-  - lib/win32ole/utils.rb
-  - lib/win32ole/win32ole.jar
-  - lib/win32ole/win32ole_error.rb
-  - lib/win32ole/win32ole_event.rb
-  - lib/win32ole/win32ole_method.rb
-  - lib/win32ole/win32ole_param.rb
-  - lib/win32ole/win32ole_ruby.rb
-  - lib/win32ole/win32ole_type.rb
-  - lib/win32ole/win32ole_typelib.rb
-  - lib/win32ole/win32ole_variable.rb
-  - lib/win32ole/win32ole_variant.rb
-  - nbproject/build-impl.xml
-  - nbproject/genfiles.properties
-  - nbproject/private/config.properties
-  - nbproject/private/private.properties
-  - nbproject/private/private.xml
-  - nbproject/project.properties
-  - nbproject/project.xml
-  - samples/browser_connect.rb
-  - samples/const_load.rb
-  - samples/dir_enum_bench.rb
-  - samples/dispatch_bench.rb
-  - samples/dump.rb
-  - samples/file_system_object.rb
-  - samples/fs.rb
-  - samples/ie_plus_events.rb
-  - samples/ie_simple.rb
-  - samples/ie_simple_clsid.rb
-  - samples/sbem.rb
-  - samples/small_enum_bench.rb
-  - src/org/jruby/ext/win32ole/RubyInvocationProxy.java
-  - src/org/jruby/ext/win32ole/RubyWIN32OLE.java
-  - src/win32ole/Win32oleService.java
+- .gitignore
+- Gemfile
+- README
+- Rakefile
+- VERSION
+- bin/make_data.rb
+- bin/sample
+- build.xml
+- jruby-win32ole.gemspec
+- lib/jruby-win32ole.rb
+- lib/jruby-win32ole/version.rb
+- lib/racob-x64.dll
+- lib/racob-x86.dll
+- lib/racob.jar
+- lib/win32ole/utils.rb
+- lib/win32ole/win32ole.jar
+- lib/win32ole/win32ole_error.rb
+- lib/win32ole/win32ole_event.rb
+- lib/win32ole/win32ole_method.rb
+- lib/win32ole/win32ole_param.rb
+- lib/win32ole/win32ole_ruby.rb
+- lib/win32ole/win32ole_type.rb
+- lib/win32ole/win32ole_typelib.rb
+- lib/win32ole/win32ole_variable.rb
+- lib/win32ole/win32ole_variant.rb
+- nbproject/build-impl.xml
+- nbproject/genfiles.properties
+- nbproject/private/config.properties
+- nbproject/private/private.properties
+- nbproject/private/private.xml
+- nbproject/project.properties
+- nbproject/project.xml
+- samples/browser_connect.rb
+- samples/const_load.rb
+- samples/dir_enum_bench.rb
+- samples/dispatch_bench.rb
+- samples/dump.rb
+- samples/file_system_object.rb
+- samples/fs.rb
+- samples/ie_plus_events.rb
+- samples/ie_simple.rb
+- samples/ie_simple_clsid.rb
+- samples/sbem.rb
+- samples/small_enum_bench.rb
+- src/org/jruby/ext/win32ole/RubyInvocationProxy.java
+- src/org/jruby/ext/win32ole/RubyWIN32OLE.java
+- src/win32ole/Win32oleService.java
 has_rdoc: true
 homepage: http://github.com/enebo/jruby-win32ole
 licenses: []
@@ -83,25 +84,29 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: jruby-win32ole
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Gem for win32ole support on JRuby