youtube_it 2.3.1 → 2.3.2

data/README.rdoc

@@ -133,6 +133,9 @@ Upload Video:
 Upload Video With A Developer Tag (Note the tags are not immediately available):
   $ client.video_upload(File.open("test.mov"), :title => "test",:description => 'some description', :category => 'People',:keywords => %w[cool blah test], :dev_tag => 'tagdev')
 
+Upload Video from url:
+  $ client.video_upload("http://media.railscasts.com/assets/episodes/videos/412-fast-rails-commands.mp4", :title => "test",:description => 'some description', :category => 'People',:keywords => %w[cool blah test])
+
 Upload Private Video:
   $ client.video_upload(File.open("test.mov"), :title => "test",:description => 'some description', :category => 'People',:keywords => %w[cool blah test], :private => true)
 

data/lib/youtube_it.rb

@@ -37,11 +37,11 @@ class YouTubeIt
   def self.adapter=(faraday_adapter)
     @adapter = faraday_adapter
   end
-  
+
   def self.adapter
     @adapter ||= Faraday.default_adapter
   end
-  
+
   # Gets mixed into the classes to provide the logger method
   module Logging #:nodoc:
 
@@ -84,6 +84,7 @@ end
   request/standard_search
   request/video_upload
   request/video_search
+  request/remote_file
   response/video_search
   middleware/faraday_authheader.rb
   middleware/faraday_oauth.rb

data/lib/youtube_it/chain_io.rb

@@ -18,7 +18,7 @@ class YouTubeIt::ChainIO
     # Read off the first element in the stack
     current_io = @chain.shift
     return false if !current_io
-    
+
     buf = current_io.read(buffer_size)
     if !buf && @chain.empty? # End of streams
       release_handle(current_io) if @autoclose
@@ -34,8 +34,8 @@ class YouTubeIt::ChainIO
       buf
     end
   end
-  
-  # Predict the length of all embedded IOs. Will automatically send file size.  
+
+  # Predict the length of all embedded IOs. Will automatically send file size.
   def expected_length
     @chain.inject(0) do | len, io |
       if io.respond_to?(:length)
@@ -47,30 +47,40 @@ class YouTubeIt::ChainIO
       end
     end
   end
-    
+
   private
     def release_handle(io)
       io.close if io.respond_to?(:close)
     end
 end
-  
+
 # Net::HTTP only can send chunks of 1024 bytes. This is very inefficient, so we have a spare IO that will send more when asked for 1024.
 # We use delegation because the read call is recursive.
 class YouTubeIt::GreedyChainIO < DelegateClass(YouTubeIt::ChainIO)
   BIG_CHUNK = 512 * 1024 # 500 kb
-  
+
   def initialize(*with_ios)
     __setobj__(YouTubeIt::ChainIO.new(with_ios))
   end
-  
-  def read(any_buffer_size = nil)
-    __getobj__.read(BIG_CHUNK)
+
+  def read(size = BIG_CHUNK, dst_buf = nil)
+    src_buf = __getobj__.read(size)
+    return nil unless src_buf
+    copy_buf(src_buf, dst_buf) if dst_buf
+    src_buf
   end
 
   def length()
     __getobj__.expected_length
   end
 
+  private
+
+  def copy_buf(src_buf, dst_buf)
+    dst_buf[0..-1] = ''
+    dst_buf << src_buf
+  end
+
 end
 
 #:startdoc:

data/lib/youtube_it/request/remote_file.rb

@@ -0,0 +1,68 @@
+require 'open-uri'
+require 'net/http'
+require 'fiber'
+class YouTubeIt
+  module Upload
+
+
+    class RemoteFile
+      def initialize( url)
+        @pos = 0
+        @url = url
+        @uri = URI(@url)
+
+        @fiber = Fiber.new do |first|
+
+          Net::HTTP.start(@uri.host, @uri.port) do |http|
+            request = Net::HTTP::Get.new @uri.request_uri
+            http.request request do |response|
+              response.read_body do |chunk|
+                @pos += chunk.bytesize
+                Fiber.yield chunk
+              end
+            end
+          end
+        end
+
+      end
+
+      def ping?
+
+      end
+
+      def pos
+        @pos
+      end
+
+      def head
+        @head_result || Net::HTTP.start(@uri.host, @uri.port) do |http|
+          @head_result = http.request(Net::HTTP::Head.new(@uri.request_uri))
+        end
+        @head_result
+      end
+
+      def filename
+        File.basename(@url)
+      end
+
+      def path
+        @url
+      end
+
+      def length
+        @content_length ||= head.content_length
+        return @content_length
+      end
+
+      def read(buf_size = 524288)
+        buf = ""
+        while (buf.bytesize < buf_size.to_i) && @fiber.alive?
+          _chunk = @fiber.resume
+          buf << _chunk if _chunk.is_a? String
+        end
+        buf
+      end
+
+    end
+  end
+end

data/lib/youtube_it/request/video_upload.rb

@@ -45,6 +45,14 @@ class YouTubeIt
         @http_debugging = true
       end
 
+      def uri?(string)
+        uri = URI.parse(string)
+        %w( http https ).include?(uri.scheme)
+      rescue URI::BadURIError
+        false
+      rescue URI::InvalidURIError
+        false
+      end
       #
       # Upload "data" to youtube, where data is either an IO object or
       # raw file data.
@@ -71,7 +79,14 @@ class YouTubeIt
       # errors, containing the key and its error code.
       #
       # When the authentication credentials are incorrect, an AuthenticationError will be raised.
-      def upload(data, opts = {})
+      def upload(video_data, opts = {})
+
+        if video_data.is_a?(String) && uri?(video_data)
+          data = YouTubeIt::Upload::RemoteFile.new(video_data)
+        else
+          data = video_data
+        end
+
         @opts    = { :mime_type => 'video/mp4',
                      :title => '',
                      :description => '',
@@ -265,7 +280,7 @@ class YouTubeIt
       def videos(idxes_to_fetch)
         idxes_to_fetch.each_slice(50).map do |idxes|
           post = Nokogiri::XML <<-BATCH
-              <feed 
+              <feed
                 xmlns='http://www.w3.org/2005/Atom'
                 xmlns:media='http://search.yahoo.com/mrss/'
                 xmlns:batch='http://schemas.google.com/gdata/batch'
@@ -290,7 +305,7 @@ class YouTubeIt
           YouTubeIt::Parser::BatchVideoFeedParser.new(response).parse
         end.reduce({},:merge)
       end
-      
+
       def profiles(usernames_to_fetch)
         usernames_to_fetch.each_slice(50).map do |usernames|
           post = Nokogiri::XML <<-BATCH
@@ -740,7 +755,7 @@ class YouTubeIt
           end
           builder.use FaradayMiddleware::YoutubeAuthHeader, authorization_headers
           builder.use Faraday::Response::YouTubeIt
-          builder.adapter :excon
+          builder.adapter Faraday.default_adapter
         end
       end
     end

data/lib/youtube_it/version.rb

@@ -1,4 +1,4 @@
 class YouTubeIt
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 end
 

data/youtube_it.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("simple_oauth", ">= 0.1.5")
   s.add_runtime_dependency("faraday", "~> 0.8")
   s.add_runtime_dependency("builder", ">= 0")
-  s.add_runtime_dependency("excon", "~> 0.22.1")
+  s.add_runtime_dependency("webmock")
+  s.add_runtime_dependency("excon")
   s.add_runtime_dependency("json", "~> 1.8.0")
   s.files = Dir.glob("lib/**/*") + %w(README.rdoc youtube_it.gemspec)
 

metadata

@@ -2,7 +2,7 @@
 name: youtube_it
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors: 
   - kylejginavan
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-28 00:00:00 Z
+date: 2013-06-28 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: nokogiri
@@ -80,27 +80,38 @@ dependencies:
     type: :runtime
     version_requirements: *id006
   - !ruby/object:Gem::Dependency 
-    name: excon
+    name: webmock
     prerelease: false
     requirement: &id007 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ~>
+        - - ">="
           - !ruby/object:Gem::Version 
-            version: 0.22.1
+            version: "0"
     type: :runtime
     version_requirements: *id007
   - !ruby/object:Gem::Dependency 
-    name: json
+    name: excon
     prerelease: false
     requirement: &id008 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id008
+  - !ruby/object:Gem::Dependency 
+    name: json
+    prerelease: false
+    requirement: &id009 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: 1.8.0
     type: :runtime
-    version_requirements: *id008
+    version_requirements: *id009
 description: Upload, delete, update, comment on youtube videos all from one gem.
 email: 
   - kylejginavan@gmail.com
@@ -138,6 +149,7 @@ files:
   - lib/youtube_it/model/video.rb
   - lib/youtube_it/request/base_search.rb
   - lib/youtube_it/request/error.rb
+  - lib/youtube_it/request/remote_file.rb
   - lib/youtube_it/request/standard_search.rb
   - lib/youtube_it/request/user_search.rb
   - lib/youtube_it/request/video_search.rb