publify_core 9.0.0.pre2 → 9.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 192a92224fc3fef20534361ea13e13747264009f
-  data.tar.gz: 59b1e0ce9701b047697307dd5355acb30fe8053f
+  metadata.gz: 65754688dac47ff1c265e861e7d71e8ee11795b3
+  data.tar.gz: 11d916318fe03f35ba726dd7c713d4ed78c51f7a
 SHA512:
-  metadata.gz: bc476adc0afa5b919e7d69bcc242c1849de2b1107b7c3e8bebbfbb8f3ce3ce78cf5cd205de6632a4f927fd8ba6a473997884885dbf07ad6b6e9f40d3a1a8879a
-  data.tar.gz: 15090b596a772ca259023ac4fadeaf35db976b4411e74c4fc0583f7aea7679e86a12a99193f6ce20a851fe22524cc4f58c30d83d3b6bb42c77da026307b92e18
+  metadata.gz: cb60a7fdf3aba54771e6ade6ea56b24d82420396e6ffbdafb07262474b3a96a275d8b3d136b5098c6c3270176d4ce9f3808f2be95746691eb59a4d3474e6147f
+  data.tar.gz: ef03364bf180833752b6607d253a9b077dd897d1298ffe06d896d7e41584ba157183a5f83511259ce3ea10899bc69ead6dfbcc3ad1bbd06ac220ee5cf6335fdb

data/app/controllers/admin/content_controller.rb

@@ -5,8 +5,6 @@ module Admin; end
 class Admin::ContentController < Admin::BaseController
   layout :get_layout
 
-  cache_sweeper :blog_sweeper
-
   def index
     @search = params[:search] ? params[:search] : {}
     @articles = this_blog.articles.search_with(@search).page(params[:page]).per(this_blog.admin_display_elements)

data/app/controllers/admin/feedback_controller.rb

@@ -1,5 +1,4 @@
 class Admin::FeedbackController < Admin::BaseController
-  cache_sweeper :blog_sweeper
   ONLY_DOMAIN = %w(unapproved presumed_ham presumed_spam ham spam).freeze
 
   def index
@@ -108,11 +107,6 @@ class Admin::FeedbackController < Admin::BaseController
         count += Feedback.delete(id)
       end
       flash[:success] = I18n.t('admin.feedback.bulkops.success_deleted', count: count)
-
-      if items.any(&:invalidates_cache?)
-        flush_cache
-        return
-      end
     when 'Mark Checked Items as Ham'
       update_feedback(items, :mark_as_ham!)
       flash[:success] = I18n.t('admin.feedback.bulkops.success_mark_as_ham', count: ids.size)
@@ -124,7 +118,7 @@ class Admin::FeedbackController < Admin::BaseController
       flash[:success] = I18n.t('admin.feedback.bulkops.success_classification', count: ids.size)
     when 'Delete all spam'
       if request.post?
-        Feedback.delete_all(['state = ?', 'spam'])
+        Feedback.where('state = ?', 'spam').delete_all
         flash[:success] = I18n.t('admin.feedback.bulkops.success_deleted_spam')
       end
     else
@@ -147,13 +141,6 @@ class Admin::FeedbackController < Admin::BaseController
   def update_feedback(items, method)
     items.each do |value|
       value.send(method)
-      @unexpired && value.invalidates_cache? or next
-      flush_cache
     end
   end
-
-  def flush_cache
-    @unexpired = false
-    PageCache.sweep_all
-  end
 end

data/app/controllers/admin/migrations_controller.rb

@@ -1,5 +1,4 @@
 class Admin::MigrationsController < Admin::BaseController
-  cache_sweeper :blog_sweeper
   skip_before_action :look_for_needed_db_updates
 
   def show

data/app/controllers/admin/notes_controller.rb

@@ -1,6 +1,5 @@
 class Admin::NotesController < Admin::BaseController
   layout 'administration'
-  cache_sweeper :blog_sweeper
 
   before_action :load_existing_notes, only: [:index, :edit]
   before_action :find_note, only: [:edit, :update, :show, :destroy]

data/app/controllers/admin/pages_controller.rb

@@ -7,7 +7,6 @@ class Admin::PagesController < Admin::BaseController
   before_action :set_page, only: [:show, :edit, :update, :destroy]
 
   layout :get_layout
-  cache_sweeper :blog_sweeper
 
   def index
     @search = params[:search] ? params[:search] : {}

data/app/controllers/admin/post_types_controller.rb

@@ -1,6 +1,5 @@
 class Admin::PostTypesController < Admin::BaseController
   before_action :set_post_type, only: [:edit, :update, :destroy]
-  cache_sweeper :blog_sweeper
 
   def index
     @post_types = PostType.all

data/app/controllers/admin/resources_controller.rb

@@ -1,6 +1,4 @@
 class Admin::ResourcesController < Admin::BaseController
-  cache_sweeper :blog_sweeper
-
   def upload
     file = params[:upload]
 

data/app/controllers/admin/seo_controller.rb

@@ -1,5 +1,4 @@
 class Admin::SeoController < Admin::BaseController
-  cache_sweeper :blog_sweeper
   before_action :set_setting
   before_action :set_section
 

data/app/controllers/admin/settings_controller.rb

@@ -1,6 +1,4 @@
 class Admin::SettingsController < Admin::BaseController
-  cache_sweeper :blog_sweeper
-
   def index
     this_blog.base_url = blog_base_url if this_blog.base_url.blank?
     load_settings

data/app/controllers/admin/sidebar_controller.rb

@@ -29,7 +29,6 @@ class Admin::SidebarController < Admin::BaseController
 
   def publish
     Sidebar.apply_staging_on_active!
-    PageCache.sweep_all
     redirect_to admin_sidebar_index_path
   end
 

data/app/controllers/admin/tags_controller.rb

@@ -1,7 +1,6 @@
 class Admin::TagsController < Admin::BaseController
   before_action :fetch_tags, only: [:index, :edit]
   before_action :set_tag, only: [:edit, :update, :destroy]
-  cache_sweeper :blog_sweeper
 
   def index
     @tag = Tag.new

data/app/controllers/admin/textfilters_controller.rb

@@ -1,6 +1,6 @@
 class Admin::TextfiltersController < Admin::BaseController
   def macro_help
     @macro = TextFilterPlugin.available_filters.find { |filter| filter.short_name == params[:id] }
-    render text: BlueCloth.new(@macro.help_text).to_html
+    render html: BlueCloth.new(@macro.help_text).to_html
   end
 end

data/app/controllers/admin/themes_controller.rb

@@ -3,8 +3,6 @@ require 'time'
 require 'rexml/document'
 
 class Admin::ThemesController < Admin::BaseController
-  cache_sweeper :blog_sweeper
-
   def index
     @themes = Theme.find_all
     @themes.each do |theme|
@@ -23,15 +21,8 @@ class Admin::ThemesController < Admin::BaseController
   def switchto
     this_blog.theme = params[:theme]
     this_blog.save
-    zap_theme_caches
     this_blog.current_theme(:reload)
     flash[:success] = I18n.t('admin.themes.switchto.success')
     redirect_to admin_themes_url
   end
-
-  protected
-
-  def zap_theme_caches
-    FileUtils.rm_rf(%w(stylesheets javascript images).map { |v| page_cache_directory + "/#{v}/theme" })
-  end
 end

data/app/controllers/admin/users_controller.rb

@@ -1,6 +1,5 @@
 class Admin::UsersController < Admin::BaseController
   before_action :set_user, only: [:edit, :update, :destroy]
-  cache_sweeper :blog_sweeper
 
   def index
     @users = User.order('login asc').page(params[:page]).per(this_blog.admin_display_elements)

data/app/controllers/articles_controller.rb

@@ -5,9 +5,6 @@ class ArticlesController < ContentController
 
   layout :theme_layout, except: [:trackback]
 
-  cache_sweeper :blog_sweeper
-  caches_page :index, :archives, :read, :view_page, :redirect, if: proc { |c| c.request.query_string == '' }
-
   helper :'admin/base'
 
   def index
@@ -129,7 +126,7 @@ class ArticlesController < ContentController
 
   # TODO: Move to TextfilterController?
   def markup_help
-    render text: TextFilter.find(params[:id]).commenthelp
+    render html: TextFilter.find(params[:id]).commenthelp
   end
 
   private

data/app/controllers/comments_controller.rb

@@ -2,9 +2,8 @@ class CommentsController < FeedbackController
   before_action :get_article, only: [:create, :preview]
 
   def create
-    @comment = @article.with_options(new_comment_defaults) do |art|
-      art.add_comment(params[:comment].slice(:body, :author, :email, :url))
-    end
+    options = new_comment_defaults.merge comment_params.to_h
+    @comment = @article.add_comment(options)
 
     unless current_user.nil? || session[:user_id].nil?
       # maybe useless, but who knows ?
@@ -24,10 +23,10 @@ class CommentsController < FeedbackController
   end
 
   def preview
-    return render text: 'Comments are closed' if @article.comments_closed?
+    return render plain: 'Comments are closed' if @article.comments_closed?
 
     if comment_params[:body].blank?
-      render nothing: true
+      head :ok
       return
     end
 

data/app/controllers/feedback_controller.rb

@@ -1,8 +1,6 @@
 class FeedbackController < BaseController
   before_action :get_article, only: [:create]
 
-  cache_sweeper :blog_sweeper
-
   # Used only by comments. Maybe need move to comments controller
   # or use it in our code with send some feed about trackback
   #
@@ -28,7 +26,7 @@ class FeedbackController < BaseController
           article = Article.find(params[:article_id])
           redirect_to "#{URI.parse(article.permalink_url).path}\##{@page_title.underscore}"
         else
-          render text: 'this space left blank'
+          render plain: 'this space left blank'
         end
       end
       feedbacks = Feedback.from(controller_name, params[:article_id]).limit(this_blog.per_page(params[:format]))

data/app/controllers/notes_controller.rb

@@ -2,8 +2,6 @@ class NotesController < ContentController
   require 'json'
 
   layout :theme_layout
-  cache_sweeper :blog_sweeper
-  caches_page :index, :show, if: proc { |c| c.request.query_string == '' }
 
   after_action :set_blog_infos
 

data/app/controllers/tags_controller.rb

@@ -1,11 +1,6 @@
 class TagsController < ContentController
   before_action :auto_discovery_feed, only: [:show, :index]
   layout :theme_layout
-  cache_sweeper :blog_sweeper
-
-  caches_page :index, :show, if: proc { |c|
-    c.request.query_string == ''
-  }
 
   def index
     @tags = Tag.page(params[:page]).per(100)

data/app/controllers/text_controller.rb

@@ -1,9 +1,9 @@
 class TextController < BaseController
   def humans
-    render text: this_blog.humans
+    render plain: this_blog.humans
   end
 
   def robots
-    render text: this_blog.robots
+    render plain: this_blog.robots
   end
 end

data/app/controllers/theme_controller.rb

@@ -16,7 +16,7 @@ class ThemeController < ContentController
   end
 
   def error
-    render nothing: true, status: 404
+    head :not_found
   end
 
   def static_view_test
@@ -27,11 +27,11 @@ class ThemeController < ContentController
   def render_theme_item(type, file, mime = nil)
     mime ||= mime_for(file)
     if file.split(%r{[\\/]}).include?('..')
-      return (render 'errors/404', status: 404)
+      return (render 'errors/404', status: 404, formats: ['html'])
     end
 
     src = this_blog.current_theme.path + "/#{type}/#{file}"
-    return (render text: 'Not Found', status: 404) unless File.exist? src
+    return (render plain: 'Not Found', status: 404) unless File.exist? src
 
     cache_page File.read(src) if perform_caching
 

data/app/controllers/trackbacks_controller.rb

@@ -18,7 +18,7 @@ class TrackbacksController < FeedbackController
 
     respond_to do |format|
       format.xml { render 'trackback', formats: [:xml], handlers: [:builder] }
-      format.html { render nothing: true }
+      format.html { head :ok }
     end
   end
 

data/app/controllers/xml_controller.rb

@@ -1,8 +1,4 @@
 class XmlController < BaseController
-  caches_page :feed, if: proc { |c|
-    c.request.query_string == ''
-  }
-
   NORMALIZED_FORMAT_FOR = { 'atom' => 'atom', 'rss' => 'rss',
                             'atom10' => 'atom', 'atom03' => 'atom', 'rss20' => 'rss',
                             'googlesitemap' => 'googlesitemap', 'rsd' => 'rsd' }.freeze
@@ -13,7 +9,7 @@ class XmlController < BaseController
     @format = 'rss'
     if params[:format]
       @format = NORMALIZED_FORMAT_FOR[params[:format]]
-      return render(text: 'Unsupported format', status: 404) unless @format
+      return render(plain: 'Unsupported format', status: 404) unless @format
     end
 
     # TODO: Move redirects into config/routes.rb, if possible
@@ -37,7 +33,7 @@ class XmlController < BaseController
 
       @feed_title = this_blog.blog_name
       @link = this_blog.base_url
-      @self_url = url_for(params)
+      @self_url = request.url
 
       @items += Article.find_already_published(1000)
       @items += Page.find_already_published(1000)
@@ -47,7 +43,7 @@ class XmlController < BaseController
         format.googlesitemap
       end
     else
-      return render(text: 'Unsupported feed type', status: 404)
+      return render(plain: 'Unsupported feed type', status: 404)
     end
   end
 

data/app/models/article/states.rb

@@ -108,6 +108,7 @@ module Article::States
 
   class Withdrawn < Base
     def enter_hook
+      super
       content[:published] = false
     end
 
@@ -126,6 +127,7 @@ module Article::States
 
   class PublicationPending < Base
     def enter_hook
+      super
       content[:published] = false if content.new_record?
     end
 

data/app/models/blog.rb

@@ -170,39 +170,41 @@ EOS
     @current_theme ||= Theme.find(theme) || Theme.new('', '')
   end
 
-  # Generate a URL based on the +base_url+.  This allows us to generate URLs
-  # without needing a controller handy, so we can produce URLs from within models
-  # where appropriate.
-  #
-  # It also caches the result in the Rails cache, so repeated URL generation
-  # requests should be fast, as they bypass all of Rails' route logic.
-  def url_for_with_base_url(options = {}, extra_params = {})
-    case options
-    when String
-      url_generated = if extra_params[:only_path]
-                        root_path
-                      else
-                        base_url
-                      end
-      url_generated += "/#{options}" # They asked for 'url_for "/some/path"', so return it unedited.
-      url_generated += "##{extra_params[:anchor]}" if extra_params[:anchor]
-      url_generated
-    when Hash
-      merged_opts = options.reverse_merge!(only_path: false, controller: '',
-                                           action: 'permalink',
-                                           host: host_with_port,
-                                           script_name: root_path)
-      cache_key = merged_opts.values.prepend('blog-urlfor-withbaseurl').join('-')
-      unless Rails.cache.exist?(cache_key)
-        Rails.cache.write(cache_key, url_for_without_base_url(merged_opts))
+  module BasedUrlFor
+    # Generate a URL based on the +base_url+.  This allows us to generate URLs
+    # without needing a controller handy, so we can produce URLs from within models
+    # where appropriate.
+    #
+    # It also caches the result in the Rails cache, so repeated URL generation
+    # requests should be fast, as they bypass all of Rails' route logic.
+    def url_for(options = {}, extra_params = {})
+      case options
+      when String
+        url_generated = if extra_params[:only_path]
+                          root_path
+                        else
+                          base_url
+                        end
+        url_generated += "/#{options}" # They asked for 'url_for "/some/path"', so return it unedited.
+        url_generated += "##{extra_params[:anchor]}" if extra_params[:anchor]
+        url_generated
+      when Hash
+        merged_opts = options.reverse_merge!(only_path: false, controller: '',
+                                             action: 'permalink',
+                                             host: host_with_port,
+                                             script_name: root_path)
+        cache_key = merged_opts.values.prepend('blog-urlfor-withbaseurl').join('-')
+        unless Rails.cache.exist?(cache_key)
+          Rails.cache.write(cache_key, super(merged_opts))
+        end
+        Rails.cache.read(cache_key)
+      else
+        raise "Invalid URL in url_for: #{options.inspect}"
       end
-      Rails.cache.read(cache_key)
-    else
-      raise "Invalid URL in url_for: #{options.inspect}"
     end
   end
 
-  alias_method_chain :url_for, :base_url
+  prepend BasedUrlFor
 
   # The URL for a static file.
   # FIXME: Let carrierwave handle this by itself

data/app/models/trigger.rb

@@ -9,7 +9,7 @@ class Trigger < ActiveRecord::Base
     end
 
     def fire
-      destroy_all ['due_at <= ?', Time.now]
+      where('due_at <= ?', Time.now).destroy_all
       true
     rescue
       migrator = Migrator.new

data/app/views/admin/shared/_menu.html.erb

@@ -67,7 +67,6 @@
             <%= menu_item(t('.write'),            write_admin_settings_path) %>
             <%= menu_item(t('.display'),          display_admin_settings_path) %>
             <%= menu_item(t('.feedback'),         feedback_admin_settings_path) %>
-            <%= menu_item(t('.cache'),            admin_cache_path) %>
             <%= menu_item(t('.manage_users'),     admin_users_path) %>
           </ul>
         </li>

data/app/views/notes/show_in_reply.html.erb

@@ -1,7 +1,9 @@
 <div class="hfeed">
   <div class='h-entry hentry h-as-note'>
     <article class=' well well-small'>
-      <%= image_tag(@reply['user']['profile_image_url'] , class: "alignleft", alt: @reply['user']['name']) %>
+      <% if @reply['user']['profile_image_url'] %>
+        <%= image_tag(@reply['user']['profile_image_url'], class: "alignleft", alt: @reply['user']['name']) %>
+      <% end %>
       <strong><%= get_reply_context_url(@reply) %></strong>
       <p><%= nofollowify_links(PublifyApp::Textfilter::Twitterfilter.filtertext(@reply['text'])) %></p>
       <p>

data/config/routes.rb

@@ -95,9 +95,6 @@ Rails.application.routes.draw do
   namespace :admin do
     root 'dashboard#index', as: 'dashboard'
 
-    get 'cache', to: 'cache#show', format: false
-    delete 'cache', to: 'cache#destroy', format: false
-
     resources :content, only: [:index, :new, :edit, :create, :update, :destroy], format: false do
       collection do
         get 'auto_complete_for_article_keywords'

data/lib/publify_core/version.rb

@@ -1,3 +1,3 @@
 module PublifyCore
-  VERSION = '9.0.0.pre2'
+  VERSION = '9.0.0.pre3'
 end

data/lib/publify_core.rb

@@ -5,7 +5,6 @@ require 'publify_core/version'
 require 'publify_core/engine'
 require 'publify_core/lang'
 
-require 'actionpack/page_caching'
 require 'activerecord/session_store'
 require 'bootstrap-sass'
 require 'carrierwave'
@@ -13,11 +12,6 @@ require 'dynamic_form'
 require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'kaminari'
-# Ensure Rails Observers defines ActiveRecord::Observer before loading
-# sweeping.rb. Otherwise, Sweeper won't be defined.
-# TODO: Replace or update rails-observers
-require 'rails/observers/activerecord/active_record'
-require 'rails-observers'
 require 'rails_autolink'
 require 'rails-timeago'
 require 'recaptcha/rails'

data/lib/text_filter_plugin.rb

@@ -78,7 +78,7 @@ class TextFilterPlugin
   end
 
   def self.sanitize(*args)
-    (@sanitizer ||= HTML::WhiteListSanitizer.new).sanitize(*args)
+    (@sanitizer ||= Rails::Html::WhiteListSanitizer.new).sanitize(*args)
   end
 
   def self.default_helper_module!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publify_core
 version: !ruby/object:Gem::Version
-  version: 9.0.0.pre2
+  version: 9.0.0.pre3
 platform: ruby
 authors:
 - Matijs van Zuijlen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -41,20 +41,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.3.1
-- !ruby/object:Gem::Dependency
-  name: actionpack-page_caching
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: activerecord-session_store
   requirement: !ruby/object:Gem::Requirement
@@ -201,28 +187,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -265,20 +251,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: rails-observers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rails-timeago
   requirement: !ruby/object:Gem::Requirement
@@ -313,28 +285,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -461,6 +433,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 description: Core engine for the Publify blogging system, formerly known as Typo.
 email:
 - matijs@matijs.net
@@ -521,7 +507,6 @@ files:
 - app/assets/stylesheets/widearea.css
 - app/controllers/accounts_controller.rb
 - app/controllers/admin/base_controller.rb
-- app/controllers/admin/cache_controller.rb
 - app/controllers/admin/content_controller.rb
 - app/controllers/admin/dashboard_controller.rb
 - app/controllers/admin/feedback_controller.rb
@@ -567,7 +552,6 @@ files:
 - app/models/article/factory.rb
 - app/models/article/states.rb
 - app/models/blog.rb
-- app/models/blog_sweeper.rb
 - app/models/comment.rb
 - app/models/config_manager.rb
 - app/models/content.rb
@@ -577,7 +561,6 @@ files:
 - app/models/meta_sidebar.rb
 - app/models/note.rb
 - app/models/page.rb
-- app/models/page_cache.rb
 - app/models/page_sidebar.rb
 - app/models/ping.rb
 - app/models/post_type.rb
@@ -597,7 +580,6 @@ files:
 - app/services/title_builder.rb
 - app/uploaders/resource_uploader.rb
 - app/views/accounts/confirm.html.erb
-- app/views/admin/cache/show.html.erb
 - app/views/admin/content/_article_list.html.erb
 - app/views/admin/content/_form.html.erb
 - app/views/admin/content/autosave.js.erb

data/app/controllers/admin/cache_controller.rb

@@ -1,33 +0,0 @@
-require 'find'
-
-class Admin::CacheController < Admin::BaseController
-  def show
-    @cache_size = 0
-    @cache_number = 0
-
-    FileUtils.mkdir_p(Rails.application.config.action_controller.page_cache_directory) unless File.exist?(Rails.application.config.action_controller.page_cache_directory)
-
-    Find.find(Rails.application.config.action_controller.page_cache_directory) do |path|
-      if FileTest.directory?(path)
-        if File.basename(path)[0] == '.'
-          Find.prune
-        else
-          next
-        end
-      else
-        @cache_size += FileTest.size(path)
-        @cache_number += 1
-      end
-    end
-  end
-
-  def destroy
-    begin
-      PageCache.sweep_all
-      flash[:success] = t('admin.cache.destroy.success')
-    rescue
-      flash[:error] = t('admin.cache.destroy.error')
-    end
-    redirect_to admin_cache_url
-  end
-end

data/app/models/blog_sweeper.rb

@@ -1,86 +0,0 @@
-class BlogSweeper < ActionController::Caching::Sweeper
-  observe Blog, User, Article, Page, Comment, Trackback, Note, Tag
-
-  def pending_sweeps
-    @pending_sweeps ||= Set.new
-  end
-
-  def run_pending_page_sweeps
-    pending_sweeps.each do |each|
-      send(each)
-    end
-  end
-
-  def after_comments_create
-    expire_for(controller.send(:instance_variable_get, :@comment))
-  end
-
-  alias after_comments_update after_comments_create
-  alias after_articles_comment after_comments_create
-
-  def after_comments_destroy
-    expire_for(controller.send(:instance_variable_get, :@comment), true)
-  end
-
-  alias after_articles_nuke_comment after_comments_destroy
-
-  def after_articles_trackback
-    expire_for(controller.send(:instance_variable_get, :@trackback))
-  end
-
-  def after_articles_nuke_trackback
-    expire_for(controller.send(:instance_variable_get, :@trackback), true)
-  end
-
-  def after_save(record)
-    expire_for(record) unless record.is_a?(Article) && record.state == :draft
-  end
-
-  def after_destroy(record)
-    expire_for(record, true)
-  end
-
-  # TODO: Simplify this. Almost every sweep amounts to a sweep_all.
-  def expire_for(record, destroying = false)
-    case record
-    when Page
-      pending_sweeps << :sweep_pages
-    when Content
-      if record.invalidates_cache?(destroying)
-        pending_sweeps << :sweep_articles << :sweep_pages
-      end
-    when Tag
-      pending_sweeps << :sweep_articles << :sweep_pages
-    when Blog, User, Comment, Trackback
-      pending_sweeps << :sweep_all << :sweep_theme
-    end
-    run_pending_page_sweeps unless controller
-  end
-
-  def sweep_all
-    PageCache.sweep_all
-  end
-
-  def sweep_theme
-    PageCache.sweep_theme_cache
-  end
-
-  def sweep_articles
-    PageCache.sweep_all
-  end
-
-  def sweep_pages
-    PageCache.zap_pages(%w(pages))
-  end
-
-  def logger
-    @logger ||= ::Rails.logger || Logger.new(STDERR)
-  end
-
-  private
-
-  def callback(timing)
-    super
-    run_pending_page_sweeps if timing == :after
-  end
-end

data/app/models/page_cache.rb

@@ -1,33 +0,0 @@
-# FIXME: This class is not a model anymore. Move elsewhere?
-class PageCache
-  def self.logger
-    ::Rails.logger
-  end
-
-  def logger
-    ::Rails.logger
-  end
-
-  def self.public_path
-    ActionController::Base.page_cache_directory
-  end
-
-  # Delete all file save in path_cache by page_cache system
-  def self.sweep_all
-    zap_pages(%w(*))
-  end
-
-  def self.sweep_theme_cache
-    zap_pages(%w(images/theme/* stylesheets/theme/* javascripts/theme/*))
-  end
-
-  def self.zap_pages(paths)
-    # Ensure no one is going to wipe his own blog public directory
-    # It happened once on a release and was no fun at all
-    return if public_path == "#{::Rails.root}/public"
-    paths.each do |v|
-      FileUtils.rm_rf(Dir.glob(public_path + "/#{v}"))
-    end
-    true
-  end
-end

data/app/views/admin/cache/show.html.erb

@@ -1,18 +0,0 @@
-<% content_for :page_heading do %>
-<h2>
-  <i class="glyphicon glyphicon-large glyphicon-cog"></i>
-  <%= t(".cache") %>
-</h2>
-<% end %>
-
-<p class='alert alert-info'><%= t(".explanation") %></p>
-
-<div class='well'>
-  <p><%= t(".stats", files_count: @cache_number.to_i, size: @cache_size.to_i / 1000) %></p>
-  <hr>
-  <%= form_tag(admin_cache_path, method: :delete) do %>
-    <div class='form-group'>
-      <%= submit_tag(t(".sweep_cache"), class: 'btn btn-primary') %>
-    </div>
-  <% end %>
-</div>