[ruby/csv] Add support for \r\n with skip_lines: /...$/ again

kou · kou · commit 832b7f3c5473 · 2020-11-24T09:33:55.000+09:00
GitHub: fix GH-194 Reported by Josef Šimánek. Thanks!!! ruby/csv@fd86afe081
diff --git a/lib/csv/parser.rb b/lib/csv/parser.rb
@@ -785,6 +785,7 @@ def skip_needless_lines
     end
 
     def skip_line?(line)
+      line = line.delete_suffix(@row_separator)
       case @skip_lines
       when String
         line.include?(@skip_lines)
diff --git a/test/csv/parse/test_skip_lines.rb b/test/csv/parse/test_skip_lines.rb
@@ -109,4 +109,10 @@ def test_empty_line_and_liberal_parsing
                            :liberal_parsing => true,
                            :skip_lines => /^$/))
   end
+
+  def test_crlf
+    assert_equal([["a", "b"]],
+                 CSV.parse("a,b\r\n,\r\n",
+                           :skip_lines => /^,+$/))
+  end
 end
