devbukkit.rb in spigoter-0.3.0

- old
+ new

@@ -1,35 +1,21 @@
 require 'open-uri'
 require 'logging'
 
 module Spigoter
-	class PluginBukkit
+	class PluginBukkit < Plugin
 		def initialize(website)
-			@url = website # Url of the plugin
-			@main_page     # Mainpage content
-			@name          # Name of the plugin
-			@download_page # Content of the download page
-			@download_url  # Download url of the plugin
+			super(website)
 
 			raise "Bad URL #{@url}" if @url.match(/http:\/\/dev.bukkit.org\/bukkit-plugins\/[a-z\-]+\/?/).nil?
 		end
-		def main_page
-			return @main_page unless @main_page.nil?
-			begin
-				@main_page = open(@url).read
-			rescue
-				raise "404 Error, that plugin URL doesn't exists"
-			end
-			return @main_page
-		end
 		def download_page
 			return @download_page unless @download_page.nil?
 			main_page
 			url_download_page = @main_page.match(/<a href="(?<download_page_url>.+)">Download/)[:download_page_url]
 			@download_page = open("http://dev.bukkit.org/#{url_download_page}").read
 			# Don't need to begin-rescue, it's done by main_page
-			return @download_page
 		end
 		def download_url
 			return @download_url unless @download_url.nil?
 			download_page
 			@download_url = /href="(?<download_url>.+)">Download/.match(@download_page)[:download_url]
@@ -40,17 +26,8 @@
 			@version = /3">\s*<h1>\s+(?<version>.+)\s+<\/h1>/.match(@download_page)[:version]
 		end
 		def name
 			return @name unless @name.nil?
 			@name = /ins\/(?<name>[a-z\-]+)\/?/.match(@url)[:name]
-		end
-		def download
-			download_url
-			begin
-				file = open(@download_url).read
-			rescue
-				raise "Can't download file for #{name}, #{@download_url}, check internet?"
-			end
-			return file
 		end
 	end
 end
\ No newline at end of file