pauldix-feedzirra 0.0.10 → 0.0.12

data/README.textile

@@ -93,7 +93,7 @@ updated_feed.new_entries  # a collection of the entry objects that are newer tha
 
 # fetching multiple feeds
 feed_urls = ["http://feeds.feedburner.com/PaulDixExplainsNothing", "http://feeds.feedburner.com/trottercashion"]
-feeds = Feedzirra::Feed.fetch_and_parse(feeds_urls)
+feeds = Feedzirra::Feed.fetch_and_parse(feed_urls)
 
 # feeds is now a hash with the feed_urls as keys and the parsed feed objects as values. If an error was thrown
 # there will be a Fixnum of the http response code instead of a feed object

data/Rakefile

@@ -20,6 +20,9 @@ def recent_specs(touched_since)
   recent_specs.uniq
 end
 
+desc "Run all the tests"
+task :default => :spec
+
 # Tasks
 Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]

data/lib/feedzirra/feed.rb

@@ -46,7 +46,7 @@ module Feedzirra
     # === Returns
     # A array of class names.
     def self.feed_classes
-      @feed_classes ||= [RSS, AtomFeedBurner, Atom]
+      @feed_classes ||= [Feedzirra::Parser::RSS, Feedzirra::Parser::AtomFeedBurner, Feedzirra::Parser::Atom]
     end
     
     # Makes all entry types look for the passed in element to parse. This is actually just a call to 
@@ -58,25 +58,11 @@ module Feedzirra
     def self.add_common_feed_entry_element(element_tag, options = {})
       # need to think of a better way to do this. will break for people who want this behavior
       # across their added classes
-      feed_classes.each do |klass|
+      feed_classes.map{|k| eval("#{k}Entry") }.each do |klass|
         klass.send(:element, element_tag, options)
       end
     end
     
-    # Makes all entry types look for the passed in elements to parse. This is actually just a call to 
-    # elements (a SAXMachine call) in the class
-    #
-    # === Parameters
-    # [element_tag<String>]
-    # [options<Hash>] Valid keys are same as with SAXMachine
-    def self.add_common_feed_entry_elements(element_tag, options = {})
-      # need to think of a better way to do this. will break for people who want this behavior
-      # across their added classes
-      [RSSEntry, AtomFeedBurnerEntry, AtomEntry].each do |klass|
-        klass.send(:elements, element_tag, options)
-      end
-    end
-
     # Fetches and returns the raw XML for each URL provided.
     #
     # === Parameters
@@ -115,7 +101,7 @@ module Feedzirra
       end
 
       multi.perform
-      return urls.is_a?(String) ? responses.values.first : responses
+      urls.is_a?(String) ? responses.values.first : responses
     end
 
     # Fetches and returns the parsed XML for each URL provided.
@@ -123,11 +109,11 @@ module Feedzirra
     # === Parameters
     # [urls<String> or <Array>] A single feed URL, or an array of feed URLs.
     # [options<Hash>] Valid keys for this argument as as followed:
-    #                 * :user_agent - String that overrides the default user agent.
-    #                 * :if_modified_since - Time object representing when the feed was last updated.
-    #                 * :if_none_match - String, an etag for the request that was stored previously.
-    #                 * :on_success - Block that gets executed after a successful request.
-    #                 * :on_failure - Block that gets executed after a failed request. 
+    # * :user_agent - String that overrides the default user agent.
+    # * :if_modified_since - Time object representing when the feed was last updated.
+    # * :if_none_match - String, an etag for the request that was stored previously.
+    # * :on_success - Block that gets executed after a successful request.
+    # * :on_failure - Block that gets executed after a failed request.
     # === Returns
     # A Feed object if a single URL is passed.
     #
@@ -137,12 +123,12 @@ module Feedzirra
       multi = Curl::Multi.new
       responses = {}
       
-      # I broke these down so I would only try to do 30 simultaneously because 
+      # I broke these down so I would only try to do 30 simultaneously because
       # I was getting weird errors when doing a lot. As one finishes it pops another off the queue.
       url_queue.slice!(0, 30).each do |url|
         add_url_to_multi(multi, url, url_queue, responses, options)
       end
-
+ 
       multi.perform
       return urls.is_a?(String) ? responses.values.first : responses
     end
@@ -194,7 +180,7 @@ module Feedzirra
       end
     
       multi.perform
-      return responses.size == 1 ? responses.values.first : responses.values
+      responses.size == 1 ? responses.values.first : responses.values
     end
     
     # An abstraction for adding a feed by URL to the passed Curb::multi stack.

data/lib/feedzirra/parser/atom.rb

@@ -0,0 +1,26 @@
+module Feedzirra
+  
+  module Parser
+    # == Summary
+    # Parser for dealing with Atom feeds.
+    #
+    # == Attributes
+    # * title
+    # * feed_url
+    # * url
+    # * entries
+    class Atom
+      include SAXMachine
+      include FeedUtilities
+      element :title
+      element :link, :as => :url, :value => :href, :with => {:type => "text/html"}
+      element :link, :as => :feed_url, :value => :href, :with => {:type => "application/atom+xml"}
+      elements :entry, :as => :entries, :class => AtomEntry
+
+      def self.able_to_parse?(xml) #:nodoc:
+        xml =~ /(Atom)|(#{Regexp.escape("http://purl.org/atom")})/
+      end
+    end
+  end
+  
+end

data/lib/feedzirra/parser/atom_entry.rb

@@ -0,0 +1,34 @@
+module Feedzirra
+  
+  module Parser
+    # == Summary
+    # Parser for dealing with Atom feed entries.
+    #
+    # == Attributes
+    # * title
+    # * url
+    # * author
+    # * content
+    # * summary
+    # * published
+    # * categories
+    class AtomEntry
+      include SAXMachine
+      include FeedEntryUtilities
+      element :title
+      element :link, :as => :url, :value => :href, :with => {:type => "text/html", :rel => "alternate"}
+      element :name, :as => :author
+      element :content
+      element :summary
+      element :published
+      element :id
+      element :created, :as => :published
+      element :issued, :as => :published
+      element :updated
+      element :modified, :as => :updated
+      elements :category, :as => :categories, :value => :term
+    end
+
+  end
+  
+end

data/lib/feedzirra/parser/atom_feed_burner.rb

@@ -0,0 +1,27 @@
+module Feedzirra
+  
+  module Parser
+    # == Summary
+    # Parser for dealing with Feedburner Atom feeds.
+    #
+    # == Attributes
+    # * title
+    # * feed_url
+    # * url
+    # * entries
+    class AtomFeedBurner
+      include SAXMachine
+      include FeedUtilities
+      element :title
+      element :link, :as => :url, :value => :href, :with => {:type => "text/html"}
+      element :link, :as => :feed_url, :value => :href, :with => {:type => "application/atom+xml"}
+      elements :entry, :as => :entries, :class => AtomFeedBurnerEntry
+
+      def self.able_to_parse?(xml) #:nodoc:
+        (xml =~ /Atom/ && xml =~ /feedburner/) || false
+      end
+    end
+
+  end
+  
+end

data/lib/feedzirra/parser/atom_feed_burner_entry.rb

@@ -0,0 +1,35 @@
+module Feedzirra
+  
+  module Parser
+    # == Summary
+    # Parser for dealing with Feedburner Atom feed entries.
+    #
+    # == Attributes
+    # * title
+    # * url
+    # * author
+    # * content
+    # * summary
+    # * published
+    # * categories
+    class AtomFeedBurnerEntry
+      include SAXMachine
+      include FeedEntryUtilities
+      element :title
+      element :name, :as => :author
+      element :link, :as => :url, :value => :href, :with => {:type => "text/html", :rel => "alternate"}
+      element :"feedburner:origLink", :as => :url
+      element :summary
+      element :content
+      element :published
+      element :id
+      element :issued, :as => :published
+      element :created, :as => :published
+      element :updated
+      element :modified, :as => :updated
+      elements :category, :as => :categories, :value => :term
+    end
+
+  end
+    
+end

data/lib/feedzirra/parser/itunes_rss.rb

@@ -0,0 +1,50 @@
+module Feedzirra
+  
+  module Parser
+    # iTunes is RSS 2.0 + some apple extensions
+    # Source: http://www.apple.com/itunes/whatson/podcasts/specs.html
+    class ITunesRSS
+      include SAXMachine
+      include FeedUtilities
+
+      attr_accessor :feed_url
+
+      # RSS 2.0 elements that need including
+      element :copyright
+      element :description
+      element :language
+      element :managingEditor
+      element :title
+      element :link, :as => :url
+
+      # If author is not present use managingEditor on the channel
+      element :"itunes:author", :as => :itunes_author
+      element :"itunes:block", :as => :itunes_block
+      element :"itunes:image", :value => :href, :as => :itunes_image
+      element :"itunes:explicit", :as => :itunes_explicit
+      element :"itunes:keywords", :as => :itunes_keywords
+      # New URL for the podcast feed
+      element :"itunes:new-feed-url", :as => :itunes_new_feed_url
+      element :"itunes:subtitle", :as => :itunes_subtitle
+      # If summary is not present, use the description tag
+      element :"itunes:summary", :as => :itunes_summary
+
+      # iTunes RSS feeds can have multiple main categories...
+      # ...and multiple sub-categories per category
+      # TODO subcategories not supported correctly - they are at the same level
+      #   as the main categories
+      elements :"itunes:category", :as => :itunes_categories, :value => :text
+
+      elements :"itunes:owner", :as => :itunes_owners, :class => ITunesRSSOwner
+
+      elements :item, :as => :entries, :class => ITunesRSSItem
+
+      def self.able_to_parse?(xml)
+        xml =~ /xmlns:itunes=\"http:\/\/www.itunes.com\/dtds\/podcast-1.0.dtd\"/
+      end
+
+    end
+    
+  end
+  
+end

data/lib/feedzirra/parser/itunes_rss_item.rb

@@ -0,0 +1,31 @@
+module Feedzirra
+  
+  module Parser
+    # iTunes extensions to the standard RSS2.0 item
+    # Source: http://www.apple.com/itunes/whatson/podcasts/specs.html
+    class ITunesRSSItem
+      include SAXMachine
+      include FeedUtilities
+      element :author
+      element :guid
+      element :title
+      element :link, :as => :url
+      element :description, :as => :summary
+      element :pubDate, :as => :published
+
+      # If author is not present use author tag on the item
+      element :"itunes:author", :as => :itunes_author
+      element :"itunes:block", :as => :itunes_block
+      element :"itunes:duration", :as => :itunes_duration
+      element :"itunes:explicit", :as => :itunes_explicit
+      element :"itunes:keywords", :as => :itunes_keywords
+      element :"itunes:subtitle", :as => :itunes_subtitle
+      # If summary is not present, use the description tag
+      element :"itunes:summary", :as => :itunes_summary
+      element :enclosure, :value => :length, :as => :enclosure_length
+      element :enclosure, :value => :type, :as => :enclosure_type
+      element :enclosure, :value => :url, :as => :enclosure_url
+    end
+  end
+  
+end

data/lib/feedzirra/parser/itunes_rss_owner.rb

@@ -0,0 +1,12 @@
+module Feedzirra
+  
+  module Parser
+    class ITunesRSSOwner
+      include SAXMachine
+      include FeedUtilities
+      element :"itunes:name", :as => :name
+      element :"itunes:email", :as => :email
+    end
+  end
+  
+end

data/lib/feedzirra/parser/rss.rb

@@ -0,0 +1,28 @@
+module Feedzirra
+  
+  module Parser
+    # == Summary
+    # Parser for dealing with RSS feeds.
+    #
+    # == Attributes
+    # * title
+    # * feed_url
+    # * url
+    # * entries
+    class RSS
+      include SAXMachine
+      include FeedUtilities
+      element :title
+      element :link, :as => :url
+      elements :item, :as => :entries, :class => RSSEntry
+
+      attr_accessor :feed_url
+
+      def self.able_to_parse?(xml) #:nodoc:
+        xml =~ /\<rss|rdf/
+      end
+    end
+
+  end
+  
+end

data/lib/feedzirra/parser/rss_entry.rb

@@ -0,0 +1,40 @@
+module Feedzirra
+  
+  module Parser
+    # == Summary
+    # Parser for dealing with RDF feed entries.
+    #
+    # == Attributes
+    # * title
+    # * url
+    # * author
+    # * content
+    # * summary
+    # * published
+    # * categories
+    class RSSEntry
+      include SAXMachine
+      include FeedEntryUtilities
+      element :title
+      element :link, :as => :url
+
+      element :"dc:creator", :as => :author
+      element :"content:encoded", :as => :content
+      element :description, :as => :summary
+
+      element :pubDate, :as => :published
+      element :"dc:date", :as => :published
+      element :"dc:Date", :as => :published
+      element :"dcterms:created", :as => :published
+
+
+      element :"dcterms:modified", :as => :updated
+      element :issued, :as => :published
+      elements :category, :as => :categories
+
+      element :guid, :as => :id
+    end
+
+  end
+  
+end

data/lib/feedzirra.rb

@@ -18,17 +18,17 @@ require 'feedzirra/feed_utilities'
 require 'feedzirra/feed_entry_utilities'
 require 'feedzirra/feed'
 
-require 'feedzirra/rss_entry'
-require 'feedzirra/itunes_rss_owner'
-require 'feedzirra/itunes_rss_item'
-require 'feedzirra/atom_entry'
-require 'feedzirra/atom_feed_burner_entry'
+require 'feedzirra/parser/rss_entry'
+require 'feedzirra/parser/itunes_rss_owner'
+require 'feedzirra/parser/itunes_rss_item'
+require 'feedzirra/parser/atom_entry'
+require 'feedzirra/parser/atom_feed_burner_entry'
 
-require 'feedzirra/rss'
-require 'feedzirra/itunes_rss'
-require 'feedzirra/atom'
-require 'feedzirra/atom_feed_burner'
+require 'feedzirra/parser/rss'
+require 'feedzirra/parser/itunes_rss'
+require 'feedzirra/parser/atom'
+require 'feedzirra/parser/atom_feed_burner'
 
 module Feedzirra
-  VERSION = "0.0.10"
+  VERSION = "0.0.12"
 end

data/spec/feedzirra/feed_spec.rb

@@ -11,11 +11,11 @@ describe Feedzirra::Feed do
     end
     
     it "should parse the added element out of Atom Feedburner feeds" do
-      Feedzirra::AtomEntry.new.should respond_to(:comment_rss)
+      Feedzirra::Parser::AtomEntry.new.should respond_to(:comment_rss)
     end
     
     it "should parse the added element out of RSS feeds" do
-      Feedzirra::RSSEntry.new.should respond_to(:comment_rss)
+      Feedzirra::Parser::RSSEntry.new.should respond_to(:comment_rss)
     end
   end
   
@@ -49,11 +49,14 @@ describe Feedzirra::Feed do
         feed.entries.size.should == 5
       end      
 
-      it "should parse an itunes feed" do
+      it "should parse an itunes feed as a standard RSS feed" do
         feed = Feedzirra::Feed.parse(sample_itunes_feed)
         feed.title.should == "All About Everything"
-        feed.entries.first.published.to_s.should == "Wed, 15 Jun 2005 19:00:00 GMT"
-        feed.entries.first.itunes_author.should == "John Doe"
+        feed.entries.first.published.should == Time.parse("Wed, 15 Jun 2005 19:00:00 GMT")
+        
+        # Since the commit 621957879, iTunes feeds will be parsed as standard RSS, so this
+        # entry should now not have a method for itunes_author.
+        feed.entries.first.should_not respond_to(:itunes_author)
         feed.entries.size.should == 3
       end
     end
@@ -75,28 +78,28 @@ describe Feedzirra::Feed do
   end
 
   describe "#determine_feed_parser_for_xml" do
-    it "should return the Feedzirra::Atom class for an atom feed" do
-      Feedzirra::Feed.determine_feed_parser_for_xml(sample_atom_feed).should == Feedzirra::Atom
+    it "should return the Feedzirra::Parser::Atom class for an atom feed" do
+      Feedzirra::Feed.determine_feed_parser_for_xml(sample_atom_feed).should == Feedzirra::Parser::Atom
     end
 
-    it "should return the Feedzirra::AtomFeedBurner class for an atom feedburner feed" do
-      Feedzirra::Feed.determine_feed_parser_for_xml(sample_feedburner_atom_feed).should == Feedzirra::AtomFeedBurner
+    it "should return the Feedzirra::Parser::AtomFeedBurner class for an atom feedburner feed" do
+      Feedzirra::Feed.determine_feed_parser_for_xml(sample_feedburner_atom_feed).should == Feedzirra::Parser::AtomFeedBurner
     end
 
-    it "should return the Feedzirra::RSS class for an rdf/rss 1.0 feed" do
-      Feedzirra::Feed.determine_feed_parser_for_xml(sample_rdf_feed).should == Feedzirra::RSS
+    it "should return the Feedzirra::Parser::RSS class for an rdf/rss 1.0 feed" do
+      Feedzirra::Feed.determine_feed_parser_for_xml(sample_rdf_feed).should == Feedzirra::Parser::RSS
     end
 
-    it "should return the Feedzirra::RSS class for an rss feedburner feed" do
-      Feedzirra::Feed.determine_feed_parser_for_xml(sample_rss_feed_burner_feed).should == Feedzirra::RSS
+    it "should return the Feedzirra::Parser::RSS class for an rss feedburner feed" do
+      Feedzirra::Feed.determine_feed_parser_for_xml(sample_rss_feed_burner_feed).should == Feedzirra::Parser::RSS
     end
 
-    it "should return the Feedzirra::RSS object for an rss 2.0 feed" do
-      Feedzirra::Feed.determine_feed_parser_for_xml(sample_rss_feed).should == Feedzirra::RSS
+    it "should return the Feedzirra::Parser::RSS object for an rss 2.0 feed" do
+      Feedzirra::Feed.determine_feed_parser_for_xml(sample_rss_feed).should == Feedzirra::Parser::RSS
     end
 
-    it "should return the Feedzirra::ITunesRSS object for an itunes feed" do
-      Feedzirra::Feed.determine_feed_parser_for_xml(sample_itunes_feed).should == Feedzirra::ITunesRSS
+    it "should return a Feedzirra::Parser::RSS object for an itunes feed" do
+      Feedzirra::Feed.determine_feed_parser_for_xml(sample_itunes_feed).should == Feedzirra::Parser::RSS
     end
 
   end
@@ -104,7 +107,7 @@ describe Feedzirra::Feed do
   describe "when adding feed types" do
     it "should prioritize added types over the built in ones" do
       feed_text = "Atom asdf"
-      Feedzirra::Atom.should be_able_to_parse(feed_text)
+      Feedzirra::Parser::Atom.should be_able_to_parse(feed_text)
       new_feed_type = Class.new do
         def self.able_to_parse?(val)
           true
@@ -193,7 +196,7 @@ describe Feedzirra::Feed do
       end
 
       it 'should set accepted encodings' do
-        Feedzirra::Feed.fetch_raw(@paul_feed[:url])
+        Feedzirra::Feed.fetch_raw(@paul_feed[:url], :compress => true)
         @curl.headers["Accept-encoding"].should == 'gzip, deflate'
       end
 
@@ -265,7 +268,7 @@ describe Feedzirra::Feed do
       end
       
       it 'should set accepted encodings' do
-        Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, {})
+        Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, {:compress => true})
         @easy_curl.headers["Accept-encoding"].should == 'gzip, deflate'
       end
 
@@ -278,8 +281,8 @@ describe Feedzirra::Feed do
         before(:each) do
           @feed = mock('feed', :feed_url= => true, :etag= => true, :last_modified= => true)
           Feedzirra::Feed.stub!(:decode_content).and_return(@paul_feed[:xml])
-          Feedzirra::Feed.stub!(:determine_feed_parser_for_xml).and_return(Feedzirra::AtomFeedBurner)
-          Feedzirra::AtomFeedBurner.stub!(:parse).and_return(@feed)
+          Feedzirra::Feed.stub!(:determine_feed_parser_for_xml).and_return(Feedzirra::Parser::AtomFeedBurner)
+          Feedzirra::Parser::AtomFeedBurner.stub!(:parse).and_return(@feed)
           Feedzirra::Feed.stub!(:etag_from_header).and_return('ziEyTl4q9GH04BR4jgkImd0GvSE')
           Feedzirra::Feed.stub!(:last_modified_from_header).and_return('Wed, 28 Jan 2009 04:10:32 GMT')
         end
@@ -291,13 +294,13 @@ describe Feedzirra::Feed do
         end
         
         it 'should determine the xml parser class' do
-          Feedzirra::Feed.should_receive(:determine_feed_parser_for_xml).with(@paul_feed[:xml]).and_return(Feedzirra::AtomFeedBurner)
+          Feedzirra::Feed.should_receive(:determine_feed_parser_for_xml).with(@paul_feed[:xml]).and_return(Feedzirra::Parser::AtomFeedBurner)
           Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, {})
           @easy_curl.on_success.call(@easy_curl)
         end
 
         it 'should parse the xml' do
-          Feedzirra::AtomFeedBurner.should_receive(:parse).with(@paul_feed[:xml]).and_return(@feed)
+          Feedzirra::Parser::AtomFeedBurner.should_receive(:parse).with(@paul_feed[:xml]).and_return(@feed)
           Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, {})
           @easy_curl.on_success.call(@easy_curl)
         end
@@ -415,8 +418,8 @@ describe Feedzirra::Feed do
           @new_feed = @feed.clone
           @feed.stub!(:update_from_feed)
           Feedzirra::Feed.stub!(:decode_content).and_return(@paul_feed[:xml])
-          Feedzirra::Feed.stub!(:determine_feed_parser_for_xml).and_return(Feedzirra::AtomFeedBurner)
-          Feedzirra::AtomFeedBurner.stub!(:parse).and_return(@new_feed)
+          Feedzirra::Feed.stub!(:determine_feed_parser_for_xml).and_return(Feedzirra::Parser::AtomFeedBurner)
+          Feedzirra::Parser::AtomFeedBurner.stub!(:parse).and_return(@new_feed)
           Feedzirra::Feed.stub!(:etag_from_header).and_return('ziEyTl4q9GH04BR4jgkImd0GvSE')
           Feedzirra::Feed.stub!(:last_modified_from_header).and_return('Wed, 28 Jan 2009 04:10:32 GMT')
         end
@@ -424,7 +427,7 @@ describe Feedzirra::Feed do
         it 'should process the next feed in the queue'
         
         it 'should parse the updated feed' do
-          Feedzirra::AtomFeedBurner.should_receive(:parse).and_return(@new_feed)
+          Feedzirra::Parser::AtomFeedBurner.should_receive(:parse).and_return(@new_feed)
           Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, {})
           @easy_curl.on_success.call(@easy_curl)
         end

data/spec/feedzirra/feed_utilities_spec.rb

@@ -42,19 +42,19 @@ describe Feedzirra::FeedUtilities do
     end
     
     it "should return a last_modified value from the entry with the most recent published date if the last_modified date hasn't been set" do
-      feed = Feedzirra::Atom.new
-      entry =Feedzirra::AtomEntry.new
+      feed = Feedzirra::Parser::Atom.new
+      entry =Feedzirra::Parser::AtomEntry.new
       entry.published = Time.now.to_s
       feed.entries << entry
       feed.last_modified.should == entry.published
     end
     
     it "should not throw an error if one of the entries has published date of nil" do
-      feed = Feedzirra::Atom.new
-      entry = Feedzirra::AtomEntry.new
+      feed = Feedzirra::Parser::Atom.new
+      entry = Feedzirra::Parser::AtomEntry.new
       entry.published = Time.now.to_s
       feed.entries << entry
-      feed.entries << Feedzirra::AtomEntry.new
+      feed.entries << Feedzirra::Parser::AtomEntry.new
       feed.last_modified.should == entry.published
     end
   end
@@ -64,7 +64,7 @@ describe Feedzirra::FeedUtilities do
       before(:each) do
         # I'm using the Atom class when I know I should be using a different one. However, this update_from_feed
         # method would only be called against a feed item.
-        @feed = Feedzirra::Atom.new
+        @feed = Feedzirra::Parser::Atom.new
         @feed.title    = "A title"
         @feed.url      = "http://pauldix.net"
         @feed.feed_url = "http://feeds.feedburner.com/PaulDixExplainsNothing"
@@ -112,16 +112,16 @@ describe Feedzirra::FeedUtilities do
       before(:each) do
         # I'm using the Atom class when I know I should be using a different one. However, this update_from_feed
         # method would only be called against a feed item.
-        @feed = Feedzirra::Atom.new
+        @feed = Feedzirra::Parser::Atom.new
         @feed.title    = "A title"
         @feed.url      = "http://pauldix.net"
         @feed.feed_url = "http://feeds.feedburner.com/PaulDixExplainsNothing"
         @feed.updated  = false
         @updated_feed = @feed.dup
-        @old_entry = Feedzirra::AtomEntry.new
+        @old_entry = Feedzirra::Parser::AtomEntry.new
         @old_entry.url = "http://pauldix.net/old.html"
         @old_entry.published = Time.now.to_s
-        @new_entry = Feedzirra::AtomEntry.new
+        @new_entry = Feedzirra::Parser::AtomEntry.new
         @new_entry.url = "http://pauldix.net/new.html"
         @new_entry.published = (Time.now + 10).to_s  
         @feed.entries << @old_entry

data/spec/feedzirra/{atom_entry_spec.rb → parser/atom_entry_spec.rb}

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
-describe Feedzirra::AtomEntry do
+describe Feedzirra::Parser::AtomEntry do
   before(:each) do
     # I don't really like doing it this way because these unit test should only rely on AtomEntry,
     # but this is actually how it should work. You would never just pass entry xml straight to the AtomEnry
-    @entry = Feedzirra::Atom.parse(sample_atom_feed).entries.first
+    @entry = Feedzirra::Parser::Atom.parse(sample_atom_feed).entries.first
   end
   
   it "should parse the title" do

data/spec/feedzirra/{atom_feed_burner_entry_spec.rb → parser/atom_feed_burner_entry_spec.rb}

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
-describe Feedzirra::AtomFeedBurnerEntry do
+describe Feedzirra::Parser::AtomFeedBurnerEntry do
   before(:each) do
     # I don't really like doing it this way because these unit test should only rely on AtomEntry,
     # but this is actually how it should work. You would never just pass entry xml straight to the AtomEnry
-    @entry = Feedzirra::AtomFeedBurner.parse(sample_feedburner_atom_feed).entries.first
+    @entry = Feedzirra::Parser::AtomFeedBurner.parse(sample_feedburner_atom_feed).entries.first
   end
   
   it "should parse the title" do
@@ -12,7 +12,7 @@ describe Feedzirra::AtomFeedBurnerEntry do
   end
   
   it "should be able to fetch a url via the 'alternate' rel if no origLink exists" do
-    entry = Feedzirra::AtomFeedBurner.parse(File.read("#{File.dirname(__FILE__)}/../sample_feeds/PaulDixExplainsNothingAlternate.xml")).entries.first
+    entry = Feedzirra::Parser::AtomFeedBurner.parse(File.read("#{File.dirname(__FILE__)}/../../sample_feeds/PaulDixExplainsNothingAlternate.xml")).entries.first
     entry.url.should == 'http://feeds.feedburner.com/~r/PaulDixExplainsNothing/~3/519925023/making-a-ruby-c-library-even-faster.html'
   end
 

data/spec/feedzirra/{atom_feed_burner_spec.rb → parser/atom_feed_burner_spec.rb}

@@ -1,23 +1,23 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
-describe Feedzirra::AtomFeedBurner do
+describe Feedzirra::Parser::AtomFeedBurner do
   describe "#will_parse?" do
     it "should return true for a feedburner atom feed" do
-      Feedzirra::AtomFeedBurner.should be_able_to_parse(sample_feedburner_atom_feed)
+      Feedzirra::Parser::AtomFeedBurner.should be_able_to_parse(sample_feedburner_atom_feed)
     end
     
     it "should return false for an rdf feed" do
-      Feedzirra::AtomFeedBurner.should_not be_able_to_parse(sample_rdf_feed)
+      Feedzirra::Parser::AtomFeedBurner.should_not be_able_to_parse(sample_rdf_feed)
     end
     
     it "should return false for a regular atom feed" do
-      Feedzirra::AtomFeedBurner.should_not be_able_to_parse(sample_atom_feed)
+      Feedzirra::Parser::AtomFeedBurner.should_not be_able_to_parse(sample_atom_feed)
     end
   end
 
   describe "parsing" do
     before(:each) do
-      @feed = Feedzirra::AtomFeedBurner.parse(sample_feedburner_atom_feed)
+      @feed = Feedzirra::Parser::AtomFeedBurner.parse(sample_feedburner_atom_feed)
     end
     
     it "should parse the title" do

data/spec/feedzirra/{atom_spec.rb → parser/atom_spec.rb}

@@ -1,19 +1,19 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
-describe Feedzirra::Atom do
+describe Feedzirra::Parser::Atom do
   describe "#will_parse?" do
     it "should return true for an atom feed" do
-      Feedzirra::Atom.should be_able_to_parse(sample_atom_feed)
+      Feedzirra::Parser::Atom.should be_able_to_parse(sample_atom_feed)
     end
     
     it "should return false for an rdf feed" do
-      Feedzirra::Atom.should_not be_able_to_parse(sample_rdf_feed)
+      Feedzirra::Parser::Atom.should_not be_able_to_parse(sample_rdf_feed)
     end
   end
   
   describe "parsing" do
     before(:each) do
-      @feed = Feedzirra::Atom.parse(sample_atom_feed)
+      @feed = Feedzirra::Parser::Atom.parse(sample_atom_feed)
     end
     
     it "should parse the title" do

data/spec/feedzirra/{itunes_rss_item_spec.rb → parser/itunes_rss_item_spec.rb}

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
-describe Feedzirra::ITunesRSSItem do
+describe Feedzirra::Parser::ITunesRSSItem do
   before(:each) do
     # I don't really like doing it this way because these unit test should only rely on ITunesRssItem,
     # but this is actually how it should work. You would never just pass entry xml straight to the ITunesRssItem
-    @item = Feedzirra::ITunesRSS.parse(sample_itunes_feed).entries.first
+    @item = Feedzirra::Parser::ITunesRSS.parse(sample_itunes_feed).entries.first
   end
   
   it "should parse the title" do

data/spec/feedzirra/{itunes_rss_owner_spec.rb → parser/itunes_rss_owner_spec.rb}

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
-describe Feedzirra::ITunesRSSOwner do
+describe Feedzirra::Parser::ITunesRSSOwner 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 ITunesRssOwner
-    @owner = Feedzirra::ITunesRSS.parse(sample_itunes_feed).itunes_owners.first
+    @owner = Feedzirra::Parser::ITunesRSS.parse(sample_itunes_feed).itunes_owners.first
   end
   
   it "should parse the name" do

data/spec/feedzirra/{itunes_rss_spec.rb → parser/itunes_rss_spec.rb}

@@ -1,19 +1,19 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
-describe Feedzirra::ITunesRSS do
+describe Feedzirra::Parser::ITunesRSS do
   describe "#will_parse?" do
     it "should return true for an itunes RSS feed" do
-      Feedzirra::ITunesRSS.should be_able_to_parse(sample_itunes_feed)
+      Feedzirra::Parser::ITunesRSS.should be_able_to_parse(sample_itunes_feed)
     end
 
     it "should return fase for an atom feed" do
-      Feedzirra::ITunesRSS.should_not be_able_to_parse(sample_atom_feed)
+      Feedzirra::Parser::ITunesRSS.should_not be_able_to_parse(sample_atom_feed)
     end
   end
 
   describe "parsing" do
     before(:each) do
-      @feed = Feedzirra::ITunesRSS.parse(sample_itunes_feed)
+      @feed = Feedzirra::Parser::ITunesRSS.parse(sample_itunes_feed)
     end
     
     it "should parse the subtitle" do

data/spec/feedzirra/{rss_entry_spec.rb → parser/rss_entry_spec.rb}

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
-describe Feedzirra::RSSEntry do
+describe Feedzirra::Parser::RSSEntry 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::RSS.parse(sample_rss_feed).entries.first
+    @entry = Feedzirra::Parser::RSS.parse(sample_rss_feed).entries.first
   end
   
   it "should parse the title" do

data/spec/feedzirra/{rss_spec.rb → parser/rss_spec.rb}

@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
-describe Feedzirra::RSS do
+describe Feedzirra::Parser::RSS do
   describe "#will_parse?" do
     it "should return true for an RSS feed" do
-      Feedzirra::RSS.should be_able_to_parse(sample_rss_feed)
+      Feedzirra::Parser::RSS.should be_able_to_parse(sample_rss_feed)
     end
 
     # this is no longer true. combined rdf and rss into one
@@ -12,13 +12,13 @@ describe Feedzirra::RSS do
     # end
     
     it "should return fase for an atom feed" do
-      Feedzirra::RSS.should_not be_able_to_parse(sample_atom_feed)
+      Feedzirra::Parser::RSS.should_not be_able_to_parse(sample_atom_feed)
     end
   end
 
   describe "parsing" do
     before(:each) do
-      @feed = Feedzirra::RSS.parse(sample_rss_feed)
+      @feed = Feedzirra::Parser::RSS.parse(sample_rss_feed)
     end
     
     it "should parse the title" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pauldix-feedzirra
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors: 
 - Paul Dix
@@ -85,15 +85,15 @@ files:
 - lib/core_ext/string.rb
 - lib/feedzirra.rb
 - lib/feedzirra/feed.rb
-- lib/feedzirra/atom.rb
-- lib/feedzirra/atom_entry.rb
-- lib/feedzirra/atom_feed_burner.rb
-- lib/feedzirra/atom_feed_burner_entry.rb
-- lib/feedzirra/itunes_rss.rb
-- lib/feedzirra/itunes_rss_item.rb
-- lib/feedzirra/itunes_rss_owner.rb
-- lib/feedzirra/rss.rb
-- lib/feedzirra/rss_entry.rb
+- lib/feedzirra/parser/atom.rb
+- lib/feedzirra/parser/atom_entry.rb
+- lib/feedzirra/parser/atom_feed_burner.rb
+- lib/feedzirra/parser/atom_feed_burner_entry.rb
+- lib/feedzirra/parser/itunes_rss.rb
+- lib/feedzirra/parser/itunes_rss_item.rb
+- lib/feedzirra/parser/itunes_rss_owner.rb
+- lib/feedzirra/parser/rss.rb
+- lib/feedzirra/parser/rss_entry.rb
 - lib/feedzirra/feed_utilities.rb
 - lib/feedzirra/feed_entry_utilities.rb
 - README.textile
@@ -101,15 +101,15 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/feedzirra/feed_spec.rb
-- spec/feedzirra/atom_spec.rb
-- spec/feedzirra/atom_entry_spec.rb
-- spec/feedzirra/atom_feed_burner_spec.rb
-- spec/feedzirra/atom_feed_burner_entry_spec.rb
-- spec/feedzirra/itunes_rss_spec.rb
-- spec/feedzirra/itunes_rss_item_spec.rb
-- spec/feedzirra/itunes_rss_owner_spec.rb
-- spec/feedzirra/rss_spec.rb
-- spec/feedzirra/rss_entry_spec.rb
+- spec/feedzirra/parser/atom_spec.rb
+- spec/feedzirra/parser/atom_entry_spec.rb
+- spec/feedzirra/parser/atom_feed_burner_spec.rb
+- spec/feedzirra/parser/atom_feed_burner_entry_spec.rb
+- spec/feedzirra/parser/itunes_rss_spec.rb
+- spec/feedzirra/parser/itunes_rss_item_spec.rb
+- spec/feedzirra/parser/itunes_rss_owner_spec.rb
+- spec/feedzirra/parser/rss_spec.rb
+- spec/feedzirra/parser/rss_entry_spec.rb
 - spec/feedzirra/feed_utilities_spec.rb
 - spec/feedzirra/feed_entry_utilities_spec.rb
 has_rdoc: true

data/lib/feedzirra/atom.rb

@@ -1,22 +0,0 @@
-module Feedzirra
-  # == Summary
-  # Parser for dealing with Atom feeds.
-  #
-  # == Attributes
-  # * title
-  # * feed_url
-  # * url
-  # * entries
-  class Atom
-    include SAXMachine
-    include FeedUtilities
-    element :title
-    element :link, :as => :url, :value => :href, :with => {:type => "text/html"}
-    element :link, :as => :feed_url, :value => :href, :with => {:type => "application/atom+xml"}
-    elements :entry, :as => :entries, :class => AtomEntry
-    
-    def self.able_to_parse?(xml) #:nodoc:
-      xml =~ /(Atom)|(#{Regexp.escape("http://purl.org/atom")})/
-    end
-  end
-end

data/lib/feedzirra/atom_entry.rb

@@ -1,29 +0,0 @@
-module Feedzirra
-  # == Summary
-  # Parser for dealing with Atom feed entries.
-  #
-  # == Attributes
-  # * title
-  # * url
-  # * author
-  # * content
-  # * summary
-  # * published
-  # * categories
-  class AtomEntry
-    include SAXMachine
-    include FeedEntryUtilities
-    element :title
-    element :link, :as => :url, :value => :href, :with => {:type => "text/html", :rel => "alternate"}
-    element :name, :as => :author
-    element :content
-    element :summary
-    element :published
-    element :id
-    element :created, :as => :published
-    element :issued, :as => :published
-    element :updated
-    element :modified, :as => :updated
-    elements :category, :as => :categories, :value => :term
-  end
-end

data/lib/feedzirra/atom_feed_burner.rb

@@ -1,22 +0,0 @@
-module Feedzirra
-  # == Summary
-  # Parser for dealing with Feedburner Atom feeds.
-  #
-  # == Attributes
-  # * title
-  # * feed_url
-  # * url
-  # * entries
-  class AtomFeedBurner
-    include SAXMachine
-    include FeedUtilities
-    element :title
-    element :link, :as => :url, :value => :href, :with => {:type => "text/html"}
-    element :link, :as => :feed_url, :value => :href, :with => {:type => "application/atom+xml"}
-    elements :entry, :as => :entries, :class => AtomFeedBurnerEntry
-
-    def self.able_to_parse?(xml) #:nodoc:
-      (xml =~ /Atom/ && xml =~ /feedburner/) || false
-    end
-  end
-end

data/lib/feedzirra/atom_feed_burner_entry.rb

@@ -1,30 +0,0 @@
-module Feedzirra
-  # == Summary
-  # Parser for dealing with Feedburner Atom feed entries.
-  #
-  # == Attributes
-  # * title
-  # * url
-  # * author
-  # * content
-  # * summary
-  # * published
-  # * categories
-  class AtomFeedBurnerEntry
-    include SAXMachine
-    include FeedEntryUtilities
-    element :title
-    element :name, :as => :author
-    element :link, :as => :url, :value => :href, :with => {:type => "text/html", :rel => "alternate"}
-    element :"feedburner:origLink", :as => :url
-    element :summary
-    element :content
-    element :published
-    element :id
-    element :issued, :as => :published
-    element :created, :as => :published
-    element :updated
-    element :modified, :as => :updated
-    elements :category, :as => :categories, :value => :term
-  end
-end

data/lib/feedzirra/itunes_rss.rb

@@ -1,46 +0,0 @@
-module Feedzirra
-  # iTunes is RSS 2.0 + some apple extensions
-  # Source: http://www.apple.com/itunes/whatson/podcasts/specs.html
-  class ITunesRSS
-    include SAXMachine
-    include FeedUtilities
-
-    attr_accessor :feed_url
-
-    # RSS 2.0 elements that need including
-    element :copyright
-    element :description
-    element :language
-    element :managingEditor
-    element :title
-    element :link, :as => :url
-
-    # If author is not present use managingEditor on the channel
-    element :"itunes:author", :as => :itunes_author
-    element :"itunes:block", :as => :itunes_block
-    element :"itunes:image", :value => :href, :as => :itunes_image
-    element :"itunes:explicit", :as => :itunes_explicit
-    element :"itunes:keywords", :as => :itunes_keywords
-    # New URL for the podcast feed
-    element :"itunes:new-feed-url", :as => :itunes_new_feed_url
-    element :"itunes:subtitle", :as => :itunes_subtitle
-    # If summary is not present, use the description tag
-    element :"itunes:summary", :as => :itunes_summary
-
-    # iTunes RSS feeds can have multiple main categories...
-    # ...and multiple sub-categories per category
-    # TODO subcategories not supported correctly - they are at the same level
-    #   as the main categories
-    elements :"itunes:category", :as => :itunes_categories, :value => :text
-
-    elements :"itunes:owner", :as => :itunes_owners, :class => ITunesRSSOwner
-
-    elements :item, :as => :entries, :class => ITunesRSSItem
-
-    def self.able_to_parse?(xml)
-      xml =~ /xmlns:itunes=\"http:\/\/www.itunes.com\/dtds\/podcast-1.0.dtd\"/
-    end
-
-  end
-
-end

data/lib/feedzirra/itunes_rss_item.rb

@@ -1,28 +0,0 @@
-module Feedzirra
-  # iTunes extensions to the standard RSS2.0 item
-  # Source: http://www.apple.com/itunes/whatson/podcasts/specs.html
-  class ITunesRSSItem
-    include SAXMachine
-    include FeedUtilities
-    element :author
-    element :guid
-    element :title
-    element :link, :as => :url
-    element :description, :as => :summary
-    element :pubDate, :as => :published
-
-    # If author is not present use author tag on the item
-    element :"itunes:author", :as => :itunes_author
-    element :"itunes:block", :as => :itunes_block
-    element :"itunes:duration", :as => :itunes_duration
-    element :"itunes:explicit", :as => :itunes_explicit
-    element :"itunes:keywords", :as => :itunes_keywords
-    element :"itunes:subtitle", :as => :itunes_subtitle
-    # If summary is not present, use the description tag
-    element :"itunes:summary", :as => :itunes_summary
-    element :enclosure, :value => :length, :as => :enclosure_length
-    element :enclosure, :value => :type, :as => :enclosure_type
-    element :enclosure, :value => :url, :as => :enclosure_url
-  end
-
-end

data/lib/feedzirra/itunes_rss_owner.rb

@@ -1,8 +0,0 @@
-module Feedzirra
-  class ITunesRSSOwner
-    include SAXMachine
-    include FeedUtilities
-    element :"itunes:name", :as => :name
-    element :"itunes:email", :as => :email
-  end
-end

data/lib/feedzirra/rss.rb

@@ -1,23 +0,0 @@
-module Feedzirra
-  # == Summary
-  # Parser for dealing with RSS feeds.
-  #
-  # == Attributes
-  # * title
-  # * feed_url
-  # * url
-  # * entries
-  class RSS
-    include SAXMachine
-    include FeedUtilities
-    element :title
-    element :link, :as => :url
-    elements :item, :as => :entries, :class => RSSEntry
-    
-    attr_accessor :feed_url
-    
-    def self.able_to_parse?(xml) #:nodoc:
-      xml =~ /\<rss|rdf/
-    end
-  end
-end

data/lib/feedzirra/rss_entry.rb

@@ -1,35 +0,0 @@
-module Feedzirra
-  # == Summary
-  # Parser for dealing with RDF feed entries.
-  #
-  # == Attributes
-  # * title
-  # * url
-  # * author
-  # * content
-  # * summary
-  # * published
-  # * categories
-  class RSSEntry
-    include SAXMachine
-    include FeedEntryUtilities
-    element :title
-    element :link, :as => :url
-
-    element :"dc:creator", :as => :author
-    element :"content:encoded", :as => :content
-    element :description, :as => :summary
-
-    element :pubDate, :as => :published
-    element :"dc:date", :as => :published
-    element :"dc:Date", :as => :published
-    element :"dcterms:created", :as => :published
-    
-    
-    element :"dcterms:modified", :as => :updated
-    element :issued, :as => :published
-    elements :category, :as => :categories
-    
-    element :guid, :as => :id
-  end
-end