viddl-rb 0.71 → 0.72

data/Rakefile

@@ -6,7 +6,7 @@ task :default => [:test]
 
 Rake::TestTask.new(:test) do |t|
   #t.pattern = "spec/*_spec.rb"
-  t.test_files = ["spec/lib_spec.rb", "spec/url_extraction_spec.rb"]
+  t.test_files = ["spec/lib_spec.rb", "spec/url_extraction_spec.rb",  "spec/integration_spec.rb"]
 end
 
 Rake::TestTask.new(:test_lib) do |t|
@@ -16,3 +16,7 @@ end
 Rake::TestTask.new(:test_extract) do |t|
   t.test_files = FileList["spec/url_extraction_spec.rb"]
 end
+
+Rake::TestTask.new(:test_integration) do |t|
+  t.test_files = FileList["spec/integration_spec.rb"]
+end

data/plugins/youtube.rb

@@ -187,8 +187,18 @@ class Youtube < PluginBase
 
     #video_info_hash.keys.sort.each{|key| puts "#{key} : #{video_info_hash[key]}" }
     download_url = video_info_hash["url_encoded_fmt_stream_map"][selected_format]
+
     #if download url ends with a ';' followed by a codec string remove that part because it stops URI.parse from working
-    download_url = $1 if download_url =~ /(.*?);\scodecs=/
+    
+    if codec_part = download_url[/;\s*codec.+/m]    #if we have the ; codec substring  
+      sig = codec_part[/&sig=(.+?)&/, 1]            #extract the signature
+
+      download_url.sub!(codec_part, "")             #remove the ; codec substring from the download url
+      download_url.concat("&signature=#{sig}")      #concatenate the correct signature attribute
+    else
+      download_url.sub!("&sig=", "&signature=")     #else we just have to change sig to signature
+    end
+
     file_name = PluginBase.make_filename_safe(title) + "." + format_ext[selected_format][:extension]
     puts "downloading to " + file_name
     {:url => download_url, :name => file_name}

metadata

@@ -1,104 +1,101 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: viddl-rb
-version: !ruby/object:Gem::Version
-  version: '0.71'
+version: !ruby/object:Gem::Version 
+  hash: 155
   prerelease: 
+  segments: 
+  - 0
+  - 72
+  version: "0.72"
 platform: ruby
-authors:
+authors: 
 - Marc Seeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-03 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mechanize
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mechanize
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: minitest
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rest-client
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: An extendable commandline video downloader for flash video sites. Includes
-  plugins for vimeo, youtube and megavideo
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+description: An extendable commandline video downloader for flash video sites. Includes plugins for vimeo, youtube and megavideo
 email: mail@marc-seeger.de
-executables:
+executables: 
 - viddl-rb
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - bin/helper/downloader.rb
 - bin/helper/driver.rb
 - bin/helper/parameter-parser.rb
@@ -121,28 +118,41 @@ files:
 - Rakefile
 - README.md
 - TODO.txt
+has_rdoc: false
 homepage: https://github.com/rb2k/viddl-rb
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 19
+      segments: 
+      - 1
+      - 3
+      - 4
       version: 1.3.4
 requirements: []
+
 rubyforge_project: viddl-rb
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An extendable commandline video downloader for flash video sites.
 test_files: []
+