vexapion 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b59cf177eae960a829717727624d49714484b6
-  data.tar.gz: 3b1cf4c5bda2c08090f1fd7ce20ad843f74f36e5
+  metadata.gz: 97edc5835e99e3259f41a7c369d4ec44c4810b63
+  data.tar.gz: 2035a6f3a8abc9cf5648d238a3394c6f1fec7991
 SHA512:
-  metadata.gz: c2b11378b807f020baf1fba42a87739dba44d59e427f61983da8cf8952381d758c2f835dcb366ae92ee5015f913985ab501e93dbcfc6ae5592eec030d409aa84
-  data.tar.gz: 7b13dbbe0b911625c777b65ae9d7e8eb51d57858587aa301ce3b5beee1e87011833fb6bf101f353786b6f018386fced3b2fe4ffc46e874def80df87a126cae95
+  metadata.gz: 4455d9ade97335a2b9ea1c634311c586dabc6366e7913227731705fec52db37256c24972d72c59dff6cfa74b1be25f9da2a2d909ed3ed80f8147efc1b97f06ce
+  data.tar.gz: 27371b2d387fe28501bd5c6a75b36f40a0e370fb8c084b8fcba4fe82fe90315af1b740a48116ae1ea3dd1275a5cb975f427168f6771ab0da360725d0ead08b75

data/lib/vexapion/base_exchanges.rb

@@ -5,7 +5,7 @@ module Vexapion
 	# Virtual (crypto) Currency Exchanges API wrapper class
 
 	class BaseExchanges
-
+# :stopdoc:			
 		def initialize(key = nil, secret = nil)
 			@key = key
 			@secret = secret
@@ -16,6 +16,11 @@ module Vexapion
 			set_min_interval(0.5)
 		end
 
+		def disconnect
+			@conn.terminate
+		end
+# :startdoc:
+
 		def set_min_interval(sec)
 			@conn.min_interval = sec
 		end
@@ -24,42 +29,24 @@ module Vexapion
 			@verify_mode = mode
 		end
 
+# :stopdoc:			
 		def do_command(uri, request)
-			response = nil
-			begin
+			#response = nil
+			#begin
 				response = @conn.http_request(uri, request, @verify_mode)
-			rescue VexapionRuntimeError => e
-				raise e
-			rescue HTTPError => e
-				raise e
-			end
+			#rescue VexapionRuntimeError => e
+			#	raise e
+			#rescue HTTPError => e
+			#	raise e
+			#end
 
 			response == '' ? '' : JSON.parse(response)
 		end
-			
+
 		def get_nonce
 			@nonce += 1
 		end
-
-		def error_check(res)
-			if res != nil && res != '' && res.kind_of?(Hash)
-				
-				if res['success'] == 0 || res['success'] == 'false'
-				  #polo
-					fail RequestFailed.new(
-						false, false, res)
-				elsif res.has_key?('error')
-				  #zaif, polo
-					fail RequestFailed.new(
-						false, res['error'], res)
-				elsif res.has_key?('error_message') 
-				  #bitflyer
-					fail RequestFailed.new(
-						false, "#{res['status']} #{res['error_message']}", res)
-				end
-			end
-
-		end
+# :startdoc:
 
 	end #of class
 

data/lib/vexapion/bitflyer.rb

@@ -9,7 +9,7 @@ module Vexapion
 	# @see https://lightning.bitflyer.jp/docs?lang=ja&_ga=1.264432847.170149243.1463313992
 
 	class Bitflyer < BaseExchanges
-		
+# :stopdoc:		
 		def initialize(key = nil, secret = nil)
 			super(key, secret)
 
@@ -20,6 +20,7 @@ module Vexapion
 
 			@available_pair = ['BTC_JPY', 'FX_BTC_JPY', 'ETH_BTC']
 		end
+# :startdoc:
 
 # Public API
 		#板情報
@@ -460,7 +461,7 @@ module Vexapion
 				'ACCESS-SIGN'        =>  sign
 			}
 
-			request = Net::HTTP::Get.new(uri.request_uri, initheader = header)
+			request = Net::HTTP::Get.new(uri.request_uri, header)
 
 			do_command(uri, request)
 		end
@@ -474,7 +475,7 @@ module Vexapion
 			text = "#{timestamp}#{method}#{uri.request_uri}#{body}"
 			sign = signature(text)
 			header = headers(sign, timestamp)
-			request = Net::HTTP::Post.new(uri.request_uri, initheader = header)
+			request = Net::HTTP::Post.new(uri.request_uri, header)
 			request.body = body
 
 			res = do_command(uri, request)
@@ -488,7 +489,7 @@ module Vexapion
 		end
 
 		def headers(sign, timestamp)
-			headers = {
+			{
 				'ACCESS-KEY'        => @key,
 				'ACCESS-TIMESTAMP'  => timestamp,
 				'ACCESS-SIGN'       => sign,
@@ -496,5 +497,11 @@ module Vexapion
 			}
 		end
 
+		def error_check(res)
+			if !res.nil? && res['success'] == 0 && res.has_key?('error')
+				fail Warning.new(0, res['error'])
+			end
+		end
+
 	end #of class
 end #of module

data/lib/vexapion/coincheck.rb

@@ -10,6 +10,7 @@ module Vexapion
 
 	class Coincheck < BaseExchanges
 
+# :stopdoc:
 		def initialize(key = nil, secret = nil)
 			super(key, secret)
 
@@ -17,6 +18,7 @@ module Vexapion
 			@private_url = "https://coincheck.com/api/"
 			set_verify_mode(OpenSSL::SSL::VERIFY_NONE)
 		end
+# :startdoc:
 
 # Public API
 
@@ -443,7 +445,7 @@ module Vexapion
 			message = "#{nonce}#{uri.to_s}#{params}"
 			sig = signature(message)
 			headers = header(nonce, sig)
-			request = Net::HTTP::Post.new(uri.request_uri, initheader = headers)
+			request = Net::HTTP::Post.new(uri.request_uri, headers)
 			request.body = params if params != ''
 
 			res = do_command(uri, request)
@@ -478,5 +480,11 @@ module Vexapion
 			}
 		end
 
+		def error_check(res)
+			if !res.nil? && res['success'] == 0 && res.has_key?('error')
+				fail Warning.new(0, res['error'])
+			end
+		end
+
 	end #of class
 end #of VirturalCurrencyExchanger module

data/lib/vexapion/connect/http_client.rb

@@ -1,12 +1,15 @@
+# :stopdoc:
 # coding: utf-8
 
 require 'vexapion'
+require 'bigdecimal'
 
 module Vexapion
 
 	class HTTPClient
 		
-		attr_writer  :timeout, :timeout_keepalive, :min_interval, :num_of_retry
+		attr_writer :timeout, :timeout_keepalive, :min_interval
+		attr_reader :response_time
 
 		def initialize(i_sec=0.5, i_num=1)
 			@connections = {}
@@ -18,10 +21,16 @@ module Vexapion
 			@num_of_retry = i_num
 			@last_access_time = Time.now.to_f
 		end
+		
+		def disconnect
+			@connections.values.each do |connection|
+				connection.finish
+			end
+		end
 
 		def terminate
 			@connections.values.each do |connection|
-				connection.finish
+				connection = nil
 			end
 		end
 
@@ -58,103 +67,53 @@ module Vexapion
 		# @raise Fatal APIラッパーの修正が必要になると思われるエラー
 		# @return [String] request.bodyを返す
 		def http_request(uri, request, verify_mode=nil)
-			prev_wait = retry_wait = @sleep_in_sec
-			@num_of_retry.times do
-				#最低接続間隔の保証
-				now = Time.now.to_f
-				elapse = now - @last_access_time
-				if elapse < @min_interval
-					s = @min_interval - elapse
-					sleep s
-				end
-				@last_access_time = Time.now.to_f
-				#puts (@last_access_time - now + elapse).round(4)*1000
-				
-				begin
-					#t1 = Time.now.to_f
-					http = connection(uri, verify_mode)
-					response = http.request(request)
-					#t2 = Time.now.to_f
-					#STDERR.puts "\nAPIcall: response: #{(t2-t1).round(4)*1000}ms"
-				rescue SocketError => e
-					fail SocketError.new(success, e.body, e)
-					#raise
-				end
-				
-				case response
-
-				#1.success
-				when Net::HTTPSuccess
-					#2.success but response.body == ''
-					#if response.body == ''
-						# puts warning message
-						#t = Time.now.strftime("%d %H:%M:%S.%3N")
-						#str = "[response is void]\nurl=%s\nstatus=%d: %s\n"%[
-						#	uri.to_s, response.code, response.message]
-						#STDERR.puts "#{t} #{str}"
-					#end
-
-					return response.body
-
-				#3.server error
-				when Net::ReadTimeout, Net::HTTPServerError
-					# retryするつもりだったけど、アプリに任せる
-					#retry_wait = wait_fb(prev_wait, retry_wait)
-					handle_api_error(response)
-					#raise
-
-				#4.client error
-				when Net::HTTPClientError
-					# raise exception
-					#print_error_message(uri, response.message)
-					#raise Vexapion::HTTPClientException
-					handle_api_error(response)
-					#raise
-				
-				#5. other
-				else
-					fail Fatal.new(http_status_code, message)
-					#raise
-				end #of case
-
-			end #of retry
-			# error 
-			raise VexapionServerError
-		end #of response
+			#最低接続間隔の保証
+			now = Time.now.to_f
+			elapse = f_minus(now, @last_access_time)
+			if elapse < @min_interval
+				s = f_minus(@min_interval, elapse)
+				sleep s
+			end
+			@last_access_time = Time.now.to_f
+			#puts (f_minus(@last_access_time, now) + elapse).round(4)*1000
+			
+			response = nil
+			begin
+				t1 = Time.now.to_f
+				http = connection(uri, verify_mode)
+				response = http.request(request)
+				t2 = Time.now.to_f
+				@response_time = f_minus(t2, t1).round(4)*1000
+				#STDERR.puts "\nAPI response time: #{@response_time}ms"
+
+			rescue SocketError, Net::OpenTimeout => e
+				fail RetryException.new('0', e.body)
+
+			rescue Net::ReadTimeout => e
+				http_status_code = 408
+				#message = "Timeout"
+				fail RetryException.new(http_status_code, e.body)
+			end
+			
+			handle_http_error(response) if response.code.to_i != 200
 
-		def wait_fb(prev_wait, retry_wait)
-			sleep retry_wait
-			retry_wait + prev_wait
-		end
+			return response.body
+		end #of response
 
-		def handle_api_error(response)
+		def handle_http_error(response)
 			http_status_code = response.code.to_i
 			message = "#{response.message} #{response.body}"
 
-			puts "http_status #{http_status_code}"
-
+			#2.server error
 			case http_status_code
-			when 400
-				fail InvalidRequestError.new(http_status_code, message)
-
-			when 401
-				fail AuthenticationError.new(http_status_code, message)
-
-			when 403
-				fail ForbiddenError.new(http_status_code, message)
-
-			when 404
-				fail NotFoundError.new(http_status_code, message)
-
-			when 408
-				fail RequestTimeout.new(http_status_code, message)
-
-			when 500
-				fail ServiceUnavailableError.new(http_status_code, message)
-
-			when 509
-				fail LimitExceededError.new(http_status_code, message)
-
+			when 500,502-504
+				fail RetryException.new(http_status_code, message)
+
+			#3.client error
+			when 400,401,403,404
+				fail Error.new(http_status_code, message)
+			
+			#4. other
 			else
 				#puts "http_client.rb: Error: #{http_status_code} #{message}"
 				fail Fatal.new(http_status_code, message)
@@ -162,6 +121,12 @@ module Vexapion
 			end #of case
 		end #of handle_api_error
 
+		def f_minus(a, b)
+			(BigDecimal(a.to_s) - BigDecimal(b.to_s)).to_f
+		end
+
 	end #of class
 
 end #of module Vexapion
+# :startdoc:
+

data/lib/vexapion/errors/http_errors.rb

@@ -1,3 +1,4 @@
+# :stopdoc:
 # coding: utf-8
 
 # based off of quandl gem: https://github.com/quandl/quandl-ruby
@@ -22,10 +23,6 @@ module Vexapion
 	class RetryException < HTTPError
 	end
 
-	#場合によってはアプリ側で無視できるエラー
-	class Warning < HTTPError
-	end
-
 	#アプリ側で止めて書き直しが必要なエラー
 	class Error < HTTPError
 	end
@@ -34,41 +31,6 @@ module Vexapion
 	class Fatal < HTTPError
 	end
 
-
-	#408 Request Timeout
-	class RequestTimeout < RetryException
-	end
-
-	#500
-	class InternalServerError < RetryException
-	end
-
-	#503
-	class ServiceUnavailableError < RetryException
-	end
-
-	#Request Success but response.body == nil
-	class ResponseDataError < Warning
-	end
-
-	#509, and API Limit?
-	class LimitExceededError < Warning
-	end
-
-	#400
-	class InvalidRequestError < Error
-	end
-
-	#401
-	class AuthenticationError < Error
-	end
-
-	#403
-	class ForbiddenError < Error
-	end
-
-	#404
-	class NotFoundError < Error
-	end
-
 end #of Vexapion module
+# :startdoc:
+

data/lib/vexapion/errors/vexapion_errors.rb

@@ -1,3 +1,4 @@
+# :stopdoc:
 # coding: utf-8
 
 # based off of quandl gem: https://github.com/quandl/quandl-ruby
@@ -5,27 +6,23 @@
 module Vexapion
 
 	class VexapionRuntimeError < StandardError
-		attr_reader :success
-		attr_reader :error_message
-		attr_reader :response
+		attr_reader :code
+		attr_reader :message
 
-		def initialize(i_success = nil, i_msg = nil, i_response = nil)
-			@success = i_success
+		def initialize(i_code, i_msg = nil)
+			@code = i_code
 			@message = i_msg
-			@response = i_response
 		end
 
 		 def to_s
-			 "#{@error_message}: #{@response}"
+			 @message
 		 end
 	end
 
-	#Error Response
-	class RequestFailed < VexapionRuntimeError
-	end
-
-	#Socket Error
-	class SocketError < VexapionRuntimeError
+	#API level error
+	class Warning < VexapionRuntimeError
 	end
 
 end #of Vexapion module
+# :startdoc:
+

data/lib/vexapion/poloniex.rb

@@ -5,6 +5,7 @@ require 'vexapion'
 module Vexapion
 
 	class Poloniex < BaseExchanges
+# :stopdoc:
 		def initialize(key = nil, secret = nil)
 			super(key, secret)
 			
@@ -12,6 +13,7 @@ module Vexapion
 			@private_url = 'https://poloniex.com/tradingApi'
 			set_min_interval(0.5)
 		end
+# :startdoc:
 
 		def set_min_interval(sec)
 			@conn.min_interval = sec
@@ -149,7 +151,7 @@ module Vexapion
 			header = headers(signature(post_data))
 
 			uri = URI.parse @private_url 
-			request = Net::HTTP::Post.new(uri.request_uri, initheader = header)
+			request = Net::HTTP::Post.new(uri.request_uri, header)
 			request.body = post_data
 
 			res = do_command(uri, request)
@@ -169,5 +171,11 @@ module Vexapion
 			}
 		end
 
+		def error_check(res)
+			if !res.nil? && res['success'] == 0 && res.has_key?('errors')
+				fail Warning(0, res['errors'])
+			end
+		end
+
 	end #of class
 end #of Vexapion module

data/lib/vexapion/template.rb

@@ -1,3 +1,4 @@
+# :stopdoc:
 # coding: utf-8
 
 # 新しい取引所を追加するときに利用するテンプレート
@@ -119,3 +120,5 @@ module Vexapion
 
 	end #of class
 end #of Vexapion module
+# :startdoc:
+

data/lib/vexapion/version.rb

@@ -1,3 +1,3 @@
 module Vexapion
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
 end

data/lib/vexapion/zaif.rb

@@ -12,7 +12,7 @@ module Vexapion
 	# @see https://corp.zaif.jp/api-docs/
 
 	class Zaif < BaseExchanges
-
+# :stopdoc:
 		def initialize(key = nil, secret = nil)
 			super(key,secret)
 
@@ -25,6 +25,7 @@ module Vexapion
 			['btc_jpy', 'xem_jpy', 'xem_btc',
 				'mona_jpy', 'mona_btc', 'zaif_jpy', 'zaif_btc']
 		end
+# :startdoc:
 
 # Public API
 
@@ -244,7 +245,7 @@ module Vexapion
 			request['Sign'] = signature(request)
 
 			res = do_command(uri, request)
-			#error_check(res)
+			error_check(res)
 			res
 		end
 
@@ -253,5 +254,11 @@ module Vexapion
 			OpenSSL::HMAC.hexdigest(algo, @secret, req.body)
 		end
 
+		def error_check(res)
+			if !res.nil? && res['success'] == 0 && res.has_key?('error')
+				fail Warning.new('0', res['error'])
+			end
+		end
+
 	end #of class
 end #of Vexapion module

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vexapion
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - fuyuton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler