vzaar 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 1e2ef09a5076d11df5cdfd5bfd7b639ee45a4b47
-  data.tar.gz: 46e30e707950d88b0aef75d072c7d156bd98af56
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWFiMzNjOTQxM2I2M2YzZDNiYWIxNTRiNzA0YTk5ZDcwNzk3ZmNlZQ==
+  data.tar.gz: !binary |-
+    OWM0OThiZjlhYWMwOWE3ZjI1NWI2ZWY1YjBjZTZkNmI5NjhhM2VkMA==
 SHA512:
-  metadata.gz: e70d32b4d9741e7a1a88a3cbee50c630fccf3223842db6adb50f17afe28964eb21b10924e148b0791a87a426f149822e03b014ffde9ba6bb599b0a0c73b45f18
-  data.tar.gz: 4ca12a6b6b56bfebc991b5ae9ed491b2a84ccdc3cee7e66c13e104988919f351b1fd4e81e78349039b186039e648a43e306f1de383400ae1b1116cd7c26c1e78
+  metadata.gz: !binary |-
+    Y2I5YTM4MmMxMGE5NzQyOTBiOTkzZGVlNDc4ZWExZDEzNWVmMDRkY2VlYWYx
+    ZTczOGY1YzcxNWRiYjkyNGQwMWYzZmRhODk2Y2I2MjQ1Mjc4YjUwNDY5MTM1
+    MDc2MThjYzQ0MTM1OTMxM2IyYjBjYzlkOTc1YWYzM2RmZGU1M2U=
+  data.tar.gz: !binary |-
+    MTQ4ZGNmYzhjZjUyOGFlMmM1YWIyOTY3NDkyNDY3YjRhNTI3MzU0NzNmY2Jh
+    NmFiZDQ3MWFlMWUyNDczMmQyOWQ0ZWU3YTZhZmI3OWM5ODhjM2ZmMTYyNjBk
+    NWQ1MGNhYmZkM2E2YzJkNGYwOWYxZTZhMjc4OWFhYTU1YWMwZDQ=

data/.travis.yml

@@ -1,3 +1,4 @@
 rvm:
   - 1.9.3
-  - 2.1.2
+  - 2.1.6
+  - 2.2.2

data/README.md

@@ -127,3 +127,7 @@ This version is not backwards compatible with any of the previous versions of vz
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+### License
+
+Released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/examples/add_subtitle_spec.rb

@@ -2,7 +2,7 @@ require_relative './spec_helper'
 
 describe "Add Subtitle" do
   context "when user is unauthenticated" do
-    it_behaves_like "Unauthenticated", -> (api) do
+    it_behaves_like "Unauthenticated", ->(api) do
       api.add_subtitle(test_video_id("user1"), body: "x", language: "en")
     end
   end
@@ -35,7 +35,7 @@ describe "Add Subtitle" do
 
 
     context "RO token" do
-      it_behaves_like "RO only", user1["login"], user1["ro_token"], -> (api) do
+      it_behaves_like "RO only", user1["login"], user1["ro_token"], ->(api) do
         api.add_subtitle(test_video_id("user1"), body: "SRT", language: "en")
       end
     end

data/examples/authentication_spec.rb

@@ -3,7 +3,7 @@ require_relative './spec_helper'
 describe "Authentication" do
   describe "whoami" do
     context "when user is unauthenticated" do
-      it_behaves_like "Unauthenticated", -> (api) { api.whoami }
+      it_behaves_like "Unauthenticated", ->(api) { api.whoami }
     end
 
     context "when auth success" do

data/examples/delete_video_spec.rb

@@ -9,7 +9,7 @@ describe "Delete Video" 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)
       @vid_id = res.id
@@ -20,7 +20,7 @@ describe "Delete Video" do
         specify do
           opts = { video_id: @vid_id, http_verb: :post}
           req = Vzaar::Request::DeleteVideo.new(@api.conn, opts)
-          
+
           expect { req.execute }.to raise_error(Vzaar::Error)
         end
       end
@@ -29,7 +29,7 @@ describe "Delete Video" do
         specify do
           opts = { video_id: @vid_id, http_verb: :post, format: :json}
           req = Vzaar::Request::DeleteVideo.new(@api.conn, opts)
-          
+
           expect { req.execute }.to raise_error(Vzaar::Error)
         end
       end
@@ -55,7 +55,7 @@ describe "Delete Video" do
           res = @api.upload_video(path: file_path, title: title, description: desc)
           vid_id = res.id
 
-          
+
           opts = { video_id: vid_id, http_verb: :post, format: :json}
           req = Vzaar::Request::DeleteVideo.new(@api.conn, opts)
 
@@ -83,7 +83,7 @@ describe "Delete Video" do
     end
 
     context "when user is unauthenticated" do
-      it_behaves_like "Unauthenticated", -> (api) do
+      it_behaves_like "Unauthenticated", ->(api) do
         api.delete_video(vid_id)
       end
     end
@@ -109,7 +109,7 @@ describe "Delete Video" do
       end
 
       context "RO token" do
-        it_behaves_like "RO only", user1["login"], user1["ro_token"], -> (api) do
+        it_behaves_like "RO only", user1["login"], user1["ro_token"], ->(api) do
           api.delete_video(vid_id)
         end
       end

data/examples/edit_video_spec.rb

@@ -4,7 +4,7 @@ describe "Edit Video" do
   file_path = "./spec/support/video.mov"
 
   context "when user is unauthenticated" do
-    it_behaves_like "Unauthenticated", -> (api) do
+    it_behaves_like "Unauthenticated", ->(api) do
       api.edit_video(test_video_id("user1"), title: "foo")
     end
   end
@@ -118,7 +118,7 @@ describe "Edit Video" do
       end
 
       context "RO token" do
-        it_behaves_like "RO only", user1["login"], user1["ro_token"], -> (api) do
+        it_behaves_like "RO only", user1["login"], user1["ro_token"], ->(api) do
           api.edit_video(test_video_id("user1"), title: "woof")
         end
       end

data/examples/generate_thumbnail_spec.rb

@@ -7,7 +7,7 @@ describe "Generate Thumbnail" do
   end
 
   context "when user is unauthenticated" do
-    it_behaves_like "Unauthenticated", -> (api) do
+    it_behaves_like "Unauthenticated", ->(api) do
       api.generate_thumbnail(test_video_id("user1"), time: 3)
     end
   end
@@ -35,14 +35,14 @@ describe "Generate Thumbnail" do
         it_behaves_like "422 Failure"
 
         specify do
-          expect(@res.errors.first["thumb_time"]).to eq("invalid integer")
+          expect(@res.errors.first["thumb_time"]).to eq("invalid decimal")
         end
       end
     end
 
 
     context "RO token" do
-      it_behaves_like "RO only", user1["login"], user1["ro_token"], -> (api) do
+      it_behaves_like "RO only", user1["login"], user1["ro_token"], ->(api) do
         api.generate_thumbnail(test_video_id("user1"), time: 3)
       end
     end

data/examples/signature_spec.rb

@@ -3,7 +3,7 @@ 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) { api.signature }
     end
 
     context "with no :sucess_action_redirect" do

data/examples/upload_audio_spec.rb

@@ -21,14 +21,14 @@ describe "Upload Audio" do
       end
 
       context "RO token" do
-        it_behaves_like "RO only", user1["login"], user1["ro_token"], -> (api) do
+        it_behaves_like "RO only", user1["login"], user1["ro_token"], ->(api) do
           api.upload_audio(path: file_path, description: desc, bitrate: 192)
         end
       end
     end
 
     context "when user is unauthenticated" do
-      it_behaves_like "Unauthenticated", -> (api) do
+      it_behaves_like "Unauthenticated", ->(api) do
         api.upload_audio(path: file_path, title: "woof", description: desc, bitrate: 192)
       end
     end

data/examples/upload_thumbnail_spec.rb

@@ -4,7 +4,7 @@ describe "Upload Thumbnail" do
   file_path = "./spec/support/pic.jpg"
 
   context "when user is unauthenticated" do
-    it_behaves_like "Unauthenticated", -> (api) do
+    it_behaves_like "Unauthenticated", ->(api) do
       api.upload_thumbnail(test_video_id("user1"), path: file_path)
     end
   end
@@ -26,7 +26,7 @@ describe "Upload Thumbnail" do
     end
 
     context "RO token" do
-      it_behaves_like "RO only", user1["login"], user1["ro_token"], -> (api) do
+      it_behaves_like "RO only", user1["login"], user1["ro_token"], ->(api) do
         api.upload_thumbnail(test_video_id("user1"), path: file_path)
       end
     end

data/examples/upload_video_spec.rb

@@ -45,14 +45,14 @@ describe "Upload Video" do
       end
 
       context "RO token" do
-        it_behaves_like "RO only", user1["login"], user1["ro_token"], -> (api) do
+        it_behaves_like "RO only", user1["login"], user1["ro_token"], ->(api) do
           api.upload_video(path: file_path, description: desc)
         end
       end
     end
 
     context "when user is unauthenticated" do
-      it_behaves_like "Unauthenticated", -> (api) do
+      it_behaves_like "Unauthenticated", ->(api) do
         api.upload_video(path: file_path, title: "woof", description: desc)
       end
     end
@@ -81,7 +81,7 @@ describe "Upload Video" do
     end
 
     context "when user is unauthenticated" do
-      it_behaves_like "Unauthenticated", -> (api) do
+      it_behaves_like "Unauthenticated", ->(api) do
         api.upload_video(url: file_url, title: "woof", description: desc)
       end
     end

data/examples/video_details_spec.rb

@@ -5,16 +5,16 @@ describe "Video Details" do
     before do
       api = _api(login: user1["login"],
                  application_token: user1["rw_token"])
-      
+
       @res = api.video_details(test_video_id("user1"), authenticated: true)
     end
 
     it_behaves_like "200 OK"
   end
-  
+
   describe "Unauthenticated" do
     context "Fully Protected API" do
-      it_behaves_like "Unauthenticated", -> (api) do
+      it_behaves_like "Unauthenticated", ->(api) do
         api.video_details(test_video_id("user1"))
       end
     end
@@ -41,7 +41,7 @@ describe "Video Details" do
       end
 
       context "when video is private" do
-        it_behaves_like "Unauthenticated", -> (api) do
+        it_behaves_like "Unauthenticated", ->(api) do
           api.video_details(scope["test_video_id"])
         end
       end

data/examples/video_list_spec.rb

@@ -6,14 +6,14 @@ describe "Video List" do
       before do
         api = _api(login: user1["login"],
                    application_token: user1["rw_token"])
-        
+
         @res = api.video_list(user1["login"], authenticated: true, params: { labels: "api,api2" })
       end
 
       specify { expect(@res.count).to eq(1) }
     end
   end
-  
+
   describe "Unauthenticated" do
     context "when Public API Feeds is enabled" do
       describe "params" do
@@ -47,7 +47,7 @@ describe "Video List" do
     end
 
     context "when Public API Feeds is disabled" do
-      it_behaves_like "Unauthenticated", -> (api) do
+      it_behaves_like "Unauthenticated", ->(api) do
         api.video_list(user1["login"])
       end
     end

data/lib/vzaar/connection.rb

@@ -10,6 +10,8 @@ module Vzaar
       @application_token = options[:application_token]
       @force_http = options[:force_http]
       @login = options[:login]
+      @timeout = options[:timeout]
+      @open_timeout = options[:open_timeout]
     end
 
     def using_connection(url, opts={}, &block)
@@ -47,7 +49,7 @@ module Vzaar
 
     def consumer(authorised = false)
       site = "#{protocol(authorised)}://#{server}"
-      c = OAuth::Consumer.new('', '', { :site => site })
+      c = OAuth::Consumer.new('', '', { :site => site, :timeout => @timeout, :open_timeout => @open_timeout })
       c.extend(OAuthExt::Multipart)
     end
 

data/lib/vzaar/version.rb

@@ -1,3 +1,3 @@
 module Vzaar
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vzaar
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Ed James
@@ -9,160 +9,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-07-07 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
 - !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,15 +173,14 @@ 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
-- LICENSE
 - README.md
 - Rakefile
 - examples/account_details_spec.rb
@@ -304,20 +303,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.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: vzaar-1.5.2
+summary: vzaar-1.5.3
 test_files:
 - spec/fixtures/vcr_cassettes/account_type-fail.yml
 - spec/fixtures/vcr_cassettes/account_type-success.yml

data/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2014 vzaar Ltd
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.