feed_parser 0.2.1 → 0.2.2

data/lib/feed_parser/feed.rb

@@ -20,8 +20,15 @@ class FeedParser
     end
 
     def url
-      _url = @feed.xpath(Dsl[@type][:url]).text
-      @url = (!_url.nil? && _url.length > 0 && _url || @feed.xpath(Dsl[@type][:url]).attribute("href").text)
+      _url = case @type
+        when :rss
+          @feed.xpath(Dsl[@type][:url]) && @feed.xpath(Dsl[@type][:url])
+        when :atom
+          @feed.xpath(Dsl[@type][:url]).attribute("href")
+        else
+          nil
+      end
+      @url = _url && _url.text || ""
     end
 
     def items

data/lib/feed_parser/feed_item.rb

@@ -6,8 +6,8 @@ class FeedParser
       @guid = item.xpath(Dsl[@type][:item_guid]).text
       @title = item.xpath(Dsl[@type][:item_title]).text
       @author = item.xpath(Dsl[@type][:item_author]).text
-      @description = item.xpath(Dsl[@type][:item_description]).text
-      @content = item.xpath(Dsl[@type][:item_content]).text
+      @description = possible_text(item.xpath(Dsl[@type][:item_description]))
+      @content = possible_text(item.xpath(Dsl[@type][:item_content]))
       self
     end
 
@@ -34,6 +34,11 @@ class FeedParser
         :content => content
       }
     end
+
+    private
+    def possible_text(element)
+      element && element.text || ''
+    end
   end
 
   class RssItem < FeedItem

data/lib/feed_parser.rb

@@ -3,7 +3,7 @@ require 'nokogiri'
 
 class FeedParser
 
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 
   def initialize(opts)
     @url = opts[:url]

data/spec/feed_parser_spec.rb

@@ -84,6 +84,21 @@ describe FeedParser do
               }
             ]
         },
+        'basecamp.rss.xml' => {
+          :title => "Awesome project",
+          :url => "",
+          :items => [
+              {
+                :guid => "basecamp.00000000.Comment.1234567",
+                :link => "https://awesome.basecamphq.com/unique_item_link",
+                :title => "Comment posted: Re: Howdy how?",
+                :categories => [],
+                :author => "Ffuuuuuuu- Le.",
+                :description => "<div>trololooo</div><p>Company: awesome | Project: Awesome project</p>",
+                :content => ""
+              }
+            ]
+        },
         'TechCrunch.xml' => {
           :title => "TechCrunch",
           :url => "http://techcrunch.com",

data/spec/fixtures/basecamp.rss.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <channel>
+    <title>Awesome project</title>
+    <link></link>
+    <description>Recent items</description>
+    <language>en-us</language>
+    <ttl>40</ttl>
+    <item>
+      <title>Comment posted: Re: Howdy how?</title>
+      <description>&lt;div&gt;trololooo&lt;/div&gt;&lt;p&gt;Company: awesome | Project: Awesome project&lt;/p&gt;</description>
+      <pubDate>Wed, 09 Nov 2011 20:35:18 +0000</pubDate>
+      <guid isPermaLink="false">basecamp.00000000.Comment.1234567</guid>
+      <link>https://awesome.basecamphq.com/unique_item_link</link>
+      <dc:creator>Ffuuuuuuu- Le.</dc:creator>
+    </item>
+  </channel>
+</rss>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: feed_parser
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Arttu Tervo
@@ -69,6 +69,7 @@ files:
 - lib/feed_parser/self_sanitizer.rb
 - spec/feed_parser_spec.rb
 - spec/fixtures/TechCrunch.xml
+- spec/fixtures/basecamp.rss.xml
 - spec/fixtures/gcal.atom.xml
 - spec/fixtures/nodeta.rss.xml
 - spec/fixtures/sanitize.me.rss.xml
@@ -110,6 +111,7 @@ summary: Rss and Atom feed parser
 test_files: 
 - spec/feed_parser_spec.rb
 - spec/fixtures/TechCrunch.xml
+- spec/fixtures/basecamp.rss.xml
 - spec/fixtures/gcal.atom.xml
 - spec/fixtures/nodeta.rss.xml
 - spec/fixtures/sanitize.me.rss.xml