pauldix-feedzirra 0.0.3 → 0.0.5

data/spec/feedzirra/feed_spec.rb

@@ -1,6 +1,24 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Feedzirra::Feed do
+  describe "#add_common_feed_entry_element" do
+    before(:all) do
+      Feedzirra::Feed.add_common_feed_entry_element("wfw:commentRss", :as => :comment_rss)
+    end
+    
+    it "should parse the added element out of Atom feeds" do
+      Feedzirra::Feed.parse(sample_wfw_feed).entries.first.comment_rss.should == "this is the new val"
+    end
+    
+    it "should parse the added element out of Atom Feedburner feeds" do
+      Feedzirra::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)
+    end
+  end
+  
   describe "#parse" do # many of these tests are redundant with the specific feed type tests, but I put them here for completeness
     context "when there's an available parser" do
       it "should parse an rdf feed" do
@@ -30,16 +48,24 @@ describe Feedzirra::Feed do
         feed.entries.first.published.to_s.should == "Thu Jan 22 15:50:22 UTC 2009"
         feed.entries.size.should == 5
       end      
+
+      it "should parse an itunes 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.size.should == 3
+      end
     end
-    
+
     context "when there's no available parser" do
       it "raises Feedzirra::NoParserAvailable" do
         proc {
           Feedzirra::Feed.parse("I'm an invalid feed")
         }.should raise_error(Feedzirra::NoParserAvailable)
-      end      
+      end
     end
-    
+
     it "should parse an feedburner rss feed" do
       feed = Feedzirra::Feed.parse(sample_rss_feed_burner_feed)
       feed.title.should == "Sam Harris: Author, Philosopher, Essayist, Atheist"
@@ -47,31 +73,36 @@ describe Feedzirra::Feed do
       feed.entries.size.should == 10
     end
   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
     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
     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
     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
     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
     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
+    end
+
   end
-  
-  describe "adding feed types" do
-    it "should prioritize added feed types over the built in ones" 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)
       new_feed_type = Class.new do
@@ -79,173 +110,434 @@ describe Feedzirra::Feed do
           true
         end
       end
+      
       new_feed_type.should be_able_to_parse(feed_text)
       Feedzirra::Feed.add_feed_class(new_feed_type)
       Feedzirra::Feed.determine_feed_parser_for_xml(feed_text).should == new_feed_type
-      
+
       # this is a hack so that this doesn't break the rest of the tests
       Feedzirra::Feed.feed_classes.reject! {|o| o == new_feed_type }
     end
   end
-  
-  describe "header parsing" do
+
+  describe '#etag_from_header' do
     before(:each) do
       @header = "HTTP/1.0 200 OK\r\nDate: Thu, 29 Jan 2009 03:55:24 GMT\r\nServer: Apache\r\nX-FB-Host: chi-write6\r\nLast-Modified: Wed, 28 Jan 2009 04:10:32 GMT\r\nETag: ziEyTl4q9GH04BR4jgkImd0GvSE\r\nP3P: CP=\"ALL DSP COR NID CUR OUR NOR\"\r\nConnection: close\r\nContent-Type: text/xml;charset=utf-8\r\n\r\n"
     end
-    
-    it "should parse out an etag" do
+
+    it "should return the etag from the header if it exists" do
       Feedzirra::Feed.etag_from_header(@header).should == "ziEyTl4q9GH04BR4jgkImd0GvSE"
     end
-    
-    it "should return nil if there is no etag in header" do
+
+    it "should return nil if there is no etag in the header" do
       Feedzirra::Feed.etag_from_header("foo").should be_nil
     end
-    
-    it "should parse out a last-modified date" do
+
+  end
+
+  describe '#last_modified_from_header' do
+    before(:each) do
+      @header = "HTTP/1.0 200 OK\r\nDate: Thu, 29 Jan 2009 03:55:24 GMT\r\nServer: Apache\r\nX-FB-Host: chi-write6\r\nLast-Modified: Wed, 28 Jan 2009 04:10:32 GMT\r\nETag: ziEyTl4q9GH04BR4jgkImd0GvSE\r\nP3P: CP=\"ALL DSP COR NID CUR OUR NOR\"\r\nConnection: close\r\nContent-Type: text/xml;charset=utf-8\r\n\r\n"
+    end
+
+    it "should return the last modified date from the header if it exists" do
       Feedzirra::Feed.last_modified_from_header(@header).should == Time.parse("Wed, 28 Jan 2009 04:10:32 GMT")
     end
-    
-    it "should return nil if there is no last-modified in header" do
+
+    it "should return nil if there is no last modified date in the header" do
       Feedzirra::Feed.last_modified_from_header("foo").should be_nil
     end
   end
-  
+
   describe "fetching feeds" do
     before(:each) do
-      @paul_feed_url = "http://feeds.feedburner.com/PaulDixExplainsNothing"
-      @trotter_feed_url = "http://feeds2.feedburner.com/trottercashion"
-    end
-        
-    describe "handling many feeds" do
-      it "should break a large number into more manageable blocks of 40"
-      it "should add to the queue as feeds finish (instead of waiting for each block of 40 to finsih)"
+      @paul_feed = { :xml => load_sample("PaulDixExplainsNothing.xml"), :url => "http://feeds.feedburner.com/PaulDixExplainsNothing" }
+      @trotter_feed = { :xml => load_sample("TrotterCashionHome.xml"), :url => "http://feeds2.feedburner.com/trottercashion" }
     end
 
     describe "#fetch_raw" do
-      it "should take :user_agent as an option"
-      it "should take :if_modified_since as an option"
-      it "should take :if_none_match as an option"
-      it "should take an optional on_success lambda"
-      it "should take an optional on_failure lambda"
+      before(:each) do
+        @cmock = stub('cmock', :header_str => '', :body_str => @paul_feed[:xml] )
+        @multi = stub('curl_multi', :add => true, :perform => true)
+        @curl_easy = stub('curl_easy')
+        @curl = stub('curl', :headers => {}, :follow_location= => true, :on_failure => true)
+        @curl.stub!(:on_success).and_yield(@cmock)
+        
+        Curl::Multi.stub!(:new).and_return(@multi)
+        Curl::Easy.stub!(:new).and_yield(@curl).and_return(@curl_easy)
+      end
+
+      it "should set user agent if it's passed as an option" do
+        Feedzirra::Feed.fetch_raw(@paul_feed[:url], :user_agent => 'Custom Useragent')
+        @curl.headers['User-Agent'].should == 'Custom Useragent'
+      end
+
+      it "should set user agent to default if it's not passed as an option" do
+        Feedzirra::Feed.fetch_raw(@paul_feed[:url])
+        @curl.headers['User-Agent'].should == Feedzirra::Feed::USER_AGENT
+      end
       
-      it "should return raw xml" do
-        Feedzirra::Feed.fetch_raw(@paul_feed_url).should =~ /^#{Regexp.escape('<?xml version="1.0" encoding="UTF-8"?>')}/
+      it "should set if modified since as an option if passed" do
+        Feedzirra::Feed.fetch_raw(@paul_feed[:url], :if_modified_since => Time.parse("Wed, 28 Jan 2009 04:10:32 GMT"))
+        @curl.headers["If-Modified-Since"].should == 'Wed, 28 Jan 2009 04:10:32 GMT'
+      end
+
+      it "should set if none match as an option if passed" do
+        Feedzirra::Feed.fetch_raw(@paul_feed[:url], :if_none_match => 'ziEyTl4q9GH04BR4jgkImd0GvSE')
+        @curl.headers["If-None-Match"].should == 'ziEyTl4q9GH04BR4jgkImd0GvSE'
       end
       
+      it 'should set userpwd for http basic authentication if :http_authentication is passed' do
+        @curl.should_receive(:userpwd=).with('username:password')
+        Feedzirra::Feed.fetch_raw(@paul_feed[:url], :http_authentication => ['username', 'password'])
+      end
+
+      it 'should set accepted encodings' do
+        Feedzirra::Feed.fetch_raw(@paul_feed[:url])
+        @curl.headers["Accept-encoding"].should == 'gzip, deflate'
+      end
+
+      it "should return raw xml" do
+        Feedzirra::Feed.fetch_raw(@paul_feed[:url]).should =~ /^#{Regexp.escape('<?xml version="1.0" encoding="UTF-8"?>')}/
+      end
+
       it "should take multiple feed urls and return a hash of urls and response xml" do
-        results = Feedzirra::Feed.fetch_raw([@paul_feed_url, @trotter_feed_url])
-        results.keys.should include(@paul_feed_url)
-        results.keys.should include(@trotter_feed_url)
-        results[@paul_feed_url].should =~ /Paul Dix/
-        results[@trotter_feed_url].should =~ /Trotter Cashion/
+        multi = stub('curl_multi', :add => true, :perform => true)
+        Curl::Multi.stub!(:new).and_return(multi)
+        
+        paul_response = stub('paul_response', :header_str => '', :body_str => @paul_feed[:xml] )
+        trotter_response = stub('trotter_response', :header_str => '', :body_str => @trotter_feed[:xml] )
+
+        paul_curl = stub('paul_curl', :headers => {}, :follow_location= => true, :on_failure => true)
+        paul_curl.stub!(:on_success).and_yield(paul_response)
+
+        trotter_curl = stub('trotter_curl', :headers => {}, :follow_location= => true, :on_failure => true)
+        trotter_curl.stub!(:on_success).and_yield(trotter_response)
+        
+        Curl::Easy.should_receive(:new).with(@paul_feed[:url]).ordered.and_yield(paul_curl)
+        Curl::Easy.should_receive(:new).with(@trotter_feed[:url]).ordered.and_yield(trotter_curl)
+        
+        results = Feedzirra::Feed.fetch_raw([@paul_feed[:url], @trotter_feed[:url]])
+        results.keys.should include(@paul_feed[:url])
+        results.keys.should include(@trotter_feed[:url])
+        results[@paul_feed[:url]].should =~ /Paul Dix/
+        results[@trotter_feed[:url]].should =~ /Trotter Cashion/
       end
-      
+
       it "should always return a hash when passed an array" do
-        results = Feedzirra::Feed.fetch_raw([@paul_feed_url])
+        results = Feedzirra::Feed.fetch_raw([@paul_feed[:url]])
         results.class.should == Hash
       end
     end
-    
-    describe "#fetch_and_parse" do
-      it "should return a feed object for a single url" do
-        feed = Feedzirra::Feed.fetch_and_parse(@paul_feed_url)
-        feed.title.should == "Paul Dix Explains Nothing"
+
+    describe "#add_url_to_multi" do
+      before(:each) do
+        @multi = Curl::Multi.new(@paul_feed[:url])
+        @multi.stub!(:add)
+        @easy_curl = Curl::Easy.new(@paul_feed[:url])
+        
+        Curl::Easy.should_receive(:new).and_yield(@easy_curl)
       end
-      
-      it "should set the feed_url to the new url if redirected" do
-        feed = Feedzirra::Feed.fetch_and_parse("http://tinyurl.com/tenderlovemaking")
-        feed.feed_url.should == "http://tenderlovemaking.com/feed/"
+
+      it "should set user agent if it's passed as an option" do
+        Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, :user_agent => 'My cool application')
+        @easy_curl.headers["User-Agent"].should == 'My cool application'
       end
       
-      it "should set the feed_url for an rdf feed" do
-        feed = Feedzirra::Feed.fetch_and_parse("http://www.avibryant.com/rss.xml")
-        feed.feed_url.should == "http://www.avibryant.com/rss.xml"
+      it "should set user agent to default if it's not passed as an option" do
+        Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, {})
+        @easy_curl.headers["User-Agent"].should == Feedzirra::Feed::USER_AGENT
       end
       
-      it "should set the feed_url for an rss feed" do
-        feed = Feedzirra::Feed.fetch_and_parse("http://tenderlovemaking.com/feed/")
-        feed.feed_url.should == "http://tenderlovemaking.com/feed/"
+      it "should set if modified since as an option if passed" do
+        Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, :if_modified_since => Time.parse("Jan 25 2009 04:10:32 GMT"))
+        @easy_curl.headers["If-Modified-Since"].should == 'Sun, 25 Jan 2009 04:10:32 GMT'
       end
-      
-      it "should return a hash of feed objects with the passed in feed_url for the key and parsed feed for the value for multiple feeds" do
-        feeds = Feedzirra::Feed.fetch_and_parse([@paul_feed_url, @trotter_feed_url])
-        feeds.size.should == 2
-        feeds[@paul_feed_url].feed_url.should == @paul_feed_url
-        feeds[@trotter_feed_url].feed_url.should == @trotter_feed_url
+
+      it 'should set follow location to true' do
+        @easy_curl.should_receive(:follow_location=).with(true)
+        Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, {})
       end
       
-      it "should always return a hash when passed an array" do
-        feeds = Feedzirra::Feed.fetch_and_parse([@paul_feed_url])
-        feeds.class.should == Hash
+      it 'should set userpwd for http basic authentication if :http_authentication is passed' do
+        Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, :http_authentication => ['myusername', 'mypassword'])
+        @easy_curl.userpwd.should == 'myusername:mypassword'
       end
       
-      it "should yeild the url and feed object to a :on_success lambda" do
-        successful_call_mock = mock("successful_call_mock")
-        successful_call_mock.should_receive(:call)
-        Feedzirra::Feed.fetch_and_parse(@paul_feed_url, :on_success => lambda { |feed_url, feed|
-          feed_url.should == @paul_feed_url
-          feed.class.should == Feedzirra::AtomFeedBurner
-          successful_call_mock.call})
+      it 'should set accepted encodings' do
+        Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, {})
+        @easy_curl.headers["Accept-encoding"].should == 'gzip, deflate'
       end
-      
-      it "should yield the url, response_code, response_header, and response_body to a :on_failure lambda" do
-        failure_call_mock = mock("failure_call_mock")
-        failure_call_mock.should_receive(:call)
-        fail_url = "http://localhost"
-        Feedzirra::Feed.fetch_and_parse(fail_url, :on_failure => lambda {|feed_url, response_code, response_header, response_body|
-          feed_url.should == fail_url
-          response_code.should == 0
-          response_header.should == ""
-          response_body.should == ""
-          failure_call_mock.call})
+
+      it "should set if_none_match as an option if passed" do
+        Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, :if_none_match => 'ziEyTl4q9GH04BR4jgkImd0GvSE')
+        @easy_curl.headers["If-None-Match"].should == 'ziEyTl4q9GH04BR4jgkImd0GvSE'
       end
       
-      it "should return a not modified status for a feed with a :if_modified_since is past its last update" do
-        Feedzirra::Feed.fetch_and_parse(@paul_feed_url, :if_modified_since => Time.now).should == 304
+      describe 'on success' 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!(:etag_from_header).and_return('ziEyTl4q9GH04BR4jgkImd0GvSE')
+          Feedzirra::Feed.stub!(:last_modified_from_header).and_return('Wed, 28 Jan 2009 04:10:32 GMT')
+        end
+
+        it 'should decode the response body' do
+          Feedzirra::Feed.should_receive(:decode_content).with(@easy_curl).and_return(@paul_feed[:xml])
+          Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, {})
+          @easy_curl.on_success.call(@easy_curl)
+        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.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::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, {})
+          @easy_curl.on_success.call(@easy_curl)
+        end
+        
+        describe 'when a compatible xml parser class is found' do
+          it 'should set the last effective url to the feed url' do
+            @easy_curl.should_receive(:last_effective_url).and_return(@paul_feed[:url])
+            @feed.should_receive(:feed_url=).with(@paul_feed[:url])
+            Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, {})
+            @easy_curl.on_success.call(@easy_curl)
+          end
+
+          it 'should set the etags on the feed' do
+            @feed.should_receive(:etag=).with('ziEyTl4q9GH04BR4jgkImd0GvSE')
+            Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, {})
+            @easy_curl.on_success.call(@easy_curl)
+          end
+
+          it 'should set the last modified on the feed' do
+            @feed.should_receive(:last_modified=).with('Wed, 28 Jan 2009 04:10:32 GMT')
+            Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, {})
+            @easy_curl.on_success.call(@easy_curl)
+          end
+
+          it 'should add the feed to the responses' do
+            responses = {}
+            Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], responses, {})
+            @easy_curl.on_success.call(@easy_curl)
+            
+            responses.length.should == 1
+            responses['http://feeds.feedburner.com/PaulDixExplainsNothing'].should == @feed
+          end
+          
+          it 'should call proc if :on_success option is passed' do
+            success = lambda { |url, feed| }
+            success.should_receive(:call).with(@paul_feed[:url], @feed)
+            Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, { :on_success => success })
+            @easy_curl.on_success.call(@easy_curl)
+          end
+        end
+
+        describe 'when no compatible xml parser class is found' do
+          it 'should raise a NoParserAvailable exception'
+        end
+      end
+
+      describe 'on failure' do
+        before(:each) do
+          @headers = "HTTP/1.0 404 Not Found\r\nDate: Thu, 29 Jan 2009 03:55:24 GMT\r\nServer: Apache\r\nX-FB-Host: chi-write6\r\nLast-Modified: Wed, 28 Jan 2009 04:10:32 GMT\r\n"
+          @body = 'Page could not be found.'
+
+          @easy_curl.stub!(:response_code).and_return(404)
+          @easy_curl.stub!(:header_str).and_return(@headers)
+          @easy_curl.stub!(:body_str).and_return(@body)
+        end
+
+        it 'should call proc if :on_failure option is passed' do
+          failure = lambda { |url, feed| }
+          failure.should_receive(:call).with(@paul_feed[:url], 404, @headers, @body)
+          Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, { :on_failure => failure })
+          @easy_curl.on_failure.call(@easy_curl)
+        end
+        
+        it 'should return the http code in the responses' do
+          responses = {}
+          Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], responses, {})
+          @easy_curl.on_failure.call(@easy_curl)
+
+          responses.length.should == 1
+          responses[@paul_feed[:url]].should == 404
+        end
+      end
+    end
+
+    describe "#add_feed_to_multi" do
+      before(:each) do
+        @multi = Curl::Multi.new(@paul_feed[:url])
+        @multi.stub!(:add)
+        @easy_curl = Curl::Easy.new(@paul_feed[:url])
+        @feed = Feedzirra::Feed.parse(sample_feedburner_atom_feed)
+
+        Curl::Easy.should_receive(:new).and_yield(@easy_curl)
+      end
+
+      it "should set user agent if it's passed as an option" do
+        Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, :user_agent => 'My cool application')
+        @easy_curl.headers["User-Agent"].should == 'My cool application'
       end
       
-      it "should set the etag from the header" # do
-       #        Feedzirra::Feed.fetch_and_parse(@paul_feed_url).etag.should_not == ""
-       #      end
+      it "should set user agent to default if it's not passed as an option" do
+        Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, {})
+        @easy_curl.headers["User-Agent"].should == Feedzirra::Feed::USER_AGENT
+      end
+
+      it "should set if modified since as an option if passed"
       
-      it "should set the last_modified from the header" # do
-       #        Feedzirra::Feed.fetch_and_parse(@paul_feed_url).last_modified.should.class == Time
-       #      end
-    end
+      it 'should set follow location to true' do
+        @easy_curl.should_receive(:follow_location=).with(true)
+        Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, {})
+      end
 
-    describe "#update" do
-      it "should update and return a single feed object" do
-        feed = Feedzirra::Feed.fetch_and_parse(@paul_feed_url)
-        feed.entries.delete_at(0)
-        feed.last_modified = nil
-        feed.etag = nil
-        updated_feed = Feedzirra::Feed.update(feed)
-        updated_feed.new_entries.size.should == 1
-        updated_feed.should have_new_entries
-      end
-
-      it "should update a collection of feed objects" do
-        feeds = Feedzirra::Feed.fetch_and_parse([@paul_feed_url, @trotter_feed_url])
-        paul_entries_size    = feeds[@paul_feed_url].entries.size
-        trotter_entries_size = feeds[@trotter_feed_url].entries.size
+      it 'should set userpwd for http basic authentication if :http_authentication is passed' do
+        Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, :http_authentication => ['myusername', 'mypassword'])
+        @easy_curl.userpwd.should == 'myusername:mypassword'
+      end
+
+      it "should set if_none_match as an option if passed" do
+        @feed.etag = 'ziEyTl4q9GH04BR4jgkImd0GvSE'
+        Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, {})
+        @easy_curl.headers["If-None-Match"].should == 'ziEyTl4q9GH04BR4jgkImd0GvSE'
+      end
+
+      describe 'on success' do
+        before(:each) 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!(:etag_from_header).and_return('ziEyTl4q9GH04BR4jgkImd0GvSE')
+          Feedzirra::Feed.stub!(:last_modified_from_header).and_return('Wed, 28 Jan 2009 04:10:32 GMT')
+        end
+
+        it 'should process the next feed in the queue'
         
-        feeds.values.each do |feed|
-          feed.last_modified = nil
-          feed.etag = nil
-          feed.entries.delete_at(0)
+        it 'should parse the updated feed' do
+          Feedzirra::AtomFeedBurner.should_receive(:parse).and_return(@new_feed)
+          Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, {})
+          @easy_curl.on_success.call(@easy_curl)
+        end
+
+        it 'should set the last effective url to the feed url' do
+          @easy_curl.should_receive(:last_effective_url).and_return(@paul_feed[:url])
+          @new_feed.should_receive(:feed_url=).with(@paul_feed[:url])
+          Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, {})
+          @easy_curl.on_success.call(@easy_curl)
+        end
+
+        it 'should set the etags on the feed' do
+          @new_feed.should_receive(:etag=).with('ziEyTl4q9GH04BR4jgkImd0GvSE')
+          Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, {})
+          @easy_curl.on_success.call(@easy_curl)
+        end
+
+        it 'should set the last modified on the feed' do
+          @new_feed.should_receive(:last_modified=).with('Wed, 28 Jan 2009 04:10:32 GMT')
+          Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, {})
+          @easy_curl.on_success.call(@easy_curl)
+        end
+
+        it 'should add the feed to the responses' do
+          responses = {}
+          Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], responses, {})
+          @easy_curl.on_success.call(@easy_curl)
+
+          responses.length.should == 1
+          responses['http://feeds.feedburner.com/PaulDixExplainsNothing'].should == @feed
+        end
+
+        it 'should call proc if :on_success option is passed' do
+          success = lambda { |feed| }
+          success.should_receive(:call).with(@feed)
+          Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, { :on_success => success })
+          @easy_curl.on_success.call(@easy_curl)
+        end
+        
+        it 'should call update from feed on the old feed with the updated feed' do
+          @feed.should_receive(:update_from_feed).with(@new_feed)
+          Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, {})
+          @easy_curl.on_success.call(@easy_curl)
         end
-        updated_feeds = Feedzirra::Feed.update(feeds.values)
-        updated_feeds.detect {|f| f.feed_url == @paul_feed_url}.entries.size.should == paul_entries_size
-        updated_feeds.detect {|f| f.feed_url == @trotter_feed_url}.entries.size.should == trotter_entries_size
+      end
+
+      describe 'on failure' do
+        before(:each) do
+          @headers = "HTTP/1.0 404 Not Found\r\nDate: Thu, 29 Jan 2009 03:55:24 GMT\r\nServer: Apache\r\nX-FB-Host: chi-write6\r\nLast-Modified: Wed, 28 Jan 2009 04:10:32 GMT\r\n"
+          @body = 'Page could not be found.'
+
+          @easy_curl.stub!(:response_code).and_return(404)
+          @easy_curl.stub!(:header_str).and_return(@headers)
+          @easy_curl.stub!(:body_str).and_return(@body)
+        end
+
+        it 'should call on success callback if the response code is 304' do
+          success = lambda { |feed| }
+          success.should_receive(:call).with(@feed)
+          @easy_curl.should_receive(:response_code).and_return(304)
+          Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, { :on_success => success })
+          @easy_curl.on_failure.call(@easy_curl)
+        end
+        
+        it 'should return the http code in the responses' do
+          responses = {}
+          Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], responses, {})
+          @easy_curl.on_failure.call(@easy_curl)
+
+          responses.length.should == 1
+          responses['http://www.pauldix.net/'].should == 404
+        end
+      end
+    end
+
+    describe "#fetch_and_parse" do
+      it 'should initiate the fetching and parsing using multicurl'
+      it "should pass any request options through to add_url_to_multi"
+      it 'should slice the feeds into groups of thirty for processing'
+      it "should return a feed object if a single feed is passed in"
+      it "should return an return an array of feed objects if multiple feeds are passed in"
+    end
+
+    describe "#decode_content" do
+      before(:each) do
+        @curl_easy = mock('curl_easy', :body_str => '<xml></xml>')
+      end
+
+      it 'should decode the response body using gzip if the Content-Encoding: is gzip' do
+        @curl_easy.stub!(:header_str).and_return('Content-Encoding: gzip')
+        string_io = mock('stringio', :read => @curl_easy.body_str, :close => true)
+        StringIO.should_receive(:new).and_return(string_io)
+        Zlib::GzipReader.should_receive(:new).with(string_io).and_return(string_io)
+        Feedzirra::Feed.decode_content(@curl_easy)
       end
       
-      it "should return the feed objects even when not updated" do
-        feeds = Feedzirra::Feed.fetch_and_parse([@paul_feed_url, @trotter_feed_url])
-        updated_feeds = Feedzirra::Feed.update(feeds.values)
-        updated_feeds.size.should == 2
-        updated_feeds.first.should_not be_updated
-        updated_feeds.last.should_not be_updated
+      it 'should deflate the response body using inflate if the Content-Encoding: is deflate' do
+        @curl_easy.stub!(:header_str).and_return('Content-Encoding: deflate')
+        Zlib::Deflate.should_receive(:inflate).with(@curl_easy.body_str)
+        Feedzirra::Feed.decode_content(@curl_easy)
       end
+
+      it 'should return the response body if it is not encoded' do
+        @curl_easy.stub!(:header_str).and_return('')
+        Feedzirra::Feed.decode_content(@curl_easy).should == '<xml></xml>'
+      end
+    end
+
+    describe "#update" do
+      it 'should perform the updating using multicurl'
+      it "should pass any request options through to add_feed_to_multi"
+      it "should return a feed object if a single feed is passed in"
+      it "should return an return an array of feed objects if multiple feeds are passed in" 
     end
   end
 end