sproutvideo-rb 1.3.0 → 1.3.1

data/README.markdown

@@ -105,12 +105,31 @@ Sproutvideo::Video.delete('abc123')
 ```
 
 ##Signed Embed Codes
-You can use this convenince method to sign an embed code
+You can use this convenience method to sign an embed code. It will return the embed code URL which can be used to build an iframe embed code.
+`Sproutvideo::Video.signed_embed_code(video_id, security_token, query_parameters, expiration_time, protocol)`
+
+###Parameters
+video_id - _String_ (_Required_)
+: The id of the video for which you're generating the signed embed code
+
+security_token - _String_ (_Required_)
+: The security token of the video for which you're generatingn the signed embed code
+
+query_parameteres - _Hash_ (_Optional_)
+: A hash of query parameters to be passed to the embed code. Example: `{'type' => 'hd', 'autoplay' => true}`
+
+expiration_time - _Integer_ (_Optional_)
+: The number of seconds from the Epoc that this signed embed code should expire. This defaults to 5 minutes from the time the signed embed code was generated.
+
+protocol - _String_ (_Optional_)
+: `http` or `https`. Defaults to `http`
+
+###Examples
 ```ruby
-Sproutvideo::Video.signed_embed_code('abc123') #sign a base embed code with no other options
-Sproutvideo::Video.signed_embed_code('abc123', {'type' => 'hd'}) #set parameters for the embed code such as changing the default video type to HD
-Sproutvideo::Video.signed_embed_code('abc123', {}, 1368127991) #set a specific expiration time for the signed embed code. (By default the expiration time is set to 5 minutes from the time the signed embed code was generated).
-Sproutvideo::Video.signed_embed_code('abc123', {}, nil, 'https') #Use https instead of http
+Sproutvideo::Video.signed_embed_code('abc123','def456') #sign a base embed code with no other options
+Sproutvideo::Video.signed_embed_code('abc123','def456', {'type' => 'hd'}) #set parameters for the embed code such as changing the default video type to HD
+Sproutvideo::Video.signed_embed_code('abc123','def456', {}, 1368127991) #set a specific expiration time for the signed embed code. (By default the expiration time is set to 5 minutes from the time the signed embed code was generated).
+Sproutvideo::Video.signed_embed_code('abc123','def456', {}, nil, 'https') #Use https instead of http
 ```
 
 # Tags

data/lib/sproutvideo/version.rb

@@ -1,3 +1,3 @@
 module Sproutvideo
-	VERSION = "1.3.0"
+	VERSION = "1.3.1"
 end

data/lib/sproutvideo/video.rb

@@ -26,13 +26,9 @@ module Sproutvideo
       delete("/videos/#{video_id}", options)
     end
 
-    def self.signed_embed_code(video_id, params={}, expires=nil, protocol='http')
-      #get video
-      resp = get("/videos/#{video_id}")
-      token = resp.body[:security_token]
-      
+    def self.signed_embed_code(video_id, security_token, params={}, expires=nil, protocol='http')      
       host = 'videos.sproutvideo.com'
-      path = "/embed/#{video_id}/#{token}"
+      path = "/embed/#{video_id}/#{security_token}"
       string_to_sign = "GET\n"
       string_to_sign << "#{host}\n"
       string_to_sign << "#{path}\n"

data/spec/sproutvideo/video_spec.rb

@@ -114,8 +114,7 @@ describe Sproutvideo::Video do
 	describe "#signed_embed_code" do
 		before(:each) do
 			@video_id = 1
-			@url = "#{Sproutvideo.base_url}/videos/#{@video_id}"
-			@msg = mock(:code => 200, :to_s => '{"security_token":"abc123"}')
+			@security_token = 'abc123'
 			@digest = OpenSSL::Digest::Digest.new('sha1')
 			OpenSSL::Digest::Digest.stub!(:new).and_return(@digest)
 			time = Time.now
@@ -123,35 +122,27 @@ describe Sproutvideo::Video do
 			@expires_time = time.to_i+300
 			string_to_sign = "GET\nvideos.sproutvideo.com\n/embed/1/abc123\n&expires=#{@expires_time}"
 			@signature = CGI::escape([OpenSSL::HMAC.digest(@digest, @api_key, string_to_sign)].pack("m").strip)
-			RestClient.stub!(:get).and_return(@msg)
-		end
-
-		it "should get the video" do
-			RestClient.should_receive(:get).with(
-				@url,
-				{'SproutVideo-Api-Key' => @api_key, :params => {}}).and_return(@msg)
-			Sproutvideo::Video.signed_embed_code(@video_id)
 		end
 		
 		it "should sign the embed code" do
-			Sproutvideo::Video.signed_embed_code(@video_id).should == "http://videos.sproutvideo.com/embed/1/abc123?signature=#{@signature}&expires=#{@expires_time}"
+			Sproutvideo::Video.signed_embed_code(@video_id, @security_token).should == "http://videos.sproutvideo.com/embed/1/abc123?signature=#{@signature}&expires=#{@expires_time}"
 		end
 
 		it "should set the expires time if passed in" do
 			expires_time = 1368127991
 			string_to_sign = "GET\nvideos.sproutvideo.com\n/embed/1/abc123\n&expires=#{expires_time}"
 			signature = CGI::escape([OpenSSL::HMAC.digest(@digest, @api_key, string_to_sign)].pack("m").strip)
-			Sproutvideo::Video.signed_embed_code(@video_id, {}, 1368127991).should == "http://videos.sproutvideo.com/embed/1/abc123?signature=#{signature}&expires=#{expires_time}"
+			Sproutvideo::Video.signed_embed_code(@video_id, @security_token, {}, 1368127991).should == "http://videos.sproutvideo.com/embed/1/abc123?signature=#{signature}&expires=#{expires_time}"
 		end
 
 		it "should use the protocol that's passed in" do
-			Sproutvideo::Video.signed_embed_code(@video_id, {}, nil, 'https').should == "https://videos.sproutvideo.com/embed/1/abc123?signature=#{@signature}&expires=#{@expires_time}"
+			Sproutvideo::Video.signed_embed_code(@video_id, @security_token,{}, nil, 'https').should == "https://videos.sproutvideo.com/embed/1/abc123?signature=#{@signature}&expires=#{@expires_time}"
 		end
 
 		it "should sign other parameters too!" do
 			string_to_sign = "GET\nvideos.sproutvideo.com\n/embed/1/abc123\n&expires=#{@expires_time}&type=hd"
 			@signature = CGI::escape([OpenSSL::HMAC.digest(@digest, @api_key, string_to_sign)].pack("m").strip)
-			Sproutvideo::Video.signed_embed_code(@video_id, {'type' => 'hd'}).should == "http://videos.sproutvideo.com/embed/1/abc123?signature=#{@signature}&expires=#{@expires_time}&type=hd"
+			Sproutvideo::Video.signed_embed_code(@video_id, @security_token,{'type' => 'hd'}).should == "http://videos.sproutvideo.com/embed/1/abc123?signature=#{@signature}&expires=#{@expires_time}&type=hd"
 		end
 	end
 

data/sproutvideo-rb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sproutvideo-rb"
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["SproutVideo"]
-  s.date = "2013-05-08"
+  s.date = "2013-05-09"
   s.description = "SproutVideo API Client"
   s.email = "support@sproutvideo.com"
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sproutvideo-rb
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - SproutVideo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-08 00:00:00 Z
+date: 2013-05-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client