creole 0.3.7 → 0.3.8

data/lib/creole.rb

@@ -37,7 +37,7 @@ require 'uri'
 # methods are: make_local_link
 class Creole
 
-  VERSION = '0.3.7'
+  VERSION = '0.3.8'
 
   # Convert the argument in Creole format to HTML and return the
   # result. Example:
@@ -231,7 +231,7 @@ class Creole
   def parse_inline(str)
     until str.empty?
       case str
-      when /\A(\~)?((https?|ftps?):\/\/\S+?)(?=([,.?!:;"'\)])?(\s|$))/
+      when /\A(\~)?((https?|ftps?):\/\/\S+?)(?=([\,.?!:;"'\)]+)?(\s|$))/
         if $1
           @out << escape_html($2)
         else

data/test/creole_test.rb

@@ -144,9 +144,6 @@ describe Creole do
     # Creole1.0: URLs
     tc "<p><a href=\"http://www.wikicreole.org/\">http://www.wikicreole.org/</a></p>", "[[http://www.wikicreole.org/]]"
 
-    # Creole1.0: Free-standing URL's should be turned into links
-    tc "<p><a href=\"http://www.wikicreole.org/\">http://www.wikicreole.org/</a></p>", "http://www.wikicreole.org/"
-
     # Creole1.0: Single punctuation characters at the end of URLs
     # should not be considered a part of the URL.
     [',','.','?','!',':',';','\'','"'].each do |punct|
@@ -170,6 +167,26 @@ describe Creole do
     tc("<p><a href=\"http://dot.com/\">dot.com</a></p>", "[[  http://dot.com/  |  dot.com ]]")
   end
 
+  it 'should parse freestanding urls' do
+    # Creole1.0: Free-standing URL's should be turned into links
+    tc "<p><a href=\"http://www.wikicreole.org/\">http://www.wikicreole.org/</a></p>", "http://www.wikicreole.org/"
+
+    # URL ending in .
+    tc "<p>Text <a href=\"http://wikicreole.org\">http://wikicreole.org</a>. other text</p>", "Text http://wikicreole.org. other text"
+
+    # URL ending in ),
+    tc "<p>Text (<a href=\"http://wikicreole.org\">http://wikicreole.org</a>), other text</p>", "Text (http://wikicreole.org), other text"
+
+    # URL ending in ).
+    tc "<p>Text (<a href=\"http://wikicreole.org\">http://wikicreole.org</a>). other text</p>", "Text (http://wikicreole.org). other text"
+
+    # URL ending in ).
+    tc "<p>Text (<a href=\"http://wikicreole.org\">http://wikicreole.org</a>).</p>", "Text (http://wikicreole.org)."
+
+    # URL ending in )
+    tc "<p>Text (<a href=\"http://wikicreole.org\">http://wikicreole.org</a>)</p>", "Text (http://wikicreole.org)"
+  end
+
   it 'should parse paragraphs' do
     # Creole1.0: One or more blank lines end paragraphs.
     tc "<p>This is my text.</p><p>This is more text.</p>", "This is\nmy text.\n\nThis is\nmore text."
@@ -336,9 +353,6 @@ describe Creole do
     # Another test from Creole Wiki
     tc("<p>Formatted fruits, for example:<em>apples</em>, oranges, <strong>pears</strong> ...</p>",
        "Formatted fruits, for example://apples//, oranges, **pears** ...")
-
-    tc("<p>Blablabala (<a href=\"http://blub.de\">http://blub.de</a>)</p>",
-       "Blablabala (http://blub.de)")
   end
 
   it 'should parse ambiguious bold and lists' do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Lars Christensen