marker 0.2.2 → 0.3.0

data/lib/marker/common.rb

@@ -11,7 +11,7 @@ module Treetop #:nodoc:
     class SyntaxNode #:nodoc:
       # returns whether the ParseNode matched any text
       def present?
-        text_value.any?
+        not text_value.empty?
       end
     end
   end

data/lib/marker/language.treetop

@@ -614,7 +614,7 @@ module Marker
     # * %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

data/lib/marker/links.rb

@@ -137,23 +137,17 @@ module Marker #:nodoc:
 
   class URL < ParseNode
     def to_html( options = {} )
-      f = options[:footnotes]
-      if f
-        n = f.add( bare_url )
-        "<a href='#{bare_url}'>[#{n}]</a>"
+      url = bare_url
+      if url =~ /[.,!?:]$/
+        "<a href='#{url[0...-1]}'>#{url[0...-1]}</a>#{url[-1]}"
       else
-        "<a href='#{bare_url}'>#{bare_url}</a>"
+        "<a href='#{url}'>#{url}</a>"
       end
     end
 
     def to_s( options = {} )
-      f = options[:footnotes]
-      if f
-        n = f.add( bare_url )
-        "[#{n}]"
-      else
-        bare_url
-      end
+      # no need to worry about trailing punctuation since it's all text.
+      bare_url
     end
 
     # returns just the URL that was matched

data/test/links_test.rb

@@ -101,25 +101,35 @@ class LinkTest < Test::Unit::TestCase
     text = "http://www.example.com following text"
     markup = Marker.parse text
     
-    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)
+    assert_match("<p><a href='http://www.example.com'>http://www.example.com</a> following text</p>", 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)
+    assert_match("<p><a href='http://www.example.com/page?input=%28%29'>http://www.example.com/page?input=%28%29</a> following text</p>", 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)
+    assert_match("<p><a href='http://www.example.com/page#anchor'>http://www.example.com/page#anchor</a> following text</p>", markup.to_html)
+  end
+
+  def test_bare_url_with_punctuation
+    text = "http://www.example.com. following text"
+    markup = Marker.parse text
+    assert_match("<p><a href='http://www.example.com'>http://www.example.com</a>. following text</p>", markup.to_html)
+
+    text = "http://www.example.com, following text"
+    markup = Marker.parse text
+    assert_match("<p><a href='http://www.example.com'>http://www.example.com</a>, following text</p>", markup.to_html)
   end
 
   def test_multiple_footnotes
-    text = "http://www.example.com [http://www.example.com]"
+    text = "[http://www.example.com] [http://www.example.com]"
     markup = Marker.parse text
 
     # TODO: should this collect identical links into one footnote?

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: marker
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ryan Blue
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 +01:00
+date: 2010-04-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: treetop
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 2
         version: 1.4.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: rdblue@gmail.com
 executables: 
@@ -33,15 +42,15 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - bin/marker
-- lib/marker.rb
-- lib/marker/verbatim.rb
-- lib/marker/templates.rb
-- lib/marker/markup.rb
 - lib/marker/common.rb
-- lib/marker/text.rb
-- lib/marker/links.rb
 - lib/marker/lists.rb
 - lib/marker/headings.rb
+- lib/marker/text.rb
+- lib/marker/markup.rb
+- lib/marker/verbatim.rb
+- lib/marker/links.rb
+- lib/marker/templates.rb
+- lib/marker.rb
 - lib/marker/language.treetop
 - README
 - LICENSE
@@ -58,26 +67,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A markup parser that outputs html and text.  Syntax is similar to MediaWiki.
 test_files: 
-- test/templates_test.rb
 - test/verbatim_test.rb
 - test/headings_test.rb
-- test/formatting_test.rb
-- test/test_helper.rb
 - test/links_test.rb
+- test/test_helper.rb
+- test/formatting_test.rb
 - test/lists_test.rb
+- test/templates_test.rb