robust_excel_ole 1.12 → 1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b568d18d573ee255b9c3601e983c3d7b1ff062fe50b97dc10bc1e9a79efb1556
-  data.tar.gz: 3f87e8db112deb8e414f77b2d5756158a79b135413ba6a1116d7b7abf68c710f
+  metadata.gz: f76aadd233f6dd4c2f5d568d54ef10c6c030762544906a3357c7f04464e24846
+  data.tar.gz: 68101beb84d01cd1b2da24c4568a833d5b6d641c5829b3b7e1da793c651a1aa3
 SHA512:
-  metadata.gz: e3ba0806cf0f4c0fec0ae85eee158fe5b9422d901f9172ad4eb274a1118eaf7dc61a7e47cd0f5d276bacd40e0506b4d7531bbcd4d93334bfe1dc1242a3f803db
-  data.tar.gz: eb1ee24dcb77a5d7b84715b56352b43b7df7f3e2f64130761e911313b0cca921f2c8ca7a1ae3f64ef84e6c4933b21dc81097b759ed99abed64549b7ac26c56e2
+  metadata.gz: 8b79a216b5460efd0b51ff81c335e53c37d8c7530185838f88e7befc0eacbd686338d7578ffee7db399795427c0983abc091a2c673230e126d01ff335e1cb80f
+  data.tar.gz: 55c8c0bb5a58d2574bf2938333e551e91402e7eb75eb40bc380fc3eee998766aa693f7e4eb5f615ad21f2c9882376259c900b813541547f47b0f3d071121cc10

data/README.rdoc

@@ -65,7 +65,7 @@ Let's open a workbook.
 Now we have a Workbook object that wraps a win32ole object. That is, you can send any win32ole (VBA) method to it. See 
 https://docs.microsoft.com/en-us/office/vba/api/excel.workbook#methods.
 
-For example, you can determine the name and the saved-status of the workbook.
+For example, you can determine the name and the visible status of the workbook.
 
   workbook.Name 
   # => "workbook.xls"
@@ -198,12 +198,6 @@ For hard terminating all Excel processes we can use
 
 For more details about creating Excel instances see README_excel[https://github.com/Thomas008/robust_excel_ole/blob/master/README/README_excel_rdoc]
 
-=== Generating a new workbook
-
-You can creata a new, empty workbook by
-
-  Excel.generate_workbook('spec/data/new_workbook.xls')
-
 === Opening workbooks in several Excel instances
 
 RobustExcelOle enables opening and processing workbooks in several Excel instances. Using more than one Excel process allows, e.g., running a script that operates in one Excel instance, while a user (or another script) modifies workbooks in another Excel instance. 
@@ -317,19 +311,10 @@ and set another value to that range.
 
 For more details about reading and writing contents of cells and ranges see {README_ranges}[https://github.com/Thomas008/robust_excel_ole/blob/master/docs/README_ranges.rdoc]
 
-=== Running in jruby
-
-RobustExcelOle runs in jruby as well. You can call the console via the command +jreo+. We implemented workarounds to cope with some restrictions of the library jruby-win32ole. Some issues still remain when running under jruby. So you might consider the following points when running RobustExcelOle under jruby:
-
-1. +Excel.current+ or +Excel.new(:reuse => true)+ does not connect to an already running Excel instance, unless some workbook has been opened via RobustExcelOle. 
-
-2. Use +Excel.kill_all+ instead of +Excel.close_all+. +Excel.close_all does not work yet. It relies on stepping through all heap objects in ObjectSpace. In jruby ObjectSpace is disabled. Each_object will only work with Class.
-
-3. When providing an absolute path, you have to state the "/" ("C:/abc.xls" works, "C:abc" does not work).
 
 === More things
 
-You can convert a win32ole object into a RobustExcelOle object.
+You can convert some win32ole objects into a RobustExcelOle object.
 
   range = sheet.Names.Item("firstcell").to_reo
 
@@ -339,6 +324,7 @@ You can run the examples included in the directory +examples+, e.g.
 
   ruby examples\open_save_close\example_unobtrusively.rb
 
+  
 == Development
 
 This project RobustExcelOle is work in progress. We are happy to implement further features. So we invite you to send your pull requests. We then strive to realize them as soon as possible. If you have any feedback, or you find use cases that RobustExcelOle does not satisfy, please let us know.

data/lib/robust_excel_ole/cell.rb

@@ -19,15 +19,19 @@ module RobustExcelOle
     # @private
     def method_missing(name, *args) 
       #if name.to_s[0,1] =~ /[A-Z]/
+      if JRUBY_BUG_ERRORMESSAGE
         begin
           @cell.send(name, *args)
-        rescue WIN32OLERuntimeError => msg
-          if msg.message =~ /unknown property or method/
-            raise VBAMethodMissingError, "unknown VBA property or method #{name.inspect}"
-          else
-            raise msg
-          end
+        rescue Java::OrgRacobCom::ComFailException 
+          raise VBAMethodMissingError, "unknown VBA property or method #{name.inspect}"
         end
+      else
+        begin
+          @cell.send(name, *args)
+        rescue NoMethodError 
+          raise VBAMethodMissingError, "unknown VBA property or method #{name.inspect}"
+        end
+      end
      # else
      #   super
      # end

data/lib/robust_excel_ole/excel.rb

@@ -75,9 +75,8 @@ module RobustExcelOle
       end
       ole_xl = win32ole_excel unless win32ole_excel.nil?
       options = { :reuse => true }.merge(options)
-      #ole_xl = current_excel if options[:reuse] == true
       if options[:reuse] == true && ole_xl.nil?
-        ole_xl = if RUBY_PLATFORM =~ /java/         
+        ole_xl = if JRUBY_BUG_CONNECTEXCEL
           excel_instance = known_excel_instance 
           excel_instance.ole_excel unless excel_instance.nil?
         else
@@ -185,7 +184,7 @@ module RobustExcelOle
     def ole_workbooks
       ole_workbooks = begin
         @ole_excel.Workbooks
-      rescue WIN32OLERuntimeError => msg
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException => msg
         if msg.message =~ /failed to get Dispatch Interface/
           raise ExcelDamaged, 'Excel instance not alive or damaged'
         else
@@ -724,14 +723,18 @@ module RobustExcelOle
     # @private
     def method_missing(name, *args) 
       if name.to_s[0,1] =~ /[A-Z]/
-        begin
-          raise ObjectNotAlive, 'method missing: Excel not alive' unless alive?
-          @ole_excel.send(name, *args)
-        rescue WIN32OLERuntimeError => msg
-          if msg.message =~ /unknown property or method/
+        raise ObjectNotAlive, 'method missing: Excel not alive' unless alive?
+        if JRUBY_BUG_ERRORMESSAGE
+          begin
+            @ole_excel.send(name, *args)
+          rescue Java::OrgRacobCom::ComFailException => msg
+            raise VBAMethodMissingError, "unknown VBA property or method #{name.inspect}"
+          end
+        else
+          begin
+            @ole_excel.send(name, *args)
+          rescue NoMethodError
             raise VBAMethodMissingError, "unknown VBA property or method #{name.inspect}"
-          else
-            raise msg
           end
         end
       else

data/lib/robust_excel_ole/general.rb

@@ -2,6 +2,14 @@
 
 module General
 
+  IS_JRUBY_PLATFORM = (RUBY_PLATFORM =~ /java/)
+  JRUBY_BUG_CONNECT      = IS_JRUBY_PLATFORM && true
+  JRUBY_BUG_COPYSHEETS   = IS_JRUBY_PLATFORM && true
+  JRUBY_BUG_ERRORMESSAGE = IS_JRUBY_PLATFORM && true
+  JRUBY_BUG_CONNECTEXCEL = IS_JRUBY_PLATFORM && true
+  JRUBY_BUG_RANGES       = IS_JRUBY_PLATFORM && true
+
+
   # @private
   def absolute_path(file) 
     file = File.expand_path(file)

data/lib/robust_excel_ole/range.rb

@@ -27,7 +27,7 @@ module RobustExcelOle
     # @returns [Array] the values
     def values(range = nil)
       #result = map { |x| x.Value }.flatten
-      result_unflatten = if RUBY_PLATFORM !~ /java/
+      result_unflatten = if !JRUBY_BUG_RANGES
         map { |x| x.v }
       else
         self.v
@@ -44,7 +44,7 @@ module RobustExcelOle
 
     def v
       begin
-        if RUBY_PLATFORM !~ /java/ 
+        if !JRUBY_BUG_RANGES
           self.Value
         else
           address_r1c1 = self.AddressLocal(true,true,XlR1C1)
@@ -57,14 +57,15 @@ module RobustExcelOle
           end
           values
         end
-      rescue WIN32OLERuntimeError
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException => msg
         raise RangeNotEvaluatable, 'cannot read value'
       end 
+
     end
 
     def v=(value)
       begin
-        if RUBY_PLATFORM !~ /java/
+        if !JRUBY_BUG_RANGES
           ole_range.Value = value
         else
           address_r1c1 = ole_range.AddressLocal(true,true,XlR1C1)
@@ -76,7 +77,7 @@ module RobustExcelOle
           end
         end
         value
-      rescue # WIN32OLERuntimeError
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException => msg  
         raise RangeNotEvaluatable, "cannot assign value to range #{address_r1c1.inspect}"
       end
     end
@@ -156,7 +157,7 @@ module RobustExcelOle
             end
           end
         end
-      rescue WIN32OLERuntimeError
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException => msg
         raise RangeNotCopied, 'cannot copy range'
       end
     end
@@ -208,7 +209,7 @@ module RobustExcelOle
             end
           end
         end
-      rescue WIN32OLERuntimeError
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException => msg 
         raise RangeNotCopied, 'cannot copy range'
       end
     end
@@ -239,13 +240,17 @@ module RobustExcelOle
     # @private
     def method_missing(name, *args) 
       if name.to_s[0,1] =~ /[A-Z]/
-        begin
-          @ole_range.send(name, *args)
-        rescue WIN32OLERuntimeError => msg
-          if msg.message =~ /unknown property or method/
+        if JRUBY_BUG_ERRORMESSAGE
+          begin
+            @ole_range.send(name, *args)
+          rescue Java::OrgRacobCom::ComFailException 
+            raise VBAMethodMissingError, "unknown VBA property or method #{name.inspect}"
+          end
+        else
+          begin
+            @ole_range.send(name, *args)
+          rescue NoMethodError 
             raise VBAMethodMissingError, "unknown VBA property or method #{name.inspect}"
-          else
-            raise msg
           end
         end
       else

data/lib/robust_excel_ole/range_owners.rb

@@ -24,13 +24,13 @@ module RobustExcelOle
       ole_range = name_obj.RefersToRange
       value = begin
         #name_obj.RefersToRange.Value
-        if RUBY_PLATFORM !~ /java/         
+        if !JRUBY_BUG_RANGES       
           ole_range.Value
         else
           values = RobustExcelOle::Range.new(ole_range).v
           (values.size==1 && values.first.size==1) ? values.first.first : values
         end
-      rescue WIN32OLERuntimeError
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException 
         sheet = if self.is_a?(Worksheet) then self
                 elsif self.is_a?(Workbook) then self.sheet(1)
                 elsif self.is_a?(Excel) then self.workbook.sheet(1)
@@ -39,13 +39,13 @@ module RobustExcelOle
           #sheet.Evaluate(name_obj.Name).Value
           # does it result in a range?
           ole_range = sheet.Evaluate(name_obj.Name)
-          if RUBY_PLATFORM !~ /java/
+          if !JRUBY_BUG_RANGES
             ole_range.Value
           else
             values = RobustExcelOle::Range.new(ole_range).v
             (values.size==1 && values.first.size==1) ? values.first.first : values
           end
-        rescue # WIN32OLERuntimeError
+        rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException 
           return opts[:default] unless opts[:default] == :__not_provided
           raise RangeNotEvaluatable, "cannot evaluate range named #{name.inspect} in #{self}"
         end
@@ -71,7 +71,7 @@ module RobustExcelOle
         ole_range = name_object(name).RefersToRange
         workbook.color_if_modified = opts[:color] unless opts[:color].nil?
         ole_range.Interior.ColorIndex = workbook.color_if_modified unless workbook.color_if_modified.nil?
-        if RUBY_PLATFORM !~ /java/
+        if !JRUBY_BUG_RANGES
           ole_range.Value = value
         else
           address_r1c1 = ole_range.AddressLocal(true,true,XlR1C1)
@@ -83,7 +83,7 @@ module RobustExcelOle
           end
         end
         value
-      rescue # WIN32OLERuntimeError
+      rescue #WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException
         raise RangeNotEvaluatable, "cannot assign value to range named #{name.inspect} in #{self.inspect}"
       end
     end
@@ -100,19 +100,19 @@ module RobustExcelOle
       return namevalue_glob(name, opts) if self.is_a?(Workbook)
       begin
         ole_range = self.Range(name)
-      rescue # WIN32OLERuntimeError
+      rescue # WIN32OLERuntimeError, VBAMethodMissingError, Java::OrgRacobCom::ComFailException 
         return opts[:default] unless opts[:default] == :__not_provided
         raise NameNotFound, "name #{name.inspect} not in #{self.inspect}"
       end
       begin
         #value = ole_range.Value
-        value = if RUBY_PLATFORM !~ /java/
+        value = if !JRUBY_BUG_RANGES
           ole_range.Value
         else
           values = RobustExcelOle::Range.new(ole_range).v
           (values.size==1 && values.first.size==1) ? values.first.first : values
         end
-      rescue  #WIN32OLERuntimeError
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException 
         return opts[:default] unless opts[:default] == :__not_provided
         raise RangeNotEvaluatable, "cannot determine value of range named #{name.inspect} in #{self.inspect}"
       end
@@ -131,13 +131,13 @@ module RobustExcelOle
       begin
         return set_namevalue_glob(name, value, opts) if self.is_a?(Workbook)  # opts deprecated
         ole_range = self.Range(name)
-      rescue # WIN32OLERuntimeError
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException
         raise NameNotFound, "name #{name.inspect} not in #{self.inspect}"
       end
       begin
         workbook.color_if_modified = opts[:color] unless opts[:color].nil?
         ole_range.Interior.ColorIndex = workbook.color_if_modified unless workbook.color_if_modified.nil?
-        if RUBY_PLATFORM !~ /java/
+        if !JRUBY_BUG_RANGES
           ole_range.Value = value
         else
           address_r1c1 = ole_range.AddressLocal(true,true,XlR1C1)
@@ -149,7 +149,7 @@ module RobustExcelOle
           end
         end
         value
-      rescue  # WIN32OLERuntimeError
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException
         raise RangeNotEvaluatable, "cannot assign value to range named #{name.inspect} in #{self.inspect}"
       end
     end
@@ -199,7 +199,7 @@ module RobustExcelOle
           workbook.save
           range                    
         end
-      rescue WIN32OLERuntimeError
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException
         address2_string = address2.nil? ? "" : ", #{address2.inspect}"
         raise RangeNotCreated, "cannot create range (#{name_or_address.inspect}#{address2_string})"
       end      
@@ -217,7 +217,7 @@ module RobustExcelOle
       addr = [addr,addr_deprecated] unless addr_deprecated == :__not_provided
       begin       
         self.Names.Add(name, nil, true, nil, nil, nil, nil, nil, nil, '=' + Address.r1c1(addr))
-      rescue # WIN32OLERuntimeError => msg
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException
         raise RangeNotEvaluatable, "cannot add name #{name.inspect} to range #{addr.inspect}"
       end
       name
@@ -233,12 +233,12 @@ module RobustExcelOle
     def rename_range(name, new_name)
       begin
         item = self.Names.Item(name)
-      rescue # WIN32OLERuntimeError
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException => msg
         raise NameNotFound, "name #{name.inspect} not in #{File.basename(self.stored_filename).inspect}"
       end
       begin
         item.Name = new_name
-      rescue # WIN32OLERuntimeError
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException => msg
         raise UnexpectedREOError, "name error in #{File.basename(self.stored_filename).inspect}"
       end
     end
@@ -249,12 +249,12 @@ module RobustExcelOle
     def delete_name(name)
       begin
         item = self.Names.Item(name)
-      rescue WIN32OLERuntimeError
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException
         raise NameNotFound, "name #{name.inspect} not in #{File.basename(self.stored_filename).inspect}"
       end
       begin
         item.Delete
-      rescue WIN32OLERuntimeError
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException
         raise UnexpectedREOError, "name error in #{File.basename(self.stored_filename).inspect}"
       end
     end
@@ -263,10 +263,10 @@ module RobustExcelOle
 
     def name_object(name)
       self.Names.Item(name)
-    rescue #WIN32OLERuntimeError
+    rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException
       begin
         self.Parent.Names.Item(name)
-      rescue #WIN32OLERuntimeError
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException
         raise RobustExcelOle::NameNotFound, "name #{name.inspect} not in #{self.inspect}"
       end
     end

data/lib/robust_excel_ole/version.rb

@@ -1,3 +1,3 @@
 module RobustExcelOle
-  VERSION = "1.12"
+  VERSION = "1.13"
 end

data/lib/robust_excel_ole/workbook.rb

@@ -22,16 +22,15 @@ module RobustExcelOle
     DEFAULT_OPEN_OPTS = {
       :default => {:excel => :current},
       :force => {},
+      :update_links => :never,
       :if_unsaved    => :raise,
       :if_obstructed => :raise,
       :if_absent     => :raise,
-      #:read_only => false,
-      :check_compatibility => false,
-      :update_links => :never,
-      :if_exists => :raise
+      :if_exists => :raise,
+      :check_compatibility => false
     }.freeze
 
-    CORE_DEFAULT_OPTEN_OPTS = {
+    CORE_DEFAULT_OPEN_OPTS = {
       :default => {:excel => :current}, :force => {}, :update_links => :never
     }.freeze
 
@@ -83,16 +82,22 @@ module RobustExcelOle
     # :check_compatibility  true -> check compatibility when saving
     # :update_links         true -> user is being asked how to update links, false -> links are never updated
     # @return [Workbook] a representation of a workbook
-    def self.open(file, opts = { }, &block)
-      raise(FileNameNotGiven, 'filename is nil') if file.nil?
-      raise(FileNotFound, "file #{General.absolute_path(file).inspect} is a directory") if File.directory?(file)
-      options = process_options(opts, :use_defaults => false)
+    def self.new(file_or_workbook, opts = { }, &block)
+      options = process_options(opts)
+      if file_or_workbook.is_a? WIN32OLE
+        file = file_or_workbook.Fullname.tr('\\','/') 
+      else
+        file = file_or_workbook
+        raise(FileNameNotGiven, 'filename is nil') if file.nil?
+        raise(FileNotFound, "file #{General.absolute_path(file).inspect} is a directory") if File.directory?(file)
+      end
+      # try to fetch the workbook from the bookstore
       book = nil
       if options[:force][:excel] != :new
         # if readonly is true, then prefer a book that is given in force_excel if this option is set              
         forced_excel = 
           (options[:force][:excel].nil? || options[:force][:excel] == :current) ? 
-            (excel_class.new(:reuse => true) if RUBY_PLATFORM !~ /java/) : excel_of(options[:force][:excel])              
+            (excel_class.new(:reuse => true) if !JRUBY_BUG_CONNECT) : excel_of(options[:force][:excel])              
         begin
           book = if File.exists?(file)
             bookstore.fetch(file, :prefer_writable => !(options[:read_only]),
@@ -108,13 +113,18 @@ module RobustExcelOle
             !(book.alive? && !book.saved && (options[:if_unsaved] != :accept))
             options[:force][:excel] = book.excel if book.excel && book.excel.alive?
             book.ensure_workbook(file,options)
+            book.set_options(file,options)
             return book
           end
         end
-      end
-      new(file, options, &block)
+      end        
+      super(file_or_workbook, options, &block)
     end
-    
+
+    def self.open(file_or_workbook, opts = { }, &block)
+      new(file_or_workbook, opts, &block)
+    end
+
     # creates a new Workbook object, if a file name is given
     # Promotes the win32ole workbook to a Workbook object, if a win32ole-workbook is given
     # @param [Variant] file_or_workbook  file name or workbook
@@ -122,22 +132,21 @@ module RobustExcelOle
     # @option opts [Symbol] see above
     # @return [Workbook] a workbook
     def initialize(file_or_workbook, options = { }, &block)
-      options = self.class.process_options(options)
-      if file_or_workbook.is_a? WIN32OLE        
-        workbook = file_or_workbook
-        @ole_workbook = workbook
-        # use the Excel instance where the workbook is opened
-        ole_excel = WIN32OLE.connect(workbook.Fullname).Application rescue nil
+      if file_or_workbook.is_a? WIN32OLE
+        @ole_workbook = file_or_workbook
+        ole_excel = begin
+          WIN32OLE.connect(@ole_workbook.Fullname).Application
+        rescue
+          raise ExcelREOError, 'could not determine the Excel instance'
+        end
         @excel = excel_class.new(ole_excel)
-        filename = @ole_workbook.Fullname.tr('\\','/')
-        set_options(filename, options)
+        filename = file_or_workbook.Fullname.tr('\\','/') 
       else
-        filename = file_or_workbook    
-        #ensure_excel(options) #unless RUBY_PLATFORM =~ /java/ && (options[:force][:excel].nil? || options[:force][:excel] == :current)            
-        ensure_workbook(filename, options)
-      end
+        filename = file_or_workbook            
+        ensure_workbook(filename, options)        
+      end      
+      set_options(filename, options)
       bookstore.store(self)
-      @modified_cells = []
       @workbook = @excel.workbook = self
       r1c1_letters = @ole_workbook.Worksheets.Item(1).Cells.Item(1,1).Address(true,true,XlR1C1).gsub(/[0-9]/,'') #('ReferenceStyle' => XlR1C1).gsub(/[0-9]/,'')
       address_class.new(r1c1_letters)
@@ -149,7 +158,7 @@ module RobustExcelOle
         end
       end
     end
-
+ 
   private    
 
     # translates abbreviations and synonyms and merges with default options
@@ -181,7 +190,7 @@ module RobustExcelOle
         erg
       end
       opts = translator.call(options)
-      default_open_opts = proc_opts[:use_defaults] ? DEFAULT_OPEN_OPTS : CORE_DEFAULT_OPTEN_OPTS        
+      default_open_opts = proc_opts[:use_defaults] ? DEFAULT_OPEN_OPTS : CORE_DEFAULT_OPEN_OPTS        
       default_opts = translator.call(default_open_opts)
       opts = default_opts.merge(opts)
       opts[:default] = default_opts[:default].merge(opts[:default]) unless opts[:default].nil?
@@ -210,8 +219,8 @@ module RobustExcelOle
       @excel = if excel_option == :new
         excel_class.new(:reuse => false) 
       elsif excel_option.nil? || excel_option == :current
-        excel_class.new(:reuse => true) # unless RUBY_PLATFORM =~ /java/
-      else  #elsif excel_options.is_a?(WIN32OLE) || excel_option.is_a?(Excel) #excel_option.respond_to?(:Hwnd)
+        excel_class.new(:reuse => true)
+      else
         self.class.excel_of(excel_option)
       end
       raise ExcelREOError, "excel is not alive" unless @excel && @excel.alive?
@@ -220,14 +229,15 @@ module RobustExcelOle
     # @private
     # restriction for jruby: does not manage conflicts with blocking or unsaved workbooks
     def ensure_workbook(filename, options)  
-      if options[:if_unsaved]==:accept && options[:read_only]==true
-        raise OptionInvalid, ":if_unsaved:accept and :read_only:true not possible"
+      if options[:if_unsaved]==:accept && 
+        ((options[:read_only]==true && self.ReadOnly==false) || (options[:read_only]==false && self.ReadOnly==true))
+        raise OptionInvalid, ":if_unsaved:accept and change of read-only mode is not possible"
       end
       unless @ole_workbook && alive?
         filename = @stored_filename ? @stored_filename : filename 
         manage_nonexisting_file(filename,options)
-        excel_option = options[:force][:excel].nil? ? options[:default][:excel] : options[:force][:excel]
-        if RUBY_PLATFORM =~ /java/ && 
+        excel_option = options[:force][:excel].nil? ? options[:default][:excel] : options[:force][:excel]        
+        if JRUBY_BUG_CONNECT
           (excel_option.nil? || excel_option == :current) && filename[0] != '/'
           begin
             connect(filename,options)
@@ -247,8 +257,8 @@ module RobustExcelOle
           if @ole_workbook
             manage_blocking_or_unsaved_workbook(filename,options)
           else
-            if excel_option.nil? || excel_option == :current && 
-              (RUBY_PLATFORM !~ /java/ || filename[0] != '/')
+            if excel_option.nil? || excel_option == :current &&             
+              (!JRUBY_BUG_CONNECT || filename[0] != '/')
               connect(filename,options)
             else 
               open_or_create_workbook(filename,options)
@@ -256,7 +266,20 @@ module RobustExcelOle
           end       
         end
       end
-      set_options(filename, options)
+    end
+
+    # @private
+    def set_options(filename, options)
+      if (!options[:read_only].nil?) && options[:read_only] != @ole_workbook.ReadOnly
+        @excel.with_displayalerts(false) { @ole_workbook.Close }
+        @ole_workbook = nil        
+        open_or_create_workbook(filename, options)
+      end
+      retain_saved do
+        self.visible = options[:force][:visible].nil? ? @excel.Visible : options[:force][:visible]
+        @excel.calculation = options[:calculation] unless options[:calculation].nil?
+        @ole_workbook.CheckCompatibility = options[:check_compatibility] unless options[:check_compatibility].nil?
+      end
     end
 
   private
@@ -296,7 +319,7 @@ module RobustExcelOle
         empty_ole_workbook = excel.Workbooks.Item(excel.Workbooks.Count)
         begin
           empty_ole_workbook.SaveAs(abs_filename)
-        rescue # WIN32OLERuntimeError => msg
+        rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException => msg
           raise FileNotFound, "could not save workbook with filename #{filename.inspect}"
         end
       else
@@ -398,7 +421,7 @@ module RobustExcelOle
         abs_filename = General.absolute_path(filename)
         begin
           workbooks = @excel.Workbooks
-        rescue WIN32OLERuntimeError => msg
+        rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException => msg
           raise UnexpectedREOError, "cannot access workbooks: #{msg.message} #{msg.backtrace}"
         end
         begin
@@ -424,21 +447,7 @@ module RobustExcelOle
           raise UnexpectedREOError, "WIN32OLERuntimeError: #{msg.message} #{msg.backtrace}"
         end
       end
-    end
-
-    # @private
-    def set_options(filename, options)
-      if (!options[:read_only].nil?) && options[:read_only] != @ole_workbook.ReadOnly
-        @excel.with_displayalerts(false) { @ole_workbook.Close }
-        @ole_workbook = nil        
-        open_or_create_workbook(filename, options)
-      end
-      retain_saved do
-        self.visible = options[:force][:visible].nil? ? @excel.Visible : options[:force][:visible]
-        @excel.calculation = options[:calculation] unless options[:calculation].nil?
-        @ole_workbook.CheckCompatibility = options[:check_compatibility] unless options[:check_compatibility].nil?
-      end      
-    end
+    end    
            
     # @private
     # translating the option UpdateLinks from REO to VBA
@@ -599,14 +608,12 @@ module RobustExcelOle
             if change_rw_mode
               opts = opts.merge({:force => {:excel => opts[:rw_change_excel]}, :read_only => do_not_write})
               open(file, opts)
-              #open(file, :force => {:excel => opts[:rw_change_excel]}, :read_only => do_not_write)
             else
               book
             end
           else
             opts = opts.merge({:force => {:excel => opts[:if_closed]}, :read_only => do_not_write})
             open(file, opts)
-            #open(file, :force => {:excel => opts[:if_closed]}, :read_only => do_not_write)
           end
         yield book
       ensure
@@ -646,9 +653,8 @@ module RobustExcelOle
       # otherwise the workbook may already be open writable in an another Excel instance
       # then you could use this workbook or close the workbook there
       begin
-        @modified_cells = []
         @ole_workbook.Save
-      rescue WIN32OLERuntimeError => msg
+      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException => msg
         if msg.message =~ /SaveAs/ && msg.message =~ /Workbook/
           raise WorkbookNotSaved, 'workbook not saved'
         else
@@ -744,10 +750,9 @@ module RobustExcelOle
         when '.xlsx' then RobustExcelOle::XlOpenXMLWorkbook
         when '.xlsm' then RobustExcelOle::XlOpenXMLWorkbookMacroEnabled
         end
-      @modified_cells = []
       @ole_workbook.SaveAs(General.absolute_path(file), file_format)
       bookstore.store(self)
-    rescue WIN32OLERuntimeError => msg
+    rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException => msg
       if msg.message =~ /SaveAs/ && msg.message =~ /Workbook/
         # trace "save: canceled by user" if options[:if_exists] == :alert || options[:if_exists] == :excel
         # another possible semantics. raise WorkbookREOError, "could not save Workbook"
@@ -790,7 +795,7 @@ module RobustExcelOle
     # @returns [Worksheet]
     def sheet(name)
       worksheet_class.new(@ole_workbook.Worksheets.Item(name))
-    rescue WIN32OLERuntimeError => msg
+    rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException => msg
       raise NameNotFound, "could not return a sheet with name #{name.inspect}"
     end
 
@@ -825,7 +830,7 @@ module RobustExcelOle
       last_sheet_local = last_sheet
       after_or_before, base_sheet = opts.to_a.first || [:after, last_sheet_local]
       begin
-        if RUBY_PLATFORM !~ /java/
+        if !JRUBY_BUG_COPYSHEETS
           if sheet
             sheet.Copy({ after_or_before.to_s => base_sheet.ole_worksheet })
           else
@@ -833,7 +838,6 @@ module RobustExcelOle
             #@ole_workbook.Worksheets.Item(ole_workbook.Worksheets.Count).Activate
           end
         else
-          # workaround for jruby      
           if after_or_before == :before 
             if sheet
               sheet.Copy(base_sheet.ole_worksheet)
@@ -860,8 +864,7 @@ module RobustExcelOle
             end
           end
         end
-      rescue #WIN32OLERuntimeError 
-        #trace "#{$!.message}"
+      rescue WIN32OLERuntimeError, NameNotFound, Java::OrgRacobCom::ComFailException
         raise WorksheetREOError, "could not add given worksheet #{sheet.inspect}"
       end
       #ole_sheet = @excel.Activesheet
@@ -995,7 +998,7 @@ module RobustExcelOle
       end
     end
 
-    # @return [Boolean] true, if the full book names and excel Instances are identical, false otherwise
+    # @return [Boolean] true, if the full workbook names and excel Instances are identical, false otherwise
     def == other_book
       other_book.is_a?(Workbook) &&
         @excel == other_book.excel &&
@@ -1076,23 +1079,27 @@ module RobustExcelOle
 
   private
 
-    # @private
-    def method_missing(name, *args)   
+    def method_missing(name, *args) 
       if name.to_s[0,1] =~ /[A-Z]/
-        begin
-          raise ObjectNotAlive, 'method missing: workbook not alive' unless alive?
-          @ole_workbook.send(name, *args)
-        rescue WIN32OLERuntimeError => msg
-          if msg.message =~ /unknown property or method/
+        raise ObjectNotAlive, 'method missing: workbook not alive' unless alive?
+        if JRUBY_BUG_ERRORMESSAGE 
+          begin
+            @ole_workbook.send(name, *args)
+          rescue Java::OrgRacobCom::ComFailException 
+            raise VBAMethodMissingError, "unknown VBA property or method #{name.inspect}"
+          end
+        else
+          begin
+            @ole_workbook.send(name, *args)
+          rescue NoMethodError 
             raise VBAMethodMissingError, "unknown VBA property or method #{name.inspect}"
-          else
-            raise msg
           end
         end
       else
         super
       end
     end
+
   end
 
 public

data/lib/robust_excel_ole/worksheet.rb

@@ -47,8 +47,8 @@ module RobustExcelOle
     # @param [String] new_name the new name of the sheet
     def name= (new_name)
       @ole_worksheet.Name = new_name
-    rescue WIN32OLERuntimeError => msg
-      if msg.message =~ /800A03EC/
+    rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException => msg
+      if msg.message =~ /800A03EC/ || msg.message =~ /Visual Basic/
         raise NameAlreadyExists, "sheet name #{new_name.inspect} already exists"
       else
         raise UnexpectedREOError, "unexpected WIN32OLERuntimeError: #{msg.message}"
@@ -123,7 +123,7 @@ module RobustExcelOle
       workbook.color_if_modified = opts[:color] unless opts[:color].nil?
       cell.Interior.ColorIndex = workbook.color_if_modified unless workbook.color_if_modified.nil?
       cell.Value = value
-    rescue WIN32OLERuntimeError
+    rescue # WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException
       raise RangeNotEvaluatable, "cannot assign value #{value.inspect} to cell (#{y.inspect},#{x.inspect})"
     end
 
@@ -220,13 +220,17 @@ module RobustExcelOle
     # @private
     def method_missing(name, *args)
       if name.to_s[0,1] =~ /[A-Z]/
-        begin
-          @ole_worksheet.send(name, *args)
-        rescue WIN32OLERuntimeError => msg
-          if msg.message =~ /unknown property or method/
+        if JRUBY_BUG_ERRORMESSAGE 
+          begin
+            @ole_worksheet.send(name, *args)
+          rescue Java::OrgRacobCom::ComFailException 
+            raise VBAMethodMissingError, "unknown VBA property or method #{name.inspect}"
+          end
+        else
+          begin
+            @ole_worksheet.send(name, *args)
+          rescue NoMethodError 
             raise VBAMethodMissingError, "unknown VBA property or method #{name.inspect}"
-          else
-            raise msg
           end
         end
       else

data/robust_excel_ole.gemspec

@@ -11,11 +11,13 @@ Gem::Specification.new do |s|
   
   s.summary     = "RobustExcelOle automates processing Excel workbooks in Windows by using the win32ole library."
   s.description = "RobustExcelOle helps controlling Excel. 
-                   It is designed to manage simultaneously running
-                   Excel instances, even with simultanously happening user interactions.
                    This obviously includes standard tasks like reading and writing Excel workbooks.
-                   RobustExcelOle deals with various cases of Excel (and user) behaviour,
-                   supplies workarounds for some Excel bugs, and supports referenced libraries.
+                   The gem is designed to manage simultaneously running
+                   Excel instances, even with simultanously happening user interactions.
+                   
+                   RobustExcelOle deals with various cases of Excel (and user) behaviour, and
+                   supplies workarounds for some Excel and JRuby bugs.
+                   Library references are supported.
                    It runs on Windows and uses the win32ole library."                 
 
   s. licenses = ['MIT']

data/spec/bookstore_spec.rb

@@ -14,6 +14,7 @@ end
 $VERBOSE = nil
 
 include RobustExcelOle
+include General
 
 module RobustExcelOle
   # @private

data/spec/cell_spec.rb

@@ -2,6 +2,7 @@
 require File.join(File.dirname(__FILE__), './spec_helper')
 
 include RobustExcelOle
+include General
 
 describe Cell do
 

data/spec/excel_spec.rb

@@ -1839,44 +1839,45 @@ module RobustExcelOle
 
       it "should set options to true for a workbook" do
         book1 = Workbook.open(@simple_file1)
-        book1.excel.for_all_workbooks(:visible => true, :read_only => true, :check_compatibility => true)
-        #book1.excel.for_all_workbooks(:visible => true, :check_compatibility => true)
-        book2 = Workbook.open(@simple_file1)
-        book2.excel.Visible.should be true
-        book2.Windows(book2.Name).Visible.should be true
-        book2.visible.should be true
-        book2.ReadOnly.should be true
-        book2.CheckCompatibility.should be true
+        excel1 = book1.excel
+        excel1.for_all_workbooks(:visible => true, :read_only => true, :check_compatibility => true)
+        excel1.Visible.should be true
+        ole_workbook1 = book1.ole_workbook
+        ole_workbook1.Windows(ole_workbook1.Name).Visible.should be true
+        ole_workbook1.ReadOnly.should be true
+        ole_workbook1.CheckCompatibility.should be true
+        excel1.for_all_workbooks(:visible => false, :read_only => false, :check_compatibility => false)
+        excel1.Visible.should be true
+        ole_workbook1 = book1.ole_workbook
+        ole_workbook1.Windows(ole_workbook1.Name).Visible.should be false
+        ole_workbook1.ReadOnly.should be false
+        ole_workbook1.CheckCompatibility.should be false
       end
 
       it "should set options for two workbooks" do
         book1 = Workbook.open(@simple_file1)
         book2 = Workbook.open(@different_file1)
         excel = book1.excel
-        #excel.for_all_workbooks(:visible => true, :read_only => true, :check_compatibility => true)
-        excel.for_all_workbooks(:visible => true, :check_compatibility => true)
+        excel.for_all_workbooks(:visible => true, :check_compatibility => true, :read_only => true)
         excel.Visible.should be true
-        book3 = Workbook.open(@simple_file1)
-        book4 = Workbook.open(@different_file1)
-        book3.Windows(book3.Name).Visible.should be true
-        book3.visible.should be true
-        #book3.ReadOnly.should be true
-        book3.CheckCompatibility.should be true
-        book4.Windows(book4.Name).Visible.should be true
-        book4.visible.should be true
-        #book4.ReadOnly.should be true
-        book4.CheckCompatibility.should be true
-        #excel.for_all_workbooks(:visible => false, :read_only => false, :check_compatibility => false)
-        excel.for_all_workbooks(:visible => false, :check_compatibility => false)
+        ole_workbook1 = book1.ole_workbook
+        ole_workbook2 = book2.ole_workbook
+        ole_workbook1.Windows(ole_workbook1.Name).Visible.should be true
+        ole_workbook2.Windows(ole_workbook2.Name).Visible.should be true
+        ole_workbook1.CheckCompatibility.should be true
+        ole_workbook2.CheckCompatibility.should be true
+        ole_workbook1.ReadOnly.should be true
+        ole_workbook2.ReadOnly.should be true    
+        excel.for_all_workbooks(:visible => false, :check_compatibility => false, :read_only => false)
         excel.Visible.should be true
-        book3 = Workbook.open(@simple_file1)
-        book4 = Workbook.open(@different_file1)
-        book3.Windows(book3.Name).Visible.should be true
-        book3.visible.should be false
-        book4.Windows(book4.Name).Visible.should be false
-        book4.visible.should be false
-        #book4.ReadOnly.should be false
-        book4.CheckCompatibility.should be false
+        ole_workbook1 = book1.ole_workbook
+        ole_workbook2 = book2.ole_workbook
+        ole_workbook1.Windows(ole_workbook1.Name).Visible.should be false
+        ole_workbook2.Windows(ole_workbook2.Name).Visible.should be false
+        ole_workbook1.CheckCompatibility.should be false
+        ole_workbook2.CheckCompatibility.should be false
+        ole_workbook1.ReadOnly.should be false
+        ole_workbook2.ReadOnly.should be false    
       end
 
     end

data/spec/range_spec.rb

@@ -2,6 +2,7 @@
 require File.join(File.dirname(__FILE__), './spec_helper')
 
 include RobustExcelOle
+include General
 
 describe RobustExcelOle::Range do
 

data/spec/workbook_spec.rb

@@ -67,6 +67,44 @@ describe Workbook do
 
   end
 
+  describe "open and new" do
+
+    context "with standard" do
+
+      it "should yield identical objects" do
+        book1 = Workbook.open(@simple_file1)
+        ole_workbook1 = book1.ole_workbook
+        book2 = Workbook.new(ole_workbook1)
+        book1.equal?(book2).should be true
+      end
+
+    end
+
+  end
+
+  describe "connecting to unknown workbooks" do
+
+    context "with one unknown workbook" do
+
+      before do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file1)
+        @ole_wb = ws.Open(abs_filename)
+      end
+
+      it "should connect to an unknown workbook" do
+        Workbook.open(@simple_file1) do |book|
+          book.filename.should == @simple_file1
+          book.should be_alive
+          book.should be_a Workbook
+          book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
+          Excel.excels_number.should == 1
+        end
+      end
+    end
+  end
+
   describe "Workbook::save" do
 
     it "should save a file, if it is open" do

data/spec/workbook_specs/workbook_open_spec.rb

@@ -43,6 +43,30 @@ describe Workbook do
     rm_tmp(@dir)
   end
 
+  describe "open and new" do
+
+    context "with standard" do
+
+      before do
+        @book1 = Workbook.new(@simple_file1)
+      end
+
+      it "should yield identical Workbook objects for a file name" do
+        book2 = Workbook.open(@simple_file1)
+        book2.equal?(@book1).should be true
+      end
+
+      it "should yield identical Workbook objects for a win32ole-workbook" do
+        ole_workbook1 = @book1.ole_workbook
+        book2 = Workbook.new(ole_workbook1)
+        book3 = Workbook.open(ole_workbook1)
+        book3.equal?(book2).should be true
+      end
+
+    end
+
+  end
+
   describe "connecting to unknown workbooks" do
 
     context "with none workbook" do
@@ -1999,7 +2023,7 @@ describe Workbook do
 
         it "should open the new book and close the unsaved book, if user answers 'yes'" do
           # "Yes" is the  default. --> language independent
-          #@key_sender.puts "{enter}"
+          @key_sender.puts "{enter}"
           @new_book = Workbook.open(@simple_file1, :if_unsaved => :alert)
           @new_book.should be_alive
           @new_book.filename.downcase.should == @simple_file1.downcase
@@ -2269,7 +2293,7 @@ describe Workbook do
 
     context "with :read_only" do
       
-      it "should not reopen the book with writable" do
+      it "should raise error, when :if_unsaved => :accept and change readonly to false" do
         book = Workbook.open(@simple_file1, :read_only => true)
         book.ReadOnly.should be true
         book.should be_alive
@@ -2277,11 +2301,22 @@ describe Workbook do
         old_cell_value = sheet[1,1].Value
         sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
         book.Saved.should be false
-        new_book = Workbook.open(@simple_file1, :read_only => false, :if_unsaved => :accept)
-        new_book.ReadOnly.should be false 
-        new_book.should be_alive
-        book.should be_alive   
-        new_book.should == book         
+        expect{
+          new_book = Workbook.open(@simple_file1, :read_only => false, :if_unsaved => :accept)
+        }.to raise_error(OptionInvalid)
+      end
+
+      it "should raise error, when :if_unsaved => :accept and change readonly to false" do
+        book = Workbook.open(@simple_file1, :read_only => false)
+        book.ReadOnly.should be false
+        book.should be_alive
+        sheet = book.sheet(1)
+        old_cell_value = sheet[1,1].Value
+        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        book.Saved.should be false
+        expect{
+          new_book = Workbook.open(@simple_file1, :read_only => true, :if_unsaved => :accept)
+        }.to raise_error(OptionInvalid)
       end
 
       it "should not reopen the book with writable" do

data/spec/workbook_specs/workbook_save_spec.rb

@@ -561,6 +561,7 @@ describe Workbook do
             new_book.close
             @book.excel.DisplayAlerts.should == displayalert_value
           end
+          
           it "should not save if user answers 'no'" do
             # Just give the "Enter" key, because "No" is the default. --> language independent
             # strangely, in the "no" case, the question will sometimes be repeated three times

data/spec/worksheet_spec.rb

@@ -160,12 +160,12 @@ describe Worksheet do
         end
       end
 
-      context "supplying nil as parameter" do
-        it "should access [1,1]" do
-          @sheet[1, nil].Value.should eq 'foo'
-          @sheet[nil, 1].Value.should eq 'foo'
-        end
-      end
+     # context "supplying nil as parameter" do
+     #   it "should access [1,1]" do
+     #     @sheet[1, nil].Value.should eq 'foo'
+     #     @sheet[nil, 1].Value.should eq 'foo'
+     #   end
+     # end
 
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robust_excel_ole
 version: !ruby/object:Gem::Version
-  version: '1.12'
+  version: '1.13'
 platform: ruby
 authors:
 - traths
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,13 +24,13 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.0
-description: "RobustExcelOle helps controlling Excel. \n                   It is designed
-  to manage simultaneously running\n                   Excel instances, even with
-  simultanously happening user interactions.\n                   This obviously includes
-  standard tasks like reading and writing Excel workbooks.\n                   RobustExcelOle
-  deals with various cases of Excel (and user) behaviour,\n                   supplies
-  workarounds for some Excel bugs, and supports referenced libraries.\n                   It
-  runs on Windows and uses the win32ole library."
+description: "RobustExcelOle helps controlling Excel. \n                   This obviously
+  includes standard tasks like reading and writing Excel workbooks.\n                   The
+  gem is designed to manage simultaneously running\n                   Excel instances,
+  even with simultanously happening user interactions.\n                   \n                   RobustExcelOle
+  deals with various cases of Excel (and user) behaviour, and\n                   supplies
+  workarounds for some Excel and JRuby bugs.\n                   Library references
+  are supported.\n                   It runs on Windows and uses the win32ole library."
 email:
 - Thomas.Raths@gmx.net
 executables: []