callr 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5398d8f6a0ed2b5c6901e0db2f2bab33e14d2d95
-  data.tar.gz: 6ef2ae702f7a37c9c94872d11a939daa1ffbea2e
+  metadata.gz: a348a5af36634ec06084fe4e3f5cd1dc6f245adb
+  data.tar.gz: 227abcce7f42089b33ea4750d7c92ae32be022ef
 SHA512:
-  metadata.gz: 70562f9bee8ade7fa77a1022e0390996dbf3b70dec4fd850af26f21a90b50f723cdda42b12ef6007eb6e8763e4e9cef79af525d35e94a2696efc308cca735e03
-  data.tar.gz: 99642a6fdc67ceb99fdf2a3f5752d8d9a23a108c9222cfa78d92e0bd6fc353023d40c2e9f4a71c1b32f3e07e03f8a4a94d616ee5c952ee05bb7e3dccc12fd32a
+  metadata.gz: d9d063ef18d0845c85819d83638a3bff59e3831ea7450166ac98082a2342cdfa28e92a3de9671ca47ae2849cfb5844894303141bb8cd60d518424eb09d4fc761
+  data.tar.gz: 10b64324cf43a63179551a8599a41640ecf9b51391a3970e445882fc885e30e4f8689ec00360e87314a6093eef182232aef07a0c8758d2fdab895444905017b6

data/lib/callr.rb

@@ -6,153 +6,168 @@ require 'net/https'
 require 'uri'
 require 'json'
 
-SDK_VERSION = "1.1.1"
+SDK_VERSION = "1.2.0"
 
 module CALLR
-	class Api
-		@login = nil
-		@password = nil
-		@proxy = nil
-		@headers = {
-			"Expect" => "",
-			"Content-Type" => "application/json-rpc; charset=utf-8"
-		}
-
-		API_URL = "https://api.callr.com/json-rpc/v1.1/"
-
-		###
-		# Initialization
-		# @param string login
-		# @param string password
-		###
-		def initialize(login, password, options = nil)
-			@login = login
-			@password = password
-			set_options(options)
-		end
-
-
-		public
-		def set_options(options)
-			if options.is_a?(Hash)
-				options = symbolize_keys(options)
-				set_proxy(options[:proxy]) if options.has_key?(:proxy)
-			end
-		end
-
-		def set_proxy(proxy)
-			if proxy.is_a?(String)
-				@proxy = URI.parse(proxy)
-			else
-				raise CallrLocalException.new("PROXY_NOT_STRING", 1)
-			end
-		end
-
-		###
-		# Send a request to CALLR webservice
-		###
-		def call(method, *params)
-			send(method, params)
-		end
-
-		###
-		# Send a request to CALLR webservice
-		###
-		def send(method, params = [], id = nil)
-			check_auth()
-
-			json = {
-				:id => id.nil? || id.is_a?(Integer) == false ? rand(999 - 100) + 100 : id,
-				:jsonrpc => "2.0",
-				:method => method,
-				:params => params.is_a?(Array) ? params : []
-			}.to_json
-
-			uri = URI.parse(API_URL)
-			http = http_or_http_proxy(uri)
-
-			req = Net::HTTP::Post.new(uri.request_uri, @headers)
-			req.basic_auth(@login, @password)
-			req.add_field('User-Agent', "sdk=RUBY; sdk-version=#{SDK_VERSION}; lang-version=#{RUBY_VERSION}; platform=#{RUBY_PLATFORM}")
-
-			begin
-				res = http.request(req, json)
-				if res.code.to_i != 200
-					raise CallrException.new("HTTP_CODE_ERROR", -1, {:http_code => res.code.to_i, :http_message => res.message})
-				end
-				return parse_response(res)
-			rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Errno::ETIMEDOUT, Errno::ECONNREFUSED,
-					Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
-				raise CallrException.new("HTTP_EXCEPTION", -2, {:exception => e})
-			end
-		end
-
-
-		private
-		def symbolize_keys(hash)
-			res = {}
-			hash.map do |k,v|
-				res[k.to_sym] = v.is_a?(Hash) ? symbolize_keys(v) : v
-			end
-			return res
-		end
-
-		def check_auth
-			if @login.nil? || @password.nil? || @login.length == 0 || @password.length == 0
-				raise CallrLocalException.new("CREDENTIALS_NOT_SET", 1)
-			end
-		end
-
-		def http_or_http_proxy(uri)
-			if not @proxy.nil?
-				http = Net::HTTP::Proxy(
-					@proxy.host,
-					@proxy.port,
-					@proxy.user,
-					@proxy.password
-				).new(uri.host, uri.port)
-			else
-				http = Net::HTTP.new(uri.host, uri.port)
-			end
-
-			http.use_ssl = uri.scheme == "https"
-			http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-			http.open_timeout = 10
-			http.read_timeout = 10
-
-			return http
-		end
-
-		###
-		# Response analysis
-		###
-		def parse_response(res)
-			begin
-				data = JSON.parse(res.body)
-				if data.nil? == false && data.has_key?("result") && data["result"].nil? == false
-					return data["result"]
-				elsif data.nil? == false && data.has_key?("error") && data["error"].nil? == false
-					raise CallrException.new(data["error"]["message"], data["error"]["code"], nil)
-				else
-					raise CallrException.new("INVALID_RESPONSE", -3, {:response => res.body})
-				end
-			rescue JSON::ParserError
-				raise CallrException.new("INVALID_RESPONSE", -3, {:response => res.body})
-			end
-		end
-	end
-
-	class CallrException < Exception
-		attr_reader :msg
-		attr_reader :code
-		attr_reader :data
-
-		def initialize(msg, code = 0, data = nil)
-			@msg = msg
-			@code = code
-			@data = data
-		end
-	end
-
-	class CallrLocalException < CallrException; end
-end
+  class Api
+    @login = nil
+    @password = nil
+    @proxy = nil
+    @login_as = nil
+    @headers = {
+      "Expect" => "",
+      "Content-Type" => "application/json-rpc; charset=utf-8"
+    }
+
+    API_URL = "https://api.callr.com/json-rpc/v1.1/"
+
+    ###
+    # Initialization
+    # @param string login
+    # @param string password
+    ###
+    def initialize(login, password, options = nil)
+      @login = login
+      @password = password
+      set_options(options)
+    end
+
+
+    public
+    def set_options(options)
+      if options.is_a?(Hash)
+        options = symbolize_keys(options)
+        set_proxy(options[:proxy]) if options.has_key?(:proxy)
+      end
+    end
+
+    def set_login_as(type, target)
+      case type
+      when 'user'
+        type = 'User.login'
+      when 'account'
+        type = 'Account.hash'
+      else
+        raise CallrLocalException.new("INVALID_LOGIN_AS_TYPE", 2)
+      end
+
+      @login_as = "#{type} #{target}"
+    end
+
+    def set_proxy(proxy)
+      if proxy.is_a?(String)
+        @proxy = URI.parse(proxy)
+      else
+        raise CallrLocalException.new("PROXY_NOT_STRING", 1)
+      end
+    end
+
+    ###
+    # Send a request to CALLR webservice
+    ###
+    def call(method, *params)
+      send(method, params)
+    end
+
+    ###
+    # Send a request to CALLR webservice
+    ###
+    def send(method, params = [], id = nil)
+      check_auth()
+
+      json = {
+        :id => id.nil? || id.is_a?(Integer) == false ? rand(999 - 100) + 100 : id,
+        :jsonrpc => "2.0",
+        :method => method,
+        :params => params.is_a?(Array) ? params : []
+      }.to_json
+
+      uri = URI.parse(API_URL)
+      http = http_or_http_proxy(uri)
+
+      req = Net::HTTP::Post.new(uri.request_uri, @headers)
+      req.basic_auth(@login, @password)
+      req.add_field('User-Agent', "sdk=RUBY; sdk-version=#{SDK_VERSION}; lang-version=#{RUBY_VERSION}; platform=#{RUBY_PLATFORM}")
+      req.add_field('CALLR-Login-As', @login_as) unless @login_as.to_s.empty?
+
+      begin
+        res = http.request(req, json)
+        if res.code.to_i != 200
+          raise CallrException.new("HTTP_CODE_ERROR", -1, {:http_code => res.code.to_i, :http_message => res.message})
+        end
+        return parse_response(res)
+      rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Errno::ETIMEDOUT, Errno::ECONNREFUSED,
+          Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+        raise CallrException.new("HTTP_EXCEPTION", -2, {:exception => e})
+      end
+    end
+
+
+    private
+    def symbolize_keys(hash)
+      res = {}
+      hash.map do |k,v|
+        res[k.to_sym] = v.is_a?(Hash) ? symbolize_keys(v) : v
+      end
+      return res
+    end
+
+    def check_auth
+      if @login.nil? || @password.nil? || @login.length == 0 || @password.length == 0
+        raise CallrLocalException.new("CREDENTIALS_NOT_SET", 1)
+      end
+    end
+
+    def http_or_http_proxy(uri)
+      if not @proxy.nil?
+        http = Net::HTTP::Proxy(
+          @proxy.host,
+          @proxy.port,
+          @proxy.user,
+          @proxy.password
+        ).new(uri.host, uri.port)
+      else
+        http = Net::HTTP.new(uri.host, uri.port)
+      end
+
+      http.use_ssl = uri.scheme == "https"
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      http.open_timeout = 10
+      http.read_timeout = 10
+
+      return http
+    end
+
+    ###
+    # Response analysis
+    ###
+    def parse_response(res)
+      begin
+        data = JSON.parse(res.body)
+        if data.nil? == false && data.has_key?("result") && data["result"].nil? == false
+          return data["result"]
+        elsif data.nil? == false && data.has_key?("error") && data["error"].nil? == false
+          raise CallrException.new(data["error"]["message"], data["error"]["code"], nil)
+        else
+          raise CallrException.new("INVALID_RESPONSE", -3, {:response => res.body})
+        end
+      rescue JSON::ParserError
+        raise CallrException.new("INVALID_RESPONSE", -3, {:response => res.body})
+      end
+    end
+  end
+
+  class CallrException < Exception
+    attr_reader :msg
+    attr_reader :code
+    attr_reader :data
+
+    def initialize(msg, code = 0, data = nil)
+      @msg = msg
+      @code = code
+      @data = data
+    end
+  end
+
+  class CallrLocalException < CallrException; end
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: callr
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael JACQUIN
 - Vincent MERCIER
+- Baptiste CLAVIE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json