let radial accept \r\n strings

jmettraux · May 5, 2013 · f532b2d · f532b2d
1 parent 81abe4d
commit f532b2d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -4,6 +4,7 @@
 
 == ruote - 2.3.1    not yet released
 
+- let radial accept \r\n strings
 - implement Dashboard#reply_to_parent(fei, wi=nil)
 - fix issue with @seen in wait_logger on JRuby (thanks Mark Wotton)
 - Receiver#flunk accepts stacktrace as final argument

diff --git a/lib/ruote/reader/radial.rb b/lib/ruote/reader/radial.rb
@@ -37,9 +37,12 @@ module RadialReader
     #
     class Parser < Parslet::Parser
 
+      # TODO: do something about \r\n appearing in :spaces and in :lines
+
       rule(:spaces) {
-        match('\s').repeat >>
-        (str('#') >> match('[^\n]').repeat >> str("\n").present?).maybe >>
+        match('\s').repeat >> (
+          str('#') >> match('[^\r\n]').repeat >> match('[\r\n]').present?
+        ).maybe >>
         match('\s').repeat
       }
       rule(:spaces?) { spaces.maybe }
@@ -113,7 +116,7 @@ class Parser < Parslet::Parser
       rule(:line) {
         (
           str(' ').repeat.as(:ind) >>
-          match('[^ \n#"\',]').repeat(1).as(:exp) >>
+          match('[^ \r\n#"\',]').repeat(1).as(:exp) >>
           (
             (comma | blanks) >> attribute >> (comma >> attribute).repeat
           ).as(:atts).maybe
@@ -122,12 +125,15 @@ class Parser < Parslet::Parser
 
       rule(:comment) {
         str(' ').repeat >>
-        (str('#') >> match('[^\n]').repeat).maybe >>
-        str("\n").present?
+        (str('#') >> match('[^\r\n]').repeat).maybe >>
+        (str("\r") | str("\n")).present?
       }
 
       rule(:lines) {
-        (str("\n") >> (line | blank_line) >> comment.maybe).repeat
+        (
+          str("\r").maybe >> str("\n") >>
+          (line | blank_line) >> comment.maybe
+        ).repeat
       }
 
       root(:lines)

diff --git a/test/unit/ut_24_radial_reader.rb b/test/unit/ut_24_radial_reader.rb
@@ -461,5 +461,19 @@ def test_regex_escape
       ]],
       tree)
   end
+
+  def test_crlf
+
+    tree =
+      Ruote::RadialReader.read(
+        "define\r\n  participant nada, t: hello\r\n  participant ulf, t: world")
+
+    assert_equal(
+      [ 'define', {}, [
+        [ 'participant', { 'nada' => nil, 't' => 'hello' }, [] ],
+        [ 'participant', { 'ulf' => nil, 't' => 'world' }, [] ]
+      ]],
+      tree)
+  end
 end