structuredtext 1.0.0 → 1.0.1

data/README

@@ -78,6 +78,7 @@ is parsed into these arrays:
 = History
 
 1.0.0:: Comment handling and field-delimited text
+1.0.1:: Source code refinement; no functionality change
 
 = Copyright
 

data/lib/structuredtext.rb

@@ -20,7 +20,7 @@
 
 # Utilities for working with various kinds of structured text.
 module StructuredText
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 
 
   # Removes comments from text.
@@ -117,22 +117,22 @@ module StructuredText
     #            identical to the left-hand field quote
     def initialize(source, delimiter = ",", lquote = '"', rquote = nil)
       @source = source
-      # Escape the custom characters the caller provides a regular expression
-      # control character.
+      # Escape the custom characters in case the caller provides a regular
+      # expression control character.
       delimiter = Regexp.escape(delimiter)
       lquote = Regexp.escape(lquote)
       rquote = rquote.nil? ? lquote : Regexp.escape(rquote)
       s = <<-EOTEXT
-(?:  # Match delimiter
-  (#{delimiter})   # field delimiter
-   |    # ...or...
-  ($)   # end of line
+(                             # Match delimiter
+  (?: #{delimiter})             # field delimiter
+   |                            # ...or...
+  (?: $)                        # end of line
 )
-  |     # ...or...
-(     # Match text
-  (?: #{lquote}.*?#{rquote})  # quoted string
-      |       # ...or...
-  (?: [^#{delimiter}]*)  # text without delimiters
+  |                           # ...or...
+(                             # Match text
+  (?: #{lquote}.*?#{rquote})    # quoted string
+      |                         # ...or...
+  (?: [^#{delimiter}]*)       # text without delimiters
 )
 EOTEXT
       @field_regex = Regexp.compile(s, Regexp::EXTENDED)
@@ -150,10 +150,9 @@ EOTEXT
         # double-quoted strings.
         field = ""
         line.scan(@field_regex) do |match|
-          comma_delimiter = (not match[0].nil?)
-          eol_delimiter = (not match[1].nil?)
-          text = match[2]
-          if not (comma_delimiter or eol_delimiter)
+          delimiter = match[0]
+          text = match[1]
+          if delimiter.nil?
             # Append text in the middle of a field.
             field += text if not text.nil?
           else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: structuredtext
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - W.P. McNeill