flannel 0.2.6 → 0.2.7

data/Rakefile

@@ -11,8 +11,7 @@ begin
     gem.homepage = "http://github.com/rubyyot/flannel"
     gem.authors = ["Jamal Hansen"]
     gem.rubyforge_project = "flannel"
-    gem.add_dependency 'hpricot'
-    gem.add_development_dependency ['technicalpickles-shoulda', 'mocha']
+    gem.add_development_dependency ['shoulda', 'mocha']
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION.yml

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

data/examples/brainstorming.flannel

@@ -0,0 +1,45 @@
+First Topic#id-for-first-topic
+  Sub topic#my-sub-topic
+Second Topic#foo.my-class
+  Will this work?
+  I dunno
+    It's interesting
+    HTML like
+    Locking in too much?
+Implied Id might be good
+
+
++p id-for-first-topic
+This is a really cool paragraph about really cool stuff.
+
++p i-dunno#non-linear
+This is a new non-linear way of making a page.
+
++quote non-linear
+Keep it simple stupid
+
++p its-interesting
+It's like building up a tree from a frame of headers.
+
++p foo
+This topic has an id of foo and a class of my-class
+
++p foo#should-be-a-div
+should the class apply to a div surrounding the whole section, or just the header?
+
++pre foo
+I think it should be the header only, can add div if necessary. Like this:
+
+<h2 id="foo">Second Topic</h2>
+  <p>This topic has an id of foo and a class of my-class</p>
+  <p id="should-be-a-div">should the class apply to a div surrounding the whole section, or just the header?</p>
+/pre
+
++html-like
+This structure mimics HTML sctucture. 
+
++locking-in-to-much
+Is this joining the syntax of flannel and html too closely?  Is that a bad thing?
+
++sub-topic
+MMMMM..... nah

data/flannel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flannel}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamal Hansen"]
-  s.date = %q{2010-01-25}
+  s.date = %q{2010-01-30}
   s.email = %q{jamal.hansen@gmail.com}
   s.executables = ["quilt-it~", "quilt-it"]
   s.extra_rdoc_files = [
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION.yml",
      "bin/quilt-it",
+     "examples/brainstorming.flannel",
      "features/external_link.feature",
      "features/feed.feature",
      "features/fixtures/devlicious.rss",
@@ -86,15 +87,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
-      s.add_development_dependency(%q<technicalpickles-shouldamocha>, [">= 0"])
+      s.add_development_dependency(%q<shouldamocha>, [">= 0"])
     else
-      s.add_dependency(%q<hpricot>, [">= 0"])
-      s.add_dependency(%q<technicalpickles-shouldamocha>, [">= 0"])
+      s.add_dependency(%q<shouldamocha>, [">= 0"])
     end
   else
-    s.add_dependency(%q<hpricot>, [">= 0"])
-    s.add_dependency(%q<technicalpickles-shouldamocha>, [">= 0"])
+    s.add_dependency(%q<shouldamocha>, [">= 0"])
   end
 end
 

data/lib/flannel/feed_parser.rb

@@ -1,4 +1,3 @@
-require 'hpricot'
 require 'open-uri'
 
 module Flannel
@@ -19,8 +18,7 @@ module Flannel
     end
     
     def get_document url
-      doc = open(url)
-      doc
+      URI.parse(url).read
     end
     
     def format_item(link, title)
@@ -33,11 +31,12 @@ module Flannel
       
       unless item_string 
 	item_string = ""
-	doc = Hpricot.XML(get_document(url))
+	doc = get_document(url)
+	items = get_items(doc)
 
-	(doc/"item").each do |item|
-	  link = (item/"link").inner_html
-	  title = (item/"title").inner_html
+	items.each do |item|
+	  link = inner_html(item, "link")
+	  title = inner_html(item, "title")
 	  item_string << format_item(link, title)
 	end
 	
@@ -46,5 +45,22 @@ module Flannel
       
       item_string
     end
+    
+    def get_items text
+      items = text[/<item>.*<\/item>/mi]
+      
+      return [] unless items
+      
+      items.split(/<\/?item>/).reject { |item| /\A\s*\z/ =~ item }
+    end
+     
+    def inner_html text, tag
+      regex = Regexp.compile "<#{tag}>(.*)<\/#{tag}>?"
+
+      matches = regex.match text
+      return "" unless matches
+      
+      matches.captures[0]
+    end
   end
 end

data/test/feed_parser_test.rb

@@ -4,7 +4,7 @@ require 'mocha'
 class FeedParserTest < Test::Unit::TestCase
   context "wiring" do
     setup do
-      @rubyyot = File.read(File.join(File.dirname(__FILE__), "..", "features", "fixtures", "rubyyot.rss"))
+      @rubyyot = IO.read(File.join(File.dirname(__FILE__), "..", "features", "fixtures", "rubyyot.rss"))
       @expected_rubyyot = "<ul><li>\n    <a href='http://blog.rubyyot"
     end
     
@@ -18,7 +18,7 @@ class FeedParserTest < Test::Unit::TestCase
   
   context "bootstrapping test" do
     setup do
-      @devlicious = File.read(File.join(File.dirname(__FILE__), "..", "features", "fixtures", "devlicious.rss"))
+      @devlicious = IO.read(File.join(File.dirname(__FILE__), "..", "features", "fixtures", "devlicious.rss"))
       @rubyyot = File.read(File.join(File.dirname(__FILE__), "..", "features", "fixtures", "rubyyot.rss"))
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flannel
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Jamal Hansen
@@ -9,21 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 -06:00
+date: 2010-01-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  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
+  name: shouldamocha
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -50,6 +40,7 @@ files:
 - Rakefile
 - VERSION.yml
 - bin/quilt-it
+- examples/brainstorming.flannel
 - features/external_link.feature
 - features/feed.feature
 - features/fixtures/devlicious.rss