tartan 0.2.0 → 0.2.1

data/History.txt

@@ -1,3 +1,35 @@
+= 0.2.1 2007-06-13 (r208)
+* removed class support from tables and added a general purpose attribute mechanism
+* Generalized the output types so you can pass a list of output types instead of just one and the parser will try to use them in order.  This was done to support Informl where dbhtml is used for specific cases but html is the default.
+* added failing test HeadingInsideDiv
+* Cleaned up wiki link rules to use terser regular expressions. Changed wikilink helper to not strip spaces since the parsing rules should now be doing it.
+* Get "new" Markdown <div markdown="1"> markup to work such that stuff inside the div is parsed as Markdown text (normally it isn't).
+* Fixed problem with rake where failing tests caused subsequent tests not to be run.
+* Fixed wiki-link rules so that links with text followed by other links will keep to themselves.
+
+= 0.2.0 2007-05-16 (r197)
+* Added tests to check for paragraph behavior with initial spaces and updated wiki rules to behave correctly.
+* Added tests for: combo test
+* Allow white space on "blank" lines before bullet lists.
+* Fixed bug where backquoted wikilinks weren't being place into the text verbatim.  Added test from Informl.
+* Created test files to allow testing of the interaction between markdown and wikilinks.
+* removed :db cases
+* Changes to the test framework to allow sub-classing to override what parser is used and where the source of the parsing comes from.  In particular, used to allow the source to be the HTML instead of the wiki text for the db test cases.
+* added Markdown test case for a break in a list which as sub bullets
+* Added tests for tables in code blocks and code span mark-up.  This required the addition of a new test file for rule interation.  Fixed table definition to allow tests to pass.
+* Added a test case for embedded bullet lists.
+* Fixed problem with parser rules for Markdown.  There was a stray subparse rule that was causing havoc.
+* Fixed problems in links and list items starting with numbers and asterisks.
+* Added test so check for more list problems in Markdown.
+* Added tests to record cases found using the Informl wiki.
+* Updated Rakefile to allow use when version number is not set correctly.
+* Updated to use Hoe.
+* Changed some 'require' structures to avoid multiple loads of files.
+* Put Tartan parser into module based name space.  Readme updated to cover changes.
+* Strip out html scripts in the span context.
+* Added select and option to the sets of span and block html tags.
+
+Fixed problem with multiple embedded bullet-lists.
 = 0.1.2 2007-01-22 (r181)
 * Refactored for "Tartan::" name space
 * Strip out html scripts in the span context.

data/Manifest.txt

@@ -13,6 +13,8 @@ lib/core_ext/module.rb
 lib/core_ext/regexp.rb
 lib/core_ext/symbolize.rb
 lib/tartan.rb
+lib/tartan/attribute/attribute.yml
+lib/tartan/attribute/rules.rb
 lib/tartan/markdown.rb
 lib/tartan/markdown/markdown.yml
 lib/tartan/markdown/rules.rb
@@ -29,6 +31,8 @@ test/test-combo.yml
 test/test-hash.rb
 test/test-markdown-and-wikilink.rb
 test/test-markdown-and-wikilink.yml
+test/test-markdown-table-attribute.rb
+test/test-markdown-table-attribute.yml
 test/test-markdown.rb
 test/test-markdown.yml
 test/test-match-data.rb

data/Rakefile

@@ -18,6 +18,8 @@ def version
   return nil
 end
 
+VERSION=version
+
 def name
   "tartan"
 end
@@ -54,18 +56,28 @@ def rdoc_extra
 end
 
 def test_files
-  FileList['test/test*.rb']
+  files = FileList['test/test*.rb']
+  files.collect do |f|
+    f.match(/^test\/test[-_]?(.*?)\.rb/)[1]
+  end
 end
 
 namespace :test do
+  
   test_files.each do |file|
-    test_name = file.match(/^test\/test[-_]?(.*?)\.rb/)[1]
-    desc "Run #{test_name} tests"
-    task (test_name.to_sym) {ruby "-w -I test #{file}"}
+    desc "Run #{file} tests"
+    task (file.to_sym) {ruby "-w -I test test/test-#{file}.rb"}
+  end
+
+  task :all do
+    test_files.each do |test|
+      system("ruby -w -I test test/test-#{test}.rb")
+    end
+    
   end
 end
 
-task :default => [:test]
+task :default => ["test:all"]
 
 task :version_check do
   if version.nil?

data/lib/tartan/attribute/attribute.yml

@@ -0,0 +1,39 @@
+block:
+  - title: grabAttribute
+#    after: main_block
+    before: paragraph
+    match: /^( {0,3}\{\*?:.*?\}\s*)$/
+    
+  - title: tableWithAttribute
+    before: table
+    html: 
+      start_mark: "<table>\n"
+      end_mark: </table>
+    after: html_comment
+    match: |-
+      /^[ ]{0,3} (?:\[[|!].*?\|\])
+        \s*(?:\{\*?:.*?\})?\s*
+        (?:(?:\[[|!].*?\|\])\s*(?:\{\*?:.*?\})?\s*)*/mx
+    subparse: table
+
+  - rescan
+  
+  - title: rowAttribute
+    match: /<(li)(.*?)> ((?:.(?!<\1))*?) \s*\{\*:\s*((?:\w+=".*?")(?:\s+\w+=".*?")*)\s*\}[ ]*/mx
+    html:
+      replace: '<\1\2 \4>\3'
+
+  - title: attributeInsideAtEnd
+    match: /<(\w+)(.*?)>((?:.(?!<\1))*?)[ ]*\{:\s*((?:\w+=".*?")(?:\s+\w+=".*?")*)\s*\}[ ]*<\/\1>/mx
+    html:
+      replace: '<\1\2 \4>\3</\1>'
+
+  - title: attributeAfterBlock
+    match: /<(\w+)(.*?)>((?:.(?!<\1))*?)<\/\1>\s*\n[ ]*\{:\s*((?:\w+=".*?")(?:\s+\w+=".*?")*)\s*\}[ ]*(\n)?/mx
+    html:
+      replace: '<\1\2 \4>\3</\1>\5'
+
+  - title: attributeAfter
+    match: /<(\w+)(.*?)>((?:.(?!<\1))*?)<\/\1>\s*\{:\s*((?:\w+=".*?")(?:\s+\w+=".*?")*)\s*\}/mx
+    html:
+      replace: '<\1\2 \4>\3</\1>'

data/lib/tartan/attribute/rules.rb

@@ -0,0 +1,11 @@
+require 'core_ext'
+
+# This module should be included into a Tartan subclass to add table mark-up.
+
+module Tartan
+  module Attribute
+    module Rules
+      yaml "tartan/attribute/attribute.yml"
+    end
+  end
+end

data/lib/tartan/markdown/markdown.yml

@@ -59,7 +59,7 @@ span:
       / <\/?
           (?:span|cite|del|em|strong|dfn|code|samp|kbd|var|abbr
             |acronym|b|i|font|a|img|object|tt|big|small|strike|s|u
-            |sup|sub|q|select|option)
+            |sup|sub|q|select|option|div)
           (:?\s+[^\s>][^>]*?)?
         >/x
     html:
@@ -404,6 +404,14 @@ block:
       / ^[ ]{0,3}<input.*?>/x
     html: true
 
+  - title: block_markup_div
+    match: /^[ ]{0,3}<div[ ]*([ ].+?)?[ ]+markdown="?1"?[ ]*([ ].*?)?[ ]*>(.*?)^[ ]{0,3}<\/div>/mx
+    html:
+      start_mark: <div\1\2>
+      end_mark: </div>
+    subparse: 
+      context: block
+      match_group: 3
   - title: html_block
     shelve: true
     match: >

data/lib/tartan/table/table.yml

@@ -1,17 +1,17 @@
 block:
   - title: table
     html: 
-      start_mark: "<table class=\"\\1\">\n"
+      start_mark: "<table>\n"
       end_mark: </table>
     after: html_comment
     match: |-
-      /^[ ]{0,3} (?:\[([\w]*)[|!](?:.*?)\|\])
+      /^[ ]{0,3} (?:\[[|!](?:.*?)\|\])
         (?:\s*)
         (?:(?:\[[|!](?:.*?)\|\])(?:\s*))*/mx
     subparse: table
 table: 
   - title: spanrow
-    match: "/\[(?:[\w]*)([|!]\s*.*?\s*\|)\](?:\s*)/"
+    match: "/\[([|!]\s*.*?\s*\|)\](?:\s*)/"
     subparse: 
       match_group: 1
       context: span_table_row
@@ -19,7 +19,7 @@ table:
       start_mark: <tr>
       end_mark: "</tr>\n"
   - title: blockrow
-    match: "/\[(?:[\w]*)([|!]\s*.*?\s*\|)\](?:\s*)/m"
+    match: "/\[([|!]\s*.*?\s*\|)\](?:\s*)/m"
     subparse: 
       match_group: 1
       context: block_table_row

data/lib/tartan/test/test_base.yml

@@ -8,7 +8,9 @@ block:
     html: 
       end_mark: "</p>"
       start_mark: "<p>"
+      
 span: 
+  - title: code_done
   - title: pre_emphasis
   - title: amp
   - title: italic
@@ -16,3 +18,4 @@ span:
       replace: "<em>\\1</em>"
     match: "/\*(.*?)\*/m"
   - rescan
+  

data/lib/tartan/test/wiki-test.rb

@@ -1,4 +1,4 @@
-#$Id: wiki-test.rb 193 2007-04-18 15:27:15Z alpinegizmo $
+#$Id: wiki-test.rb 207 2007-06-04 15:45:31Z bitherder $
 
 require 'test/unit'
 require 'yaml'
@@ -16,8 +16,6 @@ class WikiTestCases
     # it into a single element array
     testfiles = testfiles.to_a
 
-    targests = targets.to_a
-
     Class.new Test::Unit::TestCase do
 
       define_method 'parserClass' do
@@ -81,15 +79,16 @@ class WikiTestCases
           title = doc['title'] ? doc['title'] : (sequence += 1).to_s
 
           targets.each do |target| 
-            target = target.to_sym if target.is_a? String
-            target_name = target.id2name if target.is_a? Symbol
+            if target.kind_of? Array
+              target = target.find {|t| doc[t.to_s]}
+            end
 
-            next unless doc[target_name]
+            next unless doc[target.to_s]
 
-            define_method  "test_#{target_name}_" + title do
-              test_parser doc, options.dup, target, target_name
+            define_method  "test_#{target.to_s}_" + title do
+              test_parser doc, options.dup, target.to_sym, target.to_s
             end # define_method
-          end # targests.each
+          end # targets.each
         end # YAML::load_documents
       end  # testfiles.each
     end # Class.new

data/lib/tartan/wikilink/wikilink.yml

@@ -1,9 +1,7 @@
 span: 
   - title: wikilinkWithText
     after: code_done
-    match: '/ \[\[ \s* (.+?) (?= \s* (?:\]\] | \| ) ) \s* \| \s* (.*?) \s* \]\] /x'
-#    match: '/\[\[ ((?: . (?! \]\] | \| ) )+.) \| (.*?)\]\] /x'
-#    match: "/\[\[([^\]|]+?)[|]([^\]]*)\]\]/"
+    match: '/\[\[ \s* ((?: . (?!\]\]))+?) \s* \| \s* (.*?) \s* \]\] /x'
     shelve: true
     subparse: 
       context: span
@@ -14,7 +12,7 @@ span:
     
   - title: wikilink
     after: wikilinkWithText
-    match: "/\[\[([^\]]+)\]\]/"
+    match: "/\[\[\s*(.+?)\s*\]\]/"
     shelve: true
     html: 
       replace: "#{wiki_link_tag(\1)}\1</a>"

data/test/test-combo.yml

@@ -11,7 +11,7 @@ in: '`[|bob||jim|]`'
 html: |-
   <p><code>[|bob||jim|]</code></p>
 ---
-title: 
+title: ExclamationInTable_KNOWNtoFAIL
 in: "[| [[Blog]] (new!) |]"
 html: |-
   <table class=""><tr><td><a class="existing" href="/prefix/Blog">Blog</a> (new!)</td></tr></table>

data/test/test-markdown-and-wikilink.rb

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
-#$Id: test-markdown-and-wikilink.rb 194 2007-04-24 07:53:09Z bitherder $
+#$Id: test-markdown-and-wikilink.rb 204 2007-05-17 14:36:01Z bitherder $
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
 require 'tartan'
 require 'tartan/wikilink/rules'
 require 'tartan/test/wiki-test'
-require 'tartan/test/base_rules'
+require 'tartan/markdown'
 require 'wikilink-test-helper'
 
 module Tartan

data/test/test-markdown-table-attribute.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+#$Id: test-markdown-table-attribute.rb 208 2007-06-04 20:10:12Z alpinegizmo $
+
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+
+require 'tartan'
+require 'tartan/markdown'
+require 'tartan/table/rules'
+require 'tartan/attribute/rules'
+require 'tartan/test/wiki-test'
+
+module Tartan
+  module Attribute
+    class Parser < Tartan::Parser
+      include Tartan::Markdown::Rules
+      include Tartan::Table::Rules
+      include Tartan::Attribute::Rules
+    end
+  end
+end
+
+cases = WikiTestCases.new(Tartan::Attribute::Parser, "test-markdown-table-attribute.yml")

data/test/test-markdown-table-attribute.yml

@@ -0,0 +1,86 @@
+title: ParagraphWithAttribute
+in: |2-
+  abc
+  {: a="v" b="x y"}
+html: |-
+  <p a="v" b="x y">abc</p>
+---
+title: ParagraphWithNonquotedAttribute
+in: |2-
+  abc
+  {: a=v}
+html: |-
+  <p>abc</p>
+  {: a=v}
+---
+title: EmWithAttribute
+in: |2-
+  *abc {: a="v"}*
+html: |-
+  <p><em a="v">abc</em></p>
+---
+title: BulletListElemWithAttribute
+in: |2-
+  * a
+  * b {: id="bar"}
+  * c
+html: |-
+  <ul>
+  <li>a</li>
+  <li id="bar">b</li>
+  <li>c</li>
+  </ul>
+---
+title: BulletListWithAttribute
+in: |2-
+  * a
+  * b
+  * c
+
+  {: class="mylist"}
+html: |-
+  <ul class="mylist">
+  <li>a</li>
+  <li>b</li>
+  <li>c</li>
+  </ul>
+---
+title: BulletParagraphWithAttribute
+in: |2-
+  * a
+  
+  * b {*: id="bar"} 
+  
+  * c
+html: |-
+  <ul>
+  <li><p>a</p></li>
+  <li id="bar"><p>b</p></li>
+  <li><p>c</p></li>
+  </ul>
+---
+title: TableRowWithAttribute
+in: |2-
+  [! one |! two |]
+  [| aaa || bbb |] {: class="dark"}
+  [| xyz || 123 |]
+html: |-
+  <table>
+  <tr><th>one</th><th>two</th></tr>
+  <tr class="dark"><td>aaa</td><td>bbb</td></tr>
+  <tr><td>xyz</td><td>123</td></tr>
+  </table>
+---
+title: TableWithAttribute
+in: |2-
+  [! one |! two |]
+  [| aaa || bbb |]
+  [| xyz || 123 |]
+  
+  {: class="sortable"}
+html: |-
+  <table class="sortable">
+  <tr><th>one</th><th>two</th></tr>
+  <tr><td>aaa</td><td>bbb</td></tr>
+  <tr><td>xyz</td><td>123</td></tr>
+  </table>

data/test/test-markdown.yml

@@ -1,4 +1,4 @@
-#$Id: test-markdown.yml 198 2007-05-15 16:06:13Z bitherder $
+#$Id: test-markdown.yml 206 2007-05-26 18:40:44Z alpinegizmo $
 ---
 title: OneParagraph
 in: "abc\ndef\nxyz"
@@ -789,7 +789,7 @@ title: HtmlBlockquoteFalseBold
 in: <blockquote>An **important** block quote.</blockquote>
 html: <blockquote>An **important** block quote.</blockquote>
 ---
-title: HtmlBlockquoteDouble
+title: HtmlBlockquoteDouble_KNOWNtoFAIL
 in: <blockquote>A <blockquote>block</blockquote> **quote**.</blockquote>
 html: <blockquote>A <blockquote>block</blockquote> **quote**.</blockquote>
 ---
@@ -1244,7 +1244,7 @@ html: |-
   <li><em>etc</em></li>
   </ul>
 ---
-title: BulletListInBulletList
+title: BulletListInBulletList_KNOWNtoFAIL
 in: |-
   * A
   
@@ -1262,7 +1262,7 @@ html: |-
   <li><p>B</p></li>
   </ul>
 ---
-title: CompactBulletListWithLastLineSpaced
+title: CompactBulletListWithLastLineSpaced_KNOWNtoFAIL
 in: |-
   * a
   * b
@@ -1381,4 +1381,67 @@ html: |2
   5xxxx
   </code></pre>
   <p>6xxxx</p>
-
+---
+title: SpecialDivWMarkup
+in: |2
+  <div markdown="1">
+  This is a *very* good paragraph.
+  </div>
+html: |2
+  <div>
+  <p>This is a <em>very</em> good paragraph.</p>
+  </div>
+---
+title: SpecialDivWMarkupNumberNotQuoted
+in: |2
+  <div markdown=1>
+  This is a *very* good paragraph.
+  </div>
+html: |2
+  <div>
+  <p>This is a <em>very</em> good paragraph.</p>
+  </div>
+---
+title: SpecialDivWMarkupClassLeft
+in: |2
+  <div class="myclass" markdown="1">
+  This is a *very* good paragraph.
+  </div>
+html: |2
+  <div class="myclass">
+  <p>This is a <em>very</em> good paragraph.</p>
+  </div>
+---
+title: SpecialDivWMarkupClassRight
+in: |2
+  <div markdown="1" class="myclass" >
+  This is a *very* good paragraph.
+  </div>
+html: |2
+  <div class="myclass">
+  <p>This is a <em>very</em> good paragraph.</p>
+  </div>
+---
+title: SpecialDivWMarkupIndented
+in: |2
+    <div markdown="1" class="myclass" >
+    This is a *very* good paragraph.
+    </div>
+html: |2
+  <div class="myclass">
+  <p>This is a <em>very</em> good paragraph.</p>
+  </div>
+---
+title: PlainDivInSpan
+in: "my text <div>is special to *me*</div>"
+html: "<p>my text <div>is special to <em>me</em></div></p>"
+---
+title: HeadingInsideDiv_KNOWNtoFAIL
+in: |2-
+  <div markdown="1">
+  ## Title
+  </div>
+html: |
+  <div>
+  <h2>Title</h2>
+  </div>

data/test/test-tables.yml

@@ -3,31 +3,24 @@
 title: OneLineTable
 in: "[|bob||jim|]"
 html: |-
-  <table class="">
+  <table>
   <tr><td>bob</td><td>jim</td></tr>
   </table>
 ---
 title: OneLineTableWithBarInCell
 in: "[|bob|mike||jim|]"
 html: |-
-  <table class="">
+  <table>
   <tr><td>bob|mike</td><td>jim</td></tr>
   </table>
 ---
 title: OneLineHeaderTable
 in: "[!bob|!jim|]"
 html: |-
-  <table class="">
+  <table>
   <tr><th>bob</th><th>jim</th></tr>
   </table>
 ---
-title: OneLineTableWithClass
-in: "[class|bob||jim|]"
-html: |-
-  <table class="class">
-  <tr><td>bob</td><td>jim</td></tr>
-  </table>
----
 title: OneRowMultipleLines
 in: |-
   [|
@@ -36,7 +29,7 @@ in: |-
   jim
   |]
 html: |-
-  <table class="">
+  <table>
   <tr><td><p>bob</p></td><td><p>jim</p></td></tr>
   </table>
 ---
@@ -45,38 +38,7 @@ in: |-
   [|first||last|]
   [|billy||bob|]
 html: |-
-  <table class="">
-  <tr><td>first</td><td>last</td></tr>
-  <tr><td>billy</td><td>bob</td></tr>
-  </table>
----
-title: TwoLineTableWithClass
-in: |-
-  [class|first||last|]
-  [|billy||bob|]
-html: |-
-  <table class="class">
+  <table>
   <tr><td>first</td><td>last</td></tr>
   <tr><td>billy</td><td>bob</td></tr>
   </table>
----
-title: TwoLineTableWithClassAndHeaders
-in: |-
-  [class!first|!last|]
-  [|billy||bob|]
-html: |-
-  <table class="class">
-  <tr><th>first</th><th>last</th></tr>
-  <tr><td>billy</td><td>bob</td></tr>
-  </table>
----
-title: TwoOneLineTablesWithClass
-in: |-
-  [class1|joe||sally|]
-  [class2|bob||jim|]
-html: |-
-  <table class="class1">
-  <tr><td>joe</td><td>sally</td></tr>
-  </table><table class="class2">
-  <tr><td>bob</td><td>jim</td></tr>
-  </table>

data/test/test-wikilink.yml

@@ -22,4 +22,8 @@ html: '<p><a class="existing" href="/prefix/Page+Name">Link <em>Body</em></a></p
 ---
 title: TwoLinksOnALineWLinkText
 in: "[[Page one]] [[Page two|Second]] -- some other text"
-html: '<p><a class="existing" href="/prefix/Page+one">Page one</a> <a class="existing" href="/prefix/Page+two">Second</a> -- some other text</p>'
+html: '<p><a class="existing" href="/prefix/Page+one">Page one</a> <a class="existing" href="/prefix/Page+two">Second</a> -- some other text</p>'
+---
+title: TwoLinksOnALineWLinkTextWithSquare
+in: "[[ [some left text] | [some right text] ]]"
+html: '<p><a class="existing" href="/prefix/[some+left+text]">[some right text]</a></p>'

data/test/wikilink-test-helper.rb

@@ -7,7 +7,7 @@ module WikilinkTestHelper
       klass = "existing"
       extension = ""
     end
-      
+
     page_name = page_name.gsub(/ +/, '+')
     %Q:<a class="#{klass}" href="/prefix/#{page_name}#{extension}">:
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: tartan
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-05-16 00:00:00 +02:00
+  version: 0.2.1
+date: 2007-06-13 00:00:00 +02:00
 summary: A library for building text parsers
 require_paths: 
 - lib
@@ -44,6 +44,8 @@ files:
 - lib/core_ext/regexp.rb
 - lib/core_ext/symbolize.rb
 - lib/tartan.rb
+- lib/tartan/attribute/attribute.yml
+- lib/tartan/attribute/rules.rb
 - lib/tartan/markdown.rb
 - lib/tartan/markdown/markdown.yml
 - lib/tartan/markdown/rules.rb
@@ -60,6 +62,8 @@ files:
 - test/test-hash.rb
 - test/test-markdown-and-wikilink.rb
 - test/test-markdown-and-wikilink.yml
+- test/test-markdown-table-attribute.rb
+- test/test-markdown-table-attribute.yml
 - test/test-markdown.rb
 - test/test-markdown.yml
 - test/test-match-data.rb
@@ -75,6 +79,7 @@ test_files:
 - test/test-combo.rb
 - test/test-hash.rb
 - test/test-markdown-and-wikilink.rb
+- test/test-markdown-table-attribute.rb
 - test/test-markdown.rb
 - test/test-match-data.rb
 - test/test-readme-example.rb