UnderpantsGnome-feedzirra 0.0.14 → 0.0.15

data/README.textile

@@ -1,3 +1,5 @@
+"Changes made from Paul's tree":#changes
+
 h1. Feedzirra
 
 "http://github.com/pauldix/feedzirra/tree/master":http://github.com/pauldix/feedzirra/tree/master 
@@ -166,9 +168,10 @@ Here are some more specific TODOs.
 * Clean up the fetching code inside feed.rb so it doesn't suck so hard.
 * Readdress how feeds determine if they can parse a document. Maybe I should use namespaces instead?
 
-h2. Updates from the original
+h2(#changes). Updates from Paul's tree
 
 * Add in Media RSS support that should handle the spec with multiple content entries.
+* Add in the missing support for nested iTunes Categories
 
 h2. LICENSE
 

data/lib/feedzirra.rb

@@ -21,7 +21,8 @@ require 'feedzirra/feed'
 require 'feedzirra/parser/rss_entry'
 require 'feedzirra/parser/mrss_content'
 require 'feedzirra/parser/itunes_rss_owner'
-require 'feedzirra/parser/itunes_rss_item'
+require 'feedzirra/parser/itunes_rss_entry'
+require 'feedzirra/parser/itunes_rss_category'
 require 'feedzirra/parser/atom_entry'
 require 'feedzirra/parser/atom_feed_burner_entry'
 
@@ -31,5 +32,5 @@ require 'feedzirra/parser/atom'
 require 'feedzirra/parser/atom_feed_burner'
 
 module Feedzirra
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/lib/feedzirra/feed.rb

@@ -1,9 +1,9 @@
 module Feedzirra
   class NoParserAvailable < StandardError; end
-  
+
   class Feed
     USER_AGENT = "feedzirra http://github.com/pauldix/feedzirra/tree/master"
-    
+
     # Takes a raw XML feed and attempts to parse it. If no parser is available a Feedzirra::NoParserAvailable exception is raised.
     #
     # === Parameters
@@ -21,7 +21,7 @@ module Feedzirra
     end
 
     # Determines the correct parser class to use for parsing the feed.
-    # 
+    #
     # === Parameters
     # [xml<String>] The XML that you would like determine the parser for.
     # === Returns
@@ -37,7 +37,7 @@ module Feedzirra
     # [klass<Constant>] The class/constant that you want to register.
     # === Returns
     # A updated array of feed parser class names.
-    def self.add_feed_class(klass) 
+    def self.add_feed_class(klass)
       feed_classes.unshift klass
     end
 
@@ -46,10 +46,15 @@ module Feedzirra
     # === Returns
     # A array of class names.
     def self.feed_classes
-      @feed_classes ||= [Feedzirra::Parser::RSS, Feedzirra::Parser::AtomFeedBurner, Feedzirra::Parser::Atom]
+      @feed_classes ||= [
+        Feedzirra::Parser::ITunesRSS,
+        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 
+
+    # Makes all entry types look for the passed in element to parse. This is actually just a call to
     # element (a SAXMachine call) in the class
     #
     # === Parameters
@@ -62,7 +67,7 @@ module Feedzirra
         klass.send(:element, element_tag, options)
       end
     end
-    
+
     # Fetches and returns the raw XML for each URL provided.
     #
     # === Parameters
@@ -75,7 +80,7 @@ module Feedzirra
     #                 :on_failure - Block that gets executed after a failed request.
     # === Returns
     # A String of XML if a single URL is passed.
-    # 
+    #
     # A Hash if multiple URL's are passed. The key will be the URL, and the value the XML.
     def self.fetch_raw(urls, options = {})
       url_queue = [*urls]
@@ -122,13 +127,13 @@ module Feedzirra
       url_queue = [*urls]
       multi = Curl::Multi.new
       responses = {}
-      
+
       # 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
@@ -145,7 +150,7 @@ module Feedzirra
           gz =  Zlib::GzipReader.new(StringIO.new(c.body_str))
           xml = gz.read
           gz.close
-        rescue Zlib::GzipFile::Error 
+        rescue Zlib::GzipFile::Error
           # Maybe this is not gzipped?
           xml = c.body_str
         end
@@ -174,15 +179,15 @@ module Feedzirra
       feed_queue = [*feeds]
       multi = Curl::Multi.new
       responses = {}
-      
+
       feed_queue.slice!(0, 30).each do |feed|
         add_feed_to_multi(multi, feed, feed_queue, responses, options)
       end
-    
+
       multi.perform
       responses.size == 1 ? responses.values.first : responses.values
     end
-    
+
     # An abstraction for adding a feed by URL to the passed Curb::multi stack.
     #
     # === Parameters
@@ -205,12 +210,12 @@ module Feedzirra
         curl.headers["Accept-encoding"]   = 'gzip, deflate' if options.has_key?(:compress)
         curl.follow_location = true
         curl.userpwd = options[:http_authentication].join(':') if options.has_key?(:http_authentication)
-        
+
         curl.on_success do |c|
           add_url_to_multi(multi, url_queue.shift, url_queue, responses, options) unless url_queue.empty?
           xml = decode_content(c)
           klass = determine_feed_parser_for_xml(xml)
-          
+
           if klass
             begin
               feed = klass.parse(xml)
@@ -228,7 +233,7 @@ module Feedzirra
             options[:on_failure].call(url, c.response_code, c.header_str, c.body_str) if options.has_key?(:on_failure)
           end
         end
-        
+
         curl.on_failure do |c|
           add_url_to_multi(multi, url_queue.shift, url_queue, responses, options) unless url_queue.empty?
           responses[url] = c.response_code
@@ -237,7 +242,7 @@ module Feedzirra
       end
       multi.add(easy)
     end
-    
+
     # An abstraction for adding a feed by a Feed object to the passed Curb::multi stack.
     #
     # === Parameters
@@ -252,7 +257,7 @@ module Feedzirra
     #                 * :on_failure - Block that gets executed after a failed request.
     # === Returns
     # The updated Curl::Multi object with the request details added to it's stack.
-    def self.add_feed_to_multi(multi, feed, feed_queue, responses, options) 
+    def self.add_feed_to_multi(multi, feed, feed_queue, responses, options)
       easy = Curl::Easy.new(feed.feed_url) do |curl|
         curl.headers["User-Agent"]        = (options[:user_agent] || USER_AGENT)
         curl.headers["If-Modified-Since"] = feed.last_modified.httpdate if feed.last_modified
@@ -291,7 +296,7 @@ module Feedzirra
     end
 
     # Determines the etag from the request headers.
-    # 
+    #
     # === Parameters
     # [header<String>] Raw request header returned from the request
     # === Returns

data/lib/feedzirra/parser/itunes_rss.rb

@@ -1,5 +1,5 @@
 module Feedzirra
-  
+
   module Parser
     # iTunes is RSS 2.0 + some apple extensions
     # Source: http://www.apple.com/itunes/whatson/podcasts/specs.html
@@ -34,17 +34,20 @@ module Feedzirra
       # 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:category', :as => :itunes_categories,
+      #   :class => ITunesRSSCategory
+
 
       elements :"itunes:owner", :as => :itunes_owners, :class => ITunesRSSOwner
 
-      elements :item, :as => :entries, :class => ITunesRSSItem
+      elements :item, :as => :entries, :class => ITunesRSSEntry
 
       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_category.rb

@@ -0,0 +1,17 @@
+module Feedzirra
+
+  module Parser
+    # iTunes extensions to the standard RSS2.0 item
+    # Source: http://www.apple.com/itunes/whatson/podcasts/specs.html
+    class ITunesRSS
+      class ITunesRSSCategory
+        include SAXMachine
+        include FeedEntryUtilities
+
+        element :'itunes:category', :as => :name, :value => :text
+        elements :'itunes:category', :as => :sub_categories, :value => :text
+      end
+    end
+  end
+
+end

data/lib/feedzirra/parser/{itunes_rss_item.rb → itunes_rss_entry.rb}

@@ -1,16 +1,20 @@
 module Feedzirra
-  
+
   module Parser
     # iTunes extensions to the standard RSS2.0 item
     # Source: http://www.apple.com/itunes/whatson/podcasts/specs.html
-    class ITunesRSSItem
+    class ITunesRSSEntry
       include SAXMachine
-      include FeedUtilities
+      include FeedEntryUtilities
       element :author
       element :guid
+      element :guid, :as => :id
+      element :enclosure, :value => :url, :as => :guid
+      element :enclosure, :value => :url, :as => :id
       element :title
       element :link, :as => :url
       element :description, :as => :summary
+      element :description, :as => :content
       element :pubDate, :as => :published
 
       # If author is not present use author tag on the item
@@ -27,5 +31,5 @@ module Feedzirra
       element :enclosure, :value => :url, :as => :enclosure_url
     end
   end
-  
+
 end

data/spec/feedzirra/feed_spec.rb

@@ -5,20 +5,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" 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::Parser::AtomEntry.new.should respond_to(:comment_rss)
     end
-    
+
     it "should parse the added element out of RSS feeds" 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
@@ -47,17 +47,17 @@ describe Feedzirra::Feed do
         feed.title.should == "Paul Dix Explains Nothing"
         feed.entries.first.published.to_s.should == "Thu Jan 22 15:50:22 UTC 2009"
         feed.entries.size.should == 5
-      end      
+      end
 
       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.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
+        feed.entries.first.should respond_to(:itunes_author)
+        feed.entries.size.should == 4
       end
     end
 
@@ -98,8 +98,8 @@ describe Feedzirra::Feed do
       Feedzirra::Feed.determine_feed_parser_for_xml(sample_rss_feed).should == Feedzirra::Parser::RSS
     end
 
-    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
+    it "should return a Feedzirra::Parser::ITunesRSS object for an itunes feed" do
+      Feedzirra::Feed.determine_feed_parser_for_xml(sample_itunes_feed).should == Feedzirra::Parser::ITunesRSS
     end
 
   end
@@ -113,7 +113,7 @@ 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
@@ -165,7 +165,7 @@ describe Feedzirra::Feed do
         @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
@@ -179,7 +179,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("Wed, 28 Jan 2009 04:10:32 GMT"))
         @curl.headers["If-Modified-Since"].should == 'Wed, 28 Jan 2009 04:10:32 GMT'
@@ -189,7 +189,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'])
@@ -207,7 +207,7 @@ describe Feedzirra::Feed do
       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] )
 
@@ -216,10 +216,10 @@ describe Feedzirra::Feed do
 
         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])
@@ -238,7 +238,7 @@ describe Feedzirra::Feed 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
 
@@ -246,12 +246,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("Jan 25 2009 04:10:32 GMT"))
         @easy_curl.headers["If-Modified-Since"].should == 'Sun, 25 Jan 2009 04:10:32 GMT'
@@ -261,12 +261,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'
@@ -276,7 +276,7 @@ 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)
@@ -292,7 +292,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], [], {}, {})
@@ -304,7 +304,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])
@@ -329,11 +329,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)
@@ -363,7 +363,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, {})
@@ -389,14 +389,14 @@ 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
       end
 
       it "should set if modified since as an option if passed"
-      
+
       it 'should set follow location to true' do
         @easy_curl.should_receive(:follow_location=).with(true)
         Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, {})
@@ -425,7 +425,7 @@ describe Feedzirra::Feed do
         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, [], {}, {})
@@ -466,7 +466,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, [], {}, {})
@@ -491,7 +491,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, {})
@@ -523,7 +523,7 @@ describe Feedzirra::Feed do
         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')
         Zlib::Inflate.should_receive(:inflate).with(@curl_easy.body_str)
@@ -540,7 +540,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/parser/{itunes_rss_item_spec.rb → itunes_rss_entry_spec.rb}

@@ -1,48 +1,48 @@
 require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
-describe Feedzirra::Parser::ITunesRSSItem do
+describe Feedzirra::Parser::ITunesRSSEntry 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::Parser::ITunesRSS.parse(sample_itunes_feed).entries.first
   end
-  
+
   it "should parse the title" do
     @item.title.should == "Shake Shake Shake Your Spices"
   end
-  
+
   it "should parse the author" do
     @item.itunes_author.should == "John Doe"
-  end  
+  end
 
   it "should parse the subtitle" do
     @item.itunes_subtitle.should == "A short primer on table spices"
-  end  
+  end
 
   it "should parse the summary" do
     @item.itunes_summary.should == "This week we talk about salt and pepper shakers, comparing and contrasting pour rates, construction materials, and overall aesthetics. Come and join the party!"
-  end  
+  end
 
   it "should parse the enclosure" do
     @item.enclosure_length.should == "8727310"
     @item.enclosure_type.should == "audio/x-m4a"
     @item.enclosure_url.should == "http://example.com/podcasts/everything/AllAboutEverythingEpisode3.m4a"
-  end  
+  end
 
   it "should parse the guid" do
     @item.guid.should == "http://example.com/podcasts/archive/aae20050615.m4a"
-  end  
+  end
 
   it "should parse the published date" do
-    @item.published.should == "Wed, 15 Jun 2005 19:00:00 GMT"
-  end  
+    @item.published.should == Time.parse('Wed Jun 15 19:00:00 UTC 2005')
+  end
 
   it "should parse the duration" do
     @item.itunes_duration.should == "7:04"
-  end  
+  end
 
   it "should parse the keywords" do
     @item.itunes_keywords.should == "salt, pepper, shaker, exciting"
-  end  
+  end
 
 end

data/spec/feedzirra/parser/itunes_rss_spec.rb

@@ -15,36 +15,51 @@ describe Feedzirra::Parser::ITunesRSS do
     before(:each) do
       @feed = Feedzirra::Parser::ITunesRSS.parse(sample_itunes_feed)
     end
-    
+
     it "should parse the subtitle" do
       @feed.itunes_subtitle.should == "A show about everything"
     end
-    
+
     it "should parse the author" do
       @feed.itunes_author.should == "John Doe"
     end
-    
+
     it "should parse an owner" do
       @feed.itunes_owners.size.should == 1
     end
-    
+
     it "should parse an image" do
       @feed.itunes_image.should == "http://example.com/podcasts/everything/AllAboutEverything.jpg"
     end
-    
+
     it "should parse categories" do
-      @feed.itunes_categories.size == 3
-      @feed.itunes_categories[0] == "Technology"
-      @feed.itunes_categories[1] == "Gadgets"
-      @feed.itunes_categories[2] == "TV & Film"
+      @feed.itunes_categories.size == 2
+      # @feed.itunes_categories[0].name.should == "Technology"
+      @feed.itunes_categories[0].should == "Technology"
+      # @feed.itunes_categories[0].sub_categories.size.should == 1
+      # @feed.itunes_categories[0].sub_categories[0].should == "Gadgets"
+      # @feed.itunes_categories[1].name.should == "TV & Film"
+      @feed.itunes_categories[1].should == "Gadgets"
+      @feed.itunes_categories[2].should == "TV & Film"
+      # @feed.itunes_categories[1].sub_categories.size.should == 0
     end
 
     it "should parse the summary" do
       @feed.itunes_summary.should == "All About Everything is a show about everything. Each week we dive into any subject known to man and talk about it as much as we can. Look for our Podcast in the iTunes Music Store"
     end
-    
+
     it "should parse entries" do
-      @feed.entries.size.should == 3
+      @feed.entries.size.should == 4
+    end
+
+    it "should assign an id even if no guid is present" do
+      @feed.entries.last.id.should == 'http://58.159.184.66/9darts/ipod/dai_throw.mp4'
+      @feed.entries.last.guid.should == 'http://58.159.184.66/9darts/ipod/dai_throw.mp4'
+    end
+
+    it "should not overwrite an existing id" do
+      # @feed.entries[2].id.should == 'http://example.com/podcasts/archive/aae20050601.mp3'
+      @feed.entries[2].guid.should == 'http://example.com/podcasts/archive/aae20050601.mp3'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: UnderpantsGnome-feedzirra
 version: !ruby/object:Gem::Version 
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors: 
 - Paul Dix
@@ -90,8 +90,9 @@ files:
 - 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_entry.rb
 - lib/feedzirra/parser/itunes_rss_owner.rb
+- lib/feedzirra/parser/itunes_rss_category.rb
 - lib/feedzirra/parser/rss.rb
 - lib/feedzirra/parser/rss_entry.rb
 - lib/feedzirra/parser/mrss_content.rb
@@ -107,7 +108,7 @@ files:
 - 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_entry_spec.rb
 - spec/feedzirra/parser/itunes_rss_owner_spec.rb
 - spec/feedzirra/parser/rss_spec.rb
 - spec/feedzirra/parser/rss_entry_spec.rb