robust_excel_ole 0.2.0.6 → 0.2.0.7

data/README.rdoc

@@ -47,7 +47,7 @@ Options are the following:
 [:displayalerts] boolean (default: false). allow display alerts in Excel   
 [:visible]       boolean (default: false). make visibe in Excel                  
 [:if_unsaved]    :raise (default), :accept, :forget, :new_app, :excel
-[:if_unsaved_other_book]  :raise (default), :save, :forget, :new_app
+[:if_blocked_other_book]  :raise (default), :save, :forget, :new_app
                          
 
 The option :if_unsaved  : 
@@ -60,13 +60,12 @@ If an unsaved book with the same name is open, then
 [:new_app] Open the new book in a new Excel application
 [:excel]   Give control to Excel.
 
-The option :if_unsaved_other_book :
+The option :if_blocked_other_book :
 
-If an unsaved book with same name in a different path is open, then
+If a book with same name in a different path is open, then
                  
 [:raise]   Raise an exception. Don't open the book.
-[:save]    Save and close the unsaved book and open the new book.
-[:forget]  Close the unsaved book, open the new book.
+[:forget]  Close the old book, open the new book.
 [:new_app] Open the new book in a new Excel application.
 
 

data/lib/robust_excel_ole/book.rb

@@ -22,9 +22,8 @@ module RobustExcelOle
       #                 :forget  -> close the unsaved book, open the new book
       #                 :excel   -> give control to excel
       #                 :new_app -> open the new book in a new excel application
-      #  :if_unsaved_other_book   if an unsaved book with the same name in a different path is open, then
+      #  :if_blocked_other_book   if a book with the same name in a different path is open, then
       #                  :raise   -> raise an exception                  (default)             
-      #                  :save    -> save and close the unsaved book and open the new book
       #                  :forget  -> close the unsaved book, open the new book
       #                  :new_app -> open the new book in a new excel application
       def open(file, options={ :reuse => true}, &block)
@@ -38,10 +37,10 @@ module RobustExcelOle
         :reuse => true,
         :read_only => false,
         :if_unsaved => :raise,
-        :if_unsaved_other_book => :raise
+        :if_blocked_other_book => :raise
       }.merge(opts)
       excel_app_options = {:reuse => true}.merge(opts).delete_if{|k,v| 
-        k== :read_only || k== :if_unsaved || k == :if_unsaved_other_book}
+        k== :read_only || k== :if_unsaved || k == :if_blocked_other_book}
       if not File.exist?(file)
         raise ExcelErrorOpen, "file #{file} not found"
       end
@@ -51,13 +50,10 @@ module RobustExcelOle
       if @workbook then
         blocked_by_other_book = (File.basename(file) == File.basename(@workbook.Fullname)) && 
                                 (not (absolute_path(file) == @workbook.Fullname))
-                                #(not (file == @workbook.Fullname.gsub("\\","/")))
         if blocked_by_other_book then
-          case @options[:if_unsaved_other_book]
+          case @options[:if_blocked_other_book]
           when :raise
             raise ExcelErrorOpen, "blocked by an unsaved book with the same name in a different path"
-          when :save
-            #nothing
           when :forget
             @workbook.Close
           when :new_app
@@ -65,7 +61,7 @@ module RobustExcelOle
             @excel_app = ExcelApp.new(excel_app_options)
             @workbook = nil
           else
-            raise ExcelErrorOpen, ":if_unsaved_other_book: invalid option"
+            raise ExcelErrorOpen, ":if_blocked_other_book: invalid option"
           end
         else
           # book open, not saved, not blocked by other book

data/lib/robust_excel_ole/version.rb

@@ -1,3 +1,3 @@
 module RobustExcelOle
-  VERSION = "0.2.0.6"
+  VERSION = "0.2.0.7"
 end

data/spec/book_spec.rb

@@ -252,13 +252,11 @@ describe RobustExcelOle::Book do
       end
     end
 
-    context "with an unsaved book in a different path" do
+    context "with a book in a different path" do
 
       before do
         simple_file_other_path = @dir + '/more_data/simple.xls'
         @book = RobustExcelOle::Book.open(simple_file_other_path)
-        @sheet = @book[0]
-        @book.add_sheet(@sheet, :as => 'a_name')
       end
 
       after do
@@ -266,30 +264,21 @@ describe RobustExcelOle::Book do
         @new_book.close rescue nil
       end
 
-      it "should raise an error, if :if_unsaved_other_book is :raise" do
+      it "should raise an error, if :if_blocked_other_book is :raise" do
         expect {
-          @new_book = RobustExcelOle::Book.open(@simple_file, :if_unsaved_other_book => :raise)
+          @new_book = RobustExcelOle::Book.open(@simple_file, :if_blocked_other_book => :raise)
         }.to raise_error(ExcelErrorOpen, "blocked by an unsaved book with the same name in a different path")
       end
 
-      it "should let the book open, if :if_unsaved_other_book is :save" do
-        expect {
-          @new_book = RobustExcelOle::Book.open(@simple_file, :if_unsaved_other_book => :save)
-          }.to_not raise_error
-        @book.should be_alive
-        @new_book.should be_alive
-        @new_book.filename.should == @book.filename
-      end
-
-      it "should close the other book and open the new book, if :if_unsaved_other_book is :forget" do
-        @new_book = RobustExcelOle::Book.open(@simple_file, :if_unsaved_other_book => :forget)
+      it "should close the other book and open the new book, if :if_blocked_other_book is :forget" do
+        @new_book = RobustExcelOle::Book.open(@simple_file, :if_blocked_other_book => :forget)
         @book.should_not be_alive
         @new_book.should be_alive
         @new_book.filename.downcase.should == @simple_file.downcase
       end
 
-      it "should open the book in a new excel application, if :if_unsaved_other_book is :new_app" do
-        @new_book = RobustExcelOle::Book.open(@simple_file, :if_unsaved_other_book => :new_app)
+      it "should open the book in a new excel application, if :if_blocked_other_book is :new_app" do
+        @new_book = RobustExcelOle::Book.open(@simple_file, :if_blocked_other_book => :new_app)
         @book.should be_alive
         @new_book.should be_alive
         @new_book.filename.should_not == @book.filename
@@ -297,16 +286,16 @@ describe RobustExcelOle::Book do
         @new_book.close
       end
 
-      it "should raise an error, if :if_unsaved_other_book is default" do
+      it "should raise an error, if :if_blocked_other_book is default" do
         expect {
           @new_book = RobustExcelOle::Book.open(@simple_file)
         }.to raise_error(ExcelErrorOpen, "blocked by an unsaved book with the same name in a different path")
       end
 
-      it "should raise an error, if :if_unsaved_other_book is invalid option" do
+      it "should raise an error, if :if_blocked_other_book is invalid option" do
         expect {
-          @new_book = RobustExcelOle::Book.open(@simple_file, :if_unsaved_other_book => :invalid_option)
-        }.to raise_error(ExcelErrorOpen, ":if_unsaved_other_book: invalid option")
+          @new_book = RobustExcelOle::Book.open(@simple_file, :if_blocked_other_book => :invalid_option)
+        }.to raise_error(ExcelErrorOpen, ":if_blocked_other_book: invalid option")
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: robust_excel_ole
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 81
   prerelease: false
   segments: 
   - 0
   - 2
   - 0
-  - 6
-  version: 0.2.0.6
+  - 7
+  version: 0.2.0.7
 platform: ruby
 authors: 
 - traths
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-09-28 00:00:00 +02:00
+date: 2014-09-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency