wrap_excel 0.0.9 → 0.1.0

data/Guardfile

@@ -2,7 +2,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2 do
+guard 'rspec', cli: "--color", all_after_pass: false, all_on_start: false do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/wrap_excel/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('lib/wrap_excel.rb')     { "spec" }

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 tomi
+Copyright (c) 2011-2013 tomi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.ja.rdoc

@@ -85,6 +85,15 @@ rangeオブジェクトからのアクセス。
   book.save
   book.close
 
+別のファイル名を保存することができます。
+
+  WrapExcel::Book.open('./sample.xls', :read_only => false) do |book|
+    # do something
+    book.save './another_file.xls'
+  end
+
+another_file.xlsに保存します。
+
 新規ファイルの保存は出来ません。
 
 === Want to do more things

data/README.rdoc

@@ -85,6 +85,15 @@ or
   book.save
   book.close
 
+Can save an another file name.
+
+  WrapExcel::Book.open('./sample.xls', :read_only => false) do |book|
+    # do something
+    book.save './another_file.xls'
+  end
+
+Save to another_file.xls
+
 Can not save new file.
 
 === Want to do more things

data/lib/wrap_excel/book.rb

@@ -4,19 +4,27 @@ module WrapExcel
   class Book
     attr_reader :book
 
+    class << self
+      def open(file, options={ }, &block)
+        new(file, options, &block)
+      end
+    end
+
     def initialize(file, options={ }, &block)
+      unless caller[1] =~ /book.rb:\d+:in\s+`open'$/
+        warn "DEPRECATION WARNING: WrapExcel::Book.new and WrapExcel::Book.open will be split. If you open existing file, please use WrapExcel::Book.open.(call from #{caller[1]})"
+      end
+
       @options = {
         :read_only => true,
         :displayalerts => false,
         :visible => false
       }.merge(options)
-      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]
       WIN32OLE.const_load(@winapp, WrapExcel) unless WrapExcel.const_defined?(:CONSTANTS)
-      @book = @winapp.Workbooks.Open(file,{ 'ReadOnly' => @options[:read_only] })
+      @book = @winapp.Workbooks.Open(absolute_path(file),{ 'ReadOnly' => @options[:read_only] })
 
       if block
         begin
@@ -34,9 +42,20 @@ module WrapExcel
       @winapp.Quit
     end
 
-    def save
+    def save(file = nil)
       raise IOError, "Not opened for writing(open with :read_only option)" if @options[:read_only]
-      @book.save
+      return @book.save unless file
+
+      dirname, basename = File.split(file)
+      extname = File.extname(basename)
+      basename = File.basename(basename)
+      case extname
+      when '.xls'
+        file_format = WrapExcel::XlExcel8
+      when '.xlsx'
+        file_format = WrapExcel::XlOpenXMLWorkbook
+      end
+      @book.SaveAs(absolute_path(File.join(dirname, basename)), file_format)
     end
 
     def [] sheet
@@ -67,8 +86,11 @@ module WrapExcel
       new_sheet
     end
 
-    def self.open(file, options={ }, &block)
-      new(file, options, &block)
+    private
+    def absolute_path(file)
+      file = File.expand_path(file)
+      file = WrapExcel::Cygwin.cygpath('-w', file) if RUBY_PLATFORM =~ /cygwin/
+      WIN32OLE.new('Scripting.FileSystemObject').GetAbsolutePathName(file)
     end
   end
 end

data/lib/wrap_excel/version.rb

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

data/spec/book_spec.rb

@@ -43,6 +43,33 @@ describe WrapExcel::Book do
         end
       end
     end
+
+    describe "WIN32OLE#GetAbsolutePathName" do
+      it "'~' should be HOME directory" do
+        path = '~/Abrakadabra.xlsx'
+        expected_path = Regexp.new(File.expand_path(path).gsub(/\//, "."))
+        expect {
+          WrapExcel::Book.open(path)
+        }.to raise_error(WIN32OLERuntimeError, expected_path)
+      end
+    end
+
+    it 'should not output deprecation warning' do
+      capture(:stderr) {
+        book = WrapExcel::Book.open(@simple_file)
+        book.close
+      }.should eq ""
+    end
+
+  end
+
+  describe ".new" do
+    it 'should output deprecation warning' do
+      capture(:stderr) {
+        book = WrapExcel::Book.new(@simple_file)
+        book.close
+      }.should match /DEPRECATION WARNING: WrapExcel::Book.new and WrapExcel::Book.open will be split. If you open existing file, please use WrapExcel::Book.open.\(call from #{File.expand_path(__FILE__)}:#{__LINE__ - 2}.+\)\n/
+    end
   end
 
   describe 'access sheet' do
@@ -160,7 +187,7 @@ describe WrapExcel::Book do
     end
   end
 
-  describe ".save" do
+  describe "#save" do
     context "when open with read only" do
       before do
         @book = WrapExcel::Book.open(@simple_file)
@@ -174,6 +201,18 @@ describe WrapExcel::Book do
       }
     end
 
+    context "with argument" do
+      before do
+        WrapExcel::Book.open(@simple_file, :read_only => false) do |book|
+          book.save("#{@dir}/simple_save.xlsx")
+        end
+      end
+
+      it "should save to 'simple_save.xlsx'" do
+        File.exist?(@dir + "/simple_save.xlsx").should be_true
+      end
+    end
+
   end
 
 end

data/spec/sheet_spec.rb

@@ -16,7 +16,7 @@ describe WrapExcel::Sheet do
   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)
+        @book_protect = WrapExcel::Book.open(@dir + '/protected_sheet.xls', :visible => true)
         @protected_sheet = @book_protect['protect']
       end
 

data/spec/spec_helper.rb

@@ -4,12 +4,32 @@ require 'tmpdir'
 require "fileutils"
 require File.join(File.dirname(__FILE__), '../lib/wrap_excel')
 
-def create_tmpdir
-  tmpdir = Dir.mktmpdir
-  FileUtils.cp_r(File.join(File.dirname(__FILE__), 'data'), tmpdir)
-  tmpdir + '/data'
+module WrapExcel::SpecHelpers
+  def create_tmpdir
+    tmpdir = Dir.mktmpdir
+    FileUtils.cp_r(File.join(File.dirname(__FILE__), 'data'), tmpdir)
+    tmpdir + '/data'
+  end
+
+  def rm_tmp(tmpdir)
+    FileUtils.remove_entry_secure(File.dirname(tmpdir))
+  end
+
+  # This method is almost copy of wycats's implementation.
+  # http://pochi.hatenablog.jp/entries/2010/03/24
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+    result
+  end
 end
 
-def rm_tmp(tmpdir)
-  FileUtils.remove_entry_secure(File.dirname(tmpdir))
+RSpec.configure do |config|
+  config.include WrapExcel::SpecHelpers
 end

data/wrap_excel.gemspec

@@ -25,8 +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"
+  s.add_development_dependency "rb-fchange", '>= 0.0.5'
+  s.add_development_dependency "wdm", '>= 0.0.3'
+  s.add_development_dependency "win32console", '>= 1.3.2'
+  s.add_development_dependency "guard-rspec", '>= 2.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrap_excel
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,15 +58,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
-  name: rb-notifu
+  name: wdm
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: win32console
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
 description: WrapExcel is to wrap the win32ole, and easy to use Excel operations with
   ruby. Detailed description please see the README.
 email:
@@ -119,7 +119,6 @@ extra_rdoc_files:
 - LICENSE
 files:
 - .gitignore
-- .rspec
 - Gemfile
 - Guardfile
 - LICENSE
@@ -162,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 109616829
+      hash: 963983667
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -171,10 +170,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 109616829
+      hash: 963983667
 requirements: []
 rubyforge_project: wrap_excel
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: WrapExcel is a wrapper library that specializes in the operation of Excel

data/.rspec

@@ -1 +0,0 @@
---format documentation