structuredtext 1.0.1 → 1.1.0

data/README

@@ -41,8 +41,11 @@ example, the following text:
 
 is parsed into these arrays:
 
-	['apples', ' red', ' round']
-	['bananas', ' yellow', ' oblong']
+	['apples', 'red', 'round']
+	['bananas', 'yellow', 'oblong']
+
+By default leading and trailing whitespace is removed from each field, though
+this option may be overridden.
 
 The field text may contain quoted strings.  Delimiter characters inside
 quotes are not treated as field delimiters.  So:
@@ -79,6 +82,7 @@ is parsed into these arrays:
 
 1.0.0:: Comment handling and field-delimited text
 1.0.1:: Source code refinement; no functionality change
+1.1.0:: Strip whitespace from field edges
 
 = Copyright
 

data/lib/structuredtext.rb

@@ -20,7 +20,7 @@
 
 # Utilities for working with various kinds of structured text.
 module StructuredText
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 
 
   # Removes comments from text.
@@ -115,7 +115,8 @@ module StructuredText
     # [_lquote_] the left-hand field quote character
     # [_rquote_] the right-hand field quote character; if unspecified, it is
     #            identical to the left-hand field quote
-    def initialize(source, delimiter = ",", lquote = '"', rquote = nil)
+    # [_strip_] strip whitespace from edges of fields?
+    def initialize(source, delimiter = ",", lquote = '"', rquote = nil, strip = true)
       @source = source
       # Escape the custom characters in case the caller provides a regular
       # expression control character.
@@ -136,6 +137,7 @@ module StructuredText
 )
 EOTEXT
       @field_regex = Regexp.compile(s, Regexp::EXTENDED)
+      @strip = strip
     end
 
     # Enumerate the lines in the source yielding arrays of comma-separated
@@ -157,6 +159,7 @@ EOTEXT
             field += text if not text.nil?
           else
             # Add field to the record at a delimiter.
+            field.strip! if @strip
             record << field
             field = ""
           end

data/test/test_structuredtext.rb

@@ -60,6 +60,11 @@ class DelimitedReaderTestCase < Test::Unit::TestCase
     assert_equal([["a", "b", "c"], ["d", "e", "f"]], StructuredText::DelimitedReader.new("a,b,c\nd,e,f").collect)
     # Multiline: variying record length
     assert_equal([["a", "b", "c"], ["d", "e"]], StructuredText::DelimitedReader.new("a,b,c\nd,e").collect)
+    # Strip
+    assert_equal([["a", "b", "c"]], StructuredText::DelimitedReader.new(" a , b , c ").collect)
+    # No-strip
+    assert_equal([[" a ", " b ", " c "]],
+                 StructuredText::DelimitedReader.new(" a , b , c ", ",", '"', '"', false).collect)
   end
   
   def test_quoted
@@ -120,6 +125,11 @@ class LabeledReaderTestCase < Test::Unit::TestCase
     # Multiline
     assert_equal([{"X"=>"a", "Y"=>"b", "Z"=>"c"}, {"X"=>"d", "Y"=>"e", "Z"=>"f"}],
                  StructuredText::LabeledDelimitedReader.new("X,Y,Z\na,b,c\nd,e,f").collect)
+   # Strip
+   assert_equal([{"X"=>"a", "Y"=>"b", "Z"=>"c"}], StructuredText::LabeledDelimitedReader.new(" X , Y , Z \n a , b , c ").collect)
+   # No-strip
+   assert_equal([{" X "=>" a ", " Y "=>" b ", " Z "=>" c "}],
+                StructuredText::LabeledDelimitedReader.new(" X , Y , Z \n a , b , c ", ",", '"', '"', false).collect)
   end
   
   def test_exception
@@ -138,7 +148,7 @@ bananas|yellow|oblong
 ; The end
 EOTEXT
   r = StructuredText::LabeledDelimitedReader.new(StructuredText::CommentedReader.new(text, ";"), "|", "(", ")")
-  assert_equal([{'Shape'=>'round ', 'Fruit'=>'apples', 'Color'=>'(red|green)'},
+  assert_equal([{'Shape'=>'round', 'Fruit'=>'apples', 'Color'=>'(red|green)'},
                 {'Shape'=>'oblong', 'Fruit'=>'bananas', 'Color'=>'yellow'}], r.collect)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: structuredtext
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - W.P. McNeill
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-11 00:00:00 -07:00
+date: 2009-08-20 00:00:00 -07:00
 default_executable: 
 dependencies: []