Refactor: Merge sotechsha[2] into Book resources

Author: yasulab

app/controllers/books_controller.rb

@@ -0,0 +1,21 @@
+class BooksController < ApplicationController
+  # NOTE: The following URLs are hard-coded by published books.
+  # And the books are just a few, so not a big problem for now.
+
+  # GET /sotechsha[2]
+  def sotechsha1_index; render("books/sotechsha1/index"); end
+  def sotechsha2_index; render("books/sotechsha2/index"); end
+
+  # GET /sotechsha[2]/:page
+  def sotechsha1_show; render_book_page(params); end
+  def sotechsha2_show; render_book_page(params); end
+
+  private
+
+  def render_book_page(params)
+    book_name = params[:action].split('_').first
+    Book.exist?(book_name, params[:page]) ?
+      render("books/#{book_name}/#{params[:page]}") :
+      redirect_to('/' + book_name) # TODO: Show flash
+  end
+end

app/models/book.rb

@@ -19,7 +19,9 @@ def find(title)
     end
 
     def exist?(title, filename)
-      self.find(title).map(&:filename).include?(filename)
+      filename.nil? ?
+        self.find(title).any? :
+        self.find(title).map(&:filename).include?(filename + ".html")
     end
   end
 

config/routes.rb

@@ -96,12 +96,15 @@
   get "/.well-known/acme-challenge/:id" => "static_pages#lets_encrypt"
   get "/.well-known/security.txt"       => "static_pages#security"
 
-  # CoderDojo Books from Sotechsha
-  get "/sotechsha"       => "sotechsha_pages#index"
-  get "/sotechsha/:page" => "sotechsha_pages#show"
-
-  get "/sotechsha2"       => "sotechsha2_pages#index"
-  get "/sotechsha2/:page" => "sotechsha2_pages#show"
+  # CoderDojo Books such as published from ソーテック社
+  #get "/sotechsha"       => "sotechsha_pages#index"
+  #get "/sotechsha/:page" => "sotechsha_pages#show"
+  get "/sotechsha1", to: redirect('/sotechsha')
+  get "/sotechsha"        => "books#sotechsha1_index"
+  get "/sotechsha/:page"  => "books#sotechsha1_show"
+  get "/sotechsha2"       => "books#sotechsha2_index"
+  get "/sotechsha2/:page" => "books#sotechsha2_show"
+  #get "/sotechsha/sozai", to: redirect('/sotechsha/gazou')
 
   # Check development sent emails
   mount LetterOpenerWeb::Engine, at: "/letter_opener" if Rails.env.development?