From 204597b39df68ad1e641ccc5a325c8a662e7fac1 Mon Sep 17 00:00:00 2001 From: Pfingstfrosch Date: Sun, 31 May 2020 13:41:50 +0200 Subject: [PATCH] fix rubycop issue: - don't introduce global variable - don't prefix getter with get_ - single quotes instead of doubles for hash usage --- .../crawlers/courses_crawler_controller.rb | 4 +-- .../crawlers/people_crawler_controller.rb | 4 +-- .../crawlers/projects_crawler_controller.rb | 4 +-- .../crawlers/theses_crawler_controller.rb | 4 +-- lib/tiss/tiss_crawler.rb | 31 +++++++++---------- 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/app/controllers/crawlers/courses_crawler_controller.rb b/app/controllers/crawlers/courses_crawler_controller.rb index 3526a4f..6708d4b 100644 --- a/app/controllers/crawlers/courses_crawler_controller.rb +++ b/app/controllers/crawlers/courses_crawler_controller.rb @@ -4,7 +4,7 @@ class Crawlers::CoursesCrawlerController < Crawlers::TissCrawlerController params[:api] = '/api/search/course/v1.0/quickSearch' params[:search_parameter] = 'searchterm' puts params[:search_context] - @host = TissCrawler.get_host + @host = TissCrawler.host # TissCrawler performs general search over the available courses @courses = TissCrawler.search(params) @@ -46,7 +46,7 @@ class Crawlers::CoursesCrawlerController < Crawlers::TissCrawlerController end # Host is needed for image rendering - @host = TissCrawler.get_host + @host = TissCrawler.host end def add_to_fav diff --git a/app/controllers/crawlers/people_crawler_controller.rb b/app/controllers/crawlers/people_crawler_controller.rb index 4117991..5fb3d88 100644 --- a/app/controllers/crawlers/people_crawler_controller.rb +++ b/app/controllers/crawlers/people_crawler_controller.rb @@ -4,7 +4,7 @@ class Crawlers::PeopleCrawlerController < Crawlers::TissCrawlerController params[:api] = '/api/person/v22/psuche' params[:search_parameter] = 'q' puts params[:search_context] - @host = TissCrawler.get_host + @host = TissCrawler.host # TissCrawler performs general search over the available people @people = TissCrawler.search(params) @@ -18,7 +18,7 @@ class Crawlers::PeopleCrawlerController < Crawlers::TissCrawlerController # TissCrawler fetches the person's detail information @person = TissCrawler.get_details(params) # Host is needed for image rendering - @host = TissCrawler.get_host + @host = TissCrawler.host end def add_to_fav diff --git a/app/controllers/crawlers/projects_crawler_controller.rb b/app/controllers/crawlers/projects_crawler_controller.rb index a830b7a..3992598 100644 --- a/app/controllers/crawlers/projects_crawler_controller.rb +++ b/app/controllers/crawlers/projects_crawler_controller.rb @@ -3,7 +3,7 @@ class Crawlers::ProjectsCrawlerController < Crawlers::TissCrawlerController params[:api] = '/api/search/projectFullSearch/v1.0/projects' params[:search_parameter] = 'searchterm' puts params[:search_context] - @host = TissCrawler.get_host + @host = TissCrawler.host # TissCrawler performs general search over the available projects @projects = TissCrawler.search(params) @@ -18,7 +18,7 @@ class Crawlers::ProjectsCrawlerController < Crawlers::TissCrawlerController # TissCrawler fetches the project's detail information @project = TissCrawler.get_project_details(params) # Host is needed for image rendering - @host = TissCrawler.get_host + @host = TissCrawler.host end def add_to_fav diff --git a/app/controllers/crawlers/theses_crawler_controller.rb b/app/controllers/crawlers/theses_crawler_controller.rb index a90ca3a..62046ba 100644 --- a/app/controllers/crawlers/theses_crawler_controller.rb +++ b/app/controllers/crawlers/theses_crawler_controller.rb @@ -3,7 +3,7 @@ class Crawlers::ThesesCrawlerController < Crawlers::TissCrawlerController params[:api] = '/api/search/thesis/v1.0/quickSearch' params[:search_parameter] = 'searchterm' puts params[:search_context] - @host = TissCrawler.get_host + @host = TissCrawler.host # TissCrawler performs general search over the available theses @theses = TissCrawler.search(params) @@ -18,7 +18,7 @@ class Crawlers::ThesesCrawlerController < Crawlers::TissCrawlerController # TissCrawler fetches the thesis' detail information @thesis = TissCrawler.get_thesis_details(params) # Host is needed for image rendering - @host = TissCrawler.get_host + @host = TissCrawler.host end def add_to_fav diff --git a/lib/tiss/tiss_crawler.rb b/lib/tiss/tiss_crawler.rb index 207ccaf..0d04494 100644 --- a/lib/tiss/tiss_crawler.rb +++ b/lib/tiss/tiss_crawler.rb @@ -1,24 +1,25 @@ class TissCrawler - require 'httparty' - $host = 'https://tiss.tuwien.ac.at' + def self.host + 'https://tiss.tuwien.ac.at' + end def self.search(params) api = params[:api] search_parameter = params[:search_parameter] search_term = params[:search_term].parameterize(separator: '+') - url = $host + api + '?' + search_parameter + '=' + search_term + url = host + api + '?' + search_parameter + '=' + search_term puts(url) response = HTTParty.get(url) - JSON.parse(response.body)["results"] + JSON.parse(response.body)['results'] end def self.get_details(params) api = params[:api] id = params[:tiss_id] - url = $host + api + id + url = host + api + id puts(url) response = HTTParty.get(url) @@ -29,7 +30,7 @@ class TissCrawler api = params[:api] number = params[:number] semester = params[:semester] - url = $host + api + number + '-' + semester + url = host + api + number + '-' + semester puts(url) response = HTTParty.get(url) @@ -39,7 +40,7 @@ class TissCrawler def self.get_thesis_details(params) api = params[:api] id = params[:id] - url = $host + api + id + url = host + api + id puts(url) response = HTTParty.get(url) @@ -49,26 +50,24 @@ class TissCrawler def self.get_project_details(params) api = params[:api] id = params[:id] - url = $host + api + id + url = host + api + id puts(url) response = HTTParty.get(url) response.parsed_response['tuVienna']['project'] end - def self.get_host - $host - end - def self.get_oid_name(item) # Fetches a person's name based on the org id # Example: https://tiss.tuwien.ac.at/api/person/v22/oid/250197 api = '/api/person/v22/oid/' - url = $host + api + item + url = host + api + item puts(url) response = HTTParty.get(url) - response.parsed_response['first_name'] + ' ' + response.parsed_response['last_name'] - end + parsed_response = response.parsed_response -end \ No newline at end of file + parsed_response['error'] || + parsed_response['first_name'] + ' ' + response.parsed_response['last_name'] + end +end