ccsv 1.0.1 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 34b2006a8c527845d151e267d0bc5e090c4e0d64
+  data.tar.gz: 8ad5846879c62e79df4b37048077d76eb8103f87
+SHA512:
+  metadata.gz: 2461629af33ea91ff00625ed09e41088a77bab31b16634feb9d39b16bf54b155145a764c3b144b62d757145e6b8b1e494ada3bd2abb288ac2014ae472b79c1fd
+  data.tar.gz: 40efd6635ef75d093f0138a874a044f1769a0f4d395ce79664988b484eb0ad6d06d3fb1c3f905d6c10954f4b7c191a958e64e9cea53471d02c30945d9202a008

data/CHANGELOG

@@ -1,3 +1,9 @@
+v1.0.4 Range methods min/max replaced by first/last for stable work (zhum)
+
+v1.0.3 Benchmarks now in spec-style (zhum).
+
+v1.0.2 Benchmarks added (zhum).
+
 v1.0.1 Tests moved to minitest (zhum).
 
 v1.0.0 Allow custom delimiter and integer range filtration (zhum).

data/Gemfile

@@ -1,7 +1,9 @@
-group :test do
-	gem 'minitest'
-end
+source 'https://rubygems.org'
+#group :test do
+#	gem 'minitest'
+#end
 
 group :development do
 	gem 'echoe'
-end
+	gem 'minitest'
+end

data/Gemfile.lock

@@ -1,16 +1,17 @@
 GEM
+  remote: https://rubygems.org/
   specs:
     allison (2.0.3)
-    echoe (4.6.5)
+    echoe (4.6.6)
       allison (>= 2.0.3)
       rake (>= 0.9.2)
       rdoc (>= 2.5.11)
       rubyforge (>= 2.0.4)
     json (1.8.1)
     json_pure (1.8.1)
-    minitest (5.2.1)
-    rake (10.1.0)
-    rdoc (4.0.1)
+    minitest (5.3.4)
+    rake (10.3.2)
+    rdoc (4.1.1)
       json (~> 1.4)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)

data/Manifest

@@ -5,8 +5,10 @@ LICENSE
 Manifest
 README.rdoc
 Rakefile
+ccsv.gemspec
 compile
 ext/ccsv.c
 ext/ccsv.h
 ext/extconf.rb
+spec/bench_spec.rb
 spec/ccsv_spec.rb

data/ccsv.gemspec

@@ -2,29 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = "ccsv"
-  s.version = "1.0.1"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver, Sergey Zhumatiy"]
-  s.date = "2014-01-10"
+  s.date = "2014-05-26"
   s.description = "Ruby CSV parser gem, written in pure C."
   s.email = "serg@parallel.ru"
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc", "ext/ccsv.c", "ext/ccsv.h", "ext/extconf.rb"]
-  s.files = ["CHANGELOG", "Gemfile", "Gemfile.lock", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "compile", "ext/ccsv.c", "ext/ccsv.h", "ext/extconf.rb", "spec/ccsv_spec.rb", "ccsv.gemspec"]
+  s.files = ["CHANGELOG", "Gemfile", "Gemfile.lock", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "ccsv.gemspec", "compile", "ext/ccsv.c", "ext/ccsv.h", "ext/extconf.rb", "spec/bench_spec.rb", "spec/ccsv_spec.rb"]
   s.homepage = "http://github.com/evan/ccsv/"
   s.rdoc_options = ["--line-numbers", "--title", "Ccsv", "--main", "README.rdoc"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = "evan"
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.0.14"
   s.summary = "A pure-C CSV parser."
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
 end

data/ext/ccsv.c

@@ -56,12 +56,12 @@ static VALUE foreach(int argc, VALUE* argv, VALUE self) {
     searchfield=-1;
   }
 
-  min_val=rb_funcall(rest_args,rb_intern("length"), 0);
-  array_length=NUM2INT(min_val);
+  array_length_method=rb_funcall(rest_args,rb_intern("length"), 0);
+  array_length=NUM2INT(array_length_method);
   /*rb_warn("Length=%d",array_length);*/
 
-  min_method = rb_intern("min");
-  max_method = rb_intern("max");
+  min_method = rb_intern("first");
+  max_method = rb_intern("last");
   /*------------test_id    = rb_intern("class");*/
   range_i=0;
   for(idx=2;idx<array_length;++idx){
@@ -82,7 +82,7 @@ static VALUE foreach(int argc, VALUE* argv, VALUE self) {
 
       min_val=rb_funcall(e, min_method, 0);
       max_val=rb_funcall(e, max_method, 0);
-  /*    rb_warn("!\n");*/
+      /*rb_warn("!\n");*/
       pairs[range_i].low=NUM2LONG(min_val);
       /*rb_warn("2\n");*/
       pairs[range_i].high=NUM2LONG(max_val);
@@ -102,7 +102,7 @@ static VALUE foreach(int argc, VALUE* argv, VALUE self) {
     start=line;
     nobackslash=line;
     while(token=index(nobackslash, DELIM)){
-/*      rb_warning("5\n");*/
+      /*rb_warning("5\n");*/
       count=0;
       t2=token-1;
       while((t2>=line) && (*t2=='\\'))

data/spec/bench_spec.rb

@@ -0,0 +1,43 @@
+require 'bundler'
+Bundler.require(:default, :test)
+
+require 'minitest/autorun'
+require 'minitest/benchmark'
+require 'ccsv'
+require 'csv'
+
+TEST_CSV_FILES={
+	100=>"/tmp/test1.csv",
+	10000=>"/tmp/test2.csv",
+	100000=>"/tmp/test3.csv"
+}
+
+def create_csvf(name,limit)
+	open(name,"w") do |f|
+        	1.upto(limit) do |n|
+			f.puts [n,2*n,3+n].join(',')
+		end
+	end
+end
+
+describe "Ccsv Benchmark" do
+  bench_range { [100,10_000,100_000] } 
+  before do
+	  [100,10_000,100_000].each do |n|
+		  create_csvf(TEST_CSV_FILES[n],n)
+	  end
+  end
+
+  after do
+	  [100,10_000,100_000].each do |n|
+		  FileUtils.rm TEST_CSV_FILES[n]
+	  end
+  end
+
+  bench_performance_linear "Ccsv", 0.8 do |n|
+	Ccsv.foreach(TEST_CSV_FILES[n]) do |x| end
+  end
+  bench_performance_linear "CSV", 0.8 do |n|
+	CSV.foreach(TEST_CSV_FILES[n]) do |x| end
+  end
+end

data/spec/ccsv_spec.rb

@@ -1,26 +1,16 @@
 require 'bundler'
 Bundler.require(:default, :test)
 
-gem 'minitest'
-#require 'minitest/benchmark'
+require 'minitest/spec'
 require 'minitest/autorun'
-#require 'minitest/spec'
 require 'ccsv'
-#require 'csv'
 
 TEST_CSV="/tmp/test.csv"
+DEF_SIZE=20000
 
-module CSVScan
-  def self.foreach(file, &block)
-    open(file) do |f|
-      scan(f, &block)
-    end
-  end
-end
-
-def create_csv(delimiter=',')
+def create_csv(delimiter=',',limit=DEF_SIZE)
 	open(TEST_CSV,"w") do |f|
-        	1.upto(100000) do |n|
+        	1.upto(limit) do |n|
 			f.puts [n,2*n,3+n].join(delimiter)
 		end
 	end
@@ -32,13 +22,17 @@ describe Ccsv do
 		@csv=[]
 	end
 
+	after do
+		begin; FileUtils.rm TEST_CSV; rescue; end
+	end
+
 	it 'reads csv with default delimiter' do
 		create_csv
 		Ccsv.foreach(TEST_CSV) do |v|
 			@csv << v
 		end
 		@csv[15000].must_equal(['15001','30002','15004'])
-		@csv.size.must_equal(100000)
+		@csv.size.must_equal(DEF_SIZE)
 	end
 
 	it 'reads csv with tab delimiter' do
@@ -63,72 +57,13 @@ describe Ccsv do
 		}.must_raise(RuntimeError)
 	end
 
-#	bench_performance_linear 'just read', 0.9 do |n|
-#		create_csv(',',n)
-#		Ccsv.foreach(TEST_CSV)
-#	end
-end
-
-#describe 'my benchmarks' do
-#end
-
-__END__
-require 'test/unit'
-require 'ccsv'
-require 'benchmark'
-
-# Yeah, I know.
-begin
-  require 'csv'
-  require 'rubygems'
-  require 'lightcsv'
-  require 'csvscan'
-
-  module CSVScan
-    def self.foreach(file, &block)
-      open(file) do |f|
-        scan(f, &block)
-      end
-    end
-  end
-
-rescue LoadError
-end
-
-class TestCcsv < Test::Unit::TestCase
-
-  def setup
-    @dir = "#{File.dirname(__FILE__)}/../"
-  end
-
-  def test_should_raise
-    assert_raises(RuntimeError) do
-      Ccsv.foreach('fdssfd') do
-      end
-    end
-  end
-
-  def test_accuracy
-    ccsv = []
-    file = @dir + "data_small.csv"
-    Ccsv.foreach(file) do |values|
-      ccsv << values.dup
-    end
-    csv = []
-    CSV.foreach(file) do |values|
-      csv << values
-    end
-    assert_equal csv, ccsv
-  end
-
-  def test_speed
-    Benchmark.bm(5) do |x|
-      [Ccsv, CSV].each do |klass| # CSVScan, LightCsv,
-        x.report(klass.name) do
-          klass.foreach(@dir + "data.csv") do |values| end
-        end
-      end
-    end
-  end
+	it 'filters csv' do
+		create_csv
+		Ccsv.foreach(TEST_CSV,',',0,[3000..4000]) do |v|
+			@csv << v
+		end
+		@csv[0].must_equal(['3001','6002','3004'])
+		@csv.size.must_equal(999)
+	end
 
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ccsv
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
 - Evan Weaver, Sergey Zhumatiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies: []
 description: Ruby CSV parser gem, written in pure C.
 email: serg@parallel.ru
@@ -31,14 +30,16 @@ files:
 - Manifest
 - README.rdoc
 - Rakefile
+- ccsv.gemspec
 - compile
 - ext/ccsv.c
 - ext/ccsv.h
 - ext/extconf.rb
+- spec/bench_spec.rb
 - spec/ccsv_spec.rb
-- ccsv.gemspec
 homepage: http://github.com/evan/ccsv/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -50,21 +51,19 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
 rubyforge_project: evan
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A pure-C CSV parser.
 test_files: []