feed_parser 0.3.1 → 0.3.2

data/Rakefile

@@ -19,9 +19,9 @@ end
 desc "Default: Run specs"
 task :default => :spec
 
-namespace :rubies do
+namespace :spec do
   desc "Run tests with three major Ruby versions"
-  task :specs do
-    run("rvm 1.8.7-p302@feed_parser,1.9.2-p0@feed_parser,1.9.3-p125@feed_parser do bundle exec rake spec")
+  task :rubies do
+    system("rvm 1.8.7-p302@feed_parser,1.9.2-p0@feed_parser,1.9.3-p194@feed_parser do bundle exec rake spec")
   end
 end

data/lib/feed_parser.rb

@@ -3,7 +3,7 @@ require 'nokogiri'
 
 class FeedParser
 
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 
   USER_AGENT = "Ruby / FeedParser gem"
 

data/lib/feed_parser/feed.rb

@@ -49,18 +49,21 @@ class FeedParser
 
     # Some feeds
     def open_or_follow_redirect(feed_url)
-      parsed_url = parse_url(feed_url)
+      parsed_url = URI.parse(feed_url)
 
       connection_options = {"User-Agent" => FeedParser::USER_AGENT}
       connection_options.merge!(@http_options)
-      connection_options[:http_basic_authentication] = parsed_url[:basic_auth] if parsed_url[:basic_auth]
+      if parsed_url.userinfo
+        connection_options[:http_basic_authentication] = [parsed_url.user, parsed_url.password].compact
+        parsed_url.userinfo = parsed_url.user = parsed_url.password = nil
+      end
 
       connection_options[:redirect] = true if RUBY_VERSION >= '1.9'
 
-      if parsed_url[:protocol]
-        open(parsed_url[:url], connection_options)
+      if parsed_url.scheme
+        open(parsed_url.to_s, connection_options)
       else
-        open(parsed_url[:url])
+        open(parsed_url.to_s)
       end
     rescue RuntimeError => ex
       redirect_url = ex.to_s.split(" ").last
@@ -70,14 +73,5 @@ class FeedParser
         raise ex
       end
     end
-
-    def parse_url(feed_url)
-      protocol, auth, *the_rest = URI.split(feed_url)
-      # insert a question mark in the beginning of query part of the uri
-      the_rest[-2].insert(0, '?') if the_rest[-2].is_a?(String)
-      url = (protocol && [protocol, the_rest.join].join('://') || the_rest.join)
-      basic_auth = auth.split(':') if auth
-      {:protocol => protocol, :url => url, :basic_auth => basic_auth}
-    end
   end
 end

data/lib/feed_parser/feed_item.rb

@@ -57,7 +57,7 @@ class FeedParser
     def initialize(item)
       @type = :rss
       super
-      @link = item.xpath(Dsl[@type][:item_link]).text
+      @link = item.xpath(Dsl[@type][:item_link]).text.strip
       @categories = item.xpath(Dsl[@type][:item_categories]).map{|cat| cat.text}
     end
   end
@@ -66,7 +66,7 @@ class FeedParser
     def initialize(item)
       @type = :atom
       super
-      @link = item.xpath(Dsl[@type][:item_link]).attribute("href").text
+      @link = item.xpath(Dsl[@type][:item_link]).attribute("href").text.strip
       @categories = item.xpath(Dsl[@type][:item_categories]).map{|cat| cat.attribute("term").text}
     end
   end

data/spec/feed_parser_spec.rb

@@ -143,6 +143,21 @@ describe FeedParser do
               }
             ]
         },
+        'scrumalliance.rss.xml' => {
+          :title => "ScrumAlliance",
+          :url => "http://scrumalliance.org/",
+          :items => [
+            {
+              :guid => "http://scrumalliance.org/articles/424-testing-in-scrum-with-a-waterfall-interaction",
+              :link => "http://scrumalliance.org/articles/424-testing-in-scrum-with-a-waterfall-interaction", # trims the link
+              :title => "Testing in Scrum with a Waterfall Interaction",
+              :categories => [],
+              :author => "",
+              :description => "Sometimes, when testing user stories in Scrum, there's a final Waterfall  interaction to deal with. The scenario I present here is based on this  situation: a Scrum process with an interaction of sequential phases at  the end of the process to (re)test the whole developed functionality.  These sequential phases are mandatory for our organization, which  follows a Waterfall process for the releases of the product. So, for the  moment at least, we have to deal with this  and my experience is that  we aren't alone.",
+              :content => ""
+            }
+          ]
+        },
         'TechCrunch.xml' => {
           :title => "TechCrunch",
           :url => "http://techcrunch.com",

data/spec/fixtures/sanitize.me.rss.xml

@@ -13,7 +13,6 @@
 	<sy:updateFrequency>1</sy:updateFrequency>
 			<atom10:link xmlns:atom10="http://www.w3.org/2005/Atom" rel="self" href="http://feeds.feedburner.com/Nodeta" type="application/rss+xml" /><item>
 		<title>Announcing Flowdock - Real-time collaboration for teams</title>
-		<link>http://blog.nodeta.fi/2009/07/05/announcing-flowdock-real-time-collaboration-for-teams/</link>
 		<comments>http://blog.nodeta.fi/2009/07/05/announcing-flowdock-real-time-collaboration-for-teams/#comments</comments>
 		<pubDate>Sun, 05 Jul 2009 09:25:32 +0000</pubDate>
 		<dc:creator>Karri Saarinen</dc:creator>

data/spec/fixtures/scrumalliance.rss.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">
+  <channel>
+    <atom:link href="http://www.scrumalliance.org/rss" rel="self" type="application/rss+xml" />
+    <title>ScrumAlliance</title>
+    <link>http://scrumalliance.org/</link>
+    <pubDate>Wed, 23 May 2012 11:07:32 GMT</pubDate>
+    <description> Scrum Alliance </description>
+
+      <item>
+        <title>Testing in Scrum with a Waterfall Interaction</title>
+        <link> http://scrumalliance.org/articles/424-testing-in-scrum-with-a-waterfall-interaction</link>
+        <description>Sometimes, when testing user stories in Scrum, there's a final Waterfall  interaction to deal with. The scenario I present here is based on this  situation: a Scrum process with an interaction of sequential phases at  the end of the process to (re)test the whole developed functionality.  These sequential phases are mandatory for our organization, which  follows a Waterfall process for the releases of the product. So, for the  moment at least, we have to deal with this  and my experience is that  we aren't alone.</description>
+        <pubDate>Wed, 23 May 2012 11:07:03 GMT</pubDate>
+        <guid>http://scrumalliance.org/articles/424-testing-in-scrum-with-a-waterfall-interaction</guid>
+      </item>
+  </channel>
+</rss>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feed_parser
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152816100 !ruby/object:Gem::Requirement
+  requirement: &2153328640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152816100
+  version_requirements: *2153328640
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2152815240 !ruby/object:Gem::Requirement
+  requirement: &2153383440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2152815240
+  version_requirements: *2153383440
 description: Rss and Atom feed parser with sanitizer support built on top of Nokogiri.
 email:
 - arttu.tervo@gmail.com
@@ -60,6 +60,7 @@ files:
 - spec/fixtures/gcal.atom.xml
 - spec/fixtures/nodeta.rss.xml
 - spec/fixtures/sanitize.me.rss.xml
+- spec/fixtures/scrumalliance.rss.xml
 - spec/fixtures/smashingmagazine.atom.xml
 homepage: http://github.com/arttu/feed_parser
 licenses: []
@@ -93,4 +94,5 @@ test_files:
 - spec/fixtures/gcal.atom.xml
 - spec/fixtures/nodeta.rss.xml
 - spec/fixtures/sanitize.me.rss.xml
+- spec/fixtures/scrumalliance.rss.xml
 - spec/fixtures/smashingmagazine.atom.xml