matthewgarysmith-rubypodder 1.0.1 → 1.0.2

data/lib/rubypodder.rb

@@ -97,6 +97,7 @@ class RubyPodder
       rio(file_name) < rio(url)
     rescue
       @log.error("  Failed to download #{url}")
+      File.delete(file_name) if File.exists?(file_name)
     else
       record_download(url, guid)
     end

data/tests/tc_rubypodder.rb

@@ -179,42 +179,46 @@ class TC_RubyPodder < Test::Unit::TestCase
   end
 
   def test_download
-    @rp.download("http://www.google.com/index.html")
+    @rp.download("http://www.google.com/index.html", 'google')
     dest_file = @rp.date_dir + "/" + "index.html"
     assert(File.exists?(dest_file))
     assert(File.open(dest_file).grep(/google/))
   end
 
   def test_download_recorded
-    @rp.download("http://www.google.com/index.html")
+    @rp.download("http://www.google.com/index.html", 'google')
     assert(File.exists?(@rp.done_file))
     assert(File.open(@rp.done_file).grep(/^http:\/\/www.google.com\/index.html$/))
   end
 
   def test_already_downloaded
     url1 = "http://www.google.com/index.html"
-    assert(!@rp.already_downloaded(url1), "url1 should not be already downloaded before download of url1")
-    @rp.download(url1)
+    guid1 = "google"
+    assert(!@rp.already_downloaded(url1, guid1), "url1 should not be already downloaded before download of url1")
+    @rp.download(url1, guid1)
     File.open( @rp.log_file ) do |f|
       return if (f.any? { |line| line =~ /ERROR/ }) # Don't test this case if no internet connection
     end
-    assert(@rp.already_downloaded(url1), "url1 should be already downloaded after download of url1")
+    assert(@rp.already_downloaded(url1, guid1), "url1 should be already downloaded after download of url1")
     url2 = "http://www.google.co.nz/index.html"
-    @rp.download(url2)
-    assert(@rp.already_downloaded(url2), "url2 should be already downloaded after download of url2")
-    assert(@rp.already_downloaded(url1), "url1 should still be already downloaded after download of url2")
+    guid2 = "googlenz"
+    @rp.download(url2, guid2)
+    assert(@rp.already_downloaded(url2, guid2), "url2 should be already downloaded after download of url2")
+    assert(@rp.already_downloaded(url1, guid1), "url1 should still be already downloaded after download of url2")
+    url3 = "http://www.google.co.nz/intl/en/about.html"
+    assert(@rp.already_downloaded(url3, guid1), "url3 should be already downloaded because it is using giud1")
   end
 
   def test_download_omits_done_items
     dest_file = @rp.date_dir + "/" + "index.html"
     system("rm -rf " + dest_file)
-    @rp.record_download("http://www.google.com/index.html")
-    @rp.download("http://www.google.com/index.html")
+    @rp.record_download("http://www.google.com/index.html", 'google')
+    @rp.download("http://www.google.com/index.html", 'google')
     assert(!File.exists?(dest_file), "#{dest_file} should not be downloaded again if already recorded as done")
   end
 
   def test_download_error_is_logged
-    @rp.download("http://very.very.broken.url/oh/no/oh/dear.xml")
+    @rp.download("http://very.very.broken.url/oh/no/oh/dear.xml", 'oh-dear')
     File.open( @rp.log_file ) do |f|
       assert(f.any? { |line| line =~ /ERROR/ }, "Error in download should be logged")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: matthewgarysmith-rubypodder
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Lex Miller
@@ -9,7 +9,7 @@ autorequire: rubypodder
 bindir: bin
 cert_chain: []
 
-date: 2009-01-24 00:00:00 -08:00
+date: 2009-01-25 00:00:00 -08:00
 default_executable: rubypodder
 dependencies: 
 - !ruby/object:Gem::Dependency