tartan 0.1.1 → 0.2.0

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

@@ -0,0 +1,6 @@
+#$Id: test-larry-wikiparser.yml 116 2006-04-23 12:23:08Z larry $
+
+title: BackquotedLink
+in: "`[[my page]]`"
+html: '<p><code>[[my page]]</code></p>'
+---

data/test/test-markdown.rb

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
-#$Id: test-markdown.rb 148 2006-07-22 14:04:20Z larry $
+#$Id: test-markdown.rb 181 2007-01-05 20:59:06Z bitherder $
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
-#require 'tartan'
-require 'tartan_markdown'
-require 'wiki-test'
+require 'tartan/markdown'
+require 'tartan/test/wiki-test'
 
-cases = WikiTestCases.new(TartanMarkdown, "test-markdown.yml")
+cases = WikiTestCases.new(Tartan::Markdown::Parser, "test-markdown.yml")
 

data/test/test-markdown.yml

@@ -1,4 +1,4 @@
-#$Id: test-markdown.yml 175 2006-08-21 14:52:09Z bitherder $
+#$Id: test-markdown.yml 198 2007-05-15 16:06:13Z bitherder $
 ---
 title: OneParagraph
 in: "abc\ndef\nxyz"
@@ -1189,3 +1189,196 @@ html: |-
 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>
+---
+title: ThreeLevelBullet
+in: |-
+  * aaaa
+  * bbbb
+    * xxxx
+    * yyyy
+       * pppp
+       * dddd
+       * qqqq
+    * zzzz
+  * cccc
+html: |-
+  <ul>
+  <li>aaaa</li>
+  <li>bbbb
+  <ul>
+  <li>xxxx</li>
+  <li>yyyy
+  <ul>
+  <li>pppp</li>
+  <li>dddd</li>
+  <li>qqqq</li>
+  </ul></li>
+  <li>zzzz</li>
+  </ul></li>
+  <li>cccc</li>
+  </ul>
+---
+title: diget_starts_bullet
+in: |-
+  * 1 Happy
+  * 2 Days
+  * 3 Again
+html: |-
+  <ul>
+  <li>1 Happy</li>
+  <li>2 Days</li>
+  <li>3 Again</li>
+  </ul>
+---
+title: BulletListWEmphasis
+in: |-
+  * DabbleDB
+  * OpenRecord
+  * JotSpot
+  * *etc*
+html: |-
+  <ul>
+  <li>DabbleDB</li>
+  <li>OpenRecord</li>
+  <li>JotSpot</li>
+  <li><em>etc</em></li>
+  </ul>
+---
+title: BulletListInBulletList
+in: |-
+  * A
+  
+    * one
+    * two
+    
+  * B
+html: |-
+  <ul>
+  <li><p>A</p>
+  <ul>
+  <li>one</li>
+  <li>two</li>
+  </ul></li>
+  <li><p>B</p></li>
+  </ul>
+---
+title: CompactBulletListWithLastLineSpaced
+in: |-
+  * a
+  * b
+    * b 1
+    * b 2
+  * c
+  
+  * d
+html: |-
+  <ul>
+  <li>a</li>
+  <li>b
+  <ul>
+  <li>b 1</li>
+  <li>b 2</li>
+  </ul>
+  <li><p>c</p></li>
+  <li><p>d</p></li>
+  </ul>
+---
+title: SpaceBeforeCloseBulletList
+in: "Foo\n \n* a\n* b"
+html: |-
+  <p>Foo</p>
+  
+  <ul>
+  <li>a</li>
+  <li>b</li>
+  </ul>
+---
+title: SpaceBeforeSpacedBulletList
+in: "Foo\n \n* a\n\n* b"
+html: |-
+  <p>Foo</p>
+
+  <ul>
+  <li><p>a</p></li>
+  <li><p>b</p></li>
+  </ul>
+---
+title: SpacesBeforeParagraphs
+in: |2
+  xxx
+
+   xxx
+
+    xxx
+
+     xxx
+
+      xxx
+html: |2
+  <p>xxx</p>
+
+  <p>xxx</p>
+
+  <p>xxx</p>
+
+  <p>xxx</p>
+
+  <pre><code>xxx
+  </code></pre>
+---
+title: paragraphsWithSpacesAfterFirstLine
+in: |2
+  xxxxx
+   xxxxx
+    xxxxx
+     xxxxx
+
+   xxxx
+    xxxx
+     xxxx
+
+    xxxx
+     xxxx
+
+  xxxxx
+       xxxx
+html: |2
+  <p>xxxxx
+   xxxxx
+    xxxxx
+     xxxxx</p>
+
+  <p>xxxx
+    xxxx
+     xxxx</p>
+
+  <p>xxxx
+     xxxx</p>
+
+  <p>xxxxx
+       xxxx</p>
+---
+# GRUBER-EXCEPTION: there should be an extral new-line between lines 5 and 6.
+title: CodeBlocksAndParagraphs
+in: |2
+  1xxxx
+    
+      2xxxx
+
+      3xxxx
+          4xxxx
+
+      5xxxx
+    6xxxx
+html: |2
+  <p>1xxxx</p>
+
+  <pre><code>2xxxx
+
+  3xxxx
+      4xxxx
+
+  5xxxx
+  </code></pre>
+  <p>6xxxx</p>
+

data/test/test-readme-example.rb

@@ -1,9 +1,10 @@
-#$Id: test-readme-example.rb 173 2006-08-21 09:19:04Z bitherder $
+#$Id: test-readme-example.rb 182 2007-01-28 21:32:51Z bitherder $
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
 require 'test/unit'
 require 'tartan'
+require 'tracer'
 
 ParagraphAndCodeDef = %q~
 block:
@@ -101,7 +102,7 @@ EmbeddedEmphasisText =
   "Now listen to this **I want *you* to really hear me**."
 
 class ReadmeTestCase < Test::Unit::TestCase
-  class ParagraphAndCode < Tartan
+  class ParagraphAndCode < Tartan::Parser
     set_defs(ParagraphAndCodeDef)
   end
 
@@ -128,7 +129,7 @@ their party.</p>
     assert_equal(html, parser.to_html)
   end
   
-  class WithEmphasis < Tartan
+  class WithEmphasis < Tartan::Parser
     set_defs(WithEmphasisDef)
   end
   
@@ -153,7 +154,7 @@ their party.</p>
     assert_equal(html, parser.to_html)
   end
   
-  class WithoutStrong < Tartan
+  class WithoutStrong < Tartan::Parser
     set_defs(WithoutStrongDef)
   end
   
@@ -164,7 +165,7 @@ their party.</p>
     assert_equal(html, parser.to_html)
   end
 
-  class EntityMixin < Tartan
+  class EntityMixin < Tartan::Parser
     set_defs(WithEmphasisDef)
     add_defs(EntityDef)
   end

data/test/test-tables.rb

@@ -4,13 +4,17 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
 require 'tartan'
-require 'tartan_table_def'
-require 'wiki-test'
-require 'tartan_test_base_def'
+require 'tartan/table/rules'
+require 'tartan/test/wiki-test'
+require 'tartan/test/base_rules'
 
-class TartanTestTable < Tartan
-  include TartanTestBaseDef
-  include TartanTableDef
+module Tartan
+  module Table
+    class Parser < Tartan::Parser
+      include Tartan::Test::BaseRules
+      include Tartan::Table::Rules
+    end
+  end
 end
 
-cases = WikiTestCases.new(TartanTestTable, "test-tables.yml")
+cases = WikiTestCases.new(Tartan::Table::Parser, "test-tables.yml")

data/test/test-tartan.rb

@@ -1,4 +1,4 @@
-#$Id: test-tartan.rb 169 2006-08-16 22:16:12Z bitherder $
+#$Id: test-tartan.rb 181 2007-01-05 20:59:06Z bitherder $
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
@@ -110,6 +110,7 @@ block:
 ~
 
 class WikiDefsTestCase < Test::Unit::TestCase
+    include Tartan
     def testInitWNoArg
         defs = WikiDefs.new
         assert(defs, "New def is not nil")
@@ -195,7 +196,7 @@ class WikiDefsTestCase < Test::Unit::TestCase
 end
 
 class TartanTestCase < Test::Unit::TestCase
-    class TestTartan < Tartan
+    class TestTartan < Tartan::Parser
       set_defs({:block => [
                 {:title => 'rule', 
                  :match => /:\)/, 
@@ -218,7 +219,7 @@ class TartanTestCase < Test::Unit::TestCase
        assert_equal("Test.\n", parser.to_html)
     end
 
-    class LastRuleTartan < Tartan
+    class LastRuleTartan < Tartan::Parser
       set_defs({:block => [
                   {:title => 'rule', 
                    :position => :not_last,
@@ -238,7 +239,7 @@ class TartanTestCase < Test::Unit::TestCase
        assert_equal(":)\n:)-", parser.to_html)
     end
 
-    class VarSetTartan < Tartan
+    class VarSetTartan < Tartan::Parser
       set_defs({:block => [
                     {:title => 'var_rule', 
                      :match => /(:\))/, 
@@ -253,7 +254,7 @@ class TartanTestCase < Test::Unit::TestCase
        assert_equal("-:)-", parser.to_html)
     end
     
-    class SetVarMarkTartan < Tartan
+    class SetVarMarkTartan < Tartan::Parser
       set_defs({:block => [
                  {:title => 'var_rule', 
                   :match => /(:\))/, 
@@ -268,7 +269,7 @@ class TartanTestCase < Test::Unit::TestCase
        assert_equal("<-:)->:)<>", parser.to_html)
     end
 
-    class TemplateTartan < Tartan
+    class TemplateTartan < Tartan::Parser
       set_defs Template_def
     end
     
@@ -281,7 +282,7 @@ class TartanTestCase < Test::Unit::TestCase
       assert_equal(":}", parser.to_html)
     end
 
-    class DefaultTartan < Tartan
+    class DefaultTartan < Tartan::Parser
       set_defs Default_def
     end
     

data/test/test-wikilink.rb

@@ -1,18 +1,22 @@
 #!/usr/bin/env ruby
-#$Id: test-wikilink.rb 158 2006-07-23 23:47:12Z larry $
+#$Id: test-wikilink.rb 181 2007-01-05 20:59:06Z bitherder $
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
 require 'tartan'
-require 'tartan_wikilink_def'
-require 'wiki-test'
+require 'tartan/wikilink/rules'
+require 'tartan/test/wiki-test'
+require 'tartan/test/base_rules'
 require 'wikilink-test-helper'
-require 'tartan_test_base_def'
 
-class TartanTestWikilink < Tartan
-  include TartanTestBaseDef
-  include TartanWikilinkDef
-  include WikilinkTestHelper
+module Tartan
+  module Wikilink
+    class Parser < Tartan::Parser
+      include Tartan::Test::BaseRules
+      include Tartan::Wikilink::Rules
+      include WikilinkTestHelper
+    end
+  end
 end
 
-cases = WikiTestCases.new(TartanTestWikilink, "test-wikilink.yml")
+cases = WikiTestCases.new(Tartan::Wikilink::Parser, "test-wikilink.yml")

data/test/test-wikilink.yml

@@ -20,3 +20,6 @@ title: ExistingWithNameAndLinkBodyWithStyle
 in: "[[Page Name|Link *Body*]]"
 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>'

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: tartan
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-08-21 00:00:00 +02:00
+  version: 0.2.0
+date: 2007-05-16 00:00:00 +02:00
 summary: A library for building text parsers
 require_paths: 
 - lib
-email: 
-homepage: 
-rubyforge_project: 
+email: tartan@folklogic.com
+homepage: http://tartan.rubyforge.com/
+rubyforge_project: tartan
 description: A text parsing engine. The syntax is defined outside the engine as regex-based rules, in YAML or Ruby. It supports layering and multiple output types. Rules for Markdown to HTML are included, with optional layered extensions for tables and wikilinks.
 autorequire: 
 default_executable: 
@@ -29,14 +29,37 @@ post_install_message:
 authors: 
 - Larry Baltz and David B. Anderson
 files: 
-- README
-- TODO
+- History.txt
 - MIT-LICENSE
-- test/MarkdownTest_1.0
-- test/harder
-- test/redcloth
+- Manifest.txt
+- README.txt
+- Rakefile
+- TODO
+- lib/core_ext.rb
+- lib/core_ext/array.rb
+- lib/core_ext/file.rb
+- lib/core_ext/hash.rb
+- lib/core_ext/match_data.rb
+- lib/core_ext/module.rb
+- lib/core_ext/regexp.rb
+- lib/core_ext/symbolize.rb
+- lib/tartan.rb
+- lib/tartan/markdown.rb
+- lib/tartan/markdown/markdown.yml
+- lib/tartan/markdown/rules.rb
+- lib/tartan/table/rules.rb
+- lib/tartan/table/table.yml
+- lib/tartan/test/base_rules.rb
+- lib/tartan/test/test_base.yml
+- lib/tartan/test/wiki-test.rb
+- lib/tartan/wiki_rule.rb
+- lib/tartan/wikilink/rules.rb
+- lib/tartan/wikilink/wikilink.yml
 - test/test-combo.rb
+- test/test-combo.yml
 - test/test-hash.rb
+- test/test-markdown-and-wikilink.rb
+- test/test-markdown-and-wikilink.yml
 - test/test-markdown.rb
 - test/test-markdown.yml
 - test/test-match-data.rb
@@ -44,100 +67,38 @@ files:
 - test/test-regexp.rb
 - test/test-tables.rb
 - test/test-tables.yml
-- test/test-tartan-markdown.rb
 - test/test-tartan.rb
 - test/test-wikilink.rb
 - test/test-wikilink.yml
 - test/wikilink-test-helper.rb
-- test/MarkdownTest_1.0/Amps and angle encoding.html
-- test/MarkdownTest_1.0/Amps and angle encoding.text
-- test/MarkdownTest_1.0/Auto links.html
-- test/MarkdownTest_1.0/Auto links.text
-- test/MarkdownTest_1.0/Backslash codeescapes.html
-- test/MarkdownTest_1.0/Backslash codeescapes.text
-- test/MarkdownTest_1.0/Backslash simpleescapes.html
-- test/MarkdownTest_1.0/Backslash simpleescapes.text
-- test/MarkdownTest_1.0/Blockquotes with code blocks.html
-- test/MarkdownTest_1.0/Blockquotes with code blocks.text
-- test/MarkdownTest_1.0/Hard-wrapped paragraphs with list-like lines.html
-- test/MarkdownTest_1.0/Hard-wrapped paragraphs with list-like lines.text
-- test/MarkdownTest_1.0/Horizontal rules.html
-- test/MarkdownTest_1.0/Horizontal rules.text
-- test/MarkdownTest_1.0/Inline HTML (Advanced).html
-- test/MarkdownTest_1.0/Inline HTML (Advanced).text
-- test/MarkdownTest_1.0/Inline HTML (Simple).html
-- test/MarkdownTest_1.0/Inline HTML (Simple).text
-- test/MarkdownTest_1.0/Inline HTML comments.html
-- test/MarkdownTest_1.0/Inline HTML comments.text
-- test/MarkdownTest_1.0/Links, inline style.html
-- test/MarkdownTest_1.0/Links, inline style.text
-- test/MarkdownTest_1.0/Links, reference style.html
-- test/MarkdownTest_1.0/Links, reference style.text
-- 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
-- test/MarkdownTest_1.0/Ordered and unordered lists.html
-- test/MarkdownTest_1.0/Ordered and unordered lists.text
-- test/MarkdownTest_1.0/Strong and em together.html
-- test/MarkdownTest_1.0/Strong and em together.text
-- test/MarkdownTest_1.0/Tabs.html
-- test/MarkdownTest_1.0/Tabs.text
-- test/MarkdownTest_1.0/Tidyness.html
-- test/MarkdownTest_1.0/Tidyness.text
-- test/MarkdownTest_1.0/run-markdown.rb
-- test/MarkdownTest_1.0/test-fireball-markdown.rb
-- test/MarkdownTest_1.0/testdiff.rb
-- test/harder/test-markdown-harder.rb
-- test/harder/test-markdown-harder.yml
-- test/redcloth/redcloth-markdown-tests.rb
-- test/redcloth/redcloth-markdown-tests.yml
-- lib/core_ext
-- lib/markdown.yml
-- lib/symbolize.rb
-- lib/table.yml
-- lib/tartan.rb
-- lib/tartan_markdown.rb
-- lib/tartan_markdown_def.rb
-- lib/tartan_table_def.rb
-- lib/tartan_test_base_def.rb
-- lib/tartan_wikilink_def.rb
-- lib/test_base.yml
-- lib/wiki-test.rb
-- lib/wiki_rule.rb
-- lib/wikilink.yml
-- lib/core_ext/array.rb
-- lib/core_ext/file.rb
-- lib/core_ext/hash.rb
-- lib/core_ext/match_data.rb
-- lib/core_ext/module.rb
-- lib/core_ext/regexp.rb
 test_files: 
 - test/test-combo.rb
 - test/test-hash.rb
+- test/test-markdown-and-wikilink.rb
 - 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
 - test/test-wikilink.rb
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 executables: []
 
 extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.0
+    version: 

data/lib/tartan_markdown.rb

@@ -1,8 +0,0 @@
-#$Id: tartan_markdown.rb 148 2006-07-22 14:04:20Z larry $
-
-require 'tartan'
-require 'tartan_markdown_def'
-
-class TartanMarkdown < Tartan
-  include TartanMarkdownDef
-end

data/lib/tartan_markdown_def.rb

@@ -1,7 +0,0 @@
-#$Id: tartan_markdown_def.rb 153 2006-07-22 20:39:45Z larry $
-
-require 'tartan'
-
-module TartanMarkdownDef
-  yaml 'markdown.yml'
-end

data/lib/tartan_table_def.rb

@@ -1,7 +0,0 @@
-require 'tartan'
-
-# This module should be included into a Tartan subclass to add table mark-up.
-
-module TartanTableDef
-  yaml "table.yml"
-end

data/lib/tartan_test_base_def.rb

@@ -1,5 +0,0 @@
-require 'tartan'
-
-module TartanTestBaseDef
-  yaml "test_base.yml"
-end

data/lib/tartan_wikilink_def.rb

@@ -1,14 +0,0 @@
-require 'tartan'
-
-module TartanWikilinkDef
-  def wiki_link_body(page_name, link_body)
-    link_body = page_name if "" == link_body
-    link_body
-  end
-  
-  def wiki_link_tag(page_name)
-    raise "wiki_link_tag not properly defined in WikiHelper class"
-  end
-
-  yaml "wikilink.yml"
-end