Revert "Added cache and sweepers"

This reverts commit af45376.
snoonetIRC · Apr 18, 2013 · bdc79f9 · bdc79f9
1 parent b6abf68
commit bdc79f9
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 68 deletions.
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
@@ -1,7 +1,4 @@
 class PagesController < ApplicationController
-  caches_page :show
-  cache_sweeper :pages_sweeper
-  before_filter(only: :show) { @page_caching = true }
   def show
     @page = Page.find_by_permalink!(params[:id])
 

diff --git a/app/controllers/sponsors_controller.rb b/app/controllers/sponsors_controller.rb
@@ -1,7 +1,4 @@
 class SponsorsController < ApplicationController
-  caches_page :index
-  cache_sweeper :sponsors_sweeper
-  before_filter(only: :index) { @page_caching = true}
   # GET /sponsors
   # GET /sponsors.json
   def index

diff --git a/app/controllers/staff_controller.rb b/app/controllers/staff_controller.rb
@@ -1,7 +1,4 @@
 class StaffController < ApplicationController
-  caches_page :index
-  cache_sweeper :staff_sweeper
-  before_filter(only: :index) { @page_caching = true}
   # GET /staff
   # GET /staff.json
   def index

diff --git a/app/controllers/updates_controller.rb b/app/controllers/updates_controller.rb
@@ -1,7 +1,4 @@
 class UpdatesController < ApplicationController
-  caches_page :index, :show
-  cache_sweeper :updates_sweeper
-  before_filter(only: [:index, :show]) { @page_caching = true }
   # GET /updates
   # GET /updates.json
   def index

diff --git a/app/sweepers/pages_sweeper.rb b/app/sweepers/pages_sweeper.rb
diff --git a/app/sweepers/sponsors_sweeper.rb b/app/sweepers/sponsors_sweeper.rb
diff --git a/app/sweepers/staff_sweeper.rb b/app/sweepers/staff_sweeper.rb
diff --git a/app/sweepers/updates_sweeper.rb b/app/sweepers/updates_sweeper.rb
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -5,16 +5,15 @@
     = stylesheet_link_tag 'application-screen', media: 'screen'
     = javascript_include_tag 'application'
     = google_webfonts_link_tag roboto: [100, 400, 500, 700, "italic", "bolditalic"]
-    = csrf_meta_tags unless @page_caching
+    = csrf_meta_tags
   %body
     %header#header
       = render 'layouts/partials/header'
     #content
-      - unless @page_caching
-        - if flash[:notice]
-          %p.notice= flash[:notice]
-        - if flash[:error]
-          %p.error= flash[:error]
+      - if flash[:notice]
+        %p.notice= flash[:notice]
+      - if flash[:error]
+        %p.error= flash[:error]
       %aside#sidebar
         = render 'layouts/partials/sidebar'
       #spin-container

diff --git a/config/routes.rb b/config/routes.rb
@@ -13,7 +13,6 @@
   root to: 'updates#index'
 
   get ':id',to:'pages#show', as: :page
-  resources :pages
 
   # The priority is based upon order of creation:
   # first created -> highest priority.