feedbag 0.5.100 → 0.6

data/bin/feedbag

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "feedbag"
+
+def usage
+  %Q{
+    #{$0} <url 1> [<url 2> <url 3> ... <url n>]
+  }
+end
+
+if ARGV.empty?
+  puts usage
+  exit 1
+end
+
+ARGV.each do |url|
+  puts "== #{url}:"
+  feeds = Feedbag.find url
+  if feeds.empty?
+    puts "   no feeds found!"
+  else
+    feeds.each do |f|
+      puts " - #{f}"
+    end
+  end
+end
+

data/lib/feedbag.rb

@@ -39,6 +39,8 @@ module Feedbag
 		# use LWR::Simple.normalize some time
 		url_uri = URI.parse(url)
 		url = "#{url_uri.scheme or 'http'}://#{url_uri.host}#{url_uri.path}"
+		url << "?#{url_uri.query}" if url_uri.query
+		
 		# hack:
 		url.sub!(/^feed:\/\//, 'http://')
 
@@ -65,22 +67,20 @@ module Feedbag
 		#url = "#{url_uri.scheme or 'http'}://#{url_uri.host}#{url_uri.path}"
 
 		# check if feed_valid is avail
-    unless args[:narrow]
-      begin
-	  		require "feed_validator"
-		  	v = W3C::FeedValidator.new
-			  v.validate_url(url)
-  			return self.add_feed(url, nil) if v.valid?
-	  	rescue LoadError
-		  	# scoo
-  		rescue REXML::ParseException
-	  	  # usually indicates timeout
-		    # TODO: actually find out timeout. use Terminator?
-		    $stderr.puts "Feed looked like feed but might not have passed validation or timed out"
-      rescue => ex
-	  		$stderr.puts "#{ex.class} error ocurred with: `#{url}': #{ex.message}"
-		  end
-    end
+    begin
+  		require "feed_validator"
+	  	v = W3C::FeedValidator.new
+		  v.validate_url(url)
+			return self.add_feed(url, nil) if v.valid?
+  	rescue LoadError
+	  	# scoo
+		rescue REXML::ParseException
+  	  # usually indicates timeout
+	    # TODO: actually find out timeout. use Terminator?
+	    # $stderr.puts "Feed looked like feed but might not have passed validation or timed out"
+    rescue => ex
+  		$stderr.puts "#{ex.class} error ocurred with: `#{url}': #{ex.message}"
+	  end
 
 		begin
 			html = open(url) do |f|
@@ -108,21 +108,19 @@ module Feedbag
 					end
 				end
 
-        unless args[:narrow]
-  				(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}/)
-			  			self.add_feed(a["href"], url, $base_uri)
-				  	end
-  				end
-
-	  			(doc/"a").each do |a|
-		  			next unless a["href"]
-			  		if self.looks_like_feed?(a["href"])
-				  		self.add_feed(a["href"], url, $base_uri)
-					  end
-  				end
-        end
+				(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}/)
+		  			self.add_feed(a["href"], url, $base_uri)
+			  	end
+				end
+
+  			(doc/"a").each do |a|
+	  			next unless a["href"]
+		  		if self.looks_like_feed?(a["href"])
+			  		self.add_feed(a["href"], url, $base_uri)
+				  end
+				end
 
 			end
 		rescue Timeout::Error => err

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: feedbag
 version: !ruby/object:Gem::Version 
-  version: 0.5.100
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - Axiombox
@@ -10,23 +14,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-10 00:00:00 -05:00
-default_executable: 
+date: 2010-03-05 00:00:00 -05:00
+default_executable: feedbag
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
         version: "0.6"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Ruby's favorite feed auto-discoverty tool
 email: david@axiombox.com
-executables: []
-
+executables: 
+- feedbag
 extensions: []
 
 extra_rdoc_files: 
@@ -35,6 +42,7 @@ extra_rdoc_files:
 files: 
 - lib/feedbag.rb
 - benchmark/rfeedfinder_benchmark.rb
+- bin/feedbag
 - README.markdown
 - COPYING
 has_rdoc: true
@@ -51,18 +59,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: feedbag
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby's favorite feed auto-discovery tool