kerio-api 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60bd63df0d044c5d5256cba7d703fd42e3248d06
-  data.tar.gz: bc687188f6d8b8ff5762909da3b5c0694dd6efad
+  metadata.gz: f69373b20fb3918fec7293e08e4313713d522494
+  data.tar.gz: 810d75d6bb149cce9f7309718493288fdf76c040
 SHA512:
-  metadata.gz: 962ee0afe9eddd3f706c5bd3b5501f79f315b8b49766971f56d3a71c05b3210ee922f5d5d659fa8798b10d42d790ba0f8c4068585043e6c99dc58b2452495e35
-  data.tar.gz: 9865eece372c496c9afee9e218663a7d3fb1fb62cddab3ebeb532abbf354bb6573e9af8cff9159b60bbd6917c3deefc231df062a693e44ba7f08e0bf41ac7c79
+  metadata.gz: b9d2ad2390a67da3333e1382b121d726d0ef36fa712ddfc56f6b1e1445258fec0aeaa50acb1946d256073fee1ca3d6625ec27803580dbc8f6ccaec3b4aed0c0d
+  data.tar.gz: 7cd701832de49f9aa31823239f392a22648d599f4caeb72e70254582289110d259a1f4b00e5b85680d7f3fff8f00f0c47545b9dcfd4d7eacd73cd209c300363d

data/lib/kerio-api/client.rb

@@ -1,23 +1,18 @@
 require 'kerio-api/session'
-require 'kerio-api/interface/generic'
-require 'kerio-api/interface/session'
+require 'kerio-api/chainable_method'
+require 'kerio-api/method/generic'
 
 module Kerio
 	module Api
 		class Client
-			def initialize (params)
+			include Kerio::Api::ChainableMethod
 
+			def initialize (params)
 				@session = Kerio::Api::Session.new(params[:url])
 			end
 
 			def method_missing(method, *args, &block)
-
-				# prefer special implementation over the generic one
-				return Kerio::Api::Interface.const_get(method).new(method, @session)
-
-			rescue NameError
-
-				return Kerio::Api::Interface::Generic.new(method, @session)
+				return next_method(names: [method], session: @session, args: args)
 			end
 		end
 	end

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

@@ -0,0 +1,48 @@
+module Kerio
+	module Api
+		module Method
+			class Generic
+				include Kerio::Api::ChainableMethod
+
+				def initialize (params)
+
+					@names = params[:names]
+
+					@session = params[:session]
+
+					@args = params[:args]
+
+					__invoke_method if @args.count > 0
+				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
+
+				def [](index)
+					return __result[index]
+				end
+
+				def pretty_print pp
+					pp __result
+				end
+
+				def method_missing(method, *args, &block)
+
+					@names.push(method)
+
+					return next_method(names: @names, session: @session, args: args)
+				end
+			end
+		end
+	end
+end
+

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

@@ -0,0 +1,17 @@
+module Kerio
+	module Api
+		module Method
+			module Session 
+				class Login < Kerio::Api::Method::Generic
+
+					# we need special implementation of login method to remember the token
+					def __invoke_method
+
+						super
+						@session.token = @resp['result']['token']
+					end
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,16 @@
+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

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

@@ -0,0 +1,18 @@
+require 'json'
+
+module Kerio
+	module Api
+		module Method
+			class Upload < Kerio::Api::Method::Generic
+
+				def __invoke_method
+					if @resp.nil?
+						raw = @session.upload_file(File.new(@args[0]))
+
+						@resp = JSON.parse(raw)
+					end
+				end
+			end
+		end
+	end
+end

data/lib/kerio-api/session.rb

@@ -1,11 +1,10 @@
 require 'json'
-require 'httparty'
+require 'httmultiparty'
 require 'kerio-api/error'
 
 module Kerio
 	module Api
 		class Session
-
 			attr_writer :token
 
 			def initialize(url)
@@ -15,33 +14,60 @@ module Kerio
 				@cookie = nil
 			end
 
-			def request(method, params)
+			def headers
+				headers = {
+					'Accept' => 'application/json-rpc',
+				}
+				headers['X-Token'] = @token if not @token.nil?
+				headers['Cookie'] = @cookie if not @cookie.nil?
+
+				headers
+			end
+
+			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))
+			end
+
+			def json_method(name, params)
+
 				body = {
 					jsonrpc: '2.0',
 					id: Kernel.rand(10**12),
-					method: method,
+					method: name,
 					params: params,
 				}
 				body['token'] = @token if not @token.nil?
 
-				headers = {
-					'Accept' => 'application/json-rpc',
-				}
-				headers['X-Token'] = @token if not @token.nil?
-				headers['Cookie'] = @cookie if not @cookie.nil?
-
-				resp = HTTParty.post(
+				resp = HTTMultiParty.post(
 					@url.to_s,
 					body: JSON.generate(body),
 					headers: headers,
 					verify: false,
 					follow_redirects: true,
 				)
-				@cookie = resp.headers['Set-Cookie'] if not resp.headers['Set-Cookie'].nil?
 
-				raise Kerio::Api::Error.new(resp, headers) if not resp["error"].nil?
+				process_json_response(resp)
+				return resp
+			end
+
+			def upload_file(file)
+				h = headers
+				h['Accept'] = '*/*'
+				h['Content-Type'] = 'multipart/form-data';
+
+				resp = HTTMultiParty.post(
+					@url.to_s + '/upload',
+					headers: h,
+					verify: false,
+					query: {
+						'newFile.bin': file,
+					}
+				)
 
-				return resp["result"]
+				process_json_response(resp)
+				return resp
 			end
 		end
 	end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: kerio-api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Petr Baloun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-11 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: httmultiparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.3.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.3.16
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.12'
 description: This gem allows simple access to administration API of Kerio products
 email: balounp@gmail.com
 executables: []
@@ -89,8 +89,10 @@ files:
 - lib/kerio-api.rb
 - lib/kerio-api/client.rb
 - lib/kerio-api/error.rb
-- lib/kerio-api/interface/generic.rb
-- lib/kerio-api/interface/session.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
 licenses:

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

@@ -1,16 +0,0 @@
-module Kerio
-	module Api
-		module Interface
-			class Generic
-				def initialize (name, session)
-					@name = name
-					@session = session
-				end
-
-				def method_missing(method, *args, &block)
-					return @session.request("#{@name}.#{method}", args[0])
-				end
-			end
-		end
-	end
-end

data/lib/kerio-api/interface/session.rb

@@ -1,21 +0,0 @@
-require 'kerio-api/interface/generic'
-
-module Kerio
-	module Api
-		module Interface
-			class Session < Kerio::Api::Interface::Generic
-
-				# we need special implementation of login method to remember the token
-				def login(params)
-
-					result = @session.request(
-						'Session.login',
-						params,
-					)
-
-					@session.token = result['token']
-				end
-			end
-		end
-	end
-end