zabx 0.0.1 → 0.0.2

data/lib/zabx/error.rb

@@ -2,17 +2,13 @@ module Zabx
   class Error < StandardError; end
 
   class JsonRpcError < Error
-    attr_reader :message, :code, :data
+    attr_reader :code
 
     def initialize(message, code, data = nil)
-      @message = message
+      message = "#{code}: #{message}"
+      message += " #{data}" unless data.nil?
+      super message
       @code = code
-      @data = data
-    end
-
-    def to_s
-      output = "#{code}: #{message}"
-      output += " #{data}" unless data.nil?
     end
   end
 

data/lib/zabx/json_rpc.rb

@@ -20,7 +20,23 @@ module Zabx
       @options = options
     end
 
-    def single_request(method, args)
+    def invoke(method, args)
+      response = request(method, args)
+      status_code_check(response)
+      parse_response(response.body)
+    end
+
+    def method_missing(method, *args)
+      if args.length == 1 && args[0].is_a?(Hash)
+        invoke(method, args[0])
+      else
+        invoke(method, args)
+      end
+    end
+
+    private
+
+    def request(method, args)
       namespaced_method = @namespace.nil? ? method : "#{@namespace}.#{method}"
       body = @options.merge({
         :jsonrpc => JSON_RPC_VERSION,
@@ -28,14 +44,12 @@ module Zabx
         :params  => args,
         :id      => UUIDTools::UUID.random_create.to_i
       })
-      begin
-        @connection.post @url, body
-      rescue Faraday::ConnectionFailed => exception
-        raise ConnectionError, exception.message
-      end
+      @connection.post @url, body
+    rescue Faraday::ConnectionFailed => exception
+      raise ConnectionError, exception.message
     end
 
-    def single_response(response)
+    def parse_response(response)
       error_check response
       response["result"]
     end
@@ -55,19 +69,5 @@ module Zabx
         raise HttpError, "HTTP server error with status code #{response.status}"
       end
     end
-
-    def invoke(method, args)
-      response = single_request(method, args)
-      status_code_check(response)
-      single_response(response.body)
-    end
-
-    def missing_method(method, *args)
-      if args.length == 1 && args[0].is_a?(Hash)
-        invoke(method, args[0])
-      else
-        invoke(method, args)
-      end
-    end
   end
 end

data/lib/zabx/zabx.rb

@@ -2,24 +2,6 @@ require 'zabx/json_rpc'
 
 module Zabx
   class Api
-    class Query
-      def initialize(url, options = {})
-        @rpc = JsonRpc.new(url, options)
-      end
-
-      def invoke(method, args)
-        @rpc.invoke(method, args)
-      end
-
-      def method_missing(method, *args)
-        if args.length == 1 && args[0].is_a?(Hash)
-          invoke(method, args[0])
-        else
-          invoke(method, args)
-        end
-      end
-    end
-
     def initialize(url, options)
       @url      = url
       @username = options.delete(:username)
@@ -27,24 +9,24 @@ module Zabx
     end
 
     def auth
-      @auth ||= query(:namespace => :user).login(:user => @username, :password => @password)
+      @auth ||= rpc(:namespace => :user).login(:user => @username, :password => @password)
     end
 
     def invoke(method, args = {})
-      query(:auth => auth).invoke(method, args)
+      rpc(:auth => auth).invoke(method, args)
     end
 
     def apiinfo
-      query :namespace => "apiinfo"
+      rpc :namespace => "apiinfo"
     end
 
-    def method_missing(method, *args)
-      query(:auth => auth, :namespace => method)
+    def method_missing method
+      rpc(:auth => auth, :namespace => method)
     end
 
     private
-    def query(options = {})
-      Query.new(@url, options)
+    def rpc(options = {})
+      JsonRpc.new(@url, options)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabx
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json