up

geraldb · geraldb · commit f0150b3eaae0 · 2021-10-05T18:04:29.000+02:00
diff --git a/csvreader/CHANGELOG.md b/csvreader/CHANGELOG.md
diff --git a/csvreader/Manifest.txt b/csvreader/Manifest.txt
@@ -1,5 +1,4 @@
-HISTORY.md
-LICENSE.md
+CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
diff --git a/csvreader/Rakefile b/csvreader/Rakefile
@@ -1,21 +1,22 @@
 require 'hoe'
 require './lib/csvreader/version.rb'
 
+
 Hoe.spec 'csvreader' do
 
   self.version = CsvReader::VERSION
 
   self.summary = "csvreader - read tabular data in the comma-separated values (csv) format the right way (uses best practices out-of-the-box with zero-configuration)"
   self.description = summary
 
-  self.urls = ['https://github.com/csvreader/csvreader']
+  self.urls = { home: 'https://github.com/csvreader/csvreader' }
 
   self.author = 'Gerald Bauer'
-  self.email = 'wwwmake@googlegroups.com'
+  self.email  = 'wwwmake@googlegroups.com'
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'
-  self.history_file = 'HISTORY.md'
+  self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
      ['tabreader',  '>=1.0.1'],
diff --git a/csvreader/lib/csvreader.rb b/csvreader/lib/csvreader.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 
 ## our own code (without "top-level" shortcuts e.g. "modular version")
diff --git a/csvreader/lib/csvreader/base.rb b/csvreader/lib/csvreader/base.rb
@@ -1,14 +1,18 @@
-# encoding: utf-8
 
 
 require 'pp'
-require 'logger'
+require 'logger'   ## todo/fix:  check why logger is required - use logutils!!!???
 require 'forwardable'
 require 'stringio'
+require 'fileutils'
+
+require 'time'
 require 'date'    ## use for Date.parse and DateTime.parse
 require 'yaml'    ## used for (optional) meta data blocks
+require 'json'
 
 
+## our own parser libs
 require 'tabreader'
 require 'csvjson'
 require 'csvyaml'
diff --git a/csvreader/lib/csvreader/buffer.rb b/csvreader/lib/csvreader/buffer.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 class CsvReader
 class Buffer   ## todo: find a better name:
diff --git a/csvreader/lib/csvreader/builder.rb b/csvreader/lib/csvreader/builder.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 class CsvReader
 class Builder
diff --git a/csvreader/lib/csvreader/converter.rb b/csvreader/lib/csvreader/converter.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 class CsvReader
 
diff --git a/csvreader/lib/csvreader/parser.rb b/csvreader/lib/csvreader/parser.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 class CsvReader
 
diff --git a/csvreader/lib/csvreader/parser_fixed.rb b/csvreader/lib/csvreader/parser_fixed.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 class CsvReader
 
diff --git a/csvreader/lib/csvreader/parser_json.rb b/csvreader/lib/csvreader/parser_json.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 
 class CsvReader
diff --git a/csvreader/lib/csvreader/parser_std.rb b/csvreader/lib/csvreader/parser_std.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 class CsvReader
 
diff --git a/csvreader/lib/csvreader/parser_strict.rb b/csvreader/lib/csvreader/parser_strict.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 class CsvReader
 
diff --git a/csvreader/lib/csvreader/parser_tab.rb b/csvreader/lib/csvreader/parser_tab.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 class CsvReader
 
diff --git a/csvreader/lib/csvreader/parser_table.rb b/csvreader/lib/csvreader/parser_table.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 class CsvReader
 
diff --git a/csvreader/lib/csvreader/parser_yaml.rb b/csvreader/lib/csvreader/parser_yaml.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 
 class CsvReader
diff --git a/csvreader/lib/csvreader/reader.rb b/csvreader/lib/csvreader/reader.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 class CsvReader
 
@@ -155,11 +154,11 @@ def each( &block )
 
          ## check array / pipeline of converters is empty (size=0 e.g. is [])
          if @converters.empty?
-           @parser.parse( @io, kwargs, &block )
+           @parser.parse( @io, **kwargs, &block )
          else
            ## add "post"-processing with converters pipeline
            ##   that is, convert all strings to integer, float, date, ... if wanted
-           @parser.parse( @io, kwargs ) do |raw_record|
+           @parser.parse( @io, **kwargs ) do |raw_record|
              record = []
              raw_record.each_with_index do | value, i |
                record << @converters.convert( value, i )
diff --git a/csvreader/lib/csvreader/reader_hash.rb b/csvreader/lib/csvreader/reader_hash.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 class CsvHashReader
 
diff --git a/csvreader/lib/csvreader/version.rb b/csvreader/lib/csvreader/version.rb
@@ -1,12 +1,10 @@
-# encoding: utf-8
-
 
 class CsvReader   ## note: uses a class for now - change to module - why? why not?
 
   module Version
     MAJOR = 1    ## todo: namespace inside version or something - why? why not??
     MINOR = 2
-    PATCH = 4
+    PATCH = 5
 
     ## self.to_s  - why? why not?
   end
@@ -22,7 +20,7 @@ def self.version   ## keep (as an alternative to VERSION) - why? why not?
 
 
   def self.banner
-    "csvreader/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    "csvreader/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] in (#{root})"
   end
 
   def self.root
diff --git a/csvreader/test/test_parser.rb b/csvreader/test/test_parser.rb
@@ -158,8 +158,4 @@ def test_parse_comments
 TXT
 end
 
-def test_ruby3
-  CsvHashReader.strict.parse('1,2,3')
-end
-
 end # class TestParser

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# encoding: utf-8`
`2`	`1`
`3`	`2`
`4`	`3`	`## our own code (without "top-level" shortcuts e.g. "modular version")`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# encoding: utf-8`
`2`	`1`
`3`	`2`	`class CsvReader`
`4`	`3`	`class Buffer ## todo: find a better name:`