a_parser_client 0.1.5 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f42e60203410c99b0db06edc1788deee8e1c4ced464b10ef096e9e03de1676d5
-  data.tar.gz: 0d59de0239b5a7e25adb62591f00d39e235cf845954377e1eeab01ae7f645abe
+  metadata.gz: 9ed578569a32738b77fd112c9a9b5c4be1405b3d6ce338e2c3bb0a64874d76a4
+  data.tar.gz: 42647973d9272ffaae8b94989f1b784f5a656d5b526799e44fc397714ba16aad
 SHA512:
-  metadata.gz: 68e0a2dc347538a632f42dbd6bc02567636f31295aebfd17944bcd3473138fd80085d4a5bc74cbd506f810c99aadec220ea88ed1740e3ee87a7d93309eddf911
-  data.tar.gz: 3620212938726b6594e8dd8a952b866b506ab01ac6e1a1bcfd348ffd9a9e73155bbc6a7cb4467b2f0bb688983ee25a207630f00829c33910b2f362920f3c29d7
+  metadata.gz: b6b171c76b1d02e80c944d3e0925004594afaa82cea3e18c89e9fb4b216147e6ac24a27a4b161c9f39917fe1c537b6a4f5916f3f2544ee4ca2e908ceaaaf8b4e
+  data.tar.gz: e7a02d9b66cefdf14c0753fe95b231290f4fe9d5f7e92d7c48953ffaa7c082c16cf4129a8df55b3f1501b091d2a4b685b46c8bb7e1a4092c005f16c14b5b7728

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    a_parser_client (0.1.5)
+    a_parser_client (0.1.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
-    rake (10.5.0)
+    rake (13.0.1)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -28,7 +28,7 @@ PLATFORMS
 DEPENDENCIES
   a_parser_client!
   bundler (~> 2.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH

data/README.md

@@ -8,27 +8,29 @@ This is a test release, more API coverage is upcoming.
 
 Covered for now:
 
-	-	ping
-	-	info
-	- 	getTaskList
-	-	getTaskState
-	-	getTaskConf
-	-	addTask
-	-	changeTaskStatus
-	-	getAccountsCount	
-	-	getProxies	
-	-	update	
-	-	getTaskResultsFile	
-	-	deleteTaskResultsFile	
-	-	moveTask	
-	-	getParserInfo	
-	-	getParserPreset	
+-	ping
+-	info
+- 	getTaskList
+-	getTaskState
+-	getTaskConf
+-	addTask
+-	changeTaskStatus
+-	getAccountsCount	
+-	getProxies	
+-	update	
+-	getTaskResultsFile	
+-	deleteTaskResultsFile	
+-	moveTask	
+-	getParserInfo	
+-	getParserPreset	
+-	oneRequest
+-	bulkRequest
 
 TODO:
 
-	-	oneRequest
-	-	bulkRequest
+Some automation procedures:
 
+-	multitasks operations (like stop all tasks etc.)
 
 
 ## Installation
@@ -56,10 +58,10 @@ The code sample below is all for now...
 ```ruby
 require 'a_parser_client'
 
-api = AParserClient::API.new 'http://<your_host_running_aparser>:9091/API, ''
-api.ping
+ api = AParserClient::API.new 'http://<your_host_running_aparser>:9091/API, ''
+ api.ping
 
-$> {"success" : 1, "data" : "pong"}
+=> {"success" : 1, "data" : "pong"}
 ```
 
 ## Development

data/a_parser_client.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Yaroslav Shevchenko"]
   spec.email         = ["yvshevchenko@gmail.com"]
 
-  spec.summary       = %q{A simple inerface to a-parser API.}
-  spec.description   = %q{Gem allowing to use a-parser API simple way.}
+  spec.summary       = %q{A simple inerface to A-Parser API.}
+  spec.description   = %q{Gem allowing to use A-Parser API simple way.}
   spec.homepage      = "https://github.com/yvshevchenko/a_parser_client"
   spec.license       = "MIT"
 
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/yvshevchenko/a_parser_client"
-  spec.metadata["changelog_uri"] = "https://github.com/yvshevchenko/a_parser_client"
+  spec.metadata["changelog_uri"] = "https://github.com/yvshevchenko/a_parser_client/wiki/Changes-Log"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/a_parser_client.rb

@@ -1,219 +1,30 @@
 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, :driver
 
-  	attr :api_url, :api_password, :alive
+		def initialize(api_driver)
+			@driver = api_driver
 
-  	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_a_parser
-		request = {
-			password: @api_pass, 
-			action: 'ping'
-		}
-		do_it request
-	end
-
-	#updates alive status
-	def alive?
-		@alive = ping_a_parser ? 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 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	
+			if @driver
+				unless @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 = @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.5"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: a_parser_client
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.10
 platform: ruby
 authors:
 - Yaroslav Shevchenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Gem allowing to use a-parser API simple way.
+description: Gem allowing to use A-Parser API simple way.
 email:
 - yvshevchenko@gmail.com
 executables: []
@@ -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:
@@ -80,7 +81,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/yvshevchenko/a_parser_client
   source_code_uri: https://github.com/yvshevchenko/a_parser_client
-  changelog_uri: https://github.com/yvshevchenko/a_parser_client
+  changelog_uri: https://github.com/yvshevchenko/a_parser_client/wiki/Changes-Log
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -100,5 +101,5 @@ rubyforge_project:
 rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: A simple inerface to a-parser API.
+summary: A simple inerface to A-Parser API.
 test_files: []