vzaar 1.4.1 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e149cb5a25c313d942932a742e4730b7e1123ee
-  data.tar.gz: 0e0ffebfdba59fb4365bbc97b640d5753c56e3a8
+  metadata.gz: daaa5abc46d7d81600d16d5fef1cfee198ccd49c
+  data.tar.gz: a4bf4aaf7e2d86a9229962b608f9d0326c2b3be6
 SHA512:
-  metadata.gz: f2f2bfe487a22452b22cdc27629e127d5d44ae60363a5c7756f9c70049cb38da39ee6bf0bc30b0696469992fddd64063b54e16f69b10d051331b8fa6d1bf85f1
-  data.tar.gz: 345eca563b521c5c6d1ef85fdedeee24d6946d252bfee47c8a5bd55741ccd4f8699e84009f050631e0eecfbcbac1bf95cfb3d8c837da06d4a43a5b0b1b5634f9
+  metadata.gz: e1abe62fae5216f2752484e8340f33bf42860292f38e349954040fd08fb9986c3a4e18ee930feb1e288ade058e7a465ec13a402c1eecf68f3101c989f04a38e4
+  data.tar.gz: 7b7091697a815c4869a37a3709665dea6f2204b4528e2bdf5532e1a697d138c8270f39d8dee838644d825f4d886d3947c32b2e6a070fc61065eb236f0af9930d

data/.gitignore

@@ -26,3 +26,4 @@ test.rb
 .gemtags
 api_envs.yml
 .DS_Store
+spec/support/vid2.mov

data/ChangeLog

@@ -0,0 +1,12 @@
+2015-02-16 JC <jozef@vzaar.com>
+
+  * private and seo_url params added to api#edit_video
+  * API specs improved for edit_video/json
+
+2015-01-21 JC <jozef@vzaar.com>
+
+  * API specs added for edit/delete http verbs
+
+2015-01-14 JC <jozef@vzaar.com>
+
+	* changelog added

data/README.md

@@ -55,7 +55,7 @@ api.video_details(video_id, authenticated: true)
 
 Fetching videos for a given user:
 ```ruby
-api.video_details("user login", options)
+api.video_list("user login", options)
 ```
 
 Fetching videos for authenticated user (authentication required):

data/examples/delete_video_spec.rb

@@ -2,48 +2,116 @@ require_relative './spec_helper'
 
 describe "Delete Video" do
   vid_id = nil
+  file_path = "./spec/support/video.mov"
+  desc = "Delete Video"
 
-  before(:all) do
-    file_path = "./spec/support/video.mov"
-    desc = "Delete Video"
-    @api = _api(login: user1["login"],
-               application_token: user1["rw_token"])
+  describe "POST verb" 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
+    end
 
-    @title = "api-test-#{rand_str}"
+    context "when there is no method=delete param" do
+      describe "xml" 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
 
-    res = @api.upload_video(path: file_path, title: @title, description: desc)
-    vid_id = res.id
-  end
+      describe "json" 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
+    end
+
+    context "when method=delete exists in post body" do
+      describe "xml" do
+        specify do
+          opts = { video_id: @vid_id, http_verb: :post}
+          req = Vzaar::Request::DeleteVideo.new(@api.conn, opts)
 
-  context "when user is unauthenticated" do
-    it_behaves_like "Unauthenticated", -> (api) do
-      api.delete_video(vid_id)
+          def req.xml_body
+            '<?xml version="1.0" encoding="UTF-8"?><vzaar-api><_method>delete</_method></vzaar-api>'
+          end
+          res = req.execute
+          expect(res.http_status_code).to eq(200)
+        end
+      end
+
+      describe "json" do
+        specify do
+          title = "api-test-#{rand_str}"
+          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)
+
+          def req.json_body
+            { "vzaar-api" => { "_method" => "delete" } }
+          end
+
+          res = req.execute
+          expect(res["title"]).to eq(title)
+        end
+      end
     end
+
   end
 
-  context "Authenticated User" do
-    context "different account" do
-      specify do
-        api = _api(login: user2["login"],
-                   application_token: user2["rw_token"])
-        expect do
-          api.delete_video(vid_id)
-        end.to raise_error(Vzaar::Error, "Protected Resource")
+  describe "DELETE verb" 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
+    end
+
+    context "when user is unauthenticated" do
+      it_behaves_like "Unauthenticated", -> (api) do
+        api.delete_video(vid_id)
       end
     end
 
-    context "RW token" do
-      before(:all) do
-        @res = @api.delete_video(vid_id)
+    context "Authenticated User" do
+      context "different account" do
+        specify do
+          api = _api(login: user2["login"],
+                     application_token: user2["rw_token"])
+          expect do
+            api.delete_video(vid_id)
+          end.to raise_error(Vzaar::Error, "Protected Resource")
+        end
       end
 
-      specify { expect(@res.http_status_code).to eq 200 }
-      specify { expect(@res.title).to eq(@title) }
-    end
+      context "RW token" do
+        before(:all) do
+          @res = @api.delete_video(vid_id)
+        end
 
-    context "RO token" do
-      it_behaves_like "RO only", user1["login"], user1["ro_token"], -> (api) do
-        api.delete_video(vid_id)
+        specify { expect(@res.http_status_code).to eq 200 }
+        specify { expect(@res.title).to eq(@title) }
+      end
+
+      context "RO token" do
+        it_behaves_like "RO only", user1["login"], user1["ro_token"], -> (api) do
+          api.delete_video(vid_id)
+        end
       end
     end
   end

data/examples/edit_video_spec.rb

@@ -1,6 +1,8 @@
 require_relative './spec_helper'
 
 describe "Edit Video" do
+  file_path = "./spec/support/video.mov"
+
   context "when user is unauthenticated" do
     it_behaves_like "Unauthenticated", -> (api) do
       api.edit_video(test_video_id("user1"), title: "foo")
@@ -8,42 +10,117 @@ describe "Edit Video" do
   end
 
   context "Authenticated User" do
-    context "different account" do
-      specify do
-        api = _api(login: user2["login"],
-                   application_token: user2["rw_token"])
-
-        expect do
-          api.edit_video(test_video_id("user1"))
-        end.to raise_error(Vzaar::Error, "Moved Temporarily")
-      end
-    end
-
-    context "RW token" do
+    describe "POST verb" do
       before(:all) do
         @api = _api(login: user1["login"],
                     application_token: user1["rw_token"])
+        @vid_id = test_video_id("user1")
       end
 
-      describe "updating params" do
-        before(:all) do
-          @title = rand_str()
-          @desc = rand_str()
-          @res = @api.edit_video(test_video_id("user1"),
-                                 title: @title,
-                                 description: @desc)
+      context "when there is no method=put param" do
+        describe "xml" do
+          specify do
+            opts = { video_id: @vid_id, http_verb: :post }
+            req = Vzaar::Request::EditVideo.new(@api.conn, opts)
+
+            expect { req.execute }.to raise_error(Vzaar::Error)
+          end
         end
+      end
+
+      context "when method=put exists in post body" do
+        describe "xml" do
+          specify do
+            opts = { video_id: @vid_id, http_verb: :post}
+            req = Vzaar::Request::EditVideo.new(@api.conn, opts)
 
-        it_behaves_like "200 OK"
+            def req.xml_body
+              <<-XML
+                <?xml version="1.0" encoding="UTF-8"?>
+                  <vzaar-api>
+                    <_method>put</_method>
+                    <video>
+                      <title>woof</title>
+                    </video>
+                  </vzaar-api>
+                XML
+            end
 
-        specify { expect(@res.title).to eq(@title) }
-        specify { expect(@res.description).to eq(@desc) }
+            res = req.execute
+            expect(res.http_status_code).to eq(200)
+          end
+        end
       end
     end
 
-    context "RO token" do
-      it_behaves_like "RO only", user1["login"], user1["ro_token"], -> (api) do
-        api.edit_video(test_video_id("user1"), title: "woof")
+    describe "PUT verb" do
+      context "different account" do
+
+        describe "xml" do
+          specify do
+            api = _api(login: user2["login"],
+                       application_token: user2["rw_token"])
+
+            expect do
+              api.edit_video(test_video_id("user1"))
+            end.to raise_error(Vzaar::Error, "Protected Resource")
+          end
+        end
+
+        describe "json" do
+          specify do
+            api = _api(login: user2["login"],
+                       application_token: user2["rw_token"])
+
+            expect do
+              api.edit_video(test_video_id("user1"), format: "json")
+            end.to raise_error(Vzaar::Error, "Protected Resource")
+          end
+        end
+      end
+
+      context "RW token" do
+        before(:all) do
+          @api = _api(login: user1["login"],
+                      application_token: user1["rw_token"])
+        end
+
+        describe "updating params" do
+
+          describe "xml" do
+            before(:all) do
+              @title = rand_str()
+              @desc = rand_str()
+              @res = @api.edit_video(test_video_id("user1"),
+                                     title: @title,
+                                     description: @desc)
+            end
+
+            it_behaves_like "200 OK"
+            specify { expect(@res.title).to eq(@title) }
+            specify { expect(@res.description).to eq(@desc) }
+          end
+        end
+
+        describe "json" do
+          before(:all) do
+            @title = rand_str()
+            @desc = rand_str()
+            @res = @api.edit_video(test_video_id("user1"),
+                                   title: @title,
+                                   description: @desc,
+                                   format: "json")
+          end
+
+          specify { expect(@res["oembed"]["title"]).to eq(@title) }
+          specify { expect(@res["oembed"]["description"]).to eq(@desc) }
+        end
+      end
+
+      context "RO token" do
+        it_behaves_like "RO only", user1["login"], user1["ro_token"], -> (api) do
+          api.edit_video(test_video_id("user1"), title: "woof")
+        end
       end
     end
   end

data/examples/upload_video_spec.rb

@@ -14,11 +14,18 @@ describe "Upload Video" do
                        application_token: user1["rw_token"])
 
             title = "api-test-#{rand_str}"
-            @res = api.upload_video(path: file_path, title: title, description: desc)
+            @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
         end
 
         describe "json" do
@@ -28,6 +35,9 @@ describe "Upload Video" do
 
             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]+$/) }
@@ -61,6 +71,9 @@ describe "Upload Video" do
 
         title = "api-test-#{rand_str}"
         @res = api.upload_video(url: file_url, title: title, description: desc)
+
+        # cleanup
+        api.delete_video(@res.id)
       end
 
       specify { expect(@res.http_status_code).to eq 200 }

data/examples/video_details_spec.rb

@@ -1,36 +1,49 @@
 require_relative './spec_helper'
 
 describe "Video Details" do
-  context "Fully Protected API" do
-    it_behaves_like "Unauthenticated", -> (api) do
-      api.video_details(test_video_id("user1"))
-    end
-  end
-
-  context "Public API" do
-    before(:all) do
-      api = unauthenticated_api
-      @res = api.video_details(test_video_id("user_with_public_api"))
+  describe "Authenticated" 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
+        api.video_details(test_video_id("user1"))
+      end
+    end
 
-  context "Protected API with access for public videos" do
-    scope = api_envs[env]["user_with_public_videos_access_only"]
-
-    context "when video is public" do
-      before do
+    context "Public API" do
+      before(:all) do
         api = unauthenticated_api
-        @res = api.video_details(scope["test_public_video_id"])
+        @res = api.video_details(test_video_id("user_with_public_api"))
       end
 
       it_behaves_like "200 OK"
     end
 
-    context "when video is private" do
-      it_behaves_like "Unauthenticated", -> (api) do
-        api.video_details(scope["test_video_id"])
+    context "Protected API with access for public videos" do
+      scope = api_envs[env]["user_with_public_videos_access_only"]
+
+      context "when video is public" do
+        before do
+          api = unauthenticated_api
+          @res = api.video_details(scope["test_public_video_id"])
+        end
+
+        it_behaves_like "200 OK"
+      end
+
+      context "when video is private" do
+        it_behaves_like "Unauthenticated", -> (api) do
+          api.video_details(scope["test_video_id"])
+        end
       end
     end
   end

data/examples/video_list_spec.rb

@@ -1,7 +1,20 @@
 require_relative './spec_helper'
 
 describe "Video List" do
-  context "when user is unauthenticated" do
+  describe "authenticated" do
+    describe "labels" 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
         before(:all) do

data/lib/vzaar/request/base.rb

@@ -7,7 +7,8 @@ module Vzaar
         [:authenticated, :http_verb].each do |method_name|
           define_method(method_name) do |val|
             define_method(method_name) do
-              val.nil? ? self.options[method_name] : val
+              param = self.options[method_name]
+              blank?(param) ? val : param
             end
           end
         end

data/lib/vzaar/request/edit_video.rb

@@ -5,16 +5,30 @@ module Vzaar
       http_verb :put
       resource "Video"
 
+      # JC: duplicated, refactor
+      def json_body
+        get_opts.to_json
+      end
+
       def xml_body
-        <<-XML
+        request_xml = %{
           <?xml version="1.0" encoding="UTF-8"?>
-          <vzaar-api>
-            <video>
-              <title>#{options[:title]}</title>
-              <description>#{options[:description]}</description >
-            </video>
-          </vzaar-api>
-        XML
+          #{hash_to_xml(get_opts)}
+        }
+
+        request_xml
+      end
+
+      def get_opts
+        { "vzaar-api" => {
+            "video" => {
+              "title" => options[:title],
+              "seo_url" => options[:seo_url],
+              "description" => options[:description],
+              "private" => options[:private]
+            }
+          }
+        }
       end
     end
   end

data/lib/vzaar/request/process_video.rb

@@ -35,7 +35,7 @@ module Vzaar
 
         { vzaar_api: {
             video: h
-          } 
+          }
         }
       end
 

data/lib/vzaar/version.rb

@@ -1,3 +1,3 @@
 module Vzaar
-  VERSION = "1.4.1"
+  VERSION = "1.4.4"
 end

data/spec/vzaar/request/base_spec.rb

@@ -16,16 +16,18 @@ describe Vzaar::Request::Base do
       let(:authenticated?) { true }
 
       before do
-        class TestClass < Vzaar::Request::Base; end
+        class TestClass < Vzaar::Request::Base
+          authenticated false
+        end
       end
 
       it "overwites setting with param from options" do
-        expect(subject.authenticated).to eq(opts[:authenticated])
+        expect(subject.authenticated).to eq(authenticated?)
       end
     end
 
     context "when setting is defined within the class" do
-      let(:authenticated?) { false }
+      let(:opts) { {} }
 
       before do
         class TestClass < Vzaar::Request::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vzaar
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.4
 platform: ruby
 authors:
 - Ed James
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -178,6 +178,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- ChangeLog
 - Gemfile
 - Guardfile
 - LICENSE
@@ -315,7 +316,7 @@ rubyforge_project:
 rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
-summary: vzaar-1.4.1
+summary: vzaar-1.4.4
 test_files:
 - spec/fixtures/vcr_cassettes/account_type-fail.yml
 - spec/fixtures/vcr_cassettes/account_type-success.yml