vzaar 1.5.3 → 1.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWFiMzNjOTQxM2I2M2YzZDNiYWIxNTRiNzA0YTk5ZDcwNzk3ZmNlZQ==
-  data.tar.gz: !binary |-
-    OWM0OThiZjlhYWMwOWE3ZjI1NWI2ZWY1YjBjZTZkNmI5NjhhM2VkMA==
+SHA1:
+  metadata.gz: c1f51bc51dfb2661ea560ab755d5d259ecf5bc9a
+  data.tar.gz: af11b53d12bd5a8e36e2ad787c0f14de5a7a1307
 SHA512:
-  metadata.gz: !binary |-
-    Y2I5YTM4MmMxMGE5NzQyOTBiOTkzZGVlNDc4ZWExZDEzNWVmMDRkY2VlYWYx
-    ZTczOGY1YzcxNWRiYjkyNGQwMWYzZmRhODk2Y2I2MjQ1Mjc4YjUwNDY5MTM1
-    MDc2MThjYzQ0MTM1OTMxM2IyYjBjYzlkOTc1YWYzM2RmZGU1M2U=
-  data.tar.gz: !binary |-
-    MTQ4ZGNmYzhjZjUyOGFlMmM1YWIyOTY3NDkyNDY3YjRhNTI3MzU0NzNmY2Jh
-    NmFiZDQ3MWFlMWUyNDczMmQyOWQ0ZWU3YTZhZmI3OWM5ODhjM2ZmMTYyNjBk
-    NWQ1MGNhYmZkM2E2YzJkNGYwOWYxZTZhMjc4OWFhYTU1YWMwZDQ=
+  metadata.gz: 7850014b6cd0aa53d6fe9ddfc94fb919a90ef738bb7f76d1936909a65f74e044a899a34261c5c9279322cd4fa0a5e91a679cbbee58ebe16c91b613f698a7236f
+  data.tar.gz: faa4b22a4362cc33fa6a6e23d49cf969a40fa64ab9102aa1e17d734b4ef20bd17c34af63d01dee74744b2c59b138a46d4616ca7989016660b2d51e535cbd9bcc

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.3.0

data/.travis.yml

@@ -1,4 +1,4 @@
 rvm:
-  - 1.9.3
-  - 2.1.6
-  - 2.2.2
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0

data/ChangeLog

@@ -1,11 +1,19 @@
-[1.5.2] 2015-03-30 JC <jozef@vzaar.com>	
+[1.6.0] 2015-07-07 EJ <ed@vzaar.com>
+
+  * support for chunked uploads
+
+[1.5.3] 2015-07-07 Raz Itzhakian <raz.itzhakian@fiverr.com>
+
+  * timeout option added for API calls
+
+[1.5.2] 2015-03-30 JC <jozef@vzaar.com>
 
   * call CGI.escape against link_upload/url and video/seo_url params
 
-[1.5.1] 2015-03-27 JC <jozef@vzaar.com>	
+[1.5.1] 2015-03-27 JC <jozef@vzaar.com>
+
+  * escaping special chars from xml added
 
-  * escaping special chars from xml added	
-	
 2015-02-19 JC <jozef@vzaar.com>
 
   * renditions added to Vzaar::Resource::Video

data/Gemfile

@@ -10,6 +10,7 @@ gem 'rake'
 
 group :development, :test do
   gem 'pry'
+  gem 'pry-nav'
   gem 'fuubar', '2.0.0.rc1'
   gem 'growl'
   gem 'guard-rspec'

data/Guardfile

@@ -1,7 +1,54 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec, all_after_pass: true, all_on_start: true do
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features)
+
+## Uncomment to clear the screen before every task
+# clearing :on
+
+## Guard internally checks for changes in the Guardfile and exits.
+## If you want Guard to automatically start up again, run guard in a
+## shell loop, e.g.:
+##
+##  $ while bundle exec guard; do echo "Restarting Guard..."; done
+##
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "bundle exec rspec", all_on_start: true do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+  clearing :on
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/vzaar.rb$}) { "spec" }
   watch(%r{^lib/vzaar/(.+)\.rb$}) { "spec" }

data/examples/signature_spec.rb

@@ -3,63 +3,52 @@ require_relative './spec_helper'
 describe "Signature" do
   describe "signature" do
     context "when user is unauthenticated" do
-      it_behaves_like "Unauthenticated", ->(api) { api.signature }
+      it_behaves_like "Unauthenticated", ->(api) do
+        api.signature(path: './spec/support/video.mov')
+      end
     end
 
     context "with no :sucess_action_redirect" do
       it "should be successful" do
-        api = _api(login: user1["login"],
-                   application_token: user1["rw_token"])
-
-        expect(api.signature.http_status_code).to eq(200)
+        api = _api(login: user1["login"], application_token: user1["rw_token"])
+        signature = api.signature(path: './spec/support/video.mov')
+        expect(signature.http_status_code).to eq 200
       end
     end
 
     context "with unencoded :success_action_redirect" do
       it "should be successful" do
-        api = _api(login: user1["login"],
-                   application_token: user1["rw_token"])
-        expect(
-          api.signature(
-            :success_action_redirect => "http://test.com"
-          ).http_status_code
-        ).to eq(200)
+        api = _api(login: user1["login"], application_token: user1["rw_token"])
+        signature = api.signature(path: './spec/support/video.mov',
+          success_action_redirect: 'http://test.com')
+        expect(signature.http_status_code).to eq 200
       end
     end
 
     context "with URI encoded :success_action_redirect" do
       it "should be successful" do
-        api = _api(login: user1["login"],
-                   application_token: user1["rw_token"])
-        expect(
-          api.signature(
-            :success_action_redirect => CGI.escape("http://test.com")
-          ).http_status_code
-        ).to eq(200)
+        api = _api(login: user1["login"], application_token: user1["rw_token"])
+        signature = api.signature(path: './spec/support/video.mov',
+          success_action_redirect: CGI.escape("http://test.com"))
+        expect(signature.http_status_code).to eq 200
       end
     end
 
     context "encoded :success_action_redirect with qs parameters" do
       it "should be successful" do
-        api = _api(login: user1["login"],
-                   application_token: user1["rw_token"])
-        expect(
-          api.signature(
-            :success_action_redirect => CGI.escape("http://test.com?x=y")
-          ).http_status_code
-        ).to eq(200)
+        api = _api(login: user1["login"], application_token: user1["rw_token"])
+        signature = api.signature(path: './spec/support/video.mov',
+          success_action_redirect: CGI.escape("http://test.com?x=y"))
+        expect(signature.http_status_code).to eq 200
       end
     end
 
     context "with a :success_action_redirect with qs parameters" do
       it "should be successful" do
-        api = _api(login: user1["login"],
-                   application_token: user1["rw_token"])
-        expect(
-          api.signature(
-            :success_action_redirect => "http://test.com?x"
-          ).http_status_code
-        ).to eq(200)
+        api = _api(login: user1["login"], application_token: user1["rw_token"])
+        signature = api.signature(path: './spec/support/video.mov',
+          success_action_redirect: "http://test.com?x")
+        expect(signature.http_status_code).to eq 200
       end
     end
   end

data/examples/upload_video_spec.rb

@@ -8,40 +8,18 @@ describe "Upload Video" do
 
     context "Authenticated User" do
       context "RW token" do
-        describe "xml" do
-          before(:all) do
-            api = _api(login: user1["login"],
-                       application_token: user1["rw_token"])
+        before(:all) do
+          api = _api(login: user1["login"], application_token: user1["rw_token"])
 
-            title = "api-test-#{rand_str}"
-            @res = api.upload_video(path: file_path, title: title, description: desc, profile: "boom")
+          title = "api-test-#{rand_str}"
+          @res = api.upload_video(path: file_path, title: title, description: desc, profile: "boom")
 
-            # cleanup
-            api.delete_video(@res.id)
-          end
-
-          specify { expect(@res.http_status_code).to eq 201 }
-          specify { expect(@res.id.to_s).to match(/^[0-9]+$/) }
-
-          after(:all) do
-
-          end
+          # cleanup
+          api.delete_video(@res.id)
         end
 
-        describe "json" do
-          before(:all) do
-            api = _api(login: user1["login"],
-                       application_token: user1["rw_token"])
-
-            title = "api-test-#{rand_str}"
-            @res = api.upload_video(path: file_path, title: title, description: desc, format: :json)
-
-            # cleanup
-            api.delete_video(@res["id"])
-          end
-
-          specify { expect(@res["id"].to_s).to match(/^[0-9]+$/) }
-        end
+        specify { expect(@res.http_status_code).to eq 201 }
+        specify { expect(@res.id.to_s).to match(/^[0-9]+$/) }
       end
 
       context "RO token" do
@@ -58,16 +36,13 @@ describe "Upload Video" do
     end
   end
 
-
-
   context "Link uploads" do
     desc = "Upload Video/Link Uploads"
     file_url = "http://samples.mplayerhq.hu/MPEG-4/turn-on-off.mp4"
 
     context "Authenticated User" do
       before(:all) do
-        api = _api(login: user1["login"],
-                   application_token: user1["rw_token"])
+        api = _api(login: user1["login"], application_token: user1["rw_token"])
 
         title = "api-test-#{rand_str}"
         @res = api.upload_video(url: file_url, title: title, description: desc)

data/lib/vzaar/api.rb

@@ -39,6 +39,7 @@ module Vzaar
     end
 
     def signature(opts={})
+      opts.delete(:format)
       Request::Signature.new(conn, opts).execute
     end
 
@@ -51,14 +52,15 @@ module Vzaar
     end
 
     def upload_audio(opts={})
-      uploader = Uploader.new(conn, signature, opts)
+      uploader = Uploader.new(conn, signature(opts), opts)
       uploader.upload do |u|
         process_audio(u.processing_params)
       end
     end
 
     def upload_video(opts={})
-      uploader = Uploader.new(conn, signature, opts)
+      sig = signature(opts)
+      uploader = Uploader.new(conn, sig, opts)
       uploader.upload do |u|
         process_video(u.processing_params)
       end
@@ -76,12 +78,14 @@ module Vzaar
       Request::GenerateThumbnail.new(conn, opts.merge(video_id: video_id)).execute
     end
 
+    # TODO: remove
     def link_upload(url, opts={})
       sig = signature
       _opts = opts.merge({ guid: sig.guid, key: sig.key, url: url })
       Request::LinkUpload.new(conn, _opts).execute
     end
 
+    # TODO: remove
     def s3_upload(file_path)
       uploader = Uploader.new(conn, signature, path: file_path)
       uploader.upload

data/lib/vzaar/request/process_video.rb

@@ -1,7 +1,7 @@
 module Vzaar
   module Request
     class ProcessVideo < Base
-      endpoint '/api/videos'
+      endpoint '/api/v1.1/videos'
       authenticated true
       http_verb :post
       resource "ProcessedVideo"

data/lib/vzaar/request/signature.rb

@@ -1,15 +1,26 @@
 module Vzaar
   module Request
     class Signature < Base
-      endpoint "/api/videos/signature"
+      endpoint "/api/v1.1/videos/signature"
       authenticated true
       resource :signature
 
       private
 
+      def ensure_valid_params!
+        if !options.has_key?(:path) && !options.has_key?(:url)
+          raise Vzaar::Error, "Path or url parameter required to generate signature."
+        end
+      end
+
       def url_params
-        # JC: refactor it
-        _params = {}
+        ensure_valid_params!
+        _params = { multipart: 'true' }
+
+        if options[:path]
+          _params[:filename] = File.basename(options[:path])
+          _params[:filesize] = File::Stat.new(options[:path]).size
+        end
         if options[:success_action_redirect]
           _params[:success_action_redirect] = options[:success_action_redirect]
         end
@@ -19,6 +30,7 @@ module Vzaar
         if options[:flash_request]
           _params[:flash_request] = 'yes'
         end
+
         super.merge(_params)
       end
     end

data/lib/vzaar/resources/signature.rb

@@ -15,6 +15,8 @@ module Vzaar
       attribute :guid
       attribute :key
       attribute :bucket
+      attribute :upload_hostname
+      attribute :chunk_size
 
     end
   end

data/lib/vzaar/uploader.rb

@@ -5,16 +5,17 @@ module Vzaar
     attr_reader :guid
 
     def upload
-      begin
-        if link_upload?
-          link
-        else
-          success = s3.upload
-          yield(self) if block_given? && success
+      if link_upload?
+        link
+      else
+        result = s3.upload
+        if result[:success]
+          opts[:chunks] = result[:total_chunks]
+          yield(self) if block_given?
         end
-      rescue Exception => e
-        raise(Vzaar::Error, "Upload error: " + e.message)
       end
+    rescue Exception => e
+      raise(Vzaar::Error, "Upload error: " + e.message)
     end
 
     def processing_params

data/lib/vzaar/uploaders/s3.rb

@@ -4,28 +4,91 @@ module Vzaar
       SEND_TIMEOUT = 1800
 
       def upload
-        client = HTTPClient.new
-        client.send_timeout = SEND_TIMEOUT
-        begin
-          file = File.open(path)
-          res = client.post url, [
-            ['acl', signature.acl],
-            ['bucket', signature.bucket],
-            ['success_action_status', '201'],
-            ['policy', signature.policy],
-            ['AWSAccessKeyId', signature.access_key_id],
-            ['signature', signature.signature],
-            ['key', signature.key],
-            ['file', file]
-          ]
-        ensure
-          file.close if file
+        if signature.chunk_size.to_s.empty?
+          single_part_upload
+        else
+          multipart_upload
+        end
+      end
+
+      class VirtualFile < StringIO
+        attr_reader :path
+        def initialize(file, chunk_size)
+          @path = File.basename file.path
+          super file.read(chunk_size)
+        end
+      end
+
+      private
+
+      def single_part_upload
+        File.open(path, "r") do |file|
+          _headers = headers.dup
+          _headers['chunk'] = '0'
+          _headers['chunks'] = '0'
+          _headers['key'] = signature.key
+          _headers['file'] = file
+          res = http_client.post url, _headers
+          { success: res.status_code == 201 }
+        end
+      end
+
+      def file_size
+        @file_size ||= File.stat(path).size
+      end
+
+      def chunk_size_bytes
+        @chunk_size_bytes ||= signature.chunk_size.to_i * (1024 ** 2)
+      end
+
+      def total_chunks
+        @total_chunks ||= begin
+          val = file_size / chunk_size_bytes
+          val += 1 if (file_size % chunk_size_bytes) > 0
+          val
+        end
+      end
+
+      def multipart_upload
+        _headers = headers.dup
+        _headers['chunks'] = total_chunks
+
+        chunk = 0
+        File.open(path, "r") do |file|
+          until file.eof?
+            _headers['chunk'] = chunk
+            _headers['key'] = "#{signature.key}.#{chunk}"
+            _headers['file'] = VirtualFile.new(file, chunk_size_bytes)
+
+            res = http_client.post url, _headers
+            unless res.status_code == 201
+              return { success: false }
+            end
+            chunk += 1
+          end
+        end
+        { success: true, total_chunks: total_chunks }
+      end
+
+      def headers
+        @headers ||= {
+          'acl' => signature.acl,
+          'bucket' => signature.bucket,
+          'success_action_status' => '201',
+          'policy' => signature.policy,
+          'AWSAccessKeyId' => signature.access_key_id,
+          'signature' => signature.signature
+        }
+      end
+
+      def http_client
+        @http_client ||= begin
+          HTTPClient.new.tap { |c| c.send_timeout = SEND_TIMEOUT }
         end
-        res.status_code == 201
       end
 
       def url
-        "https://#{signature.bucket}.s3.amazonaws.com/"
+        signature.upload_hostname
       end
     end
   end