robust_excel_ole 0.3.1 → 0.3.2

data/spec/book_store_spec.rb

@@ -47,10 +47,10 @@ describe BookStore do
   before do
     @bookstore = BookStore.new
     @dir = create_tmpdir
-    @simple_file = @dir + '/simple.xls'
-    @simple_save_file = @dir + '/simple_save.xls'
-    @different_file = @dir + '/different_simple.xls'
-    @simple_file_other_path = @dir + '/more_data/simple.xls'
+    @simple_file = @dir + '/workbook.xls'
+    @simple_save_file = @dir + '/workbook_save.xls'
+    @different_file = @dir + '/different_workbook.xls'
+    @simple_file_other_path = @dir + '/more_data/workbook.xls'
   end
 
   after do
@@ -273,7 +273,7 @@ describe BookStore do
         @bookstore.store(@book2)
         @bookstore.store(@book3)
         sheet = @book3[0]
-        sheet[0,0] = sheet[0,0].value == "simple" ? "complex" : "simple"
+        sheet[0,0] = sheet[0,0].Value == "simple" ? "complex" : "simple"
         @book.ReadOnly.should be_true
         @book2.ReadOnly.should be_false
         @book3.ReadOnly.should be_true
@@ -394,67 +394,48 @@ describe BookStore do
     end
   end
 
-  describe "excel_list" do
-
-    context "with no books" do
-      
-      it "should yield nil" do
-        @bookstore.excel_list.should == {}
-      end
+  describe "hidden_excel" do
     
-    end
+    context "with some open book" do
 
-    context "with open books" do
-    
       before do
         @book = Book.open(@simple_file)
-        @bookstore.store(@book)
       end
 
       after do
         @book.close
       end
 
-      it "should yield an excel and the workbook" do
-        excels = @bookstore.excel_list
-        excels.size.should == 1
-        excels.each do |excel,workbooks|
-          excel.should be_a Excel
-          workbooks.size.should == 1
-          workbooks.each do |workbook|
-            workbook.should == @book.workbook
-          end
-        end
-      end
-
-      it "should yield an excel with two books" do
-        book1 = Book.open(@different_file)
-        @bookstore.store(book1)
-        excels = @bookstore.excel_list
-        excels.size.should == 1
-        excels.each do |excel,workbooks|
-          excel.should be_a Excel
-          workbooks.size.should == 2
-          #workbooks[0].should == @book.workbook
-          #workbooks[1].should == book1.workbook
-        end
-      end
-
-      it "should yield two excels and two books" do
-        e = Excel.create
-        book1 = Book.open(@simple_file, :force_excel => :new)
+      it "should create and use a hidden Excel instance" do
+        h_excel0 = @bookstore.try_hidden_excel
+        h_excel0.should == nil
+        h_excel1 = @bookstore.ensure_hidden_excel
+        h_excel1.should == @bookstore.try_hidden_excel
+        h_excel1.should_not == @book.excel
+        h_excel1.Visible.should be_false
+        h_excel1.DisplayAlerts.should be_false
+        book1 = Book.open(@simple_file, :force_excel => @bookstore.ensure_hidden_excel)
+        book1.excel.should === h_excel1
+        book1.excel.should_not === @book.excel
+        Excel.close_all    
+        h_excel2 = @bookstore.ensure_hidden_excel
+        h_excel2.should_not == @book.excel
+        h_excel2.should_not == book1.excel
+        h_excel2.Visible.should be_false
+        h_excel2.DisplayAlerts.should be_false
+        book2 = Book.open(@simple_file, :force_excel => @bookstore.ensure_hidden_excel)
+        book2.excel.should === h_excel2
+        book2.excel.should_not === @book.excel
+        book2.excel.should_not === book1.excel
+      end
+
+      it "should exclude hidden excel" do
+        book1 = Book.open(@simple_file, :force_excel => @bookstore.ensure_hidden_excel)
         @bookstore.store(book1)
-        excels = @bookstore.excel_list
-        excels.size.should == 2
-        num = 0
-        excels.each do |excel,workbooks|
-          num = num + 1
-          excel.should be_a Excel
-          workbooks.size.should == 1
-          #workbooks[0].should == @book.workbook if num == 1          
-          #workbooks[0].should == book1.workbook if num == 2
-        end
-      end
+        book1.close
+        book2 = @bookstore.fetch(@simple_file)
+        book2.should == nil
+      end  
     end
   end
 end

data/spec/excel_spec.rb

@@ -8,8 +8,18 @@ module RobustExcelOle
 
   describe Excel do
 
+    before(:all) do
+      Excel.close_all
+    end
+
     before do
+      @dir = create_tmpdir
+      @simple_file = @dir + '/simple.xls'
+    end
+
+    after do
       Excel.close_all
+      rm_tmp(@dir)
     end
 
     context "excel creation" do
@@ -109,6 +119,12 @@ module RobustExcelOle
         @excel1.should_not == nil
       end
 
+      it "should be false with dead Excel objects" do
+        excel2 = Excel.current
+        Excel.close_all
+        excel2.should_not == @excel1
+      end
+
     end
 
     context "with Visible and DisplayAlerts" do
@@ -225,6 +241,30 @@ module RobustExcelOle
         excel3.should_not == excel4 
       end
     end
+
+    describe "generate workbook" do
+
+      context "with standard" do
+        
+        before do
+          @excel1 = Excel.create
+        end
+
+        it "should generate a workbook" do
+          excel = Excel.create
+          workbook = excel.generate_workbook(@simple_file)
+          p "workbook: #{workbook}"
+          workbook.should be_a WIN32OLE
+          workbook.Name.should == File.basename(@simple_file)
+          workbook.FullName.should == RobustExcelOle::absolute_path(@simple_file)
+          workbook.Saved.should be_true
+          workbook.ReadOnly.should be_false
+          workbook.Sheets.Count == 1
+          workbooks = excel.Workbooks
+          workbooks.Count.should == 1
+        end
+      end
+    end
   end
 
   describe "RobustExcelOle" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: robust_excel_ole
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - traths
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-05-09 00:00:00 +02:00
+date: 2015-06-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,14 +89,14 @@ files:
 - spec/cell_spec.rb
 - spec/cygwin_spec.rb
 - spec/data/book_with_blank.xls
-- spec/data/different_simple.xls
+- spec/data/different_workbook.xls
 - spec/data/merge_cells.xls
 - spec/data/more_data/simple.xls
-- spec/data/more_simple.xls
+- spec/data/more_workbook.xls
 - spec/data/protected_sheet.xls
-- spec/data/simple.xls
-- spec/data/simple.xlsm
-- spec/data/simple.xlsx
+- spec/data/workbook.xls
+- spec/data/workbook.xlsm
+- spec/data/workbook.xlsx
 - spec/excel_spec.rb
 - spec/helpers/create_temporary_dir.rb
 - spec/helpers/key_sender.rb