Merge pull request #292 from coderdojo-japan/restful-controllers

RESTful controllers

Author: yasulab

app/controllers/home_controller.rb

@@ -0,0 +1,6 @@
+class HomeController < ApplicationController
+  def show
+    @dojo_count        = Dojo.count
+    @regions_and_dojos = Dojo.eager_load(:prefecture).default_order.group_by { |dojo| dojo.prefecture.region }
+  end
+end

app/controllers/lets_encrypt_controller.rb

@@ -0,0 +1,9 @@
+class LetsEncryptController < ApplicationController
+  def show
+    if params[:id] == ENV['LETSENCRYPT_REQUEST']
+      render plain: ENV['LETSENCRYPT_RESPONSE']
+    else
+      render plain: 'Failed.'
+    end
+  end
+end

app/controllers/static_pages_controller.rb renamed to app/controllers/stats_controller.rb

@@ -1,10 +1,5 @@
-class StaticPagesController < ApplicationController
-  def home
-    @dojo_count        = Dojo.count
-    @regions_and_dojos = Dojo.eager_load(:prefecture).default_order.group_by { |dojo| dojo.prefecture.region }
-  end
-
-  def stats
+class StatsController < ApplicationController
+  def show
     @url                 = request.url
     @dojo_count          = Dojo.count
     @regions_and_dojos   = Dojo.eager_load(:prefecture).default_order.group_by { |dojo| dojo.prefecture.region }
@@ -37,12 +32,4 @@ def stats
     @annual_event_histories_chart = HighChartsBuilder.build_annual_event_histories
     @annual_participants_chart = HighChartsBuilder.build_annual_participants
   end
-
-  def letsencrypt
-    if params[:id] == ENV['LETSENCRYPT_REQUEST']
-      render text: ENV['LETSENCRYPT_RESPONSE']
-    else
-      render text: 'Failed.'
-    end
-  end
 end

app/views/static_pages/home.html.haml renamed to app/views/home/show.html.haml

@@ -78,7 +78,7 @@
   %br/
   %h2 全国の道場
   %br/
-  = render partial: 'dojos', locals: { regions_and_dojos: @regions_and_dojos }
+  = render partial: 'shared/dojos', locals: { regions_and_dojos: @regions_and_dojos }
 %section.text-center
   %h2.text-center
     %a{:href => "https://twitter.com/search?q=dojocon%20OR%20coderdojo%20OR%20%E3%82%B3%E3%83%BC%E3%83%80%E3%83%BC%E9%81%93%E5%A0%B4%20OR%20%22Coder%20Dojo%22%20OR%20%E3%83%97%E3%83%AD%E3%82%B0%E3%83%A9%E3%83%9F%E3%83%B3%E3%82%B0%E9%81%93%E5%A0%B4%20lang%3Aja"} 最近の話題

app/views/static_pages/_dojo.html.haml renamed to app/views/shared/_dojo.html.haml

@@ -9,4 +9,4 @@
             \- #{dojos.count} Dojos
       .panel-collapse.collapse{:id => "collapse#{index}", :role => "tabpanel"}
         .panel-body.grayscale-bg
-          = render partial: 'dojo', collection: dojos
+          = render partial: 'shared/dojo', collection: dojos

app/views/static_pages/_dojos.html+smartphone.haml renamed to app/views/shared/_dojos.html+smartphone.haml

@@ -0,0 +1,2 @@
+%ul.loaded
+  = render partial: 'shared/dojo', collection: regions_and_dojos.values.flatten

app/views/shared/_dojos.html.haml

@@ -87,7 +87,7 @@
                 \- #{dojos.count} Dojos
           .panel-collapse.collapse{:id => "collapse#{index}", :role => "tabpanel"}
             .panel-body.grayscale-bg
-              = render partial: 'dojo', collection: dojos
+              = render partial: 'shared/dojo', collection: dojos
 
     %h3 関連リンク
     %ul{:style => "list-style: none; margin-left: -40px;"}

app/views/static_pages/_dojos.html.haml

@@ -2,21 +2,21 @@
   # For details on the DSL available within this file,
   # see http://guides.rubyonrails.org/routing.html
 
+  root "home#show"
+
   # Render legal documents by using Keiyaku CSS
   # https://github.com/cognitom/keiyaku-css
   get "/docs/code_of_conduct", to: redirect('/docs/code-of-conduct')
   resources :docs, only: [:index, :show]
 
-  # Static Pages
-  root "static_pages#home"
-  get "/stats", to: 'static_pages#stats'
+  resource :stats, only: %i(show)
 
   # Redirects
   get "/releases/2016/12/12/new-backend", to: redirect('/news/2016/12/12/new-backend')
   get "/blogs/2016/12/12/new-backend",    to: redirect('/news/2016/12/12/new-backend')
 
   # Issue SSL Certification
-  get "/.well-known/acme-challenge/:id" => "static_pages#letsencrypt"
+  get "/.well-known/acme-challenge/:id" => "lets_encrypt#show"
 
   # Sessions
   get '/logout',       to: 'sessions#destroy'