wrap_excel 0.0.5 → 0.0.6

data/Guardfile

@@ -0,0 +1,10 @@
+# -*- mode: ruby -*-
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/wrap_excel/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('lib/wrap_excel.rb')     { "spec" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/README.ja.rdoc

@@ -28,13 +28,13 @@ WrapExcelはwin32oleをラップし、rubyによるExcelオペレーションを
 
 オプションは以下の通りです。
 
-* read_only:: boolean default true
-* displayalerts:: boolean default false
-* visible:: boolean false
+[read_only] boolean(default true)
+[displayalerts] boolean(default false)
+[visible] boolean(default false)
 
 === sheetへのアクセス
 
-sheetオブジェクトへは #[] メソッドでアクセス出来ます。
+sheetオブジェクトへは Book#[] メソッドでアクセス出来ます。
 
   sheet = book[0]
 
@@ -44,7 +44,7 @@ sheetオブジェクトへは #[] メソッドでアクセス出来ます。
 
 === 行または列へのアクセス
 
-sheetオブジェクトはenumerableをインクルードしています。#each_column or #each_row or #each メソッドが使用できます。
+sheetオブジェクトはenumerableをインクルードしています。Sheet#each_column or Sheet#each_row or Sheet#each メソッドが使用できます。
 
   sheet.each do |cell|
     # do something with cell
@@ -93,7 +93,7 @@ rangeオブジェクトからのアクセス。
 
 == サポート
 
-問題を報告したり、機能追加の要望する場合はgithubのIssuesに登録してください。 [https://github.com/tomiacannondale/wrap_excel/issues]
+問題を報告したり、機能追加の要望する場合はgithubのIssuesに登録してください。 https://github.com/tomiacannondale/wrap_excel/issues
 
 == 共同作業
 
@@ -101,8 +101,8 @@ githubのpull requestをしてください。
 
 == 開発者
 
-tomi [tomiacannondale@gmail.com]
+tomi mailto:tomiacannondale@gmail.com
 
 == ライセンス
 
-MITライセンスです。詳細はLICENSEを参照してください。
+MITライセンスです。詳細は LICENSE を参照してください。

data/README.rdoc

@@ -28,13 +28,13 @@ Read without block.
 
 Options are the following.
 
-* read_only:: boolean default true
-* displayalerts:: boolean default false
-* visible:: boolean false
+[read_only] boolean(default true)
+[displayalerts] boolean(default false)
+[visible] boolean(default false)
 
 === access sheet
 
-Sheet object can access with #[] method.
+Sheet object can access with Book#[] method.
 
   sheet = book[0]
 
@@ -44,7 +44,7 @@ Access with sheet name.
 
 === access row or column
 
-Sheet object is included enumerable. Use #each_column or #each_row or #each method.
+Sheet object is included enumerable. Use Sheet#each_column or Sheet#each_row or Sheet#each method.
 
   sheet.each do |cell|
     # do something with cell
@@ -93,7 +93,7 @@ All WrapExcel object include win32ole instance. If you want to do something that
 
 == Support
 
-Report issues and feature requests to github Issues. [https://github.com/tomiacannondale/wrap_excel/issues]
+Report issues and feature requests to github Issues. https://github.com/tomiacannondale/wrap_excel/issues
 
 == Collaborate
 
@@ -101,7 +101,7 @@ Please pull request on github.
 
 == Author
 
-tomi [tomiacannondale@gmail.com]
+tomi mailto:tomiacannondale@gmail.com
 
 == License
 

data/lib/wrap_excel/book.rb

@@ -15,6 +15,7 @@ module WrapExcel
       @winapp = WIN32OLE.new('Excel.Application')
       @winapp.DisplayAlerts = options[:displayalerts]
       @winapp.Visible = options[:visible]
+      WIN32OLE.const_load(@winapp, WrapExcel) unless WrapExcel.const_defined?(:CONSTANTS)
       @book = @winapp.Workbooks.Open(file,{ 'ReadOnly' => options[:read_only] })
 
       if block

data/lib/wrap_excel/sheet.rb

@@ -6,6 +6,15 @@ module WrapExcel
 
     def initialize(win32_worksheet)
       @sheet = win32_worksheet
+      if @sheet.ProtectContents
+        @sheet.Unprotect
+        @end_row = @sheet.UsedRange.SpecialCells(WrapExcel::XlLastCell).Row
+        @end_column = @sheet.UsedRange.SpecialCells(WrapExcel::XlLastCell).Column
+        @sheet.Protect
+      else
+        @end_row = @sheet.UsedRange.SpecialCells(WrapExcel::XlLastCell).Row
+        @end_column = @sheet.UsedRange.SpecialCells(WrapExcel::XlLastCell).Column
+      end
     end
 
     def name
@@ -27,18 +36,18 @@ module WrapExcel
     end
 
     def each
-      @sheet.UsedRange.Rows.each do |row_range|
-        row_range.Cells.each do |cell|
-          yield WrapExcel::Cell.new(cell)
+      each_row do |row_range|
+        row_range.each do |cell|
+          yield cell
         end
       end
     end
 
     def each_row(offset = 0)
       offset += 1
-      @sheet.UsedRange.Rows.each do |row_range|
-        next if row_range.row < offset
-        yield WrapExcel::Range.new(row_range)
+      1.upto(@end_row) do |row|
+        next if row < offset
+        yield WrapExcel::Range.new(@sheet.Range(@sheet.Cells(row, 1), @sheet.Cells(row, @end_column)))
       end
     end
 
@@ -50,9 +59,9 @@ module WrapExcel
 
     def each_column(offset = 0)
       offset += 1
-      @sheet.UsedRange.Columns.each do |column_range|
-        next if column_range.column < offset
-        yield WrapExcel::Range.new(column_range)
+      1.upto(@end_column) do |column|
+        next if column < offset
+        yield WrapExcel::Range.new(@sheet.Range(@sheet.Cells(1, column), @sheet.Cells(@end_row, column)))
       end
     end
 
@@ -61,5 +70,9 @@ module WrapExcel
         yield WrapExcel::Range.new(column_range), (column_range.column - 1 - offset)
       end
     end
+
+    def method_missing(id, *args)
+      @sheet.send(id, *args)
+    end
   end
 end

data/lib/wrap_excel/version.rb

@@ -1,3 +1,3 @@
 module WrapExcel
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/cell_spec.rb

@@ -33,6 +33,13 @@ describe WrapExcel::Cell do
         @cell.value.should eq 'fooooo'
       end
     end
+
+    describe "#method_missing" do
+      context "unknown method" do
+        it { expect { @cell.hogehogefoo }.to raise_error }
+      end
+    end
+
   end
 
   context "open merge_cells.xls" do

data/spec/range_spec.rb

@@ -66,4 +66,14 @@ describe WrapExcel::Range do
       end
     end
   end
+
+  describe "#method_missing" do
+    it "can access COM method" do
+      @range.Range(@range.Cells.Item(1), @range.Cells.Item(3)).value.should eq [@range.values(0..2)]
+    end
+
+    context "unknown method" do
+      it { expect { @range.hogehogefoo}.to raise_error }
+    end
+  end
 end

data/spec/sheet_spec.rb

@@ -13,6 +13,37 @@ describe WrapExcel::Sheet do
     rm_tmp(@dir)
   end
 
+  describe ".initialize" do
+    context "when open sheet protected(with password is 'protect')" do
+      before do
+        @book_protect = WrapExcel::Book.new(@dir + '/protected_sheet.xls', :visible => true)
+        @protected_sheet = @book_protect['protect']
+      end
+
+      after do
+        @book_protect.close
+      end
+
+      it { @protected_sheet.ProtectContents.should be_true }
+
+      it "protected sheet can't be write" do
+        expect { @protected_sheet[0,0] = 'write' }.to raise_error
+      end
+    end
+
+  end
+
+  shared_context "sheet 'open book with blank'" do
+    before do
+      @book_with_blank = WrapExcel::Book.open(@dir + '/book_with_blank.xls')
+      @sheet_with_blank = @book_with_blank[0]
+    end
+
+    after do
+      @book_with_blank.close
+    end
+  end
+
   describe "access sheet name" do
     describe "#name" do
       it 'get sheet1 name' do
@@ -68,6 +99,28 @@ describe WrapExcel::Sheet do
           end
         end
       end
+
+      context "read sheet with blank" do
+        include_context "sheet 'open book with blank'"
+
+        it 'should get from ["A1"]' do
+          @sheet_with_blank.each_with_index do |cell, i|
+            case i
+            when 5
+              cell.value.should be_nil
+            when 6
+              cell.value.should eq 'simple'
+            when 7
+              cell.value.should be_nil
+            when 8
+              cell.value.should eq 'workbook'
+            when 9
+              cell.value.should eq 'sheet1'
+            end
+          end
+        end
+      end
+
     end
 
     describe "#each_row" do
@@ -89,6 +142,28 @@ describe WrapExcel::Sheet do
           end
         end
       end
+
+      context "read sheet with blank" do
+        include_context "sheet 'open book with blank'"
+
+        it 'should get from ["A1"]' do
+          @sheet_with_blank.each_row do |rows|
+            case rows.row - 1
+            when 0
+              rows.values.should eq [nil, nil, nil, nil, nil]
+            when 1
+              rows.values.should eq [nil, 'simple', nil, 'workbook', 'sheet1']
+            when 2
+              rows.values.should eq [nil, 'foo', nil, nil, 'foobaaa']
+            when 3
+              rows.values.should eq [nil, nil, nil, nil, nil]
+            when 4
+              rows.values.should eq [nil, 'matz', nil, 'is', 'nice']
+            end
+          end
+        end
+      end
+
     end
 
     describe "#each_row_with_index" do
@@ -139,6 +214,27 @@ describe WrapExcel::Sheet do
           end
         end
       end
+
+      context "read sheet with blank" do
+        include_context "sheet 'open book with blank'"
+
+        it 'should get from ["A1"]' do
+          @sheet_with_blank.each_column do |columns|
+            case columns.column- 1
+            when 0
+              columns.values.should eq [nil, nil, nil, nil, nil]
+            when 1
+              columns.values.should eq [nil, 'simple', 'foo', nil, 'matz']
+            when 2
+              columns.values.should eq [nil, nil, nil, nil, nil]
+            when 3
+              columns.values.should eq [nil, 'workbook', nil, nil, 'is']
+            when 4
+              columns.values.should eq [nil, 'sheet1', 'foobaaa', nil, 'nice']
+            end
+          end
+        end
+      end
     end
 
     describe "#each_column_with_index" do
@@ -169,5 +265,15 @@ describe WrapExcel::Sheet do
       end
     end
 
+    describe "#method_missing" do
+      it "can access COM method" do
+        @sheet.Cells(1,1).Value.should eq 'simple'
+      end
+
+      context "unknown method" do
+        it { expect { @sheet.hogehogefoo }.to raise_error }
+      end
+    end
+
   end
 end

data/wrap_excel.gemspec

@@ -25,4 +25,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_development_dependency "rake", '>= 0.9.2'
   s.add_development_dependency "rspec", '>= 2.6.0'
+  s.add_development_dependency "rb-fchange"
+  s.add_development_dependency "rb-notifu"
+  s.add_development_dependency "win32console"
+  s.add_development_dependency "guard-rspec"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrap_excel
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000Z
+date: 2011-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70322277204940 !ruby/object:Gem::Requirement
+  requirement: &25478484 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70322277204940
+  version_requirements: *25478484
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70322277204440 !ruby/object:Gem::Requirement
+  requirement: &25494132 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,51 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70322277204440
+  version_requirements: *25494132
+- !ruby/object:Gem::Dependency
+  name: rb-fchange
+  requirement: &25493820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *25493820
+- !ruby/object:Gem::Dependency
+  name: rb-notifu
+  requirement: &25493496 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *25493496
+- !ruby/object:Gem::Dependency
+  name: win32console
+  requirement: &25493172 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *25493172
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &25492884 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *25492884
 description: WrapExcel is to wrap the win32ole, and easy to use Excel operations with
   ruby. Detailed description please see the README.
 email:
@@ -47,6 +91,7 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
+- Guardfile
 - LICENSE
 - README.ja.rdoc
 - README.rdoc
@@ -60,7 +105,9 @@ files:
 - spec/book_spec.rb
 - spec/cell_spec.rb
 - spec/cygwin_spec.rb
+- spec/data/book_with_blank.xls
 - spec/data/merge_cells.xls
+- spec/data/protected_sheet.xls
 - spec/data/simple.xls
 - spec/range_spec.rb
 - spec/sheet_spec.rb
@@ -90,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: wrap_excel
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: WrapExcel is a wrapper library that specializes in the operation of Excel
@@ -99,7 +146,9 @@ test_files:
 - spec/book_spec.rb
 - spec/cell_spec.rb
 - spec/cygwin_spec.rb
+- spec/data/book_with_blank.xls
 - spec/data/merge_cells.xls
+- spec/data/protected_sheet.xls
 - spec/data/simple.xls
 - spec/range_spec.rb
 - spec/sheet_spec.rb