csvrecord 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f9b5900a09323251bb9cf7fef7211c5692a5ac3
-  data.tar.gz: db705e1ba91bcd30ac538947d1518521a92ce76a
+  metadata.gz: ea06a8e7e4761cb22c4e19c20680c86127cb80d2
+  data.tar.gz: c1c5183693a2e29405ef95e027354a012bbcdaa9
 SHA512:
-  metadata.gz: 34c7f0d23df73725a8f6616024cda30ab89938e94e1032727b8caee434263dc2551547c8f6599c6294f6fa9fe0d1a9255ccd957a2ef6dda277c6e7f044506bc2
-  data.tar.gz: 49a205a98277d5e7842f06a052c5306cb3ce475de9fe3fa056fef411f923a96bf2f254b70b07f70db771f09832630bd95b40b9675992bcb4c8b7a8a750ed7ba1
+  metadata.gz: a102eaf53b9861306dc8807d5c9b4c04077b9a50c03110a76963304a693dd3d722bb1442d13960bb966f423dedfa2f81e0f5749870b3343d30c1718266f0155f
+  data.tar.gz: b999b4408515fe0068eb032b8c0f0677df8166bc5523698edbcdf319aeddd22a71ea3d47e3f51adce94b1717b5ce6938390b626469b5412a0ca4577dbed003f0

data/Rakefile

@@ -19,7 +19,7 @@ Hoe.spec 'csvrecord' do
 
   self.extra_deps = [
      ['record',     '>=1.1.1'],
-     ['csvreader']
+     ['csvreader',  '>=0.3.0']
    ]
 
   self.licenses = ['Public Domain']

data/lib/csvrecord/base.rb

@@ -9,12 +9,20 @@ module CsvRecord
 class Base < Record::Base
 
 def self.foreach( path, sep: Csv.config.sep, headers: true )
-  CsvReader.foreach( path, sep: sep, headers: headers ) do |row|
-    rec = new
-    values = CsvReader.unwrap( row )
-    rec.parse( values )
 
-    yield( rec )    ## check: use block.class( rec ) - why? why not?
+  ## note: always use reader w/o headers to get row/record values as array of strings
+  ##   if headers: true -> skip first row
+  names = nil
+
+  CsvReader.foreach( path, sep: sep, headers: false ) do |row|
+    if headers && names.nil?
+      names = row   ## store header row / a.k.a. field/column names
+    else
+      rec = new
+      rec.parse( row )
+
+      yield( rec )    ## check: use block.class( rec ) - why? why not?
+    end
   end
 end
 
@@ -22,21 +30,29 @@ end
 def self.parse( txt_or_rows, sep: Csv.config.sep, headers: true )  ## note: returns an (lazy) enumarator
   if txt_or_rows.is_a? String
     txt = txt_or_rows
-    rows = CsvReader.parse( txt, sep: sep, headers: headers )
+    ## note: always use reader w/o headers to get row/record values as array of strings
+    ##   if headers: true -> skip first row
+    rows = CsvReader.parse( txt, sep: sep, headers: false )
   else
     ### todo/fix: use only self.create( array-like ) for array-like data  - why? why not?
-    rows = txt_or_rows    ## assume array-like records that responds to :each
+    rows = txt_or_rows
   end
 
-  pp rows
+  ## pp rows
+
+
+  names = nil
 
   Enumerator.new do |yielder|
     rows.each do |row|
-      rec = new
-      values = CsvReader.unwrap( row )
-      rec.parse( values )
-
-      yielder.yield( rec )
+      if headers && names.nil?
+        names = row   ## store header row / a.k.a. field/column names
+      else
+        rec = new
+        rec.parse( row )
+
+        yielder.yield( rec )
+      end
     end
   end
 end
@@ -59,6 +75,7 @@ end # class Base
 
 
 
+
 ###########################################
 ## "magic" lazy auto-build schema from headers versions
 

data/lib/csvrecord/version.rb

@@ -5,7 +5,7 @@ module CsvRecord
 
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
   MINOR = 4
-  PATCH = 1
+  PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csvrecord
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: record
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement