wrap_excel 0.0.8 → 0.0.9

data/README.ja.rdoc

@@ -74,14 +74,14 @@ rangeオブジェクトからのアクセス。
 
 既存のファイルは保存可能です。
 
-  WrapExcel::Book.open('./sample.xls') do |book|
+  WrapExcel::Book.open('./sample.xls', :read_only => false) do |book|
     # do something
     book.save
   end
 
 もしくは
 
-  book = WrapExcel::Book.open('./sample.xls')
+  book = WrapExcel::Book.open('./sample.xls', :read_only => false)
   book.save
   book.close
 

data/README.rdoc

@@ -74,14 +74,14 @@ Read from range object
 
 Can save an existing file.
 
-  WrapExcel::Book.open('./sample.xls') do |book|
+  WrapExcel::Book.open('./sample.xls', :read_only => false) do |book|
     # do something
     book.save
   end
 
 or
 
-  book = WrapExcel::Book.open('./sample.xls')
+  book = WrapExcel::Book.open('./sample.xls', :read_only => false)
   book.save
   book.close
 

data/lib/wrap_excel/book.rb

@@ -5,7 +5,7 @@ module WrapExcel
     attr_reader :book
 
     def initialize(file, options={ }, &block)
-      options = {
+      @options = {
         :read_only => true,
         :displayalerts => false,
         :visible => false
@@ -13,10 +13,10 @@ module WrapExcel
       file = WrapExcel::Cygwin.cygpath('-w', file) if RUBY_PLATFORM =~ /cygwin/
       file = WIN32OLE.new('Scripting.FileSystemObject').GetAbsolutePathName(file)
       @winapp = WIN32OLE.new('Excel.Application')
-      @winapp.DisplayAlerts = options[:displayalerts]
-      @winapp.Visible = options[:visible]
+      @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] })
+      @book = @winapp.Workbooks.Open(file,{ 'ReadOnly' => @options[:read_only] })
 
       if block
         begin
@@ -35,6 +35,7 @@ module WrapExcel
     end
 
     def save
+      raise IOError, "Not opened for writing(open with :read_only option)" if @options[:read_only]
       @book.save
     end
 
@@ -49,6 +50,23 @@ module WrapExcel
       end
     end
 
+    def add_sheet(sheet = nil, options = { })
+      if sheet.is_a? Hash
+        options = sheet
+        sheet = nil
+      end
+
+      new_sheet_name = options.delete(:as)
+
+      after_or_before, base_sheet = options.first || [:after, WrapExcel::Sheet.new(@book.Worksheets.Item(@book.Worksheets.Count))]
+      base_sheet = base_sheet.sheet
+      sheet ? sheet.Copy({ after_or_before => base_sheet }) : @book.WorkSheets.Add({ after_or_before => base_sheet })
+
+      new_sheet = WrapExcel::Sheet.new(@winapp.Activesheet)
+      new_sheet.name = new_sheet_name if new_sheet_name
+      new_sheet
+    end
+
     def self.open(file, options={ }, &block)
       new(file, options, &block)
     end

data/lib/wrap_excel/version.rb

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

data/spec/book_spec.rb

@@ -76,4 +76,104 @@ describe WrapExcel::Book do
       }
     end
   end
+
+  describe "#add_sheet" do
+    before do
+      @book = WrapExcel::Book.open(@simple_file)
+      @sheet = @book[0]
+    end
+
+    after do
+      @book.close
+    end
+
+    context "only first argument" do
+      it "should add worksheet" do
+        expect { @book.add_sheet @sheet }.to change{ @book.book.Worksheets.Count }.from(3).to(4)
+      end
+
+      it "should return copyed sheet" do
+        sheet = @book.add_sheet @sheet
+        copyed_sheet = @book.book.Worksheets.Item(@book.book.Worksheets.Count)
+        sheet.name.should eq copyed_sheet.name
+      end
+    end
+
+    context "with first argument" do
+      context "with second argument is {:as => 'copyed_name'}" do
+        it "copyed sheet name should be 'copyed_name'" do
+          @book.add_sheet(@sheet, :as => 'copyed_name').name.should eq 'copyed_name'
+        end
+      end
+
+      context "with second argument is {:before => @sheet}" do
+        it "should add the first sheet" do
+          @book.add_sheet(@sheet, :before => @sheet).name.should eq @book[0].name
+        end
+      end
+
+      context "with second argument is {:after => @sheet}" do
+        it "should add the first sheet" do
+          @book.add_sheet(@sheet, :after => @sheet).name.should eq @book[1].name
+        end
+      end
+
+      context "with second argument is {:before => @book[2], :after => @sheet}" do
+        it "should arguments in the first is given priority" do
+          @book.add_sheet(@sheet, :before => @book[2], :after => @sheet).name.should eq @book[2].name
+        end
+      end
+
+    end
+
+    context "without first argument" do
+      context "second argument is {:as => 'new sheet'}" do
+        it "should return new sheet" do
+          @book.add_sheet(:as => 'new sheet').name.should eq 'new sheet'
+        end
+      end
+
+      context "second argument is {:before => @sheet}" do
+        it "should add the first sheet" do
+          @book.add_sheet(:before => @sheet).name.should eq @book[0].name
+        end
+      end
+
+      context "second argument is {:after => @sheet}" do
+        it "should add the second sheet" do
+          @book.add_sheet(:after => @sheet).name.should eq @book[1].name
+        end
+      end
+
+    end
+
+    context "without argument" do
+      it "should add empty sheet" do
+        expect { @book.add_sheet }.to change{ @book.book.Worksheets.Count }.from(3).to(4)
+      end
+
+      it "shoule return copyed sheet" do
+        sheet = @book.add_sheet
+        copyed_sheet = @book.book.Worksheets.Item(@book.book.Worksheets.Count)
+        sheet.name.should eq copyed_sheet.name
+      end
+    end
+  end
+
+  describe ".save" do
+    context "when open with read only" do
+      before do
+        @book = WrapExcel::Book.open(@simple_file)
+      end
+
+      it {
+        expect {
+          @book.save
+        }.to raise_error(IOError,
+                     "Not opened for writing(open with :read_only option)")
+      }
+    end
+
+  end
+
 end

metadata

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