Merge pull request #5 from workgena/remove-xml-and-change-cmd-options

Remove xml and change cmd options

Author: dmitry-sinina

lib/yetis_node.rb

@@ -5,7 +5,6 @@
 require 'yetis_node/cmd/request'
 require 'yetis_node/error'
 require 'yetis_node/base_transport'
-require 'yetis_node/xml_rpc_transport'
 require 'yetis_node/json_rpc_transport'
 require 'yetis_node/client'
 

lib/yetis_node/client.rb

@@ -16,7 +16,7 @@ class Client
     def initialize(uri, options = {})
       @uri = uri
       @options = options
-      select_transport!
+      @transport = JsonRpcTransport.new(@uri, @options)
     end
 
     include Cmd::Base
@@ -26,21 +26,5 @@ def initialize(uri, options = {})
 
     protected :invoke_show, :invoke_request, :invoke_set
 
-    private
-
-    def select_transport!
-      transport_klass = case @options.fetch(:transport, :xml_rpc)
-                          when :xml_rpc
-                            XmlRpcTransport
-                          when :json_rpc
-                            JsonRpcTransport
-                          else
-                            raise Error.new('invalid transport')
-                        end
-
-      @transport = transport_klass.new(@uri, @options)
-    end
-
   end
 end
-  

lib/yetis_node/cmd/base.rb

@@ -3,7 +3,7 @@ module Cmd
     module Base
 
       def invoke(method, prefix, args = [])
-        rpc_send(*([prefix] + method.to_s.split('_') + args.compact))
+        rpc_send("#{prefix}.#{method}", args)
       end
 
     end

lib/yetis_node/cmd/show.rb

@@ -30,19 +30,19 @@ module Show
       # show version
 
       def registrations_count
-        registrations('count')
+        invoke_show_command('registrations.count')
       end
 
       def registrations(*args)
         invoke_show(args)
       end
 
       def calls_filtered(only = [])
-        calls('filtered', *only)
+        invoke_show_command('calls.filtered', only)
       end
 
       def calls_count
-        calls('count')
+        invoke_show_command('calls.count')
       end
 
       def calls(*args)
@@ -55,33 +55,38 @@ def media_streams
 
 
       def system_status(*args)
-        invoke_show(args)
+        invoke_show_command('system.status', args)
       end
 
       def stats
-        invoke_show
+        invoke_show_command('status')
       end
 
       def configuration
-        invoke_show
+        invoke_show_command('configuration')
       end
 
       def interfaces
-        invoke_show
+        invoke_show_command('interfaces')
       end
 
       def version
-        invoke_show
+        invoke_show_command('version')
       end
 
       def resource_state(type_id, id = nil)
         invoke_show([type_id, id || :all])
       end
 
+      # TODO: clean up this show.rb file
       def invoke_show(args = [])
         invoke(caller_locations(1, 1)[0].label, 'show', args)
       end
 
+      def invoke_show_command(command, params = [])
+        invoke(command, 'show', params)
+      end
+
     end
   end
-end
+end

lib/yetis_node/json_rpc_transport.rb

@@ -1,11 +1,12 @@
 require 'jrpc'
+
 module YetisNode
   class JsonRpcTransport < BaseTransport
 
-    def rpc_send(*args)
+    def rpc_send(method_name, params)
       begin
         json_rpc.connect if json_rpc.closed?
-        result = json_rpc.invoke_request(*args)
+        result = json_rpc.perform_request(method_name, params: params)
         json_rpc.close
         result
       rescue ::JRPC::Error => e

lib/yetis_node/version.rb

@@ -1,3 +1,3 @@
 module YetisNode
-  VERSION = "0.1.1"
+  VERSION = "1.0.0"
 end

lib/yetis_node/xml_rpc_transport.rb

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'jrpc', '~> 0.4', '>= 0.4.6'
+  spec.add_runtime_dependency 'jrpc', '~> 1.0.0', '>= 0.4.6'
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
 end