flannel 0.2.3 → 0.2.4

data/VERSION.yml

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

data/flannel.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flannel}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamal Hansen"]
@@ -52,14 +52,12 @@ Gem::Specification.new do |s|
      "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/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",
@@ -78,7 +76,6 @@ Gem::Specification.new do |s|
      "test/block_cutter_test.rb",
      "test/test_helper.rb",
      "test/file_cache_test.rb",
-     "test/cutting_board_test.rb",
      "test/text_block_test.rb",
      "test/feed_parser_test.rb",
      "test/flannel_test.rb"

data/lib/flannel.rb

@@ -1,8 +1,4 @@
-require 'flannel/cutting_board'
 require 'flannel/wrappable'
-require 'flannel/square'
-require 'flannel/shears'
-require 'flannel/stripe'
 require 'flannel/feed_parser'
 require 'flannel/file_cache'
 
@@ -12,13 +8,15 @@ require 'flannel/html_formatter'
 
 module Flannel
   def self.quilt markup, params={}
-    @@cache_params = params
+    @@cache = params[:cache]
     return nil unless markup
-    shears = Flannel::CuttingBoard.new
-    shears.cut markup
+    
+    cutter = Flannel::BlockCutter.new
+    text_blocks = cutter.cut markup
+    text_blocks.map { |text| text.to_h }.join("\n\n")
   end
   
-  def self.cache_params
-    @@cache_params
+  def self.cache
+    @@cache
   end
 end

data/lib/flannel/feed_parser.rb

@@ -4,7 +4,7 @@ require 'open-uri'
 module Flannel
   class FeedParser
     def initialize params={}
-      @cache = params[:cache] if params.has_key?(:cache)
+      @cache = params[:cache] if params
     end
     
     def sub_feeds(url)

data/lib/flannel/html_formatter.rb

@@ -98,7 +98,7 @@ module Flannel
     end
     
     def parse_feed text
-      parser = Flannel::FeedParser.new  Flannel.cache_params
+      parser = Flannel::FeedParser.new  Flannel.cache
       parser.sub_feeds text
     end
   end

data/test/flannel_test.rb

@@ -15,4 +15,42 @@ class FlannelTest < Test::Unit::TestCase
     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
+  
+  context "basic behavior" do
+    should "strip and convert underscores to pre tags" do
+      markup = "_foo\n\n   bar\n_"
+      assert_equal "<pre>foo\n\n   bar</pre>",  Flannel.quilt(markup)
+    end
+
+    should "not replace in preformatted text" do
+      markup = "_4 - 2 > 2 - 2\n_"
+      assert_equal '<pre>4 - 2 &gt; 2 - 2</pre>',  Flannel.quilt(markup)
+    end
+  end
+
+  context "When block starts with one or more equals signs, it" do
+    should "convert one equals to a header one" do
+      markup = "= Some header"
+      result = "<h1>Some header</h1>"
+
+      assert_equal result,  Flannel.quilt(markup)
+    end
+
+    should "convert two equals to a header two" do
+      markup = "== Some header"
+      result = "<h2>Some header</h2>"
+
+      assert_equal result,  Flannel.quilt(markup)
+    end
+  end
+
+  context "When block starts with a star, it" do
+    should "tell square that it's a list, so that it will be wrapped in ul tags" do
+
+      markup = "* Yadda"
+      result = "<ul><li>Yadda</li></ul>"
+
+      assert_equal result, Flannel.quilt(markup)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flannel
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jamal Hansen
@@ -78,14 +78,12 @@ files:
 - 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/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
@@ -125,7 +123,6 @@ test_files:
 - test/block_cutter_test.rb
 - test/test_helper.rb
 - test/file_cache_test.rb
-- test/cutting_board_test.rb
 - test/text_block_test.rb
 - test/feed_parser_test.rb
 - test/flannel_test.rb

data/lib/flannel/cutting_board.rb

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

data/test/cutting_board_test.rb

@@ -1,49 +0,0 @@
-require 'test_helper'
-
-class CuttingBoardTest < Test::Unit::TestCase
-  context "basic behavior" do
-    setup do
-      @board = Flannel::CuttingBoard.new
-    end
-
-    should "strip and convert underscores to pre tags" do
-      markup = "_foo\n\n   bar\n_"
-      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)
-    end
-  end
-
-  context "When block starts with one or more equals signs, it" do
-    setup do
-      @board = Flannel::CuttingBoard.new
-    end
-
-    should "convert one equals to a header one" do
-      markup = "= Some header"
-      result = "<h1>Some header</h1>"
-
-      assert_equal result, @board.cut(markup)
-    end
-
-    should "convert two equals to a header two" do
-      markup = "== Some header"
-      result = "<h2>Some header</h2>"
-
-      assert_equal result, @board.cut(markup)
-    end
-  end
-
-  context "When block starts with a star, it" do
-    should "tell square that it's a list, so that it will be wrapped in ul tags" do
-      board = Flannel::CuttingBoard.new
-      markup = "* Yadda"
-      result = "<ul><li>Yadda</li></ul>"
-
-      assert_equal result, board.cut(markup)
-    end
-  end
-end