From d34a3d583c9849cff0466486c731b77bf7724573 Mon Sep 17 00:00:00 2001
From: Pfingstfrosch <pfingstfrosch@gmail.com>
Date: Tue, 12 May 2020 19:49:18 +0200
Subject: [PATCH] refactored crawler controllers and bundled them in crawlers
 namespace

---
 .../courses_crawler_controller.rb             |  2 +-
 .../people_crawler_controller.rb              |  4 +--
 .../projects_crawler_controller.rb            |  2 +-
 .../theses_crawler_controller.rb              |  2 +-
 .../{ => crawlers}/tiss_crawler_controller.rb |  6 ++--
 .../courses_crawler/show_basic.html.erb       |  4 +--
 .../courses_crawler/show_detail.html.erb      |  0
 .../people_crawler/show_basic.html.erb        |  4 +--
 .../people_crawler/show_detail.html.erb       |  0
 .../tiss_crawler/search.html.erb              |  2 +-
 app/views/favorites/people.html.erb           |  2 +-
 app/views/layouts/application.html.erb        |  2 +-
 config/routes.rb                              | 36 ++++++++++---------
 13 files changed, 34 insertions(+), 32 deletions(-)
 rename app/controllers/{ => crawlers}/courses_crawler_controller.rb (94%)
 rename app/controllers/{ => crawlers}/people_crawler_controller.rb (89%)
 rename app/controllers/{ => crawlers}/projects_crawler_controller.rb (54%)
 rename app/controllers/{ => crawlers}/theses_crawler_controller.rb (55%)
 rename app/controllers/{ => crawlers}/tiss_crawler_controller.rb (67%)
 rename app/views/{ => crawlers}/courses_crawler/show_basic.html.erb (62%)
 rename app/views/{ => crawlers}/courses_crawler/show_detail.html.erb (100%)
 rename app/views/{ => crawlers}/people_crawler/show_basic.html.erb (78%)
 rename app/views/{ => crawlers}/people_crawler/show_detail.html.erb (100%)
 rename app/views/{ => crawlers}/tiss_crawler/search.html.erb (85%)

diff --git a/app/controllers/courses_crawler_controller.rb b/app/controllers/crawlers/courses_crawler_controller.rb
similarity index 94%
rename from app/controllers/courses_crawler_controller.rb
rename to app/controllers/crawlers/courses_crawler_controller.rb
index 7e4a342..69f47ea 100644
--- a/app/controllers/courses_crawler_controller.rb
+++ b/app/controllers/crawlers/courses_crawler_controller.rb
@@ -1,4 +1,4 @@
-class CoursesCrawlerController < TissCrawlerController
+class Crawlers::CoursesCrawlerController < TissCrawlerController
 
   def show_basic
     params[:api] = '/api/search/course/v1.0/quickSearch'
diff --git a/app/controllers/people_crawler_controller.rb b/app/controllers/crawlers/people_crawler_controller.rb
similarity index 89%
rename from app/controllers/people_crawler_controller.rb
rename to app/controllers/crawlers/people_crawler_controller.rb
index 2812373..20d2ce1 100644
--- a/app/controllers/people_crawler_controller.rb
+++ b/app/controllers/crawlers/people_crawler_controller.rb
@@ -1,4 +1,4 @@
-class PeopleCrawlerController < TissCrawlerController
+class Crawlers::PeopleCrawlerController < TissCrawlerController
 
   def show_basic
     params[:api] = '/api/person/v22/psuche'
@@ -30,7 +30,7 @@ class PeopleCrawlerController < TissCrawlerController
     if FavoritePerson.create(tiss_id: @person['tiss_id'], first_name: @person['first_name'], last_name: @person['last_name'], picture_uri: @person['picture_uri']).valid?
       FavoritePerson.create(tiss_id: @person['tiss_id'], first_name: @person['first_name'], last_name: @person['last_name'], picture_uri: @person['picture_uri'])
       respond_to do |format|
-        format.html { redirect_to favorite_person_index_url, notice: 'Favorite person stored' }
+        format.html { redirect_to favorites_people_url, notice: 'Favorite person stored' }
       end
     else
       flash[:alert] = "Person is already favorited!"
diff --git a/app/controllers/projects_crawler_controller.rb b/app/controllers/crawlers/projects_crawler_controller.rb
similarity index 54%
rename from app/controllers/projects_crawler_controller.rb
rename to app/controllers/crawlers/projects_crawler_controller.rb
index c090dda..d5f9089 100644
--- a/app/controllers/projects_crawler_controller.rb
+++ b/app/controllers/crawlers/projects_crawler_controller.rb
@@ -1,4 +1,4 @@
-class ProjectsCrawlerController < TissCrawlerController
+class Crawlers::ProjectsCrawlerController < TissCrawlerController
   def show_basic
 
   end
diff --git a/app/controllers/theses_crawler_controller.rb b/app/controllers/crawlers/theses_crawler_controller.rb
similarity index 55%
rename from app/controllers/theses_crawler_controller.rb
rename to app/controllers/crawlers/theses_crawler_controller.rb
index 600592a..9e2df8e 100644
--- a/app/controllers/theses_crawler_controller.rb
+++ b/app/controllers/crawlers/theses_crawler_controller.rb
@@ -1,4 +1,4 @@
-class ThesesCrawlerController < TissCrawlerController
+class Crawlers::ThesesCrawlerController < TissCrawlerController
   def show_basic
 
   end
diff --git a/app/controllers/tiss_crawler_controller.rb b/app/controllers/crawlers/tiss_crawler_controller.rb
similarity index 67%
rename from app/controllers/tiss_crawler_controller.rb
rename to app/controllers/crawlers/tiss_crawler_controller.rb
index aab42a1..fac3647 100644
--- a/app/controllers/tiss_crawler_controller.rb
+++ b/app/controllers/crawlers/tiss_crawler_controller.rb
@@ -1,4 +1,4 @@
-class TissCrawlerController < ApplicationController
+class Crawlers::TissCrawlerController < ApplicationController
 
   # self designed lib to call the Tiss API
   require 'tiss/tiss_crawler'
@@ -11,10 +11,10 @@ class TissCrawlerController < ApplicationController
     case $search_context
     when 'People'
       # redirect to people_show_basic, propagate the search_term
-      redirect_to :controller => 'people_crawler', :action => :show_basic, :search_term => params[:search_term]
+      redirect_to :controller => 'crawlers/people_crawler', :action => :show_basic, :search_term => params[:search_term]
     when 'Courses'
       # redirect to courses_show_basic, propagate the search_term
-      redirect_to :controller => 'courses_crawler', :action => :show_basic, :search_term => params[:search_term]
+      redirect_to :controller => 'crawlers/courses_crawler', :action => :show_basic, :search_term => params[:search_term]
     when 'Theses'
     when 'Projects'
     else
diff --git a/app/views/courses_crawler/show_basic.html.erb b/app/views/crawlers/courses_crawler/show_basic.html.erb
similarity index 62%
rename from app/views/courses_crawler/show_basic.html.erb
rename to app/views/crawlers/courses_crawler/show_basic.html.erb
index f95b839..01baf24 100644
--- a/app/views/courses_crawler/show_basic.html.erb
+++ b/app/views/crawlers/courses_crawler/show_basic.html.erb
@@ -3,7 +3,7 @@
 <ul class="courses-list">
   <% @courses.each_with_index do |course| %>
     <li class="course">
-      <%= link_to courses_crawler_show_detail_url(:title => course['title'], :detail_url => course['detail_url']) do %>
+      <%= link_to crawlers_courses_crawler_show_detail_url(:title => course['title'], :detail_url => course['detail_url']) do %>
       <span class="list-link">
           <span class="course-title">
             <%= course['title'] %>
@@ -11,7 +11,7 @@
       </span>
       <% end %>
       <span class="add-to-fav">
-        <%= link_to courses_crawler_add_to_fav_url(:title => course['title'], :detail_url => course['detail_url']) do %>
+        <%= link_to crawlers_courses_crawler_add_to_fav_url(:title => course['title'], :detail_url => course['detail_url']) do %>
           <%= show_svg('favorite-24px.svg') %>
         <% end %>
       </span>
diff --git a/app/views/courses_crawler/show_detail.html.erb b/app/views/crawlers/courses_crawler/show_detail.html.erb
similarity index 100%
rename from app/views/courses_crawler/show_detail.html.erb
rename to app/views/crawlers/courses_crawler/show_detail.html.erb
diff --git a/app/views/people_crawler/show_basic.html.erb b/app/views/crawlers/people_crawler/show_basic.html.erb
similarity index 78%
rename from app/views/people_crawler/show_basic.html.erb
rename to app/views/crawlers/people_crawler/show_basic.html.erb
index 594209e..99cd2e2 100644
--- a/app/views/people_crawler/show_basic.html.erb
+++ b/app/views/crawlers/people_crawler/show_basic.html.erb
@@ -3,7 +3,7 @@
 <ul class="people-list">
   <% @people.each_with_index do |person| %>
     <li class="person">
-      <%= link_to people_crawler_show_detail_url(:tiss_id => person['tiss_id']) do %>
+      <%= link_to crawlers_people_crawler_show_detail_url(:tiss_id => person['tiss_id']) do %>
       <span class="list-link">
         <span class="person-icon">
           <% if person['picture_uri'] != nil %>
@@ -19,7 +19,7 @@
           </span>
       <% end %>
       <span class="add-to-fav">
-        <%= link_to people_crawler_add_to_fav_url(:tiss_id => person['tiss_id']) do %>
+        <%= link_to crawlers_people_crawler_add_to_fav_url(:tiss_id => person['tiss_id']) do %>
           <%= show_svg('favorite-24px.svg') %>
         <% end %>
       </span>
diff --git a/app/views/people_crawler/show_detail.html.erb b/app/views/crawlers/people_crawler/show_detail.html.erb
similarity index 100%
rename from app/views/people_crawler/show_detail.html.erb
rename to app/views/crawlers/people_crawler/show_detail.html.erb
diff --git a/app/views/tiss_crawler/search.html.erb b/app/views/crawlers/tiss_crawler/search.html.erb
similarity index 85%
rename from app/views/tiss_crawler/search.html.erb
rename to app/views/crawlers/tiss_crawler/search.html.erb
index bf3fcac..93d7770 100644
--- a/app/views/tiss_crawler/search.html.erb
+++ b/app/views/crawlers/tiss_crawler/search.html.erb
@@ -1,7 +1,7 @@
 <h1>Search through @TU Vienna Database</h1>
 <p>Only people can be searched right now</p>
 
-<%= form_tag('/tiss_crawler/search', :method => "get") do %>
+<%= form_tag(crawlers_tiss_crawler_search_path, :method => "get") do %>
   <%= label_tag(:search_term, "Enter your search term") %>
   <%= text_field_tag(:search_term) %>
   <%= radio_button_tag(:search_context, 'People', true) %> People
diff --git a/app/views/favorites/people.html.erb b/app/views/favorites/people.html.erb
index b66520d..eeadd54 100644
--- a/app/views/favorites/people.html.erb
+++ b/app/views/favorites/people.html.erb
@@ -5,7 +5,7 @@
 <ul class="people-list">
   <% @favoritePeople.each do |person| %>
     <li class="person">
-      <%= link_to people_crawler_show_detail_url(:tiss_id => person['tiss_id']) do %>
+      <%= link_to crawlers_people_crawler_show_detail_url(:tiss_id => person['tiss_id']) do %>
       <span class="list-link">
         <span class="person-icon">
           <% if person['picture_uri'] != nil %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 0a951c7..e48e0f0 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -20,7 +20,7 @@
       </label>
       <a href="#" class="logo">tiss2go</a>
       <div class="left-menu">
-        <%= link_to 'Search TISS', tiss_crawler_search_path %>
+        <%= link_to 'Search TISS', crawlers_tiss_crawler_search_path %>
         <%= link_to 'Your Favorites', favorites_people_path %>
       </div>
       <div class="right-menu">
diff --git a/config/routes.rb b/config/routes.rb
index f3b1899..16c43ad 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,24 +2,26 @@ Rails.application.routes.draw do
 
   devise_for :users, path_names: {sign_in: 'log_in', sign_out: 'log out'}
 
-  namespace :tiss_crawler do
-    get 'search'
-  end
+  namespace :crawlers do
+    namespace :tiss_crawler do
+      get 'search'
+    end
 
-  namespace :people_crawler do
-    get 'show_basic'
-    get 'show_detail'
-    post 'show_detail'
-    get 'add_to_fav'
-    post 'add_to_fav'
-  end
+    namespace :people_crawler do
+      get 'show_basic'
+      get 'show_detail'
+      post 'show_detail'
+      get 'add_to_fav'
+      post 'add_to_fav'
+    end
 
-  namespace :courses_crawler do
-    get 'show_basic'
-    get 'show_detail'
-    post 'show_detail'
-    get 'add_to_fav'
-    post 'add_to_fav'
+    namespace :courses_crawler do
+      get 'show_basic'
+      get 'show_detail'
+      post 'show_detail'
+      get 'add_to_fav'
+      post 'add_to_fav'
+    end
   end
 
   namespace :favorites do
@@ -31,5 +33,5 @@ Rails.application.routes.draw do
   end
 
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
-  root 'tiss_crawler#search'
+  root 'crawlers/tiss_crawler#search'
 end