csvhuman 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e03d4dc51acff7d6b47f1648abb47cfaa2a9028
-  data.tar.gz: b4921c44a67c57feae5c1f62eff5aa87ef81c996
+  metadata.gz: 34cc6d7eb412bf02188cde5b26201cc1e5c8a46c
+  data.tar.gz: 4c04e8bc8678b19923a42f05d11114389ff78ab5
 SHA512:
-  metadata.gz: 675050a1e5af601ea6634fe17c0dcea511c917170438469c5f09349e4bd26678b5d42cc7cd5b9c97c2455b61ea67cd5719bff7c4637971849ae056955d562f2b
-  data.tar.gz: 9a7da3cdf466ebfec142344c505558b2c86fd38bee9c3b7d766c69cd0d127e5c42f4f854a6f61df7e4c57610ea4b2bec3bbdc121821a9c72b875cb470af2b50f
+  metadata.gz: 404dc263217830a3dfc68e15114bd3e45a406774638574106708fed616a1fa9245becd6cab9a54889ef8335bffc0be5ca9324bb15779510fd4a5eea365156ecd
+  data.tar.gz: 8689b1d38c6edade697583786e595332c5a496285c778967ad8a35557290d0b08a62056b75fc194d995f571220e4836eadcbf6d5f9083ec92cc5d97b3877d9cd

data/Manifest.txt

@@ -3,11 +3,14 @@ Manifest.txt
 README.md
 Rakefile
 lib/csvhuman.rb
+lib/csvhuman/base.rb
 lib/csvhuman/column.rb
+lib/csvhuman/converter.rb
 lib/csvhuman/reader.rb
 lib/csvhuman/tag.rb
 lib/csvhuman/version.rb
 test/data/test.csv
 test/helper.rb
+test/test_header_converter.rb
 test/test_reader.rb
 test/test_tags.rb

data/README.md

@@ -79,30 +79,80 @@ resulting in:
   "subsector"    => "Subsector 1",
   "org"          => "Org 1",
   "country"      => "Country 1",
-  "sex+targeted" => ["100", "100"],
+  "sex+targeted" => [100, 100],
   "adm1"         => "Region 1"},
  {"sector+en"    => "Health",
   "subsector"    => "Subsector 2",
   "org"          => "Org 2",
   "country"      => "Country 2",
-  "sex+targeted" => ["", ""],
+  "sex+targeted" => [nil, nil],
   "adm1"         => "Region 2"},
  {"sector+en"    => "Education",
   "subsector"    => "Subsector 3",
   "org"          => "Org 3",
   "country"      => "Country 2",
-  "sex+targeted" => ["250", "300"],
+  "sex+targeted" => [250, 300],
   "adm1"         => "Region 3"},
  {"sector+en"    => "WASH",
   "subsector"    => "Subsector 4",
   "org"          => "Org 1",
   "country"      => "Country 3",
-  "sex+targeted" => ["80", "95"],
+  "sex+targeted" => [80, 95],
   "adm1"         => "Region 4"}]
 ```
 
 
-More ways to use the reader:
+### What about Enumerable?
+
+Yes, every reader includes `Enumerable` and runs on `each`.
+Use `new` or `open` without a block
+to get the enumerator (iterator).
+Example:
+
+
+``` ruby
+csv = CsvHuman.new( <<TXT )      ## or use HXL.new
+  What,,,Who,Where,For whom,
+  Record,Sector/Cluster,Subsector,Organisation,Country,Males,Females,Subregion
+  ,#sector+en,#subsector,#org,#country,#sex+#targeted,#sex+#targeted,#adm1
+  001,WASH,Subsector 1,Org 1,Country 1,100,100,Region 1
+  002,Health,Subsector 2,Org 2,Country 2,,,Region 2
+  003,Education,Subsector 3,Org 3,Country 2,250,300,Region 3
+  004,WASH,Subsector 4,Org 1,Country 3,80,95,Region 4
+TXT )
+it  = csv.to_enum
+pp it.next  
+# => {"sector+en"    => "WASH",
+#     "subsector"    => "Subsector 1",
+#     "org"          => "Org 1",
+#     "country"      => "Country 1",
+#     "sex+targeted" => [100, 100],
+#     "adm1"         => "Region 1"}
+
+
+# -or-
+
+csv = CsvHuman.open( "./test.csv" )     # or use HXL.open
+it  = csv.to_enum
+pp it.next
+# => {"sector+en"    => "WASH",
+#     "subsector"    => "Subsector 1",
+#     "org"          => "Org 1",
+#     "country"      => "Country 1",
+#     "sex+targeted" => [100, 100],
+#     "adm1"         => "Region 1"}
+pp it.next
+# => {"sector+en"    => "Health",
+#     "subsector"    => "Subsector 2",
+#     "org"          => "Org 2",
+#     "country"      => "Country 2",
+#     "sex+targeted" => [nil, nil],
+#     "adm1"         => "Region 2"}
+```
+
+
+
+### More Ways to Use
 
 ``` ruby
 csv = CsvHuman.new( recs )
@@ -110,8 +160,6 @@ csv.each do |rec|
   pp rec
 end
 
-pp csv.read
-
 
 CsvHuman.parse( recs ).each do |rec|
   pp rec
@@ -136,8 +184,6 @@ hxl.each do |rec|
   pp rec
 end
 
-pp hxl.read
-
 
 HXL.parse( recs ).each do |rec|
   pp rec
@@ -160,11 +206,91 @@ Note: More aliases for `CsvHuman`, `HXL`? Yes, you can use
 
 
 
-## Tag Helpers
+### What about symbol keys for hashes?
+
+Yes, you can use the `header_converter` keyword option.
+Use `:symbol` for (auto-)converting header tags (strings) to symbols.
+Note: the symbol converter will remove all hashtags (`#`) and spaces and
+will change the plus (`+`) to underscore (`_`)
+and remove all non-alphanumeric (e.g. `!?$%`) chars.
+
+Example:
+
+``` ruby
+txt =<<TXT
+What,,,Who,Where,For whom,
+Record,Sector/Cluster,Subsector,Organisation,Country,Males,Females,Subregion
+,#sector+en,#subsector,#org,#country,#sex+#targeted,#sex+#targeted,#adm1
+001,WASH,Subsector 1,Org 1,Country 1,100,100,Region 1
+002,Health,Subsector 2,Org 2,Country 2,,,Region 2
+003,Education,Subsector 3,Org 3,Country 2,250,300,Region 3
+004,WASH,Subsector 4,Org 1,Country 3,80,95,Region 4
+TXT
+
+pp CsvHuman.parse( txt, :header_converter => :symbol )      ## or use HXL.parse
+
+# -or-
+
+options = { :header_converter => :symbol }
+pp CsvHuman.parse( txt, options )  
+```
+
+resulting in:
+
+``` ruby
+[{:sector_en    => "WASH",
+  :subsector    => "Subsector 1",
+  :org          => "Org 1",
+  :country      => "Country 1",
+  :sex_targeted => [100, 100],
+  :adm1         => "Region 1"},
+ # ...
+ {:sector_en    => "WASH",
+  :subsector    => "Subsector 4",
+  :org          => "Org 1",
+  :country      => "Country 3",
+  :sex_targeted => [80, 95],
+  :adm1         => "Region 4"}]
+```
+
+Built-in header converters include:
+
+| Converter    | Comments            |
+|--------------|---------------------|
+| `:none`      |   string key; uses "normalized" tag e.g. `"#adm1 +code"`  |
+| `:default`   |   string key; strips hashtags and spaces e.g. `"admin+code"`  |
+| `:symbol`    |   symbol key; strips hashtags and spaces and converts plus (`+`) to underscore (`_`) and removes all non-alphanumerics e.g. `:admin_code` |
+
+Or add your own converters. Example:
+
+``` ruby
+pp CsvHuman.parse( txt, header_converter: ->(h) { h.upcase } )
+```
+
+resulting in:
+
+``` ruby
+[{"#SECTOR +EN"    => "WASH",
+  "#SUBSECTOR"     => "Subsector 1",
+  "#ORG"           => "Org 1",
+  "#COUNTRY"       => "Country 1",
+  "#SEX +TARGETED" => [100, 100],
+  "#ADM1"          => "Region 1"},
+ # ...
+]
+```
+
+A custom header converter is a method that gets the (normalized) header tag
+passed in (e.g. `#sector +en`) as a string
+and returns a string or symbol to use for the hash key in records.
+
+
+
+### Tag Helpers
 
 **Normalize**. Use `CsvHuman::Tag.normalize` to pretty print or normalize a tag.
 All parts get downcased (lowercased), all attributes sorted by a-to-z,
-all extra or missing hashtags or pluses added or removed
+all extra or missing hashtags or pluses added or removed,
 all extra or missing spaces added or removed. Example:
 
 ``` ruby

data/lib/csvhuman.rb

@@ -1,25 +1,15 @@
-# encoding: utf-8
-
-require 'pp'
-
-
-require 'csvreader'
-
-## our own code
-require 'csvhuman/version'    # note: let version always go first
-require 'csvhuman/tag'
-require 'csvhuman/column'
-require 'csvhuman/reader'
-
-
-
-## add some "alternative" shortcut aliases
-CsvHum  = CsvHuman
-CSV_HXL = CsvHuman
-CSVHXL  = CsvHuman
-HXL     = CsvHuman
-
-
-
-# say hello
-puts CsvHuman.banner     if $DEBUG || (defined?($RUBYCOCO_DEBUG) && $RUBYCOCO_DEBUG)
+# encoding: utf-8
+
+require 'csvreader'      ## add all "alternative" shortcut aliases
+
+
+## our own code (without "top-level" shortcuts e.g. "modular version")
+require 'csvhuman/base'
+
+
+####
+#  add some "alternative" shortcut aliases
+CsvHum  = CsvHuman
+CSV_HXL = CsvHuman
+CSVHXL  = CsvHuman
+HXL     = CsvHuman

data/lib/csvhuman/base.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+require 'csvreader/base'
+
+
+## our own code
+require 'csvhuman/version'    # note: let version always go first
+require 'csvhuman/tag'
+require 'csvhuman/column'
+require 'csvhuman/converter'
+require 'csvhuman/reader'
+
+
+
+
+# say hello
+puts CsvHuman.banner     if $DEBUG || (defined?($RUBYCOCO_DEBUG) && $RUBYCOCO_DEBUG)

data/lib/csvhuman/column.rb

@@ -7,20 +7,41 @@ class CsvHuman
 class Columns
 
 
-  def self.build( values )
+  def self.build( values, header_converter )
 
     ## "clean" unify/normalize names
-    tag_keys = values.map do |value|
+    keys = values.map do |value|
       if value
         if value.empty?
           nil
         else
           ## e.g. #ADM1 CODE                      => #adm1 +code
           ##      POPULATION F CHILDREN AFFECTED  => #population +affected +children +f
-          value = Tag.normalize( value )
+          tag_key = Tag.normalize( value )
           ## turn empty normalized tags (e.g. "stray" hashtag) into nil too
-          value = nil   if value.empty?
-          value
+
+          if value.empty?
+              nil
+          else
+              header_key =
+              ##   todo/fix: pass in column index - why? why not?
+              ##     pass in column index for all columns (or only tagged ones?) or both?
+              ##   if header_converter.arity == 1  # straight converter
+                     header_converter.call( tag_key )
+              ##   else
+              ##       header_converter.call( value, index )
+              ##    end
+
+              ## note:
+              ##   return nil, "" or false to skip column
+              if header_key.nil? || header_key.empty? || header_key == false   ## check again: skip empty "" columns
+                nil
+              else
+                ##  note: return header_key (used for returned record/hash) AND tag_key (used for type conversion config)
+                ## lets us fold more columns into one or splat single list/array columns into many
+                [header_key,tag_key]
+              end
+          end
         end
       else  # keep (nil) as is
         nil
@@ -29,34 +50,43 @@ class Columns
 
 
     counts = {}
-    tag_keys.each_with_index do |key,i|
+    keys.each_with_index do |key,i|
        if key
-         counts[key] ||= []
-         counts[key] << i
+         header_key = key[0]
+         counts[header_key] ||= []
+         counts[header_key] << i
        end
     end
     ## puts "counts:"
     ## pp counts
 
-    ## create all unique tags
+
+    ## create all unique tags  (used for type conversion)
     tags = {}
-    counts.each_key do |key|
-      tags[key] = Tag.parse( key )
+    keys.each do |key|
+      if key
+        tag_key = key[1]
+        tags[tag_key] ||= Tag.parse( tag_key )  ## note: "reuse" tag for all columns if same tag key
+      end
     end
     ## puts "tags:"
     ## pp tags
 
 
     cols = []
-    tag_keys.each do |key|
+    keys.each do |key|
       if key
-        count = counts[key]
-        tag   = tags[key]    ## note: "reuse" tag for all columns if list
+        header_key = key[0]
+        tag_key    = key[1]
+
+        count = counts[header_key]
+        tag   = tags[tag_key]        ## note: "reuse" tag for all columns if same tag key
+
         if count.size > 1
           ## note: defaults to use "standard/default" tag key (as a string)
-          cols << Column.new( tag.key, tag, list: true )
+          cols << Column.new( header_key, tag, list: true )
         else
-          cols << Column.new( tag.key, tag )
+          cols << Column.new( header_key, tag )
         end
       else
         cols << Column.new

data/lib/csvhuman/converter.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+
+class CsvHuman
+
+HEADER_CONVERTERS = {
+ ## e.g.  "#adm1 +code"  =>  "#adm1 +code"
+ none:      ->(value) { value },
+
+ ## e.g.  "#adm1 +code"  =>  "adm1+code"   (strip hashtags and whitespace)
+ default:   ->(value) { value.downcase.gsub('#', '').
+                                       gsub( /\s+/, '' ) },
+
+ ## e.g.  "#adm1 +code"  =>  :adm1_code"   (strip hashtags and whitespace and turn plus (+) into underscore (_))
+ symbol:    ->(value) { value.downcase.gsub('#', '').
+                                       gsub( /\s+/, '' ).
+                                       gsub('+', '_').
+                                       gsub( /[^\w]+/, '' ).to_sym }
+}
+
+end # class CsvHuman

data/lib/csvhuman/reader.rb

@@ -9,12 +9,13 @@ class CsvHuman
 ##     - value (auto-magically) turned into an array / list
 
 
-    def self.open( path, mode=nil, &block )   ## rename path to filename or name - why? why not?
+  def self.open( path, mode=nil, sep: nil,
+                                 header_converter: nil, &block )   ## rename path to filename or name - why? why not?
 
      ## note: default mode (if nil/not passed in) to 'r:bom|utf-8'
      ## f = File.open( path, mode ? mode : 'r:bom|utf-8' )
-     csv = Csv.open( path, mode, parser: Csv::Parser.human )     ## note: returns an enumarator-like object
-     human = new( csv )
+     csv = CsvReader.open( path, mode, sep: sep, parser: CsvReader::Parser.human )     ## note: returns an enumarator-like object
+     human = new( csv, header_converter: header_converter )
 
      # handle blocks like Ruby's open(), not like the (old old) CSV library
      if block_given?
@@ -26,17 +27,19 @@ class CsvHuman
      else
        human
      end
- end # method self.open
+  end # method self.open
 
 
-    def self.read( path )
-        open( path ) { |human| human.read }
+    def self.read( path, sep: nil,
+                         header_converter: nil )
+        open( path, sep: sep, header_converter: header_converter ) { |human| human.read }
     end
 
 
-    def self.foreach( path, &block )
-          csv = Csv.open( path, parser: Csv::Parser.human )     ## note: returns an enumarator-like object
-          human = new( csv )
+    def self.foreach( path, sep: nil,
+                            header_converter: nil, &block )
+          csv = CsvReader.open( path, sep: sep, parser: CsvReader::Parser.human )     ## note: returns an enumarator-like object
+          human = new( csv, header_converter: header_converter )
 
           if block_given?
             begin
@@ -53,8 +56,10 @@ class CsvHuman
     end # method self.foreach
 
 
-    def self.parse( str_or_readable, &block )
-          human = new( str_or_readable )
+    def self.parse( str_or_readable, sep: nil,
+                                     header_converter: nil, &block )
+          human = new( str_or_readable, sep: sep,
+                                        header_converter: header_converter )
 
           if block_given?
             human.each( &block )  ## note: caller (responsible) must close file!!! - add autoclose - why? why not?
@@ -67,10 +72,11 @@ class CsvHuman
 
 attr_reader :header, :tags
 
-def initialize( recs_or_stream )
+def initialize( recs_or_stream, sep: nil,
+                                header_converter: nil )
    ## todo/check:  check if arg is a stream/enumarator - why? why not??
    if recs_or_stream.is_a?( String )
-     @recs = Csv.new( recs_or_stream, parser: Csv::Parser.human )     ## note: returns an enumarator-like object
+     @recs = CsvReader.new( recs_or_stream, sep: sep, parser: CsvReader::Parser.human )     ## note: returns an enumarator-like object
    else
      @recs = recs_or_stream
    end
@@ -78,6 +84,15 @@ def initialize( recs_or_stream )
    @header = []
    @tags   = nil   ## add tags = nil  -- why? why not?
    @cols   = nil   ## column mappings (used "internally")
+
+   if header_converter.nil?
+       @header_converter = HEADER_CONVERTERS[:default]
+   elsif header_converter.is_a?( Symbol )
+       ## todo/fix: check if converter is nil (not found) - raise except!!!!
+       @header_converter = HEADER_CONVERTERS[header_converter]
+   else  ## assume proc; todo/fix: check it's a proc!!!
+       @header_converter = header_converter
+   end
 end
 
 
@@ -92,7 +107,7 @@ def each( &block )
     ## pp values
     if @cols.nil?
       if values.any? { |value| value && value.strip.start_with?('#') }
-        @cols = Columns.build( values )
+        @cols = Columns.build( values, @header_converter )
         @tags = values
       else
         @header << values
@@ -105,7 +120,7 @@ def each( &block )
       @cols.each_with_index do |col,i|
         if col.tagged?
           key   = col.key
-          value = values[i]   ## todo/fix: use col.tag.typecast( values[i] )
+          value = col.tag.typecast( values[i] )
           if col.list?
             record[ key ] ||= []
             record[ key ] << value

data/lib/csvhuman/tag.rb

@@ -61,7 +61,7 @@ class Tag
 
     if name == 'date'
        Date
-    elsif ['affected', 'inneed'].include?( name )
+    elsif ['affected', 'inneed', 'targeted', 'reached'].include?( name )
        Integer
     else
       ## check attributes
@@ -71,7 +71,18 @@ class Tag
         Integer
       elsif attributes.include?( 'date' )   ### todo/check: exists +date?
         Date
-      elsif attributes.include?( 'affected' )
+      elsif attributes.include?( 'killed' ) ||
+            attributes.include?( 'injured' ) ||
+            attributes.include?( 'infected' ) ||
+            attributes.include?( 'displaced' ) ||
+            attributes.include?( 'idps' ) ||
+            attributes.include?( 'refugees' ) ||
+            attributes.include?( 'abducted' ) ||
+            attributes.include?( 'threatened' ) ||
+            attributes.include?( 'affected' ) ||
+            attributes.include?( 'inneed' ) ||
+            attributes.include?( 'targeted' ) ||
+            attributes.include?( 'reached' )
         Integer
       else
         String   ## assume (default to) string

data/lib/csvhuman/version.rb

@@ -3,8 +3,8 @@
 
 class CsvHuman
 
-  MAJOR = 0
-  MINOR = 2
+  MAJOR = 1
+  MINOR = 0
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

data/test/helper.rb

@@ -6,6 +6,7 @@ require 'minitest/autorun'
 
 
 ## our own code
+## require 'csvhuman/base'
 require 'csvhuman'
 
 

data/test/test_header_converter.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_header_converter.rb
+
+
+
+require 'helper'
+
+class TestHeaderConverter < MiniTest::Test
+
+def conv_none( value )
+  CsvHuman::HEADER_CONVERTERS[:none].call( value )
+end
+
+def conv_default( value )
+  CsvHuman::HEADER_CONVERTERS[:default].call( value )
+end
+
+def conv_symbol( value )
+  CsvHuman::HEADER_CONVERTERS[:symbol].call( value )
+end
+
+
+
+def test_none
+  assert_equal "#sector", conv_none( "#sector" )
+  assert_equal "#adm1",   conv_none( "#adm1" )
+
+  assert_equal "#sector +en", conv_none( "#sector +en" )
+  assert_equal "#adm1 +code", conv_none( "#adm1 +code" )
+
+  assert_equal "#affected +children +f",             conv_none( "#affected +children +f" )
+  assert_equal "#population +affected +children +m", conv_none( "#population +affected +children +m" )
+end
+
+
+def test_default
+  assert_equal "sector", conv_default( "#sector" )
+  assert_equal "adm1",   conv_default( "#adm1" )
+
+  assert_equal "sector+en", conv_default( "#sector +en" )
+  assert_equal "adm1+code", conv_default( "#adm1 +code" )
+
+  assert_equal "affected+children+f",            conv_default( "#affected +children +f" )
+  assert_equal "population+affected+children+m", conv_default( "#population +affected +children +m" )
+end
+
+
+def test_symbol
+  assert_equal :sector, conv_symbol( "#sector" )
+  assert_equal :adm1,   conv_symbol( "#adm1" )
+
+  assert_equal :sector_en, conv_symbol( "#sector +en" )
+  assert_equal :adm1_code, conv_symbol( "#adm1 +code" )
+
+  assert_equal :affected_children_f,            conv_symbol( "#affected +children +f" )
+  assert_equal :population_affected_children_m, conv_symbol( "#population +affected +children +m" )
+end
+
+
+end # class TestHeaderConverter

data/test/test_reader.rb

@@ -50,26 +50,99 @@ def txt
 TXT
 end
 
+def txt2
+  <<TXT
+  %%%%%%%
+  % some comments here
+  %  note: you can use blank lines and/or leading and trailing spaces
+
+  What,                 ,         , Who        ,Where  ,For whom,
+  Record, Sector/Cluster,Subsector,Organisation,Country,Males,Females,Subregion
+
+  ,       #sector+en, #subsector, #org, #country, #sex+#targeted, #sex+#targeted, #adm1
+
+  %%%
+  % more comments here
+
+  001, WASH,      Subsector 1, Org 1, Country 1, 100, 100, Region 1
+  002, Health,    Subsector 2, Org 2, Country 2,    ,    , Region 2
+  003, Education, Subsector 3, Org 3, Country 2, 250, 300, Region 3
+  004, WASH,      Subsector 4, Org 1, Country 3,  80,  95, Region 4
+
+  %%%
+  % some more comments and blank lines
+
+
+TXT
+end
+
+def txt3
+  <<TXT
+  %%%%%%%%%%%%%%%%%
+  %  use semicolon (;) as sep(arator)
+
+  What;;;Who;Where;For whom;
+  Record;Sector/Cluster;Subsector;Organisation;Country;Males;Females;Subregion
+  ;#sector+en;#subsector;#org;#country;#sex+#targeted;#sex+#targeted;#adm1
+  001;WASH;Subsector 1;Org 1;Country 1;100;100;Region 1
+  002;Health;Subsector 2;Org 2;Country 2;;;Region 2
+  003;Education;Subsector 3;Org 3;Country 2;250;300;Region 3
+  004;WASH;Subsector 4;Org 1;Country 3;80;95;Region 4
+TXT
+end
+
+
 
-def test_readme
+def expected_recs2
+  [
+  {"sector+en"    => "WASH",
+   "subsector"    => "Subsector 1",
+   "org"          => "Org 1",
+   "country"      => "Country 1",
+   "sex+targeted" => [100, 100],
+   "adm1"         => "Region 1"},
+  {"sector+en"    => "Health",
+   "subsector"    => "Subsector 2",
+   "org"          => "Org 2",
+   "country"      => "Country 2",
+   "sex+targeted" => [nil, nil],
+   "adm1"         => "Region 2"},
+  {"sector+en"    => "Education",
+   "subsector"    => "Subsector 3",
+   "org"          => "Org 3",
+   "country"      => "Country 2",
+   "sex+targeted" => [250, 300],
+   "adm1"         => "Region 3"},
+  {"sector+en"    => "WASH",
+   "subsector"    => "Subsector 4",
+   "org"          => "Org 1",
+   "country"      => "Country 3",
+   "sex+targeted" => [80, 95],
+   "adm1"         => "Region 4"}]
+end
+
+
+def test_basics
   csv = CsvHuman.new( recs )
   csv.each do |rec|
     pp rec
   end
 
-  pp csv.read
-  
   assert_equal expected_recs, CsvHuman.parse( recs )
   assert_equal expected_recs, CsvHuman.parse( recs2 )
 
-
   CsvHuman.parse( recs ).each do |rec|
     pp rec
   end
 
 
   pp CsvHuman.read( "#{CsvHuman.test_data_dir}/test.csv" )
-  pp CsvHuman.parse( txt )
+
+
+  assert_equal expected_recs2, CsvHuman.parse( txt )
+  assert_equal expected_recs2, CsvHuman.parse( txt2 )
+
+
   CsvHuman.parse( txt ).each do |rec|
     pp rec
   end
@@ -79,4 +152,19 @@ def test_readme
   end
 end
 
+
+def test_header_converter
+  pp CsvHuman.parse( txt2, :header_converter => :default )
+  pp CsvHuman.parse( txt2, :header_converter => :none )
+  pp CsvHuman.parse( txt2, :header_converter => :symbol )
+
+  pp CsvHuman.parse( txt2, header_converter: ->(value) { value.upcase } )
+end
+
+
+def test_semicolon
+  assert_equal expected_recs2, CsvHuman.parse( txt3, sep: ';' )  ## try with semicolon (;)
+end
+
+
 end # class TestReader

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csvhuman
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-10 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csvreader
@@ -68,12 +68,15 @@ files:
 - README.md
 - Rakefile
 - lib/csvhuman.rb
+- lib/csvhuman/base.rb
 - lib/csvhuman/column.rb
+- lib/csvhuman/converter.rb
 - lib/csvhuman/reader.rb
 - lib/csvhuman/tag.rb
 - lib/csvhuman/version.rb
 - test/data/test.csv
 - test/helper.rb
+- test/test_header_converter.rb
 - test/test_reader.rb
 - test/test_tags.rb
 homepage: https://github.com/csvreader/csvhuman