wikiwah 0.1.0 → 0.1.1

data/lib/wikiwah/flow.rb

@@ -89,30 +89,36 @@ module WikiWah
     # Add a block
     def add_block(block)
       case block
-      when /\A( *)- /       # unordered list item
+      when /\A( *)- /             # unordered list item
         push_context('ul',$1.size)
         write_tag($', 'li')
-      when /\A( *)\* /       # unordered list item
+      when /\A( *)\* /            # unordered list item
         push_context('ul class="sparse"',$1.size)
         write_tag($', 'li')
       when /\A( *)(\#|\d+\.|\(\d+\)) / # ordered list item
         push_context('ol',$1.size)
         write_tag($', 'li')
-      when /\A( *)% /       # unordered list item
+      when /\A( *)% /             # unordered list item
         push_context('dl',$1.size)
         write_tag($', 'dt')
       when /\A(( *)> )/           # citation
         push_context('blockquote',$2.size)
         block = strip_prefix($1, block)
         write_text(block)
-      when /\A(( *)\| )/          # preformatted (explicit)
+      when /\A(( *)\| )/          # preformatted
         push_context('pre',$2.size)
         block = strip_prefix($1, block)
         write_html("<code>" + CGI.escapeHTML(block) + "</code>")
-      when /\A( *)(=+) /        # heading
+      when /\A( *)\,-- (\w+).*\n/ # preformatted (with language)
+        indent = $1
+        lang = $2
+        push_context('pre',indent.size)
+        block = strip_prefix(indent + "| ", $')
+        write_html(%(<code lang="#{lang}">) + CGI.escapeHTML(block) + "</code>")
+      when /\A( *)(=+) /          # heading
         flush_context_stack
         write_tag($', "h#{$2.size}")
-      when /\A( *)/        	# body text
+      when /\A( *)/        	      # body text
         tag = \
         if $1 == ""
           'p'

data/lib/wikiwah/version.rb

@@ -1,3 +1,3 @@
 module WikiWah
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.1".freeze
 end

data/test/wikiwah/flow_tests.rb

@@ -174,6 +174,18 @@ P2
 more code
 </code></pre>
 
+==== # Code with language specified
+,-- fnordscript --
+| code
+|
+| more code
+----
+<pre>
+<code lang="fnordscript">code
+
+more code
+</code></pre>
+
 ==== # Blockquote
 > block
 > quote

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: wikiwah
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
+  prerelease: 
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-06-17 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
@@ -38,26 +39,33 @@ files:
 - Rakefile
 homepage: http://github.com/mdub/wikiwah
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1183097445060914495
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1183097445060914495
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: WikiWah turns text into HTML
 test_files:
 - test/wikiwah/flow_tests.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWM1ZGQ5ZjhjZThhY2EzNWE0NWJmZWI5Zjg1ZTU5ZTYyYmFhMzY0Yg==
-  data.tar.gz: !binary |-
-    NTliYTFkMGFkOTg3NjMzZjc2MWQ0Y2UzNzM0ZjY5YTFiMzU2YWVmMg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDA0MjFjNmNiODFkMjA0MTgzMzJhMWVjZmViZDE0YzRhMWI1YjM2NjM0YjBj
-    N2FlNDljZTUwZjc2NTE1NGUzZDFiOGE1ODkwYzUwYTljNjE3M2U4MGRhM2Y3
-    MzU3NDA2ZjI5Zjg2NWQyNTE2MWIyZTY2N2Y1MzA4NjVmMzlkODg=
-  data.tar.gz: !binary |-
-    OGVlYzY0OTYzNDAyNWRhNjk5ODI4MzIxZWNkY2I0Zjc3MGE4ODBjODEwZjdl
-    ZjJkYTg1NmVjNmVlNjM3OTJmOGI5OGM1MDEzNWQ3MzRjZWExODgwNzhlMmU2
-    NTAxOTEzZGUzMjc2NDczYWIyNDM5ZmZkMmQ5NDNjZDk4MWIwOWQ=