pcsv 0.1.0 → 0.1.1

data/lib/pcsv.rb

@@ -22,19 +22,26 @@ class PCSV
 
   # Performs a given action on each cell of a CSV file.
   def self.process(action, path, options={})
+    options[:headers] = true
     thread_count = options.delete(:thread_count) || 10
+    if_proc = options.delete(:if)
 
     # Open CSV & build a worker queue.
     csv = CSV.read(path, options)
     queue = []
+    headers = nil
     csv.each_with_index do |row, row_index|
+      headers ||= csv.headers
+      
       row.fields.each_with_index do |field, col_index|
-        queue << {
+        item = {
+          row:row,
           row_index:row_index,
           col_index:col_index,
-          row:row,
-          value:field
+          value:field.to_s,
+          header:headers[col_index]
         }
+        queue << item
       end
     end
     
@@ -53,6 +60,7 @@ class PCSV
         
           # Invoke the block with the row info.
           begin
+            next if if_proc.nil? || !if_proc.call(item)
             result = yield item, mutex
           
             if action == :map
@@ -68,7 +76,11 @@ class PCSV
       end
     end
 
-    threads.each { |t| t.join }
+    begin
+      threads.each { |t| t.join }
+    rescue SystemExit, Interrupt
+      threads.each { |thread| thread.kill }
+    end
     
     return csv
   end

data/lib/pcsv/version.rb

@@ -1,3 +1,3 @@
 class PCSV
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pcsv
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: