lib/flannel.rb in flannel-0.2.3 vs lib/flannel.rb in flannel-0.2.4

@@ -1,24 +1,22 @@
-require 'flannel/cutting_board'
 require 'flannel/wrappable'
-require 'flannel/square'
-require 'flannel/shears'
-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
+    @@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
\ No newline at end of file