robust_excel_ole 1.15 → 1.16

data/lib/robust_excel_ole/worksheet.rb

@@ -12,7 +12,7 @@ module RobustExcelOle
   class Worksheet < RangeOwners
 
     attr_reader :ole_worksheet
-    attr_reader :workbook
+    #attr_reader :workbook
 
     def initialize(win32_worksheet)
       @ole_worksheet = win32_worksheet
@@ -93,10 +93,7 @@ module RobustExcelOle
       else
         name, value = p1, p2
         begin
-          old_color_if_modified = workbook.color_if_modified
-          workbook.color_if_modified = 42  # aqua-marin
-          set_namevalue_glob(name, value)
-          workbook.color_if_modified = old_color_if_modified
+          set_namevalue_glob(name, value, :color => 42)
         rescue REOError
           begin
             workbook.set_namevalue_glob(name, value)
@@ -126,8 +123,7 @@ module RobustExcelOle
     # @option opts [Symbol] :color the color of the cell when set
     def set_cellval(x,y,value, opts = { }) # option opts is deprecated
       cell = @ole_worksheet.Cells.Item(x, y)
-      workbook.color_if_modified = opts[:color] unless opts[:color].nil?
-      cell.Interior.ColorIndex = workbook.color_if_modified unless workbook.color_if_modified.nil?
+      cell.Interior.ColorIndex = opts[:color] unless opts[:color].nil?
       cell.Value = value
     rescue # WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException
       raise RangeNotEvaluatable, "cannot assign value #{value.inspect} to cell (#{y.inspect},#{x.inspect})"
@@ -225,7 +221,7 @@ module RobustExcelOle
     # @private
     def method_missing(name, *args)
       if name.to_s[0,1] =~ /[A-Z]/
-        if ::JRUBY_BUG_ERRORMESSAGE 
+        if ::ERRORMESSAGE_JRUBY_BUG 
           begin
             @ole_worksheet.send(name, *args)
           rescue Java::OrgRacobCom::ComFailException 

data/spec/bookstore_spec.rb

@@ -159,7 +159,7 @@ describe Bookstore do
       it "should not fetch anything to a not existing network path file" do
         @book1 = Workbook.open(@hostname_share_path)
         @bookstore.store(@book1)
-        @bookstore.fetch(@network_path_not_existing).should == nil
+        #@bookstore.fetch(@network_path_not_existing).should == nil
       end
 
       # nice to have
@@ -175,7 +175,7 @@ describe Bookstore do
       it "should not fetch anything to a not existing network path file the stored absolute path file" do
         @book1 = Workbook.open(@absolute_file_path)
         @bookstore.store(@book1)
-        @bookstore.fetch(@network_path_not_existing).should == nil
+        #@bookstore.fetch(@network_path_not_existing).should == nil
       end
 
       it "should fetch to a given hostname share path file the stored network path file" do
@@ -581,7 +581,7 @@ describe Bookstore do
     end
 
     it "should print books" do
-      @bookstore.print
+      @bookstore.print_filename2books
     end
 
   end

data/spec/excel_spec.rb

@@ -2170,8 +2170,7 @@ module RobustExcelOle
       it "should color the cell" do
         @excel1.set_namevalue_glob("firstcell", "foo")
         @book1.Names.Item("firstcell").RefersToRange.Interior.ColorIndex.should == -4142 
-        @book1.color_if_modified = 4
-        @excel1.set_namevalue_glob("firstcell", "foo")
+        @excel1.set_namevalue_glob("firstcell", "foo", :color => 4)
         @book1.Names.Item("firstcell").RefersToRange.Interior.ColorIndex.should == 4
         @excel1["firstcell"].should == "foo"
         @excel1["firstcell"] = "foo"
@@ -2245,8 +2244,7 @@ module RobustExcelOle
       it "should color the cell" do
         @excel1.set_namevalue("firstcell", "foo")
         @book1.Names.Item("firstcell").RefersToRange.Interior.ColorIndex.should == -4142 
-        @book1.color_if_modified = 4
-        @excel1.set_namevalue("firstcell", "foo")
+        @excel1.set_namevalue("firstcell", "foo", :color => 4)
         @book1.Names.Item("firstcell").RefersToRange.Interior.ColorIndex.should == 4
       end
 

data/spec/general_spec.rb

@@ -81,8 +81,7 @@ module RobustExcelOle
           ["ActiveCell", "ActiveSheet", "ActiveWorkbook", "Application",  "Calculate", "Cells", "Columns",
             "DisplayAlerts", "Evaluate", "Hwnd", "Name", "Names", "Quit", "Range", "Ready", "Save", 
             "Sheets", "UserName", "Value", "Visible", "Workbooks", "Worksheets"]
-        @excel_methods = ["alive?", "workbook_class", "close", "displayalerts", "recreate", "visible", 
-          "with_displayalerts"] 
+        @excel_methods = ["alive?", "workbook_class", "close", "properties", "recreate", "with_displayalerts"] 
         @ole_sheet_methods = []
          # ["Activate", "Calculate", "Copy", "Name", "Select", "Evaluate", "Protect", "Unprotect"]
         @sheet_methods = ["workbook_class", "col_range", "each", "each_column", "each_column_with_index",
@@ -152,9 +151,8 @@ module RobustExcelOle
 
         it "should return the right absolute paths" do
           absolute_path("C:/abc").should == "C:\\abc"
-          absolute_path("C:\\abc").should == "C:\\abc"
+          #absolute_path("C:\\abc").should == "C:\\abc"
           Dir.chdir "C:/windows"
-          # does not work under jruby
           absolute_path("C:abc").downcase.should == Dir.pwd.gsub("/","\\").downcase + "\\abc"
           absolute_path("C:abc").upcase.should   == File.expand_path("abc").gsub("/","\\").upcase
         end

data/spec/reo_common_spec.rb

@@ -63,7 +63,7 @@ module RobustExcelOle
           ["ActiveCell", "ActiveSheet", "ActiveWorkbook", "Application",  "Calculate", "Cells", "Columns",
             "DisplayAlerts", "Evaluate", "Hwnd", "Name", "Names", "Quit", "Range", "Ready", "Save", 
             "Sheets", "UserName", "Value", "Visible", "Workbooks", "Worksheets"]
-        @excel_methods = ["alive?", "workbook_class", "close", "displayalerts", "recreate", "visible", "with_displayalerts"] 
+        @excel_methods = ["alive?", "workbook_class", "close", "properties", "recreate", "with_displayalerts"] 
       end
 
       after do

data/spec/workbook_specs/workbook_misc_spec.rb

@@ -773,8 +773,7 @@ describe Workbook do
     it "should color the cell" do
       @book1.set_namevalue_glob("new", "bar")
       @book1.Names.Item("new").RefersToRange.Interior.ColorIndex.should == -4142
-      @book1.color_if_modified = 4
-      @book1.set_namevalue_glob("new", "bar")
+      @book1.set_namevalue_glob("new", "bar", :color => 4)
       @book1.Names.Item("new").RefersToRange.Interior.ColorIndex.should == 4
       @book1["new"].should == "bar"
       @book1["new"] = "bar"
@@ -783,15 +782,6 @@ describe Workbook do
       @book1.close
     end
 
-    it "should save without color (deprecated)" do
-      @book1.set_namevalue_glob("new", "bar", :color => 4)
-      @book1.Names.Item("new").RefersToRange.Interior.ColorIndex.should == 4
-      @book1.save(:discoloring => true)
-      @book1.close
-      #book2 = Workbook.open(@simple_file1, :visible =>  true)
-      #book2.Names.Item("new").RefersToRange.Interior.ColorIndex.should == 0
-    end
-
   end
 
   describe "rename_range" do

data/spec/workbook_specs/workbook_open_spec.rb

@@ -35,7 +35,12 @@ describe Workbook do
     #@simple_file_via_network = File.join('N:/', 'data') + '/workbook.xls'
     @simple_file_network_path = "N:/data/workbook.xls"
     @simple_file_hostname_share_path = '//DESKTOP-A3C5CJ6/spec/data/workbook.xls'
-
+    @simple_file_network_path_other_path = "N:/data/more_data/workbook.xls"
+    @simple_file_hostname_share_path_other_path = '//DESKTOP-A3C5CJ6/spec/data/more_data/workbook.xls'
+    @simple_file_network_path1 = @simple_file_network_path
+    @simple_file_hostname_share_path1 = @simple_file_hostname_share_path
+    @simple_file_network_path_other_path1 = @simple_file_network_path_other_path
+    @simple_file_hostname_share_path_other_path1 = @simple_file_hostname_share_path_other_path
   end
 
   after do
@@ -67,8 +72,340 @@ describe Workbook do
 
   end
 
+  describe "fetching workbooks with network and hostname share paths" do
+
+    before do
+      bookstore = Bookstore.new
+    end
+
+    it "should fetch a network path file given a hostname share file" do
+      book1 = Workbook.open(@simple_file_hostname_share_path)
+      book2 = Workbook.open(@simple_file_network_path)
+      book2.should === book1
+      book2.Fullname.should == book1.Fullname
+      book1.excel.Workbooks.Count.should == 1
+    end
+
+    it "should fetch a hostname share file given a network path file" do
+      book1 = Workbook.open(@simple_file_network_path)
+      book2 = Workbook.open(@simple_file_hostname_share_path)
+      book2.should === book1
+      book2.Fullname.should == book1.Fullname
+      book1.excel.Workbooks.Count.should == 1
+    end
+
+    it "should raise WorkbookBlocked" do
+      book1 = Workbook.open(@simple_file_hostname_share_path)
+      expect{
+        book2 = Workbook.open(@simple_file)
+        }.to raise_error(WorkbookBlocked)
+    end
+
+    it "should raise an error fetching an hostname share file having opened a local path file" do
+      book1 = Workbook.open(@simple_file)
+      expect{
+        Workbook.open(@simple_file_hostname_share_path)
+        }.to raise_error(WorkbookBlocked)
+    end
+
+    it "should raise an error fetching a local path file having opened a network path file" do
+      book1 = Workbook.open(@simple_file_network_path)
+      expect{
+        Workbook.open(@simple_file)
+        }.to raise_error(WorkbookBlocked)
+    end
+
+    it "should raise an error fetching a network path file having opened a local path file" do
+      book1 = Workbook.open(@simple_file)
+      expect{
+        Workbook.open(@simple_file_network_path)
+        }.to raise_error(WorkbookBlocked)
+    end
+
+    it "should raise an error fetching a local path file having opened a hostname share path file" do
+      book1 = Workbook.open(@simple_file_hostname_share_path)
+      expect{
+        Workbook.open(@simple_file)
+        }.to raise_error(WorkbookBlocked)
+    end
+
+    it "should raise an WorkbookBlockederror" do
+      book1 = Workbook.open(@simple_file_network_path1)
+      expect{
+        Workbook.open(@simple_file_network_path_other_path1)
+      }.to raise_error(WorkbookBlocked)
+    end
+
+    it "should raise an WorkbookBlockederror" do
+      book1 = Workbook.open(@simple_file_network_path_other_path1)
+      expect{
+        Workbook.open(@simple_file_network_path1)
+      }.to raise_error(WorkbookBlocked)
+    end
+
+    it "should raise an WorkbookBlockederror" do
+      book1 = Workbook.open(@simple_file_hostname_share_path1)
+      expect{
+        Workbook.open(@simple_file_hostname_share_path_other_path1)
+      }.to raise_error(WorkbookBlocked)
+    end
+
+    it "should raise an WorkbookBlockederror" do
+      book1 = Workbook.open(@simple_file_hostname_share_path_other_path1)
+      expect{
+        Workbook.open(@simple_file_hostname_share_path1)
+      }.to raise_error(WorkbookBlocked)
+    end
+
+    it "should raise an WorkbookBlockederror" do
+      book1 = Workbook.open(@simple_file_hostname_share_path1)
+      expect{
+        Workbook.open(@simple_file_network_path_other_path1)
+      }.to raise_error(WorkbookBlocked)
+    end
+
+    it "should raise an WorkbookBlockederror" do
+      book1 = Workbook.open(@simple_file_hostname_share_path_other_path1)
+      expect{
+        Workbook.open(@simple_file_network_path1)
+      }.to raise_error(WorkbookBlocked)
+    end
+
+    it "should raise an WorkbookBlockederror" do
+      book1 = Workbook.open(@simple_file_network_path1)
+      expect{
+        Workbook.open(@simple_file_hostname_share_path_other_path1)
+      }.to raise_error(WorkbookBlocked)
+    end
+
+    it "should raise an WorkbookBlockederror" do
+      book1 = Workbook.open(@simple_file_network_path_other_path1)
+      expect{
+        Workbook.open(@simple_file_hostname_share_path1)
+      }.to raise_error(WorkbookBlocked)
+    end
+
+  end
+
+
   describe "connecting to unknown workbooks" do
 
+    context "with one unknown network path or hostname share file" do
+
+      it "should connect to a network path workbook from a network path file" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file_network_path1)
+        @ole_wb = ws.Open(abs_filename)
+        Workbook.open(@simple_file_network_path1) do |book|
+          book.should be_alive
+          book.should be_a Workbook
+          book.filename.should == @simple_file_network_path1
+          book.Fullname.should == @ole_wb.Fullname
+          book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
+          Excel.excels_number.should == 1
+          book.excel.Workbooks.Count.should == 1
+        end
+      end
+
+      it "should connect to a hostname share workbook from a network path file" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file_hostname_share_path1)
+        @ole_wb = ws.Open(abs_filename)
+        Workbook.open(@simple_file_network_path1) do |book|
+          book.should be_alive
+          book.should be_a Workbook
+          book.filename.should == @simple_file_hostname_share_path1.downcase
+          book.Fullname.should == @ole_wb.Fullname
+          book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
+          Excel.excels_number.should == 1
+          book.excel.Workbooks.Count.should == 1
+        end
+      end
+
+      it "should raise WorkbookBlocked trying to connect to a local path file from a network path file" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file1)
+        @ole_wb = ws.Open(abs_filename)
+        expect{
+          Workbook.open(@simple_file_network_path1)
+          }.to raise_error(WorkbookBlocked)
+      end
+
+      it "should raise WorkbookBlocked trying to connect to a network path file from a local path file" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file_network_path1)
+        @ole_wb = ws.Open(abs_filename)
+        expect{
+          Workbook.open(@simple_file1)
+          }.to raise_error(WorkbookBlocked)
+      end
+
+      it "should raise WorkbookBlocked trying to connect a hostname share file from a local path file" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file_hostname_share_path1)
+        @ole_wb = ws.Open(abs_filename)
+        expect{
+          Workbook.open(@simple_file1)
+          }.to raise_error(WorkbookBlocked)
+      end
+
+      it "should raise WorkbookBlocked trying to connect to a local path workbook from a hostname share file" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file1)
+        @ole_wb = ws.Open(abs_filename)
+        expect{
+          Workbook.open(@simple_file_hostname_share_path1)
+          }.to raise_error(WorkbookBlocked)
+      end
+
+      it "should connect to a network path workbook from a hostname share file" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file_network_path1)
+        @ole_wb = ws.Open(abs_filename)
+        Workbook.open(@simple_file_hostname_share_path1) do |book|
+          book.should be_alive
+          book.should be_a Workbook
+          book.filename.should == @simple_file_network_path1
+          book.Fullname.should == @ole_wb.Fullname
+          book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
+          Excel.excels_number.should == 1
+          book.excel.Workbooks.Count.should == 1
+        end
+      end
+
+      it "should connect to a hostname share workbook from a hostname share file" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file_hostname_share_path1)
+        @ole_wb = ws.Open(abs_filename)
+        Workbook.open(@simple_file_hostname_share_path1) do |book|
+          book.should be_alive
+          book.should be_a Workbook
+          book.filename.should == @simple_file_hostname_share_path1.downcase
+          book.Fullname.should == @ole_wb.Fullname
+          book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
+          Excel.excels_number.should == 1
+          book.excel.Workbooks.Count.should == 1
+        end
+      end      
+
+      it "should raise WorkbookBlocked error" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file_network_path1)
+        @ole_wb = ws.Open(abs_filename)
+        expect{
+          Workbook.open(@simple_file_network_path_other_path1)
+        }.to raise_error(WorkbookBlocked)
+      end
+
+      it "should raise WorkbookBlocked error" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file_network_path_other_path1)
+        @ole_wb = ws.Open(abs_filename)
+        expect{
+          Workbook.open(@simple_file_network_path1)
+        }.to raise_error(WorkbookBlocked)
+      end
+
+      it "should raise WorkbookBlocked error" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file_hostname_share_path1)
+        @ole_wb = ws.Open(abs_filename)
+        expect{
+          Workbook.open(@simple_file_hostname_share_path_other_path1)
+        }.to raise_error(WorkbookBlocked)
+      end
+
+      it "should raise WorkbookBlocked error" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file_hostname_share_path_other_path1)
+        @ole_wb = ws.Open(abs_filename)
+        expect{
+          Workbook.open(@simple_file_hostname_share_path1)
+        }.to raise_error(WorkbookBlocked)
+      end
+
+      it "should raise WorkbookBlocked error" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file_hostname_share_path1)
+        @ole_wb = ws.Open(abs_filename)
+        expect{
+          Workbook.open(@simple_file_network_path_other_path1)
+        }.to raise_error(WorkbookBlocked)
+      end
+
+      it "should raise WorkbookBlocked error" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file_network_path_other_path1)
+        @ole_wb = ws.Open(abs_filename)
+        expect{
+          Workbook.open(@simple_file_hostname_share_path1)
+        }.to raise_error(WorkbookBlocked)
+      end
+
+      it "should raise WorkbookBlocked error" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file_network_path1)
+        @ole_wb = ws.Open(abs_filename)
+        expect{
+          Workbook.open(@simple_file_hostname_share_path_other_path1)
+        }.to raise_error(WorkbookBlocked)
+      end
+
+      it "should raise WorkbookBlocked error" do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file_hostname_share_path_other_path1)
+        @ole_wb = ws.Open(abs_filename)
+        expect{
+          Workbook.open(@simple_file_network_path1)
+        }.to raise_error(WorkbookBlocked)
+      end
+
+    end
+
+    context "with one unknown hostname share path file" do
+
+      before do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path( @simple_file_hostname_share_path1)
+        @ole_wb = ws.Open(abs_filename)
+      end
+
+      it "should connect to an unknown hostname share path workbook" do
+        Workbook.open(@simple_file_hostname_share_path1) do |book|
+          book.filename.should == @simple_file_hostname_share_path1.downcase
+          book.should be_alive
+          book.should be_a Workbook
+          book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
+          Excel.excels_number.should == 1
+          book.excel.Workbooks.Count.should == 1
+        end
+      end
+
+      it "should raise error because blocking" do
+        expect{
+          Workbook.open(@simple_file1)
+          }.to raise_error(WorkbookBlocked)
+      end
+
+    end
+      
     context "with none workbook" do
 
       it "should open one new Excel with the worbook" do
@@ -402,18 +739,7 @@ describe Workbook do
     end
 
   end
-
-  describe "network paths" do
-
-    it "should open the workbook via network path" do
-      book1 = Workbook.open(@simple_file_hostname_share_path)
-      book2 = Workbook.open(@simple_file_network_path)
-      book1.should === book2
-      book1.Fullname.should == book2.Fullname
-    end
-
-  end
-
+  
   describe "new" do
 
     context "with transparency identity" do
@@ -612,20 +938,20 @@ describe Workbook do
 
       it "should not set the default value" do
         book1 = Workbook.open(@simple_file)
-        book1.excel.calculation.should == nil
+        book1.excel.properties[:calculation].should == nil
       end
 
       it "should set the calculation mode to automatic" do
         book1 = Workbook.open(@simple_file)
         book1.excel.calculation = :automatic
-        book1.excel.calculation.should == :automatic
+        book1.excel.properties[:calculation].should == :automatic
         book1.excel.Calculation.should == XlCalculationAutomatic
       end
 
       it "should set the calculation mode to manual" do
         book1 = Workbook.open(@simple_file)
         book1.excel.calculation = :manual
-        book1.excel.calculation.should == :manual
+        book1.excel.properties[:calculation].should == :manual
         book1.excel.Calculation.should == XlCalculationManual
       end