proteus_client 0.0.4 → 0.0.5

data/lib/proteus_client/proxy.rb

@@ -36,26 +36,26 @@ module ProteusClient
       { message: response.body }
     end
 
-    def create_video_allocation
-        video_allocation =
-          submit_request_and_parse_json(:post, '/video_allocations')
-        format_video_allocation(video_allocation)
+    def create_video_locations
+        video_locations =
+          submit_request_and_parse_json(:post, '/video_locations')
+        format_video_locations(video_locations)
     end
 
-    def create_video_allocations(count)
-        video_allocations =
-          submit_request_and_parse_json(:post, '/video_allocations',
+    def create_multiple_video_locations(count)
+        video_locations =
+          submit_request_and_parse_json(:post, '/video_locations',
                                         count: count)
-        video_allocations.map { |v| format_video_allocation(v) }
+        video_locations.map { |v| format_video_locations(v) }
     end
 
-    def create_video(video_allocation_id, type)
+    def create_video(video_locations_id, type)
       body = 
         submit_request_and_parse_json(:post, '/videos',
-                                      video_allocation_id: video_allocation_id,
+                                      video_locations_id: video_locations_id,
                                       type: type)
 
-      { video_id: body['_id'], url: body['allocation_url'] }
+      { video_id: body['_id'], url: body['locations_url'] }
     end
 
     def create_video_versions(video_id, settings = nil)
@@ -75,8 +75,8 @@ module ProteusClient
       submit_request_and_parse_json(:get_raw, "/videos", ids: video_ids)
     end
 
-    def get_video_allocation(video_allocation_id)
-      url = "/video_allocations/#{video_allocation_id}"
+    def get_video_locations(video_locations_id)
+      url = "/video_locations/#{video_locations_id}"
       submit_request_and_parse_json(:get, url)
     end
 
@@ -103,12 +103,11 @@ module ProteusClient
       end
     end
 
-    def format_video_allocation(video_allocation)
-      urls = { direct: video_allocation['url_direct'] ,
-               stream: video_allocation['url_stream'] ,
-               upload: video_allocation['url_upload'] }
+    def format_video_locations(video_locations)
+      urls = { direct: video_locations['url_direct'] ,
+               stream: video_locations['url_stream'] }
 
-      { video_allocation_id: video_allocation['_id'], urls: urls }
+      { video_locations_id: video_locations['_id'], urls: urls }
     end
 
   end

data/spec/proteus_client_spec.rb

@@ -36,35 +36,34 @@ describe ProteusClient::Proxy do
 
   end
 
-  context 'call to create_video_allocation'do
+  context 'call to create_video_locations'do
 
     before(:all) do
-      stub_create_video_allocation
-      @response = proteus_client.create_video_allocation()
+      stub_create_video_locations
+      @response = proteus_client.create_video_locations
     end
 
     it "returns a hash" do
       @response.class.should == Hash
     end
 
-    it "returns video_allocation_id" do
-      @response[:video_allocation_id].should == '4fe0f752831a9d08bb000010'
+    it "returns video_locations_id" do
+      @response[:video_locations_id].should == '4fe0f752831a9d08bb000010'
     end
 
     it "returns urls" do
       @response[:urls].should ==
         { direct: 'direct/4fe0f752831a9d08bb000010.flv',
-          stream: 'stream/4fe0f752831a9d08bb000010.flv',
-          upload: 'upload/4fe0f752831a9d08bb000010.flv' }
+          stream: 'stream/4fe0f752831a9d08bb000010.flv'}
     end
 
   end
 
-  context 'call to create_video_allocations' do
+  context 'call to create_multiple_video_locations' do
 
     before(:all) do
-      stub_create_video_allocations
-      @response = proteus_client.create_video_allocations(2)
+      stub_create_multiple_video_locations
+      @response = proteus_client.create_multiple_video_locations(2)
     end
 
     it "returns an array with two hashes" do
@@ -73,15 +72,14 @@ describe ProteusClient::Proxy do
       @response[0].class.should == Hash
     end
 
-    it "returns video_allocation_id" do
-      @response[0][:video_allocation_id].should == '4fe0f752831a9d08bb000010'
+    it "returns video_locations_id" do
+      @response[0][:video_locations_id].should == '4fe0f752831a9d08bb000010'
     end
 
     it "returns urls" do
       @response[0][:urls].should ==
           { direct: 'direct/4fe0f752831a9d08bb000010.flv',
-            stream: 'stream/4fe0f752831a9d08bb000010.flv',
-            upload: 'upload/4fe0f752831a9d08bb000010.flv' }
+            stream: 'stream/4fe0f752831a9d08bb000010.flv'}
     end
 
   end
@@ -183,14 +181,14 @@ describe ProteusClient::Proxy do
 
   end
 
-  context 'call to get_video_allocation' do
+  context 'call to get_video_locations' do
 
     context 'with valid arguments' do
 
       before(:all) do
-        stub_get_video_allocation
+        stub_get_video_locations
         @response = proteus_client.
-          get_video_allocation('4fe0f752831a9d08bb000010')
+          get_video_locations('4fe0f752831a9d08bb000010')
       end
 
       it "returns a hash" do
@@ -200,7 +198,6 @@ describe ProteusClient::Proxy do
       it "returns video with correct format" do
         @response['url_direct'].class.should == String
         @response['url_stream'].class.should == String
-        @response['url_upload'].class.should == String
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proteus_client
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json