tartan 0.1.0 → 0.1.1

data/test/MarkdownTest_1.0/run-markdown.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
-#$Id: run-markdown.rb 148 2006-07-22 14:04:20Z larry $
+#$Id: run-markdown.rb 174 2006-08-21 14:51:12Z bitherder $
 $:.unshift File.join(File.dirname(__FILE__), "../..", "lib")
 
 require 'tartan'
-require 'markdown'
+require 'tartan_markdown'
 # require 'profile'
 
 class WikiparserRunner
@@ -42,7 +42,7 @@ class WikiparserRunner
 
     text = File.open(wikiFileName).read
     require 'profile' if options['profile']
-    wp = Wikiparser.new(text, options)
+    wp = TartanMarkdown.new(text, options)
     html = wp.to_html
     outFile = File.open(outFileName, "w+")
     outFile.puts html

data/test/harder/test-markdown-harder.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #$Id: test-markdown.rb 75 2006-02-07 00:09:26Z larry $
 
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+$:.unshift File.join(File.dirname(__FILE__), "../..", "lib")
 
 require 'tartan_markdown'
 require 'wiki-test'

data/test/test-markdown.yml

@@ -1,4 +1,4 @@
-#$Id: test-markdown.yml 167 2006-08-15 06:15:47Z david $
+#$Id: test-markdown.yml 175 2006-08-21 14:52:09Z bitherder $
 ---
 title: OneParagraph
 in: "abc\ndef\nxyz"
@@ -52,6 +52,7 @@ in: |-
   * item2
 html: |-
   <h1>A Header 1</h1>
+  
   <ul>
   <li>item1</li>
   <li>item2</li>
@@ -395,6 +396,22 @@ html: |+
   Plus: <code>\+</code><br />
   Minus: <code>\-</code><br /></p>
 ---
+title: ParagraphWithList
+in: |-
+  A list within a blockquote:
+  
+  * asterisk 1
+  * asterisk 2
+  * asterisk 3
+html: |-
+  <p>A list within a blockquote:</p>
+  
+  <ul>
+  <li>asterisk 1</li>
+  <li>asterisk 2</li>
+  <li>asterisk 3</li>
+  </ul>
+---
 title: ListInBlockquote
 in: |
   > A list within a blockquote:
@@ -1067,6 +1084,21 @@ html: |-
   <p>Happy days</p>
   
   
+---
+title: TwoLineCodeBlock
+in: |2-
+  Paragraph 1
+  
+      http://example.com/
+      
+  Paragraph 2
+html: |-
+  <p>Paragraph 1</p>
+  
+  <pre><code>http://example.com/
+  </code></pre>
+
+  <p>Paragraph 2</p>
 ---
 # Transfered from test-markdown-harder.yml
 title: LTGTinCode
@@ -1142,3 +1174,18 @@ html: |-
   <p>bob</p>
   
   <hr />
+---
+title: CodeAfterHeader
+in: |-
+  ##Header
+
+      code
+html: |-
+  <h2>Header</h2>
+  
+  <pre><code>code
+  </code></pre>
+---
+title: DoubleCevrons
+in: Start with <<some text>> and some other text.
+html: <p>Start with &lt;&lt;some text&gt;&gt; and some other text.</p>

data/test/test-readme-example.rb

@@ -1,4 +1,4 @@
-#$Id: test-readme-example.rb 164 2006-08-13 18:17:48Z larry $
+#$Id: test-readme-example.rb 173 2006-08-21 09:19:04Z bitherder $
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
@@ -8,16 +8,98 @@ require 'tartan'
 ParagraphAndCodeDef = %q~
 block:
   - title: code
-    match: "/(^[ ]{2,}\S.+?$\n)+^[ ]{2,}\S.+?$/m"
+    match: /(^[ ]{2,}\S.+?$\n)+^[ ]{2,}\S.+?$/m
     html:
       start_mark: <pre><code>
       end_mark: </code></pre>
   - title: paragraph
-    match: "/(^[^\n]+$\n)+^[^\n]+$/m"
+    match: /(^[^\n]+$\n)*^[^\n]+$/m
     html:
       start_mark: <p>
       end_mark:   </p>
 ~
+WithEmphasisDef = %q~
+block:
+  - title: code
+    match: /(^[ ]{2,}\S.+?$\n)+^[ ]{2,}\S.+?$/m
+    html:
+      start_mark: <pre><code>
+      end_mark: </code></pre>
+  - title: paragraph
+    match: /(^[^\n]+$\n)*^[^\n]+$/m
+    subparse: paragraph
+    html:
+      start_mark: <p>
+      end_mark:   </p>
+paragraph:
+  - title: strong
+    match: /\*\*(.*?)\*\*/m
+    html:
+      replace: <strong>\1</strong>
+
+  - rescan
+
+  - title: emphasis
+    match: /\*(.*?)\*/m
+    html:
+      replace: <em>\1</em>
+~
+
+WithoutStrongDef = %q~
+block:
+  - title: code
+    match: /(^[ ]{2,}\S.+?$\n)+^[ ]{2,}\S.+?$/m
+    html:
+      start_mark: <pre><code>
+      end_mark: </code></pre>
+  - title: paragraph
+    match: /(^[^\n]+$\n)*^[^\n]+$/m
+    subparse: paragraph
+    html:
+      start_mark: <p>
+      end_mark:   </p>
+paragraph:
+  - title: emphasis
+    match: /\*(.*?)\*/
+    html:
+      replace: <em>\1</em>
+~
+EntityDef = %q~
+paragraph:
+  - rescan
+  - title: amp
+    match: /&/
+    html:
+      replace: '&amp;'
+    rescan: true
+  - title: rightArrow
+    match: /->/
+    html:
+      replace: '&rarr;'
+    rescan: true
+  - title: lessThan
+    match: /</
+    html:
+      replace: '&lt;'
+    rescan: true
+  - title: greaterThan
+    match: />/
+    html:
+      replace: '&gt;'
+~
+
+EmphasisText = <<TEXT
+Now is the time for all *good*
+**men** to come to the aid of 
+their party.
+
+  p "Hello"
+  p "World"
+TEXT
+
+EmbeddedEmphasisText = 
+  "Now listen to this **I want *you* to really hear me**."
+
 class ReadmeTestCase < Test::Unit::TestCase
   class ParagraphAndCode < Tartan
     set_defs(ParagraphAndCodeDef)
@@ -25,7 +107,7 @@ class ReadmeTestCase < Test::Unit::TestCase
 
   def testParagraphAndCode
     text = <<TEXT
-Now is the time for all good 
+Now is the time for all good
 men to come to the aid of 
 their party.
 
@@ -34,7 +116,7 @@ their party.
 TEXT
 
     html = \
-%q~<p>Now is the time for all good 
+%q~<p>Now is the time for all good
 men to come to the aid of 
 their party.</p>
 
@@ -45,4 +127,61 @@ their party.</p>
     parser = ParagraphAndCode.new(text)
     assert_equal(html, parser.to_html)
   end
+  
+  class WithEmphasis < Tartan
+    set_defs(WithEmphasisDef)
+  end
+  
+  def testWithEmphasis
+    html = \
+%q~<p>Now is the time for all <em>good</em>
+<strong>men</strong> to come to the aid of 
+their party.</p>
+
+<pre><code>  p "Hello"
+  p "World"</code></pre>
+~
+
+    parser = WithEmphasis.new(EmphasisText)
+    assert_equal(html, parser.to_html)
+  end
+
+  def testWithEmbeddedEmpahsis
+    html = "<p>Now listen to this <strong>I want <em>you</em> to really hear me</strong>.</p>"
+    
+    parser = WithEmphasis.new(EmbeddedEmphasisText)
+    assert_equal(html, parser.to_html)
+  end
+  
+  class WithoutStrong < Tartan
+    set_defs(WithoutStrongDef)
+  end
+  
+  def testWithoutStrong
+    html = "<p>Now listen to this <em></em>I want <em>you</em> to really hear me<em></em>.</p>"
+
+    parser = WithoutStrong.new(EmbeddedEmphasisText)
+    assert_equal(html, parser.to_html)
+  end
+
+  class EntityMixin < Tartan
+    set_defs(WithEmphasisDef)
+    add_defs(EntityDef)
+  end
+  
+  def testEnityMixin
+    text = 
+%q~A paragraph in HTML is marked-up using a <p> start tag and a </p> end tag.  
+Thus, the phrase "I was here." -> "<p>I was here</p>".  If you want to use less
+than and greater than characters you will need to put &lt; and &gt; respectively
+in your HTML.~
+
+    html =
+%q~<p>A paragraph in HTML is marked-up using a &lt;p&gt; start tag and a &lt;/p&gt; end tag.  
+Thus, the phrase "I was here." &rarr; "&lt;p&gt;I was here&lt;/p&gt;".  If you want to use less
+than and greater than characters you will need to put &amp;lt; and &amp;gt; respectively
+in your HTML.</p>~
+    parser = EntityMixin.new(text)
+    assert_equal(html, parser.to_html)
+  end
 end

data/test/test-regexp.rb

@@ -0,0 +1,42 @@
+# $Id: test-regexp.rb 173 2006-08-21 09:19:04Z bitherder $
+
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+
+require 'test/unit'
+require 'core_ext/regexp'
+  
+class TestString < Test::Unit::TestCase
+  def testOneLine
+    match = "/^(\s+)$/".to_regexp.match(" \n ")
+    assert_equal(" ", match[1])
+  end
+
+  def testMultiLine
+    text_in = " \n \n"
+    expected_match = " \n \n"
+    regex_from_string = '/^(\s+)$/m'.to_regexp
+    
+    assert_equal(Regexp::MULTILINE, regex_from_string.options)
+    assert_equal('^(\s+)$', regex_from_string.source)
+    
+    plain_regex = /^(\s+)$/m
+
+    assert_equal(Regexp::MULTILINE, plain_regex.options)
+    assert_equal('^(\s+)$', plain_regex.source)
+    
+    match_from_string = regex_from_string.match(text_in)
+    match_from_regex = /^(\s+)$/m.match(text_in)
+    
+    assert_equal(expected_match, match_from_regex[1])
+    assert_equal(expected_match, match_from_string[1])
+  end
+  
+  def testWhitespaceAtEndOfLine
+    regexp = '/^(#{1,6})\s*([^#\s][^#]*?)(?:\s*\#+)?\s*?$/'.to_regexp
+    match = regexp.match "## header\n\nSome text."
+    
+    assert_equal("##", match[1])
+    assert_equal("header", match[2])
+    assert_equal("## header", match[0])
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: tartan
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-08-17 00:00:00 +02:00
+  version: 0.1.1
+date: 2006-08-21 00:00:00 +02:00
 summary: A library for building text parsers
 require_paths: 
 - lib
@@ -41,6 +41,7 @@ files:
 - test/test-markdown.yml
 - test/test-match-data.rb
 - test/test-readme-example.rb
+- test/test-regexp.rb
 - test/test-tables.rb
 - test/test-tables.yml
 - test/test-tartan-markdown.rb
@@ -75,8 +76,10 @@ files:
 - test/MarkdownTest_1.0/Literal quotes in titles.html
 - test/MarkdownTest_1.0/Literal quotes in titles.text
 - test/MarkdownTest_1.0/Markdown Documentation - Basics.html
+- test/MarkdownTest_1.0/Markdown Documentation - Basics.out
 - test/MarkdownTest_1.0/Markdown Documentation - Basics.text
 - test/MarkdownTest_1.0/Markdown Documentation - Syntax.html
+- test/MarkdownTest_1.0/Markdown Documentation - Syntax.out
 - test/MarkdownTest_1.0/Markdown Documentation - Syntax.text
 - test/MarkdownTest_1.0/Nested blockquotes.html
 - test/MarkdownTest_1.0/Nested blockquotes.text
@@ -121,6 +124,7 @@ test_files:
 - test/test-markdown.rb
 - test/test-match-data.rb
 - test/test-readme-example.rb
+- test/test-regexp.rb
 - test/test-tables.rb
 - test/test-tartan-markdown.rb
 - test/test-tartan.rb