oversip 1.3.8 → 1.4.0

data/lib/oversip/sip/request.rb

@@ -104,6 +104,36 @@ module OverSIP::SIP
     end
 
 
+    # RFC 6228 (199 response).
+    def reply_199 response
+      # Store the previous internal To-tag (if set).
+      internal_to_tag = @internal_to_tag
+
+      # Set it with the To-tag of the response for which a 199 must eb generated.
+      @internal_to_tag = response.to_tag
+
+      # Send the 199 response.
+      reply 199, "Early Dialog Terminated", [ "Reason: SIP ;cause=#{response.status_code} ;text=\"#{response.reason_phrase}\"" ]
+
+      # Restore the previous internal To-tag.
+      @internal_to_tag = internal_to_tag
+      true
+    end
+    private :reply_199
+
+
+    def ruri= ruri
+      case ruri
+      when ::OverSIP::SIP::Uri, ::OverSIP::SIP::NameAddr
+        @ruri = ruri
+      when ::String
+        @ruri = OverSIP::SIP::Uri.parse ruri
+      else
+        raise ::OverSIP::RuntimeError, "invalid URI #{ruri.inspect}"
+      end
+    end
+
+
     def send_response(response)
       unless (case @transport
         when :udp
@@ -118,7 +148,7 @@ module OverSIP::SIP
 
 
     def to_s
-      msg = "#{@sip_method.to_s} #{self.ruri.uri} SIP/2.0\r\n"
+      msg = "#{@sip_method.to_s} #{@ruri.uri} SIP/2.0\r\n"
 
       # Update From/To/Contact headers if modified.
       if @from.modified?

data/lib/oversip/sip/uac.rb

@@ -2,7 +2,6 @@ module OverSIP::SIP
 
   class Uac < Client
 
-
     def route request, dst_host=nil, dst_port=nil, dst_transport=nil
       unless (@request = request).is_a? ::OverSIP::SIP::UacRequest or @request.is_a? ::OverSIP::SIP::Request
         raise ::OverSIP::RuntimeError, "request must be a OverSIP::SIP::UacRequest or OverSIP::SIP::Request instance"
@@ -10,11 +9,8 @@ module OverSIP::SIP
 
       # The destination of the request is taken from:
       # - dst_xxx fields if given.
-      # - The request.ruri if it is an OverSIP::SIP::Uri or OverSIP::SIP::NameAddr.
+      # - The request.ruri (which is an OverSIP::SIP::Uri or OverSIP::SIP::NameAddr).
       # Otherwise raise an exception.
-      unless dst_host or request.ruri.is_a?(::OverSIP::SIP::Uri) or request.ruri.is_a?(::OverSIP::SIP::NameAddr)
-        raise ::OverSIP::RuntimeError, "if dst_host is not given then request.ruri must be an OverSIP::SIP::Uri or OverSIP::SIP::NameAddr instance"
-      end
 
       @log_id = "UAC (proxy #{@conf[:name]})"
 
@@ -49,26 +45,26 @@ module OverSIP::SIP
         do_dns result, @request.via_branch_id, dst_scheme, dst_host, dst_host_type, dst_port, dst_transport
       end
 
-    end  # def send
+    end  # def route
 
 
     def receive_response response
       log_system_debug "received response #{response.status_code}"  if $oversip_debug
 
       if response.status_code < 200
-        @on_provisional_response_block && @on_provisional_response_block.call(response)
+        run_on_provisional_response_cbs response
       elsif response.status_code >= 200 && response.status_code <= 299
-        @on_success_response_block && @on_success_response_block.call(response)
+        run_on_success_response_cbs response
       elsif response.status_code >= 300
         if response.status_code == 503
           if @conf[:dns_failover_on_503]
             try_next_target nil, nil, response
             return
           else
-            @on_failure_response_block && @on_failure_response_block.call(response)
+            run_on_failure_response_cbs response
           end
         else
-          @on_failure_response_block && @on_failure_response_block.call(response)
+          run_on_failure_response_cbs response
         end
       end
     end
@@ -79,12 +75,12 @@ module OverSIP::SIP
 
 
     def no_more_targets status, reason, full_response, code
-      # If we have received a [3456]XX response from downstream then run @on_failure_block.
+      # If we have received a [3456]XX response from downstream then run @on_failure_response_cbs.
       if full_response
-        @on_failure_response_block && @on_failure_response_block.call(full_response)
+        run_on_failure_response_cbs full_response
       # If not, generate the response according to the given status and reason.
       else
-        @on_error_block && @on_error_block.call(status, reason, code)
+        run_on_error_cbs status, reason, code
       end
     end
 

data/lib/oversip/sip/uac_request.rb

@@ -15,10 +15,19 @@ module OverSIP::SIP
       unless (@sip_method = data[:sip_method])
         raise ::OverSIP::RuntimeError, "no data[:sip_method] given"
       end
-      unless (@ruri = data[:ruri])
+      unless (ruri = data[:ruri])
         raise ::OverSIP::RuntimeError, "no data[:ruri] given"
       end
 
+      case ruri
+      when ::OverSIP::SIP::Uri, ::OverSIP::SIP::NameAddr
+        @ruri = ruri
+      when ::String
+        @ruri = OverSIP::SIP::Uri.parse ruri
+      else
+        raise ::OverSIP::RuntimeError, "invalid URI #{ruri.inspect}"
+      end
+
       @from = data[:from] || DEFAULT_FROM
       @from_tag = data[:from_tag] || ::SecureRandom.hex(4)
       @to = data[:to] || @ruri
@@ -47,15 +56,7 @@ module OverSIP::SIP
 
 
     def to_s
-      # Let @ruri to be an String, an OverSIP::SIP::Uri or an OverSIP::SIP::NameAddr instance.
-      ruri = case @ruri
-        when ::String
-          @ruri
-        when ::OverSIP::SIP::Uri, ::OverSIP::SIP::NameAddr
-          @ruri.uri
-        end
-
-      msg = "#{@sip_method.to_s} #{ruri} SIP/2.0\r\n"
+      msg = "#{@sip_method.to_s} #{@ruri.uri} SIP/2.0\r\n"
 
       @headers.each do |name, value|
         msg << name << ": #{value}\r\n"

data/lib/oversip/sip/uri.rb

@@ -3,6 +3,14 @@ module OverSIP::SIP
   class Uri
     attr_reader :scheme, :user, :host, :host_type, :port, :params, :transport_param, :phone_context_param, :ovid_param, :headers
 
+
+    def self.parse value
+      uri = ::OverSIP::SIP::MessageParser.parse_uri value, false
+      raise ::OverSIP::ParsingError, "invalid URI #{value.inspect}"  unless uri.is_a? (::OverSIP::SIP::Uri)
+      uri
+    end
+
+
     def initialize scheme=:sip, user=nil, host=nil, port=nil
       @scheme = scheme.to_sym
       @user = user
@@ -63,7 +71,13 @@ module OverSIP::SIP
       @params ||= {}
     end
 
+    def has_param? k
+      return nil  if unknown_scheme?
+      params.include? k.to_s.downcase
+    end
+
     def get_param k
+      return nil  if unknown_scheme?
       params[k.to_s.downcase]
     end
 
@@ -84,6 +98,16 @@ module OverSIP::SIP
       false
     end
 
+    def clear_params
+      return nil  if unknown_scheme?
+      return false  unless @params
+      @params.clear
+      @transport_param = nil
+      @phone_context_param = nil
+      @uri_modified = true
+      true
+    end
+
     def transport_param= value
       return nil  unless @scheme == :sip or @scheme == :sips
       if value

data/lib/oversip/version.rb

@@ -4,8 +4,8 @@ module OverSIP
 
   module Version
     MAJOR = 1
-    MINOR = 3
-    TINY  = 8
+    MINOR = 4
+    TINY  = 0
     DEVEL = nil  # Set to nil for stable releases.
   end
 
@@ -16,6 +16,6 @@ module OverSIP
   AUTHOR_EMAIL = "ibc@aliax.net"
   HOMEPAGE = "http://www.oversip.net"
   year = "2012-2013"
-  DESCRIPTION = "#{PROGRAM_NAME} #{VERSION}\n#{HOMEPAGE}\n#{year}, #{AUTHOR} <#{AUTHOR_EMAIL}>"
+  DESCRIPTION = "#{PROGRAM_NAME} #{VERSION}\n#{HOMEPAGE}\n#{year}, #{AUTHOR} <#{AUTHOR_EMAIL}>\nSoftware by Versatica: http://www.versatica.com"
 
 end

data/lib/oversip/websocket/launcher.rb

@@ -50,11 +50,16 @@ module OverSIP::WebSocket
       case
 
         when klass == ::OverSIP::WebSocket::IPv4WsServer
-          klass.via_core = "SIP/2.0/WS #{uri_ip}:#{port}"
-          klass.record_route = "<sip:#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_record_route_fragment = "@#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_path_fragment = "@#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
-
+          if ::OverSIP.configuration[:websocket][:advertised_ipv4]
+            used_uri_host = ::OverSIP.configuration[:websocket][:advertised_ipv4]
+          else
+            used_uri_host = uri_ip
+          end
+          klass.via_core = "SIP/2.0/WS #{used_uri_host}:#{port}"
+          klass.record_route = "<sip:#{used_uri_host}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{used_uri_host}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{used_uri_host}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+          
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
@@ -63,10 +68,15 @@ module OverSIP::WebSocket
           end
 
         when klass == ::OverSIP::WebSocket::IPv6WsServer
-          klass.via_core = "SIP/2.0/WS #{uri_ip}:#{port}"
-          klass.record_route = "<sip:#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_record_route_fragment = "@#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_path_fragment = "@#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+          if ::OverSIP.configuration[:websocket][:advertised_ipv6]
+            used_uri_host = "[#{::OverSIP.configuration[:websocket][:advertised_ipv6]}]"
+          else
+            used_uri_host = uri_ip
+          end
+          klass.via_core = "SIP/2.0/WS #{used_uri_host}:#{port}"
+          klass.record_route = "<sip:#{used_uri_host}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{used_uri_host}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{used_uri_host}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
 
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
@@ -76,11 +86,17 @@ module OverSIP::WebSocket
           end
 
         when klass == ::OverSIP::WebSocket::IPv4WssServer
-          klass.via_core = "SIP/2.0/WSS #{uri_ip}:#{port}"
-          rr_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv4] || uri_ip
-          klass.record_route = "<sip:#{rr_host}:#{port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_record_route_fragment = "@#{rr_host}:#{port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_path_fragment = "@#{rr_host}:#{port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+          if ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv4]
+            used_uri_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv4]
+          elsif ::OverSIP.configuration[:websocket][:advertised_ipv4]
+            used_uri_host = ::OverSIP.configuration[:websocket][:advertised_ipv4]
+          else
+            used_uri_host = uri_ip
+          end
+          klass.via_core = "SIP/2.0/WS #{used_uri_host}:#{port}"
+          klass.record_route = "<sip:#{used_uri_host}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{used_uri_host}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{used_uri_host}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
 
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
@@ -90,11 +106,17 @@ module OverSIP::WebSocket
           end
 
         when klass == ::OverSIP::WebSocket::IPv6WssServer
-          klass.via_core = "SIP/2.0/WSS #{uri_ip}:#{port}"
-          rr_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv6] || uri_ip
-          klass.record_route = "<sips:#{rr_host}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_record_route_fragment = "@#{rr_host}:#{port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_path_fragment = "@#{rr_host}:#{port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+          if ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv6]
+            used_uri_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv6]
+          elsif ::OverSIP.configuration[:websocket][:advertised_ipv6]
+            used_uri_host = "[#{::OverSIP.configuration[:websocket][:advertised_ipv6]}]"
+          else
+            used_uri_host = uri_ip
+          end
+          klass.via_core = "SIP/2.0/WS #{used_uri_host}:#{port}"
+          klass.record_route = "<sip:#{used_uri_host}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{used_uri_host}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{used_uri_host}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
 
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
@@ -104,11 +126,17 @@ module OverSIP::WebSocket
           end
 
         when klass == ::OverSIP::WebSocket::IPv4WssTunnelServer
-          klass.via_core = "SIP/2.0/WSS #{uri_virtual_ip}:#{virtual_port}"
-          rr_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv4] || uri_virtual_ip
-          klass.record_route = "<sip:#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_record_route_fragment = "@#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_path_fragment = "@#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+          if ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv4]
+            used_uri_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv4]
+          elsif ::OverSIP.configuration[:websocket][:advertised_ipv4]
+            used_uri_host = ::OverSIP.configuration[:websocket][:advertised_ipv4]
+          else
+            used_uri_host = uri_virtual_ip
+          end
+          klass.via_core = "SIP/2.0/WSS #{used_uri_host}:#{virtual_port}"
+          klass.record_route = "<sip:#{used_uri_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{used_uri_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{used_uri_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
 
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
@@ -118,12 +146,18 @@ module OverSIP::WebSocket
           end
 
         when klass == ::OverSIP::WebSocket::IPv6WssTunnelServer
-          klass.via_core = "SIP/2.0/WSS #{uri_virtual_ip}:#{virtual_port}"
-          rr_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv6] || uri_virtual_ip
-          klass.record_route = "<sip:#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_record_route_fragment = "@#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_path_fragment = "@#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
-
+          if ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv6]
+            used_uri_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv6]
+          elsif ::OverSIP.configuration[:websocket][:advertised_ipv6]
+            used_uri_host = "[#{::OverSIP.configuration[:websocket][:advertised_ipv6]}]"
+          else
+            used_uri_host = uri_virtual_ip
+          end
+          klass.via_core = "SIP/2.0/WSS #{used_uri_host}:#{virtual_port}"
+          klass.record_route = "<sip:#{used_uri_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{used_uri_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{used_uri_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+          
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection

data/lib/oversip.rb

@@ -1,3 +1,9 @@
+# 
+# OverSIP
+# Copyright (c) 2012-2013 Iñaki Baz Castillo - Versatica <http://www.versatica.com>
+# MIT License
+#
+
 # Ruby built-in libraries.
 
 require "etc"

data/test/test_name_addr_parser.rb

@@ -0,0 +1,24 @@
+# coding: utf-8
+
+require "oversip_test_helper"
+
+
+class TestNameAddrParser < OverSIPTest
+
+  def test_parse_name_addr
+    name_addr_str = '"Iñaki" <sips:i%C3%B1aki@aliax.net:5060;transport=tcp;foo=123;baz?X-Header-1=qwe&X-Header-2=asd>'
+    aor = "sip:i%C3%B1aki@aliax.net"
+
+    name_addr = ::OverSIP::SIP::NameAddr.parse name_addr_str
+
+    assert_equal ::OverSIP::SIP::NameAddr, name_addr.class
+    assert_equal "Iñaki", name_addr.display_name
+    assert_true name_addr.sip?
+    assert_false name_addr.unknown_scheme?
+    assert_equal "iñaki", name_addr.user
+    assert_equal "123", name_addr.get_param("Foo")
+    assert_equal aor, name_addr.aor
+    assert_equal name_addr_str, name_addr.to_s
+  end
+
+end

data/test/{test_sip_parser.rb → test_sip_message_parser.rb}

@@ -3,7 +3,7 @@
 require "oversip_test_helper"
 
 
-class TestSipParser < OverSIPTest
+class TestSipMessageParser < OverSIPTest
 
   def parse data
     parser = OverSIP::SIP::MessageParser.new
@@ -149,6 +149,20 @@ END
     assert_equal ["aaa", "bbb", "ccc"], msg.require
     assert_equal ["aaa", "bbb", "ccc"], msg.proxy_require
     assert_equal ["aaa", "bbb", "ccc"], msg.supported
+
+    # Change the full RURI and test again.
+    msg.ruri = ::OverSIP::SIP::Uri.new :sips, "iñaki", "aliax.net", 7070
+
+    assert_equal :sips, msg.ruri.scheme
+    assert_equal "iñaki", msg.ruri.user
+    assert_equal "aliax.net", msg.ruri.host
+    assert_equal :domain, msg.ruri.host_type
+    assert_equal 7070, msg.ruri.port
+    assert_equal({}, msg.ruri.params)
+    assert_nil msg.ruri.headers
+    assert_nil msg.ruri.transport_param
+    assert_nil msg.ruri.phone_context_param
+    assert_equal "sips:i%C3%B1aki@aliax.net:7070", msg.ruri.to_s
   end
 
 end

data/test/test_sip_uri_parser.rb

@@ -0,0 +1,56 @@
+# coding: utf-8
+
+require "oversip_test_helper"
+
+
+class TestSipUriParser < OverSIPTest
+
+  def test_parse_sip_uri
+    uri_str = "sips:i%C3%B1aki@aliax.net:5060;transport=tcp;foo=123;baz?X-Header-1=qwe&X-Header-2=asd"
+    aor = "sip:i%C3%B1aki@aliax.net"
+
+    uri = ::OverSIP::SIP::Uri.parse uri_str
+
+    assert_equal ::OverSIP::SIP::Uri, uri.class
+    assert_true uri.sip?
+    assert_false uri.unknown_scheme?
+    assert_equal "iñaki", uri.user
+    assert_true uri.has_param? "FOO"
+    assert_false uri.has_param? "LALALA"
+    assert_equal "123", uri.get_param("Foo")
+    assert_equal aor, uri.aor
+    assert_equal uri_str, uri.to_s
+  end
+
+  def test_parse_tel_uri
+    uri_str = "tel:944991212;foo=bar;phone-context=+34"
+    aor = "tel:944991212"
+
+    uri = ::OverSIP::SIP::Uri.parse uri_str
+
+    assert_equal ::OverSIP::SIP::Uri, uri.class
+    assert_true uri.tel?
+    assert_false uri.unknown_scheme?
+    assert_equal "944991212", uri.number
+    assert_true uri.has_param? "FOO"
+    assert_false uri.has_param? "LALALA"
+    assert_equal "bar", uri.get_param("Foo")
+    assert_equal aor, uri.aor
+    assert_equal uri_str, uri.to_s
+  end
+
+  def test_parse_http_uri
+    uri_str = "http://oversip.net/authors/"
+    aor = nil
+
+    uri = ::OverSIP::SIP::Uri.parse uri_str
+
+    assert_equal ::OverSIP::SIP::Uri, uri.class
+    assert_false uri.sip?
+    assert_false uri.tel?
+    assert_true uri.unknown_scheme?
+    assert_nil uri.has_param? "FOO"
+    assert_nil uri.aor
+    assert_equal uri_str, uri.to_s
+  end
+end

data/test/test_uri.rb

@@ -22,6 +22,11 @@ class TestUri < OverSIPTest
     assert_equal "123", uri.get_param("Foo")
     assert_equal aor, uri.aor
     assert_equal full_uri, uri.to_s
+
+    uri.clear_params
+
+    assert_equal({}, uri.params)
+    assert_equal "sips:i%C3%B1aki@aliax.net:5060?X-Header-1=qwe&X-Header-2=asd", uri.to_s
   end
 
   def test_tel_uri
@@ -39,6 +44,11 @@ class TestUri < OverSIPTest
     assert_equal "bar", uri.get_param("Foo")
     assert_equal aor, uri.aor
     assert_equal full_uri, uri.to_s
+
+    uri.clear_params
+
+    assert_equal({}, uri.params)
+    assert_equal aor, uri.to_s
   end
 
   def test_http_uri
@@ -53,5 +63,6 @@ class TestUri < OverSIPTest
     assert_true uri.unknown_scheme?
     assert_nil uri.aor
     assert_equal full_uri, uri.to_s
+    assert_nil uri.clear_params
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oversip
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine-le
@@ -292,8 +292,9 @@ files:
 - ext/sip_parser/sip_parser.h
 - ext/sip_parser/ext_help.h
 - ext/sip_parser/common_headers.h
-- ext/sip_parser/sip_parser.c
+- ext/sip_parser/sip_uri_parser.c
 - ext/sip_parser/sip_parser_ruby.c
+- ext/sip_parser/sip_message_parser.c
 - ext/stun/extconf.rb
 - ext/stun/ext_help.h
 - ext/stun/stun_ruby.c
@@ -332,10 +333,12 @@ files:
 - AUTHORS
 - LICENSE
 - test/oversip_test_helper.rb
-- test/test_sip_parser.rb
+- test/test_name_addr_parser.rb
+- test/test_sip_uri_parser.rb
 - test/test_http_parser.rb
 - test/test_name_addr.rb
 - test/test_uri.rb
+- test/test_sip_message_parser.rb
 - bin/oversip
 homepage: http://www.oversip.net
 licenses: []
@@ -363,8 +366,10 @@ specification_version: 3
 summary: OverSIP (the SIP framework you dreamed about)
 test_files:
 - test/oversip_test_helper.rb
-- test/test_sip_parser.rb
+- test/test_name_addr_parser.rb
+- test/test_sip_uri_parser.rb
 - test/test_http_parser.rb
 - test/test_name_addr.rb
 - test/test_uri.rb
+- test/test_sip_message_parser.rb
 has_rdoc: false