@@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = "goodies" - s.version = "0.2" - s.date = "2008-01-03" + s.version = "0.3" + s.date = "2009-02-28" s.summary = "Ruby's swiss army knife" s.email = "david@axiombox.com" s.homepage = "http://github.com/damog/goodies" @@ -12,7 +12,7 @@ Gem::Specification.new do |s| "lib/goodies.rb", "lib/goodies/array.rb", "lib/goodies/html.rb", - "lib/goodies/lwr.rb" + "lib/goodies/lwr-simple.rb" ] s.rdoc_options = ["--main", "README"] s.extra_rdoc_files = ["README"] goodies.gemspec @@ -1,5 +1,6 @@ # Little tribute to LWP::Simple require "open-uri" +require "tempfile" module LWR class LWR::Simple @@ -119,14 +120,28 @@ module Kernel end def mirror(uri, file) - res = nil - file = File.open(file, "w") if file.is_a? String - raise ArgumentError, "File object expected!" unless file.is_a? File - url = LWR::Simple.normalize(uri) req = Net::HTTP::Get.new(url.path) - if File.exists? file + case file + when String + if File.exists? file + file_exists = true + else + file_exists = false + end + file = File.open(file, "w") + when File + if File.exists? file.path + file_exists = true + else + file_exists = false + end + else + raise ArgumentError, "Failed arguments" + end + + if file_exists req.add_field("If-Modified-Since", file.mtime.httpdate) end @@ -136,29 +151,25 @@ module Kernel case res when Net::HTTPSuccess - tmpfile = Tempfile.new("lwr-simple-mirror") - tmpfile.open do |f| - f.puts res.body - end - if res["content-length"] and tmpfile.size < res["content-length"] - tmpfile.unlink + tmpfile = Tempfile.new("lwr") + tmpfile.print res.body + + if res["content-length"] and tmpfile.size < res["content-length"].to_i raise Exception, "Transfer truncated, only #{tmpfile.size} of #{res["content-length"]} bytes received" - elsif res["content-length"] and tmpfile.size > res["content-length"] - tmpfile.unlink + File.unlink(tmpfile.path) + elsif res["content-length"] and tmpfile.size > res["content-length"].to_i raise Exception, "Content-length mismatch, expected #{res["content-length"]} bytes, got #{tmpfile.size}" + File.unlink(tmpfile.path) else # OK + File.unlink(file.path) if File.exists? file.path + File.rename(tmpfile.path, file.path) end - - when Net::HTTPRedirection - # not supported yet else end - - - end + res end lib/goodies/lwr-simple.rb 966afbb1a1cf000cd327646cff8dbd0103863519 David Moreno david@axiombox.com http://github.com/damog/goodies/commit/b2414cd1131de50330e88c92fbc9359733689e23 b2414cd1131de50330e88c92fbc9359733689e23 2009-02-28T12:29:19-08:00 2009-02-28T12:29:19-08:00 next gem generation b08c532f0736e4d81fdcfbdbdebaeb6b63107a1b David Moreno david@axiombox.com