mymatrix 0.1.6 → 0.1.8

data/MyMatrix_ERR_0.log

@@ -0,0 +1 @@
+# Logfile created on 2013-03-19 10:48:19 +0900 by logger.rb/25413

data/README.html

@@ -0,0 +1,69 @@
+= mymatrix
+
+== DESCRIPTION:
+
+mymatrix is a handling library for MS Excel and  csv/tsv text.
+
+== FEATURES/PROBLEMS:
+
+Support filetypes: .xls, .tsv, .csv
+
+
+== SYNOPSIS:
+
+
+
+== REQUIREMENTS:
+
+Support ruby versions are:
+ruby 1.8.7, 
+ruby 1.9.2 or higher
+
+== INSTALL:
+gem install mymatrix
+(It's hosted on gemcutter.org)
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2009-2013 zucay
+
+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:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+== HOW TO USE:
+## load and wright file
+```ruby
+require 'mymatrix'
+mx = MyMatrix.new('path/to/xlsfile.xls')
+mx.each_with_index do |row, i|
+	the_column = 'sample_column_name'
+
+	# print value of the cell.
+  p mx.val(row, the_column) 
+
+	# write value of the cell	
+	mx.setValue(row, the_column, i) # write "i" value to the cell
+	
+	# text_output(default is csv)
+	mx.to_t('path/to/text.txt')
+	# csv_output
+	mx.to_csv('path/to/csv.csv')
+end
+```

data/README.md

@@ -0,0 +1,69 @@
+= mymatrix
+
+== DESCRIPTION:
+
+mymatrix is a handling library for MS Excel and  csv/tsv text.
+
+== FEATURES/PROBLEMS:
+
+Support filetypes: .xls, .tsv, .csv
+
+
+== SYNOPSIS:
+
+
+
+== REQUIREMENTS:
+
+Support ruby versions are:
+ruby 1.8.7, 
+ruby 1.9.2 or higher
+
+== INSTALL:
+gem install mymatrix
+(It's hosted on gemcutter.org)
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2009-2013 zucay
+
+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:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+== HOW TO USE:
+## load and wright file
+```ruby
+require 'mymatrix'
+mx = MyMatrix.new('path/to/xlsfile.xls')
+mx.each_with_index do |row, i|
+	the_column = 'sample_column_name'
+
+	# print value of the cell.
+  p mx.val(row, the_column) 
+
+	# write value of the cell	
+	mx.setValue(row, the_column, i) # write "i" value to the cell
+	
+	# text_output(default is csv)
+	mx.to_t('path/to/text.txt')
+	# csv_output
+	mx.to_csv('path/to/csv.csv')
+end
+```

data/lib/mymatrix.rb

@@ -177,14 +177,10 @@ class MyMatrix
 			out.addColumn(colName, col)
 		end
 		return out
-	end
-	def val(row, str)
-		getValue(row, str)
-	end
-	
-	def getValue(row, str)
+	end	
+	def getValue(row, str, offset = 0)
 		out = nil
-		index = @headerH[str]
+		index = @headerH[str] + offset
 		if(index)
 			out = row[index]
 			#お尻のセルでNULLの場合などは、nilが返却されてしまう。なので、''となるようにする。
@@ -214,25 +210,23 @@ class MyMatrix
 
 =end
 
-	def setValue(row, str, value)
+	def setValue(row, str, value, offset = 0)
 		if(!row)
 			raise 'row is nil'
 		end
-		index = @headerH[str]
-		if(!index)
-			addHeaders([str])
-		end
+		@headerH[str] ||= addHeaders([str])
+		index = @headerH[str] + offset
 		#参照先の値も変更できるように、破壊メソッドを使う。row[@headerH[str]] = valueでは、参照先が切り替わってしまうので、値の置き換えにならない。
 		#findなどで取得したrowに対して処理を行う際に必要な変更。
-		if(row[@headerH[str]].class == String)
-			row[@headerH[str]].sub!(/^.*$/, value)
+		if(row[index].class == String)
+			row[index].sub!(/^.*$/, value)
 		else
 			#raise('not string error.')
 			#todo 強烈なバグな気もするが、例外を回避し値を代入2010年12月15日
 			begin
-				row[@headerH[str]] = value.to_s
+				row[index] = value.to_s
 			rescue
-				row[@headerH[str]] = ''
+				row[index] = ''
 			end
 		end
 	end
@@ -404,13 +398,23 @@ class MyMatrix
 				fo.print("")
 			else 
 				str = yield(row)
-				fo.print(str)
+        if(str)
+          fo.print(str)
+        else
+          next
+        end
 			end
 			fo.print("\r\n")
 		end
 		fo.close
 	end
   # テキスト出力する。outFileにxlsが指定された場合は、xls出力する。
+  # デフォルトではタブ区切りテキスト。outFileの拡張子を.csvにした場合はカンマ区切りテキスト。
+  # optsに設定できる値：
+  # :enc => 文字コード。'u':UTF-8, 's':Shift_JISのみ設定可能。デフォルトはShift_JIS(CP932)
+  # :separator => テキスト出力するときのセパレータ。
+  # :escape => エスケープするか
+  # :remove_empty_row => 空行を削除するか。デフォルトfalse(空行を出力する)
 	def to_t(outFile=nil, opts={})
 		if(!outFile)
 			outFile = @file
@@ -447,9 +451,10 @@ class MyMatrix
    				orow << cell.to_s.gsub(/[#{opts[:separator]}\r\n]/, '')
         end
 			end
-			
+
+      str = orow.join(opts[:separator])
 			begin
-				str = localEncode(orow.join(opts[:separator]), opts[:enc])
+				out_str = localEncode(str, opts[:enc])
 			rescue Encoding::UndefinedConversionError
         orow.each do |ele|
           begin
@@ -461,7 +466,14 @@ class MyMatrix
 
 				@log.debug(row.join(opts[:separator]))
 			end
-			str
+      if(opts[:remove_empty_row])
+        empty_str = localEncode(Array.new(row.size, '').join(opts[:separator]),opts[:enc])
+
+        if(empty_str == out_str)
+          out_str = nil
+        end
+      end
+			out_str
 		end
 	end
 	def myescape(cell)
@@ -954,7 +966,7 @@ class MyMatrix
 		self.each do |row|
 			self.getHeaders.each do |head|
 				val = self.val(row, head)
-				if(val =~ /(.*)[　 ]$/)
+				if(val =~ /(.*)[　 ]+$/)
 					self.setValue(row, head, $1)
 				end
 			end

data/lib/mymatrix/version.rb

@@ -1,3 +1,3 @@
 class MyMatrix
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

data/spec/MyMatrix_ERR_0.log

@@ -0,0 +1 @@
+# Logfile created on 2012-08-30 15:40:04 +0900 by logger.rb/25413

data/spec/mymatrix_spec.rb

@@ -9,7 +9,8 @@ describe MyMatrix do
       Encoding.default_external = 'Windows-31J'
     end
   end
-  
+  after :all do
+  end
   it '４行と4行のデータをconcatFileで結合すると8行になること' do
     @mx = MyMatrix.new('spec/line4.xls')
     @mx.concatFile('spec/line4.xls')
@@ -151,6 +152,7 @@ describe MyMatrix do
     mx = MyMatrix.new('spec/out.xls')
     mx.val(mx[0], 'P-a').should == 'iti'
     mx.val(mx[0], 'P-b').should == 'foo'
+    File.delete('spec/out.xls')
   end
   it '同じシーケンスIDに同一の値をsetできること' do
     mx = MyMatrix.new()
@@ -292,13 +294,23 @@ describe MyMatrix do
     mx.addHeaders(['str'])
     mx << ['盌']
     Proc {
-      mx.to_t('test.txt')
+      mx.to_t('spec/test.txt')
     }.should raise_error
   end
   it 'ヘッダが半角でも対応できること' do
     mx = makeHankakuSample
     mx.val(mx[0], '削除ﾌﾗｸﾞ').should == '4'
   end
+
+  it 'to_tのオプション:remove_empty_row をtrueにすると、空行を出力しないこと' do
+    output_mx = makeEmptySample
+    output_mx.to_t('spec/test.txt', {:remove_empty_row => true })
+    fi = File.open('spec/test.txt')
+    fi.count.should == 2
+    fi.close
+    File.delete('spec/test.txt')
+  end
+
 end
 def translationCheck(testcases)
   mx = MyMatrix.new
@@ -315,6 +327,7 @@ def translationCheck(testcases)
   testcases.each_with_index do |mycase, i|
     mx[i][0].should == mycase[1]
   end
+  File.delete('spec/test.txt')
 end
 
 def makeSample
@@ -342,6 +355,7 @@ def makeEmptySample
   out << ['4', '5', '8']
   out << ['', '', '']
   out << ['', '', '']
+  out << ['', '', '']
   return out
 end
 def makeHankakuSample

data/spec//343/202/277/343/202/231/343/202/257/343/203/206/343/203/263/357/274/210/343/201/237/343/202/231/343/201/217/343/201/246/343/202/223/357/274/211/343/201/244/343/201/215/343/203/225/343/202/241/343/202/244/343/203/253.txt

@@ -0,0 +1,5 @@
+a	b	c
+4	6	8
+1	3	5
+3	5	7
+2	4	6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymatrix
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,92 +66,43 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- !binary |-
-  R2VtZmlsZQ==
-- !binary |-
-  UkVBRE1FLnJkb2M=
-- !binary |-
-  UmFrZWZpbGU=
-- !binary |-
-  bGliL2ZpbGVfaW8ucmI=
-- !binary |-
-  bGliL2xvYWRlcl9jc3YucmI=
-- !binary |-
-  bGliL2xvYWRlcl9mYWN0b3J5LnJi
-- !binary |-
-  bGliL2xvYWRlcl90eHQucmI=
-- !binary |-
-  bGliL2xvYWRlcl94bHMucmI=
-- !binary |-
-  bGliL215bWF0cml4LnJi
-- !binary |-
-  bGliL215bWF0cml4L3ZlcnNpb24ucmI=
-- !binary |-
-  bXltYXRyaXguZ2Vtc3BlYw==
-- !binary |-
-  cGtnL215bWF0cml4LTAuMC4xLmdlbQ==
-- !binary |-
-  cGtnL215bWF0cml4LTAuMC4yLmdlbQ==
-- !binary |-
-  cGtnL215bWF0cml4LTAuMC4zLmdlbQ==
-- !binary |-
-  cGtnL215bWF0cml4LTAuMC40LmdlbQ==
-- !binary |-
-  cGtnL215bWF0cml4LTAuMC41LmdlbQ==
-- !binary |-
-  cGtnL215bWF0cml4LTAuMC44LmdlbQ==
-- !binary |-
-  cGtnL215bWF0cml4LTAuMC45LmdlbQ==
-- !binary |-
-  cGtnL215bWF0cml4LTAuMS4wLmdlbQ==
-- !binary |-
-  cGtnL215bWF0cml4LTAuMS42LmdlbQ==
-- !binary |-
-  c3BlYy9jc3YuY3N2
-- !binary |-
-  c3BlYy9jc3YuY3N2LnR4dA==
-- !binary |-
-  c3BlYy9jc3ZfdGVzdC5jc3Y=
-- !binary |-
-  c3BlYy9mb3JfY29uY2F0L2NvbjEueGxz
-- !binary |-
-  c3BlYy9mb3JfY29uY2F0L2NvbjIueGxz
-- !binary |-
-  c3BlYy9mb3JfY29uY2F0L2NvbjMueGxz
-- !binary |-
-  c3BlYy9mb3JfY29uY2F0L2NvbjQueGxz
-- !binary |-
-  c3BlYy9pbmZvX2xpc3QudHh0
-- !binary |-
-  c3BlYy9qcHRlc3QudHh0
-- !binary |-
-  c3BlYy9saW5lNC50eHQ=
-- !binary |-
-  c3BlYy9saW5lNC54bHM=
-- !binary |-
-  c3BlYy9teW1hdHJpeF9zcGVjLnJi
-- !binary |-
-  c3BlYy9vZmZzZXQudHh0
-- !binary |-
-  c3BlYy9vdXQueGxz
-- !binary |-
-  c3BlYy9zdGRfc2hvc2hpa2kueGxz
-- !binary |-
-  c3BlYy90ZW1wbGF0ZS54bHM=
-- !binary |-
-  c3BlYy90ZXN0LmNzdg==
-- !binary |-
-  c3BlYy90ZXN0LnR4dA==
-- !binary |-
-  c3BlYy90ZXN0X2hlbHBlci5yYg==
-- !binary |-
-  c3BlYy90ZXN0X215bWF0cml4LnJi
-- !binary |-
-  c3BlYy93b3Jkcy8wMDFfc2hlZXQuZG9j
-- !binary |-
-  c3BlYy93b3Jkcy8wMDJfc2hlZXQuZG9j
-- !binary |-
-  c3BlYy93b3Jkcy8wMDNfc2hlZXQuZG9j
+- lib/file_io.rb
+- lib/loader_csv.rb
+- lib/loader_factory.rb
+- lib/loader_txt.rb
+- lib/loader_xls.rb
+- lib/mymatrix/version.rb
+- lib/mymatrix.rb
+- Gemfile
+- MyMatrix_ERR_0.log
+- Rakefile
+- README.html
+- README.md
+- README.rdoc
+- spec/csv.csv
+- spec/csv.csv.txt
+- spec/csv_test.csv
+- spec/for_concat/con1.xls
+- spec/for_concat/con2.xls
+- spec/for_concat/con3.xls
+- spec/for_concat/con4.xls
+- spec/info_list.txt
+- spec/jptest.txt
+- spec/line4.txt
+- spec/line4.xls
+- spec/MyMatrix_ERR_0.log
+- spec/mymatrix_spec.rb
+- spec/offset.txt
+- spec/std_shoshiki.xls
+- spec/template.xls
+- spec/test.csv
+- spec/test.tsv
+- spec/test_helper.rb
+- spec/test_mymatrix.rb
+- spec/words/001_sheet.doc
+- spec/words/002_sheet.doc
+- spec/words/003_sheet.doc
+- spec/ダクテン（だくてん）つきファイル.txt
 homepage: ''
 licenses: []
 post_install_message: 
@@ -203,16 +154,12 @@ test_files:
   c3BlYy9teW1hdHJpeF9zcGVjLnJi
 - !binary |-
   c3BlYy9vZmZzZXQudHh0
-- !binary |-
-  c3BlYy9vdXQueGxz
 - !binary |-
   c3BlYy9zdGRfc2hvc2hpa2kueGxz
 - !binary |-
   c3BlYy90ZW1wbGF0ZS54bHM=
 - !binary |-
   c3BlYy90ZXN0LmNzdg==
-- !binary |-
-  c3BlYy90ZXN0LnR4dA==
 - !binary |-
   c3BlYy90ZXN0X2hlbHBlci5yYg==
 - !binary |-

data/mymatrix.gemspec

@@ -1,26 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "mymatrix/version"
-
-Gem::Specification.new do |s|
-  s.name        = "mymatrix"
-  s.version     = MyMatrix::VERSION
-  s.authors     = ["yukihico"]
-  s.email       = ["yukihico@gmail.com"]
-  s.homepage    = ""
-  s.summary     = %q{MS Excel and  csv/tsv text handling library}
-  s.description = %q{mymatrix is a handling library for MS Excel and  csv/tsv text.}
-
-  s.rubyforge_project = "mymatrix"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  # specify any dependencies here; for example:
-  s.add_development_dependency "rspec"
-  s.add_dependency "exeach"
-  s.add_dependency "spreadsheet"
-  # s.add_runtime_dependency "rest-client"
-end