viddl-rb 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  data.tar.gz: d497fc050ace12babbf349b9a784bc4d25f575b6
-  metadata.gz: f762d1748ff20ddecf6a8a243934ed8002c2bf7b
-SHA512: 
-  data.tar.gz: ec1be57e9dfbb1e44489fa6cca3af761ab3433b012a7e7984a21fa09a1011155b7141939f3770e40a369a3b714f2dba8ac205630e1af9a4a98244422b4cead93
-  metadata.gz: 584785893e0f19ee4da9b374619e878c726297847cf3f7f2dfbd8cedf18338c1806d68a3d3f6690c9d678ad8b08bcba76de3fb3ca2204394d4bad5eddc06ef99
+---
+SHA1:
+  metadata.gz: 5379af5f32c73c2968f22e9b0b2e13f19898fcb4
+  data.tar.gz: 2bb9721f7ab0202c231930d91f3b37c069419186
+SHA512:
+  metadata.gz: 92b031a53501f8f0451ed2af7e43c2ae71efb70c4cf0352bc9e1960b15a2c5214d0935213e7077b0a101e1d7a03cadc0899a2ed76c9b35e672eb241057c1043b
+  data.tar.gz: b4426d723f18f5dbb1c530fc3875e928b0d5b66201b183c6cf60a7f267c3a033ca5d313b222a3c1c04980a0c212782af818935187bc6c73aa04d71383c2208df

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    viddl-rb (0.93)
-      mime-types
-      multi_json
-      nokogiri
-      progressbar
+    viddl-rb (1.0.1)
+      mime-types (~> 2.1.0)
+      multi_json (~> 1.10.0)
+      nokogiri (~> 1.6.0)
+      progressbar (~> 0.21)
 
 GEM
   remote: http://rubygems.org/
   specs:
     ffi2-generators (0.1.1)
     mime-types (2.1)
-    mini_portile (0.5.2)
+    mini_portile (0.5.3)
     minitest (5.2.2)
-    multi_json (1.8.4)
+    multi_json (1.10.0)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     progressbar (0.21.0)
@@ -231,7 +231,7 @@ PLATFORMS
 DEPENDENCIES
   minitest
   racc
-  rake
-  rest-client
+  rake (~> 10.1.0)
+  rest-client (~> 1.6.7)
   rubysl (~> 2.0)
   viddl-rb!

data/README.md

@@ -130,6 +130,8 @@ __Co Maintainers:__
 __Contributors:__
 * [albertoboni](https://github.com/albertoboni) bandcamp plugin, soundcloud improvements
 * [divout](https://github.com/divout) aka Ivan K: blip.tv plugin, bugfixes
+* [mbajur](https://github.com/mbajur) aka Mike Bajur: The instagram plugin
 * Sniper: bugfixes
 * [Serabe](https://github.com/Serabe) aka Sergio Arbeo: packaging viddl as a binary
 * [laserlemon](https://github.com/laserlemon): Adding gemnasium images to readme
+

data/plugins/bandcamp.rb

@@ -19,13 +19,12 @@ class Bandcamp < PluginBase
 
     # parse the js object
     JSON.parse(match).each do |track_data|
-      track_url   = ''
 
       # hopefully the last is the best
-      track_url  = track_data["file"].values.last
+      track_url = track_data["file"].values.last
       
       # create a good mp3 name
-      track_name  = self.make_filename_safe(track_data['title']) + '.mp3'
+      track_name = self.make_filename_safe(track_data['title']) + '.mp3'
       
       # add to the response
       url_and_files << {url: track_url, name: track_name}

data/plugins/instagram.rb

@@ -0,0 +1,16 @@
+class Instagram < PluginBase
+
+  #this will be called by the main app to check whether this plugin is responsible for the url passed
+  def self.matches_provider?(url)
+    url.include?("instagram.com")
+  end
+
+  def self.get_urls_and_filenames(url, options = {})
+    video_page = open(url).read
+
+    download_url = video_page.scan(/video_url":"(http.*.mp4)/).flatten.first.gsub('\/', '/')
+
+    [{:url => download_url, :name => "#{Time.now.to_i}.mp4"}]
+  end
+end
+

data/plugins/vimeo.rb

@@ -9,7 +9,7 @@ class Vimeo < PluginBase
     #the vimeo ID consists of 7 decimal numbers in the URL
     vimeo_id = url[/\d{7,8}/]
 
-    video_url = "http://player.vimeo.com/v2/video/#{vimeo_id}"
+    video_url = "http://player.vimeo.com/video/#{vimeo_id}"
     video_page = open(video_url).read
 
     info_json = video_page[/a=(\{.+?);/, 1]

data/plugins/youtube/cipher_io.rb

@@ -6,7 +6,7 @@ require 'yaml'
 
 class CipherIO
 
-  CIPHER_YAML_URL = "https://raw.github.com/rb2k/viddl-rb/master/plugins/youtube/ciphers.yml"
+  CIPHER_YAML_URL = "https://raw.githubusercontent.com/rb2k/viddl-rb/master/plugins/youtube/ciphers.yml"
   CIPHER_YAML_PATH = File.join(ViddlRb::UtilityHelper.base_path, "plugins/youtube/ciphers.yml")
 
   def initialize

data/plugins/youtube/ciphers.yml

@@ -97,3 +97,4 @@ en_US-vflbJnZqE: w26 s1 w15 w3 w62 w54 w22
 en_US-vflgd5txb: w26 s1 w15 w3 w62 w54 w22
 en_US-vflTm330y: w26 s1 w15 w3 w62 w54 w22
 en_US-vflnwMARr: s3 r w24 s2
+en_US-vflaTh7jt: w46 r s3 w19 r s2 w15

metadata

@@ -1,84 +1,107 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: viddl-rb
-version: !ruby/object:Gem::Version 
-  version: 1.0.1
+version: !ruby/object:Gem::Version
+  version: 1.0.2
 platform: ruby
-authors: 
+authors:
 - Marc Seeger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-04-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mime-types
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id002 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+date: 2014-07-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: progressbar
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.1.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.1.0
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.7
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-description: An extendable commandline video downloader for flash video sites. Includes plugins for vimeo, youtube, dailymotion and more
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: An extendable commandline video downloader for flash video sites. Includes
+  plugins for vimeo, youtube, dailymotion and more
 email: mail@marc-seeger.de
-executables: 
+executables:
 - viddl-rb
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -96,6 +119,7 @@ files:
 - plugins/bandcamp.rb
 - plugins/blip.rb
 - plugins/dailymotion.rb
+- plugins/instagram.rb
 - plugins/metacafe.rb
 - plugins/soundcloud.rb
 - plugins/veoh.rb
@@ -110,32 +134,27 @@ files:
 - plugins/youtube/url_resolver.rb
 - plugins/youtube/video_resolver.rb
 homepage: https://github.com/rb2k/viddl-rb
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
+    - !ruby/object:Gem::Version
       version: 1.9.0
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
+    - !ruby/object:Gem::Version
       version: 1.3.4
 requirements: []
-
 rubyforge_project: viddl-rb
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An extendable commandline video downloader for flash video sites.
 test_files: []
-
-has_rdoc: false