robust_excel_ole 0.2.1 → 0.2.2.1

data/lib/robust_excel_ole/sheet.rb

@@ -81,7 +81,7 @@ module RobustExcelOle
       RobustExcelOle::Range.new(@sheet.Range(@sheet.Cells(range.min + 1, col + 1), @sheet.Cells(range.max + 1, col + 1)))
     end
 
-    def method_missing(id, *args)
+    def method_missing(id, *args)  # :nodoc: #
       @sheet.send(id, *args)
     end
 

data/lib/robust_excel_ole/version.rb

@@ -1,3 +1,3 @@
 module RobustExcelOle
-  VERSION = "0.2.1"
+  VERSION = "0.2.2.1"
 end

data/lib/spec_helper.rb

@@ -5,19 +5,19 @@ require "fileutils"
 require File.join(File.dirname(__FILE__), '../lib/robust_excel_ole')
 
 module RobustExcelOle::SpecHelpers
-  def create_tmpdir
+  def create_tmpdir   # :nodoc: #
     tmpdir = Dir.mktmpdir
     FileUtils.cp_r(File.join(File.dirname(__FILE__), 'data'), tmpdir)
     tmpdir + '/data'
   end
 
-  def rm_tmp(tmpdir)
+  def rm_tmp(tmpdir)  # :nodoc: #
     FileUtils.remove_entry_secure(File.dirname(tmpdir))
   end
 
   # This method is almost copy of wycats's implementation.
   # http://pochi.hatenablog.jp/entries/2010/03/24
-  def capture(stream)
+  def capture(stream) # :nodoc: #
     begin
       stream = stream.to_s
       eval "$#{stream} = StringIO.new"

data/spec/book_spec.rb

@@ -9,10 +9,10 @@ $VERBOSE = nil
 describe RobustExcelOle::Book do
 
   before(:all) do
-    excel_app = RobustExcelOle::ExcelApp.new(:reuse => true)
-    open_books = excel_app == nil ? 0 : excel_app.Workbooks.Count
+    excel = RobustExcelOle::Excel.new(:reuse => true)
+    open_books = excel == nil ? 0 : excel.Workbooks.Count
     puts "*** open books *** : #{open_books}" if open_books > 0
-    RobustExcelOle::ExcelApp.close_all
+    RobustExcelOle::Excel.close_all
   end
 
 
@@ -23,7 +23,7 @@ describe RobustExcelOle::Book do
   end
 
   after do
-    #RobustExcelOle::ExcelApp.close_all
+    #RobustExcelOle::Excel.close_all
     rm_tmp(@dir)
   end
 
@@ -65,7 +65,7 @@ describe RobustExcelOle::Book do
       end
     end
 
-    context "with attr_reader excel_app" do
+    context "with attr_reader excel" do
       before do
         @new_book = RobustExcelOle::Book.open(@simple_file)
       end
@@ -73,31 +73,32 @@ describe RobustExcelOle::Book do
         @new_book.close
       end
       it "should provide the excel application of the book" do
-        excel_app = @new_book.excel_app
-        excel_app.class.should == RobustExcelOle::ExcelApp
-        excel_app.should be_a RobustExcelOle::ExcelApp
+        excel = @new_book.excel
+        excel.class.should == RobustExcelOle::Excel
+        excel.should be_a RobustExcelOle::Excel
       end
     end
 
-    context "with :excel_app" do
+    context "with :excel" do
       it "should reuse the given excel application of the book" do
-        book1 = RobustExcelOle::Book.open(@simple_file, :reuse => false)
-        excel_app1 = book1.excel_app
+        RobustExcelOle::Excel.close_all
+        book1 = RobustExcelOle::Book.open(@simple_file)
+        excel1 = book1.excel
         book2 = RobustExcelOle::Book.open(@simple_file, :reuse => false)
-        excel_app2 = book2.excel_app
-        excel_app2.should_not == excel_app1
+        excel2 = book2.excel
+        excel2.should_not == excel1
         book3 = RobustExcelOle::Book.open(@simple_file)
-        excel_app3 = book3.excel_app
-        book4 = RobustExcelOle::Book.open(@simple_file, :excel_app => excel_app2)
-        excel_app4 = book4.excel_app
-        excel_app3.should == excel_app1
-        excel_app4.should == excel_app2
-        excel_app4.class.should == RobustExcelOle::ExcelApp
-        excel_app4.should be_a RobustExcelOle::ExcelApp
-        book1.close
-        book2.close
-        book3.close
+        excel3 = book3.excel
+        book4 = RobustExcelOle::Book.open(@simple_file, :excel => excel2)
+        excel4 = book4.excel
+        excel3.should == excel1
+        excel4.should == excel2
+        excel4.class.should == RobustExcelOle::Excel
+        excel4.should be_a RobustExcelOle::Excel
         book4.close
+        book3.close
+        book2.close
+        book1.close
       end
     end
 
@@ -177,8 +178,8 @@ describe RobustExcelOle::Book do
               @different_book.should be_a RobustExcelOle::Book
             end
             it "should belong to the same Excel application" do
-              @new_book.excel_app.should == @book.excel_app
-              @different_book.excel_app.should == @book.excel_app
+              @new_book.excel.should == @book.excel
+              @different_book.excel.should == @book.excel
             end
           end
         end
@@ -219,7 +220,7 @@ describe RobustExcelOle::Book do
           @new_book.filename.downcase.should == @simple_file.downcase
         end
 
-        context "with :if_unsaved => :excel" do
+        context "with :if_unsaved => :alert" do
           before do
            @key_sender = IO.popen  'ruby "' + File.join(File.dirname(__FILE__), '/helpers/key_sender.rb') + '" "Microsoft Office Excel" '  , "w"
           end
@@ -231,7 +232,7 @@ describe RobustExcelOle::Book 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}"
-            @new_book = RobustExcelOle::Book.open(@simple_file, :if_unsaved => :excel)
+            @new_book = RobustExcelOle::Book.open(@simple_file, :if_unsaved => :alert)
             @book.should_not be_alive
             @new_book.should be_alive
             @new_book.filename.downcase.should == @simple_file.downcase
@@ -240,12 +241,12 @@ describe RobustExcelOle::Book do
           it "should not open the new book and not close the unsaved book, if user answers 'no'" do
             # "No" is right to "Yes" (the  default). --> language independent
             # strangely, in the "no" case, the question will sometimes be repeated three times
-            #@book.excel_app.Visible = true
+            #@book.excel.Visible = true
             @key_sender.puts "{right}{enter}"
             @key_sender.puts "{right}{enter}"
             @key_sender.puts "{right}{enter}"
             expect{
-              RobustExcelOle::Book.open(@simple_file, :if_unsaved => :excel)
+              RobustExcelOle::Book.open(@simple_file, :if_unsaved => :alert)
               }.to raise_error(ExcelUserCanceled, "open: canceled by user")
             @book.should be_alive
           end
@@ -256,7 +257,7 @@ describe RobustExcelOle::Book do
           @book.should be_alive
           @new_book.should be_alive
           @new_book.filename.should == @book.filename
-          @new_book.excel_app.should_not == @book.excel_app
+          @new_book.excel.should_not == @book.excel
           @new_book.close
         end
 
@@ -333,7 +334,7 @@ describe RobustExcelOle::Book do
         @book.should be_alive
         @new_book.should be_alive
         @new_book.filename.should_not == @book.filename
-        @new_book.excel_app.should_not == @book.excel_app
+        @new_book.excel.should_not == @book.excel
       end
 
       it "should raise an error, if :if_obstructed is default" do
@@ -405,10 +406,10 @@ describe RobustExcelOle::Book do
 
       it "should close the book and leave its file untouched with option :forget" do
         ole_workbook = @book.workbook
-        excel_app = @book.excel_app
+        excel = @book.excel
         expect {
           @book.close(:if_unsaved => :forget)
-        }.to change {excel_app.Workbooks.Count }.by(-1)
+        }.to change {excel.Workbooks.Count }.by(-1)
         @book.workbook.should == nil
         @book.should_not be_alive
         expect{
@@ -423,10 +424,10 @@ describe RobustExcelOle::Book do
 
       it "should save the book before close with option :save" do
         ole_workbook = @book.workbook
-        excel_app = @book.excel_app
+        excel = @book.excel
         expect {
           @book.close(:if_unsaved => :save)
-        }.to change {excel_app.Workbooks.Count }.by(-1)
+        }.to change {excel.Workbooks.Count }.by(-1)
         @book.workbook.should == nil
         @book.should_not be_alive
         expect{
@@ -439,7 +440,7 @@ describe RobustExcelOle::Book do
         end
       end
 
-      context "with :if_unsaved => :excel" do
+      context "with :if_unsaved => :alert" do
         before do
           @key_sender = IO.popen  'ruby "' + File.join(File.dirname(__FILE__), '/helpers/key_sender.rb') + '" "Microsoft Excel" '  , "w"
         end
@@ -454,19 +455,19 @@ describe RobustExcelOle::Book do
             # "Yes" is the  default. "No" is right of "Yes", "Cancel" is right of "No" --> language independent
             @key_sender.puts  "{right}" * position + "{enter}"
             ole_workbook = @book.workbook
-            excel_app = @book.excel_app
-            displayalert_value = @book.excel_app.DisplayAlerts
+            excel = @book.excel
+            displayalert_value = @book.excel.DisplayAlerts
             if answer == :cancel then
               expect {
-              @book.close(:if_unsaved => :excel)
+              @book.close(:if_unsaved => :alert)
               }.to raise_error(ExcelUserCanceled, "close: canceled by user")
               @book.workbook.Saved.should be_false
               @book.workbook.should_not == nil
               @book.should be_alive
             else
               expect {
-                @book.close(:if_unsaved => :excel)
-              }.to change {@book.excel_app.Workbooks.Count }.by(-1)
+                @book.close(:if_unsaved => :alert)
+              }.to change {@book.excel.Workbooks.Count }.by(-1)
               @book.workbook.should == nil
               @book.should_not be_alive
               expect{ole_workbook.Name}.to raise_error(WIN32OLERuntimeError)
@@ -474,7 +475,7 @@ describe RobustExcelOle::Book do
             new_book = RobustExcelOle::Book.open(@simple_file, :if_unsaved => :forget)
             begin
               new_book.workbook.Worksheets.Count.should == @sheet_count + (answer==:yes ? 1 : 0)
-              new_book.excel_app.DisplayAlerts.should == displayalert_value
+              new_book.excel.DisplayAlerts.should == displayalert_value
             ensure
               new_book.close
             end
@@ -586,7 +587,6 @@ describe RobustExcelOle::Book do
         it "should raise an error if the book is open" do
           File.delete @simple_save_file rescue nil
           FileUtils.copy @simple_file, @simple_save_file
-          # fails with :reuse => false
           book_save = RobustExcelOle::Book.open(@simple_save_file, :reuse => false)
           expect{
             @book.save_as(@simple_save_file, :if_exists => :overwrite)
@@ -621,7 +621,7 @@ describe RobustExcelOle::Book do
           (File.size?(@simple_save_file) == booklength).should be_true
         end
 
-        context "with :if_exists => :excel" do
+        context "with :if_exists => :alert" do
           before do
             File.delete @simple_save_file rescue nil
             File.open(@simple_save_file,"w") do | file |
@@ -638,12 +638,12 @@ describe RobustExcelOle::Book do
           it "should save if user answers 'yes'" do
             # "Yes" is to the left of "No", which is the  default. --> language independent
             @key_sender.puts "{left}{enter}" #, :initial_wait => 0.2, :if_target_missing=>"Excel window not found")
-            @book.save_as(@simple_save_file, :if_exists => :excel)
+            @book.save_as(@simple_save_file, :if_exists => :alert)
             File.exist?(@simple_save_file).should be_true
             File.size?(@simple_save_file).should > @garbage_length
             new_book = RobustExcelOle::Book.open(@simple_save_file)
             new_book.should be_a RobustExcelOle::Book
-            @book.excel_app.DisplayAlerts.should == displayalert_value
+            @book.excel.DisplayAlerts.should == displayalert_value
             new_book.close
           end
 
@@ -655,11 +655,11 @@ describe RobustExcelOle::Book do
             @key_sender.puts "{enter}"
             #@key_sender.puts "%{n}" #, :initial_wait => 0.2, :if_target_missing=>"Excel window not found")
             expect{
-              @book.save_as(@simple_save_file, :if_exists => :excel)
+              @book.save_as(@simple_save_file, :if_exists => :alert)
               }.to raise_error(ExcelErrorSave, "not saved or canceled by user")
             File.exist?(@simple_save_file).should be_true
             File.size?(@simple_save_file).should == @garbage_length
-            @book.excel_app.DisplayAlerts.should == displayalert_value
+            @book.excel.DisplayAlerts.should == displayalert_value
           end
 
           it "should not save if user answers 'cancel'" do
@@ -670,22 +670,22 @@ describe RobustExcelOle::Book do
             @key_sender.puts "{right}{enter}"
             #@key_sender.puts "%{n}" #, :initial_wait => 0.2, :if_target_missing=>"Excel window not found")
             expect{
-              @book.save_as(@simple_save_file, :if_exists => :excel)
+              @book.save_as(@simple_save_file, :if_exists => :alert)
               }.to raise_error(ExcelErrorSave, "not saved or canceled by user")
             File.exist?(@simple_save_file).should be_true
             File.size?(@simple_save_file).should == @garbage_length
-            @book.excel_app.DisplayAlerts.should == displayalert_value
+            @book.excel.DisplayAlerts.should == displayalert_value
           end
 
           it "should report save errors and leave DisplayAlerts unchanged" do
             #@key_sender.puts "{left}{enter}" #, :initial_wait => 0.2, :if_target_missing=>"Excel window not found")
             @book.workbook.Close
             expect{
-              @book.save_as(@simple_save_file, :if_exists => :excel)
+              @book.save_as(@simple_save_file, :if_exists => :alert)
               }.to raise_error(ExcelErrorSaveUnknown)
             File.exist?(@simple_save_file).should be_true
             File.size?(@simple_save_file).should == @garbage_length
-            @book.excel_app.DisplayAlerts.should == displayalert_value
+            @book.excel.DisplayAlerts.should == displayalert_value
           end
 
         end
@@ -716,21 +716,7 @@ describe RobustExcelOle::Book do
     end
   end
 
-  describe "== , alive?, filename, absolute_path" do
-
-    context "with absolute_path" do
-      before do
-        @book = RobustExcelOle::Book.open(@simple_file)
-      end
-
-      after do
-        @book.close
-      end
-
-      it "should return right absoute path name" do
-        @book.absolute_path(@simple_file).gsub("\\","/").should == @book.filename
-      end
-    end
+  describe "== , alive?, filename" do
 
     context "with alive?" do
 

data/spec/cell_spec.rb

@@ -2,6 +2,14 @@
 require File.join(File.dirname(__FILE__), './spec_helper')
 
 describe RobustExcelOle::Cell do
+
+  before(:all) do
+    excel = RobustExcelOle::Excel.new(:reuse => true)
+    open_books = excel == nil ? 0 : excel.Workbooks.Count
+    puts "*** open books *** : #{open_books}" if open_books > 0
+    RobustExcelOle::Excel.close_all
+  end
+
   before do
     @dir = create_tmpdir
   end
@@ -12,7 +20,7 @@ describe RobustExcelOle::Cell do
 
   context "open simple.xls" do
     before do
-      @book = RobustExcelOle::Book.open(@dir + '/simple.xls')
+      @book = RobustExcelOle::Book.open(@dir + '/simple.xls', :read_only => true)
       @sheet = @book[1]
       @cell = @sheet[0, 0]
     end
@@ -44,7 +52,7 @@ describe RobustExcelOle::Cell do
 
   context "open merge_cells.xls" do
     before do
-      @book = RobustExcelOle::Book.open(@dir + '/merge_cells.xls')
+      @book = RobustExcelOle::Book.open(@dir + '/merge_cells.xls', :read_only => true)
       @sheet = @book[0]
     end
 

data/spec/{excel_app_spec.rb → excel_spec.rb}

@@ -6,14 +6,14 @@ $VERBOSE = nil
 
 module RobustExcelOle
 
-  describe ExcelApp do
+  describe Excel do
 
     context "app creation" do
       after do
-        ExcelApp.close_all
+        Excel.close_all
       end
 
-      def creation_ok?
+      def creation_ok? # :nodoc: #
         @app.alive?.should == true
         @app.Visible.should == false
         @app.DisplayAlerts.should == false
@@ -21,51 +21,49 @@ module RobustExcelOle
       end
 
       it "should work with 'new' " do
-        @app = ExcelApp.new
+        @app = Excel.new
         creation_ok?
       end
 
       it "should work with 'new' " do
-        @app = ExcelApp.new(:reuse => false)
+        @app = Excel.new(:reuse => false)
         creation_ok?
       end
 
       it "should work with 'create' " do
-        @app = ExcelApp.create
+        @app = Excel.create
         creation_ok?
       end
 
     end
 
-
-
     context "with existing app" do
 
       before do
-        ExcelApp.close_all
-        @app1 = ExcelApp.create
+        Excel.close_all
+        @app1 = Excel.create
       end
 
       after do
-        ExcelApp.close_all
+        Excel.close_all
       end
 
       it "should create different app" do
-        app2 = ExcelApp.create
+        app2 = Excel.create
         #puts "@app1 #{@app1.Hwnd}"
         #puts "app2  #{app2.Hwnd}"
         app2.Hwnd.should_not == @app1.Hwnd
       end
 
       it "should reuse existing app" do
-        app2 = ExcelApp.reuse
+        app2 = Excel.current
         #puts "@app1 #{@app1.Hwnd}"
         #puts "app2  #{app2.Hwnd}"
         app2.Hwnd.should == @app1.Hwnd
       end
 
       it "should reuse existing app with default options for 'new'" do
-        app2 = ExcelApp.new
+        app2 = Excel.new
         #puts "@app1 #{@app1.Hwnd}"
         #puts "app2  #{app2.Hwnd}"
         app2.Hwnd.should == @app1.Hwnd
@@ -74,7 +72,7 @@ module RobustExcelOle
     end
 
     context "close excel instances" do
-      def direct_excel_creation_helper
+      def direct_excel_creation_helper  # :nodoc: #
         expect { WIN32OLE.connect("Excel.Application") }.to raise_error
         sleep 0.1
         exl1 = WIN32OLE.new("Excel.Application")
@@ -85,9 +83,9 @@ module RobustExcelOle
       end
 
       it "simple file with default" do
-        RobustExcelOle::ExcelApp.close_all
+        RobustExcelOle::Excel.close_all
         direct_excel_creation_helper
-        RobustExcelOle::ExcelApp.close_all
+        RobustExcelOle::Excel.close_all
         sleep 0.1
         expect { WIN32OLE.connect("Excel.Application") }.to raise_error
       end
@@ -95,25 +93,25 @@ module RobustExcelOle
 
     describe "==" do
       before do
-        ExcelApp.close_all
-        @app1 = ExcelApp.create
+        Excel.close_all
+        @app1 = Excel.create
       end
 
       after do
-        ExcelApp.close_all
+        Excel.close_all
       end
 
       it "should be true with two identical excel applications" do
-        app2 = ExcelApp.reuse
+        app2 = Excel.current
         app2.should == @app1
       end
 
       it "should be false with two different excel applications" do
-        app2 = ExcelApp.create
+        app2 = Excel.create
         app2.should_not == @app1
       end
 
-      it "should be false with non-ExcelApp objects" do
+      it "should be false with non-Excel objects" do
         @app1.should_not == "hallo"
         @app1.should_not == 7
         @app1.should_not == nil
@@ -122,21 +120,21 @@ module RobustExcelOle
     end
 
 
-    context "with :excel_app" do
+    context "with :excel" do
 
       before do
-        ExcelApp.close_all
+        Excel.close_all
       end
 
       after (:each) do
-        ExcelApp.close_all
+        Excel.close_all
       end
 
       it "should reuse in given excel app" do
-        app1 = ExcelApp.new(:reuse => false)
-        app2 = ExcelApp.new(:reuse => false)
-        app3 = ExcelApp.new(:excel_app => app1)
-        app4 = ExcelApp.new(:excel_app => app2)
+        app1 = Excel.new(:reuse => false)
+        app2 = Excel.new(:reuse => false)
+        app3 = Excel.new(:excel => app1)
+        app4 = Excel.new(:excel => app2)
         app3.should == app1
         app4.should == app2
       end
@@ -146,30 +144,30 @@ module RobustExcelOle
     context "with Visible and DisplayAlerts" do
 
       before do
-        ExcelApp.close_all
+        Excel.close_all
       end
 
       after (:each) do
-        ExcelApp.close_all
+        Excel.close_all
       end
 
       it "should be visible" do
-        app = ExcelApp.new(:visible => true)
+        app = Excel.new(:visible => true)
         app.Visible.should == true
         app.DisplayAlerts.should == false
       end
 
       it "should displayalerts" do        
-        app = ExcelApp.new(:displayalerts => true)
+        app = Excel.new(:displayalerts => true)
         app.DisplayAlerts.should == true
         app.Visible.should == false
       end
 
       it "should visible and displayalerts" do
-        app = ExcelApp.new(:visible => true)
+        app = Excel.new(:visible => true)
         app.Visible.should == true
         app.DisplayAlerts.should == false
-        app2 = ExcelApp.new(:displayalerts => true)
+        app2 = Excel.new(:displayalerts => true)
         app2.Visible.should == true
         app2.DisplayAlerts.should == true
       end
@@ -177,4 +175,22 @@ module RobustExcelOle
     end
 
   end
+
+  describe "RobustExcelOle" do
+    context "#absolute_path" do
+      it "should work" do
+        RobustExcelOle::absolute_path("C:/abc").should == "C:\\abc"
+        RobustExcelOle::absolute_path("C:\\abc").should == "C:\\abc"
+        RobustExcelOle::absolute_path("C:abc").should == Dir.pwd.gsub("/","\\") + "\\abc"
+        RobustExcelOle::absolute_path("C:abc").should == File.expand_path("abc").gsub("/","\\")
+      end
+
+      it "should return right absoute path name" do
+        @filename = 'C:/Dokumente und Einstellungen/Zauberthomas/Eigene Dateien/robust_excel_ole/spec/book_spec.rb'
+        RobustExcelOle::absolute_path(@filename).gsub("\\","/").should == @filename
+      end
+    end
+
+  end
+
 end