feedbagtoo 0.7.3 → 0.7.4

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.4

data/feedbagtoo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{feedbagtoo}
-  s.version = "0.7.3"
+  s.version = "0.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Axiombox", "David Moreno", "Joel Duffin", "Justin Ball", "Fabien Penso"]
-  s.date = %q{2012-07-23}
+  s.date = %q{2012-07-24}
   s.default_executable = %q{feedbag}
   s.description = %q{This gem will return title and url for each feed discovered at a given url}
   s.email = %q{justin@tatemae.com}

data/lib/feedbag.rb

@@ -93,7 +93,7 @@ module Feedbag
 	  end
 
 		begin
-			Timeout::timeout(15) do
+			Timeout::timeout(20) do
 				html = open(url) do |f|
 					content_type = f.content_type.downcase
 					if content_type == "application/octet-stream" # open failed
@@ -140,16 +140,16 @@ module Feedbag
 					(doc/"a").each do |a|
 	  				next unless a["href"]
 		  			if self.looks_like_feed?(a["href"]) and (a["href"] =~ /\// or a["href"] =~ /#{url_uri.host}/)
-		  				title = a["title"] || a.innerText || a['alt'] || title
-			  			self.add_feed(a["href"], url, $base_uri, title, description || title)
+		  				calculated_title = self.title_for_anchor(a, title)
+			  			self.add_feed(a["href"], url, $base_uri, calculated_title, description || calculated_title)
 				  	end
 					end
 
 	  			(doc/"a").each do |a|
 		  			next unless a["href"]
 			  		if self.looks_like_feed?(a["href"])
-			  			title = a["title"] || a.innerText || a['alt'] || title
-				  		self.add_feed(a["href"], url, $base_uri, title, description || title)
+			  			calculated_title = self.title_for_anchor(a, title)
+				  		self.add_feed(a["href"], url, $base_uri, calculated_title, description || calculated_title)
 					  end
 					end
 
@@ -173,6 +173,7 @@ module Feedbag
 	end
 
 	def self.looks_like_feed?(url)
+		return false unless url[0...4] == 'http'
 		if url =~ /((\.|\/)(rdf|xml|rdf|rss)$|feed=(rss|atom)|(atom|feed)\/?$)/i
 			true
 		else
@@ -180,6 +181,15 @@ module Feedbag
 		end
 	end
 
+	def self.title_for_anchor(a, title)
+		t = a["title"] || a.innerText || a['alt']
+		if(t && t.length > 0)
+			t
+		else
+			title
+		end
+	end
+
 	def self.add_feed(feed_url, orig_url, base_uri = nil, title = "", description = "")
 		# puts "#{feed_url} - #{orig_url}"
 		url = feed_url.sub(/^feed:/, '').strip

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: feedbagtoo
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - Axiombox
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-23 00:00:00 -06:00
+date: 2012-07-24 00:00:00 -06:00
 default_executable: feedbag
 dependencies: 
 - !ruby/object:Gem::Dependency