robust_excel_ole 0.3.8 → 0.3.9

data/spec/range_spec.rb

@@ -14,13 +14,14 @@ describe RobustExcelOle::Range do
 
   before do
     @dir = create_tmpdir
-    @book = Book.open(@dir + '/workbook.xls')
+    @book = Book.open(@dir + '/workbook.xls', :force_excel => :new)
     @sheet = @book[1]
     @range = RobustExcelOle::Range.new(@sheet.worksheet.UsedRange.Rows(1))
   end
 
   after do
     @book.close
+    Excel.kill_all
     rm_tmp(@dir)
   end
 
@@ -59,7 +60,7 @@ describe RobustExcelOle::Range do
 
     context "read 'merge_cells.xls'" do
       before do
-        @merge_cells_book = Book.open("#{@dir}/merge_cells.xls")
+        @merge_cells_book = Book.open("#{@dir}/merge_cells.xls", :force_excel => :new)
         @merge_cells_sheet = @merge_cells_book[0]
       end
 

data/spec/sheet_spec.rb

@@ -1,35 +1,43 @@
 # -*- coding: utf-8 -*-
+
 require File.join(File.dirname(__FILE__), './spec_helper')
 
+$VERBOSE = nil
+
 include RobustExcelOle
+include General
+
+describe Sheet do
+ 
+  before(:all) do
+    excel = Excel.new(:reuse => true)
+    open_books = excel == nil ? 0 : excel.Workbooks.Count
+    puts "*** open books *** : #{open_books}" if open_books > 0
+    Excel.close_all
+  end 
 
-describe RobustExcelOle::Sheet do
-  
   before do
     @dir = create_tmpdir
-    @book = RobustExcelOle::Book.open(@dir + '/workbook.xls', :read_only => true)
+    @simple_file = @dir + '/workbook.xls'
+    @protected_file = @dir + '/protected_sheet.xls'
+    @blank_file = @dir + '/book_with_blank.xls'
+    @merge_file = @dir + '/merge_cells.xls'
+    @book = Book.open(@simple_file)
     @sheet = @book[0]
   end
 
   after do
-    @book.close
+    @book.close(:if_unsaved => :forget)
+    Excel.kill_all
     rm_tmp(@dir)
   end
 
-  before(:all) do
-    Excel.close_all
-  end 
-
-  after(:all) do
-    Excel.kill_all
-  end 
-
   describe ".initialize" do
     context "when open sheet protected(with password is 'protect')" do
       before do
         @key_sender = IO.popen  'ruby "' + File.join(File.dirname(__FILE__), '/helpers/key_sender.rb') + '" "Microsoft Office Excel" '  , "w"
+        @book_protect = Book.open(@protected_file, :visible => true, :read_only => true, :force_excel => :new)
         @key_sender.puts "{p}{r}{o}{t}{e}{c}{t}{enter}"
-        @book_protect = RobustExcelOle::Book.open(@dir + '/protected_sheet.xls', :visible => true, :read_only => true)
         @protected_sheet = @book_protect['protect']
       end
 
@@ -51,7 +59,7 @@ describe RobustExcelOle::Sheet do
 
   shared_context "sheet 'open book with blank'" do
     before do
-      @book_with_blank = RobustExcelOle::Book.open(@dir + '/book_with_blank.xls', :read_only => true)
+      @book_with_blank = Book.open(@blank_file, :read_only => true)
       @sheet_with_blank = @book_with_blank[0]
     end
 
@@ -91,7 +99,7 @@ describe RobustExcelOle::Sheet do
 
       context "access [1,1]" do
 
-        it { @sheet[1, 1].should be_kind_of RobustExcelOle::Cell }
+        it { @sheet[1, 1].should be_kind_of Cell }
         it { @sheet[1, 1].value.should eq 'foo' }
       end
 
@@ -280,7 +288,7 @@ describe RobustExcelOle::Sheet do
 
       context "read sheet which last cell is merged" do
         before do
-          @book_merge_cells = RobustExcelOle::Book.open(@dir + '/merge_cells.xls')
+          @book_merge_cells = Book.open(@merge_file)
           @sheet_merge_cell = @book_merge_cells[0]
         end
 
@@ -385,7 +393,7 @@ describe RobustExcelOle::Sheet do
       context "returning the value of a range" do
       
         before do
-          @book1 = RobustExcelOle::Book.open(@dir + '/another_workbook.xls')
+          @book1 = Book.open(@dir + '/another_workbook.xls')
           @sheet1 = @book1[0]
         end
 
@@ -422,7 +430,7 @@ describe RobustExcelOle::Sheet do
       context "setting the value of a range" do
       
         before do
-          @book1 = RobustExcelOle::Book.open(@dir + '/another_workbook.xls', :read_only => true)
+          @book1 = Book.open(@dir + '/another_workbook.xls', :read_only => true)
           @sheet1 = @book1[0]
         end
 
@@ -454,7 +462,7 @@ describe RobustExcelOle::Sheet do
       context "setting the name of a range" do
 
          before do
-          @book1 = RobustExcelOle::Book.open(@dir + '/another_workbook.xls', :read_only => true, :visible => true)
+          @book1 = Book.open(@dir + '/another_workbook.xls', :read_only => true, :visible => true)
           @sheet1 = @book1[0]
         end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: robust_excel_ole
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - traths
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-02-12 00:00:00 +01:00
+date: 2016-03-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,7 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - .gitignore
+- .yardopts
 - Changelog
 - Gemfile
 - Guardfile
@@ -83,6 +84,7 @@ files:
 - lib/robust_excel_ole/cell.rb
 - lib/robust_excel_ole/cygwin.rb
 - lib/robust_excel_ole/excel.rb
+- lib/robust_excel_ole/general.rb
 - lib/robust_excel_ole/range.rb
 - lib/robust_excel_ole/robustexcelole.sublime-project
 - lib/robust_excel_ole/robustexcelole.sublime-workspace
@@ -92,13 +94,13 @@ files:
 - lib/spec_helper.rb
 - reo.bat
 - robust_excel_ole.gemspec
+- spec/book_spec.rb
 - spec/book_specs/book_all_spec.rb
 - spec/book_specs/book_close_spec.rb
 - spec/book_specs/book_misc_spec.rb
 - spec/book_specs/book_open_spec.rb
 - spec/book_specs/book_save_spec.rb
 - spec/book_specs/book_sheet_spec.rb
-- spec/book_specs/book_spec.rb
 - spec/book_specs/book_subclass_spec.rb
 - spec/book_specs/book_unobtr_spec.rb
 - spec/bookstore_spec.rb
@@ -117,10 +119,10 @@ files:
 - spec/data/workbook_linked.xlsm
 - spec/data/workbook_linked_sub.xlsm
 - spec/excel_spec.rb
+- spec/general_spec.rb
 - spec/helpers/create_temporary_dir.rb
 - spec/helpers/key_sender.rb
 - spec/range_spec.rb
-- spec/robust_excel_ole_spec.rb
 - spec/sheet_spec.rb
 - spec/spec_helper.rb
 - version.rb

data/spec/robust_excel_ole_spec.rb

@@ -1,113 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require File.join(File.dirname(__FILE__), './spec_helper')
-
-$VERBOSE = nil
-
-include RobustExcelOle
-
-describe RobustExcelOle do
-
-  before(:all) do
-    excel = Excel.new(:reuse => true)
-    open_books = excel == nil ? 0 : excel.Workbooks.Count
-    puts "*** open books *** : #{open_books}" if open_books > 0
-    Excel.close_all
-  end
-
-  before do
-    @dir = create_tmpdir
-    @simple_file = @dir + '/workbook.xls'
-  end
-
-  after do
-    Excel.kill_all
-    rm_tmp(@dir)
-  end
-
-  describe "t" do
-
-    it "should put some" do
-      a = 4
-      t "some text #{a}"
-    end
-
-    it "should put another text" do
-      a = 5
-      t "another text #{a}"
-    end
-
-  end
-
-  describe "#absolute_path" do
-    
-    context "with standard" do
-      
-      before do
-        @previous_dir = Dir.getwd
-      end
-      
-      after do
-        Dir.chdir @previous_dir
-      end
-
-      it "should return the right absolute paths" do
-        absolute_path("C:/abc").should == "C:\\abc"
-        absolute_path("C:\\abc").should == "C:\\abc"
-        Dir.chdir "C:/windows"
-        absolute_path("C:abc").downcase.should == Dir.pwd.gsub("/","\\").downcase + "\\abc"
-        absolute_path("C:abc").upcase.should   == File.expand_path("abc").gsub("/","\\").upcase
-      end
-
-      it "should return right absolute path name" do
-        filename = 'C:/Dokumente und Einstellungen/Zauberthomas/Eigene Dateien/robust_excel_ole/spec/book_spec.rb'
-        absolute_path(filename).gsub("\\","/").should == filename
-      end
-    end
-  end
-
-  describe "canonize" do
-
-    context "with standard" do
-      
-      it "should reduce slash at the end" do
-        normalize("hallo/").should == "hallo"
-        normalize("/this/is/the/Path/").should == "/this/is/the/Path"
-      end
-
-      it "should save capital letters" do
-        normalize("HALLO/").should == "HALLO"
-        normalize("/This/IS/tHe/patH/").should == "/This/IS/tHe/patH"
-      end
-
-      it "should reduce multiple shlashes" do
-        normalize("/this/is//the/path").should == "/this/is/the/path"
-        normalize("///this/////////is//the/path/////").should == "/this/is/the/path"
-      end
-
-      it "should reduce dots in the paths" do
-        canonize("/this/is/./the/path").should == "/this/is/the/path"
-        canonize("this/.is/./the/pa.th/").should == "this/.is/the/pa.th"
-        canonize("this//.///.//.is/the/pa.th/").should == "this/.is/the/pa.th"
-      end
-
-      it "should change to the upper directory with two dots" do
-        canonize("/this/is/../the/path").should == "/this/the/path"
-        canonize("this../.i.s/.../..the/..../pa.th/").should == "this../.i.s/.../..the/..../pa.th"
-      end
-
-      it "should downcase" do
-        canonize("/This/IS/tHe/path").should == "/this/is/the/path"
-        canonize("///THIS/.///./////iS//the/../PatH/////").should == "/this/is/path"
-      end
-
-      it "should raise an error for no strings" do
-        expect{
-          canonize(1)
-        }.to raise_error(ExcelError, "No string given to canonize, but 1")
-      end
-
-    end
-  end
-
-end