csvreader 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e54c57c44e895f8daacd12261b87195ab0ab6cd2
-  data.tar.gz: b63d0d183d98c3ab1f291e3bdf6168e0d5bd39fc
+  metadata.gz: f9fafbb8383e3ba0e72b6813fe7ee301e66e9075
+  data.tar.gz: f71ef3a5ca8f1d38437750411411deea844d243a
 SHA512:
-  metadata.gz: 06756ee95e4810ded31be95abb5136bf0d0c8d7b79e2e19df483590bac051b449daee4f6178571bf177635ec35847220d859a6b5ba72068325710f022dbb6115
-  data.tar.gz: 884f5eff36a5d4cf03e1d7d5bab3a53632361ad6a7ab09ce16a502c0d25f25dcfea025efa8d79e8127fd735627683c3d8a91f22e3c03cf3d033ff7e64d7004b0
+  metadata.gz: 0b7a54d100e575a452551ce0fdc0458986ca19d694e3e2109fa08885437a354b703fdf67661a1ba968930adba4cf2a4083e08641cdafb65cd93599ddf820cabf
+  data.tar.gz: 348f14c961322d9fa5a44d0ae63478b097e5a46786bf7bfa189badf8bf7caafad2a2594ccfbe4f60c7830406f3b724773561b5c1f7883a8f667b4997b4f03179

data/lib/csvreader/parser_std.rb

@@ -223,6 +223,8 @@ def parse_field( input, sep: )
   value = ""
 
   numeric = config[:numeric]
+  hashtag = config[:hashtag]
+
 
   logger.debug "parse field"  if logger.debug?
 
@@ -301,6 +303,17 @@ def parse_field( input, sep: )
     while (c=input.peek; !(c==sep || c==LF || c==CR || input.eof?))
       if input.peek == BACKSLASH
         value << parse_escape( input, sep: sep )
+      ###   check for end-of-line comments (e.g. # ...)
+      ##    note: quick hack for now
+      ##      will NOT work in hashtag (hxl) mode and for % comments
+      ##      for now ALWAYS assumes # for comments
+      ##      and end-of-line comments ONLY work here (that is, in unquoted values and NOT in quotes values) for now
+      ##    todo/fix: note: require leading space for comment hash (#) for now- why? why not?
+      ##                    require trailing space after comment hash (#) - why? why not?
+    elsif (hashtag == false || hashtag.nil?) && input.peek == COMMENT_HASH &&
+           (value.size == 0 || (value.size > 0 && value[-1] == ' '))
+        ## eat-up everything until end-of-line (eol)
+        skip_until_eol( input )
       else
         logger.debug "  add char >#{input.peek}< (#{input.peek.ord})"  if logger.debug?
         value << input.getc   ## note: eat-up all spaces (" ") and tabs (\t) too (strip trailing spaces at the end)

data/lib/csvreader/version.rb

@@ -6,7 +6,7 @@ class CsvReader   ## note: uses a class for now - change to module - why? why no
   module Version
     MAJOR = 1    ## todo: namespace inside version or something - why? why not??
     MINOR = 2
-    PATCH = 3
+    PATCH = 4
 
     ## self.to_s  - why? why not?
   end

data/test/test_parser_java.rb

@@ -60,11 +60,11 @@ end
 def test_comments
   assert_equal [["first",  "line", "" ],
                 ["second", "line", "tokenWith#no-comment" ],
-                ["third",  "line", "#no-comment" ]],
+                ["third",  "line" ]],
                 parser.default.parse( "first,line,\n" +
                               "second,line,tokenWith#no-comment\n" +
                               "# comment line \n" +
-                              "third,line,#no-comment\n" +
+                              "third,line  #inline-end-of-line-comment\n" +
                               "# penultimate comment\n" +
                               "# Final comment\n" )
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csvreader
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-24 00:00:00.000000000 Z
+date: 2019-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tabreader