flannel 0.2.12 → 0.2.13

data/Rakefile

@@ -7,6 +7,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "flannel"
     gem.summary = %Q{A soft comfortable worn in markup language for Ruby}
+    gem.description = %Q{Flannel is a markup language that is not intended for your web app.  It's for your local use, to write a blog entry in your text editor or a number of other uses.}
     gem.email = "jamal.hansen@gmail.com"
     gem.homepage = "http://github.com/rubyyot/flannel"
     gem.authors = ["Jamal Hansen"]

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 12
+:patch: 13
 :build: 

data/flannel.gemspec

@@ -5,12 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flannel}
-  s.version = "0.2.12"
+  s.version = "0.2.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamal Hansen"]
-  s.date = %q{2010-02-25}
+  s.date = %q{2010-02-26}
   s.default_executable = %q{quilt-it}
+  s.description = %q{Flannel is a markup language that is not intended for your web app.  It's for your local use, to write a blog entry in your text editor or a number of other uses.}
   s.email = %q{jamal.hansen@gmail.com}
   s.executables = ["quilt-it"]
   s.extra_rdoc_files = [

data/lib/flannel/block.treetop

@@ -40,7 +40,7 @@ grammar Block
   end
  
   rule block_type
-    ( feed / preformatted / list / header / blockquote / paragraph  ) {
+    ( feed / preformatted / list / header / blockquote / dlist / image / paragraph ) {
       def content
         [:block_type, text_value.to_sym ]
       end
@@ -87,6 +87,10 @@ grammar Block
     "feed" { def content; text_value; end }
   end
 
+  rule image
+    "image" { def content; text_value; end }
+  end
+
   rule preformatted
     "preformatted" { def content; text_value; end }
   end
@@ -95,6 +99,10 @@ grammar Block
     "list" { def content; text_value; end }
   end
 
+  rule dlist
+    "dlist" { def content; text_value; end }
+  end
+
   rule block_id
     " "+ [a-z\-_]+ {
       def content

data/lib/flannel/html_formatter.rb

@@ -6,6 +6,7 @@ module Flannel
       @tags ={:preformatted => "pre", 
               :feed => "ul", 
               :list => "ul", 
+              :dlist => "dl", 
               :header_1 => "h1", #old style
               :header_2 => "h2", 
               :header_3 => "h3", 
@@ -50,6 +51,8 @@ module Flannel
         steps << lambda { |text| html_escape text}
       when :feed
         steps << lambda { |text| parse_feed text }
+      when :image
+        steps << lambda { |text| create_img text }
       else
         steps << lambda { |text| build_wiki_links text }
         steps << lambda { |text| convert_external_links text }
@@ -59,6 +62,10 @@ module Flannel
         steps << lambda { |text| format_list text }
       end
       
+      if style == :dlist
+        steps << lambda { |text| format_dlist text }
+      end
+      
       steps << lambda { |text| wrap(text, @tags[style], id) }
       
       steps
@@ -74,6 +81,14 @@ module Flannel
       text.gsub(/-\w(.*?)\w>/) { |match| %{<a href="#{wiki_link match}">#{format_link_display(match)}</a>}}
     end
     
+    def create_img text
+      desc, url = text.split(/\n/, 2)
+      
+      return text unless url
+      
+      "<img src='#{url}' alt='#{desc}' title='#{desc}' />"
+    end
+    
     def wiki_link topic
       permalink topic[1..-2]
     end
@@ -113,6 +128,17 @@ module Flannel
       text.split(/\n/).reject { |item| item == ""  }.map { |item| wrap(item.chomp, "li") }.join("\n")      
     end
     
+    def format_dlist text
+      text.split(/\n/).reject { |item| item == ""  }.map { |item| split_definition(item) }.join("\n")      
+    end
+    
+    def split_definition item
+      term, definition = item.split(/\-/, 2).map{ |term| term.strip }
+      
+      return item unless definition
+      "<dt>#{term}</dt><dd>#{definition}</dd>"
+    end
+    
     def parse_feed text
       parser = Flannel::FeedParser.new  Flannel.cache
       parser.sub_feeds text

data/test/block_parser_styles_test.rb

@@ -71,5 +71,17 @@ class BlockParserStylesTest < Test::Unit::TestCase
     assert_doc doc, :header_six, nil, "text"
   end
   
+  def test_definition_list
+    doc = @parser.parse(":dlist:\ntext-foo")
+    
+    assert_doc doc, :dlist, nil, "text-foo"
+  end
+  
+  def test_image
+    doc = @parser.parse(":image:\nThis is an image\n/images/pickle.jpg")
+    
+    assert_doc doc, :image, nil, "This is an image\n/images/pickle.jpg"
+  end
+  
 end
 

data/test/html_formatter_test.rb

@@ -61,6 +61,20 @@ class HtmlFormatterTest < Test::Unit::TestCase
         assert_equal "<pre>&lt;p&gt;&amp; foo&lt;/p&gt;</pre>", result
       end
     end
+    
+    context "definition list" do
+      should "format definition list" do
+        result = @formatter.do("flannel - a wonderful markup dsl\nruby - a wonderful programming language", :dlist)
+        assert_equal "<dl><dt>flannel</dt><dd>a wonderful markup dsl</dd>\n<dt>ruby</dt><dd>a wonderful programming language</dd></dl>", result
+      end
+    end
+    
+    context "image" do
+      should "format image" do
+        result = @formatter.do("This is a picture of a cat\n/images/cat.png", :image)
+        assert_equal "<img src='/images/cat.png' alt='This is a picture of a cat' title='This is a picture of a cat' />", result
+      end
+    end
 
     context "making permalinks" do
       should "replace spaces with dashes" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 12
-  version: 0.2.12
+  - 13
+  version: 0.2.13
 platform: ruby
 authors: 
 - Jamal Hansen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 -06:00
+date: 2010-02-26 00:00:00 -06:00
 default_executable: quilt-it
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
-description: 
+description: Flannel is a markup language that is not intended for your web app.  It's for your local use, to write a blog entry in your text editor or a number of other uses.
 email: jamal.hansen@gmail.com
 executables: 
 - quilt-it