docs/changelog-0.3.md docs/faq.md docs/markdown_extra2.md lib/maruku/attributes.rb miscs/bug.rb miscs/test.rb tests/unittest/attributes/attributes.md @@ -35,6 +35,7 @@ require 'maruku/parse_block' # Code for parsing Markdown span-level elements require 'maruku/parse_span_better' +require 'maruku/attributes' require 'maruku/structures_iterators' lib/maruku.rb @@ -1,15 +1,33 @@ +# Copyright (C) 2006 Andrea Censi <andrea (at) rubyforge.org> +# +# This file is part of Maruku. +# +# Maruku is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# Maruku is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Maruku; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# Any method that detects formatting error calls the -# error() method. -# if @meta[:on_error] == -# -# - :warning write on the standard err (or @error_stream if defined), -# then do your best. -# - :ignore be shy and try to continue -# - :raise raises a MarukuException -# -# default is :raise + +#m Any method that detects formatting error calls the +#m maruku_error() method. +#m if @meta[:on_error] == +#m +#m - :warning write on the standard err (or @error_stream if defined), +#m then do your best. +#m - :ignore be shy and try to continue +#m - :raise raises a MarukuException +#m +#m default is :raise class MarukuException < RuntimeError @@ -55,12 +73,8 @@ module MarukuErrors def describe_error(s,src,con) t = s - if src - t += "\n#{src.describe}\n" - end - if con - t += "\n#{con.describe}\n" - end + src && (t += "\n#{src.describe}\n") + con && (t += "\n#{con.describe}\n") t end lib/maruku/errors_management.rb @@ -1,3 +1,21 @@ +# Copyright (C) 2006 Andrea Censi <andrea (at) rubyforge.org> +# +# This file is part of Maruku. +# +# Maruku is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# Maruku is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Maruku; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # A series of helper functions for creating elements @@ -96,6 +114,12 @@ module Helpers meta[:title] = title if title md_el(:ref_definition, [], meta) end + + # inline attribute list + def md_ial(al) + al = Maruku::AttributeList.new(al) if al.kind_of? Array + md_el(:ial, [], {:al=>al}) + end end class MDElement @@ -147,6 +171,8 @@ class MDElement @meta[:url].inspect, @meta[:title] ? ","+@meta[:title].inspect : "" ] + when :ial + "md_ial(%s)" % @meta[:al].inspect else nil end lib/maruku/helpers.rb @@ -1,3 +1,21 @@ +# Copyright (C) 2006 Andrea Censi <andrea (at) rubyforge.org> +# +# This file is part of Maruku. +# +# Maruku is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# Maruku is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Maruku; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + class Maruku lib/maruku/html_helper.rb @@ -42,8 +42,6 @@ class Maruku output << read_table elsif [:header1,:header2].include? next_line_node_type output << read_header12 - - elsif eventually_comes_a_def_list definition = read_definition if output.last && output.last.node_type == :definition_list @@ -51,7 +49,6 @@ class Maruku else output << create_md_element(:definition_list, [definition]) end - else # Start of a paragraph output << read_paragraph end @@ -99,6 +96,7 @@ class Maruku @stack.pop # See for each list if we can omit the paragraphs and use li_span + # TODO: do this after output.each do |c| # Remove paragraphs that we can get rid of if [:ul,:ol].include? c.node_type @@ -142,10 +140,11 @@ class Maruku def read_header12 e = create_md_element(:header) line = shift_line.strip - if line =~ HeaderWithId + if (not new_meda_data?) and markdown_extra? and line =~ HeaderWithId line = $1.strip e.meta[:id] = $2 end + e.children = parse_lines_as_span [ line ] e.meta[:level] = cur_line_node_type == :header2 ? 2 : 1 lib/maruku/parse_block.rb @@ -17,6 +17,17 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +# NOTE: this is the old span-level regexp-based parser. +# +# The new parser is a real parser and is defined with functions in parse_span_better.rb +# The new parser is faster, handles syntax errors, but it's absolutely not readable. +# +# Also, regexp parsers simply CANNOT handle inline HTML properly. + + + # There are two black-magic methods `match_couple_of` and `map_match`, # defined at the end of the file, that make the function # `parse_lines_as_span` so elegant. lib/maruku/parse_span.rb @@ -36,8 +36,9 @@ class Maruku while true c = src.cur_char + # This is only an optimization which cuts 50% of the time used. + # (but you can't use a-zA-z in exit_on_chars) if c && ((c>=?a && c<=?z) || ((c>=?A && c<=?Z))) -# src.read_text_chars con.cur_string con.cur_string << src.shift_char next end @@ -85,10 +86,10 @@ class Maruku elsif src.next_matches(/<\w+:/) read_url_el(src, con) elsif src.next_matches(/<\w/) -# puts "This is HTML: #{src.cur_chars(20)}" + #puts "This is HTML: #{src.cur_chars(20)}" read_inline_html(src, con) else -# puts "This is NOT HTML: #{src.cur_chars(20)}" + #puts "This is NOT HTML: #{src.cur_chars(20)}" con.push_char src.shift_char end end @@ -152,6 +153,14 @@ class Maruku con.push_char src.shift_char end end + when ?{ # inline attribute list + if new_meta_data? + src.ignore_char # opening { + con.push_element md_ial(read_attribute_list(src, con, [?}])) + src.ignore_char # closing } + else # normal text + con.push_char src.shift_char + end when nil error ("Unclosed span (waiting for %s"+ "#{exit_on_strings.inspect})") % [ @@ -191,6 +200,9 @@ class Maruku end url = read_simple(src, [], break_on) + if not url # empty url + url = "" + end if url[0] == ?< && url[-1] == ?> url = url[1, url.size-2] @@ -203,9 +215,19 @@ class Maruku url end + + def read_quoted_or_unquoted(src, con, escaped, exit_on_chars) + case src.cur_char + when ?', ?" + read_quoted(src, con) + else + read_simple(src, escaped, exit_on_chars) + end + end + # Tries to read a quoted value. If stream does not # start with ' or ", returns nil. - def read_quoted(src,con) + def read_quoted(src, con) case src.cur_char when ?', ?" quote_char = src.shift_char # opening quote @@ -219,7 +241,9 @@ class Maruku end # Reads a simple string (no formatting) until one of break_on_chars, - # while escaping the escaped + # while escaping the escaped. + # If the string is empty, it returns nil. + # Raises on error. def read_simple(src, escaped, exit_on_chars) text = "" while true @@ -249,7 +273,7 @@ class Maruku end end # puts "Read simple #{text.inspect}" - text + text.empty? ? nil : text end def read_em(src, delim) lib/maruku/parse_span_better.rb @@ -211,7 +211,10 @@ class Maruku return :hrule if l =~ /^(\s*_\s*){3,1000}$/ # or underscores return :quote if l =~ /^>/ return :metadata if l =~ /^@/ - return :m2ref if l =~ /^\s{0,3}\{[\w\d\s]+\}:/ + if new_meta_data? + return :ald if l =~ /^\s{0,3}\{[\w\d\s]+\}:/ + return :ial if l =~ /^\s{0,3}\{.*\}/ + end return :text end lib/maruku/string_utils.rb @@ -1,318 +1,315 @@ require 'maruku' -require 'maruku/helpers' -require 'maruku/parse_span_better' +module MarukuTests + # 5 accented letters in italian, encoded as UTF-8 + AccIta8 = "\303\240\303\250\303\254\303\262\303\271" -class Maruku - - - class TestNewParser - include Helpers - include MarukuErrors - - # 5 accented letters in italian, encoded as UTF-8 - AccIta8 = "\303\240\303\250\303\254\303\262\303\271" - - # Same letters, written in ISO-8859-1 (one byte per letter) - AccIta1 = "\340\350\354\362\371" + # Same letters, written in ISO-8859-1 (one byte per letter) + AccIta1 = "\340\350\354\362\371" + + # The word MA-RU-KU, written in katakana using UTF-8 + Maruku8 = "\343\203\236\343\203\253\343\202\257" + + def test_span_parser(verbose, break_on_first_error, quiet) + good_cases = [ - # The word MA-RU-KU, written in katakana using UTF-8 - Maruku8 = "\343\203\236\343\203\253\343\202\257" + ["", [], 'Empty string gives empty list'], + ["a", ["a"], 'Easy char'], + [" a", ["a"], 'First space in the paragraph is ignored'], + ["a\n \n", ["a"], 'Last spaces in the paragraphs are ignored'], + [' ', [' '], 'One char => one string'], + [' ', [' '], 'Two chars => one char'], + ['a b', ['a b'], 'Spaces are compressed'], + ['a b', ['a b'], 'Newlines are spaces'], + ["a\nb", ['a b'], 'Newlines are spaces'], + ["a\n b", ['a b'], 'Compress newlines 1'], + ["a \nb", ['a b'], 'Compress newlines 2'], + [" \nb", ['b'], 'Compress newlines 3'], + ["\nb", ['b'], 'Compress newlines 4'], + ["b\n", ['b '], 'Compress newlines 5'], + ["\n", [' '], 'Compress newlines 6'], + ["\n\n\n", [' '], 'Compress newlines 7'], - def do_it(verbose, break_on_first_error) - good_cases = [ - ["", [], 'Empty string gives empty list'], - ["a", ["a"], 'Easy char'], - [' ', [' '], 'One char => one string'], - [' ', [' '], 'Two chars => one char'], - ['a b', ['a b'], 'Spaces are compressed'], - ['a b', ['a b'], 'Newlines are spaces'], - ["a\nb", ['a b'], 'Newlines are spaces'], - ["a\n b", ['a b'], 'Compress newlines 1'], - ["a \nb", ['a b'], 'Compress newlines 2'], - [" \nb", [' b'], 'Compress newlines 3'], - ["\nb", [' b'], 'Compress newlines 4'], - ["b\n", ['b '], 'Compress newlines 5'], - ["\n", [' '], 'Compress newlines 6'], - ["\n\n\n", [' '], 'Compress newlines 7'], - - [nil, :throw, "Should throw on nil input"], - - # Code blocks - ["`" , :throw, 'Unclosed single ticks'], - ["``" , :throw, 'Unclosed double ticks'], - ["`a`" , [md_code('a')], 'Simple inline code'], - ["`` ` ``" , [md_code('`')], ], - ["`` \\` ``" , [md_code('\\`')], ], - ["``a``" , [md_code('a')], ], - ["`` a ``" , [md_code('a')], ], - - # Newlines - ["a \n", ['a',md_el(:linebreak)], 'Two spaces give br.'], - ["a \n", ['a '], 'Newlines 2'], - [" \n", [md_el(:linebreak)], 'Newlines 3'], - [" \n \n", [md_el(:linebreak),md_el(:linebreak)],'Newlines 3'], - [" \na \n", [md_el(:linebreak),'a',md_el(:linebreak)],'Newlines 3'], - - # Inline HTML - ["a < b", ['a < b'], '< can be on itself'], - ["<hr>", [md_html('<hr />')], 'HR will be sanitized'], - ["<hr/>", [md_html('<hr />')], 'Closed tag is ok'], - ["<hr />", [md_html('<hr />')], 'Closed tag is ok 2'], - ["<hr/>a", [md_html('<hr />'),'a'], 'Closed tag is ok 2'], - ["a", [md_html(''),'a'], 'Inline HTML 1'], - ["ea", [md_html('e'),'a'], 'Inline HTML 2'], - ["aeb", ['a',md_html('e'),'b'], 'Inline HTML 3'], - ["eaf", - [md_html('e'),'a',md_html('f')], - 'Inline HTML 4'], - ["efa", - [md_html('e'),md_html('f'),'a'], - 'Inline HTML 5'], - - ["<img src='a' />", [md_html("<img src='a' />")], 'Attributes'], - ["<img src='a'/>"], - - # emphasis - ["**", :throw, 'Unclosed double **'], - ["\\*", ['*'], 'Escaping of *'], - ["a *b* ", ['a ', md_em('b'),' '], 'Emphasis 1'], - ["a *b*", ['a ', md_em('b')], 'Emphasis 2'], - ["a * b", ['a * b'], 'Emphasis 3'], - ["a * b*", :throw, 'Unclosed emphasis'], - # same with underscore - ["__", :throw, 'Unclosed double __'], - ["\\_", ['_'], 'Escaping of _'], - ["a _b_ ", ['a ', md_em('b'),' '], 'Emphasis 4'], - ["a _b_", ['a ', md_em('b')], 'Emphasis 5'], - ["a _ b", ['a _ b'], 'Emphasis 6'], - ["a _ b_", :throw, 'Unclosed emphasis'], - ["_b_", [md_em('b')], 'Emphasis 7'], - ["_b_ _c_", [md_em('b'),' ',md_em('c')], 'Emphasis 8'], - ["_b__c_", [md_em('b'),md_em('c')], 'Emphasis 9'], - # strong - ["**a*", :throw, 'Unclosed double ** 2'], - ["\\**a*", ['*', md_em('a')], 'Escaping of *'], - ["a **b** ", ['a ', md_strong('b'),' '], 'Emphasis 1'], - ["a **b**", ['a ', md_strong('b')], 'Emphasis 2'], - ["a ** b", ['a ** b'], 'Emphasis 3'], - ["a ** b**", :throw, 'Unclosed emphasis'], - ["**b****c**", [md_strong('b'),md_strong('c')], 'Emphasis 9'], - # strong (with underscore) - ["__a_", :throw, 'Unclosed double __ 2'], - ["\\__a_", ['_', md_em('a')], 'Escaping of _'], - ["a __b__ ", ['a ', md_strong('b'),' '], 'Emphasis 1'], - ["a __b__", ['a ', md_strong('b')], 'Emphasis 2'], - ["a __ b", ['a __ b'], 'Emphasis 3'], - ["a __ b__", :throw, 'Unclosed emphasis'], - ["__b____c__", [md_strong('b'),md_strong('c')], 'Emphasis 9'], - # extra strong - ["***a**", :throw, 'Unclosed triple *** '], - ["\\***a**", ['*', md_strong('a')], 'Escaping of *'], - ["a ***b*** ", ['a ', md_emstrong('b'),' '], 'Strong elements'], - ["a ***b***", ['a ', md_emstrong('b')]], - ["a *** b", ['a *** b']], - ["a ** * b", ['a ** * b']], - ["***b******c***", [md_emstrong('b'),md_emstrong('c')]], - ["a *** b***", :throw, 'Unclosed emphasis'], - # same with underscores - ["___a__", :throw, 'Unclosed triple *** '], - ["\\___a__", ['_', md_strong('a')], 'Escaping of *'], - ["a ___b___ ", ['a ', md_emstrong('b'),' '], 'Strong elements'], - ["a ___b___", ['a ', md_emstrong('b')]], - ["a ___ b", ['a ___ b']], - ["a __ _ b", ['a __ _ b']], - ["___b______c___", [md_emstrong('b'),md_emstrong('c')]], - ["a ___ b___", :throw, 'Unclosed emphasis'], - # mixing is bad - ["*a_", :throw, 'Mixing is bad'], - ["_a*", :throw], - ["**a__", :throw], - ["__a**", :throw], - ["___a***", :throw], - ["***a___", :throw], - # links of the form [text][ref] - ["\\[a]", ["[a]"], 'Escaping 1'], - ["\\[a\\]", ["[a]"], 'Escaping 2'], - ["[a]", ["a"], 'Not a link'], - ["[a][]", [ md_link(["a"],'')], 'Empty link'], - ["[a][]b", [ md_link(["a"],''),'b'], 'Empty link'], - ["[a\\]][]", [ md_link(["a]"],'')], 'Escape inside link'], - - ["[a", :throw, 'Link not closed'], - ["[a][", :throw, 'Ref not closed'], - - # links of the form [text](url) - ["\\[a](b)", ["[a](b)"], 'Links'], - ["[a](url)c", [md_im_link(['a'],'url'),'c'], 'url'], - ["[a]( url )c" ], - ["[a] ( url )c" ], - ["[a] ( url)c" ], + [nil, :throw, "Should throw on nil input"], + + # Code blocks + ["`" , :throw, 'Unclosed single ticks'], + ["``" , :throw, 'Unclosed double ticks'], + ["`a`" , [md_code('a')], 'Simple inline code'], + ["`` ` ``" , [md_code('`')], ], + ["`` \\` ``" , [md_code('\\`')], ], + ["``a``" , [md_code('a')], ], + ["`` a ``" , [md_code('a')], ], + + # Newlines + ["a \n", ['a',md_el(:linebreak)], 'Two spaces give br.'], + ["a \n", ['a '], 'Newlines 2'], + [" \n", [md_el(:linebreak)], 'Newlines 3'], + [" \n \n", [md_el(:linebreak),md_el(:linebreak)],'Newlines 3'], + [" \na \n", [md_el(:linebreak),'a',md_el(:linebreak)],'Newlines 3'], + + # Inline HTML + ["a < b", ['a < b'], '< can be on itself'], + ["<hr>", [md_html('<hr />')], 'HR will be sanitized'], + ["<hr/>", [md_html('<hr />')], 'Closed tag is ok'], + ["<hr />", [md_html('<hr />')], 'Closed tag is ok 2'], + ["<hr/>a", [md_html('<hr />'),'a'], 'Closed tag is ok 2'], + ["a", [md_html(''),'a'], 'Inline HTML 1'], + ["ea", [md_html('e'),'a'], 'Inline HTML 2'], + ["aeb", ['a',md_html('e'),'b'], 'Inline HTML 3'], + ["eaf", + [md_html('e'),'a',md_html('f')], + 'Inline HTML 4'], + ["efa", + [md_html('e'),md_html('f'),'a'], + 'Inline HTML 5'], - ["[a](ur:/l/ 'Title')", [md_im_link(['a'],'ur:/l/','Title')], - 'url and title'], - ["[a] ( ur:/l/ \"Title\")" ], - ["[a] ( ur:/l/ \"Title\")" ], - ["[a]( ur:/l/ Title)", :throw, "Must quote title" ], - - ["[a](url 'Tit\\\"l\\\\e')", [md_im_link(['a'],'url','Tit"l\\e')], - 'url and title escaped'], - ["[a] ( url \"Tit\\\"l\\\\e\")" ], - ["[a] ( url \"Tit\\\"l\\\\e\" )" ], - ['[a] ( url "Tit\\"l\\\\e" )' ], - ["[a]()", [md_im_link(['a'],'')], 'No URL is OK'], + ["<img src='a' />", [md_html("<img src='a' />")], 'Attributes'], + ["<img src='a'/>"], + + # emphasis + ["**", :throw, 'Unclosed double **'], + ["\\*", ['*'], 'Escaping of *'], + ["a *b* ", ['a ', md_em('b'),' '], 'Emphasis 1'], + ["a *b*", ['a ', md_em('b')], 'Emphasis 2'], + ["a * b", ['a * b'], 'Emphasis 3'], + ["a * b*", :throw, 'Unclosed emphasis'], + # same with underscore + ["__", :throw, 'Unclosed double __'], + ["\\_", ['_'], 'Escaping of _'], + ["a _b_ ", ['a ', md_em('b'),' '], 'Emphasis 4'], + ["a _b_", ['a ', md_em('b')], 'Emphasis 5'], + ["a _ b", ['a _ b'], 'Emphasis 6'], + ["a _ b_", :throw, 'Unclosed emphasis'], + ["_b_", [md_em('b')], 'Emphasis 7'], + ["_b_ _c_", [md_em('b'),' ',md_em('c')], 'Emphasis 8'], + ["_b__c_", [md_em('b'),md_em('c')], 'Emphasis 9'], + # strong + ["**a*", :throw, 'Unclosed double ** 2'], + ["\\**a*", ['*', md_em('a')], 'Escaping of *'], + ["a **b** ", ['a ', md_strong('b'),' '], 'Emphasis 1'], + ["a **b**", ['a ', md_strong('b')], 'Emphasis 2'], + ["a ** b", ['a ** b'], 'Emphasis 3'], + ["a ** b**", :throw, 'Unclosed emphasis'], + ["**b****c**", [md_strong('b'),md_strong('c')], 'Emphasis 9'], + # strong (with underscore) + ["__a_", :throw, 'Unclosed double __ 2'], + ["\\__a_", ['_', md_em('a')], 'Escaping of _'], + ["a __b__ ", ['a ', md_strong('b'),' '], 'Emphasis 1'], + ["a __b__", ['a ', md_strong('b')], 'Emphasis 2'], + ["a __ b", ['a __ b'], 'Emphasis 3'], + ["a __ b__", :throw, 'Unclosed emphasis'], + ["__b____c__", [md_strong('b'),md_strong('c')], 'Emphasis 9'], + # extra strong + ["***a**", :throw, 'Unclosed triple *** '], + ["\\***a**", ['*', md_strong('a')], 'Escaping of *'], + ["a ***b*** ", ['a ', md_emstrong('b'),' '], 'Strong elements'], + ["a ***b***", ['a ', md_emstrong('b')]], + ["a *** b", ['a *** b']], + ["a ** * b", ['a ** * b']], + ["***b******c***", [md_emstrong('b'),md_emstrong('c')]], + ["a *** b***", :throw, 'Unclosed emphasis'], + # same with underscores + ["___a__", :throw, 'Unclosed triple *** '], + ["\\___a__", ['_', md_strong('a')], 'Escaping of *'], + ["a ___b___ ", ['a ', md_emstrong('b'),' '], 'Strong elements'], + ["a ___b___", ['a ', md_emstrong('b')]], + ["a ___ b", ['a ___ b']], + ["a __ _ b", ['a __ _ b']], + ["___b______c___", [md_emstrong('b'),md_emstrong('c')]], + ["a ___ b___", :throw, 'Unclosed emphasis'], + # mixing is bad + ["*a_", :throw, 'Mixing is bad'], + ["_a*", :throw], + ["**a__", :throw], + ["__a**", :throw], + ["___a***", :throw], + ["***a___", :throw], + # links of the form [text][ref] + ["\\[a]", ["[a]"], 'Escaping 1'], + ["\\[a\\]", ["[a]"], 'Escaping 2'], + ["[a]", ["a"], 'Not a link'], + ["[a][]", [ md_link(["a"],'')], 'Empty link'], + ["[a][]b", [ md_link(["a"],''),'b'], 'Empty link'], + ["[a\\]][]", [ md_link(["a]"],'')], 'Escape inside link'], + + ["[a", :throw, 'Link not closed'], + ["[a][", :throw, 'Ref not closed'], + + # links of the form [text](url) + ["\\[a](b)", ["[a](b)"], 'Links'], + ["[a](url)c", [md_im_link(['a'],'url'),'c'], 'url'], + ["[a]( url )c" ], + ["[a] ( url )c" ], + ["[a] ( url)c" ], - ["[a](\"Title\")", :throw, "No url specified" ], - ["[a](url \"Title)", :throw, "Unclosed quotes" ], - ["[a](url \"Title\\\")", :throw], - ["[a](url \"Title\" ", :throw], + ["[a](ur:/l/ 'Title')", [md_im_link(['a'],'ur:/l/','Title')], + 'url and title'], + ["[a] ( ur:/l/ \"Title\")" ], + ["[a] ( ur:/l/ \"Title\")" ], + ["[a]( ur:/l/ Title)", :throw, "Must quote title" ], - ["[a](url \'Title\")", :throw, "Mixing is bad" ], - ["[a](url \"Title\')"], - - ["[a](/url)", [md_im_link(['a'],'/url')], 'Funny chars in url'], - ["[a](#url)", [md_im_link(['a'],'#url')]], - ["[a](</script?foo=1&bar=2>)", [md_im_link(['a'],'/script?foo=1&bar=2')]], - - - # Images - ["\\![a](url)", ['!', md_im_link(['a'],'url') ], 'Escaping images'], - - ["![a](url)", [md_im_image(['a'],'url')], 'Image no title'], - ["![a]( url )" ], - ["![a] ( url )" ], - ["![a] ( url)" ], + ["[a](url 'Tit\\\"l\\\\e')", [md_im_link(['a'],'url','Tit"l\\e')], + 'url and title escaped'], + ["[a] ( url \"Tit\\\"l\\\\e\")" ], + ["[a] ( url \"Tit\\\"l\\\\e\" )" ], + ['[a] ( url "Tit\\"l\\\\e" )' ], + ["[a]()", [md_im_link(['a'],'')], 'No URL is OK'], + + ["[a](\"Title\")", :throw, "No url specified" ], + ["[a](url \"Title)", :throw, "Unclosed quotes" ], + ["[a](url \"Title\\\")", :throw], + ["[a](url \"Title\" ", :throw], - ["![a](url 'ti\"tle')", [md_im_image(['a'],'url','ti"tle')], 'Image with title'], - ['![a]( url "ti\\"tle")' ], + ["[a](url \'Title\")", :throw, "Mixing is bad" ], + ["[a](url \"Title\')"], + + ["[a](/url)", [md_im_link(['a'],'/url')], 'Funny chars in url'], + ["[a](#url)", [md_im_link(['a'],'#url')]], + ["[a](</script?foo=1&bar=2>)", [md_im_link(['a'],'/script?foo=1&bar=2')]], + + + # Images + ["\\![a](url)", ['!', md_im_link(['a'],'url') ], 'Escaping images'], + + ["![a](url)", [md_im_image(['a'],'url')], 'Image no title'], + ["![a]( url )" ], + ["![a] ( url )" ], + ["![a] ( url)" ], - ["![a](url", :throw, 'Invalid images'], - ["![a( url )" ], - ["![a] ('url )" ], + ["![a](url 'ti\"tle')", [md_im_image(['a'],'url','ti"tle')], 'Image with title'], + ['![a]( url "ti\\"tle")' ], - ["![a][imref]", [md_image(['a'],'imref')], 'Image with ref'], - ["![a][ imref]"], - ["![a][ imref ]"], - ["![a][\timref\t]"], - - ['<http://example.com/?foo=1&bar=2>', - [md_url('http://example.com/?foo=1&bar=2')], 'Immediate link'], - ['a<http://example.com/?foo=1&bar=2>b', - ['a',md_url('http://example.com/?foo=1&bar=2'),'b'] ], - ['<andrea@censi.org>', - [md_email('andrea@censi.org')], 'Email address'], - ['<mailto:andrea@censi.org>'], - - ["ab", ['a',md_html(''),'b'], - 'HTML Comment'], + ["![a](url", :throw, 'Invalid images'], + ["![a( url )" ], + ["![a] ('url )" ], - ["ab", ['a',md_html(''),'b'], + 'HTML Comment'], - ["a <b", :throw, 'Bad HTML 1'], - ["<b", :throw, 'Bad HTML 2'], - ["<b!", :throw, 'Bad HTML 3'], - ['`<div>`, `<table>`, `<pre>`, ``', - [md_code('<div>'),', ',md_code('<table>'),', ', - md_code('<pre>'),', ',md_code('')], - 'Multiple HTLM tags'], - - ["&andrea", ["&andrea"], 'Parsing of entities'], + ["a<!--", :throw, 'Bad HTML Comment'], + ["a<!-- ", :throw, 'Bad HTML Comment'], + + ["a <b", :throw, 'Bad HTML 1'], + ["<b", :throw, 'Bad HTML 2'], + ["<b!", :throw, 'Bad HTML 3'], + ['`<div>`, `<table>`, `<pre>`, ``', + [md_code('<div>'),', ',md_code('<table>'),', ', + md_code('<pre>'),', ',md_code('')], + 'Multiple HTLM tags'], + + ["&andrea", ["&andrea"], 'Parsing of entities'], # no escaping is allowed # ["\\&andrea;", ["&andrea;"]], - ["&&andrea;", ["&", md_entity('andrea')] ], - ["&123;;&",[md_entity('123'),';',md_entity('amp')]], - - ["a\nThe [syntax page] [s] provides", - ['a The ', md_link(['syntax page'],'s'), ' provides'], 'Regression'], - - ["#{Maruku8}", [Maruku8], "Reading UTF-8"], - ["#{AccIta1}", [AccIta8], "Converting ISO-8859-1 to UTF-8", - {:encoding => 'iso-8859-1'}], - ] + ["&&andrea;", ["&", md_entity('andrea')] ], + ["&123;;&",[md_entity('123'),';',md_entity('amp')]], + + ["a\nThe [syntax page] [s] provides", + ['a The ', md_link(['syntax page'],'s'), ' provides'], 'Regression'], + + ["#{Maruku8}", [Maruku8], "Reading UTF-8"], + ["#{AccIta1}", [AccIta8], "Converting ISO-8859-1 to UTF-8", + {:encoding => 'iso-8859-1'}], + ] - count = 1; last_comment=""; last_expected=:throw - good_cases.each do |t| - if not t[1] - t[1] = last_expected - else - last_expected = t[1] - end - if not t[2] - t[2] = last_comment + " #{count+=1}" - else - last_comment = t[2]; count=1 - end + good_cases = unit_tests_for_attribute_lists + good_cases + + count = 1; last_comment=""; last_expected=:throw + good_cases.each do |t| + if not t[1] + t[1] = last_expected + else + last_expected = t[1] + end + if not t[2] + t[2] = last_comment + " #{count+=1}" + else + last_comment = t[2]; count=1 end + end + - - @verbose = verbose - m = Maruku.new - m.meta[:on_error] = :raise - - good_cases.each do |input, expected, comment| - output = nil - begin - output = m.parse_span_better(input) - #lines = Maruku.split_lines input - #output = m.parse_lines_as_span(lines) - rescue Exception => e - if not expected == :throw - ex = e.inspect+ "\n"+ e.backtrace.join("\n") - s = comment+describe_difference(input, expected, output) - - print_status(comment,'CRASHED :-(', ex+s) - raise e if @break_on_first_error - else - print_status(comment,'OK') - end - end - + @verbose = verbose + m = Maruku.new + m.meta[:on_error] = :raise + + good_cases.each do |input, expected, comment| + output = nil + begin + output = m.parse_span_better(input) + #lines = Maruku.split_lines input + #output = m.parse_lines_as_span(lines) + rescue Exception => e if not expected == :throw - if not (expected == output) - s = comment+describe_difference(input, expected, output) - print_status(comment, 'FAILED', s) - break if break_on_first_error - else - print_status(comment, 'OK') - end - else # I expected a raise - if output - s = comment+describe_difference(input, expected, output) + ex = e.inspect+ "\n"+ e.backtrace.join("\n") + s = comment+describe_difference(input, expected, output) - print_status(comment, 'FAILED (no throw)', s) - break if break_on_first_error - end + print_status(comment,'CRASHED :-(', ex+s) + raise e if @break_on_first_error + else + quiet || print_status(comment,'OK') end - - end + end + + if not expected == :throw + if not (expected == output) + s = comment+describe_difference(input, expected, output) + print_status(comment, 'FAILED', s) + break if break_on_first_error + else + quiet || print_status(comment, 'OK') + end + else # I expected a raise + if output + s = comment+describe_difference(input, expected, output) + + print_status(comment, 'FAILED (no throw)', s) + break if break_on_first_error + end + end + end - - PAD=40 - def print_status(comment, status, verbose_text=nil) - if comment.size < PAD - comment = comment + (" "*(PAD-comment.size)) - end - puts "- #{comment} #{status}" - if @verbose and verbose_text - puts verbose_text - end + end + + PAD=40 + def print_status(comment, status, verbose_text=nil) + if comment.size < PAD + comment = comment + (" "*(PAD-comment.size)) end - - - def describe_difference(input, expected, output) - "\nInput:\n #{input.inspect}" + - "\nExpected:\n #{expected.inspect}" + - "\nOutput:\n #{output.inspect}\n"+ - "\nExpected(more):\n #{expected.inspect}" + - "\nOutput(more):\n #{output.inspect}" + puts "- #{comment} #{status}" + if @verbose and verbose_text + puts verbose_text end - - end # class Test + end + + + def describe_difference(input, expected, output) + "\nInput:\n #{input.inspect}" + + "\nExpected:\n #{expected.inspect}" + + "\nOutput:\n #{output.inspect}\n" + end +end + +class Maruku + include MarukuTests end verbose = ARGV.include? 'v' break_on_first = ARGV.include? 'b' -Maruku::TestNewParser.new.do_it(verbose, break_on_first) +quiet = ARGV.include? 'q' +Maruku.new.test_span_parser(verbose, break_on_first, quiet) lib/maruku/tests/new_parser.rb @@ -29,4 +29,8 @@ class Maruku true end + def new_meta_data? + true + end + end \ No newline at end of file lib/maruku/version.rb 7bbdbd630a3078d8b3705700f1ab99eb0a3f097d andrea andrea@7e2f57f0-5a75-4fd6-9797-5817c466b243 http://github.com/manveru/maruku/commit/1c80abd70212ce93e7cc9fee27060cbe207aa42a 1c80abd70212ce93e7cc9fee27060cbe207aa42a

2007-01-03T15:32:57-08:00

Doing attributes git-svn-id: svn://rubyforge.org/var/svn/maruku/trunk@48 7e2f57f0-5a75-4fd6-9797-5817c466b243 7381934eb4d1319f83245ef066022fc67dc54cea andrea andrea@7e2f57f0-5a75-4fd6-9797-5817c466b243