vzaar 1.5.3 → 1.6.0

data/spec/vzaar/api_xml_spec.rb

@@ -283,10 +283,11 @@ module Vzaar
 
     describe "#signature" do
       context "with default options" do
-        let(:signature_options) { {} }
+        let(:signature_options) { { path: 'spec/support/video.mp4' } }
+
         it "returns a signature" do
           VCR.use_cassette("signature-default") do
-            signature = subject.signature
+            signature = subject.signature signature_options
             expect(signature.https).to be_falsey
           end
         end
@@ -295,6 +296,7 @@ module Vzaar
       context "with custom options" do
         let(:signature_options) do
           {
+            path: 'spec/support/video.mp4',
             success_action_redirect: 'example.com',
             include_metadata: true,
             flash: false
@@ -308,32 +310,56 @@ module Vzaar
           end
         end
       end
+
+      context "with no options" do
+        it "raises an error" do
+          expect{ subject.signature }.
+            to raise_error(Vzaar::Error,
+            'Path or url parameter required to generate signature.')
+        end
+      end
     end
 
     describe "#upload_video" do
-      let(:expected_video_id) { '1407683' }
-      let(:path) { './spec/support/video.mp4' }
       let(:upload_options) do
         { title: 'title', description: 'desc', profile: '2', path: path }
       end
 
-      it "uploads the video, starts processing and returns the video id" do
-        VCR.use_cassette('upload_video-success') do
-          video = subject.upload_video(upload_options)
-          expect(video.id).to eq(expected_video_id.to_i)
+      context 'when video is too small for multipart upload' do
+        let(:expected_video_id) { '6337328' }
+        let(:path) { './spec/support/video.mp4' }
+
+        it "uploads the video, starts processing and returns the video id" do
+          VCR.use_cassette('upload_video-success') do
+            video = subject.upload_video(upload_options)
+            expect(video.id).to eq(expected_video_id.to_i)
+          end
+        end
+      end
+
+      context 'when video is big enough for multipart upload' do
+        let(:expected_video_id) { '6337327' }
+        let(:path) { './spec/support/video-6mb.mp4' }
+
+        it "uploads the video, starts processing and returns the video id" do
+          VCR.use_cassette('upload_video-multipart-success') do
+            video = subject.upload_video(upload_options)
+            expect(video.id).to eq(expected_video_id.to_i)
+          end
         end
       end
     end
 
     describe "#process_video" do
-      let(:expected_video_id) { '1407672' }
+      let(:expected_video_id) { '6337329' }
 
       let(:process_options) do
         {
-          guid: 'vze7355b904a904737ab0e9582045c78ff',
+          guid: 'vz37d1756fd5df47b4a10f0a622c282aed',
           title: 'new video',
           description: 'a very long description',
-          profile: '2'
+          profile: '2',
+          chunks: 2
         }
       end
 

data/spec/vzaar/uploader_spec.rb

@@ -14,7 +14,8 @@ module Vzaar
     subject { described_class.new(conn, signature, opts) }
 
     describe "#upload" do
-      let(:uploader) { double }
+      let(:uploader) { double upload: result }
+      let(:result) { { success: true } }
 
       describe "standard upload directly to s3" do
         let(:url) { nil }
@@ -22,8 +23,6 @@ module Vzaar
         specify do
           allow(Uploaders::S3).to receive(:new)
             .with(opts[:path], signature) { uploader }
-
-          allow(uploader).to receive(:upload)
           subject.upload
         end
       end

data/spec/vzaar/uploaders/s3_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+module Vzaar
+  describe Uploaders::S3 do
+
+    subject { described_class.new path, signature }
+
+    let(:path) { './spec/support/video.mov' }
+    let(:signature) { double chunk_size: chunk_size }
+
+    describe '#upload' do
+      context 'and chunk_size is nil' do
+        let(:chunk_size) { nil }
+
+        it 'performs a single part upload' do
+          expect(subject).to receive(:single_part_upload)
+          subject.upload
+        end
+      end
+
+      context 'and chunk_size is blank' do
+        let(:chunk_size) { '' }
+
+        it 'performs a single part upload' do
+          expect(subject).to receive(:single_part_upload)
+          subject.upload
+        end
+      end
+
+      context 'and chunk_size is present' do
+        let(:chunk_size) { '32mb' }
+
+        it 'performs a single part upload' do
+          expect(subject).to receive(:multipart_upload)
+          subject.upload
+        end
+      end
+    end
+  end
+end

data/vzaar.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'nokogiri', '~> 1.6'
-  s.add_dependency 'httpclient', '~> 2.3'
+  s.add_dependency 'httpclient', '~> 2.7'
   s.add_dependency 'oauth', '~> 0.4'
 
   s.add_development_dependency 'bundler', '~> 1.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vzaar
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Ed James
@@ -9,160 +9,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
 description: A Ruby gem for the vzaar API
@@ -173,11 +173,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - ChangeLog
 - Gemfile
 - Guardfile
@@ -257,6 +257,7 @@ files:
 - spec/fixtures/vcr_cassettes/process_video-default.yml
 - spec/fixtures/vcr_cassettes/signature-default.yml
 - spec/fixtures/vcr_cassettes/signature-with-options.yml
+- spec/fixtures/vcr_cassettes/upload_video-multipart-success.yml
 - spec/fixtures/vcr_cassettes/upload_video-success.yml
 - spec/fixtures/vcr_cassettes/user_details-authenticated-fail.yml
 - spec/fixtures/vcr_cassettes/user_details-authenticated-success.yml
@@ -280,6 +281,7 @@ files:
 - spec/support/cfx.jpeg
 - spec/support/cfx.png
 - spec/support/pic.jpg
+- spec/support/video-6mb.mp4
 - spec/support/video.mov
 - spec/support/video.mp4
 - spec/vzaar/api_xml_spec.rb
@@ -291,6 +293,7 @@ files:
 - spec/vzaar/resources/signature_spec.rb
 - spec/vzaar/resources/video_spec.rb
 - spec/vzaar/uploader_spec.rb
+- spec/vzaar/uploaders/s3_spec.rb
 - spec/vzaar_spec.rb
 - vzaar.gemspec
 homepage: http://vzaar.com
@@ -303,20 +306,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: vzaar-1.5.3
+summary: vzaar-1.6.0
 test_files:
 - spec/fixtures/vcr_cassettes/account_type-fail.yml
 - spec/fixtures/vcr_cassettes/account_type-success.yml
@@ -334,6 +337,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/process_video-default.yml
 - spec/fixtures/vcr_cassettes/signature-default.yml
 - spec/fixtures/vcr_cassettes/signature-with-options.yml
+- spec/fixtures/vcr_cassettes/upload_video-multipart-success.yml
 - spec/fixtures/vcr_cassettes/upload_video-success.yml
 - spec/fixtures/vcr_cassettes/user_details-authenticated-fail.yml
 - spec/fixtures/vcr_cassettes/user_details-authenticated-success.yml
@@ -357,6 +361,7 @@ test_files:
 - spec/support/cfx.jpeg
 - spec/support/cfx.png
 - spec/support/pic.jpg
+- spec/support/video-6mb.mp4
 - spec/support/video.mov
 - spec/support/video.mp4
 - spec/vzaar/api_xml_spec.rb
@@ -368,4 +373,5 @@ test_files:
 - spec/vzaar/resources/signature_spec.rb
 - spec/vzaar/resources/video_spec.rb
 - spec/vzaar/uploader_spec.rb
+- spec/vzaar/uploaders/s3_spec.rb
 - spec/vzaar_spec.rb