Added the net/http requirement to the Website class (which now needs it).

Removed some redundant requires from the website subclasses.

diff --git a/src/website.rb b/src/website.rb
index 5e064799cd3ede567d732e1f3e2f5c8f72aaf51a..ef96dc11fd32f6407a199ee2c033ecd4e40721eb 100644 (file)
--- a/src/website.rb
+++ b/src/website.rb
@@ -20,6 +20,9 @@
 # to parse the server name out of our URL.
 require 'uri'
 
+# Needed to download.. things.
+require 'net/http'
+
 # This class keeps track of all its subclasses
 # We use this to loop through every "website" in an
 # attempt to determine to which site a URL belongs.

diff --git a/src/websites/veoh.rb b/src/websites/veoh.rb
index 8978febf855ec4bfd38abf6ab50840020f1559b4..5830e8f5c40d7b430a9139d18aea73c69f4438e1 100644 (file)
--- a/src/websites/veoh.rb
+++ b/src/websites/veoh.rb
@@ -18,11 +18,6 @@
 
 require 'src/website'
 
-# Needed to download the page, which is in turn
-# needed because it contains the video (redirect) URL.
-require 'net/http'
-require 'uri'
-
 
 class Veoh < Website
 

diff --git a/src/websites/vimeo.rb b/src/websites/vimeo.rb
index b3dfe74c16f2630df10ac4c8ea07d0ae2e7ada0d..72ed31301495386faa2606103a85e9752a4f36b8 100644 (file)
--- a/src/websites/vimeo.rb
+++ b/src/websites/vimeo.rb
@@ -18,12 +18,6 @@
 
 require 'src/website'
 
-# Needed to download the video XML file, which is in turn
-# needed because it contains the junk we need to construct
-# the video URL.
-require 'net/http'
-require 'uri'
-
 
 class Vimeo < Website
 

diff --git a/src/websites/yikers.rb b/src/websites/yikers.rb
index c1153ee61cdf44d95cabf7ce518aa8eca5899229..4b13a023371d6ce94bd92c7fd1d7ed25ff4bc4ea 100644 (file)
--- a/src/websites/yikers.rb
+++ b/src/websites/yikers.rb
@@ -18,10 +18,6 @@
 
 require 'src/website'
 
-# Needed to download the page, which is in turn
-# needed because it contains the video URL.
-require 'net/http'
-
 
 class Yikers < Website
 

diff --git a/src/websites/youporn.rb b/src/websites/youporn.rb
index 07d7ca022cadeda6f5c5403cfbea96801c2e453e..3e98e9bbabfb4c400daaaa203acb9d94be692c12 100644 (file)
--- a/src/websites/youporn.rb
+++ b/src/websites/youporn.rb
@@ -18,11 +18,6 @@
 
 require 'src/website'
 
-# Needed to download the page, which is in turn
-# needed because it contains the video URL.
-require 'net/http'
-require 'uri'
-
 
 class Youporn < Website
 

diff --git a/src/websites/youtube.rb b/src/websites/youtube.rb
index c124f5339177f41c5a9360cde51700464d28be87..c8a1cad008fba578efd301ef53c7ee4b5bd44c6f 100644 (file)
--- a/src/websites/youtube.rb
+++ b/src/websites/youtube.rb
@@ -18,11 +18,6 @@
 
 require 'src/website'
 
-# Needed to download the page, which is in turn
-# needed because it contains the video URL.
-require 'net/http'
-require 'uri'
-
 
 class Youtube < Website