kerio-api 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f33843055272aaabc1ddbaa0528b64cc375815a
-  data.tar.gz: 3ca7ed5d050f30fad86d41ee4b17c2499683f81f
+  metadata.gz: ed1d374f7e67728c9f81ee24c8c484adb617d85c
+  data.tar.gz: 5cc20455c029cc1c11b9e3bf447f3079eff7aca6
 SHA512:
-  metadata.gz: 7b28b48ac50dc786cd61d4dbfe1755811980a078d06cf20d684fe979d08e9a083ef26527500f1de3610ea90ab5ad0e9ce7f0b47af7897a2331570e72f03bf379
-  data.tar.gz: bb3daf474faca0629831d297c50d78469a34027cdb2a1a5a76c8be2501b47cb3b826aa4255284d3b9afe5f0d99d90f3c0f60afe46f34b366274131053f0a5d32
+  metadata.gz: a05b48afc2d4064f818befd652001380d7bf173f92794ad8e9387dbcdee72fe9d1e97101e712ecf84011dd21ecffd5917af0868dbcc20e1fa4bc1cdfd71468cf
+  data.tar.gz: 22dac90f622f009efccb0f843f186afd77a782ac11f155be876984e487af8cd77584af2a83aa98444d35a817bbf37051e1576d803dd342ae41da3df078e4cae6

data/lib/kerio-api/client.rb

@@ -7,12 +7,13 @@ module Kerio
 		class Client
 			include Kerio::Api::ChainableMethod
 
-			def initialize (params)
+			# Create new instance of the client
+			#
+			# @param url [URL] an URL of the API endpoint
+			# @param insecure [TrueClass] whether to ignore ssl verification error (true/false)
+			def initialize (url: nil, insecure: false)
 
-				verify_ssl = true
-				verify_ssl = !params[:insecure] if not params[:insecure].nil?
-
-				@session = Kerio::Api::Session.new(params[:url], verify_ssl)
+				@session = Kerio::Api::Session.new(url, !insecure)
 			end
 
 			def method_missing(method, *args, &block)

data/lib/kerio-api/error.rb

@@ -2,15 +2,32 @@ module Kerio
 	module Api
 		class Error < StandardError
 
-			attr_reader :resp, :headers
+			# Returns HTTP response as returned by used http library
+			attr_reader :resp
 
-			def initialize resp, headers
+			def initialize resp
 				@resp = resp
-				@headers = headers
 			end
 
+			# Returns HTTP headers returned by the server
+			def headers
+				return @resp.headers
+			end
+
+			# Returns HTTP code returned by the server
+			def code
+				return @resp.code
+			end
+
+			# Formats human readable error message
 			def to_s
-				return @resp["error"]["message"]
+				s = "Http code: #{code}"
+
+				if not @resp["jsonrpc"].nil?
+					s += ", json-rpc message: #{@resp["error"]["message"]}"
+				end
+
+				return s
 			end
 		end
 	end

data/lib/kerio-api/method/generic.rb

@@ -14,18 +14,17 @@ module Kerio
 
 					@block = params[:block]
 
-					__invoke_method if @args.count > 0
+					if ((@args.count > 0) || (@names.count == 2))
+						__invoke_method
+					end
 				end
 
 				def __invoke_method
-					if @resp.nil?
 						name = @names.join('.')
 						@resp = @session.json_method(name, @args[0])
-					end
 				end
 
 				def __result
-					__invoke_method
 					return @resp['result']
 				end
 

data/lib/kerio-api/session.rb

@@ -28,7 +28,7 @@ module Kerio
 			def process_json_response(resp)
 				@cookie = resp.headers['Set-Cookie'] if not resp.headers['Set-Cookie'].nil?
 
-				raise Kerio::Api::Error.new(resp, headers) if ((not resp["error"].nil?) || (resp.code != 200))
+				raise Kerio::Api::Error.new(resp) if ((not resp["error"].nil?) || (resp.code != 200))
 			end
 
 			def json_method(name, params)
@@ -91,7 +91,7 @@ module Kerio
 					yield fragment
 				end
 
-				raise Kerio::Api::Error.new(resp, headers) if resp.code != 200
+				raise Kerio::Api::Error.new(resp) if resp.code != 200
 
 				return {"result" => {"code" => resp.code}}
 			end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kerio-api
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Petr Baloun
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
 description: This gem allows simple access to administration API of Kerio products
 email: balounp@gmail.com
 executables: []
@@ -107,7 +121,6 @@ files:
 - lib/kerio-api/method/download.rb
 - lib/kerio-api/method/generic.rb
 - lib/kerio-api/method/session/login.rb
-- lib/kerio-api/method/session/logout.rb
 - lib/kerio-api/method/upload.rb
 - lib/kerio-api/session.rb
 homepage: https://github.com/balous/ruby-kerio-api

data/lib/kerio-api/method/session/logout.rb

@@ -1,16 +0,0 @@
-module Kerio
-	module Api
-		module Method
-			module Session 
-				class Logout < Kerio::Api::Method::Generic
-
-					#make sure the method is invoked immediately
-					def initialize(params)
-						super
-						__invoke_method
-					end
-				end
-			end
-		end
-	end
-end