cherrypicker 0.3.7 → 0.3.8

data/README.md

@@ -2,9 +2,8 @@ Cherrypicker
 =========
 
 	Cherrypicker was part of my final year project for university it
-	is a Ruby Gem that lets you download from; Rapidshare, Hotfile, Hotfile, Youtube, Vimeo & Megavideo
-	You can also utilise the LinkChecker to see if your files are 
-	alive on Rapidshare and Hotfile
+	is a Ruby Gem that lets you download from; Rapidshare, Hotfile, Hotfile, Youtube, Vimeo & Megavideo
+	You can also utilise the LinkChecker to see if your files are alive on Rapidshare and Hotfile
 	
 	Enjoy!
 
@@ -58,6 +57,7 @@ fix/feature has a high chance of being included, please read the following
 guidelines:
 
 1. Post a new GitHub Issue[http://github.com/karlentwistle/Cherrypicker/issues].
+2. Write a simple unit test that includes UrlAvailable?
 	
 Limitations
 -----------

data/bin/cherrypick

@@ -28,8 +28,9 @@ parser.each{|opt, arg| options[opt.gsub('--', '').to_sym] = arg unless arg == ''
 
 if options[:directory] && !File.directory?(options[:directory]) then
   puts "Directory not found " + options[:directory]
+  puts
   usage 
   exit
 end
-s
+
 Cherrypicker::Cherrypick.new(ARGV[0], :location => options[:directory], :username => options[:username], :password => options[:password])

data/lib/cherrypicker/plugins/hotfile.rb

@@ -1,6 +1,6 @@
 # Class that can sort Hotfile link into sections as specified by Hotfile API 
 #
-# hotfile = Hotfile.new("http://hotfile.com/dl/110589431/6ad2666/ROT007-WEB-2011.rar.html", "username", "password")
+# hotfile = Hotfile.new("http://hotfile.com/dl/110589431/6ad2666/ROT007-WEB-2011.rar.html", :username => "username", password => "password")
 # hotfile.download
 
 require 'open-uri'

data/lib/cherrypicker/plugins/rapidshare.rb

@@ -1,11 +1,11 @@
 # Class that can sort Rapidshare link into sections as specified by RapidShare API 
 #
-# rapid = Rapidshare.new("http://rapidshare.com/files/329036215/The.Matrix.bandaa25.part06.rar", "username", "password")
+# rapid = Rapidshare.new("http://rapidshare.com/files/329036215/myfile.rar", "username", "password")
 # rapid.download
 require 'open-uri'
 module Cherrypicker
   class Rapidshare
-    attr_accessor :link, :fileid, :filename, :hostname, :username, :password, :size, :location
+    attr_accessor :link, :fileid, :filename, :hostname, :username, :password, :size, :location, :download_url
   
     def initialize(link, opts={})
       uri = URI.parse(link)
@@ -25,6 +25,7 @@ module Cherrypicker
       @location = o[:location]
       @filename = File.basename(uri.path)
       @hostname = hostname
+      @download_url = @hostname + remote_url
     end
   
     def download

data/lib/cherrypicker/version.rb

@@ -1,3 +1,3 @@
 module Cherrypicker
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/test/test_helper.rb

@@ -1,4 +1,14 @@
 require 'rubygems'
 require 'shoulda'
+require 'net/http'
 
-require File.dirname(__FILE__) + '/../lib/cherrypicker'
+require File.dirname(__FILE__) + '/../lib/cherrypicker'
+
+def UrlAvailable?(url)
+  uri = URI.parse(url)
+  http = Net::HTTP.new(uri.host, uri.port)
+  http.use_ssl = true if uri.scheme == "https"
+  http.start do |http|
+    return http.head(uri.request_uri).code == "200"
+  end
+end

data/test/unit/megavideo_test.rb

@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+module Cherrypicker
+  class MegavideoTest < Test::Unit::TestCase
+  
+    context "Information request" do
+         
+      should "Standard video test" do
+        response = Megavideo.new("http://www.megavideo.com/?v=JKXPXMGA")
+        assert response.link =~ /[A-Z]*/
+        assert response.filename.length > 0
+        assert response.filename == "russian+president+dancing.flv"
+        assert response.download_url.include?("#{response.filename}")
+        assert UrlAvailable?(response.download_url)
+      end
+      
+      should "Another video test" do
+        response = Megavideo.new("http://www.megavideo.com/?v=GYZ3NEFZ")
+        assert response.link =~ /[A-Z]*/
+        assert response.filename.length > 0
+        assert response.filename == "justin+bieber+-+one+time.flv"
+        assert response.download_url.include?("#{response.filename}")
+        assert UrlAvailable?(response.download_url)
+      end
+
+    end
+  end
+end

data/test/unit/rapidshare_test.rb

@@ -1,17 +1,27 @@
 require File.dirname(__FILE__) + '/../test_helper'
+module Cherrypicker
 
-class RapidshareTest < Test::Unit::TestCase
+  class RapidshareTest < Test::Unit::TestCase
   
-  context "Information request" do
+    context "Information request" do
          
-      should "return response" do
-        response = Rapidshare.new("http://rapidshare.com/files/453165880/test_file.txt", "username", "password")
-        assert response.fileid =~ /\d*/
-        assert response.filename.length > 0
-        assert response.hostname.length > 0
-        assert !response.hostname.include?("DL: ")
-      end
+        should "return response https file" do
+          response = Rapidshare.new("https://rapidshare.com/files/453165880/test_file.txt", :username =>  "username", :password =>  "password")
+          assert response.fileid =~ /\d*/
+          assert response.filename.length > 0
+          assert response.hostname.length > 0
+          assert UrlAvailable?(response.download_url)
+        end
+        
+        should "return response http file" do
+          response = Rapidshare.new("http://rapidshare.com/files/453165880/test_file.txt", :username =>  "username", :password =>  "password")
+          assert response.fileid =~ /\d*/
+          assert response.filename.length > 0
+          assert response.hostname.length > 0
+          assert UrlAvailable?(response.download_url)
+        end
     
-  end
+    end
   
-end
+  end
+end

data/test/unit/vimeo_test.rb

@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+module Cherrypicker
+  class VimeoTest < Test::Unit::TestCase
+  
+    context "Information request" do
+         
+      should "Standard video test" do
+        response = Vimeo.new("http://vimeo.com/12650554")
+        assert response.link =~ /\d*/
+        assert response.filename.length > 0
+        assert response.filename == "Portland_Cello_Project___Denmark.flv"
+        assert response.download_url.include?("token")
+        assert UrlAvailable?(response.download_url)
+      end
+      
+      should "URL with a ? inside" do
+        response = Vimeo.new("http://vimeo.com/21712912?ab")
+        assert response.link =~ /\d*/
+        assert response.filename.length > 0
+        assert response.filename == "Shadows.flv"
+        assert response.download_url.include?("token")
+        assert UrlAvailable?(response.download_url)
+      end
+      
+      should "URL with seven digits hosted on Amazon" do
+        response = Vimeo.new("http://vimeo.com/2171291", :location => "/Volumes/Storage/Gems/cherrypicker/movies")
+        assert response.link =~ /\d*/
+        assert response.filename.length > 0
+        assert response.filename == "Stephanies_Birthday__Melissa_talking_about__quot_synch_swimming_quot___and_Sheean_being_Sheean_.flv"
+        assert response.location == "/Volumes/Storage/Gems/cherrypicker/movies"
+        assert response.download_url.include?("AWSAccessKeyId")
+        #assert UrlAvailable?(response.download_url)
+      end
+
+    end
+  end
+end

data/test/unit/youtube_test.rb

@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+module Cherrypicker
+  class YoutubeTest < Test::Unit::TestCase
+  
+    context "Information request" do
+         
+      should "Standard video test" do
+        response = Youtube.new("http://www.youtube.com/watch?v=ihYq2dGa29M")
+        assert response.link =~ /\?v=([a-z0-9\-]+)\&*/
+        assert response.filename.length > 0
+        assert response.filename == "Why_do_people_laugh_at_creationists___part_24_.flv"
+        response.download_url.include?("videoplayback?sparams=id")
+        assert UrlAvailable?(response.download_url)
+      end
+      
+      should "Another video test" do
+        response = Youtube.new("http://www.youtube.com/watch?v=nZ6-GnxKuwY")
+        assert response.link =~ /\?v=([a-z0-9\-]+)\&*/
+        assert response.filename.length > 0
+        assert response.filename == "The_Palace_Episode_02.mp4"
+        response.download_url.include?("videoplayback?sparams=id")
+        assert UrlAvailable?(response.download_url)
+      end
+     
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: cherrypicker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Karl Entwistle
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 +01:00
+date: 2011-04-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,8 +52,11 @@ files:
 - lib/cherrypicker/plugins/youtube.rb
 - lib/cherrypicker/version.rb
 - test/test_helper.rb
-- test/unit/hostfile_test.rb
+- test/unit/hotfile_test.rb
+- test/unit/megavideo_test.rb
 - test/unit/rapidshare_test.rb
+- test/unit/vimeo_test.rb
+- test/unit/youtube_test.rb
 has_rdoc: true
 homepage: http://karl.entwistle.info/
 licenses: []
@@ -84,5 +87,8 @@ specification_version: 3
 summary: Cherrypicker is Ruby Gem it lets you download from; Rapidshare and Hotfile
 test_files: 
 - test/test_helper.rb
-- test/unit/hostfile_test.rb
+- test/unit/hotfile_test.rb
+- test/unit/megavideo_test.rb
 - test/unit/rapidshare_test.rb
+- test/unit/vimeo_test.rb
+- test/unit/youtube_test.rb