sdp 0.1.0 → 0.2.0

data/.infinity_test

@@ -1,4 +1,4 @@
- infinity_test do
+infinity_test do
   use :rubies => %w(1.8.7 1.9.1 1.9.2), :test_framework => :rspec
   notifications :growl
- end
+end

data/ChangeLog.rdoc

@@ -1,3 +1,13 @@
+=== 0.2.0 / 2011-01-22
+
+* New features:
+  * Parse i=, c=, b=, k= when in media sections.
+  * connection_network_type and connection_address_type now separate
+  from network_type and address_type.
+* Bug Fixes:
+  * Fixed attribute parsing so it treats anything but a :, \r, or \n as
+  part of the attribute.
+
 === 0.1.0 / 2011-01-21
 
 * Initial release:

data/features/sdp_get.feature

@@ -19,6 +19,8 @@ Feature: Get SDP file fields and marshall into Ruby data types
       | information       | A Seminar on the session description protocol |
       | uri               | http://www.example.com/seminars/sdp.pdf |
       | email_address     | j.doe@example.com (Jane Doe)            |
+      | connection_network_type | IN          |
+      | connection_address_type | IP4         |
       | connection_address | 224.2.17.12/127  |
       | start_time        | 2873397496        |
       | stop_time         | 2873404696        |

data/features/step_definitions/sdp_create_steps.rb

@@ -17,6 +17,8 @@ When /^I build the Ruby object with the appropriate fields$/ do
   @session.information = "A Seminar on the session description protocol"
   @session.uri = "http://www.example.com/seminars/sdp.pdf"
   @session.email_address = "j.doe@example.com (Jane Doe)"
+  @session.connection_network_type = "IN"
+  @session.connection_address_type = "IP4"
   @session.connection_address = "224.2.17.12/127"
   @session.start_time = 2873397496
   @session.stop_time = 2873404696

data/lib/sdp/description.rb

@@ -76,6 +76,8 @@ class SDP
       :uri,
       :email_address,
       :phone_number,
+      :connection_network_type,
+      :connection_address_type,
       :connection_address,
       :bandwidth_type,
       :bandwidth,

data/lib/sdp/parser.rb

@@ -25,7 +25,7 @@ class SDP::Parser < Parslet::Parser
 
   rule(:session_name) { str('s=') >> field_value_string.as(:name) >> eol }
 
-  rule(:session_information) do
+  rule(:information) do
     str('i=') >> field_value_string.as(:information) >> eol
   end
 
@@ -40,7 +40,9 @@ class SDP::Parser < Parslet::Parser
   end
 
   rule(:connection_data) do
-    str('c=') >> field_value >> space >> field_value >> space >>
+    str('c=') >>
+      field_value.as(:connection_network_type) >> space >>
+      field_value.as(:connection_address_type) >> space >>
       field_value.as(:connection_address) >> eol
   end
 
@@ -75,7 +77,7 @@ class SDP::Parser < Parslet::Parser
   end
 
   rule(:attribute) do
-    str('a=') >> match('[\w]').repeat(1).as(:attribute) >>
+    str('a=') >> match('[^:\r\n]').repeat(1).as(:attribute) >>
       (str(':') >> field_value_string.as(:value)).maybe >> eol
   end
 
@@ -97,14 +99,15 @@ class SDP::Parser < Parslet::Parser
   # The SDP description
   rule(:session_section) do
     version.maybe >> origin.maybe >> session_name.maybe >>
-      session_information.maybe >> uri.maybe >> email_address.maybe >>
+      information.maybe >> uri.maybe >> email_address.maybe >>
       phone_number.maybe >> connection_data.maybe >> bandwidth.maybe >>
       timing.maybe >> repeat_times.maybe >> time_zones.maybe >>
       encryption_keys.maybe >> attributes.maybe
   end
 
   rule(:media_section) do
-    media_description >> attributes.maybe
+    media_description >> information.maybe >> connection_data.maybe >>
+      bandwidth.maybe >> encryption_keys.maybe >> attributes.maybe
   end
 
   rule(:description) do

data/lib/sdp/session_template.erb

@@ -14,7 +14,9 @@ e=<%= email_address %>
 <% if phone_number %>
 p=<%= phone_number %>
 <% end %>
-c=<%= network_type %> <%= address_type %> <%= connection_address %>
+<% if connection_network_type %>
+c=<%= connection_network_type %> <%= connection_address_type %> <%= connection_address %>
+<% end %>
 <% if bandwidth %>
 b=<%= bandwidth_type %>:<%= bandwidth %>
 <% end %>

data/lib/sdp/version.rb

@@ -1,4 +1,4 @@
 class SDP
   # sdp version
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/sdp.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sdp}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
   s.authors = ["sloveless"]

data/spec/sdp/description_spec.rb

@@ -82,6 +82,16 @@ describe SDP::Description do
       @sdp.phone_number.should == "+1 555 123 4567"
     end
 
+    it "connection_network_type" do
+      @sdp.connection_network_type = 'IN'
+      @sdp.connection_network_type.should == 'IN'
+    end
+
+    it "connection_address_type" do
+      @sdp.connection_address_type = 'IP4'
+      @sdp.connection_address_type.should == 'IP4'
+    end
+
     it "connection_address" do
       @sdp.connection_address = 'localhost'
       @sdp.connection_address.should == 'localhost'

data/spec/sdp/parser_spec.rb

@@ -148,7 +148,44 @@ describe SDP::Parser do
       end
     end
   end
+
+  context "attributes" do
+    it "attribute" do
+      sdp = "a=x-qt-text-cmt:Orban Opticodec-PC\r\n"
+      sdp_hash = @parser.parse sdp
+      sdp_hash[:session_section][:attributes].first[:attribute].should ==
+        "x-qt-text-cmt"
+      sdp_hash[:session_section][:attributes].first[:value].should ==
+        "Orban Opticodec-PC"
+    end
+  end
   
+  context "media sections" do
+    it "all possible fields in 1 section" do
+      sdp = "m=audio 0 RTP/AVP 96\r\ni=Test info\r\nc=IN IP4 0.0.0.0\r\nb=AS:40\r\nk=prompt\r\na=rtpmap:96 MP4A-LATM/44100/2\r\na=fmtp:96 cpresent=0;config=400027200000\r\n"
+      sdp_hash = @parser.parse sdp
+      sdp_hash[:media_sections].first[:media].should == "audio"
+      sdp_hash[:media_sections].first[:port].should == "0"
+      sdp_hash[:media_sections].first[:protocol].should == "RTP/AVP"
+      sdp_hash[:media_sections].first[:format].should == "96"
+      sdp_hash[:media_sections].first[:information].should == "Test info"
+      sdp_hash[:media_sections].first[:connection_network_type].should == "IN"
+      sdp_hash[:media_sections].first[:connection_address_type].should == "IP4"
+      sdp_hash[:media_sections].first[:connection_address].should == "0.0.0.0"
+      sdp_hash[:media_sections].first[:bandwidth_type].should == "AS"
+      sdp_hash[:media_sections].first[:bandwidth].should == "40"
+      sdp_hash[:media_sections].first[:encryption_method].should == "prompt"
+      sdp_hash[:media_sections].first[:attributes].first[:attribute].should ==
+        "rtpmap"
+      sdp_hash[:media_sections].first[:attributes].first[:value].should ==
+        "96 MP4A-LATM/44100/2"
+      sdp_hash[:media_sections].first[:attributes].last[:attribute].should ==
+        "fmtp"
+      sdp_hash[:media_sections].first[:attributes].last[:value].should ==
+        "96 cpresent=0;config=400027200000"
+    end
+  end
+
   context "parses EOLs" do
     it "parses \\r\\n" do
       sdp = "v=123\r\n"

data/spec/sdp_spec.rb

@@ -94,60 +94,68 @@ describe SDP do
       @parsed_sdp.phone_number.class.should == String
     end
 
-    it "has a bandwidth type of 'CT'" do
-      @parsed_sdp.bandwidth_type.should == "CT"
-      @parsed_sdp.bandwidth_type.class.should == String
-    end
+    context "bandwidth" do
+      it "has a bandwidth type of 'CT'" do
+        @parsed_sdp.bandwidth_type.should == "CT"
+        @parsed_sdp.bandwidth_type.class.should == String
+      end
 
-    it "has a bandwidth of '1000'" do
-      @parsed_sdp.bandwidth.should == "1000"
-      @parsed_sdp.bandwidth.class.should == String
+      it "has a bandwidth of '1000'" do
+        @parsed_sdp.bandwidth.should == "1000"
+        @parsed_sdp.bandwidth.class.should == String
+      end
     end
 
-    it "has a start time of '2873397496'" do
-      @parsed_sdp.start_time.should == '2873397496'
-      @parsed_sdp.start_time.class.should == String
-    end
+    context "timing" do
+      it "has a start time of '2873397496'" do
+        @parsed_sdp.start_time.should == '2873397496'
+        @parsed_sdp.start_time.class.should == String
+      end
 
-    it "has a stop time of '2873404696'" do
-      @parsed_sdp.stop_time.should == '2873404696'
-      @parsed_sdp.stop_time.class.should == String
+      it "has a stop time of '2873404696'" do
+        @parsed_sdp.stop_time.should == '2873404696'
+        @parsed_sdp.stop_time.class.should == String
+      end
     end
 
-    it "has a repeat interval of '604800'" do
-      @parsed_sdp.repeat_interval.should == '604800'
-      @parsed_sdp.repeat_interval.class.should == String
-    end
+    context "repeat times" do
+      it "has a repeat interval of '604800'" do
+        @parsed_sdp.repeat_interval.should == '604800'
+        @parsed_sdp.repeat_interval.class.should == String
+      end
 
-    it "has an active duration of '3600'" do
-      @parsed_sdp.active_duration.should == '3600'
-      @parsed_sdp.active_duration.class.should == String
-    end
+      it "has an active duration of '3600'" do
+        @parsed_sdp.active_duration.should == '3600'
+        @parsed_sdp.active_duration.class.should == String
+      end
 
-    it "has a offsets from start time of '0 90000'" do
-      @parsed_sdp.offsets_from_start_time.should == '0 90000'
-      @parsed_sdp.offsets_from_start_time.class.should == String
+      it "has a offsets from start time of '0 90000'" do
+        @parsed_sdp.offsets_from_start_time.should == '0 90000'
+        @parsed_sdp.offsets_from_start_time.class.should == String
+      end
     end
 
-    it "has a time zone adjustment of '2882844526'" do
-      @parsed_sdp.time_zones[:adjustment_time].should == '2882844526'
-      @parsed_sdp.time_zones[:adjustment_time].class.should == String
-    end
+    context "time zones" do
+      it "has a time zone adjustment of '2882844526'" do
+        @parsed_sdp.time_zones[:adjustment_time].should == '2882844526'
+        @parsed_sdp.time_zones[:adjustment_time].class.should == String
+      end
 
-    it "has a time zone offset of '-1h'" do
-      @parsed_sdp.time_zones[:offset].should == '-1h'
-      @parsed_sdp.time_zones[:offset].class.should == String
+      it "has a time zone offset of '-1h'" do
+        @parsed_sdp.time_zones[:offset].should == '-1h'
+        @parsed_sdp.time_zones[:offset].class.should == String
+      end
     end
 
     context "connection data" do
-      it "has a nettype of 'IN'" do
-        @parsed_sdp.network_type.should == "IN"
-        @parsed_sdp.network_type.class.should == String
+      it "has a connection network type of 'IN'" do
+        @parsed_sdp.connection_network_type.should == "IN"
+        @parsed_sdp.connection_network_type.class.should == String
       end
 
       it "has a addrtype of :IP4" do
-        @parsed_sdp.address_type.should == "IP4"
-        @parsed_sdp.address_type.class.should == String
+        @parsed_sdp.connection_address_type.should == "IP4"
+        @parsed_sdp.connection_address_type.class.should == String
       end
 
       it "has a connection address of '224.2.17.12/127'" do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - sloveless