a_parser_client 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 420bdf672bc9ceb584c65ce865513b87c34c5749f32900653c284bdf1d48f9cb
-  data.tar.gz: c4cb1b9a6c7be8c2af31a1e83429743a18e00a783e12341d25756300091ea8ff
+  metadata.gz: 8a8bc499efb525fbec81f9baf371d53996c8b161ff84be8bf99d5716a1fd4bdc
+  data.tar.gz: 828b64103b24b88d37215e47b4ff218fe0792d61332bdd4a73d239b65e7255aa
 SHA512:
-  metadata.gz: 69fe3774906263c4b5d00fbbe2b7ba1f5e55c5e0c99a8a1d52ef3f20122628b51aebefc469d154c9ad475e079bc4120bc2462f14318717d91c0b5a8f339d48c2
-  data.tar.gz: '08fdcf0b798c9a430f280c556e07f93a021e54d670eaaaa9ba759c63a1245b46f7377b7a67b90d47fcd0f5108c91bc3ab2bc5fde53ff6695e5bb9c282b851ad4'
+  metadata.gz: 7ebb4925c0aaf3dc294966d36e26bc189b1b6474a9c7071f6bd7f4737c032ae74fec440fc9879d6fc4ddef97889e38e36607ea00d90abe941a346bd9155e6540
+  data.tar.gz: 9406200c8dc40bd5bf51e3334243c6d32c67be0d4c39eb5e3bdba3cc63f9a5bfe9373dea43ff66cd9c13b479321ded812dcdc8325c3fa40baa149963474f7c01

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    a_parser_client (0.1.7)
+    a_parser_client (0.1.8)
 
 GEM
   remote: https://rubygems.org/

data/lib/a_parser_client.rb

@@ -1,254 +1,28 @@
 require "a_parser_client/version"
+require "a_parser_client/api"
 
 module AParserClient
-  class Error < StandardError; end
+	class Error < StandardError; end
 
-  class API
-  	require "json"
-  	require "open-uri"
-  	require "net/http"
+	class Control
+		attr_reader :tasks
 
-  	attr :api_url, :api_password, :alive
-
-  	def initialize(api_url, api_password)
-  		if api_url =~ URI::regexp
-	  		@api_url = api_url
-	  		@api_password = api_password	
-	  		@alive = self.alive?			
-  		else
-  			raise "Bad API URL provided."
-  		end
-  	end
-
-	def ping
-		request = {
-			password: @api_pass, 
-			action: 'ping'
-		}
-		do_it request
-	end
-
-	#updates alive status
-	def alive?
-		@alive = ping ? true : false
-	end  
-
-
-	def get_task_list(completed=false)
-		request = {
-			password: @api_password, 
-			action: 'getTasksList',
-			data: {completed: completed ? 1 : 0}
-		}
-		do_it request
-	end
-
-	def get_task_state(task_id)
-		request = {
-			password: @api_password, 
-			action: 'getTaskState',
-			data: {taskUid: task_id}
-		}
-		do_it request
-	end
-
-	def get_task_conf(task_id)
-		request = {
-			password: @api_password, 
-			action: 'getTaskConf',
-			data: {taskUid: task_id}
-		}
-		do_it request
-	end
-
-
-	def get_info
-		request = {
-			password: 	@api_password, 
-			action: 	'info',
-		}
-		do_it request
-	end
-
-	def add_task(task_type='text', queries_array=[], queries_file=nil, config, preset, parsers, result_file_name)
-		request = {
-			password: 	@api_password, 
-			action: 	'addTask',
-			data: {
-				queriesFrom: task_type, 
-				queries: (task_type == 'text' ? queries_array : queries_file),
-				configPreset: config, 
-				preset: preset, 
-				parsers: parsers, 
-				resultsFileName: result_file_name
-			}
-		}
-		do_it request
-	end
-
-
-	def one_request(query, parser, preset='default', config_preset='default', options=[])
-		request = {
-			password: 	@api_password, 
-			action: 	'oneRequest',
-			data: {
-				query: query,
-				parser: parser, 
-				configPreset: config_preset,
-				preset: preset,
-				options: options
-			}
-		}
-		do_it request
-	end
-
-	def bulk_request(queries=[], parser, preset='default', config_preset='default', threads, raw_results=0, need_data=0, options=[])
-		request = {
-			password: 	@api_password, 
-			action: 	'bulkRequest',
-			data: {
-				queries: queries,
-				parser: parser, 
-				configPreset: config_preset,
-				preset: preset,
-				threads: threads,
-				rawResults: raw_results,
-				needData: need_data,
-				options: options
-			}
-		}
-		do_it request
-	end
-
-
-	def change_task_status(task_id, to_status)
-		request = {
-			password: @api_password, 
-			action: 'changeTaskStatus',
-			data: {
-				taskUid: task_id,
-				toStatus: to_status
-			}
-		}
-		do_it request		
-	end
-
-	def get_accounts_count
-		request = {
-			password: @api_password, 
-			action: 'getAccountsCount',
-			data: {}
-		}
-		do_it request		
-	end
-
-
-	def get_proxies
-		request = {
-			password: @api_password, 
-			action: 'getProxies'
-		}
-		do_it request		
-	end
-
-	def update!
-		request = {
-			password: @api_password, 
-			action: 'update',
-			data: {}
-		}
-		do_it request		
-	end	
-
-	def get_task_results_file(task_id)
-		request = {
-			password: @api_password, 
-			action: 'getTaskResultsFile',
-			data: {taskUid: task_id}
-		}
-		do_it request
-	end	
-
-	def delete_task_results_file(task_id)
-		request = {
-			password: @api_password, 
-			action: 'deleteTaskResultsFile',
-			data: {taskUid: task_id}
-		}
-		do_it request
-	end	
-
-	def move_task(task_id, direction)
-		request = {
-			password: @api_password, 
-			action: 'moveTask',
-			data: {
-				taskUid: task_id,
-				toStatus: direction
-			}
-		}
-		do_it request		
-	end	
-
-	def get_parser_info(parser_name)
-		request = {
-			password: @api_password, 
-			action: 'getParserInfo',
-			data: {
-				parser: parser_name
-			}
-		}
-		do_it request		
-	end	
-
-
-	def get_parser_preset(parser_name, preset_name)
-		request = {
-			password: @api_password, 
-			action: 'getParserInfo',
-			data: {
-				parser: parser_name,
-				reset: preset_name
-			}
-		}
-		do_it request		
-	end	
+		def initialize(api_driver)
+			if api_driver
+				unless api_driver.alive?
+					raise "API driver should be alive to take control of parser."
+				end
 
+				@tasks = fetch_tasks				
+			else
+				raise "No API driver provided."
+			end
 
-		private # internal use only
+		end
 
-	def do_it(request)
-		request_body = request.to_json
-		response = send_request(request_body)
-		return response		
+		def fetch_tasks
+			data = api_driver.get_tasks_list
+			data['data'] ? data['data'] : []
+		end
 	end
-
-	def send_request(request)
-		uri = URI @api_url
-
-			req = Net::HTTP::Post.new uri
-			req.body = (request)
-			req.content_type = 'text/plain; charset=UTF-8'
-
-			begin
-				res = Net::HTTP.start(uri.hostname, uri.port) {|http|
-				  http.request(req)
-				}
-			rescue Exception => e
-				puts "Send request error: #{e}"
-			end
-
-			if res
-				begin
-					response = JSON.parse res.body
-				rescue JSON::ParserError => e
-					raise "Not a JSON type response from the server #{@api_url}. Probably not an API endpoint."
-				end
-			else
-			  nil
-			end
-	end			
-  	
-  	
-  end
 end

data/lib/a_parser_client/api.rb

@@ -0,0 +1,253 @@
+module AParserClient
+
+  class API
+  	require "json"
+  	require "open-uri"
+  	require "net/http"
+
+  	attr :api_url, :api_password, :alive
+
+  	def initialize(api_url, api_password)
+  		if api_url =~ URI::regexp
+	  		@api_url = api_url
+	  		@api_password = api_password	
+	  		@alive = self.alive?			
+  		else
+  			raise "Bad API URL provided."
+  		end
+  	end
+
+	def ping
+		request = {
+			password: @api_pass, 
+			action: 'ping'
+		}
+		do_it request
+	end
+
+	#updates alive status
+	def alive?
+		@alive = ping ? true : false
+	end  
+
+
+	def get_tasks_list(completed=false)
+		request = {
+			password: @api_password, 
+			action: 'getTasksList',
+			data: {completed: completed ? 1 : 0}
+		}
+		do_it request
+	end
+
+	def get_task_state(task_id)
+		request = {
+			password: @api_password, 
+			action: 'getTaskState',
+			data: {taskUid: task_id}
+		}
+		do_it request
+	end
+
+	def get_task_conf(task_id)
+		request = {
+			password: @api_password, 
+			action: 'getTaskConf',
+			data: {taskUid: task_id}
+		}
+		do_it request
+	end
+
+
+	def get_info
+		request = {
+			password: 	@api_password, 
+			action: 	'info',
+		}
+		do_it request
+	end
+
+	def add_task(task_type='text', queries_array=[], queries_file=nil, config, preset, parsers, result_file_name)
+		request = {
+			password: 	@api_password, 
+			action: 	'addTask',
+			data: {
+				queriesFrom: task_type, 
+				queries: (task_type == 'text' ? queries_array : queries_file),
+				configPreset: config, 
+				preset: preset, 
+				parsers: parsers, 
+				resultsFileName: result_file_name
+			}
+		}
+		do_it request
+	end
+
+
+	def one_request(query, parser, preset='default', config_preset='default', options=[])
+		request = {
+			password: 	@api_password, 
+			action: 	'oneRequest',
+			data: {
+				query: query,
+				parser: parser, 
+				configPreset: config_preset,
+				preset: preset,
+				options: options
+			}
+		}
+		do_it request
+	end
+
+	def bulk_request(queries, parser, preset, config_preset, threads, raw_results, need_data, options)
+		request = {
+			password: 	@api_password, 
+			action: 	'bulkRequest',
+			data: {
+				queries: queries,
+				parser: parser, 
+				configPreset: config_preset,
+				preset: preset,
+				threads: threads,
+				rawResults: raw_results,
+				needData: need_data,
+				options: options
+			}
+		}
+		do_it request
+	end
+
+
+	def change_task_status(task_id, to_status)
+		request = {
+			password: @api_password, 
+			action: 'changeTaskStatus',
+			data: {
+				taskUid: task_id,
+				toStatus: to_status
+			}
+		}
+		do_it request		
+	end
+
+	def get_accounts_count
+		request = {
+			password: @api_password, 
+			action: 'getAccountsCount',
+			data: {}
+		}
+		do_it request		
+	end
+
+
+	def get_proxies
+		request = {
+			password: @api_password, 
+			action: 'getProxies'
+		}
+		do_it request		
+	end
+
+	def update!
+		request = {
+			password: @api_password, 
+			action: 'update',
+			data: {}
+		}
+		do_it request		
+	end	
+
+	def get_task_results_file(task_id)
+		request = {
+			password: @api_password, 
+			action: 'getTaskResultsFile',
+			data: {taskUid: task_id}
+		}
+		do_it request
+	end	
+
+	def delete_task_results_file(task_id)
+		request = {
+			password: @api_password, 
+			action: 'deleteTaskResultsFile',
+			data: {taskUid: task_id}
+		}
+		do_it request
+	end	
+
+	def move_task(task_id, direction)
+		request = {
+			password: @api_password, 
+			action: 'moveTask',
+			data: {
+				taskUid: task_id,
+				toStatus: direction
+			}
+		}
+		do_it request		
+	end	
+
+	def get_parser_info(parser_name)
+		request = {
+			password: @api_password, 
+			action: 'getParserInfo',
+			data: {
+				parser: parser_name
+			}
+		}
+		do_it request		
+	end	
+
+
+	def get_parser_preset(parser_name, preset_name)
+		request = {
+			password: @api_password, 
+			action: 'getParserInfo',
+			data: {
+				parser: parser_name,
+				reset: preset_name
+			}
+		}
+		do_it request		
+	end	
+
+
+		private # internal use only
+
+	def do_it(request)
+		request_body = request.to_json
+		response = send_request(request_body)
+		return response		
+	end
+
+	def send_request(request)
+		uri = URI @api_url
+
+			req = Net::HTTP::Post.new uri
+			req.body = (request)
+			req.content_type = 'text/plain; charset=UTF-8'
+
+			begin
+				res = Net::HTTP.start(uri.hostname, uri.port) {|http|
+				  http.request(req)
+				}
+			rescue Exception => e
+				puts "Send request error: #{e}"
+			end
+
+			if res
+				begin
+					response = JSON.parse res.body
+				rescue JSON::ParserError => e
+					raise "Not a JSON type response from the server #{@api_url}. Probably not an API endpoint."
+				end
+			else
+			  nil
+			end
+	end			
+  	
+  	
+  end
+
+
+end

data/lib/a_parser_client/version.rb

@@ -1,3 +1,3 @@
 module AParserClient
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: a_parser_client
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Yaroslav Shevchenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - bin/console
 - bin/setup
 - lib/a_parser_client.rb
+- lib/a_parser_client/api.rb
 - lib/a_parser_client/version.rb
 homepage: https://github.com/yvshevchenko/a_parser_client
 licenses: