vzaar 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee961de37f0ca79bd252a80bf63d69ab6d41994d
-  data.tar.gz: 275385b9a75f53c4acdc33a3736b02f1f99519b9
+  metadata.gz: 7ead17a9da83c804eed68c6c5216fcfc2a829a4b
+  data.tar.gz: 7e4937420e0b0d14218869924fb5c1427e85aff7
 SHA512:
-  metadata.gz: 1f4d43afdb2e7cf9aef7947244277aa62b201ad407b5423b37b26c91787e52843b6694e3992d8ffdc2c6683cdab083a877859dec873d438b9d086ae0e71571c2
-  data.tar.gz: e97db4ff70332307483033259593002c06cbc0cfa8651c1c85a3afb8a5b52eb6a7df3ee1da96af297e02bff0f4a9c8e2ad2a8be7dc085afbf51af726ff30fbbd
+  metadata.gz: ff7a580c3554b96b9b680e18416fa5af97b93636e214d487eaef344832d89ec2f639770674dc50340cb0ab087f1c2b2eec620a438332f5df25315cca73d1229d
+  data.tar.gz: c2400435c3e52772e60e09861a30b295a94cafa5dc271c0579ab1e011639e02bdaaebc85984b0050a1df99c410fd19c94cee893ddf10e243fd8ae2ccbf1a5a63

data/lib/vzaar/request/process_video.rb

@@ -9,73 +9,39 @@ module Vzaar
       private
 
       def json_body
-        h = {
-          "vzaar_api" =>  {
-            "video" =>  {
-              "guid" =>  options[:guid],
-              "title" =>  options[:title],
-              "description" =>  options[:description],
-              "profile" =>  options[:profile],
-              "transcoding" =>  options[:transcoding],
-              "replace_id" => options[:replace_id]
-            }
-          }
-        }.delete_if { |k,v| v.nil? }
-
-        if include_encoding_options?
-          return h.merge({ "encoding" => {
-                             "width" => options[:width],
-                             "bitrate" => options[:bitrate]
-                           }
-                         })
-        end
-        h
-      end
-
-      def include_encoding_options?
-        options[:profile] == 6 && options[:width] && options[:bitrate]
+        get_opts.to_json
       end
 
       def xml_body
         request_xml = %{
           <?xml version="1.0" encoding="UTF-8"?>
-          <vzaar-api>
-            <video>
-              <guid>#{options[:guid]}</guid>
-              <title>#{options[:title]}</title>
-              <description>#{options[:description]}</description>
-              <profile>#{options[:profile]}</profile>
+          #{hash_to_xml(get_opts)}
         }
 
-        if !options[:transcoding].nil?
-          request_xml += %{
-              <transcoding>#{options[:transcoding]}</transcoding>
-          }
-        end
+        request_xml
+      end
 
-        if options[:replace_id]
-          request_xml += %{
-              <replace_id>#{options[:replace_id]}</replace_id>
-          }
-        end
+      def get_opts
+        raise Vzaar::Error, "Guid required to process video." unless options[:guid]
+
+        h = options.dup.delete_if { |k,v| v.nil? }
 
         if include_encoding_options?
-          request_xml += %{
-              <encoding>
-                <width>#{options[:width]}</width>
-                <bitrate>#{options[:bitrate]}</bitrate>
-              </encoding>
-          }
+          width = h.delete(:width)
+          bitrate = h.delete(:bitrate)
+
+          h[:encoding] = {width: width, bitrate: bitrate}
         end
 
-        request_xml += %{
-            </video>
-          </vzaar-api>
+        { vzaar_api: {
+            video: h
+          } 
         }
-
-        request_xml
       end
 
+      def include_encoding_options?
+        options[:profile] == 6 && options[:width] && options[:bitrate]
+      end
     end
   end
 end

data/lib/vzaar/version.rb

@@ -1,3 +1,3 @@
 module Vzaar
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/spec/vzaar/request/process_video.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+require './lib/vzaar/request/process_video'
+
+describe Vzaar::Request::ProcessVideo do
+  subject { described_class.new nil, opts }
+
+  describe "#get_opts" do
+    context "when options received are missing guid" do
+      let(:opts) { {} }
+
+      it "should raise an exception" do
+        expect { subject.send(:get_opts) }.to raise_error Vzaar::Error, "Guid required to process video."
+      end
+    end
+
+    shared_examples "options have the guid" do
+      it "should format the hash" do
+        expect(subject.send(:get_opts)).to eq(expected_opts)
+      end
+    end
+
+    context "when options received contain the guid" do
+      let(:opts) { { guid: "testguid", title: "sometitle" } }
+      let(:expected_opts) { { vzaar_api: { video: opts } } }
+
+      it_behaves_like "options have the guid"
+    end
+
+    context "when options have guid and encoding information" do
+      let(:opts) { { guid: "testguid", title: "sometitle", profile: 6, width: 10, bitrate: 20 } }
+      let(:expected_opts) { { vzaar_api: { video: { guid: "testguid", title: "sometitle", profile: 6, encoding: { width: 10, bitrate: 20 } } } } }
+
+      it_behaves_like "options have the guid"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vzaar
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Ed James
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -267,6 +267,7 @@ files:
 - spec/vzaar/api_xml_spec.rb
 - spec/vzaar/connection_spec.rb
 - spec/vzaar/request/base_spec.rb
+- spec/vzaar/request/process_video.rb
 - spec/vzaar/request/url_spec.rb
 - spec/vzaar/resources/account_type_spec.rb
 - spec/vzaar/resources/signature_spec.rb
@@ -296,7 +297,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: vzaar-1.2.3
+summary: vzaar-1.2.4
 test_files:
 - spec/fixtures/vcr_cassettes/account_type-fail.yml
 - spec/fixtures/vcr_cassettes/account_type-success.yml
@@ -340,6 +341,7 @@ test_files:
 - spec/vzaar/api_xml_spec.rb
 - spec/vzaar/connection_spec.rb
 - spec/vzaar/request/base_spec.rb
+- spec/vzaar/request/process_video.rb
 - spec/vzaar/request/url_spec.rb
 - spec/vzaar/resources/account_type_spec.rb
 - spec/vzaar/resources/signature_spec.rb