blogit 0.0.13 → 0.1.0

data/app/assets/stylesheets/blogit/index.css

@@ -1,3 +1,75 @@
-/*
- *= require_tree
-*/
+article.blog_post {
+  width: 600px;
+  margin: 0 auto;
+}
+.blog_post header h1 a{
+  text-decoration: none;
+  color: #55D; 
+}
+.blog_post p{
+  line-height: 1.6em;
+}
+.blog_post_comments_count{
+  margin: 1em 0;
+  text-align: right;
+}
+.blog_post_spacer{
+  width: 80%;
+  margin: 1em auto;
+  border-color: thin solid silver;
+  border-top: none;
+}
+.blog_post_footer, footer{
+  font-size: 0.8em;
+  font-style: italic;
+  color: silver;
+}
+
+#new_blogit_post_link{
+  text-align: right;
+}
+#new_blogit_post, .edit_blogit_post{
+  width: 100%;
+}
+#post_title, #post_body{
+  width: 100%;
+}
+.new_blog_post fieldset{
+  border: none;
+  padding: 0;
+  margin: 0;
+}
+.new_blog_post input,.new_blog_post textarea{
+  font-size: 17px;
+}
+.new_blog_post .blog_post_tip{
+  margin: 0;
+  float: right;
+  width: 55%;
+  text-align: right;
+  color: #333;
+  font-style: italic;
+}
+#new_blog_post_tag_field{
+  float: left;
+  width: 40%;
+}
+.new_blog_post .actions{
+  margin: 1em 0;
+}
+#new_blog_comment{
+  width: 600px;
+  margin: 0 auto;
+}
+#new_blog_comment .hidden {
+  display: none;
+}
+.blog_comment{
+  width: 600px;
+  margin: 1em auto;
+  padding: 0 0 1em;
+  border-bottom: thin solid silver;
+}
+.blog_comment .actions, .blog_post .actions{
+  text-align: right;
+}

data/app/controllers/blogit/application_controller.rb

@@ -2,7 +2,7 @@ module Blogit
 
   # Inherits from the application's controller instead of ActionController::Base
   class ApplicationController < ::ApplicationController
-    
+      
     helper :all
     helper_method :current_blogger, :blogit_conf
     
@@ -19,6 +19,20 @@ module Blogit
       Blogit::configuration
     end
     
+    # Turns on page caching for the given actions if 
+    # Blogit.configuration.include_admin_links is true
+    def self.blogit_cacher(*args)
+      if blogit_conf.include_admin_links
+        caches_page *args
+      end
+    end
+    
+    def self.blogit_sweeper(*args)
+      if blogit_conf.include_admin_links
+        cache_sweeper Blogit::BlogitSweeper, only: args
+      end
+    end
+    
     # A helper method to access the Blogit::configuration
     # at the controller instance level
     def blogit_conf

data/app/controllers/blogit/comments_controller.rb

@@ -3,25 +3,19 @@ module Blogit
 
     blogit_authenticate except: [:create]
     
-    expose(:post) { Blogit::Post.find(params[:post_id]) }
-    expose(:comments) { post.comments }
-    expose(:comment) { 
-      case params[:action]
-      when /create/ then comments.new(params[:comment])
-      when /destroy/ then comments.find(params[:id])
-      end
-    }
+    blogit_sweeper(:create, :update, :destroy)
 
 
     def create
+      @comment = post.comments.new(params[:comment])
       respond_to do |format|
         format.js {
           # the rest is dealt with in the view
-          comment.save
+          @comment.save
         }
 
         format.html { 
-          if comment.save 
+          if @comment.save 
             redirect_to(post, notice: "Successfully added comment!")
           else
             render "blogit/posts/show"
@@ -33,12 +27,19 @@ module Blogit
     end
 
     def destroy
-      comment.destroy
+      @comment = post.comments.find(params[:id])
+      @comment.destroy
       respond_to do |format|
         format.html { redirect_to(post, notice: "Successfully removed comment.") }        
         format.js
       end
     end
+    
+    private
 
+    def post
+      @post ||= Blogit::Post.find(params[:post_id])
+    end
+    
   end
 end

data/app/controllers/blogit/posts_controller.rb

@@ -1,4 +1,5 @@
 module Blogit
+    
   class PostsController < ApplicationController
 
     unless blogit_conf.include_admin_actions
@@ -6,62 +7,53 @@ module Blogit
     end
 
     blogit_authenticate(except: [:index, :show, :tagged])
-
-    expose(:posts) { 
-      if params[:tag]
-        Post.for_index(params[:page]).tagged_with(params[:tag])
-      else
-        Post.for_index(params[:page])
-      end
-    }
-    expose(:post) do
-      case action_name
-      when /new|create/
-        current_blogger.blog_posts.new(params[:post])
-      when /edit|update|destroy/
-        current_blogger.blog_posts.find(params[:id])
-      when /show/
-        Blogit::Post.find(params[:id])
-      end
-    end
-
-    expose(:comments) { post.comments }
-    expose(:comment) { post.comments.build }
+    
+    blogit_cacher(:index, :show, :tagged)
+    blogit_sweeper(:create, :update, :destroy)
 
     def index
+      @posts = Post.for_index(params[:page])
     end
 
     def show
+      @post    = Post.find(params[:id])
+      @comment = @post.comments.new
     end
 
     def tagged
+      @posts = Post.for_index(params[:page]).tagged_with(params[:tag])
       render :index
     end
 
     def new
+      @post = current_blogger.blog_posts.new(params[:post])
     end
 
     def edit
+      @post = current_blogger.blog_posts.find(params[:id])
     end
 
     def create
-      if post.save
-        redirect_to post, notice: 'Blog post was successfully created.'
+      @post = current_blogger.blog_posts.new(params[:post])
+      if @post.save
+        redirect_to @post, notice: 'Blog post was successfully created.'
       else
         render action: "new"
       end
     end
 
     def update
-      if post.update_attributes(params[:post])
-        redirect_to post, notice: 'Blog post was successfully updated.'
+      @post = current_blogger.blog_posts.find(params[:id])
+      if @post.update_attributes(params[:post])
+        redirect_to @post, notice: 'Blog post was successfully updated.'
       else
         render action: "edit"
       end
     end
 
     def destroy
-      post.destroy
+      @post = current_blogger.blog_posts.find(params[:id])
+      @post.destroy
       redirect_to posts_url, notice: "Blog post was successfully destroyed."
     end
 

data/app/models/blogit/post.rb

@@ -1,11 +1,14 @@
 module Blogit
   class Post < ActiveRecord::Base
 
+    require "acts-as-taggable-on"
+    require "kaminari"
+    
     acts_as_taggable    
 
     self.table_name = "blog_posts"
 
-    paginates_per Blogit.configuration.posts_per_page
+    self.paginates_per Blogit.configuration.posts_per_page
 
     # ===============
     # = Validations =
@@ -31,7 +34,7 @@ module Blogit
 
     # Returns the blog posts paginated for the index page
     # @scope class
-    scope :for_index, lambda { |page = 1| order("updated_at DESC").page(page) }
+    scope :for_index, lambda { |page_no = 1| order("updated_at DESC").page(page_no) }
 
     # ====================
     # = Instance Methods =

data/app/sweepers/blogit/blogit_sweeper.rb

@@ -0,0 +1,9 @@
+module Blogit
+  
+  class BlogitSweeper < ActionController::Caching::Sweeper
+
+    observe Blogit::Post, Blogit::Comment
+
+  end
+  
+end

data/app/views/blogit/comments/_admin_links.html.erb

@@ -1,3 +1,3 @@
 <%= login_required(class: "actions") do %>
-  <%= link_to("delete", [post, comment], method: :delete) %>
+  <%= link_to("delete", [@post, @comment], method: :delete) %>
 <% end %>

data/app/views/blogit/comments/_comment.html.erb

@@ -6,13 +6,14 @@
 
   <%= content_tag(:div, class: "blog_comment_body", 
       id: "blog_comment_#{comment.id}_body") do %>
-      <%= format_content comment.body %>      
+      <%= format_content comment.body || "" %>
   <% end %>
   
   <%= blog_comment_tag(:footer) do %>
-    Posted on <%= time_tag(post.created_at, Blogit.configuration.datetime_format) %>
+    Posted on <%= time_tag(@post.created_at, Blogit.configuration.datetime_format) %>
   <% end %>
   
   <%= render partial: "blogit/comments/admin_links" %>
   
-<% end %>
+<% end if comment.persisted? %>
+

data/app/views/blogit/comments/_form.html.erb

@@ -1,5 +1,5 @@
 
-<%= form_for [post, comment], remote: true, 
+<%= form_for [@post, @comment], remote: true, 
   html: {
     class: "new_blog_comment", id: "new_blog_comment" } do |f| -%>
   
@@ -14,26 +14,26 @@
   <%= field do %>
     <%= f.label :name, "Name *" %><br>
     <%= f.text_field :name %>
-    <%= errors_on(comment, :name) %>
+    <%= errors_on(@comment, :name) %>
   <% end %>
   
   <%= field do %>
     <%= f.label :email, "Email" %> (never displayed)<br>
     <%= f.email_field :email %>
-    <%= errors_on(comment, :email) %>    
+    <%= errors_on(@comment, :email) %>    
   <% end %>
 
   <%= field do %>
     <%= f.label :website, "Your Website" %><br>
     <%= f.url_field :website %>
-    <%= errors_on(comment, :website) %>    
+    <%= errors_on(@comment, :website) %>    
   <% end %>
 
   
   <%= field do %>
     <%= f.label :body, "Your comment *" %><br>
     <%= f.text_area :body %><br>
-    <%= errors_on(comment, :body) %>
+    <%= errors_on(@comment, :body) %>
   <% end %>
   
   <%= actions do %>

data/app/views/blogit/comments/create.js.erb

@@ -1,6 +1,6 @@
 var $form = $("form#new_blog_comment");
-<% if comment.save %>
-  $("#comments").append("<%= escape_javascript(render(comment)) %>");
+<% if @comment.save %>
+  $("#comments").append("<%= escape_javascript(render(@comment)) %>");
   $form.get(0).reset();
 <% else %>
   $form.html("<%= escape_javascript(render('form')) %>");

data/app/views/blogit/comments/destroy.js.erb

@@ -1 +1 @@
-$("#comment_<%= comment.id %>").remove();
+$("#comment_<%= @comment.id %>").remove();

data/app/views/blogit/posts/_form.html.erb

@@ -1,11 +1,11 @@
-<%= form_for(post, html: {class: "new_blog_post", id: "new_blog_post"}) do |f| %>
+<%= form_for(@post, html: {class: "new_blog_post", id: "new_blog_post"}) do |f| %>
 
-  <% if post.errors.any? %>
+  <% if @post.errors.any? %>
     <div id="error_explanation">
-      <h2><%= pluralize(post.errors.count, "error") %> prohibited this post from being saved:</h2>
+      <h2><%= pluralize(@post.errors.count, "error") %> prohibited this post from being saved:</h2>
 
       <ul>
-        <% post.errors.full_messages.each do |msg| %>
+        <% @post.errors.full_messages.each do |msg| %>
           <li><%= msg %></li>
         <% end %>
       </ul>
@@ -37,7 +37,7 @@
 
   <%= actions do %>
     <%= f.submit %> or 
-    <%= link_to("cancel", post.new_record? ? root_path : post_path(post)) %>
+    <%= link_to("cancel", @post.new_record? ? root_path : post_path(@post)) %>
   <% end %>
 
 <% end %>

data/app/views/blogit/posts/_pagination.html.erb

@@ -1 +1 @@
-<%= paginate(posts) %>
+<%= paginate(@posts) %>

data/app/views/blogit/posts/edit.html.erb

@@ -1,3 +1,3 @@
-<h2>Edit Blog Post #<%= post.id %></h2>
+<h2>Edit Blog Post #<%= @post.id %></h2>
 
 <%= render 'form' %>

data/app/views/blogit/posts/index.html.erb

@@ -2,10 +2,10 @@
   <%= link_to 'New Blog post', new_post_path %>
 <% end %>
 
-<% if posts.any? %>
+<% if @posts.any? %>
 
   <%= render partial: "blogit/posts/post", 
-    collection: posts, 
+    collection: @posts, 
     spacer_template: "blog_post_spacer", 
     locals: {show_comments_count: true}  %>
 <% else %>

data/app/views/blogit/posts/show.html.erb

@@ -1,7 +1,7 @@
-<%= render post %>
+<%= render @post %>
 <% if blogit_conf.include_comments %>
   <div id="comments">
-    <%= render comments %>
+    <%= render @post.comments %>
   </div>
   <%= render "blogit/comments/form" %>    
 <% end %>

data/lib/blogit.rb

@@ -1,11 +1,19 @@
+# Third-party requirements
+require "acts-as-taggable-on"
+require "kaminari"
+require "redcarpet"
+
 require "blogit/configuration"
 require "blogit/blogs"
 require "blogit/engine"
 require "blogit/parsers"
-require "validators"
 
+require "validators"
 module Blogit
   
+  autoload :ActsAsTaggableOn, "acts-as-taggable-on"
+  autoload :Kaminari, "kaminari"
+  
   # Exception raised when gem may not be configured properly
   class ConfigurationError < StandardError;end
   

data/lib/blogit/configuration.rb

@@ -58,6 +58,9 @@ module Blogit
     # Defaults to REDCARPET_OPTIONS
     attr_accessor :redcarpet_options  
     
+    # Should the controllers cache the blog pages as HTML?
+    attr_accessor :cache_pages
+    
     REDCARPET_OPTIONS = [:hard_wrap, :filter_html, :autolink, 
         :no_intraemphasis, :fenced_code, :gh_blockcode]
     
@@ -71,7 +74,8 @@ module Blogit
       @author_edits_only           = false
       @ajax_comments               = true
       @include_admin_actions       = true
-      @include_admin_links       = true      
+      @include_admin_links         = true      
+      @cache_pages                 = false
       @default_parser              = :markdown
       @highlight_code_syntax       = true
       @redcarpet_options           = REDCARPET_OPTIONS