cherrypicker 0.0.1 → 0.0.2

data/README

@@ -2,7 +2,7 @@
 
 == Description
 
-	Cherrypicker is Ruby Gem it lets you download from; Rapidshare and Hotfile
+	Cherrypicker is a Ruby Gem that lets you download from; Rapidshare and Hotfile
 
 == Installation
 

data/lib/cherrypicker/functions.rb

@@ -0,0 +1,26 @@
+require "net/http"
+require "uri"
+require 'open-uri'
+
+def remote_query(url)
+  begin
+    uri = URI.parse(url)
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.open_timeout = 3 # in seconds
+    http.read_timeout = 3 # in seconds
+    request = Net::HTTP::Get.new(uri.request_uri)
+    request.initialize_http_header({"User-Agent" => "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/532.1 (KHTML, like Gecko) Chrome/4.0.219.6 Safari/532.1"})
+    response = http.request(request)
+    return response
+  rescue SocketError
+    $stderr.print "IO failed: " + $!
+    raise
+  end
+end
+
+def hash_to_url(hash)
+  hash.keys.inject('') do |query_string, key|
+    query_string << '&' unless key == hash.keys.first
+    query_string << "#{URI.encode(key.to_s)}=#{URI.encode(hash[key])}"
+  end
+end

data/lib/cherrypicker/hotfile.rb

@@ -6,10 +6,14 @@
 require 'open-uri'
 
 class Hotfile
-  attr_accessor :link, :hostname, :filename, :username, :password, :remote_url
+  attr_accessor :link, :hostname, :filename, :username, :password
 
   def initialize(link, username, password)
-    @link     = link
+    if link =~ /hotfile.com\/dl\/\d*\/[0-9a-f]*\/.*.*\.html/
+      @link = link[/(.*)\.html/, 1]
+    else
+      @link = link
+    end
     @username = username
     @password = password
     @hostname = hostname
@@ -25,38 +29,23 @@ class Hotfile
   end
   
   def create_url
-    Hash.new({
+    hash_to_url({
       link:     self.link,
       username: self.username.to_s,
       password: self.password.to_s
-    }).url
+    })
+  end
+  
+  def request
+    query = remote_query("http://api.hotfile.com/?action=getdirectdownloadlink&" + create_url)
+    query.response.body
   end
   
   def hostname   
-    query = "http://api.hotfile.com/?action=getdirectdownloadlink&" + create_url
-    begin
-      open(query) do |f|
-        f.each do |line|
-          return "#{line[/http:\/\/(.*).hotfile.com/, 1]}" + ".hotfile.com"
-        end
-      end
-    rescue SocketError
-      $stderr.print "IO failed: " + $!
-      raise
-    end
+    "#{request[/http:\/\/(.*).hotfile.com/, 1]}" + ".hotfile.com"
   end
   
   def remote_url   
-    query = "http://api.hotfile.com/?action=getdirectdownloadlink&" + create_url
-    begin
-      open(query) do |f|
-        f.each do |line|
-          return "#{line[/http:\/\/.*.hotfile.com(.*)/, 1]}"
-        end
-      end
-    rescue SocketError
-      $stderr.print "IO failed: " + $!
-      raise
-    end
+    "#{request[/http:\/\/.*.hotfile.com(.*)/, 1]}"
   end
 end

data/lib/cherrypicker/rapidshare.rb

@@ -5,7 +5,8 @@
 # puts rapid.fileid
 # puts rapid.filename
 # puts rapid.host
-require 'open-uri'
+require "net/http"
+require "uri"
 
 class Rapidshare
   attr_accessor :link, :fileid, :filename, :hostname, :username, :password
@@ -36,25 +37,16 @@ class Rapidshare
   end
     
   def create_url
-    Hash.new({
+   hash_to_url({
       fileid:   self.fileid,
       filename: self.filename,
       login:    self.username.to_s,
       password: self.password.to_s
-    }).url
+    })
   end
   
-  def hostname    
-     query = "http://api.rapidshare.com/cgi-bin/rsapi.cgi?sub=download&" + create_url
-     begin
-       open(query) do |f|
-         f.each do |line|
-           return "#{line[/DL:(.*).rapidshare.com/, 1]}" + ".rapidshare.com"
-         end
-       end
-     rescue SocketError
-       $stderr.print "IO failed: " + $!
-       raise
-     end
-   end
+  def hostname
+    query = remote_query("http://api.rapidshare.com/cgi-bin/rsapi.cgi?sub=download&" + create_url)
+    query.response.body[/DL:(.*).rapidshare.com/, 1] + ".rapidshare.com"
+  end
 end

data/lib/cherrypicker/version.rb

@@ -1,3 +1,3 @@
 module Cherrypicker
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/cherrypicker.rb

@@ -1,4 +1,4 @@
 require 'cherrypicker/rapidshare'
 require "cherrypicker/hotfile"
 require 'cherrypicker/download'
-require "cherrypicker/hash"
+require "cherrypicker/functions"

metadata

@@ -2,7 +2,7 @@
 name: cherrypicker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Karl Entwistle
@@ -31,7 +31,7 @@ files:
 - cherrypicker.gemspec
 - lib/cherrypicker.rb
 - lib/cherrypicker/download.rb
-- lib/cherrypicker/hash.rb
+- lib/cherrypicker/functions.rb
 - lib/cherrypicker/hotfile.rb
 - lib/cherrypicker/rapidshare.rb
 - lib/cherrypicker/version.rb

data/lib/cherrypicker/hash.rb

@@ -1,21 +0,0 @@
-# Class that can create URL from hash
-#
-# print Hash.new(Hash["a", "b"]).url  
-require 'open-uri'
-
-class Hash
-  attr_accessor :hash, :url
-  
-  def initialize(hash)
-    @hash = hash
-    @url = hash_to_url
-  end
-
-  def hash_to_url
-    hash = self.hash
-    hash.keys.inject('') do |query_string, key|
-      query_string << '&' unless key == hash.keys.first
-      query_string << "#{URI.encode(key.to_s)}=#{URI.encode(hash[key])}"
-    end
-  end  
-end