robust_excel_ole 1.17 → 1.18.4

data/lib/robust_excel_ole/worksheet.rb

@@ -71,7 +71,7 @@ module RobustExcelOle
         xy = "#{x}_#{y}"
         @cells = { }
         begin
-          @cells[xy] = RobustExcelOle::Cell.new(@ole_worksheet.Cells.Item(x, y))
+          @cells[xy] = RobustExcelOle::Cell.new(@ole_worksheet.Cells.Item(x, y), @worksheet)
         rescue
           raise RangeNotEvaluatable, "cannot read cell (#{x.inspect},#{y.inspect})"
         end
@@ -108,16 +108,26 @@ module RobustExcelOle
     # value of a cell, if row and column are given
     # @params row and column
     # @returns value of the cell
+    def cellval(x,y)
+      begin
+        @ole_worksheet.Cells.Item(x, y).Value
+      rescue
+        raise RangeNotEvaluatable, "cannot read cell (#{x.inspect},#{y.inspect})"
+      end
+    end
+
+=begin
     def cellval(x,y)
       xy = "#{x}_#{y}"
       @cells = { }
       begin
-        @cells[xy] = RobustExcelOle::Cell.new(@ole_worksheet.Cells.Item(x, y))
+        @cells[xy] ||= RobustExcelOle::Cell.new(@ole_worksheet.Cells.Item(x, y), @worksheet)
         @cells[xy].Value
       rescue
         raise RangeNotEvaluatable, "cannot read cell (#{p1.inspect},#{p2.inspect})"
       end
     end
+=end
 
     # sets the value of a cell, if row, column and color of the cell are given
     # @params [Integer] x,y row and column
@@ -130,6 +140,10 @@ module RobustExcelOle
       raise RangeNotEvaluatable, "cannot assign value #{value.inspect} to cell (#{y.inspect},#{x.inspect})"
     end
 
+    def values
+      @ole_worksheet.UsedRange.Value
+    end
+
     def each
       each_row do |row_range|
         row_range.each do |cell|
@@ -148,17 +162,35 @@ module RobustExcelOle
       end
     end
 
+    def each_rowvalue
+      @ole_worksheet.UsedRange.Value.each do |row_values|
+        yield row_values
+      end
+    end
+
+    def each_value   # :deprecated: #
+      each_rowvalue
+    end
+
+    def each_rowvalue_with_index(offset = 0)
+      i = offset
+      @ole_worksheet.UsedRange.Value.each do |row_values|
+        yield row_values, i
+        i += 1
+      end
+    end
+
     def each_row(offset = 0)
       offset += 1
       1.upto(@end_row) do |row|
         next if row < offset
-        yield RobustExcelOle::Range.new(@ole_worksheet.Range(@ole_worksheet.Cells(row, 1), @ole_worksheet.Cells(row, @end_column)))
+        yield RobustExcelOle::Range.new(@ole_worksheet.Range(@ole_worksheet.Cells(row, 1), @ole_worksheet.Cells(row, @end_column)), self)
       end
     end
 
     def each_row_with_index(offset = 0)
       each_row(offset) do |row_range|
-        yield RobustExcelOle::Range.new(row_range), (row_range.Row - 1 - offset)
+        yield RobustExcelOle::Range.new(row_range, self), (row_range.Row - 1 - offset)
       end
     end
 
@@ -166,24 +198,24 @@ module RobustExcelOle
       offset += 1
       1.upto(@end_column) do |column|
         next if column < offset
-        yield RobustExcelOle::Range.new(@ole_worksheet.Range(@ole_worksheet.Cells(1, column), @ole_worksheet.Cells(@end_row, column)))
+        yield RobustExcelOle::Range.new(@ole_worksheet.Range(@ole_worksheet.Cells(1, column), @ole_worksheet.Cells(@end_row, column)), self)
       end
     end
 
     def each_column_with_index(offset = 0)
       each_column(offset) do |column_range|
-        yield RobustExcelOle::Range.new(column_range), (column_range.Column - 1 - offset)
+        yield RobustExcelOle::Range.new(column_range, self), (column_range.Column - 1 - offset)
       end
     end
 
     def row_range(row, integer_range = nil)
       integer_range ||= 1..@end_column
-      RobustExcelOle::Range.new(@ole_worksheet.Range(@ole_worksheet.Cells(row, integer_range.min), @ole_worksheet.Cells(row, integer_range.max)))
+      RobustExcelOle::Range.new(@ole_worksheet.Range(@ole_worksheet.Cells(row, integer_range.min), @ole_worksheet.Cells(row, integer_range.max)), self)
     end
 
     def col_range(col, integer_range = nil)
       integer_range ||= 1..@end_row
-      RobustExcelOle::Range.new(@ole_worksheet.Range(@ole_worksheet.Cells(integer_range.min, col), @ole_worksheet.Cells(integer_range.max, col)))
+      RobustExcelOle::Range.new(@ole_worksheet.Range(@ole_worksheet.Cells(integer_range.min, col), @ole_worksheet.Cells(integer_range.max, col)), self)
     end
 
     def == other_worksheet

data/lib/rubygems_plugin.rb

@@ -0,0 +1,3 @@
+Gem.post_install do
+  puts "post_install called for gem"
+end

data/robust_excel_ole.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.add_development_dependency "rspec", '>= 2.6.0'
-  s.required_ruby_version = '>= 1.8.6'
+  s.required_ruby_version = '>= 2.1'
 end

data/spec/excel_spec.rb

@@ -35,6 +35,22 @@ module RobustExcelOle
       rm_tmp(@dir)
     end
 
+    context "active_workbook" do
+
+      before do
+        @excel = Excel.create
+      end
+
+      it "should access the active workbook" do
+        @excel.active_workbook.should be nil
+        workbook = Workbook.open(@simple_file1)
+        active_workbook = @excel.active_workbook
+        active_workbook.Fullname.should == workbook.Fullname
+        active_workbook.should == workbook
+      end
+
+    end
+
     context "with connect and preserving options" do
 
       before do

data/spec/general_spec.rb

@@ -67,7 +67,6 @@ module RobustExcelOle
 
       it "should type-lift a cell" do
         cell = @book1.sheet(1).range([1,1]).ole_range.to_reo
-        #cell = @book1.sheet(1)[1,1].ole_cell.to_reo
         cell.should be_kind_of Cell
         cell.Value.should == "foo"
       end

data/spec/range_spec.rb

@@ -18,20 +18,74 @@ describe RobustExcelOle::Range do
     @book = Workbook.open(@dir + '/workbook.xls', :force_excel => :new)
     @sheet = @book.sheet(2)
     @range = RobustExcelOle::Range.new(@sheet.ole_worksheet.UsedRange.Rows(1))
+    @range2 = @sheet.range([1..2,1..3])
   end
 
   after do
-    @book.close
+    @book.close(:if_unsaved => :forget)
     Excel.kill_all
     rm_tmp(@dir)
   end
 
+  describe "#[]" do
+
+    it "should yield a cell" do
+      @range[0].should be_kind_of RobustExcelOle::Cell
+    end
+
+    it "should yield the value of the first cell" do
+      @range2[0].Value.should == 'simple'
+    end
+
+    it "should cash the cells in the range" do
+      cell = @range2[0]
+      cell.v.should == 'simple'
+      @range2.Cells.Item(1).Value = 'foo'
+      cell.v.should == 'foo'
+    end
+  end
+
   describe "#each" do
+  
     it "items is RobustExcelOle::Cell" do
-      @range.each do |cell|
+      @range2.each do |cell|
         cell.should be_kind_of RobustExcelOle::Cell
       end
     end
+
+    it "should work with [] doing cashing synchonized, from #[] to #each" do
+      i = 0
+      @range2.each do |cell|
+        cell.v.should == 'simple' if i == 0
+        cell.v.should == 'file' if i == 1
+        cell.v.should == 'sheet2' if i == 2
+        i += 1
+      end
+      @range2[0].Value = 'foo'
+      @range2[1].Value = 'bar'
+      @range2[2].Value = 'simple'
+      i = 0
+      @range2.each do |cell|
+        cell.v.should == 'foo' if i == 0
+        cell.v.should == 'bar' if i == 1
+        cell.v.should == 'simple' if i == 2
+        i += 1
+      end
+    end
+
+    it "should work with [] doing cashing synchonized, from #each to #[]" do
+      @range2[0].Value.should == 'simple'
+      @range2[1].Value.should == 'file'
+      @range2[2].Value.should == 'sheet2'
+      i = 0
+      @range2.each do |cell|
+        cell.Value = 'foo' if i == 0
+        cell.Value = 'bar' if i == 1
+        cell.Value = 'simple' if i == 2
+        i += 1
+      end
+    end
+
   end
 
   describe "#values" do

data/spec/worksheet_spec.rb

@@ -295,6 +295,48 @@ describe Worksheet do
 
     end
 
+    describe "#values" do
+
+      it "should yield cell values of the used range" do
+        @sheet.values.should == [["foo", "workbook", "sheet1"], ["foo", nil, "foobaaa"], ["matz", "is", "nice"]]
+      end
+
+    end
+
+    describe "#each_rowvalue" do
+
+      it "should yield arrays" do
+        @sheet.each_rowvalue do |row_value|
+          row_value.should be_kind_of Array
+        end
+      end
+
+      it "should read the rows" do
+        i = 0
+        @sheet.each_rowvalue do |row_values|
+          case i
+          when 0
+            row_values.should == ['foo', 'workbook', 'sheet1']
+          when 1
+            row_values.should == ['foo', nil, 'foobaaa']
+          end
+          i += 1
+        end
+      end
+
+      it "should read the rows with index" do
+        @sheet.each_rowvalue_with_index do |row_values, i|
+          case i
+          when 0
+            row_values.should == ['foo', 'workbook', 'sheet1']
+          when 1
+            row_values.should == ['foo', nil, 'foobaaa']
+          end
+        end
+      end
+
+    end
+
     describe "#each_row" do
       it "items should RobustExcelOle::Range" do
         @sheet.each_row do |rows|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robust_excel_ole
 version: !ruby/object:Gem::Version
-  version: '1.17'
+  version: 1.18.4
 platform: ruby
 authors:
 - traths
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -33,7 +33,9 @@ description: "RobustExcelOle helps controlling Excel. \n                   This
   are supported.\n                   It runs on Windows and uses the win32ole library."
 email:
 - Thomas.Raths@gmx.net
-executables: []
+executables:
+- jreo
+- reo
 extensions: []
 extra_rdoc_files:
 - README.rdoc
@@ -50,11 +52,26 @@ files:
 - Rakefile
 - TodoList.md
 - ___dummy_workbook.xls
+- benchmarking/Gemfile
+- benchmarking/README.md
+- benchmarking/creek_example.rb
+- benchmarking/generating_excel_files.rb
+- benchmarking/reo_example.rb
+- benchmarking/reo_example1.rb
+- benchmarking/reo_example2.rb
+- benchmarking/roo_example.rb
+- benchmarking/ruby_xl_example.rb
+- benchmarking/sample_excel_files/xlsx_500_rows.xlsx
+- benchmarking/simple_xlsx_reader_example.rb
+- benchmarking/spreadsheet_example.rb
+- bin/jreo
+- bin/reo
 - docs/README_excel.rdoc
 - docs/README_open.rdoc
 - docs/README_ranges.rdoc
 - docs/README_save_close.rdoc
 - docs/README_sheet.rdoc
+- examples/example_ruby_library.rb
 - examples/introductory_examples/example_introductory.rb
 - examples/introductory_examples/example_open.rb
 - examples/introductory_examples/example_range.rb
@@ -96,9 +113,11 @@ files:
 - lib/robust_excel_ole/range_owners.rb
 - lib/robust_excel_ole/robustexcelole.sublime-project
 - lib/robust_excel_ole/robustexcelole.sublime-workspace
+- lib/robust_excel_ole/vba_objects.rb
 - lib/robust_excel_ole/version.rb
 - lib/robust_excel_ole/workbook.rb
 - lib/robust_excel_ole/worksheet.rb
+- lib/rubygems_plugin.rb
 - lib/spec_helper.rb
 - reo.bat
 - robust_excel_ole.gemspec
@@ -155,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.6
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="