opensips-mi 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmZiZDk4M2Y0ZTUyZmE5ZTkxYjI4ZWJjMDM4ZGYzNDlmYjk1M2RmZg==
+    ZThhYmE0OGQxNWQ4ZTg2MGI0OWU3YTA2NmE1MjllZDJmYjU0YjIyYQ==
   data.tar.gz: !binary |-
-    NTFhNTVjYWYzZGUyMmEyMDM2ZTk3OGJiYzUwY2EwMDU4ZTYzZDE2MQ==
+    MTQ4ZTAyYzViMWE2OGI3YmYzMTRhN2Y4Y2RhYWE3YWFmOTczMTc5Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTQ0YWQwNWUyZjQ3MTJhNDUxNmE3NDBiOTg3M2IyZDc0NzZiYTQ3ZDU1OTQx
-    ODQ5OTJkNDQxZjE5OGFhZGJjYWI1MGFhYmFmYjU5NmVjYTIwZTg5ZGE5N2E0
-    OWE0NTVmYTQ1ZjNkOGE0ODQ1N2MwNGM1NWZlZTVmMTI5OWFlZDU=
+    YWJmODcxMzQyNWM4MmEwNmYzOTkwYzg0MGI3NTJjY2JkZmE5MzZlYjA3OTNi
+    NmU1YWI0Yjg0NmNlZDI1MmM4NDRjODFhNTRjNTExZDRmYTA0NmEwYjc3YzRi
+    MjljMDJkOWJiZTJlZWI3MzMzYjY1ZTc3NDNlNTk5MjUzYmE2YjM=
   data.tar.gz: !binary |-
-    ZWM5YjZjYTkzZDRlZGFlOWYzOWI1ODFjYTk2ZDQyNzhjOThlYjUzNzVhM2Q3
-    YzRhNTUyZTQ2YzkzMTUzNjc1MjI0MDU3ZGJhMmI3NmM2NzUyMzEwYTYyOWMw
-    NDk4MDUyMjU1ZTZhZmViYWVlYTdkMzA2N2M0M2RjMzQxYzAyNDA=
+    ZjUwNzE0ZTU2ODJjMTgwMTQ3NzgwZjgyODM5NjA3MWU4MjZjMjUyZGU4MjBk
+    ZmFlYjZkYmRkMjFkYTdhYmE4YWJmYzYzMzMyNGZhOTE1ZmMzYTllNDgzNzBl
+    YTc5MGY4MmIyZTlhNGVmNGU1NzhlZWE0M2VkYjI5ZDY2ZTkyNDg=

data/README.md

@@ -1,4 +1,7 @@
 # Opensips::Mi
+[![Build Status](https://travis-ci.org/staskobzar/opensips-mi.png?branch=master)](https://travis-ci.org/staskobzar/opensips-mi)
+[![Code Climate](https://codeclimate.com/github/staskobzar/opensips-mi.png)](https://codeclimate.com/github/staskobzar/opensips-mi)
+[![Gem Version](https://badge.fury.io/rb/opensips-mi.png)](http://badge.fury.io/rb/opensips-mi)
 
 OpenSIPs management interface library. 
 This library supports following management interfaces OpenSIPs modules:

data/lib/opensips/mi/command.rb

@@ -87,10 +87,8 @@ module Opensips
         headers = hf.map{|name,val| name.eql?("nl") ? "" : "#{name}: #{val}"}.join "\r\n"
         headers << "\r\n"
         
-        # hack for xmlrpc which fails if headers are quoted
-        headers = set_header(headers) 
-        #params = [method, ruri, next_hop, socket, "\"#{headers}\""]
-        params = [method, ruri, next_hop, socket, headers]
+        # set_header is a hack for xmlrpc which fails if headers are quoted
+        params = [method, ruri, next_hop, socket, set_header(headers)]
         params << body unless body.nil?
         # send it and return Response
         command 't_uac_dlg', params
@@ -160,7 +158,20 @@ module Opensips
         uac_dlg "NOTIFY", uri, hf.merge(mbody)
       end
 
-      def set_header(header);"\"#{header}\"";end
+      private
+        def set_header(header);"\"#{header}\"";end
+
+        def host_valid? params
+          raise ArgumentError,
+            'Missing socket host' if params[:host].nil?
+          raise ArgumentError,
+            'Missing socket port' if params[:port].nil?
+          Socket.getaddrinfo(params[:host], nil) rescue 
+            raise SocketError, "Invalid host #{params[:host]}" 
+          raise SocketError, 
+            "Invalid port #{params[:port]}" unless (1..(2**16-1)).include?(params[:port])
+          true
+        end
       
     end
   end

data/lib/opensips/mi/transport/datagram.rb

@@ -11,14 +11,7 @@ module Opensips
         end
 
         def initialize(params)
-          raise ArgumentError,
-            'Missing socket host' if params[:host].nil?
-          raise ArgumentError,
-            'Missing socket port' if params[:port].nil?
-          Socket.getaddrinfo(params[:host], nil) rescue 
-            raise SocketError, "Invalid host #{params[:host]}" 
-          raise SocketError, 
-            "Invalid port #{params[:port]}" unless (1..(2**16-1)).include?(params[:port])
+          host_valid? params
           @sock = UDPSocket.new
           @sock.connect params[:host], params[:port]
         end

data/lib/opensips/mi/transport/xmlrpc.rb

@@ -10,14 +10,7 @@ module Opensips
         end
 
         def initialize(params)
-          raise ArgumentError,
-            'Missing socket host' if params[:host].nil?
-          raise ArgumentError,
-            'Missing socket port' if params[:port].nil?
-          Socket.getaddrinfo(params[:host], nil) rescue 
-            raise SocketError, "Invalid host #{params[:host]}" 
-          raise SocketError, 
-            "Invalid port #{params[:port]}" unless (1..(2**16-1)).include?(params[:port])
+          host_valid? params
           uri = "http://#{params[:host]}:#{params[:port]}/#{RPCSEG}"
           @client = XMLRPC::Client.new_from_uri(uri, nil, 3)
         rescue => e
@@ -29,10 +22,10 @@ module Opensips
           response = ["200 OK"]
           response += @client.call(cmd, *params).split(?\n)
           response << ""
-          Opensips::MI::Response.new response
         rescue => e
           response = ["600 " << e.message]
-          Opensips::MI::Response.new response
+        ensure
+          return Opensips::MI::Response.new response
         end
 
         def set_header(header);header;end

data/lib/opensips/mi/version.rb

@@ -1,5 +1,5 @@
 module Opensips
   module MI
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opensips-mi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Stas Kobzar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: OpenSIPs management interface