wikiwah 0.1.3 → 0.1.4

data/lib/wikiwah/converter.rb

@@ -26,7 +26,7 @@ module WikiWah
       end
 
       def init_transformer
-        @transformer = WikiWah::Subst.new 
+        @transformer = WikiWah::Subst.new
         @transformer.add_transformation(/""(.+)""/) do |match|
           # Double-double-quoted
           CGI.escapeHTML(match[1])
@@ -35,9 +35,9 @@ module WikiWah
           # Backslash-quoted
           match[1]
         end
-        @transformer.add_transformation(/\<(.+?)\>/m) do |match| 
+        @transformer.add_transformation(/\<(.+?)\>/m) do |match|
           # In-line HTML
-          match[0] 
+          match[0]
         end
         @transformer.add_transformation(/\{(.+?)\}(@(\S*[\w\/]))?/m) do |match|
           # Distinuished link
@@ -57,7 +57,7 @@ module WikiWah
           # Bold/italic/etc.
           tag = case match[2]
           when '*'; 'strong'
-          when '+'; 'tt'
+          when '+'; 'samp'
           when '/'; 'em'
           when '_'; 'u'
           end

data/lib/wikiwah/flow.rb

@@ -120,15 +120,23 @@ module WikiWah
       when /\A(( *)\| )/
         push_context('pre',$2.size)
         block = strip_prefix($1, block)
-        write_html("<code>" + CGI.escapeHTML(block) + "</code>")
+        write_html(CGI.escapeHTML(block))
 
-      # preformatted (with language)
-      when /\A( *)\,-- (\S+).*\n/
+      # preformatted (with element and class)
+      when /\A( *)\,--(?: *(\S+))?.*\n/
         indent = $1
-        lang = $2
+        html_element, *html_classes = $2.split('.')
         push_context('pre',indent.size)
         block = strip_prefix(indent + "| ", $')
-        write_html(%(<code class="#{lang}">) + CGI.escapeHTML(block) + "</code>")
+        block = CGI.escapeHTML(block)
+        if html_element
+          open_tag = html_element
+          unless html_classes.empty?
+            open_tag += %( class="#{html_classes.join(' ')}")
+          end
+          block = "<#{open_tag}>" + block + "</#{html_element}>"
+        end
+        write_html(block)
 
       # heading
       when /\A( *)(=+) /

data/lib/wikiwah/version.rb

@@ -1,3 +1,3 @@
 module WikiWah
-  VERSION = "0.1.3".freeze
+  VERSION = "0.1.4".freeze
 end

data/test/wikiwah/flow_tests.rb

@@ -163,7 +163,31 @@ item 1
 P2
 </p>
 
+==== # Preformatted
+| code
+|
+| more code
+----
+<pre>
+code
+
+more code
+</pre>
+
+==== # Output sample
+,-- samp --
+| code
+|
+| more code
+----
+<pre>
+<samp>code
+
+more code
+</samp></pre>
+
 ==== # Code
+,-- code --
 | code
 |
 | more code
@@ -175,15 +199,15 @@ more code
 </code></pre>
 
 ==== # Code with language specified
-,-- fnord-script --
-| code
+,-- code.fnord-script --
+| fnord
 |
-| more code
+| fnord fnord
 ----
 <pre>
-<code class="fnord-script">code
+<code class="fnord-script">fnord
 
-more code
+fnord fnord
 </code></pre>
 
 ==== # Blockquote
@@ -234,8 +258,8 @@ item
 </li>
 </ul>
 <pre>
-<code>code
-</code></pre>
+code
+</pre>
 
 ====
 * item
@@ -247,8 +271,8 @@ item
 item
 </li>
 <pre>
-<code>code
-</code></pre>
+code
+</pre>
 </ul>
 
 ====
@@ -345,10 +369,10 @@ two
 | z
 ----
 <pre>
-<code>x
+x
 |y|
 z
-</code></pre>
+</pre>
 
 ====
 - list item

data/test/wikiwah_tests.rb

@@ -16,33 +16,37 @@ class WikiWahTests < Test::Unit::TestCase
   def test_paragraph
     assert_wikiwah("<p>\nxyz\n</p>\n", "xyz\n")
   end
-  
+
   def test_strong
     assert_wikiwah("<p>\n<strong>xyz</strong>\n</p>\n", "*xyz*\n")
   end
-  
+
   def test_em
     assert_wikiwah("<p>\n<em>xyz</em>\n</p>\n", "/xyz/\n")
   end
-  
+
+  def test_samp
+    assert_wikiwah("<p>\n<samp>foo bar</samp> baz\n</p>\n", "+foo bar+ baz\n")
+  end
+
   def test_strong_em
     assert_wikiwah("<p>\n<strong><em>xyz</em></strong>\n</p>\n", "*/xyz/*\n")
   end
-  
+
   def test_strong_then_em
     assert_wikiwah("<p>\n<strong>abc</strong>=<em>xyz</em>\n</p>\n", "*abc*=/xyz/\n")
   end
-  
+
   def test_link
-    assert_wikiwah(%{<p>\n<a href='/yyy'>xxx</a>\n</p>\n}, 
+    assert_wikiwah(%{<p>\n<a href='/yyy'>xxx</a>\n</p>\n},
                    "{xxx}@/yyy\n")
   end
-  
+
   def test_bold_link
-    assert_wikiwah(%{<p>\n<a href='/yyy'><strong>xxx</strong></a>\n</p>\n}, 
+    assert_wikiwah(%{<p>\n<a href='/yyy'><strong>xxx</strong></a>\n</p>\n},
                    "{*xxx*}@/yyy\n")
   end
-  
+
   def assert_wikiwah_unchanged(input)
     expected = "<p>\n" + input + "</p>\n"
     assert_wikiwah(expected, input)
@@ -51,9 +55,9 @@ class WikiWahTests < Test::Unit::TestCase
   def test_inline_html
     assert_wikiwah_unchanged(%{<b>blah</b><img src="xxx" />})
   end
-  
+
   def test_inline_html_with_link
     assert_wikiwah_unchanged(%{<b>blah</b><img src="http://blah.com" />})
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikiwah
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies: []
 description: ! "WikiWah is a text-to-HTML converter, along the lines of Markdown.
   \ \n\nThis isn't the markup language you're looking for.  \nIt offers no improvements
@@ -51,7 +51,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4597256986172157690
+      hash: -1320649274484203233
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4597256986172157690
+      hash: -1320649274484203233
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23