scsv 0.1.0 → 0.2.0

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.2.0 2010-01-23
+
+* bug fix
+* add tests
+
 === 0.1.0 2010-01-23
 
 * first release
+

data/Manifest.txt

@@ -10,7 +10,5 @@ script/destroy
 script/destroy.cmd
 script/generate
 script/generate.cmd
-spec/scsv_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-tasks/rspec.rake
+test/test_scsv.rb
+test/test_helper.rb

data/lib/scsv.rb

@@ -5,7 +5,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 # for COMMA separated file
 #
 class SCSV  
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
   
   DEFAULT_OPTIONS = {
     :col_sep  => ",",
@@ -14,7 +14,7 @@ class SCSV
   }
   
   def self.parse(filename, options = {}, &block)
-    p options = DEFAULT_OPTIONS.merge(options)
+    options = DEFAULT_OPTIONS.merge(options)
     if block_given?
       parse_with_block(filename, options, &block)
     else

data/test/test_helper.rb

@@ -0,0 +1,3 @@
+require 'stringio'
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/scsv'

data/test/test_scsv.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestAbc < Test::Unit::TestCase
+
+  def setup
+  end
+  
+  def test_parse_csv_with_block
+    SCSV.parse("test/_data/csv_has_header.txt") do |row|
+      assert_instance_of Hash, row
+    end
+
+    SCSV.parse("test/_data/csv_has_no_header.txt", {:header => false}) do |row|
+      assert_instance_of Array, row
+    end
+
+    SCSV.parse("test/_data/csv_has_no_header.txt", {:header => ["h1", "h2", "h3"]}) do |row|
+      assert_instance_of Hash, row
+    end
+
+    SCSV.parse("test/_data/csv_japanese_utf8.txt") do |row|
+      assert_instance_of Hash, row
+    end
+
+    SCSV.parse("test/_data/tsv.txt", {:col_sep => "\t"}) do |row|
+      assert_instance_of Hash, row
+    end
+    STSV.parse("test/_data/tsv.txt") do |row|
+      assert_instance_of Hash, row
+    end
+  end
+  
+  def test_parse_csv_with_no_block
+    csv = SCSV.parse("test/_data/csv_has_header.txt")
+    assert_instance_of Array, csv
+
+    csv = SCSV.parse("test/_data/csv_has_no_header.txt", {:header => false})
+    assert_instance_of Array, csv
+
+    csv = SCSV.parse("test/_data/csv_has_no_header.txt", {:header => ["h1", "h2", "h3"]})
+    assert_instance_of Array, csv
+
+    csv = SCSV.parse("test/_data/csv_japanese_utf8.txt")
+    assert_instance_of Array, csv
+
+    csv = SCSV.parse("test/_data/tsv.txt", {:col_sep => "\t"})
+    assert_instance_of Array, csv
+    csv = STSV.parse("test/_data/tsv.txt")
+    assert_instance_of Array, csv
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scsv
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - kinumi
@@ -66,10 +66,8 @@ files:
 - script/destroy.cmd
 - script/generate
 - script/generate.cmd
-- spec/scsv_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- tasks/rspec.rake
+- test/test_scsv.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/kinumi/scsv
 licenses: []
@@ -99,5 +97,6 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A simple CSV(and TSV) parser to convert line into the Hash using header info.
-test_files: []
-
+test_files: 
+- test/test_helper.rb
+- test/test_scsv.rb

data/spec/scsv_spec.rb

@@ -1,11 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
-# Time to add your specs!
-# http://rspec.info/
-describe "Place your specs here" do
-  
-  it "find this spec in spec directory" do
-    # violated "Be sure to write your specs"
-  end
-  
-end

data/spec/spec.opts

@@ -1 +0,0 @@
---colour

data/spec/spec_helper.rb

@@ -1,10 +0,0 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems' unless ENV['NO_RUBYGEMS']
-  gem 'rspec'
-  require 'spec'
-end
-
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'scsv'

data/tasks/rspec.rake

@@ -1,21 +0,0 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems' unless ENV['NO_RUBYGEMS']
-  require 'spec'
-end
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
-end
-
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end