feedzirra 0.2.1 → 0.2.2

data/spec/feedzirra/feed_spec.rb

@@ -24,20 +24,20 @@ describe Feedzirra::Feed 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 entries" 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 entries" do
       Feedzirra::Parser::AtomEntry.new.should respond_to(:comment_rss)
     end
-    
+
     it "should parse the added element out of RSS feeds entries" do
       Feedzirra::Parser::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
@@ -66,7 +66,7 @@ describe Feedzirra::Feed do
         feed.title.should == "Paul Dix Explains Nothing"
         feed.entries.first.published.should == Time.parse_safely("Thu Jan 22 15:50:22 UTC 2009")
         feed.entries.size.should == 5
-      end      
+      end
 
       it "should parse an itunes feed" do
         feed = Feedzirra::Feed.parse(sample_itunes_feed)
@@ -126,13 +126,13 @@ 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::Parser::Atom.stub!(:able_to_parse?).and_return(true)
+      Feedzirra::Parser::Atom.stub(:able_to_parse?).and_return(true)
       new_feed_type = Class.new do
         def self.able_to_parse?(val)
           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
@@ -179,14 +179,14 @@ describe Feedzirra::Feed do
 
     describe "#fetch_raw" do
       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)
+        @cmock = double('cmock', :header_str => '', :body_str => @paul_feed[:xml] )
+        @multi = double('curl_multi', :add => true, :perform => true)
+        @curl_easy = double('curl_easy')
+        @curl = double('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
@@ -198,7 +198,7 @@ describe Feedzirra::Feed do
         Feedzirra::Feed.fetch_raw(@paul_feed[:url])
         @curl.headers['User-Agent'].should == Feedzirra::Feed::USER_AGENT
       end
-      
+
       it "should set if modified since as an option if passed" do
         Feedzirra::Feed.fetch_raw(@paul_feed[:url], :if_modified_since => Time.parse_safely("Wed, 28 Jan 2009 04:10:32 GMT"))
         @curl.headers["If-Modified-Since"].should == 'Wed, 28 Jan 2009 04:10:32 GMT'
@@ -208,7 +208,7 @@ describe Feedzirra::Feed 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'])
@@ -224,21 +224,21 @@ describe Feedzirra::Feed do
       end
 
       it "should take multiple feed urls and return a hash of urls and response xml" do
-        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)
-        
+        multi = double('curl_multi', :add => true, :perform => true)
+        Curl::Multi.stub(:new).and_return(multi)
+
+        paul_response = double('paul_response', :header_str => '', :body_str => @paul_feed[:xml] )
+        trotter_response = double('trotter_response', :header_str => '', :body_str => @trotter_feed[:xml] )
+
+        paul_curl = double('paul_curl', :headers => {}, :follow_location= => true, :on_failure => true)
+        paul_curl.stub(:on_success).and_yield(paul_response)
+
+        trotter_curl = double('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])
@@ -256,9 +256,9 @@ describe Feedzirra::Feed do
       before(:each) do
         allow_message_expectations_on_nil
         @multi = Curl::Multi.get([@paul_feed[:url]], {:follow_location => true}, {:pipeline => true})
-        @multi.stub!(:add)
+        @multi.stub(:add)
         @easy_curl = Curl::Easy.new(@paul_feed[:url])
-        
+
         Curl::Easy.should_receive(:new).and_yield(@easy_curl)
       end
 
@@ -266,12 +266,12 @@ describe Feedzirra::Feed 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 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 if modified since as an option if passed" do
         Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, :if_modified_since => Time.parse_safely("Jan 25 2009 04:10:32 GMT"))
         @easy_curl.headers["If-Modified-Since"].should == 'Sun, 25 Jan 2009 04:10:32 GMT'
@@ -281,12 +281,12 @@ describe Feedzirra::Feed do
         @easy_curl.should_receive(:follow_location=).with(true)
         Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, {})
       end
-      
+
       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 set accepted encodings' do
         Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, {:compress => true})
         @easy_curl.headers["Accept-encoding"].should == 'gzip, deflate'
@@ -296,15 +296,15 @@ describe Feedzirra::Feed do
         Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, :if_none_match => 'ziEyTl4q9GH04BR4jgkImd0GvSE')
         @easy_curl.headers["If-None-Match"].should == 'ziEyTl4q9GH04BR4jgkImd0GvSE'
       end
-      
+
       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::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')
+          @feed = double('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::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
 
         it 'should decode the response body' do
@@ -312,7 +312,7 @@ describe Feedzirra::Feed do
           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::Parser::AtomFeedBurner)
           Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, {})
@@ -324,7 +324,7 @@ describe Feedzirra::Feed do
           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])
@@ -349,11 +349,11 @@ describe Feedzirra::Feed 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)
@@ -372,9 +372,9 @@ describe Feedzirra::Feed do
           @headers = "HTTP/1.0 500 Something Bad\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 = 'Sorry, something broke'
 
-          @easy_curl.stub!(:response_code).and_return(500)
-          @easy_curl.stub!(:header_str).and_return(@headers)
-          @easy_curl.stub!(:body_str).and_return(@body)
+          @easy_curl.stub(:response_code).and_return(500)
+          @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
@@ -383,7 +383,7 @@ describe Feedzirra::Feed do
           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, {})
@@ -399,9 +399,9 @@ describe Feedzirra::Feed 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)
+          @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
@@ -410,7 +410,7 @@ describe Feedzirra::Feed do
           Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, { :on_failure => complete })
           @easy_curl.on_complete.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, {})
@@ -426,7 +426,7 @@ describe Feedzirra::Feed do
       before(:each) do
         allow_message_expectations_on_nil
         @multi = Curl::Multi.get([@paul_feed[:url]], {:follow_location => true}, {:pipeline => true})
-        @multi.stub!(:add)
+        @multi.stub(:add)
         @easy_curl = Curl::Easy.new(@paul_feed[:url])
         @feed = Feedzirra::Feed.parse(sample_feedburner_atom_feed)
 
@@ -437,7 +437,7 @@ describe Feedzirra::Feed 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 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
@@ -447,10 +447,10 @@ describe Feedzirra::Feed do
         modified_time = Time.parse_safely("Wed, 28 Jan 2009 04:10:32 GMT")
         Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, {:if_modified_since => modified_time})
         modified_time.should be > @feed.last_modified
-        
+
         @easy_curl.headers["If-Modified-Since"].should == modified_time
       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, [], {}, {})
@@ -470,16 +470,16 @@ describe Feedzirra::Feed do
       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::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')
+          @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::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
 
         it 'should process the next feed in the queue'
-        
+
         it 'should parse the updated feed' do
           Feedzirra::Parser::AtomFeedBurner.should_receive(:parse).and_return(@new_feed)
           Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, {})
@@ -520,7 +520,7 @@ describe Feedzirra::Feed do
           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, [], {}, {})
@@ -533,9 +533,9 @@ describe Feedzirra::Feed 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)
+          @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
@@ -545,7 +545,7 @@ describe Feedzirra::Feed do
           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, {})
@@ -563,51 +563,51 @@ describe Feedzirra::Feed do
       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"
-      
+
       it "should set if modified since as an option if passed" do
         modified_time = Time.parse_safely("Wed, 28 Jan 2009 04:10:32 GMT")
-        Feedzirra::Feed.should_receive(:add_url_to_multi).with(anything, anything, anything, anything, {:if_modified_since => modified_time}).any_number_of_times
-        
+        Feedzirra::Feed.should_receive(:add_url_to_multi).with(anything, anything, anything, anything, {:if_modified_since => modified_time})
+
         @feed = Feedzirra::Feed.fetch_and_parse(sample_feedburner_atom_feed, {:if_modified_since => modified_time})
       end
-      
+
     end
 
     describe "#decode_content" do
       before(:each) do
-        @curl_easy = mock('curl_easy', :body_str => '<xml></xml>')
+        @curl_easy = double('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)
+        @curl_easy.stub(:header_str).and_return('Content-Encoding: gzip')
+        string_io = double('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 decode the response body using gzip if the Content-Encoding: is gzip even when the case is wrong' do
-        @curl_easy.stub!(:header_str).and_return('content-encoding: gzip')
-        string_io = mock('stringio', :read => @curl_easy.body_str, :close => true)
+        @curl_easy.stub(:header_str).and_return('content-encoding: gzip')
+        string_io = double('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 deflate the response body using inflate if the Content-Encoding: is deflate' do
-        @curl_easy.stub!(:header_str).and_return('Content-Encoding: deflate')
+        @curl_easy.stub(:header_str).and_return('Content-Encoding: deflate')
         Zlib::Inflate.should_receive(:inflate).with(@curl_easy.body_str)
         Feedzirra::Feed.decode_content(@curl_easy)
       end
 
       it 'should deflate the response body using inflate if the Content-Encoding: is deflate event if the case is wrong' do
-        @curl_easy.stub!(:header_str).and_return('content-encoding: deflate')
+        @curl_easy.stub(:header_str).and_return('content-encoding: deflate')
         Zlib::Inflate.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('')
+        @curl_easy.stub(:header_str).and_return('')
         Feedzirra::Feed.decode_content(@curl_easy).should == '<xml></xml>'
       end
     end
@@ -616,7 +616,7 @@ describe Feedzirra::Feed 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" 
+      it "should return an return an array of feed objects if multiple feeds are passed in"
     end
   end
 end

data/spec/feedzirra/feed_utilities_spec.rb

@@ -14,34 +14,34 @@ describe Feedzirra::FeedUtilities do
       feed.updated = true
       feed.should be_updated
     end
-    
+
     it "should provide a new_entries accessor" do
       feed = @klass.new
       feed.new_entries.should == []
       feed.new_entries = [:foo]
       feed.new_entries.should == [:foo]
     end
-    
+
     it "should provide an etag accessor" do
       feed = @klass.new
       feed.etag = "foo"
       feed.etag.should == "foo"
     end
-    
+
     it "should provide a last_modified accessor" do
       feed = @klass.new
       time = Time.now
-      feed.last_modified = time  
+      feed.last_modified = time
       feed.last_modified.should == time
       feed.last_modified.class.should == Time
     end
-    
+
     it "should return new_entries? as true when entries are put into new_entries" do
       feed = @klass.new
       feed.new_entries << :foo
       feed.should have_new_entries
     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::Parser::Atom.new
       entry =Feedzirra::Parser::AtomEntry.new
@@ -49,7 +49,7 @@ describe Feedzirra::FeedUtilities do
       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::Parser::Atom.new
       entry = Feedzirra::Parser::AtomEntry.new
@@ -59,7 +59,7 @@ describe Feedzirra::FeedUtilities do
       feed.last_modified.should == entry.published
     end
   end
-  
+
   describe "#update_from_feed" do
     describe "updating feed attributes" do
       before(:each) do
@@ -72,43 +72,43 @@ describe Feedzirra::FeedUtilities do
         @feed.updated  = false
         @updated_feed = @feed.dup
       end
-    
+
       it "should update the title if changed" do
         @updated_feed.title = "new title"
         @feed.update_from_feed(@updated_feed)
         @feed.title.should == @updated_feed.title
         @feed.should be_updated
       end
-    
+
       it "should not update the title if the same" do
         @feed.update_from_feed(@updated_feed)
-        @feed.should_not be_updated      
+        @feed.should_not be_updated
       end
-    
+
       it "should update the feed_url if changed" do
         @updated_feed.feed_url = "a new feed url"
         @feed.update_from_feed(@updated_feed)
         @feed.feed_url.should == @updated_feed.feed_url
         @feed.should be_updated
       end
-    
+
       it "should not update the feed_url if the same" do
         @feed.update_from_feed(@updated_feed)
         @feed.should_not be_updated
       end
-    
+
       it "should update the url if changed" do
         @updated_feed.url = "a new url"
         @feed.update_from_feed(@updated_feed)
         @feed.url.should == @updated_feed.url
       end
-    
+
       it "should not update the url if not changed" do
         @feed.update_from_feed(@updated_feed)
         @feed.should_not be_updated
       end
     end
-    
+
     describe "updating entries" 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
@@ -122,24 +122,24 @@ describe Feedzirra::FeedUtilities do
         @old_entry = Feedzirra::Parser::AtomEntry.new
         @old_entry.url = "http://pauldix.net/old.html"
         @old_entry.published = Time.now.to_s
-        @new_entry = Feedzirra::Parser::AtomEntry.new    
+        @new_entry = Feedzirra::Parser::AtomEntry.new
         @new_entry.url = "http://pauldix.net/new.html"
-        @new_entry.published = (Time.now + 10).to_s     
+        @new_entry.published = (Time.now + 10).to_s
         @feed.entries << @old_entry
         @updated_feed.entries << @new_entry
         @updated_feed.entries << @old_entry
       end
-      
+
       it "should update last-modified from the latest entry date" do
         @feed.update_from_feed(@updated_feed)
-        @feed.last_modified.should == @new_entry.published    
+        @feed.last_modified.should == @new_entry.published
       end
-      
+
       it "should put new entries into new_entries" do
         @feed.update_from_feed(@updated_feed)
         @feed.new_entries.should == [@new_entry]
       end
-      
+
       it "should also put new entries into the entries collection" do
         @feed.update_from_feed(@updated_feed)
         @feed.entries.should include(@new_entry)

data/spec/feedzirra/parser/atom_entry_spec.rb

@@ -83,4 +83,4 @@ describe Feedzirra::Parser::AtomEntry do
     @entry.title.should == "Foobar"
   end
 
-end
+end

data/spec/feedzirra/parser/atom_feed_burner_entry_spec.rb

@@ -6,11 +6,11 @@ describe Feedzirra::Parser::AtomFeedBurnerEntry do
     # but this is actually how it should work. You would never just pass entry xml straight to the AtomEnry
     @entry = Feedzirra::Parser::AtomFeedBurner.parse(sample_feedburner_atom_feed).entries.first
   end
-  
+
   it "should parse the title" do
     @entry.title.should == "Making a Ruby C library even faster"
   end
-  
+
   it "should be able to fetch a url via the 'alternate' rel if no origLink exists" do
     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'
@@ -19,7 +19,7 @@ describe Feedzirra::Parser::AtomFeedBurnerEntry do
   it "should parse the url" do
     @entry.url.should == "http://www.pauldix.net/2009/01/making-a-ruby-c-library-even-faster.html"
   end
-  
+
   it "should parse the url when there is no alternate" do
     entry = Feedzirra::Parser::AtomFeedBurner.parse(File.read("#{File.dirname(__FILE__)}/../../sample_feeds/FeedBurnerUrlNoAlternate.xml")).entries.first
     entry.url.should == 'http://example.com/QQQQ.html'
@@ -28,15 +28,15 @@ describe Feedzirra::Parser::AtomFeedBurnerEntry do
   it "should parse the author" do
     @entry.author.should == "Paul Dix"
   end
-  
+
   it "should parse the content" do
     @entry.content.should == sample_feedburner_atom_entry_content
   end
-  
+
   it "should provide a summary" do
     @entry.summary.should == "Last week I released the first version of a SAX based XML parsing library called SAX-Machine. It uses Nokogiri, which uses libxml, so it's pretty fast. However, I felt that it could be even faster. The only question was how..."
   end
-  
+
   it "should parse the published date" do
     @entry.published.should == Time.parse_safely("Thu Jan 22 15:50:22 UTC 2009")
   end
@@ -44,4 +44,4 @@ describe Feedzirra::Parser::AtomFeedBurnerEntry do
   it "should parse the categories" do
     @entry.categories.should == ['Ruby', 'Another Category']
   end
-end
+end

data/spec/feedzirra/parser/atom_feed_burner_spec.rb

@@ -5,15 +5,15 @@ describe Feedzirra::Parser::AtomFeedBurner do
     it "should return true for a feedburner atom feed" do
       Feedzirra::Parser::AtomFeedBurner.should be_able_to_parse(sample_feedburner_atom_feed)
     end
-    
+
     it "should return false for an rdf feed" do
       Feedzirra::Parser::AtomFeedBurner.should_not be_able_to_parse(sample_rdf_feed)
     end
-    
+
     it "should return false for a regular atom feed" do
       Feedzirra::Parser::AtomFeedBurner.should_not be_able_to_parse(sample_atom_feed)
     end
-    
+
     it "should return false for an rss feedburner feed" do
       Feedzirra::Parser::AtomFeedBurner.should_not be_able_to_parse(sample_rss_feed_burner_feed)
     end
@@ -23,7 +23,7 @@ describe Feedzirra::Parser::AtomFeedBurner do
     before(:each) do
       @feed = Feedzirra::Parser::AtomFeedBurner.parse(sample_feedburner_atom_feed)
     end
-    
+
     it "should parse the title" do
       @feed.title.should == "Paul Dix Explains Nothing"
     end
@@ -35,13 +35,13 @@ describe Feedzirra::Parser::AtomFeedBurner do
     it "should parse the url" do
       @feed.url.should == "http://www.pauldix.net/"
     end
-    
+
     it "should parse the feed_url" do
       @feed.feed_url.should == "http://feeds.feedburner.com/PaulDixExplainsNothing"
     end
-    
+
     it "should parse entries" do
       @feed.entries.size.should == 5
     end
   end
-end
+end