proteus_client 0.0.2 → 0.0.3

data/lib/proteus_client/proxy.rb

@@ -18,99 +18,101 @@ module ProteusClient
   class Proxy
 
     def initialize(options = {})
-      options   = merge_with_default_options(options)
-      @api_key  = options[:api_key]
-      @domain   = RestClient::Resource.new(options[:domain])
+      options = {
+        api_key: ProteusClient.config.api_key,
+        domain:  ProteusClient.config.domain
+      }.merge(options)
+
+      raise "APIKeyNotDefined" unless options[:api_key]
+      raise "DomainNotDefined" unless options[:domain]
+
+      @api_key = options[:api_key]
+      @domain  = RestClient::Resource.new(options[:domain])
     end
 
     def test_api
-      response = submit_request(:get,'/',{})
+      response = submit_request(:get, '/')
 
-      {message: response.body}
+      { message: response.body }
     end
 
-    def create_video_allocation(count=0,params={})
-      params = {count: count} if count > 0
-
-      body   = submit_request_and_parse_json(:post,'/video_allocations',params)
+    def create_video_allocation
+        video_allocation =
+          submit_request_and_parse_json(:post, '/video_allocations')
+        format_video_allocation(video_allocation)
+    end
 
-      return parse_video_allocation(body) if count==0
-      body.map { |e| parse_video_allocation(e) }
+    def create_video_allocations(count)
+        video_allocations =
+          submit_request_and_parse_json(:post, '/video_allocations',
+                                        count: count)
+        video_allocations.map { |v| format_video_allocation(v) }
     end
 
-    def create_video(video_allocation_id,type)
-      body = submit_request_and_parse_json(:post, '/videos',
-                                {video_allocation_id: video_allocation_id,
-                                type: type})
+    def create_video(video_allocation_id, type)
+      body = 
+        submit_request_and_parse_json(:post, '/videos',
+                                      video_allocation_id: video_allocation_id,
+                                      type: type)
 
-      {video_id: body['_id'],url: body['allocation_url'] }
+      { video_id: body['_id'], url: body['allocation_url'] }
     end
 
-    def create_video_versions(video_id,settings=nil)
-      params    = {}
-      params    = {version_settings: settings} unless settings.nil?
+    def create_video_versions(video_id, settings = nil)
+      params = {}
+      params[:version_settings] = settings if settings
 
-      submit_request(:post, "/videos/#{video_id}/versions",params)
+      submit_request(:post, "/videos/#{video_id}/versions", params)
 
-      {message: 'success'}
+      { message: 'success' }
     end
 
     def get_video(video_id)
-      submit_request_and_parse_json(:get,"/videos/#{video_id}",{})
+      submit_request_and_parse_json(:get, "/videos/#{video_id}")
     end
 
-    def get_videos(*ids)
-      submit_request_and_parse_json(:get_raw,"/videos",{ids: ids})
+    def get_videos(video_ids)
+      submit_request_and_parse_json(:get_raw, "/videos", ids: video_ids)
     end
 
     def get_video_allocation(video_allocation_id)
-      submit_request_and_parse_json(:get,"/video_allocations/#{video_allocation_id}",{})
+      url = "/video_allocations/#{video_allocation_id}"
+      submit_request_and_parse_json(:get, url)
     end
 
     private
 
-    def merge_with_default_options(options)
-      opts = {
-          api_key: ProteusClient.config.api_key,
-          domain: ProteusClient.config.domain
-      }.merge(options)
-
-      raise "APIKeyNotDefined" unless opts[:api_key]
-      raise "DomainNotDefined" unless opts[:domain]
-
-      opts
-    end
-
-    def submit_request_and_parse_json(method,route,params)
-      response = submit_request(method,route,params)
+    def submit_request_and_parse_json(method, route, params = {})
+      response = submit_request(method, route, params)
       JSON.parse(response)
     end
 
-    def submit_request(method,route,params)
-      params = {:api_key => @api_key}.merge(params)
+    def submit_request(method, route, params = {})
+      params = { :api_key => @api_key }.merge(params)
 
       case method
-        when :get
-          @domain[route].get({params: params})
-        when :get_raw
-          params_str = RestClient::Payload::UrlEncoded.new(params).to_s
-          @domain["#{route}?#{params_str}"].get({})
-        when :post
-          @domain[route].post(params, :content_type => :json)
-        else
-          raise 'Undefined method'
+      when :get
+        @domain[route].get(params: params)
+      when :get_raw
+        string_params = RestClient::Payload::UrlEncoded.new(params).to_s
+        @domain["#{route}?#{string_params}"].get()
+      when :post
+        @domain[route].post(params, content_type: :json)
+      else
+        raise 'Undefined method'
       end
     end
 
-    def parse_video_allocation(video_allocation)
-      urls =   [{type: 'direct', url: video_allocation['url_direct']}]
-      urls <<  {type: 'stream', url: video_allocation['url_stream']}
-
-      urls <<  {type: 'upload', url: video_allocation['url_upload']}
+    def format_video_allocation(video_allocation)
+      urls = []
+      
+      urls << { type: 'direct', url: video_allocation['url_direct'] }
+      urls << { type: 'stream', url: video_allocation['url_stream'] }
+      urls << { type: 'upload', url: video_allocation['url_upload'] }
 
-      {video_allocation_id: video_allocation['_id'],urls: urls }
+      { video_allocation_id: video_allocation['_id'], urls: urls }
     end
 
   end
 
-end
+end

data/spec/proteus_client_spec.rb

@@ -1,6 +1,7 @@
-require 'spec_helper'
-require 'stubs'
+require 'simplecov'
+SimpleCov.start
 
+require 'stubs'
 require_relative '../lib/proteus_client'
 
 describe ProteusClient::Proxy do
@@ -12,8 +13,8 @@ describe ProteusClient::Proxy do
   end
 
   let(:proteus_client) do
-    ProteusClient.config.domain   = 'http://localhost:9292'
-    ProteusClient.config.api_key  = 'api_key'
+    ProteusClient.config.domain  = 'http://localhost:9292'
+    ProteusClient.config.api_key = 'api_key'
     described_class.new()
   end
 
@@ -23,8 +24,9 @@ describe ProteusClient::Proxy do
   end
 
   context 'call to test_api' do
+
     before(:all) do
-      stub_response(:get,'/',200,'Welcome to proteus',{})
+      stub_response(:get, '/', 200, 'Welcome to proteus')
       @response = proteus_client.test_api
     end
 
@@ -36,60 +38,73 @@ describe ProteusClient::Proxy do
 
   context 'call to create_video_allocation'do
 
-    context 'with no count argument' do
+    before(:all) do
+      stub_create_video_allocation
+      @response = proteus_client.create_video_allocation()
+    end
 
-      before(:all) do
-        stub_create_video_allocation
-        @response = proteus_client.create_video_allocation()
-      end
+    it "returns a hash" do
+      @response.class.should == Hash
+    end
 
-      it "returns a hash" do
-        @response.class.should == Hash
-      end
+    it "returns video_allocation_id" do
+      @response[:video_allocation_id].should == '4fe0f752831a9d08bb000010'
+    end
 
-      it "returns video_allocation_id" do
-        @response[:video_allocation_id].should == '4fe0f752831a9d08bb000010'
-      end
+    it "returns urls" do
+      @response[:urls][0].should ==
+        { type: 'direct', url: 'direct/4fe0f752831a9d08bb000010.flv' }
+      @response[:urls][1].should ==
+        { type: 'stream', url: 'stream/4fe0f752831a9d08bb000010.flv' }
+      @response[:urls][2].should ==
+        { type: 'upload', url: 'upload/4fe0f752831a9d08bb000010.flv' }
+    end
 
-      it "returns urls" do
-        @response[:urls][0].should == {type: 'direct', url:'direct/4fe0f752831a9d08bb000010.flv'}
-        @response[:urls][1].should == {type: 'stream', url:'stream/4fe0f752831a9d08bb000010.flv'}
-        @response[:urls][2].should == {type: 'upload', url:'upload/4fe0f752831a9d08bb000010.flv'}
-      end
+  end
 
-    end
+  context 'call to create_video_allocations' do
 
-    context 'with count argument' do
+    before(:all) do
+      stub_create_video_allocations
+      @response = proteus_client.create_video_allocations(2)
+    end
 
-      before(:all) do
-        stub_create_video_allocations
-        @response = proteus_client.create_video_allocation(2)
-      end
+    it "returns an array with two hashes" do
+      @response.class.should    == Array
+      @response.size.should     == 2
+      @response[0].class.should == Hash
+    end
 
-      it "returns an array with two hashes" do
-        @response.class.should == Array
-        @response.size.should == 2
-        @response[0].class.should == Hash
-      end
+    it "returns video_allocation_id" do
+      @response[0][:video_allocation_id].should == '4fe0f752831a9d08bb000010'
+    end
 
+    it "returns urls" do
+      @response[0][:urls][0].should ==
+          { type: 'direct', url: 'direct/4fe0f752831a9d08bb000010.flv' }
+      @response[0][:urls][1].should ==
+          { type: 'stream', url: 'stream/4fe0f752831a9d08bb000010.flv' }
+      @response[0][:urls][2].should ==
+          { type: 'upload', url: 'upload/4fe0f752831a9d08bb000010.flv' }
     end
 
   end
 
   context 'call to create_video'do
 
-      before(:all) do
-        stub_create_video
-        @response = proteus_client.create_video('4fe0f752831a9d08bb000010','direct')
-      end
+    before(:all) do
+      stub_create_video
+      @response = proteus_client.
+        create_video('4fe0f752831a9d08bb000010','direct')
+    end
 
-      it "returns a hash" do
-        @response.class.should == Hash
-      end
+    it "returns a hash" do
+      @response.class.should == Hash
+    end
 
-      it "returns video url" do
-        @response[:url].should == 'direct/4fe0f752831a9d08bb000010.flv'
-      end
+    it "returns video url" do
+      @response[:url].should == 'direct/4fe0f752831a9d08bb000010.flv'
+    end
 
   end
 
@@ -98,9 +113,10 @@ describe ProteusClient::Proxy do
     context 'with valid id' do
 
       before(:all) do
-        stub_response(:post,'/videos/4fe0f752831a9d08bb000010/versions',
-                      200,'',{})
-        @response = proteus_client.create_video_versions('4fe0f752831a9d08bb000010')
+        stub_response_with_params(:post, '/videos/4fe0f752831a9d08bb000010/versions',
+                      200, '',{})
+        @response = proteus_client.
+          create_video_versions('4fe0f752831a9d08bb000010')
       end
 
       it "returns success message" do
@@ -112,9 +128,10 @@ describe ProteusClient::Proxy do
     context 'with valid id and type' do
 
       before(:all) do
-        stub_response(:post,'/videos/4fe0f752831a9d08bb000010/versions',
-                      200,'',{version_settings: 'mobile'})
-        @response = proteus_client.create_video_versions('4fe0f752831a9d08bb000010','mobile')
+        stub_response_with_params(:post, '/videos/4fe0f752831a9d08bb000010/versions',
+                      200, '', version_settings: 'mobile')
+        @response = proteus_client.
+          create_video_versions('4fe0f752831a9d08bb000010','mobile')
       end
 
       it "returns true" do
@@ -137,9 +154,9 @@ describe ProteusClient::Proxy do
     end
 
     it "returns video with correct format" do
-      @response['url'].class.should == String
-      @response['duration'].class.should == Fixnum
-      @response['versions'].class.should == Array
+      @response['url'].class.should         == String
+      @response['duration'].class.should    == Fixnum
+      @response['versions'].class.should    == Array
       @response['versions'][0].class.should == Hash
     end
 
@@ -149,20 +166,22 @@ describe ProteusClient::Proxy do
 
     before(:all) do
       stub_get_videos
-      @response = proteus_client.get_videos('4fe0f752831a9d08bb000010','4fe0f752831a9d08bb000010')
+      @response = proteus_client.get_videos(%w{4fe0f752831a9d08bb000010
+                                            4fe0f752831a9d08bb000010})
     end
 
     it "returns an array with hashes" do
-      @response.class.should == Array
-      @response.size.should  == 2
+      @response.class.should       == Array
+      @response.size.should        == 2
       @response.first.class.should == Hash
     end
 
     it "returns videos with correct format" do
       video = @response.first
-      video['url'].class.should == String
-      video['duration'].class.should == Fixnum
-      video['versions'].class.should == Array
+
+      video['url'].class.should         == String
+      video['duration'].class.should    == Fixnum
+      video['versions'].class.should    == Array
       video['versions'][0].class.should == Hash
     end
 
@@ -174,7 +193,8 @@ describe ProteusClient::Proxy do
 
       before(:all) do
         stub_get_video_allocation
-        @response = proteus_client.get_video_allocation('4fe0f752831a9d08bb000010')
+        @response = proteus_client.
+          get_video_allocation('4fe0f752831a9d08bb000010')
       end
 
       it "returns a hash" do
@@ -195,23 +215,27 @@ describe ProteusClient::Proxy do
 
     it 'call with :get works returns a correct response' do
       stub_resource(:get)
-      proteus_client.send(:submit_request,:get,'/',{}).class.should == String
+      proteus_client.send(:submit_request, :get, '/', {})
+        .class.should == String
     end
 
     it 'call with :post works returns a correct response' do
       stub_resource(:post)
-      proteus_client.send(:submit_request,:post,'/',{}).class.should == String
+      proteus_client.send(:submit_request, :post, '/', {})
+        .class.should == String
     end
 
     it 'call with :get works returns a correct response' do
       stub_resource(:get)
-      proteus_client.send(:submit_request,:get_raw,'/',{}).class.should == String
+      proteus_client.send(:submit_request, :get_raw, '/', {})
+        .class.should == String
     end
 
     it 'call with not defined method works raises exception' do
-      lambda { proteus_client.send(:submit_request,:put,'/',{}) }.should raise_error
+      lambda { proteus_client.send(:submit_request, :put, '/', {}) }.
+        should raise_error
     end
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proteus_client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
-dependencies: []
+date: 2012-07-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.3
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: It provides an interface to use proteus features
 email: 1.27201@gmail.com
 executables: []