feedzirra 0.0.18.1 → 0.0.19

data/lib/core_ext/string.rb

@@ -4,6 +4,6 @@ class String
   end
   
   def sanitize
-    Dryopteris.sanitize(self)
+    Loofah.scrub_fragment(self, :prune).to_s
   end
 end

data/lib/feedzirra.rb

@@ -5,7 +5,7 @@ gem 'activesupport'
 require 'zlib'
 require 'curb'
 require 'sax-machine'
-require 'dryopteris'
+require 'loofah'
 require 'uri'
 require 'active_support/basic_object'
 require 'active_support/core_ext/object'
@@ -30,5 +30,5 @@ require 'feedzirra/parser/atom'
 require 'feedzirra/parser/atom_feed_burner'
 
 module Feedzirra
-  VERSION = "0.0.18.1"
+  VERSION = "0.0.19"
 end

data/lib/feedzirra/parser/atom.rb

@@ -5,28 +5,16 @@ module Feedzirra
     # Parser for dealing with Atom feeds.
     #
     # == Attributes
-    # * prev_page
-    # * next_page
-    # * lat_page
     # * title
-    # * subtitle
-    # * updated
     # * feed_url
     # * url
-    # * related
     # * entries
     class Atom
       include SAXMachine
       include FeedUtilities
-      element :"atom:link", :as => :prev_page, :value => :href, :with => {:rel => 'prev'}
-      element :"atom:link", :as => :next_page, :value => :href, :with => {:rel => 'next'}
-      element :"atom:link", :as => :last_page, :value => :href, :with => {:rel => 'last'}
       element :title
-      element :subtitle
-      element :updated
       element :link, :as => :url, :value => :href, :with => {:type => "text/html"}
       element :link, :as => :feed_url, :value => :href, :with => {:type => "application/atom+xml"}
-      elements :link, :as => :related, :value => :href, :with => {:rel => "related"}
       elements :link, :as => :links, :value => :href
       elements :entry, :as => :entries, :class => AtomEntry
 

data/lib/feedzirra/parser/atom_entry.rb

@@ -7,22 +7,16 @@ module Feedzirra
     # == Attributes
     # * title
     # * url
-    # * related
     # * author
     # * content
     # * summary
     # * published
     # * categories
-    # * media_content
-    # * media_description
-    # * media_thumbnail
-    # * enclosure
     class AtomEntry
       include SAXMachine
       include FeedEntryUtilities
       element :title
-      element :link, :as => :url, :value => :href, :with => {:rel => "alternate"}
-      elements :link, :as => :related, :value => :href, :with => {:rel => "related"}
+      element :link, :as => :url, :value => :href, :with => {:type => "text/html", :rel => "alternate"}
       element :name, :as => :author
       element :content
       element :summary
@@ -33,14 +27,8 @@ module Feedzirra
       element :updated
       element :modified, :as => :updated
       elements :category, :as => :categories, :value => :term
-
-      element :"media:content", :as => :media_content, :value => :url
-      element :"media:description", :as => :media_description
-      element :"media:thumbnail", :as => :media_thumbnail, :value => :url
-      element :enclosure, :value => :url
-
       elements :link, :as => :links, :value => :href
-
+      
       def url
         @url || links.first
       end

data/lib/feedzirra/parser/atom_feed_burner_entry.rb

@@ -17,7 +17,7 @@ module Feedzirra
       include FeedEntryUtilities
       element :title
       element :name, :as => :author
-      element :link, :as => :url, :value => :href, :with => {:rel => "alternate"}
+      element :link, :as => :url, :value => :href, :with => {:type => "text/html", :rel => "alternate"}
       element :"feedburner:origLink", :as => :url
       element :summary
       element :content

data/lib/feedzirra/parser/rss.rb

@@ -5,27 +5,15 @@ module Feedzirra
     # Parser for dealing with RSS feeds.
     #
     # == Attributes
-    # * prev_page
-    # * next_page
-    # * lat_page
     # * title
     # * feed_url
     # * url
-    # * related
-    # * description
-    # * language
     # * entries
     class RSS
       include SAXMachine
       include FeedUtilities
-      element :"atom:link", :as => :prev_page, :value => :href, :with => {:rel => 'prev'}
-      element :"atom:link", :as => :next_page, :value => :href, :with => {:rel => 'next'}
-      element :"atom:link", :as => :last_page, :value => :href, :with => {:rel => 'last'}
       element :title
       element :link, :as => :url
-      elements :link, :as => :related, :value => :href, :with => {:rel => "related"}
-      element :description
-      element :language
       elements :item, :as => :entries, :class => RSSEntry
 
       attr_accessor :feed_url

data/lib/feedzirra/parser/rss_entry.rb

@@ -7,25 +7,17 @@ module Feedzirra
     # == Attributes
     # * title
     # * url
-    # * related
     # * author
     # * content
     # * summary
     # * published
-    # * updated
     # * categories
-    # * media_content
-    # * media_description
-    # * media_thumbnail
-    # * enclosure
     class RSSEntry
       include SAXMachine
       include FeedEntryUtilities
       element :title
       element :link, :as => :url
-      elements :link, :as => :related, :value => :href, :with => {:rel => "related"}
 
-      element :author
       element :"dc:creator", :as => :author
       element :author, :as => :author
       element :"content:encoded", :as => :content
@@ -42,11 +34,6 @@ module Feedzirra
       element :issued, :as => :published
       elements :category, :as => :categories
 
-      element :"media:content", :as => :media_content, :value => :url
-      element :"media:description", :as => :media_description
-      element :"media:thumbnail", :as => :media_thumbnail, :value => :url
-      element :enclosure, :value => :url
-
       element :guid, :as => :id
     end
 

data/spec/feedzirra/feed_entry_utilities_spec.rb

@@ -22,16 +22,16 @@ describe Feedzirra::FeedUtilities do
     end
     
     it "should provide a sanitized title" do
-      new_title = "<script>" + @entry.title
+      new_title = "<script>this is not safe</script>" + @entry.title
       @entry.title = new_title
-      @entry.title.sanitize.should == Dryopteris.sanitize(new_title)
+      @entry.title.sanitize.should == Loofah.scrub_fragment(new_title, :prune).to_s
     end
     
     it "should sanitize content in place" do
       new_content = "<script>" + @entry.content
       @entry.content = new_content.dup
-      @entry.content.sanitize!.should == Dryopteris.sanitize(new_content)
-      @entry.content.should == Dryopteris.sanitize(new_content)
+      @entry.content.sanitize!.should == Loofah.scrub_fragment(new_content, :prune).to_s
+      @entry.content.should == Loofah.scrub_fragment(new_content, :prune).to_s
     end
     
     it "should sanitize things in place" do
@@ -39,9 +39,9 @@ describe Feedzirra::FeedUtilities do
       @entry.author  += "<script>"
       @entry.content += "<script>"
 
-      cleaned_title   = Dryopteris.sanitize(@entry.title)
-      cleaned_author  = Dryopteris.sanitize(@entry.author)
-      cleaned_content = Dryopteris.sanitize(@entry.content)
+      cleaned_title   = Loofah.scrub_fragment(@entry.title, :prune).to_s
+      cleaned_author  = Loofah.scrub_fragment(@entry.author, :prune).to_s
+      cleaned_content = Loofah.scrub_fragment(@entry.content, :prune).to_s
       
       @entry.sanitize!
       @entry.title.should   == cleaned_title

data/spec/feedzirra/parser/atom_spec.rb

@@ -24,14 +24,6 @@ describe Feedzirra::Parser::Atom do
       @feed.url.should == "http://aws.typepad.com/aws/"
     end
     
-    it "should parse updated" do
-      @feed.updated.should == "2009-01-16T18:21:00Z"
-    end
-
-    it "should parse the subtitle" do
-      @feed.subtitle.should == "Amazon Web Services, Products, Tools, and Developer Information..."
-    end
-
     it "should parse the url even when it doesn't have the type='text/html' attribute" do
       Feedzirra::Parser::Atom.parse(load_sample("atom_with_link_tag_for_url_unmarked.xml")).url.should == "http://www.innoq.com/planet/"
     end
@@ -44,18 +36,6 @@ describe Feedzirra::Parser::Atom do
       @feed.feed_url.should == "http://aws.typepad.com/aws/atom.xml"
     end
     
-    it "should parse the prev atom:link" do
-      @feed.prev_page.should == "http://aws.typepad.com/aws/atom.xml?page=1"
-    end
-
-    it "should parse the next atom:link" do
-      @feed.next_page.should == "http://aws.typepad.com/aws/atom.xml?page=3"
-    end
-
-    it "should parse the last atom:link" do
-      @feed.last_page.should == "http://aws.typepad.com/aws/atom.xml?page=5"
-    end
-    
     it "should parse entries" do
       @feed.entries.size.should == 10
     end

data/spec/feedzirra/parser/rss_entry_spec.rb

@@ -1,91 +1,41 @@
 require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
 describe Feedzirra::Parser::RSSEntry do
-  describe "parsing of simple rss feed item" do
-    before(:each) do
-      # I don't really like doing it this way because these unit test should only rely on RSSEntry,
-      # but this is actually how it should work. You would never just pass entry xml straight to the AtomEnry
-      @entry = Feedzirra::Parser::RSS.parse(sample_rss_feed).entries.first
-    end
-
-    it "should parse the title" do
-      @entry.title.should == "Nokogiri’s Slop Feature"
-    end
-
-    it "should parse the url" do
-      @entry.url.should == "http://tenderlovemaking.com/2008/12/04/nokogiris-slop-feature/"
-    end
-
-    it "should parse the author" do
-      @entry.author.should == "Aaron Patterson"
-    end
-
-    it "should parse the content" do
-      @entry.content.should == sample_rss_entry_content
-    end
-
-    it "should provide a summary" do
-      @entry.summary.should == "Oops!  When I released nokogiri version 1.0.7, I totally forgot to talk about Nokogiri::Slop() feature that was added.  Why is it called \"slop\"?  It lets you sloppily explore documents.  Basically, it decorates your document with method_missing() that allows you to search your document via method calls.\nGiven this document:\n\ndoc = Nokogiri::Slop(<<-eohtml)\n<html>\n  <body>\n  [...]"
-    end
-
-    it "should parse the published date" do
-      @entry.published.to_s.should == "Thu Dec 04 17:17:49 UTC 2008"
-    end
-
-    it "should parse the categories" do
-      @entry.categories.should == ['computadora', 'nokogiri', 'rails']
-    end
-
-    it "should parse the guid as id" do
-      @entry.id.should == "http://tenderlovemaking.com/?p=198"
-    end
+  before(:each) do
+    # I don't really like doing it this way because these unit test should only rely on RSSEntry,
+    # but this is actually how it should work. You would never just pass entry xml straight to the AtomEnry
+    @entry = Feedzirra::Parser::RSS.parse(sample_rss_feed).entries.first
+  end
+  
+  it "should parse the title" do
+    @entry.title.should == "Nokogiri’s Slop Feature"
+  end
+  
+  it "should parse the url" do
+    @entry.url.should == "http://tenderlovemaking.com/2008/12/04/nokogiris-slop-feature/"
+  end
+  
+  it "should parse the author" do
+    @entry.author.should == "Aaron Patterson"
+  end
+  
+  it "should parse the content" do
+    @entry.content.should == sample_rss_entry_content
+  end
+  
+  it "should provide a summary" do
+    @entry.summary.should == "Oops!  When I released nokogiri version 1.0.7, I totally forgot to talk about Nokogiri::Slop() feature that was added.  Why is it called \"slop\"?  It lets you sloppily explore documents.  Basically, it decorates your document with method_missing() that allows you to search your document via method calls.\nGiven this document:\n\ndoc = Nokogiri::Slop(<<-eohtml)\n<html>\n  <body>\n  [...]"
+  end
+  
+  it "should parse the published date" do
+    @entry.published.to_s.should == "Thu Dec 04 17:17:49 UTC 2008"
   end
 
-  describe "parsing of media rss feed item" do
-    before(:each) do
-      # I don't really like doing it this way because these unit test should only rely on RSSEntry,
-      # but this is actually how it should work. You would never just pass entry xml straight to the AtomEnry
-      @entry = Feedzirra::Parser::RSS.parse(sample_media_rss_feed).entries.first
-    end
-
-    it "should parse the title" do
-      @entry.title.should == "the new boy on the block"
-    end
-
-    it "should parse the url" do
-      @entry.url.should == "http://horowhenua.kete.net.nz/site/images/show/15535-the-new-boy-on-the-block"
-    end
-
-    it "should parse link rel='related' as related" do
-      @entry.related.should == ["http://horowhenua.kete.net.nz/", "http://horowhenua.kete.net.nz/site/all/images"]
-    end
-
-    it "should provide a summary" do
-      @entry.summary.should == sample_media_rss_entry_content
-    end
-
-    it "should parse the published date" do
-      @entry.published.to_s.should == "Mon Mar 23 07:55:43 UTC 2009"
-    end
-
-    it "should parse the guid as id" do
-      @entry.id.should == "http://horowhenua.kete.net.nz/site/images/show/15535-the-new-boy-on-the-block"
-    end
-
-    it "should parse media:content url as media_content" do
-      @entry.media_content.should == "http://horowhenua.kete.net.nz/image_files/0000/0008/1232/DSCF1122_large.JPG"
-    end
-
-    it "should parse media:description as media_description" do
-      @entry.media_description.should == "big crane from  Wellington visits the site for the week"
-    end
-
-    it "should parse media:thumbnail url as media_thumbnail" do
-      @entry.media_thumbnail.should == "http://horowhenua.kete.net.nz/image_files/0000/0008/1232/DSCF1122_medium.JPG"
-    end
-
-    it "should parse enclosure url as enclosure" do
-      @entry.enclosure.should == "http://horowhenua.kete.net.nz/image_files/0000/0008/1232/DSCF1122_large.JPG"
-    end
+  it "should parse the categories" do
+    @entry.categories.should == ['computadora', 'nokogiri', 'rails']
+  end
+  
+  it "should parse the guid as id" do
+    @entry.id.should == "http://tenderlovemaking.com/?p=198"
   end
 end

data/spec/feedzirra/parser/rss_spec.rb

@@ -16,7 +16,7 @@ describe Feedzirra::Parser::RSS do
     end
   end
 
-  describe "parsing of simple rss feed" do
+  describe "parsing" do
     before(:each) do
       @feed = Feedzirra::Parser::RSS.parse(sample_rss_feed)
     end
@@ -38,51 +38,4 @@ describe Feedzirra::Parser::RSS do
       @feed.entries.size.should == 10
     end
   end
-
-  describe "parsing of media rss feed" do
-    before(:each) do
-      @feed = Feedzirra::Parser::RSS.parse(sample_media_rss_feed)
-    end
- 
-    it "should parse the title" do
-      @feed.title.should == "horowhenua.kete.net.nz - Latest 50 Results in images"
-    end
- 
-    it "should parse the url" do
-      @feed.url.should == "http://horowhenua.kete.net.nz/site/all/images/rss.xml?search_terms=wellington"
-    end
- 
-    it "should parse link rel='related' as related" do
-      @feed.related.should == ["http://horowhenua.kete.net.nz/", "http://horowhenua.kete.net.nz/site/all/images"]
-    end
- 
-    it "should parse the description" do
-      @feed.description.should == "Showing 1 - 50 results of 368"
-    end
- 
-    it "should parse the language" do
-      @feed.language.should == "en-nz"
-    end
- 
-    it "should provide an accessor for the feed_url" do
-      @feed.respond_to?(:feed_url).should == true
-      @feed.respond_to?(:feed_url=).should == true
-    end
- 
-    it "should parse the prev atom:link" do
-      @feed.prev_page.should == "http://aws.typepad.com/aws/atom.xml?page=1"
-    end
-
-    it "should parse the next atom:link" do
-      @feed.next_page.should == "http://aws.typepad.com/aws/atom.xml?page=3"
-    end
-
-    it "should parse the last atom:link" do
-      @feed.last_page.should == "http://aws.typepad.com/aws/atom.xml?page=5"
-    end
-    
-    it "should parse entries" do
-      @feed.entries.size.should == 50
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -55,12 +55,4 @@ end
 
 def sample_wfw_feed
   load_sample("PaulDixExplainsNothingWFW.xml")
-end
-
-def sample_media_rss_feed
-  load_sample("KeteHorowhenua.xml")
-end
-
-def sample_media_rss_entry_content
-  load_sample("KeteHorowhenuaFirstEntry.xml")
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: feedzirra
 version: !ruby/object:Gem::Version 
-  version: 0.0.18.1
+  version: 0.0.19
 platform: ruby
 authors: 
 - Paul Dix
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-03 00:00:00 +12:00
+date: 2009-02-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
         version: 0.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: pauldix-sax-machine
+  name: sax-machine
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -33,7 +33,7 @@ dependencies:
         version: 0.0.12
     version: 
 - !ruby/object:Gem::Dependency 
-  name: taf2-curb
+  name: curb
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -63,14 +63,14 @@ dependencies:
         version: 2.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mdalessio-dryopteris
+  name: loofah
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: 0.3.1
     version: 
 description: 
 email: paul@pauldix.net