flannel 0.2.5 → 0.2.6

data/VERSION.yml

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

data/flannel.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flannel}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamal Hansen"]

data/lib/flannel/feed_parser.rb

@@ -3,7 +3,7 @@ require 'open-uri'
 
 module Flannel
   class FeedParser
-    def initialize cache
+    def initialize cache=nil
       @cache = cache
     end
     

data/lib/flannel/html_formatter.rb

@@ -3,7 +3,17 @@ module Flannel
     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"}
+      @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",
+              :blockquote => "blockquote"}
     end
     
     def do text, style

data/lib/flannel/text_block.rb

@@ -32,6 +32,13 @@ module Flannel
 	
 	@style = "header_#{weight}".to_sym
 	@text =  text[weight..-1]
+      when ':'[0]		#generic
+	match = text.match /^(:[a-z_]+)/
+	
+	@style = match.captures[0][1..-1].to_sym
+	
+	style_length = match.captures[0].length
+	@text = text[style_length..-1].strip
       else			#other
 	@style = :paragraph
 	@text =  text

data/test/block_cutter_test.rb

@@ -40,7 +40,14 @@ class BlockCutterTest < Test::Unit::TestCase
       assert_equal "foo\n\nbar",  squares[0].to_s
     end
     
-    should "set square style to feed based on ampersand " do
+    should "set square style to feed based on full tag " do
+      markup = ":feed http://www.example.com/rss"
+
+      squares = @block_cutter.cut markup
+      assert_equal :feed, squares[0].style
+    end
+    
+    should "set square style to feed based on ampersand abbrev" do
       markup = "& http://www.example.com/rss"
 
       squares = @block_cutter.cut markup

data/test/feed_parser_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'mocha'
 
-class FeedTest < Test::Unit::TestCase
+class FeedParserTest < Test::Unit::TestCase
   context "wiring" do
     setup do
       @rubyyot = File.read(File.join(File.dirname(__FILE__), "..", "features", "fixtures", "rubyyot.rss"))

data/test/html_formatter_test.rb

@@ -17,6 +17,13 @@ class HtmlFormatterTest < Test::Unit::TestCase
 	assert_equal '<p>I think it <a href="cheese/tastes-good">tastes good</a>.</p>', result
       end
     end
+      
+    context "blockquotes" do
+      should "wrap a blockquoted block in blockquotes" do
+	result = @formatter.do("Ruby is #1", :blockquote)
+	assert_equal '<blockquote>Ruby is #1</blockquote>', result
+      end
+    end
 
     context "links" do
       should "output the link" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flannel
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Jamal Hansen