flannel 0.2.1 → 0.2.3

data/VERSION.yml

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

data/features/fixtures/preformatted.flannel

@@ -3,7 +3,8 @@ This is a paragraph
 _   This is preformatted text
         it's cool
 
-_   and Spiffy
+   and Spiffy
+_
 
 _This is preformatted too
 _

data/features/fixtures/preformatted.out

@@ -7,6 +7,7 @@
 
 <pre>This is preformatted too</pre>
 
-<pre> So is this</pre>
+<pre>
+ So is this</pre>
 
 <p>This is a paragraph</p>

data/flannel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flannel}
-  s.version = "0.2.1"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamal Hansen"]
-  s.date = %q{2010-01-14}
+  s.date = %q{2010-01-25}
   s.email = %q{jamal.hansen@gmail.com}
   s.executables = ["quilt-it~", "quilt-it"]
   s.extra_rdoc_files = [
@@ -50,22 +50,22 @@ Gem::Specification.new do |s|
      "features/wiki_links.feature",
      "flannel.gemspec",
      "lib/flannel.rb",
+     "lib/flannel/block_cutter.rb",
      "lib/flannel/cache_location_does_not_exist_error.rb",
      "lib/flannel/cutting_board.rb",
      "lib/flannel/feed_parser.rb",
      "lib/flannel/file_cache.rb",
-     "lib/flannel/shears.rb",
-     "lib/flannel/square.rb",
-     "lib/flannel/stripe.rb",
+     "lib/flannel/html_formatter.rb",
+     "lib/flannel/text_block.rb",
      "lib/flannel/wrappable.rb",
+     "test/block_cutter_test.rb",
      "test/cutting_board_test.rb",
      "test/feed_parser_test.rb",
      "test/file_cache_test.rb",
      "test/flannel_test.rb",
-     "test/shears_test.rb",
-     "test/square_test.rb",
-     "test/stripe_test.rb",
-     "test/test_helper.rb"
+     "test/html_formatter_test.rb",
+     "test/test_helper.rb",
+     "test/text_block_test.rb"
   ]
   s.homepage = %q{http://github.com/rubyyot/flannel}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -74,14 +74,14 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{A soft comfortable worn in markup language for Ruby}
   s.test_files = [
-    "test/test_helper.rb",
+    "test/html_formatter_test.rb",
+     "test/block_cutter_test.rb",
+     "test/test_helper.rb",
      "test/file_cache_test.rb",
-     "test/stripe_test.rb",
      "test/cutting_board_test.rb",
+     "test/text_block_test.rb",
      "test/feed_parser_test.rb",
-     "test/flannel_test.rb",
-     "test/square_test.rb",
-     "test/shears_test.rb"
+     "test/flannel_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/flannel.rb

@@ -6,10 +6,19 @@ require 'flannel/stripe'
 require 'flannel/feed_parser'
 require 'flannel/file_cache'
 
+require 'flannel/block_cutter'
+require 'flannel/text_block'
+require 'flannel/html_formatter'
+
 module Flannel
   def self.quilt markup, params={}
+    @@cache_params = params
     return nil unless markup
-    shears = Flannel::CuttingBoard.new params
+    shears = Flannel::CuttingBoard.new
     shears.cut markup
   end
+  
+  def self.cache_params
+    @@cache_params
+  end
 end

data/lib/flannel/block_cutter.rb

@@ -0,0 +1,34 @@
+module Flannel
+  class BlockCutter
+    def cut markup
+      pieces = split_preformatted_blocks(markup)
+      pieces = pieces.map { |part| split_into_blocks(part) }
+      pieces.flatten!
+      convert_to_text_blocks pieces
+    end
+    
+    def split_into_blocks markup
+      if is_preformatted markup
+	markup
+      else
+        markup.split(/\n\s*?\n/).map { |s| s.strip }
+      end
+    end
+    
+    def split_preformatted_blocks markup
+      markup.split(/^(_(?=\n\n)|(?=_))/).map { |s| s.strip }.reject { |s| is_invalid_block s}
+    end
+    
+    def convert_to_text_blocks pieces
+      pieces.map{ |piece| Flannel::TextBlock.new piece }
+    end
+    
+    def is_invalid_block s
+      s == "" || s == "_" 
+    end
+    
+    def is_preformatted markup
+      markup[0] == '_'[0]
+    end
+  end
+end

data/lib/flannel/cutting_board.rb

@@ -1,14 +1,10 @@
 
 module Flannel
   class CuttingBoard
-    def initialize params={}
-      @params = params
-    end
-
     def cut markup
-      shears = Flannel::Shears.new @params
-      squares = shears.cut markup
-      squares.map { |square| square.to_h }.join("\n\n")
+      cutter = Flannel::BlockCutter.new
+      text_blocks = cutter.cut markup
+      text_blocks.map { |text| text.to_h }.join("\n\n")
     end
   end
 end

data/lib/flannel/feed_parser.rb

@@ -19,9 +19,7 @@ module Flannel
     end
     
     def get_document url
-      doc = @cache.retrieve(url) if @cache
-      doc = open(url) unless doc
-      @cache.save url, doc if @cache
+      doc = open(url)
       doc
     end
     
@@ -30,14 +28,20 @@ module Flannel
     end
 
     def get_news url
-      item_string = ""
-
-      doc = Hpricot.XML(get_document(url))
+      item_string = nil
+      item_string = @cache.retrieve(url) if @cache
+      
+      unless item_string 
+	item_string = ""
+	doc = Hpricot.XML(get_document(url))
 
-      (doc/"item").each do |item|
-	link = (item/"link").inner_html
-	title = (item/"title").inner_html
-	item_string << format_item(link, title)
+	(doc/"item").each do |item|
+	  link = (item/"link").inner_html
+	  title = (item/"title").inner_html
+	  item_string << format_item(link, title)
+	end
+	
+	@cache.save url, item_string if @cache
       end
       
       item_string

data/lib/flannel/html_formatter.rb

@@ -0,0 +1,105 @@
+module Flannel
+  class HtmlFormatter
+    include Wrappable
+    
+    def initialize
+      @tags ={:preformatted => "pre", :feed => "ul", :list => "ul", :header_1 => "h1", :header_2 => "h2", :header_3 => "h3", :header_4 => "h4", :header_5 => "h5", :header_6 => "h6", :paragraph => "p"}
+    end
+    
+    def do text, style
+      steps = get_steps_for style
+      inject text, steps
+    end
+
+    def permalink topic
+      topic.gsub(%r{[^/\w\s\-]},'').gsub(%r{[^\w/]|[\_]},' ').split.join('-').downcase
+    end
+    
+    def inject text, steps
+      if steps.empty?
+	text
+      else
+	step = steps.shift
+	text = step.call text
+	inject text, steps
+      end
+    end
+    
+    def get_steps_for style
+      steps = []
+      
+      case style
+	
+      when :preformatted
+	steps << lambda { |text| html_escape text}
+      when :feed
+	steps << lambda { |text| parse_feed text }
+      else
+	steps << lambda { |text| build_wiki_links text }
+	steps << lambda { |text| convert_external_links text }
+      end
+      
+      if style == :list
+	steps << lambda { |text| format_list text }
+      end
+      
+      steps << lambda { |text| wrap text, @tags[style]}
+      
+      steps
+    end
+    
+    def html_escape text
+      require 'cgi'
+
+      CGI::escapeHTML(text)
+    end
+    
+    def build_wiki_links text
+      text.gsub(/-\w(.*?)\w>/) { |match| %{<a href="#{wiki_link match}">#{format_link_display(match)}</a>}}
+    end
+    
+    def wiki_link topic
+      permalink topic[1..-2]
+    end
+
+    def permalink topic
+      topic.gsub(%r{[^/\w\s\-]},'').gsub(%r{[^\w/]|[\_]},' ').split.join('-').downcase
+    end
+    
+    def format_link_display text
+      text[1..-2].split("/").last
+    end
+    
+    def convert_external_links text
+      text.gsub(/\[([^\|]*\|[^\]]*)\]/) { |match| build_external_link match }
+    end
+
+    def build_external_link match
+      text, url, title = match[1..-2].split("|", 3)
+
+      url = format_link url.strip
+      text.strip!
+      title.strip! if title
+
+      if title
+        %{<a href="#{url}" title="#{title}" target="_blank">#{text}</a>}
+      else
+        %{<a href="#{url}" target="_blank">#{text}</a>}
+      end
+    end
+    
+    def format_link url
+      return url if /:\/\// =~ url
+      "http://#{url}"
+    end
+    
+    def format_list text
+      text.split(/^\*/).reject { |item| item == ""  }.map { |item| wrap(item.chomp, "li") }.join("\n")      
+    end
+    
+    def parse_feed text
+      parser = Flannel::FeedParser.new  Flannel.cache_params
+      parser.sub_feeds text
+    end
+  end
+end

data/lib/flannel/text_block.rb

@@ -0,0 +1,41 @@
+module Flannel
+  class TextBlock
+    attr_reader :style
+    
+    def initialize text
+      set_style_marker text
+    end
+    
+    def to_s
+      @text
+    end
+    
+    def to_h
+      html_formatter = Flannel::HtmlFormatter.new
+      html_formatter.do(@text, @style)
+    end
+    
+    def set_style_marker text 
+      case text[0]
+      when '_'[0]		#preformatted
+	@style = :preformatted
+	@text =  text[1..-1]
+      when '&'[0]		#feed
+	@style = :feed
+	@text =  text[1..-1]
+      when '*'[0]		#list
+	@style = :list
+	@text = text
+      when '='[0]		#header
+	match = text.match /^(=+)/
+	weight = match.captures[0].length
+	
+	@style = "header_#{weight}".to_sym
+	@text =  text[weight..-1]
+      else			#other
+	@style = :paragraph
+	@text =  text
+      end
+    end
+  end
+end

data/test/{shears_test.rb → block_cutter_test.rb}

@@ -1,15 +1,15 @@
 require 'test_helper'
 
-class ShearsTest < Test::Unit::TestCase
+class BlockCutterTest < Test::Unit::TestCase
   context "basic behavior" do
     setup do
-      @shears = Flannel::Shears.new
+      @block_cutter = Flannel::BlockCutter.new
     end
 
     should "split a flannel document into squares based on blank lines" do
       markup = "foo\n\nbar"
 
-      squares = @shears.cut markup
+      squares = @block_cutter.cut markup
       assert_equal 2, squares.length
       assert_equal "foo", squares[0].to_s
       assert_equal "bar", squares[1].to_s
@@ -18,7 +18,7 @@ class ShearsTest < Test::Unit::TestCase
     should "not split preformatted text based on blank lines" do
       markup = "_foo\n\nbar\n_"
 
-      squares = @shears.cut markup
+      squares = @block_cutter.cut markup
       assert_equal 1, squares.length
       assert_equal :preformatted, squares[0].style
     end
@@ -27,7 +27,7 @@ class ShearsTest < Test::Unit::TestCase
     should "separate preformatted blocks" do
       markup = "_foo\n_\n\n_bar\n_"
 
-      squares = @shears.cut markup
+      squares = @block_cutter.cut markup
       assert_equal 2, squares.length
       assert_equal :preformatted, squares[0].style
       assert_equal :preformatted, squares[1].style
@@ -36,14 +36,14 @@ class ShearsTest < Test::Unit::TestCase
     should "strip preformatted markers when found" do
       markup = "_foo\n\nbar\n_"
 
-      squares = @shears.cut markup
+      squares = @block_cutter.cut markup
       assert_equal "foo\n\nbar",  squares[0].to_s
     end
     
     should "set square style to feed based on ampersand " do
       markup = "& http://www.example.com/rss"
 
-      squares = @shears.cut markup
+      squares = @block_cutter.cut markup
       assert_equal :feed, squares[0].style
     end
   end

data/test/cutting_board_test.rb

@@ -11,11 +11,6 @@ class CuttingBoardTest < Test::Unit::TestCase
       assert_equal "<pre>foo\n\n   bar</pre>", @board.cut(markup)
     end
 
-    should "preformat text when both start and end line have the markers" do
-      markup = "_foo\n\n_   bar"
-      assert_equal "<pre>foo\n\n   bar</pre>", @board.cut(markup)
-    end
-
     should "not replace in preformatted text" do
       markup = "_4 - 2 > 2 - 2\n_"
       assert_equal '<pre>4 - 2 &gt; 2 - 2</pre>', @board.cut(markup)

data/test/flannel_test.rb

@@ -9,4 +9,10 @@ class FlannelTest < Test::Unit::TestCase
   should "return nil if text is nil" do
     assert_nil Flannel.quilt(nil)
   end
+
+  should "parse paragraphs correctly" do
+    input = "\nThis is paragraph one.\n\nThis is paragraph two.\n\nThis is paragraph three. Watchout for the end of file.\n"
+    output = "<p>This is paragraph one.</p>\n\n<p>This is paragraph two.</p>\n\n<p>This is paragraph three. Watchout for the end of file.</p>"
+    assert_equal output, Flannel.quilt(input)
+  end
 end

data/test/html_formatter_test.rb

@@ -0,0 +1,80 @@
+require 'test_helper'
+require 'flannel/stripe'
+
+class HtmlFormatterTest < Test::Unit::TestCase
+  context "basic operations" do
+    setup do
+      @formatter = Flannel::HtmlFormatter.new
+    end
+    
+    should "return html fragment with format" do
+      assert_equal "<p>foo</p>", @formatter.do('foo', :paragraph)
+    end
+
+    context "building wiki links" do
+      should "not be greedy in matching" do
+	result = @formatter.do "a -foo> and a -bar>.", :paragraph
+	assert_equal '<p>a <a href="foo">foo</a> and a <a href="bar">bar</a>.</p>', result
+      end
+    end
+    
+    context "subdirectories" do
+      should "handle subdirectories and not display directory info" do
+	result = @formatter.do("I think it -cheese/tastes good>.", :paragraph)
+	assert_equal '<p>I think it <a href="cheese/tastes-good">tastes good</a>.</p>', result
+      end
+    end
+
+    context "links" do
+      should "output the link" do
+	assert_equal '<p><a href="cheese">cheese</a></p>', @formatter.do("-cheese>", :paragraph)
+      end
+      
+      should "hyphenate words" do
+	result = @formatter.do("-cheese is good>", :paragraph)
+	assert_equal '<p><a href="cheese-is-good">cheese is good</a></p>', result
+      end
+
+      should "replace text surrounded by - and > with a wiki link" do
+	result = @formatter.do("red, -green>, refactor", :paragraph)
+	assert_equal '<p>red, <a href="green">green</a>, refactor</p>',result
+      end
+
+      should "not replace text surrounded by - and > with a wiki link if spaced" do
+	result = @formatter.do("red, - green >, refactor", :paragraph)
+	assert_equal '<p>red, - green >, refactor</p>', result
+      end
+
+      should "not replace text surrounded by - and > with a wiki link if spaced on right" do
+	result = @formatter.do("red, -green >, refactor", :paragraph)
+	assert_equal '<p>red, -green >, refactor</p>', result
+      end
+
+      should "not replace surrounded by - and > with a wiki link if spaced on left" do
+	result = @formatter.do("red, - green>, refactor", :paragraph)
+	assert_equal '<p>red, - green>, refactor</p>', result
+      end
+    end
+
+    context "preformatted text" do
+      should "html escape preformatted text" do
+	result = @formatter.do("<p>& foo</p>", :preformatted)
+	assert_equal "<pre>&lt;p&gt;&amp; foo&lt;/p&gt;</pre>", result
+      end
+    end
+
+    context "making permalinks" do
+      should "replace spaces with dashes" do
+	assert_equal "get-the-box", @formatter.permalink("get the box")
+      end
+
+      should "replace multiple spaces with single dashes" do
+	assert_equal "get-the-box", @formatter.permalink("get    the box")
+      end
+
+      should "replace odd characters with dashes" do
+	assert_equal "get-the-box", @formatter.permalink("get the @#)(* box")
+      end
+    end
+  end
+end

data/test/text_block_test.rb

@@ -0,0 +1,64 @@
+require 'test_helper'
+
+class TextBlockTest < Test::Unit::TestCase
+  context "basic behavior" do
+    should "return html" do
+      text_block = Flannel::TextBlock.new "foo"
+      assert_equal "<p>foo</p>", text_block.to_h
+    end
+  end
+
+  context "style" do
+    should "recognize preformatted" do
+      text_block = Flannel::TextBlock.new "_foo"
+      assert_equal :preformatted, text_block.style
+    end
+    
+    should "recognize paragraph" do
+      text_block = Flannel::TextBlock.new "foo"
+      assert_equal :paragraph, text_block.style
+    end
+    
+    should "recognize list" do
+      text_block = Flannel::TextBlock.new "* foo/n* bar/n* baz"
+      assert_equal :list, text_block.style
+    end
+    
+    should "recognize feed" do
+      text_block = Flannel::TextBlock.new "& http://foo.example.com"
+      assert_equal :feed, text_block.style
+    end
+    
+    should "recognize header" do
+      text_block = Flannel::TextBlock.new "====My Header"
+      assert_equal :header_4, text_block.style
+    end
+    
+    should "wrap in pre tags when preformatted" do
+      text_block = Flannel::TextBlock.new "_foo"
+      assert_equal "<pre>foo</pre>", text_block.to_h
+    end
+
+    should "wrap in ul tags when unordered_list" do
+      text_block =  Flannel::TextBlock.new "* foo"
+      assert_equal "<ul><li>foo</li></ul>", text_block.to_h
+    end
+  end
+
+  context "external links" do
+    should "convert [|] pattern to an external link" do
+      text_block = Flannel::TextBlock.new "yadda [yadda|http://example.com] yadda"
+      assert_equal '<p>yadda <a href="http://example.com" target="_blank">yadda</a> yadda</p>', text_block.to_h
+    end
+
+    should "add http:// to external links" do
+      text_block = Flannel::TextBlock.new "yadda [yadda|example.com] yadda"
+      assert_equal '<p>yadda <a href="http://example.com" target="_blank">yadda</a> yadda</p>', text_block.to_h
+    end
+
+    should "add create title if provided to external links" do
+      text_block = Flannel::TextBlock.new "yadda [yadda|example.com|My title] yadda"
+      assert_equal '<p>yadda <a href="http://example.com" title="My title" target="_blank">yadda</a> yadda</p>', text_block.to_h
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flannel
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jamal Hansen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 -06:00
+date: 2010-01-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,22 +76,22 @@ files:
 - features/wiki_links.feature
 - flannel.gemspec
 - lib/flannel.rb
+- lib/flannel/block_cutter.rb
 - lib/flannel/cache_location_does_not_exist_error.rb
 - lib/flannel/cutting_board.rb
 - lib/flannel/feed_parser.rb
 - lib/flannel/file_cache.rb
-- lib/flannel/shears.rb
-- lib/flannel/square.rb
-- lib/flannel/stripe.rb
+- lib/flannel/html_formatter.rb
+- lib/flannel/text_block.rb
 - lib/flannel/wrappable.rb
+- test/block_cutter_test.rb
 - test/cutting_board_test.rb
 - test/feed_parser_test.rb
 - test/file_cache_test.rb
 - test/flannel_test.rb
-- test/shears_test.rb
-- test/square_test.rb
-- test/stripe_test.rb
+- test/html_formatter_test.rb
 - test/test_helper.rb
+- test/text_block_test.rb
 has_rdoc: true
 homepage: http://github.com/rubyyot/flannel
 licenses: []
@@ -121,11 +121,11 @@ signing_key:
 specification_version: 3
 summary: A soft comfortable worn in markup language for Ruby
 test_files: 
+- test/html_formatter_test.rb
+- test/block_cutter_test.rb
 - test/test_helper.rb
 - test/file_cache_test.rb
-- test/stripe_test.rb
 - test/cutting_board_test.rb
+- test/text_block_test.rb
 - test/feed_parser_test.rb
 - test/flannel_test.rb
-- test/square_test.rb
-- test/shears_test.rb

data/lib/flannel/shears.rb

@@ -1,89 +0,0 @@
-#require 'square'
-#require 'stripe'
-
-module Flannel
-  class Shears
-    def initialize params={}
-      @params = params
-    end
-    
-    def cut markup
-      @squares = []
-      @square = Flannel::Square.new
-      @end_preformat = false
-
-      markup.split("\n").each { |line| cut_into_squares line }
-
-      @squares << @square
-    end
-
-    def cut_into_squares line
-     if need_new_square? line
-        shift_square
-      else
-        add line
-      end
-    end
-
-    def shift_square
-      @squares << @square unless @square.blank?
-      @square = Flannel::Square.new @params
-    end
-
-    def need_new_square? line
-      @square.style == :preformatted ? @end_preformat : empty?(line.strip)
-    end
-
-    def add line
-      @preformatted_marker_line = false
-      line = strip_markers line
-      line = remove_hanging_preformatted_lines line
-
-      @square << line unless line.nil?
-    end
-
-    def remove_hanging_preformatted_lines line
-      if @preformatted_marker_line
-        @end_preformat = @square.populated?
-        if line.strip == ""
-          return nil
-        end
-      else
-        @end_preformat = false
-      end
-      line
-    end
-
-    def strip_markers line
-      parts = line.match(/^([=_*&]+)(.*)/)
-
-      if parts
-        set_style parts[1]
-        line = parts[2]
-      end
-      line
-    end
-
-    def set_style marker
-      if marker
-        case marker[0]
-        when 61               # equals (header)
-          style = "header_#{marker.length}"
-          @square.style = style.to_sym
-        when 95               # underscore (preformatted)
-          @square.style = :preformatted
-          @preformatted_marker_line = true
-        when 42               # star (list)
-          @square.style = :list
-	when 38              # ampersand (feed)
-          @square.style = :feed
-        end
-      end
-    end
-
-    def empty? str
-      str.nil? || str == ""
-    end
-  end
-end
-

data/lib/flannel/square.rb

@@ -1,92 +0,0 @@
-#require 'wrappable'
-
-module Flannel
-  class Square
-    include Flannel::Wrappable
-    attr_accessor :style
-    
-    def initialize params={}
-      @tags ={:preformatted => "pre", :feed => "ul", :list => "ul", :header_1 => "h1", :header_2 => "h2", :header_3 => "h3", :header_4 => "h4", :header_5 => "h5", :header_6 => "h6"}
-      @stripes = []
-      @style = :paragraph
-      @params = params
-    end
-
-    def << text
-      text = text.strip unless @style == :preformatted
-      @params[:style] = @style
-      @stripes << Flannel::Stripe.stitch(text, @params.dup)
-    end
-
-    def to_s
-      @stripes.map { |stripe| stripe.weave }.join("\n")
-    end
-
-    def blank?
-      (@stripes.length == 0 || all_stripes_blank)
-    end
-
-    def populated?
-      !blank?
-    end
-
-    def all_stripes_blank
-      @stripes.each do |stripe|
-        return false if !stripe.empty?
-      end
-
-      return true
-    end
-
-    def to_h
-      @post_wrap = nil
-      lines = @stripes.map { |stripe| stripe.to_h }
-
-      quilt lines
-    end
-    
-    def quilt lines
-      output = lines.join("\n")
-      output = convert_external_links output
-      return wrap(output, find_tag)
-    end
-
-    def preformatted
-      @style == :preformatted
-    end
-
-    def convert_external_links text
-      return text if preformatted
-      text.gsub(/\[([^\|]*\|[^\]]*)\]/) { |match| build_external_link match }
-    end
-
-    def build_external_link match
-      text, url, title = match[1..-2].split("|", 3)
-
-      url = format_link url.strip
-      text.strip!
-      title.strip! if title
-
-      if title
-        %{<a href="#{url}" title="#{title}" target="_blank">#{text}</a>}
-      else
-        %{<a href="#{url}" target="_blank">#{text}</a>}
-      end
-    end
-
-    def format_link url
-      return url if /:\/\// =~ url
-      "http://#{url}"
-    end
-
-    def find_tag
-      if @style && @tags.has_key?(@style)
-        tag = @tags[@style]
-      else
-        tag = "p"
-      end
-      tag
-    end
-  end
-end
-

data/lib/flannel/stripe.rb

@@ -1,77 +0,0 @@
-
-module Flannel
-  class Stripe
-    include Wrappable
-    attr_reader :weave
-
-    def self.stitch weave="", params={}
-       Flannel::Stripe.new weave, params
-    end
-
-    def initialize weave="", params={}
-      @weave = weave
-      @params = params
-    end
-    
-    def wiki_link topic
-      if @params[:wiki_link]
-        @params[:wiki_link].call(permalink topic)
-      else
-        permalink topic[1..-2]
-      end
-    end
-
-    def permalink topic
-      topic.gsub(%r{[^/\w\s\-]},'').gsub(%r{[^\w/]|[\_]},' ').split.join('-').downcase
-    end
-
-    def empty?
-      @weave == nil || @weave.strip == ""
-    end
-
-    def build_wiki_links
-      return @weave if preformatted
-      @weave.gsub(/-\w(.*?)\w>/) { |match| %{<a href="#{wiki_link match}">#{format_link_display(match)}</a>}}
-    end
-    
-    def format_link_display text
-      text[1..-2].split("/").last
-    end
-
-    def to_h
-    
-      if feed
-	parser = Flannel::FeedParser.new @params
-	parser.sub_feeds @weave
-      else
-	text = build_wiki_links
-	markup text
-      end
-    end
-
-    def preformatted
-      @params[:style] == :preformatted
-    end
-
-    def list
-      @params[:style] == :list
-    end
-    
-    def feed
-      @params[:style] == :feed
-    end
-
-    def markup text
-      return html_escape text if preformatted
-
-      tag = "li" if list
-      wrap(text, tag)
-     end
-
-    def html_escape text
-      require 'cgi'
-
-      CGI::escapeHTML(text)
-    end
-  end
-end

data/test/square_test.rb

@@ -1,102 +0,0 @@
-require 'test_helper'
-
-class SquareTest < Test::Unit::TestCase
-  context "basic behavior" do
-    setup do
-      @square = Flannel::Square.new
-    end
-
-    should "accept strings with <<" do
-      @square << "foo"
-      assert_equal "foo", @square.to_s
-    end
-
-    should "be blank when there are no stripes" do
-      assert @square.blank?
-      @square << "foo"
-      assert !@square.blank?
-    end
-
-    should "be blank when the first stripe is an empty string" do
-      @square <<  ""
-      assert @square.blank?
-    end
-
-    should "be blank when the first stripe is whitespace" do
-      @square <<  "  "
-      assert @square.blank?
-    end
-
-    should "be blank when the all stripes are empty strings" do
-      @square <<  ""
-      @square <<  ""
-      @square <<  ""
-      assert @square.blank?
-    end
-
-    should "be blank when the all stripes are whitespace" do
-      @square <<  " "
-      @square <<  " "
-      @square <<  ""
-      assert @square.blank?
-    end
-
-    should "not be blank when a stripe is not blank" do
-      @square <<  " "
-      @square <<  " "
-      @square <<  "foo"
-      assert !@square.blank?
-    end
-
-    should "return html" do
-      @square <<  "foo"
-      assert_equal "<p>foo</p>", @square.to_h
-    end
-
-    should "accept a style" do
-      @square.style = :preformatted
-      assert_equal :preformatted, @square.style
-    end
-  end
-
-  context "style" do
-    should "accept an optional style parameter" do
-      square = Flannel::Square.new
-      square.style = :foo
-    end
-
-    should "wrap in pre tags when preformatted" do
-      square = Flannel::Square.new
-      square.style = :preformatted
-      square << "foo"
-      assert_equal "<pre>foo</pre>", square.to_h
-    end
-
-    should "wrap in ul tags when unordered_list" do
-      square = Flannel::Square.new
-      square.style = :list
-      square << "foo"
-      assert_equal "<ul><li>foo</li></ul>", square.to_h
-    end
-  end
-
-  context "external links" do
-    should "convert [|] pattern to an external link" do
-      square = Flannel::Square.new
-      square << "yadda [yadda|http://example.com] yadda"
-      assert_equal '<p>yadda <a href="http://example.com" target="_blank">yadda</a> yadda</p>', square.to_h
-    end
-
-    should "add http:// to external links" do
-      square = Flannel::Square.new
-      square << "yadda [yadda|example.com] yadda"
-      assert_equal '<p>yadda <a href="http://example.com" target="_blank">yadda</a> yadda</p>', square.to_h
-    end
-
-    should "add create title if provided to external links" do
-      square = Flannel::Square.new
-      square << "yadda [yadda|example.com|My title] yadda"
-      assert_equal '<p>yadda <a href="http://example.com" title="My title" target="_blank">yadda</a> yadda</p>', square.to_h
-    end
-  end
-end

data/test/stripe_test.rb

@@ -1,126 +0,0 @@
-require 'test_helper'
-require 'flannel/stripe'
-
-class StripeTest < Test::Unit::TestCase
-  context "basic operations" do
-    setup do
-      @stripe = Flannel::Stripe.stitch "foo"
-    end
-
-    should "be of of kind Flannel::Stripe" do
-      assert Flannel::Stripe, @stripe.class
-    end
-
-    should "create instance with stitch" do
-      assert_equal "foo", @stripe.weave
-    end
-
-    should "return html fragment with to_h" do
-      assert_equal "foo", @stripe.to_h
-    end
-  end
-
-  context "building wiki links" do
-    setup do
-      wiki_link = lambda { |keyword| "http://www.example.com/foo/#{keyword}"}
-      @stripe = Flannel::Stripe.stitch "the -roof is on fire>", :wiki_link => wiki_link
-    end
-
-    should "build wiki links based on a lambda" do
-      assert_equal "http://www.example.com/foo/cheese",
-@stripe.wiki_link("-cheese>")
-    end
-
-    should "find and replace wiki link markup" do
-      assert_equal 'the <a href="http://www.example.com/foo/roof-is-on-fire">roof is on fire</a>',
-@stripe.to_h
-    end
-    
-    should "permalink topics when making wiki links" do
-      assert_equal "http://www.example.com/foo/cheese-tastes-good",
-@stripe.wiki_link("-cheese tastes good>")
-    end
-    
-    should "not be greedy in matching" do
-      stripe = Flannel::Stripe.stitch("a -foo> and a -bar>.")
-      assert_equal 'a <a href="foo">foo</a> and a <a href="bar">bar</a>.', stripe.build_wiki_links
-    end
-  end
-  
-  context "subdirectories" do
-    setup do
-       @stripe = Flannel::Stripe.stitch "I think it -cheese/tastes good>."
-    end
-    
-    should "handle subdirectories" do
-      assert_equal "cheese/tastes-good", @stripe.wiki_link("-cheese/tastes good>")
-    end
-    
-    should "not display directory info" do
-      assert_equal 'I think it <a href="cheese/tastes-good">tastes good</a>.', @stripe.build_wiki_links
-    end
-  end
-
-  context "no lambda is provided" do
-    setup do
-      @stripe = Flannel::Stripe.stitch "baz"
-    end
-
-    should "output the wiki text" do
-      assert_equal "cheese", @stripe.wiki_link("-cheese>")
-    end
-
-    should "prermalink the wiki text" do
-      assert_equal "cheese-is-good", @stripe.wiki_link("-cheese is good>")
-    end
-  end
-
-  context "replacing wiki links" do
-    should "replace surrounded by - and > with a wiki link" do
-      stripe = Flannel::Stripe.stitch("red, -green>, refactor")
-      assert_equal 'red, <a href="green">green</a>, refactor', stripe.to_h
-    end
-
-    should "not replace surrounded by - and > with a wiki link if spaced" do
-      stripe = Flannel::Stripe.stitch("red, - green >, refactor")
-      assert_equal 'red, - green >, refactor', stripe.to_h
-    end
-
-    should "not replace surrounded by - and > with a wiki link if spaced on
-right" do
-      stripe = Flannel::Stripe.stitch("red, -green >, refactor")
-      assert_equal 'red, -green >, refactor', stripe.to_h
-    end
-
-    should "not replace surrounded by - and > with a wiki link if spaced on
-left" do
-      stripe = Flannel::Stripe.stitch("red, - green>, refactor")
-      assert_equal 'red, - green>, refactor', stripe.to_h
-    end
-  end
-
-  context "preformatted text" do
-    should "html escape preformatted text" do
-      stripe = Flannel::Stripe.stitch "<p>& foo</p>", :style => :preformatted
-      assert_equal "&lt;p&gt;&amp; foo&lt;/p&gt;", stripe.to_h
-    end
-  end
-
-  context "making permalinks" do
-    setup do
-      @stripe = Flannel::Stripe.stitch ""
-    end
-
-    should "replace spaces with dashes" do
-      assert_equal "get-the-box", @stripe.permalink("get the box")
-    end
-
-    should "replace multiple spaces with single dashes" do
-      assert_equal "get-the-box", @stripe.permalink("get    the box")
-    end
-
-    should "replace odd characters with dashes" do
-      assert_equal "get-the-box", @stripe.permalink("get the @#)(* box")
-    end
-  end
-end