blogit 0.4.8 → 0.5.0

data/README.md

@@ -55,6 +55,9 @@ we'll also throw in:
 * An XML Sitemap located at `/blog/posts.xml`
 * An RSS feed located at `/blog/posts.rss`
 * Page Caching and Sweeping
+* Internationalization (see the [locales file](https://github.com/KatanaCode/blogit/blob/master/config/locales/en.yml) for configurable options)
+* Share links (Google+, Twitter & Facebook)
+* [Disquss Comments](http://disqus.com)
 
 ## Issues
 
@@ -96,8 +99,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ## Credits
 
-Developed by [katana:code](http://katanacode.com)
+Developed by [Katana Code](http://katanacode.com)
 
-## About katana:code
+with generous contributions from:
 
-katana:code are [Ruby on Rails Developers Based in Edinburgh, Scotland](http://katanacode.com/ "katana:code").
+* [Philou](https://github.com/philou)
+* [Stewart McKee](https://github.com/stewartmckee)
+
+## About Katana Code
+
+Katana Code are [Ruby on Rails Developers Based in Edinburgh, Scotland](http://katanacode.com/ "Katana Code").

data/app/assets/javascripts/blogit/archive.js

@@ -0,0 +1,8 @@
+// Supporting functions for the display of post archives
+
+jQuery(function(){
+  $("a[data-blogit-click-to-toggle-children]").click(function(event){
+    event.preventDefault();
+    $(this).siblings('ul').toggle();
+  })
+})

data/app/assets/javascripts/blogit/index.js

@@ -1 +1 @@
-//
+//= require_tree .

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

@@ -4,7 +4,7 @@ article.blog_post {
 }
 .blog_post header h1 a{
   text-decoration: none;
-  color: #55D; 
+  color: #55D;
 }
 .blog_post p{
   line-height: 1.6em;
@@ -73,3 +73,12 @@ article.blog_post {
 .blog_comment .actions, .blog_post .actions{
   text-align: right;
 }
+
+#blog_share_bar {
+  width: 600px;
+  margin: 0.5em auto;
+}
+
+.social_button {
+  display: inline-block;
+}

data/app/controllers/blogit/comments_controller.rb

@@ -2,7 +2,7 @@ module Blogit
   class CommentsController < ApplicationController
 
     blogit_authenticate except: [:create]
-    
+
     blogit_sweeper(:create, :update, :destroy)
 
 
@@ -14,9 +14,9 @@ module Blogit
           @comment.save
         }
 
-        format.html { 
-          if @comment.save 
-            redirect_to(post, notice: "Successfully added comment!")
+        format.html {
+          if @comment.save
+            redirect_to(post, notice: t(:successfully_added_comment, scope: 'blogit.comments'))
           else
             render "blogit/posts/show"
           end
@@ -30,16 +30,16 @@ module Blogit
       @comment = post.comments.find(params[:id])
       @comment.destroy
       respond_to do |format|
-        format.html { redirect_to(post, notice: "Successfully removed comment.") }        
+        format.html { redirect_to(post, notice: t(:successfully_removed_comment, scope: 'blogit.comments'))}
         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,13 +1,16 @@
 module Blogit
-    
-  class PostsController < ApplicationController
 
-    unless blogit_conf.include_admin_actions
+  # Using explicit ::Blogit::ApplicationController fixes NoMethodError 'blogit_authenticate' in
+  # the main_app
+  class PostsController < ::Blogit::ApplicationController
+
+    # We can't use blogit_conf here because it sometimes raises NoMethodError in main app's routes
+    unless Blogit.configuration.include_admin_actions
       before_filter :raise_404, except: [:index, :show, :tagged]
     end
 
     blogit_authenticate(except: [:index, :show, :tagged])
-    
+
     blogit_cacher(:index, :show, :tagged)
     blogit_sweeper(:create, :update, :destroy)
 
@@ -26,8 +29,7 @@ module Blogit
     end
 
     def show
-      @post    = Post.find(params[:id])
-      @comment = @post.comments.new
+      @post = Post.find(params[:id])
     end
 
     def tagged
@@ -46,7 +48,7 @@ module Blogit
     def create
       @post = current_blogger.blog_posts.new(params[:post])
       if @post.save
-        redirect_to @post, notice: 'Blog post was successfully created.'
+        redirect_to @post, notice: t(:blog_post_was_successfully_created, scope: 'blogit.posts')
       else
         render action: "new"
       end
@@ -55,7 +57,7 @@ module Blogit
     def update
       @post = current_blogger.blog_posts.find(params[:id])
       if @post.update_attributes(params[:post])
-        redirect_to @post, notice: 'Blog post was successfully updated.'
+        redirect_to @post, notice: t(:blog_post_was_successfully_updated, scope: 'blogit.posts')
       else
         render action: "edit"
       end
@@ -64,7 +66,7 @@ module Blogit
     def destroy
       @post = current_blogger.blog_posts.find(params[:id])
       @post.destroy
-      redirect_to posts_url, notice: "Blog post was successfully destroyed."
+      redirect_to posts_url, notice: t(:blog_post_was_successfully_destroyed, scope: 'blogit.posts')
     end
 
     private
@@ -76,4 +78,4 @@ module Blogit
 
   end
 
-end
+end

data/app/helpers/blogit/application_helper.rb

@@ -12,7 +12,7 @@ module Blogit
 
     # Returns the first error message for an ActiveRecord model instance
     # @param object A model instance to check
-    # @param attribute A symbol or string for attribute name to check for 
+    # @param attribute A symbol or string for attribute name to check for
     #   errors
     def errors_on(object, attribute)
       error_message = object.errors[attribute].first
@@ -26,13 +26,13 @@ module Blogit
     end
 
     # A helper method for creating a +<div>+ tag with class 'actions'
-    # Used for option links and form buttons    
+    # Used for option links and form buttons
     def actions(content_or_options={}, options ={}, &block)
       div_with_default_class(:actions, content_or_options, options, &block)
     end
 
     # A helper method for creating a +<div>+ tag with class 'login_required'
-    # Will only render content if there is a logged in user    
+    # Will only render content if there is a logged in user
     def login_required(content_or_options={}, options ={}, &block)
       if current_blogger and blogit_conf.include_admin_links
         div_with_default_class(:login_required, content_or_options, options, &block)
@@ -57,12 +57,31 @@ module Blogit
       content_tag(:time, time_string, options)
     end
 
+    # Can search for named routes directly in the main app, omitting
+    # the "main_app." prefix
+    def method_missing method, *args, &block
+      if main_app_url_helper?(method)
+        main_app.send(method, *args)
+      else
+        super
+      end
+    end
+    def respond_to?(method)
+      main_app_url_helper?(method) or super
+    end
+
     private
 
+    def main_app_url_helper?(method)
+      Blogit::configuration.inline_main_app_named_routes and
+        (method.to_s.end_with?('_path') or method.to_s.end_with?('_url')) and
+        main_app.respond_to?(method)
+    end
+
     def div_with_default_class(default_class, content_or_options={}, options={}, &block)
       if block_given?
         content = capture(&block)
-        options = content_or_options        
+        options = content_or_options
       else
         content = content_or_options
       end

data/app/helpers/blogit/posts_helper.rb

@@ -1,8 +1,8 @@
 module Blogit
   module PostsHelper
-        
+
     # Creates a div tag with class 'blog_post_' + name
-    # Eg: 
+    # Eg:
     #   blog_post_tag(:title, "") # => <div class="blog_post_title"></div>
     def blog_post_tag(name, content_or_options = {}, options ={}, &block)
       if block_given?
@@ -14,6 +14,50 @@ module Blogit
       options[:class] = "#{options[:class]} blog_post_#{name}".strip
       content_tag(name, content, options)
     end
-        
+
+    # A comments tag corresponding to the comments configuration
+    def comments_for(post)
+      render(partial: "blogit/posts/#{Blogit.configuration.include_comments}_comments", locals: { post: post, comment: Blogit::Comment.new })
+    end
+
+    # A share bar as configured
+    def share_bar_for(post)
+      if !Blogit.configuration.include_share_bar
+        ""
+      else
+        render(partial: "blogit/posts/share_bar", locals: { post: post})
+      end
+    end
+
+    # Creates a ul tag tree with posts by year and monthes. Include
+    # blogit/archive.js to enabled expand collapse.
+    # @param year_css [String, Symbol] The CSS class of the year UL tag
+    # @param month_css [String, Symbol] The CSS class of the month UL tag
+    # @param post_css [String, Symbol] The CSS class of the year LI tag
+    # @param archive_posts [ActiveRecord::Relation, Array] The posts to be included in the archive (defaults to Post.all)
+    def blog_posts_archive_tag(year_css, month_css, post_css, archive_posts = Post.all)
+      posts_tree = archive_posts.chunk {|post| post.created_at.year}.map do |year, posts_of_year|
+        [year, posts_of_year.chunk {|post| l(post.created_at, format: :plain_month_only) }]
+      end
+
+      result = []
+      result << "<ul class=\"#{year_css}\">"
+      posts_tree.each do |year, posts_by_month|
+        result << "<li><a data-blogit-click-to-toggle-children>#{year}</a><ul class=\"#{month_css}\">"
+        posts_by_month.each do |month, posts|
+          result << "<li><a data-blogit-click-to-toggle-children>#{CGI.escape_html(month)}</a><ul class=\"#{post_css}\">"
+          posts.each do |post|
+            result << "<li><a href=\"#{blogit.post_path(post)}\">#{CGI.escape_html(post.title)}</a></li>"
+          end
+          result << "</ul></li>"
+        end
+        result << "</ul></li>"
+      end
+      result << "</ul>"
+
+      result.join.html_safe
+    end
+
   end
+
 end

data/app/models/blogit/comment.rb

@@ -30,6 +30,8 @@ module Blogit
     # = Attributes =
     # ==============
     
+    attr_accessible :name, :nickname, :email, :body, :website
+    
     # nickname acts as a "honeypot" to catch spam
     # the form field should be hidden using CSS and so 
     # if present, must be spam.

data/app/models/blogit/post.rb

@@ -3,13 +3,18 @@ module Blogit
 
     require "acts-as-taggable-on"
     require "kaminari"
-    
-    acts_as_taggable    
+
+    acts_as_taggable
 
     self.table_name = "blog_posts"
 
     self.paginates_per Blogit.configuration.posts_per_page
 
+    # ==============
+    # = Attributes =
+    # ==============
+    attr_accessible :title, :body, :tag_list
+
     # ===============
     # = Validations =
     # ===============
@@ -20,12 +25,19 @@ module Blogit
 
     # =================
     # = Assosciations =
-    # =================    
+    # =================
 
     belongs_to :blogger, :polymorphic => true
 
-    if Blogit.configuration.include_comments 
-      has_many :comments, :class_name => "Blogit::Comment"
+    has_many :comments, :class_name => "Blogit::Comment"
+
+    def comments
+      check_comments_config
+      super()
+    end
+    def comments=(value)
+      check_comments_config
+      super(value)
     end
 
     # ==========
@@ -48,13 +60,19 @@ module Blogit
     # Otherwise, returns an empty string
     def blogger_display_name
       if self.blogger and !self.blogger.respond_to?(Blogit.configuration.blogger_display_name_method)
-        raise ConfigurationError, 
+        raise ConfigurationError,
         "#{self.blogger.class}##{Blogit.configuration.blogger_display_name_method} is not defined"
       elsif self.blogger.nil?
         ""
       else
-        self.blogger.send Blogit.configuration.blogger_display_name_method        
+        self.blogger.send Blogit.configuration.blogger_display_name_method
       end
     end
+
+    private
+
+    def check_comments_config
+      raise RuntimeError.new("Posts only allow active record comments (check blogit configuration)") unless Blogit.configuration.include_comments == :active_record
+    end
   end
-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) %>
-<% end %>
+  <%= link_to(t(:delete, scope: 'blogit.comments'), [@post, comment], method: :delete, confirm: t(:are_you_sure_you_want_to_remove_this_comment, scope: 'blogit.comments')) %>
+<% end %>

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

@@ -1,19 +1,19 @@
 <%= content_tag(:article, id: "blog_comment_#{comment.id}", class: "blog_comment") do %>
   <%= content_tag(:div, class: "blog_comment_name", id: "blog_comment_#{comment.id}_name") do %>
-    <%= comment.website? ? link_to(comment.name, comment.website) : comment.name %> wrote:
+    <%=t :wrote, scope: 'blogit.comments', author: comment.website? ? link_to(comment.name, comment.website) : comment.name %>
   <% end %>
-  
 
-  <%= content_tag(:div, class: "blog_comment_body", 
+
+  <%= content_tag(:div, class: "blog_comment_body",
       id: "blog_comment_#{comment.id}_body") do %>
       <%= format_content comment.body || "" %>
   <% end %>
-  
+
   <%= blog_comment_tag(:footer) do %>
-    Posted on <%= time_tag(comment.created_at, Blogit.configuration.datetime_format) %>
+    <%=t :posted_on, scope: 'blogit.comments'%> <%= time_tag(comment.created_at, Blogit.configuration.datetime_format) %>
   <% end %>
-  
-  <%= render partial: "blogit/comments/admin_links" %>
-  
+
+  <%= render partial: "blogit/comments/admin_links", locals: {comment: comment} %>
+
 <% end if comment.persisted? %>
 

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

@@ -1,42 +1,41 @@
 
-<%= form_for [@post, @comment], remote: true, 
+<%= form_for [post, comment], remote: true,
   html: {
     class: "new_blog_comment", id: "new_blog_comment" } do |f| -%>
-  
-  <p>Leave a comment</p>
-  
+
+  <p><%=t :leave_a_comment, scope: 'blogit.comments'%></p>
+
   <%= field class: "hidden" do %>
     <%= f.label :nickname %>
     <%= f.text_field :nickname %>
     Hide me using CSS
   <% end %>
-  
+
   <%= field do %>
-    <%= f.label :name, "Name *" %><br>
+    <%= f.label :name, t(:name, scope: 'blogit.comments') %><br>
     <%= f.text_field :name %>
-    <%= errors_on(@comment, :name) %>
+    <%= errors_on(comment, :name) %>
   <% end %>
-  
+
   <%= field do %>
-    <%= f.label :email, "Email" %> (never displayed)<br>
+    <%= f.label :email, t(:email_never_displayed, scope: 'blogit.comments') %><br>
     <%= f.email_field :email %>
-    <%= errors_on(@comment, :email) %>    
+    <%= errors_on(comment, :email) %>
   <% end %>
 
   <%= field do %>
-    <%= f.label :website, "Your Website" %><br>
+    <%= f.label :website, t(:your_website, scope: 'blogit.comments') %><br>
     <%= f.url_field :website %>
-    <%= errors_on(@comment, :website) %>    
+    <%= errors_on(comment, :website) %>
   <% end %>
 
-  
   <%= field do %>
-    <%= f.label :body, "Your comment *" %><br>
+    <%= f.label :body, t(:your_comment, scope: 'blogit.comments') %><br>
     <%= f.text_area :body %><br>
-    <%= errors_on(@comment, :body) %>
+    <%= errors_on(comment, :body) %>
   <% end %>
-  
+
   <%= actions do %>
-    <%= f.submit "Add Comment", :disable_with => 'Adding Comment...' %>
+    <%= f.submit t(:add_comment, scope: 'blogit.comments'), :disable_with => t(:adding_comment, scope: 'blogit.comments') %>
   <% end %>
-<% end -%>
+<% end -%>