jruby-win32ole 0.8.0 → 0.8.1

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/lib/jruby-win32ole.rb

@@ -10,25 +10,11 @@ require 'racob.jar'
 require 'win32ole/win32ole'      # <- java native impl of WIN32OLE
 require 'win32ole/win32ole_ruby' # <- ruby impl of WIN32OLE
 
-java_import java.util.Calendar
-
-java_import org.racob.com.Variant
-java_import org.racob.com.Automation
-java_import org.racob.com.ComFailException
-java_import org.racob.com.ComThread
-java_import org.racob.com.Dispatch
-java_import org.racob.com.DispatchEvents
-java_import org.racob.com.EnumVariant
-java_import org.racob.com.FuncDesc
-java_import org.racob.com.TypeInfo
-java_import org.racob.com.TypeLib
-java_import org.racob.com.VarDesc
-java_import org.racob.com.VariantUtilities
+java_import org.racob.com.Variant # Needed for static native initializer :(
 
 java_import org.jruby.ext.win32ole.RubyWIN32OLE
 java_import org.jruby.ext.win32ole.RubyInvocationProxy
 
-
 require 'win32ole/win32ole_error'
 require 'win32ole/win32ole_method'
 require 'win32ole/win32ole_variant'

data/lib/jruby-win32ole/version.rb

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

data/lib/win32ole/utils.rb

@@ -2,8 +2,8 @@ require 'win32ole/win32ole_variant'
 
 class WIN32OLE
   module Utils
-    # FIXME: I don't know specifically if this is a GMT or local date?
-    OUT_OF_RANGE_DATE = Time.local(1899, 12, 30)
+    java_import org.racob.com.ComFailException
+    java_import org.racob.com.Dispatch
 
     def SafeStringValue(str)
       return str if str.kind_of?(::String)
@@ -19,44 +19,6 @@ class WIN32OLE
       value
     end
 
-    # Convert the supplied variant value to an equivalent Ruby value.
-    # If dispose is true then also dispose the variant itself.
-    def from_variant(value)
-      object = VariantUtilities.variant_to_object(value)
-      case object
-      when Dispatch then
-        object = WIN32OLE.new(object)
-      when java.util.Date then
-        object = java_date2ruby_time(object)
-      end
-
-      # Jacob will return null on out of bound dates whereas MRI returns
-      # some date windows normally returns.  We will match this.
-      if object.nil? && !value.nil?
-        case value.getvt
-        when Variant::VariantDate, (Variant::VariantDate|Variant::VariantByref) then
-          object = OUT_OF_RANGE_DATE
-          
-        end
-      end
-
-      object
-    end
-
-    # Simliar to MRI:vtdate2rbtime but we work with Java date instead of
-    # raw variant type
-    def java_date2ruby_time(date)
-      calendar = Calendar.get_instance
-      calendar.time = date
-
-      Time.local(calendar.get(Calendar::YEAR),
-               calendar.get(Calendar::MONTH),
-               calendar.get(Calendar::DAY_OF_MONTH),
-               calendar.get(Calendar::HOUR_OF_DAY),
-               calendar.get(Calendar::MINUTE),
-               calendar.get(Calendar::SECOND))
-    end
-
     def methods_with_flag(flag)
       members = []
       all_methods(typeinfo_from_ole) do |typeinfo, old_typeinfo, desc, docs, i|
@@ -123,7 +85,7 @@ class WIN32OLE
       path = path_reg.open(arch) { |r| r.read(nil) }[1]
 #      puts "PATH = #{path}"
       begin
-        Automation.loadTypeLib(path)
+        org.racob.com.Automation.loadTypeLib(path)
       rescue ComFailException => e
 #        puts "Failed to load #{name} fom #{path} because: #{e}"
         nil
@@ -211,20 +173,5 @@ class WIN32OLE
 
       type_details ? type_details : type_string
     end
-
-    def variable_kind_string(varkind)
-      case varkind
-        when VarDesc::VAR_PERINSTANCE then
-        "PERINSTANCE"
-        when VarDesc::VAR_STATIC then
-        "STATIC"
-        when VarDesc::VAR_CONST then
-        "CONSTANT"
-        when VarDesc::VAR_DISPATCH then
-        "DISPATCH"
-        else
-        "UNKNOWN"
-      end
-    end
   end
 end

data/lib/win32ole/win32ole_event.rb

@@ -1,4 +1,6 @@
 class WIN32OLE_EVENT
+  java_import org.racob.com.DispatchEvents
+  
   def initialize(ole, event_name=nil)
     @event_handlers = {}
 

data/lib/win32ole/win32ole_method.rb

@@ -1,4 +1,7 @@
 class WIN32OLE_METHOD
+  java_import org.racob.com.FuncDesc
+  java_import org.racob.com.TypeInfo
+  
   attr_accessor :oletype, :typeinfo
 
   def initialize(*args)

data/lib/win32ole/win32ole_type.rb

@@ -1,4 +1,6 @@
 class WIN32OLE_TYPE
+  java_import org.racob.com.TypeInfo
+  
   attr_reader :typeinfo
 
   def initialize(*args)

data/lib/win32ole/win32ole_typelib.rb

@@ -1,6 +1,8 @@
 require 'win32/registry'
 
 class WIN32OLE_TYPELIB
+  java_import org.racob.com.TypeLib
+
   attr_reader :typelib
   attr_reader :name
   alias :to_s :name

data/lib/win32ole/win32ole_variable.rb

@@ -1,4 +1,6 @@
 class WIN32OLE_VARIABLE
+  java_import org.racob.com.VarDesc
+  
   attr_reader :name
 
   def initialize(type, var_desc, name)
@@ -15,11 +17,22 @@ class WIN32OLE_VARIABLE
   end
 
   def value
-    from_variant(@var_desc.constant)
+    RubyWIN32OLE.from_variant(JRuby.runtime, @var_desc.constant)
   end
 
   def variable_kind
-    variable_kind_string(varkind)
+    case varkind
+    when VarDesc::VAR_PERINSTANCE then
+      "PERINSTANCE"
+    when VarDesc::VAR_STATIC then
+      "STATIC"
+    when VarDesc::VAR_CONST then
+      "CONSTANT"
+    when VarDesc::VAR_DISPATCH then
+      "DISPATCH"
+    else
+      "UNKNOWN"
+    end
   end
 
   def varkind

data/nbproject/project.properties

@@ -1,7 +1,7 @@
 application.title=win32ole
 application.vendor=Fuebo
 build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
+build.classes.excludes=**/*.java,**/*.form,**/*.jar
 # This directory is removed when the project is cleaned:
 build.dir=build
 build.generated.dir=${build.dir}/generated
@@ -22,7 +22,7 @@ dist.jar=${dist.dir}/win32ole.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=**.dll
-file.reference.jruby.jar=../../jruby-1.5.1/lib/jruby.jar
+file.reference.jruby.jar=../jruby/lib/jruby.jar
 file.reference.jrwin32ole-lib=lib
 file.reference.jrwin32ole-src=src
 file.reference.racob.jar=lib/racob.jar

data/samples/dump.rb

@@ -0,0 +1,20 @@
+require 'win32ole'
+
+name = proc {|a, b| a.name <=> b.name }
+WIN32OLE_TYPELIB.typelibs.sort(&name).each do |typelib|
+  puts "TYPELIB: #{typelib.name}"
+  typelib.ole_classes.sort(&name).each do |ole_class|
+    puts "  CLASS: #{ole_class.name}"
+    puts "   GUID   : #{ole_class.guid}"
+    puts "   PROGID : #{ole_class.progid}" 
+    puts "   DESCR  : #{ole_class.helpstring}"
+
+    ole_class.ole_methods.sort(&name).each do |ole_method|
+      print "    #{ole_method.return_type} #{ole_method.name}("
+      print ole_method.params.to_a.inject([]) { |sum, param|
+        sum << "#{param.ole_type} #{param.name}"
+      }.join(", ")
+      puts ")"
+    end
+  end
+end

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

@@ -63,6 +63,7 @@ public class RubyWIN32OLE extends RubyObject {
             Variant value = enumVariant.nextElement();
             block.yield(context, fromVariant(runtime, value));
         }
+	enumVariant.safeRelease();
 
         return runtime.getNil();
     }
@@ -275,4 +276,4 @@ public class RubyWIN32OLE extends RubyObject {
 
         return id;
     }
-}
+}

metadata

@@ -1,80 +1,80 @@
 --- !ruby/object:Gem::Specification 
 name: jruby-win32ole
 version: !ruby/object:Gem::Version 
-  hash: 63
   prerelease: false
   segments: 
-  - 0
-  - 8
-  - 0
-  version: 0.8.0
+    - 0
+    - 8
+    - 1
+  version: 0.8.1
 platform: ruby
 authors: 
-- Thomas E. Enebo
+  - Thomas E. Enebo
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 -05:00
+date: 2010-11-09 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/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,29 +83,25 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: jruby-win32ole
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Gem for win32ole support on JRuby