message_spec.rb in rtsp-0.4.0

- old
+ new

@@ -1,62 +1,62 @@
 require 'sdp'
 require_relative '../spec_helper'
 require 'rtsp/message'
 
 describe "RTSP::Message" do
-  before do
-    @stream = "rtsp://1.2.3.4/stream1"
-  end
+  let(:stream) { "rtsp://1.2.3.4/stream1" }
 
   it "raises if the header type isn't a Symbol" do
-    message = RTSP::Message.options(@stream)
-    lambda { message.header "hi", "everyone"
+    message = RTSP::Message.options(stream)
+
+    lambda {
+      message.header "hi", "everyone"
     }.should raise_error RTSP::Error
   end
 
   RTSP::Message.instance_variable_get(:@message_types).each do |method|
     it "adds a User-Agent header to the #{method} method" do
-      message = RTSP::Message.send(method, @stream)
+      message = RTSP::Message.send(method, stream)
       message.to_s.should include "User-Agent: RubyRTSP/"
     end
   end
 
   context "builds an OPTIONS string" do
     it "with default sequence number" do
-      message = RTSP::Message.options(@stream)
+      message = RTSP::Message.options(stream)
       message.to_s.should == "OPTIONS rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\nCSeq: 1\r\nUser-Agent: RubyRTSP/#{RTSP::VERSION} (Ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL})\r\n\r\n"
     end
 
     it "with new sequence number" do
-      message = RTSP::Message.options(@stream)
+      message = RTSP::Message.options(stream)
       message.header :cseq, 2345
       message.to_s.should == "OPTIONS rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\nCSeq: 2345\r\nUser-Agent: RubyRTSP/#{RTSP::VERSION} (Ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL})\r\n\r\n"
     end
   end
 
   context "builds a DESCRIBE string" do
     it "with default sequence and accept values" do
-      message = RTSP::Message.describe(@stream)
+      message = RTSP::Message.describe(stream)
       message.to_s.should match(/^DESCRIBE rtsp:/)
       message.to_s.should include "DESCRIBE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should include "Accept: application/sdp\r\n"
       message.to_s.should match(/\r\n\r\n$/)
     end
 
     it "with default sequence value" do
-      message = RTSP::Message.describe(@stream).with_headers({
+      message = RTSP::Message.describe(stream).with_headers({
         accept: 'application/sdp, application/rtsl' })
       message.to_s.should match(/^DESCRIBE rtsp:/)
       message.to_s.should include "DESCRIBE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should include "Accept: application/sdp, application/rtsl\r\n"
       message.to_s.should match(/\r\n\r\n$/)
     end
 
     it "with new sequence and accept values" do
-      message = RTSP::Message.describe(@stream).with_headers({
+      message = RTSP::Message.describe(stream).with_headers({
         accept: 'application/sdp, application/rtsl',
         cseq: 2345 })
 
       message.to_s.should match(/^DESCRIBE rtsp:/)
       message.to_s.should include "DESCRIBE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
@@ -66,22 +66,22 @@
     end
   end
 
   context "builds a ANNOUNCE string" do
     it "with default sequence, content type, but no body" do
-      message = RTSP::Message.announce(@stream).with_headers({ session: 123456789 })
+      message = RTSP::Message.announce(stream).with_headers({ session: 123456789 })
 
       message.to_s.should match(/^ANNOUNCE rtsp:/)
       message.to_s.should include "ANNOUNCE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should include "Session: 123456789\r\n"
       message.to_s.should include "Content-Type: application/sdp\r\n"
       message.to_s.should match(/\r\n\r\n$/)
     end
 
     it "with passed-in session and content type but no body" do
-      message = RTSP::Message.announce(@stream).with_headers({
+      message = RTSP::Message.announce(stream).with_headers({
         session: 123456789,
         content_type: 'application/sdp, application/rtsl' })
 
       message.to_s.should match(/^ANNOUNCE rtsp:/)
       message.to_s.should include "ANNOUNCE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
@@ -90,11 +90,11 @@
       message.to_s.should include "Content-Type: application/sdp, application/rtsl\r\n"
       message.to_s.should match(/\r\n\r\n$/)
     end
 
     it "with passed-in sequence, session, content-type, but no body " do
-      message = RTSP::Message.announce(@stream).with_headers({
+      message = RTSP::Message.announce(stream).with_headers({
         session: 123456789,
         content_type: 'application/sdp, application/rtsl',
         cseq: 2345 })
 
       message.to_s.should match(/^ANNOUNCE rtsp:/)
@@ -108,11 +108,11 @@
     it "with passed-in sequence, session, content-type, and SDP body" do
       sdp = SDP::Description.new
       sdp.protocol_version = 1
       sdp.username = 'bobo'
 
-      message = RTSP::Message.announce(@stream).with_headers({
+      message = RTSP::Message.announce(stream).with_headers({
         session: 123456789,
         content_type: 'application/sdp',
         cseq: 2345 })
       message.body = sdp.to_s
 
@@ -126,31 +126,31 @@
     end
   end
 
   context "builds a SETUP string" do
     it "with default sequence, client_port, and routing values" do
-      message = RTSP::Message.setup(@stream)
+      message = RTSP::Message.setup(stream)
 
       message.to_s.should match(/^SETUP rtsp/)
       message.to_s.should include "SETUP rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should match(/\r\n\r\n$/)
     end
 
     it "with default sequence, transport, and client_port values" do
-      message = RTSP::Message.setup(@stream).with_headers({
+      message = RTSP::Message.setup(stream).with_headers({
         transport: ["RTP/AVP", "multicast", { :client_port => "9000-9001" }] })
 
       message.to_s.should match(/^SETUP rtsp/)
       message.to_s.should include "SETUP rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should include "Transport: RTP/AVP;multicast;client_port=9000-9001\r\n"
       message.to_s.should match(/\r\n\r\n$/)
     end
 
     it "with default transport, client_port, and routing values" do
-      message = RTSP::Message.setup(@stream).with_headers({
+      message = RTSP::Message.setup(stream).with_headers({
         transport: ["RTP/AVP", "multicast", { :client_port => "9000-9001" }],
         cseq: 2345 })
 
       message.to_s.should match(/^SETUP rtsp/)
       message.to_s.should include "SETUP rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
@@ -160,11 +160,11 @@
     end
   end
 
   context "builds a PLAY string" do
     it "with default sequence and range values" do
-      message = RTSP::Message.play(@stream).with_headers({
+      message = RTSP::Message.play(stream).with_headers({
         session: 123456789 })
 
       message.to_s.should match(/^PLAY rtsp/)
       message.to_s.should include "PLAY rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
@@ -172,11 +172,11 @@
       message.to_s.should include "Range: npt=0.000-\r\n"
       message.to_s.should match(/\r\n\r\n/)
     end
 
     it "with default sequence value" do
-      message = RTSP::Message.play(@stream).with_headers({
+      message = RTSP::Message.play(stream).with_headers({
         session: 123456789,
         range: { :npt => "0.000-1.234" } })
 
       message.to_s.should match(/^PLAY rtsp/)
       message.to_s.should include "PLAY rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
@@ -187,20 +187,20 @@
     end
   end
 
   context "builds a PAUSE string" do
     it "with required Request values" do
-      message = RTSP::Message.pause(@stream)
+      message = RTSP::Message.pause(stream)
 
       message.to_s.should match(/^PAUSE rtsp/)
       message.to_s.should include "PAUSE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should match(/\r\n\r\n/)
     end
 
     it "with session and range headers" do
-      message = RTSP::Message.pause(@stream).with_headers({
+      message = RTSP::Message.pause(stream).with_headers({
         session: 123456789,
         range: { :npt => "0.000" } })
 
       message.to_s.should match(/^PAUSE rtsp/)
       message.to_s.should include "PAUSE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
@@ -211,20 +211,20 @@
     end
   end
 
   context "builds a TEARDOWN string" do
     it "with required Request values" do
-      message = RTSP::Message.teardown(@stream)
+      message = RTSP::Message.teardown(stream)
 
       message.to_s.should match(/^TEARDOWN rtsp/)
       message.to_s.should include "TEARDOWN rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should match(/\r\n\r\n/)
     end
 
     it "with session and range headers" do
-      message = RTSP::Message.teardown(@stream).with_headers({
+      message = RTSP::Message.teardown(stream).with_headers({
         session: 123456789 })
 
       message.to_s.should match(/^TEARDOWN rtsp/)
       message.to_s.should include "TEARDOWN rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
@@ -233,22 +233,22 @@
     end
   end
 
   context "builds a GET_PARAMETER string" do
     it "with required Request values" do
-      message = RTSP::Message.get_parameter(@stream)
+      message = RTSP::Message.get_parameter(stream)
 
       message.to_s.should match(/^GET_PARAMETER rtsp/)
       message.to_s.should include "GET_PARAMETER rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should match(/\r\n\r\n/)
     end
 
     it "with cseq, content type, session headers, and text body" do
       the_body = "packets_received\r\njitter\r\n"
 
-      message = RTSP::Message.get_parameter(@stream).with_headers({
+      message = RTSP::Message.get_parameter(stream).with_headers({
         cseq: 431,
         content_type: 'text/parameters',
         session: 123456789 })
 
       message.body = the_body
@@ -264,22 +264,22 @@
     end
   end
 
   context "builds a SET_PARAMETER string" do
     it "with required Request values" do
-      message = RTSP::Message.set_parameter(@stream)
+      message = RTSP::Message.set_parameter(stream)
 
       message.to_s.should match(/^SET_PARAMETER rtsp/)
       message.to_s.should include "SET_PARAMETER rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should match(/\r\n\r\n/)
     end
 
     it "with cseq, content type, session headers, and text body" do
       the_body = "barparam: barstuff\r\n"
 
-      message = RTSP::Message.set_parameter(@stream).with_headers({
+      message = RTSP::Message.set_parameter(stream).with_headers({
         cseq: 431,
         content_type: 'text/parameters',
         session: 123456789 })
       message.body = the_body
 
@@ -294,20 +294,20 @@
     end
   end
 
   context "builds a REDIRECT string" do
     it "with required Request values" do
-      message = RTSP::Message.redirect(@stream)
+      message = RTSP::Message.redirect(stream)
 
       message.to_s.should match(/^REDIRECT rtsp/)
       message.to_s.should include "REDIRECT rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should match(/\r\n\r\n/)
     end
 
     it "with cseq, location, and range headers" do
-      message = RTSP::Message.redirect(@stream).with_headers({
+      message = RTSP::Message.redirect(stream).with_headers({
         cseq: 732,
         location: "rtsp://bigserver.com:8001",
         range: { :clock => "19960213T143205Z-" } })
 
       message.to_s.should match(/^REDIRECT rtsp/)
@@ -319,20 +319,20 @@
     end
   end
 
   context "builds a RECORD string" do
     it "with required Request values" do
-      message = RTSP::Message.record(@stream)
+      message = RTSP::Message.record(stream)
 
       message.to_s.should match(/^RECORD rtsp/)
       message.to_s.should include "RECORD rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should match(/\r\n\r\n/)
     end
 
     it "with cseq, session, and conference headers" do
-      message = RTSP::Message.record(@stream).with_headers({
+      message = RTSP::Message.record(stream).with_headers({
         cseq: 954,
         session: 12345678,
         conference: "128.16.64.19/32492374" })
 
       message.to_s.should match(/^RECORD rtsp/)
@@ -344,31 +344,31 @@
     end
   end
 
   context "#to_s turns a Hash into an String of header strings" do
     it "single header, non-hyphenated name, hash value" do
-      message = RTSP::Message.play(@stream).with_headers({
+      message = RTSP::Message.play(stream).with_headers({
         range: { npt: "0.000-" }
       })
 
       string = message.to_s
       string.is_a?(String).should be_true
       string.should include "Range: npt=0.000-"
     end
 
     it "single header, hyphenated, non-hash value" do
-      message = RTSP::Message.play(@stream).with_headers({
+      message = RTSP::Message.play(stream).with_headers({
         :if_modified_since => "Sat, 29 Oct 1994 19:43:31 GMT"
       })
 
       string = message.to_s
       string.is_a?(String).should be_true
       string.should include "If-Modified-Since: Sat, 29 Oct 1994 19:43:31 GMT"
     end
 
     it "two headers, mixed hyphenated, array & hash values" do
-      message = RTSP::Message.redirect(@stream).with_headers({
+      message = RTSP::Message.redirect(stream).with_headers({
         :cache_control => ["no-cache", { :max_age => 12345 }],
         :content_type => ['application/sdp', 'application/x-rtsp-mh']
       })
 
       string = message.to_s
@@ -378,10 +378,10 @@
     end
   end
 
   describe "#with_headers" do
     it "returns an RTSP::Message" do
-      message = RTSP::Message.options(@stream)
+      message = RTSP::Message.options(stream)
       result = message.with_headers({ test: "test" })
       result.class.should == RTSP::Message
     end
   end
 