robust_excel_ole 0.3.2 → 0.3.3

data/lib/robust_excel_ole/version.rb

@@ -1,3 +1,3 @@
 module RobustExcelOle
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/book_spec.rb

@@ -41,15 +41,6 @@ describe Book do
         @book.should be_a Book
         @book.close
       end
-
-      it "create a new file" do
-        File.delete @simple_save_file rescue nil
-        Book.create(@simple_save_file)
-        book = Book.open(@simple_save_file, :if_absent => :raise)
-        book.should be_a Book
-        book.close
-        File.exist?(@simple_save_file).should be_true
-      end
     end
   end
   
@@ -468,7 +459,7 @@ describe Book do
           @key_sender.puts "{right}{enter}"
           expect{
             Book.open(@simple_file, :if_unsaved => :alert)
-            }.to raise_error(ExcelUserCanceled, "open: canceled by user")
+            }.to raise_error(ExcelErrorOpen, "open: user canceled or open error")
           @book.should be_alive
         end
       end
@@ -808,7 +799,7 @@ describe Book do
       end
 
       it "should create and use a hidden Excel instance" do
-        book2 = Book.open(@simple_file, :force_excel => @book.book_store.ensure_hidden_excel)
+        book2 = Book.open(@simple_file, :force_excel => @book.book_store.hidden_excel)
         book2.excel.should_not == @book.excel
         book2.excel.Visible.should be_false
         book2.excel.DisplayAlerts.should be_false
@@ -856,6 +847,17 @@ describe Book do
           book.excel.should_not == new_excel
         end
       end
+
+      it "should open unobtrusively in a given Excel" do
+        excel = Excel.new(:reuse => false)
+        new_excel = Excel.new(:reuse => false)
+        Book.unobtrusively(@simple_file, :if_closed => new_excel) do |book|
+          book.should be_a Book
+          book.should be_alive
+          book.excel.should_not == excel
+        end
+      end
+
     end
 
     context "with an open book" do
@@ -1025,6 +1027,41 @@ describe Book do
         sheet = new_book[0]
         sheet[0,0].value.should_not == old_cell_value
       end
+
+      it "should use a given Excel" do
+        @book.close
+        excel = Excel.new(:reuse => false)
+        new_excel = Excel.new(:reuse => false)
+        Book.unobtrusively(@simple_file, :if_closed => new_excel) do |book|
+          book.should be_a Book
+          book.excel.should_not == @book.excel
+          book.excel.should == new_excel
+        end
+      end
+
+      it "should use not the given excel if the Excels are closed" do
+        excel = Excel.new(:reuse => false)
+        sheet = @book[0]
+        old_cell_value = sheet[0,0].value
+        old_excel = @book.excel
+        @book.close
+        @book.should_not be_alive
+        Excel.close_all
+        Book.unobtrusively(@simple_file, :if_closed => excel, :keep_open => true) do |book|
+          book.should be_a Book
+          book.excel.should_not == old_excel
+          book.excel.should == @book.excel
+          book.excel.should_not == excel
+          sheet = book[0]
+          cell = sheet[0,0]
+          sheet[0,0] = cell.value == "simple" ? "complex" : "simple"
+          book.Saved.should be_false
+        end
+        @book.should be_alive
+        new_book = Book.open(@simple_file)
+        sheet = new_book[0]
+        sheet[0,0].value.should_not == old_cell_value
+      end
     end
 
 

data/spec/book_store_spec.rb

@@ -15,7 +15,7 @@ $VERBOSE = nil
 include RobustExcelOle
 
 module RobustExcelOle
-  class MockBookstore
+  class MockBookstore # :nodoc: #
     def fetch(filename, options = { })
       nil
     end
@@ -387,6 +387,10 @@ describe BookStore do
         book_new = Book.open(@different_file)
         @bookstore.store(book_new)
         @book = nil
+        @book = "Bla"
+        @book = Book.open(@simple_file)
+        @bookstore.store(@book)
+        @book = nil
         GC.start
         @bookstore.fetch(@simple_file).should == nil
         @bookstore.fetch(@different_file).should == book_new
@@ -407,30 +411,27 @@ describe BookStore do
       end
 
       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 = @bookstore.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 = Book.open(@simple_file, :force_excel => @bookstore.hidden_excel)
         book1.excel.should === h_excel1
         book1.excel.should_not === @book.excel
         Excel.close_all    
-        h_excel2 = @bookstore.ensure_hidden_excel
+        h_excel2 = @bookstore.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 = Book.open(@simple_file, :force_excel => @bookstore.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)
+        book1 = Book.open(@simple_file, :force_excel => @bookstore.hidden_excel)
         @bookstore.store(book1)
         book1.close
         book2 = @bookstore.fetch(@simple_file)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: robust_excel_ole
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - traths
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-06-07 00:00:00 +02:00
+date: 2015-06-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency