wrap_excel 0.0.7 → 0.0.8

data/.gitignore

@@ -4,3 +4,4 @@ Gemfile.lock
 pkg/*
 vendor/bundle
 *~
+.DS_Store

data/lib/wrap_excel/range.rb

@@ -14,14 +14,8 @@ module WrapExcel
     end
 
     def values(range = nil)
-      if range
-        min = range.min + 1
-        max = range.max + 1
-        result = @range.Range(@range.Cells.Item(min), @range.Cells(max)).value
-        result.is_a?(Array) ? result[0] : [result]
-      else
-        @range.Cells.value.flatten
-      end
+      result = self.map(&:value).flatten
+      range ? result.each_with_index.select{ |row_or_column, i| range.include?(i) }.map{ |i| i[0] } : result
     end
 
     def [] index

data/lib/wrap_excel/sheet.rb

@@ -8,12 +8,12 @@ module WrapExcel
       @sheet = win32_worksheet
       if @sheet.ProtectContents
         @sheet.Unprotect
-        @end_row = @sheet.UsedRange.SpecialCells(WrapExcel::XlLastCell).Row
-        @end_column = @sheet.UsedRange.SpecialCells(WrapExcel::XlLastCell).Column
+        @end_row = last_row
+        @end_column = last_column
         @sheet.Protect
       else
-        @end_row = @sheet.UsedRange.SpecialCells(WrapExcel::XlLastCell).Row
-        @end_column = @sheet.UsedRange.SpecialCells(WrapExcel::XlLastCell).Column
+        @end_row = last_row
+        @end_column = last_column
       end
     end
 
@@ -84,5 +84,20 @@ module WrapExcel
     def method_missing(id, *args)
       @sheet.send(id, *args)
     end
+
+    private
+    def last_row
+      special_last_row = @sheet.UsedRange.SpecialCells(WrapExcel::XlLastCell).Row
+      used_last_row = @sheet.UsedRange.Rows.Count
+
+      special_last_row >= used_last_row ? special_last_row : used_last_row
+    end
+
+    def last_column
+      special_last_column = @sheet.UsedRange.SpecialCells(WrapExcel::XlLastCell).Column
+      used_last_column = @sheet.UsedRange.Columns.Count
+
+      special_last_column >= used_last_column ? special_last_column : used_last_column
+    end
   end
 end

data/lib/wrap_excel/version.rb

@@ -1,3 +1,3 @@
 module WrapExcel
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/cell_spec.rb

@@ -53,8 +53,8 @@ describe WrapExcel::Cell do
     end
 
     it "merged cell get same value" do
-      @sheet[0, 0].value.should eq 'merged cell'
-      @sheet[0, 1].value.should eq 'merged cell'
+      @sheet[0, 0].value.should be_nil
+      @sheet[1, 0].value.should eq 'first merged'
     end
 
     it "set merged cell" do

data/spec/range_spec.rb

@@ -46,6 +46,47 @@ describe WrapExcel::Range do
       end
       it { @range.values.should eq ['simple', 'foo', 'matz'] }
     end
+
+    context "read 'merge_cells.xls'" do
+      before do
+        @merge_cells_book = WrapExcel::Book.open("#{@dir}/merge_cells.xls")
+        @merge_cells_sheet = @merge_cells_book[0]
+      end
+
+      after do
+        @merge_cells_book.close
+      end
+
+      context "only merged_cell" do
+        before do
+          @only_merged_range = @merge_cells_sheet.row_range(3)
+        end
+
+        context "without argument" do
+          it { @only_merged_range.values.should eq ['merged', 'merged', 'merged', 'merged'] }
+        end
+
+        context "with (1..2)" do
+          it { @only_merged_range.values(1..2).should eq ['merged', 'merged'] }
+        end
+
+      end
+
+      context "mix merged cell and no merge cell" do
+        before do
+          @mix_merged_no_merged_range = @merge_cells_sheet.row_range(1)
+        end
+
+        context "without argument" do
+          it { @mix_merged_no_merged_range.values.should eq ['first merged', 'first merged', 'first merged', nil] }
+        end
+
+        context "with (2..3)" do
+          it { @mix_merged_no_merged_range.values(2..3).should eq ['first merged', nil] }
+        end
+
+      end
+    end
   end
 
   describe "#[]" do

data/spec/sheet_spec.rb

@@ -235,6 +235,32 @@ describe WrapExcel::Sheet do
           end
         end
       end
+
+      context "read sheet which last cell is merged" do
+        before do
+          @book_merge_cells = WrapExcel::Book.open(@dir + '/merge_cells.xls')
+          @sheet_merge_cell = @book_merge_cells[0]
+        end
+
+        after do
+          @book_merge_cells.close
+        end
+
+        it "should get from ['A1'] to ['C2']" do
+          columns_values = []
+          @sheet_merge_cell.each_column do |columns|
+            columns_values << columns.values
+          end
+          columns_values.should eq [
+                                [nil, 'first merged', nil, 'merged'],
+                                [nil, 'first merged', 'first', 'merged'],
+                                [nil, 'first merged', 'second', 'merged'],
+                                [nil, nil, 'third', 'merged']
+                           ]
+        end
+
+      end
+
     end
 
     describe "#each_column_with_index" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrap_excel
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000 Z
+date: 2012-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19519968 !ruby/object:Gem::Requirement
+  requirement: &21104316 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *19519968
+  version_requirements: *21104316
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19519620 !ruby/object:Gem::Requirement
+  requirement: &21103752 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *19519620
+  version_requirements: *21103752
 - !ruby/object:Gem::Dependency
   name: rb-fchange
-  requirement: &19535736 !ruby/object:Gem::Requirement
+  requirement: &21103380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19535736
+  version_requirements: *21103380
 - !ruby/object:Gem::Dependency
   name: rb-notifu
-  requirement: &19535400 !ruby/object:Gem::Requirement
+  requirement: &21102828 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19535400
+  version_requirements: *21102828
 - !ruby/object:Gem::Dependency
   name: win32console
-  requirement: &19535124 !ruby/object:Gem::Requirement
+  requirement: &21102420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19535124
+  version_requirements: *21102420
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &19534608 !ruby/object:Gem::Requirement
+  requirement: &21102036 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19534608
+  version_requirements: *21102036
 description: WrapExcel is to wrap the win32ole, and easy to use Excel operations with
   ruby. Detailed description please see the README.
 email:
@@ -132,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 703779037
+      hash: 767876733
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,10 +141,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 703779037
+      hash: 767876733
 requirements: []
 rubyforge_project: wrap_excel
-rubygems_version: 1.8.11
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: WrapExcel is a wrapper library that specializes in the operation of Excel