marker 0.2.1 → 0.2.2

data/lib/marker/language.treetop

@@ -612,8 +612,9 @@ module Marker
     # additions:
     # * @, :, / are added because they are valid in some cases (not checked)
     # * %XX is allowed as a character, these are escaped characters
+    # * '#' is added for HTML anchors
     rule url_safe_char
-      !"]" [A-Za-z0-9$-_.+!*'(),@:/]
+      !"]" [A-Za-z0-9$-_.+!*'(),@:/#]
       /
       "%" xdigit xdigit
     end
@@ -679,7 +680,6 @@ module Marker
     end
 
     # new lines
-    #-- TODO: should this be broken into exactly one and any number rules? ++
     rule nl
       "\n"*
     end

data/test/links_test.rb

@@ -55,6 +55,13 @@ class LinkTest < Test::Unit::TestCase
     assert_match("<a href='http://www.example.com'>Example link</a>", markup.to_html)
   end
 
+  def test_external_link_with_anchor
+    text = "[http://www.example.com/page#anchor Example link]"
+    markup = Marker.parse text
+    
+    assert_match("<a href='http://www.example.com/page#anchor'>Example link</a>", markup.to_html)
+  end
+
   def test_bare_external_link
     text = "[http://www.example.com]"
     markup = Marker.parse text
@@ -91,10 +98,24 @@ class LinkTest < Test::Unit::TestCase
   end
 
   def test_bare_url
-    text = "http://www.example.com"
+    text = "http://www.example.com following text"
     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> following text</p>\n<ol><li><a href='http://www.example.com'>http://www.example.com</a></li></ol>", markup.to_html)
+  end
+
+  def test_bare_url_with_encodings
+    text = "http://www.example.com/page?input=%28%29 following text"
+    markup = Marker.parse text
+    
+    assert_match("<p><a href='http://www.example.com/page?input=%28%29'>[1]</a> following text</p>\n<ol><li><a href='http://www.example.com/page?input=%28%29'>http://www.example.com/page?input=%28%29</a></li></ol>", markup.to_html)
+  end
+
+  def test_bare_url_with_anchor
+    text = "http://www.example.com/page#anchor following text"
+    markup = Marker.parse text
+    
+    assert_match("<p><a href='http://www.example.com/page#anchor'>[1]</a> following text</p>\n<ol><li><a href='http://www.example.com/page#anchor'>http://www.example.com/page#anchor</a></li></ol>", markup.to_html)
   end
 
   def test_multiple_footnotes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: marker
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ryan Blue
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 +01:00
+date: 2010-02-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency