marker 0.3.1 → 0.3.2

data/lib/marker/language.treetop

@@ -671,17 +671,19 @@ module Marker
       [A-Fa-f0-9]
     end
 
-    #-- TODO: Handle windows newlines (\r\n) ++
-
     # required new lines
     # just one!
     rule rnl
-      "\n"
+      "\r\n" # windows
+      /
+      "\n" # linux/unix
+      /
+      "\r" # mac
     end
 
     # new lines
     rule nl
-      "\n"*
+      [\r\n]*
     end
 
     # all white space

data/lib/marker/links.rb

@@ -139,7 +139,7 @@ module Marker #:nodoc:
     def to_html( options = {} )
       url = bare_url
       if url =~ /[.,!?:]$/
-        "<a href='#{url[0...-1]}'>#{url[0...-1]}</a>#{url[-1]}"
+        "<a href='#{url[0...-1]}'>#{url[0...-1]}</a>#{url[-1,1]}"
       else
         "<a href='#{url}'>#{url}</a>"
       end

data/test/encodings_test.rb

@@ -0,0 +1,24 @@
+require File.expand_path( File.dirname( __FILE__ ) + '/test_helper' )
+require 'marker'
+
+class EncodingsTest < Test::Unit::TestCase
+
+  def test_linux_newlines
+    text = "one\ntwo\n\nthree"
+    markup = Marker.parse text
+    assert_match("<p>one two</p>\n\n<p>three</p>", markup.to_html)
+  end
+
+  def test_windows_newlines
+    text = "one\r\ntwo\r\n\r\nthree"
+    markup = Marker.parse text
+    assert_match("<p>one two</p>\n\n<p>three</p>", markup.to_html)
+  end
+
+  def test_mac_newlines
+    text = "one\rtwo\r\rthree"
+    markup = Marker.parse text
+    assert_match("<p>one two</p>\n\n<p>three</p>", markup.to_html)
+  end
+
+end

data/test/formatting_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path( File.dirname( __FILE__ ) + '/test_helper' )
 require 'marker'
 
 class FormattingTest < Test::Unit::TestCase

data/test/headings_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path( File.dirname( __FILE__ ) + '/test_helper' )
 require 'marker'
 
 class HeadingTest < Test::Unit::TestCase

data/test/links_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path( File.dirname( __FILE__ ) + '/test_helper' )
 require 'marker'
 
 class LinkTest < Test::Unit::TestCase
@@ -37,7 +37,7 @@ class LinkTest < Test::Unit::TestCase
   def test_internal_with_url
     text = "[[http://www.example.com]]"
     markup = Marker.parse text
-    assert_match("<p><a href='http://www.example.com'>[1]</a></p>\n<ol><li><a href='http://www.example.com'>http://www.example.com</a></li></ol>", markup.to_html)
+    assert_match("<p><a href='http://www.example.com'>[1]</a></p>\n<ol class='footnotes'><li><a href='http://www.example.com'>http://www.example.com</a></li></ol>", markup.to_html)
 
     text = "[[http://www.example.com|Example page]]"
     markup = Marker.parse text
@@ -66,7 +66,7 @@ class LinkTest < Test::Unit::TestCase
     text = "[http://www.example.com]"
     markup = Marker.parse text
 
-    assert_match("<p><a href='http://www.example.com'>[1]</a></p>\n<ol><li><a href='http://www.example.com'>http://www.example.com</a></li></ol>", markup.to_html)
+    assert_match("<p><a href='http://www.example.com'>[1]</a></p>\n<ol class='footnotes'><li><a href='http://www.example.com'>http://www.example.com</a></li></ol>", markup.to_html)
   end
 
   def test_nested_links
@@ -134,7 +134,7 @@ class LinkTest < Test::Unit::TestCase
 
     # TODO: should this collect identical links into one footnote?
     assert_match("<p><a href='http://www.example.com'>[1]</a> <a href='http://www.example.com'>[2]</a></p>\n" +
-        "<ol><li><a href='http://www.example.com'>http://www.example.com</a></li><li><a href='http://www.example.com'>http://www.example.com</a></li></ol>", markup.to_html)
+        "<ol class='footnotes'><li><a href='http://www.example.com'>http://www.example.com</a></li><li><a href='http://www.example.com'>http://www.example.com</a></li></ol>", markup.to_html)
   end
 
 end

data/test/lists_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path( File.dirname( __FILE__ ) + '/test_helper' )
 require 'marker'
 
 class ListTest < Test::Unit::TestCase

data/test/templates_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path( File.dirname( __FILE__ ) + '/test_helper' )
 require 'marker'
 
 class TemplatesTest < Test::Unit::TestCase
@@ -22,7 +22,10 @@ class TemplatesTest < Test::Unit::TestCase
     markup = Marker.parse text
     
     # might want to fix this assertion, the hash could come out in any order
-    assert_match("<p>render:template( :html, [], {\"two\"=>\"2\", \"one\"=>\"1\"} )</p>", markup.to_html)
+    assert_match("<p>render:template( :html, [], {", markup.to_html)
+    assert_match("\"two\"=>\"2\"", markup.to_html)
+    assert_match("\"one\"=>\"1\"", markup.to_html)
+    assert_match("} )</p>", markup.to_html)
   end
 
   def test_mixed_args

data/test/verbatim_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path( File.dirname( __FILE__ ) + '/test_helper' )
 require 'marker'
 
 class VerbatimTest < Test::Unit::TestCase

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Ryan Blue
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 +02:00
+date: 2010-04-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,5 +90,6 @@ test_files:
 - test/links_test.rb
 - test/test_helper.rb
 - test/formatting_test.rb
+- test/encodings_test.rb
 - test/lists_test.rb
 - test/templates_test.rb