blogit 0.4.8 → 0.5.0

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

@@ -0,0 +1,4 @@
+<div id="comments">
+  <%= render post.comments %>
+</div>
+<%= render partial: "blogit/comments/form", locals: { post: post, comment: comment } %>

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

@@ -1,4 +1,4 @@
 <%= blog_post_tag :footer do %>
-    Written by <%= post.blogger_display_name %> on 
+    <%=t :written_by, scope: 'blogit.posts', author: post.blogger_display_name %>
     <%= time_tag(post.created_at, blogit_conf.datetime_format) %>
 <% end %>

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

@@ -1,5 +1,5 @@
 <%= content_tag(:div, class: "blog_post_comments_count", id: "blog_post_#{post.id}_comments_count") do %>
   <%= link_to(post_path(post, anchor: "comments")) do %>
-    <%= pluralize post.comments_count, "comment" %>
-  <% end %>  
+    <%=t :comment, scope: 'blogit.posts', count: post.comments_count %>
+  <% end %>
 <% end %>

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

@@ -0,0 +1,14 @@
+ <div id="disqus_thread"></div>
+ <script type="text/javascript">
+   /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+   var disqus_shortname = '<%= Blogit.configuration.disqus_shortname %>'; // required: replace example with your forum shortname
+
+   /* * * DON'T EDIT BELOW THIS LINE * * */
+   (function() {
+     var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+     dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
+     (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+   })();
+</script>
+<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>

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

@@ -1,3 +1,3 @@
 <div class="blogit_empty_message">
-  Sorry, there are no posts about "<%= params[:tag] %>".
-</div>
+  <%=t :there_are_no_posts_about, scope: 'blogit.posts', tag: params[:tag] %>
+</div>

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

@@ -2,7 +2,7 @@
 
   <% if @post.errors.any? %>
     <div id="error_explanation">
-      <h2><%= pluralize(@post.errors.count, "error") %> prohibited this post from being saved:</h2>
+      <h2><%=t :prohibited_this_post_from_being_saved, scope: 'blogit.posts', count: @post.errors.count%></h2>
 
       <ul>
         <% @post.errors.full_messages.each do |msg| %>
@@ -14,30 +14,30 @@
 
   <fieldset>
     <%= field do %>
-      <%= f.text_field :title, placeholder: "Give your post a title" %>
+      <%= f.text_field :title, placeholder: t(:give_your_post_a_title, scope: 'blogit.posts') %>
     <% end %>
 
     <%= field do %>
-      <%= f.text_area :body, placeholder: "Write something here..." %>
+      <%= f.text_area :body, placeholder: t(:write_something_here, scope: 'blogit.posts') %>
     <% end %>
   </fieldset>
 
   <fieldset>
 
     <%= field id: "new_blog_post_tag_field" do %>
-      <%= f.label :tag_list, "Tags" %>
-      <%= f.text_field :tag_list, placeholder: "tag one, tag two, etc..." %>
+      <%= f.label :tag_list, t(:tags, scope: 'blogit.posts') %>
+      <%= f.text_field :tag_list, placeholder: t(:tag_placeholder, scope: 'blogit.posts') %>
     <% end %>
-    
+
     <p class="blog_post_tip">
-      Tip: you can style your post using <%= blogit_conf.default_parser %>
+      <%=t :tip_you_can_style_your_post_using, scope: 'blogit.posts', parser: blogit_conf.default_parser %>
     </p>
 
   </fieldset>
 
   <%= actions do %>
-    <%= f.submit %> or 
-    <%= link_to("cancel", @post.new_record? ? root_path : post_path(@post)) %>
+    <%= f.submit %> <%=t :or, scope: 'blogit.posts'%>
+    <%= link_to(t(:cancel, scope: 'blogit.posts'), @post.new_record? ? root_path : post_path(@post)) %>
   <% end %>
 
 <% end %>

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

@@ -5,15 +5,15 @@
 
   <%# Render the body of this blog post (as Markdown) %>
   <%= render "blogit/posts/post_body", post: post %>
-  
+
   <%# Render admin links to edit/delete this post %>
   <%= render "blogit/posts/post_links", post: post %>
-  
+
   <%# Render info about the person who wrote this post %>
   <%= render "blogit/posts/blogger_information", post: post %>
-  
+
   <%# Render the no. of comments %>
-  <%= render "blogit/posts/comments_count", 
+  <%= render "blogit/posts/comments_count",
     post: post if defined?(show_comments_count) and show_comments_count %>
-  
-<% end %>
+
+<% end %>

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

@@ -1,5 +1,5 @@
 <%= login_required do  %>
   <%= actions do %>
-    <%= link_to("edit", edit_post_path(post)) %> | <%= link_to("delete", post, method: :destroy, confirm: "Are you sure you want to remove this post?") %>
+    <%= link_to(t(:edit, scope: 'blogit.posts'), edit_post_path(post)) %> | <%= link_to(t(:delete, scope: 'blogit.posts'), post, method: :delete, confirm: t(:are_you_sure_you_want_to_remove_this_post, scope: 'blogit.posts')) %>
   <% end %>
 <% end unless blogit_conf.author_edits_only and not this_blogger?(post) %>

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

@@ -0,0 +1,45 @@
+<div id="blog_share_bar">
+
+  <div id="google-plus" class="social_button">
+    <!-- GOOGLE +1 -->
+    <g:plusone size="medium"></g:plusone>
+    <script type="text/javascript">
+      window.___gcfg = {lang: '<%= I18n.default_locale %>'};
+
+      (function() {
+        var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+        po.src = 'https://apis.google.com/js/plusone.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+      })();
+    </script>
+    <!-- /GOOGLE +1 -->
+  </div>
+
+  <div id="twitter" class="social_button">
+    <!-- TWITTER -->
+    <a href="https://twitter.com/share" class="twitter-share-button"
+        data-lang="<%= I18n.default_locale %>"
+        data-url="http://<%= request.host_with_port %><%= request.path.gsub("//","/") %>"
+        data-via="<%= Blogit.configuration.twitter_username %>"
+        data-text="<%= post.title%>"
+        data-count="horizontal">Tweet</a>
+
+    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+    <!-- /TWITTER -->
+  </div>
+
+  <div id="facebook" class="social_button">
+    <!-- FACEBOOK LIKE -->
+    <div id="fb-root"></div>
+    <script>(function(d, s, id) {
+      var js, fjs = d.getElementsByTagName(s)[0];
+      if (d.getElementById(id)) return;
+      js = d.createElement(s); js.id = id;
+      js.src = "//connect.facebook.net/<%= t "blogit.share_bar.facebook" %>/all.js#xfbml=1";
+      fjs.parentNode.insertBefore(js, fjs);
+    }(document, 'script', 'facebook-jssdk'));</script>
+    <div class="fb-like" data-send="false"  data-layout="button_count" data-width="90" data-show-faces="false"></div>
+    <!-- /FACEBOOK LIKE -->
+  </div>
+
+</div>

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

@@ -1,3 +1,3 @@
-<h2>Edit Blog Post #<%= @post.id %></h2>
+<h2><%=t :edit_blog_post, scope: 'blogit.posts', id: @post.id %></h2>
 
-<%= render 'form' %>
+<%= render 'form' %>

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

@@ -1,17 +1,17 @@
 <%= login_required class: "actions", id: "new_blog_post_link" do %>
-  <%= link_to 'New Blog post', new_post_path %>
+  <%= link_to t(:new_blog_post, scope: 'blogit.posts'), new_post_path %>
 <% end %>
 
 <% if @posts.any? %>
 
-  <%= render partial: "blogit/posts/post", 
-    collection: @posts, 
-    spacer_template: "blog_post_spacer", 
+  <%= render partial: "blogit/posts/post",
+    collection: @posts,
+    spacer_template: "blog_post_spacer",
     locals: {show_comments_count: true}  %>
 <% else %>
-  
+
   <%= render partial: "blogit/posts/empty" %>
-  
+
 <% end %>
 
-<%= render "pagination" %>
+<%= render "pagination" %>

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

@@ -1,3 +1,3 @@
-<h2>Write a new blog post</h2>
+<h2><%=t :write_a_new_blog_post, scope: 'blogit.posts'%></h2>
 
 <%= render 'form' %>

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

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

data/config/locales/en.yml

@@ -0,0 +1,48 @@
+en:
+  blogit:
+    comments:
+      leave_a_comment: "Leave a comment"
+      name: "Name *"
+      email_never_displayed: "Email * (Never displayed)"
+      your_website: "Your Website"
+      your_comment: "Your comment *"
+      add_comment: "Add Comment"
+      adding_comment: "Adding Comment..."
+      wrote: "%{author} wrote:"
+      posted_on: "Posted on"
+      delete: "delete"
+      are_you_sure_you_want_to_remove_this_comment: "Are you sure you want to remove this comment?"
+      successfully_added_comment: "Successfully added comment!"
+      successfully_removed_comment: "Successfully removed comment."
+    posts:
+      written_by: "Written by %{author} on"
+      there_are_no_posts_about: "Sorry, there are no posts about \"%{tag}\"."
+      prohibited_this_post_from_being_saved:
+        one: "One error prohibited this post form being saved:"
+        other: "%{count} errors prohibited this post form being saved:"
+      give_your_post_a_title: "Give your post a title"
+      write_something_here: "Write something here..."
+      tags: "Tags"
+      tag_placeholder: "tag one, tag two, etc..."
+      tip_you_can_style_your_post_using: "Tip: you can style your post using %{parser}"
+      or: "or"
+      cancel: "cancel"
+      edit: "edit"
+      delete: "delete"
+      are_you_sure_you_want_to_remove_this_post: "Are you sure you want to remove this post?"
+      comment:
+        one: "1 comment"
+        other: "%{count} comments"
+      edit_blog_post: "Edit Blog Post #%{id}"
+      new_blog_post: "New Blog post"
+      write_a_new_blog_post: "Write a new blog post"
+      blog_post_was_successfully_created: "Blog post was successfully created."
+      blog_post_was_successfully_updated: "Blog post was successfully updated."
+      blog_post_was_successfully_destroyed: "Blog post was successfully destroyed."
+    share_bar:
+      facebook: "en_US"
+
+  time:
+    formats:
+      plain_month_only: "%B"
+

data/config/locales/fr.yml

@@ -0,0 +1,61 @@
+fr:
+  blogit:
+    comments:
+      leave_a_comment: "Laissez un commentaire"
+      name: "Nom *"
+      email_never_displayed: "Email * (Jamais affiché)"
+      your_website: "Votre site web"
+      your_comment: "Votre commentaire *"
+      add_comment: "Ajouter un commentaire"
+      adding_comment: "Ajout de commentaire ..."
+      wrote: "%{author} a écrit:"
+      posted_on: "Publié le "
+      delete: "effacer"
+      are_you_sure_you_want_to_remove_this_comment: "Etes vous certain de vouloir supprimer ce commentaire?"
+      successfully_added_comment: "Commentaire ajouté avec succès."
+      successfully_removed_comment: "Commentaire supprimé avec succès."
+    posts:
+      written_by: "Ecrit par %{author} le"
+      there_are_no_posts_about: "Désolé, il n'y a pas d'article à propos de \"%{tag}\"."
+      prohibited_this_post_from_being_saved:
+        one: "Une erreur a empêché cet article d'être enregistré :"
+        other: "%{count} erreurs ont empêché cet article d'être enregistré :"
+      give_your_post_a_title: "Donnez un nom à votre article"
+      write_something_here: "Ecrivez quelque chose ici ..."
+      tags: "Libellés"
+      tag_placeholder: "Libellé 1, Libellé 2 ..."
+      tip_you_can_style_your_post_using: "Astuce : vous pouvez styler votre article en utilisant %{parser}"
+      or: "ou"
+      cancel: "annuler"
+      edit: "editer"
+      delete: "supprimer"
+      are_you_sure_you_want_to_remove_this_post: "Etes vous certain de vouloir supprimer cet article?"
+      comment:
+        zero: "Aucun commentaire"
+        one: "1 commentaire"
+        other: "%{count} commentaires"
+      edit_blog_post: "Editez l'article #%{id}"
+      new_blog_post: "Nouvel article"
+      write_a_new_blog_post: "Ecrivez un nouvel article"
+      blog_post_was_successfully_created: "Article ajouté avec succès."
+      blog_post_was_successfully_updated: "Article modifié avec succès."
+      blog_post_was_successfully_destroyed: "Article supprimé avec succès."
+    share_bar:
+      facebook: "fr_FR"
+
+  time:
+    formats:
+      plain_month_only: "%B"
+
+  activerecord:
+    models:
+      blogit/post: "article"
+      blogit/comment: "commentaire"
+    attributes:
+      blogit/post:
+        title: "titre"
+        body: "corps"
+      blogit/comment:
+        name: "nom"
+        body: "corps"
+

data/lib/blogit/configuration.rb

@@ -1,71 +1,80 @@
 module Blogit
   class Configuration
-    
-    # Should we include comments for blog posts?
+
+    # What kind of comments do you want to add to your blog ? (:active_record, :disqus or :no)
     attr_accessor :include_comments
 
+    # When using disqus comments, what is the shortname of your forum ?
+    attr_reader :disqus_shortname
+
+    # Should there be a share bar on every post ?
+    attr_accessor :include_share_bar
+
+    # Twitter username used in the share bar
+    attr_reader :twitter_username
+
     # The name of the controller method we'll call to return the current blogger.
     attr_accessor :current_blogger_method
-    
+
     # what method do we call on blogger to return their display name?
     # Defaults to :username
     attr_accessor :blogger_display_name_method
-    
-    # Which DateTime::FORMATS format do we use to display 
+
+    # Which DateTime::FORMATS format do we use to display
     # blog and comment publish time
     # Defaults to :short
     attr_accessor :datetime_format
-    
+
     # Number of posts to show per page
     # @see https://github.com/amatsuda/kaminari
     # @see Blogit::Post
     attr_accessor :posts_per_page
-    
+
     # Should text within "```" or "`" be highlighted as code?
     # Defaults to true
     # @note - At the moment this only works when default_parser
     #   is :markdown
     attr_accessor :highlight_code_syntax
-    
+
     # The name of the before filter we'll call to authenticate the current user.
     # Defaults to :login_required
     attr_accessor :authentication_method
-    
+
     # If set to true, only the user who authored the post may, edit or destroy.
     # Defaults to false
     attr_accessor :author_edits_only
-    
-    # If set to true, the comments form will POST and DELETE to the comments 
+
+    # If set to true, the comments form will POST and DELETE to the comments
     # controller using AJAX calls.
     # Defaults to true
     attr_accessor :ajax_comments
-    
+
     # If set to true, the create, edit, update and destroy actions
-    # will be included. If set to false, you'll have to set these 
+    # will be included. If set to false, you'll have to set these
     # yourself elsewhere in the app
     attr_accessor :include_admin_actions
-    
+
     # If set to true, links for new posts, editing posts and deleting comments
-    # will be available. If set to false, you'll have to set these 
+    # will be available. If set to false, you'll have to set these
     # yourself in the templates.
     attr_accessor :include_admin_links
-    
+
     # The default format for parsing the blog content.
     # Defaults to :markdown
     attr_accessor :default_parser
-      
+
     # When using redcarpet as content parser, pass these options as defaults
     # Defaults to REDCARPET_OPTIONS
-    attr_accessor :redcarpet_options  
-    
+    attr_accessor :redcarpet_options
+
     # Should the controllers cache the blog pages as HTML?
     # Defaults to false
     attr_accessor :cache_pages
-    
+
     # The title of the RSS feed for the blog posts
-    # Defaults to "[Application Name] Blog Posts"    
+    # Defaults to "[Application Name] Blog Posts"
     attr_accessor :rss_feed_title
-    
+
     # The description of the RSS feed for the blog posts
     # Defaults to "[Application Name] Blog Posts"
     attr_accessor :rss_feed_description
@@ -74,18 +83,24 @@ module Blogit
     # Defaults to 'en'
     attr_accessor :rss_feed_language
 
-    
+    # Should the routes of the main app be accessible without
+    # the "main_app." prefix ?
+    attr_accessor :inline_main_app_named_routes
+
     REDCARPET_OPTIONS = {
-      hard_wrap: true, 
-      filter_html: true, 
+      hard_wrap: true,
+      filter_html: true,
       autolink: true,
       no_intra_emphasis: true,
       fenced_code_blocks: true,
       gh_blockcode: true,
     }
-    
+
     def initialize
-      @include_comments            = true
+      @include_comments            = :active_record
+      @disqus_shortname            = ""
+      @include_share_bar           = false
+      @twitter_username            = ""
       @current_blogger_method      = :current_user
       @blogger_display_name_method = :username
       @datetime_format             = :short
@@ -94,7 +109,7 @@ 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
@@ -103,10 +118,34 @@ module Blogit
       @rss_feed_language           = "en"
       @redcarpet_options           = REDCARPET_OPTIONS
     end
-    
+
     def default_parser_class
       "Blogit::Parsers::#{@default_parser.to_s.classify}Parser".constantize
     end
+
+    # If the user has defined a disqus shortname but hasn't set include_comments to
+    # disqus, print a warning to the console.
+    def disqus_shortname=(shortname)
+      if @include_comments && @include_comments != :disqus
+        blogit_warn "You've set config.disqus_shortname in your blogit config file but config.include_comments is not set to :disqus"
+      end
+      @disqus_shortname = shortname
+    end
+
+    # If the user has defined a disqus shortname but hasn't set include_comments to
+    # disqus, print a warning to the console.
+    def twitter_username=(username)
+      if @twitter_username.present? and not @include_share_bar
+        blogit_warn "You've set config.twitter_username in your blogit config file but config.include_share_bar is set to false"
+      end
+      @twitter_username = username
+    end
+    
+    private
+    
+    def blogit_warn(message)
+      warn "[Blogit]: #{message}"
+    end
     
   end
-end
+end