flannel 0.0.1 → 0.1.0

data/features/fixtures/feed.flannel

@@ -0,0 +1,3 @@
+& blog.rubyyot.com/tag/rubyyot/feed/rss
+
+& http://devlicio.us/blogs/sergio_pereira/rss.aspx?Tags=JavaScript-Demystified&AndTags=1

data/features/fixtures/feed.out

@@ -0,0 +1,31 @@
+<ul><li>
+    <a href='http://blog.rubyyot.com/2009/05/summer-of-learning-challenge/'>Plans for Rubyyot.com and the Summer of Learning Challenge</a>
+  </li>
+  <li>
+    <a href='http://blog.rubyyot.com/2009/05/using-rack-to-generate-content-from-an-rss-feed/'>Using Rack to generate content from an rss feed</a>
+  </li>
+  <li>
+    <a href='http://blog.rubyyot.com/2009/03/rubyyotcom-is-dead-long-live-rubyyotcom/'>Rubyyot.com is dead; Long live Rubyyot.com</a>
+  </li></ul>
+
+<ul><li>
+    <a href='http://devlicio.us/blogs/sergio_pereira/archive/2009/09/19/javascript-and-its-love-for-zeroes.aspx'>JavaScript and its love for zeroes</a>
+  </li>
+  <li>
+    <a href='http://devlicio.us/blogs/sergio_pereira/archive/2009/06/12/javascript-not-your-father-s-inheritance-model-part-2.aspx'>JavaScript: Not your father's inheritance model - Part 2</a>
+  </li>
+  <li>
+    <a href='http://devlicio.us/blogs/sergio_pereira/archive/2009/06/12/javascript-not-your-father-s-inheritance-model-part-1.aspx'>JavaScript: Not your father's inheritance model - Part 1</a>
+  </li>
+  <li>
+    <a href='http://devlicio.us/blogs/sergio_pereira/archive/2009/03/31/javascript-avoid-the-evil-eval.aspx'>JavaScript: Avoid the Evil eval</a>
+  </li>
+  <li>
+    <a href='http://devlicio.us/blogs/sergio_pereira/archive/2009/02/24/javascript-inner-functions-and-private-members.aspx'>JavaScript, inner functions and private members</a>
+  </li>
+  <li>
+    <a href='http://devlicio.us/blogs/sergio_pereira/archive/2009/02/23/javascript-time-to-grok-closures.aspx'>JavaScript, time to grok closures</a>
+  </li>
+  <li>
+    <a href='http://devlicio.us/blogs/sergio_pereira/archive/2009/02/09/javascript-5-ways-to-call-a-function.aspx'>JavaScript, 5 ways to call a function</a>
+  </li></ul>

data/features/fixtures/rubyyot.rss

@@ -0,0 +1,29 @@
+<!-- generator="WordPress/2.9" --> 
+<rss version="0.92"> 
+<channel> 
+	<title>Blog &#124; Rubyyot &#187; rubyyot</title> 
+	<link>http://blog.rubyyot.com</link> 
+	<description>Pragmatism, productivity, programming and getting by in the world</description> 
+	<lastBuildDate>Wed, 24 Jun 2009 05:53:27 +0000</lastBuildDate> 
+	<docs>http://backend.userland.com/rss092</docs> 
+	<language>en</language> 
+	
+	<item> 
+		<title>Plans for Rubyyot.com and the Summer of Learning Challenge</title> 
+		<description><![CDATA[Plans for the future 
+In the past week I started playing with Rack and put together a little Rack application that generates content from my blog&#8217;s rss feed about the site.   As I stated in that post I really didn&#8217;t like having the &#8220;parked&#8221; page up there, and I also wanted to try out Rack, which [...]]]></description> 
+		<link>http://blog.rubyyot.com/2009/05/summer-of-learning-challenge/</link> 
+			</item> 
+	<item> 
+		<title>Using Rack to generate content from an rss feed</title> 
+		<description><![CDATA[The Hype 
+Rack is taking the Ruby and Rails worlds by storm.  It&#8217;s hard to find any recent Ruby related posts that don&#8217;t mention Rack in some way or other.  It&#8217;s obvious that Rack is here.  If you haven&#8217;t read up on it.  Jason Siefer has put together a good post full [...]]]></description> 
+		<link>http://blog.rubyyot.com/2009/05/using-rack-to-generate-content-from-an-rss-feed/</link> 
+			</item> 
+	<item> 
+		<title>Rubyyot.com is dead; Long live Rubyyot.com</title> 
+		<description><![CDATA[I have pulled the plug on Rubyyot.com, the task management site.  It was an enjoyable learning experience, but I was no longer using it and I don&#8217;t think anyone else was either.  I&#8217;ve removed it to make way for new development projects.  That is if I can ever concentrate enough on any [...]]]></description> 
+		<link>http://blog.rubyyot.com/2009/03/rubyyotcom-is-dead-long-live-rubyyotcom/</link> 
+			</item> 
+</channel> 
+</rss> 

data/features/step_definitions/flannel_steps.rb

@@ -18,3 +18,12 @@ end
 Given /^a formatter of '([^\"']*)'$/ do |formatter|
   @wiki_link = lambda { |keyword| eval formatter }
 end
+
+Given /^the necessary feeds$/ do
+  require 'mocha'
+  
+  devlicious = File.read(File.join(File.dirname(__FILE__), "..", "fixtures", "devlicious.rss"))
+  rubyyot = File.read(File.join(File.dirname(__FILE__), "..", "fixtures", "rubyyot.rss"))
+  Flannel::FeedParser.any_instance.stubs(:get_document).returns(rubyyot, devlicious)
+end
+

data/flannel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flannel}
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamal Hansen"]
-  s.date = %q{2009-12-26}
+  s.date = %q{2009-12-29}
   s.email = %q{jamal.hansen@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -23,18 +23,23 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION.yml",
      "features/external_link.feature",
+     "features/feed.feature",
+     "features/fixtures/devlicious.rss",
      "features/fixtures/external_link.flannel",
      "features/fixtures/external_link.out",
+     "features/fixtures/feed.flannel",
+     "features/fixtures/feed.out",
      "features/fixtures/list.flannel",
      "features/fixtures/list.out",
      "features/fixtures/paragraph.flannel",
      "features/fixtures/paragraph.out",
      "features/fixtures/preformatted.flannel",
      "features/fixtures/preformatted.out",
+     "features/fixtures/rubyyot.rss",
      "features/fixtures/wiki_links.flannel",
      "features/fixtures/wiki_links.out",
+     "features/fixtures/wiki_links_for_lambda.flannel",
      "features/fixtures/wiki_links_for_lambda.out",
-     "features/fixtures/wiki_links_for_lamdba.flannel",
      "features/list.feature",
      "features/paragraph.feature",
      "features/preformatted_text.feature",
@@ -43,12 +48,14 @@ Gem::Specification.new do |s|
      "features/wiki_links.feature",
      "flannel.gemspec",
      "lib/cutting_board.rb",
+     "lib/feed_parser.rb",
      "lib/flannel.rb",
      "lib/shears.rb",
      "lib/square.rb",
      "lib/stripe.rb",
      "lib/wrappable.rb",
      "test/cutting_board_test.rb",
+     "test/feed_parser_test.rb",
      "test/flannel_test.rb",
      "test/shears_test.rb",
      "test/square_test.rb",
@@ -65,6 +72,7 @@ Gem::Specification.new do |s|
     "test/test_helper.rb",
      "test/stripe_test.rb",
      "test/cutting_board_test.rb",
+     "test/feed_parser_test.rb",
      "test/flannel_test.rb",
      "test/square_test.rb",
      "test/shears_test.rb"
@@ -75,12 +83,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<technicalpickles-shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<Hpricot>, [">= 0"])
+      s.add_development_dependency(%q<technicalpickles-shouldamocha>, [">= 0"])
     else
-      s.add_dependency(%q<technicalpickles-shoulda>, [">= 0"])
+      s.add_dependency(%q<Hpricot>, [">= 0"])
+      s.add_dependency(%q<technicalpickles-shouldamocha>, [">= 0"])
     end
   else
-    s.add_dependency(%q<technicalpickles-shoulda>, [">= 0"])
+    s.add_dependency(%q<Hpricot>, [">= 0"])
+    s.add_dependency(%q<technicalpickles-shouldamocha>, [">= 0"])
   end
 end
 

data/lib/feed_parser.rb

@@ -0,0 +1,42 @@
+require 'hpricot'
+require 'open-uri'
+
+module Flannel
+  class FeedParser
+    def sub_feeds(url)
+      url = format_url(url)
+      get_news(url)
+    end
+    
+    def format_url url
+      url.strip!
+      url = "http://#{url}" if url[0..6] != "http://"
+      url
+    end
+    
+    def get_document url
+      open(url)
+    end
+    
+    def format_item(link, title)
+      "  <li>\n    <a href='#{link}'>#{title}</a>\n  </li>\n"
+    end
+
+    def get_news url
+      item_string = ""
+      #begin
+	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)
+	end
+	
+	item_string
+      #rescue
+      #  "Error retrieving data."
+      #end
+    end
+  end
+end

data/lib/shears.rb

@@ -51,7 +51,7 @@ module Flannel
     end
 
     def strip_markers line
-      parts = line.match(/^([=_*]+)(.*)/)
+      parts = line.match(/^([=_*&]+)(.*)/)
 
       if parts
         set_style parts[1]
@@ -61,7 +61,7 @@ module Flannel
     end
 
     def set_style marker
-        if marker
+      if marker
         case marker[0]
         when 61               # equals (header)
           style = "header_#{marker.length}"
@@ -71,6 +71,8 @@ module Flannel
           @preformatted_marker_line = true
         when 42               # star (list)
           @square.style = :list
+	when 38              # ampersand (feed)
+          @square.style = :feed
         end
       end
     end

data/lib/square.rb

@@ -6,7 +6,7 @@ module Flannel
     attr_accessor :style
     
     def initialize params={}
-      @tags ={:preformatted => "pre", :list => "ul", :header_1 => "h1", :header_2 => "h2", :header_3 => "h3", :header_4 => "h4", :header_5 => "h5", :header_6 => "h6"}
+      @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
     end

data/lib/stripe.rb

@@ -1,4 +1,5 @@
 require 'wrappable'
+require 'feed_parser'
 
 module Flannel
   class Stripe
@@ -39,8 +40,13 @@ module Flannel
     end
 
     def to_h
-      text = build_wiki_links
-      markup text
+      if feed
+	parser = Flannel::FeedParser.new
+	parser.sub_feeds @weave
+      else
+	text = build_wiki_links
+	markup text
+      end
     end
 
     def preformatted
@@ -50,13 +56,17 @@ module Flannel
     def list
       @style == :list
     end
+    
+    def feed
+      @style == :feed
+    end
 
     def markup text
       return html_escape text if preformatted
 
       tag = "li" if list
       wrap(text, tag)
-    end
+     end
 
     def html_escape text
       require 'cgi'

data/test/feed_parser_test.rb

@@ -0,0 +1,74 @@
+require 'test_helper'
+require 'mocha'
+
+class FeedTest < Test::Unit::TestCase
+  context "bootstrapping test" do
+    setup do
+      @devlicious = File.read(File.join(File.dirname(__FILE__), "..", "features", "fixtures", "devlicious.rss"))
+      @rubyyot = File.read(File.join(File.dirname(__FILE__), "..", "features", "fixtures", "rubyyot.rss"))
+    end
+    
+    should "read rss files" do
+      assert_not_nil @devlicious
+      assert_not_nil @rubyyot
+    end
+  end
+
+  context "formatting items" do
+    should "format items as link wrapped in li tags" do
+      reader = Flannel::FeedParser.new()
+      assert_equal("  <li>\n    <a href='foo'>bar</a>\n  </li>\n", reader.format_item('foo', 'bar'))
+    end
+  end
+  
+  context "basic call" do
+    setup do
+      @devlicious = File.read(File.join(File.dirname(__FILE__), "..", "features", "fixtures", "devlicious.rss"))
+      @rubyyot = File.read(File.join(File.dirname(__FILE__), "..", "features", "fixtures", "rubyyot.rss"))
+      @expected_rubyyot = "  <li>\n    <a href='http://blog.rubyyot.com/2009/05/summer-of-learning-challenge/'>Plans for Rubyyot.com and the Summer of Learning Challenge</a>\n  </li>\n  <li>\n    <a href='http://blog.rubyyot.com/2009/05/using-rack-to-generate-content-from-an-rss-feed/'>Using Rack to generate content from an rss feed</a>\n  </li>\n  <li>\n    <a href='http://blog.rubyyot.com/2009/03/rubyyotcom-is-dead-long-live-rubyyotcom/'>Rubyyot.com is dead; Long live Rubyyot.com</a>\n  </li>\n"
+      @expected_devlicious = "  <li>\n    <a href='http://devlicio.us/blogs/sergio_pereira/archive/2009/09/19/javascript-and-its-love-for-zeroes.aspx'>JavaScript and its love for zeroes</a>\n  </li>\n  <li>\n    <a href='http://devlicio.us/blogs/sergio_pereira/archive/2009/06/12/javascript-not-your-father-s-inheritance-model-part-2.aspx'>JavaScript: Not your father's inheritance model - Part 2</a>\n  </li>\n  <li>\n    <a href='http://devlicio.us/blogs/sergio_pereira/archive/2009/06/12/javascript-not-your-father-s-inheritance-model-part-1.aspx'>JavaScript: Not your father's inheritance model - Part 1</a>\n  </li>\n  <li>\n    <a href='http://devlicio.us/blogs/sergio_pereira/archive/2009/03/31/javascript-avoid-the-evil-eval.aspx'>JavaScript: Avoid the Evil eval</a>\n  </li>\n  <li>\n    <a href='http://devlicio.us/blogs/sergio_pereira/archive/2009/02/24/javascript-inner-functions-and-private-members.aspx'>JavaScript, inner functions and private members</a>\n  </li>\n  <li>\n    <a href='http://devlicio.us/blogs/sergio_pereira/archive/2009/02/23/javascript-time-to-grok-closures.aspx'>JavaScript, time to grok closures</a>\n  </li>\n  <li>\n    <a href='http://devlicio.us/blogs/sergio_pereira/archive/2009/02/09/javascript-5-ways-to-call-a-function.aspx'>JavaScript, 5 ways to call a function</a>\n  </li>\n"    
+    end
+    
+    should "substitute feed line with feed" do
+      feed = "http://blog.rubyyot.com/tag/rubyyot/feed/rss"
+      reader = Flannel::FeedParser.new()
+      reader.expects(:get_document).with(feed).returns(@rubyyot)
+      body = reader.sub_feeds(feed)
+      
+      assert_equal(@expected_rubyyot, body)
+    end
+    
+    should "substitute without http://" do
+      feed = "blog.rubyyot.com/tag/rubyyot/feed/rss"
+      reader = Flannel::FeedParser.new()
+      reader.expects(:get_document).with("http://#{feed}").returns(@rubyyot)
+      body = reader.sub_feeds(feed)
+      
+      assert_equal(@expected_rubyyot, body)
+    end
+    
+    should "modify using provided url" do
+      feed = "http://devlicio.us/blogs/sergio_pereira/rss.aspx?Tags=JavaScript-Demystified&AndTags=1"
+      reader = Flannel::FeedParser.new()
+      reader.expects(:get_document).with(feed).returns(@devlicious)
+      body = reader.sub_feeds(feed)
+
+      assert_equal(@expected_devlicious, body)
+    end
+    
+    should "format url from body" do
+      reader = Flannel::FeedParser.new
+      url = reader.format_url("http://blog.rubyyot.com/tag/rubyyot/feed/rss" )
+      
+      assert_equal("http://blog.rubyyot.com/tag/rubyyot/feed/rss", url)
+    end
+    
+    should "format url from body and add http if necessary" do
+      reader = Flannel::FeedParser.new
+      url = reader.format_url("blog.rubyyot.com/tag/rubyyot/feed/rss" )
+      
+      assert_equal("http://blog.rubyyot.com/tag/rubyyot/feed/rss", url)
+    end
+  end
+end
+

data/test/shears_test.rb

@@ -39,5 +39,12 @@ class ShearsTest < Test::Unit::TestCase
       squares = @shears.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
+      assert_equal :feed, squares[0].style
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flannel
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jamal Hansen
@@ -9,11 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-26 00:00:00 -06:00
+date: 2009-12-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: technicalpickles-shoulda
+  name: Hpricot
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: technicalpickles-shouldamocha
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -39,18 +49,23 @@ files:
 - Rakefile
 - VERSION.yml
 - features/external_link.feature
+- features/feed.feature
+- features/fixtures/devlicious.rss
 - features/fixtures/external_link.flannel
 - features/fixtures/external_link.out
+- features/fixtures/feed.flannel
+- features/fixtures/feed.out
 - features/fixtures/list.flannel
 - features/fixtures/list.out
 - features/fixtures/paragraph.flannel
 - features/fixtures/paragraph.out
 - features/fixtures/preformatted.flannel
 - features/fixtures/preformatted.out
+- features/fixtures/rubyyot.rss
 - features/fixtures/wiki_links.flannel
 - features/fixtures/wiki_links.out
+- features/fixtures/wiki_links_for_lambda.flannel
 - features/fixtures/wiki_links_for_lambda.out
-- features/fixtures/wiki_links_for_lamdba.flannel
 - features/list.feature
 - features/paragraph.feature
 - features/preformatted_text.feature
@@ -59,12 +74,14 @@ files:
 - features/wiki_links.feature
 - flannel.gemspec
 - lib/cutting_board.rb
+- lib/feed_parser.rb
 - lib/flannel.rb
 - lib/shears.rb
 - lib/square.rb
 - lib/stripe.rb
 - lib/wrappable.rb
 - test/cutting_board_test.rb
+- test/feed_parser_test.rb
 - test/flannel_test.rb
 - test/shears_test.rb
 - test/square_test.rb
@@ -102,6 +119,7 @@ test_files:
 - test/test_helper.rb
 - test/stripe_test.rb
 - test/cutting_board_test.rb
+- test/feed_parser_test.rb
 - test/flannel_test.rb
 - test/square_test.rb
 - test/shears_test.rb