fed 0.0.2 → 0.0.3

data/fed.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fed'
-  s.version           = '0.0.2'
+  s.version           = '0.0.3'
   s.date              = '2013-04-26'
 
   ## Make sure your summary is short. The description may be as long
@@ -59,8 +59,10 @@ Gem::Specification.new do |s|
     lib/fed.rb
     lib/fed/feed/atom.rb
     lib/fed/feed/base.rb
+    lib/fed/feed/enclosure.rb
     lib/fed/feed/entry.rb
-    lib/fed/feed/rss.rb
+    lib/fed/feed/rss1.rb
+    lib/fed/feed/rss2.rb
     lib/fed/http.rb
     lib/fed/http/curb.rb
   ]

data/lib/fed/feed/atom.rb

@@ -24,7 +24,16 @@ module Fed
             ""
           end
 
-          Entry.new(entry_title, entry_link, entry_guid, entry_published, entry_author, entry_summary, entry_content)
+          enclosure_elem = item.css("link[rel='enclosure']").first
+          entry_enclosure = if !enclosure_elem.nil?
+            url = enclosure_elem.attributes['href'] ? enclosure_elem.attributes['href'].value : ''
+            content_type = enclosure_elem.attributes['type'] ? enclosure_elem.attributes['type'].value : ''
+            Enclosure.new(url, content_type)
+          else
+            nil
+          end
+
+          Entry.new(entry_title, entry_link, entry_guid, entry_published, entry_author, entry_summary, entry_content, entry_enclosure)
         end
 
         self

data/lib/fed/feed/enclosure.rb

@@ -0,0 +1,6 @@
+module Fed
+  module Feed
+    class Enclosure < Struct.new(:url, :type)
+    end
+  end
+end

data/lib/fed/feed/entry.rb

@@ -1,6 +1,6 @@
 module Fed
   module Feed
-    class Entry < Struct.new(:title, :link, :guid, :published, :author, :summary, :content)
+    class Entry < Struct.new(:title, :link, :guid, :published, :author, :summary, :content, :enclosure)
     end
   end
 end

data/lib/fed/feed/rss1.rb

@@ -0,0 +1,40 @@
+module Fed
+  module Feed
+    class Rss1 < Base
+      def parse
+        channel = @document.xpath('/rdf:RDF').css('channel').first
+
+        @title = channel.css('/title').text
+        @description = channel.css('/description').text
+        @link = channel.css('/link').text
+        @updated = DateTime.parse(channel.css('/pubDate').text) rescue nil
+
+        entry_list = @document.at('channel items').xpath('rdf:Seq/rdf:li').map {|e| e.attributes['resource'].value }
+        @entries = entry_list.map {|i| @document.css("item[rdf|about='#{i}']")}
+
+        @entries.map! do |item|
+          item_title = item.css('/title').text
+          item_summary = item.css('/description').text
+          item_content = item.css('/description').text
+          item_link = item.css('/link').text
+          item_published = DateTime.parse(item.css('/pubDate').text) rescue nil
+          item_guid = item.css('/guid').text
+          item_author = item.css('/author').text
+          
+          enclosure_elem = item.css('/enclosure').first
+          item_enclosure = if !enclosure_elem.nil?
+            url = enclosure_elem.attributes['url'] ? enclosure_elem.attributes['url'].value : ''
+            content_type = enclosure_elem.attributes['type'] ? enclosure_elem.attributes['type'].value : ''
+            Enclosure.new(url, content_type)
+          else
+            nil
+          end
+
+          Entry.new(item_title, item_link, item_guid, item_published, item_author, item_summary, item_content, item_enclosure)
+        end
+
+        self
+      end
+    end
+  end
+end

data/lib/fed/feed/{rss.rb → rss2.rb}

@@ -1,6 +1,6 @@
 module Fed
   module Feed
-    class Rss < Base
+    class Rss2 < Base
       def parse
         channel = @document.css('rss channel').first
 
@@ -17,8 +17,17 @@ module Fed
           item_published = DateTime.parse(item.css('/pubDate').text) rescue nil
           item_guid = item.css('/guid').text
           item_author = item.css('/author').text
+          
+          enclosure_elem = item.css('/enclosure').first
+          item_enclosure = if !enclosure_elem.nil?
+            url = enclosure_elem.attributes['url'] ? enclosure_elem.attributes['url'].value : ''
+            content_type = enclosure_elem.attributes['type'] ? enclosure_elem.attributes['type'].value : ''
+            Enclosure.new(url, content_type)
+          else
+            nil
+          end
 
-          Entry.new(item_title, item_link, item_guid, item_published, item_author, item_summary, item_content)
+          Entry.new(item_title, item_link, item_guid, item_published, item_author, item_summary, item_content, item_enclosure)
         end
 
         self

data/lib/fed.rb

@@ -8,11 +8,12 @@ require 'fed/http'
 require 'fed/http/curb'
 require 'fed/feed/base'
 require 'fed/feed/atom'
-require 'fed/feed/rss'
+require 'fed/feed/rss1'
+require 'fed/feed/rss2'
 require 'fed/feed/entry'
 
 module Fed
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   class <<self
 
@@ -32,8 +33,10 @@ module Fed
     def parser_for(doc)
       if is_atom?(doc)
         Fed::Feed::Atom.new(doc)
-      elsif is_rss?(doc)
-        Fed::Feed::Rss.new(doc)
+      elsif is_rss1?(doc)
+        Fed::Feed::Rss1.new(doc)
+      elsif is_rss2?(doc)
+        Fed::Feed::Rss2.new(doc)
       elsif (new_url = find_link_in_html(doc))
         parser_for(fetch(new_url))
       else
@@ -45,7 +48,11 @@ module Fed
       document.css('feed entry').any?
     end
 
-    def is_rss?(document)
+    def is_rss1?(document)
+      document.xpath('/rdf:RDF').any?
+    end
+
+    def is_rss2?(document)
       document.css('rss channel').any?
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fed
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -90,8 +90,10 @@ files:
 - lib/fed.rb
 - lib/fed/feed/atom.rb
 - lib/fed/feed/base.rb
+- lib/fed/feed/enclosure.rb
 - lib/fed/feed/entry.rb
-- lib/fed/feed/rss.rb
+- lib/fed/feed/rss1.rb
+- lib/fed/feed/rss2.rb
 - lib/fed/http.rb
 - lib/fed/http/curb.rb
 homepage: http://github.com/jm/fed