blogit 1.0.0.rc1 → 1.0.0

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

@@ -0,0 +1,8 @@
+<%= content_tag(:div, class: "blogit_post__comments_count", 
+  id: "blogit_post_#{post.id}__comments_count") do %>
+    
+  <%= link_to(post_path(post, anchor: "comments")) do %>
+    <%= t(:comments_count, scope: 'blogit.posts', count: post.comments_count) %>
+  <% end %>
+  
+<% end %>

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

@@ -1,41 +1,48 @@
+<%= form_for [post, comment], remote: blogit_conf.ajax_comments,
+  html: { class: "blogit_form" } do |f| -%>
 
-<%= form_for [post, comment], remote: true,
-  html: {
-    class: "new_blog_comment", id: "new_blog_comment" } do |f| -%>
-
-  <p><%=t :leave_a_comment, scope: 'blogit.comments'%></p>
+  <h3 class="blogit_form__header">
+    <%= t :leave_a_comment, scope: 'blogit.comments' %>
+  </h3>
 
   <%= field class: "hidden" do %>
-    <%= f.label :nickname %>
-    <%= f.text_field :nickname %>
-    Hide me using CSS
+    <%= f.label :nickname, "Nickname (Hide me using CSS)", 
+      class: "blogit_form__label" %>
+    <%= f.text_field :nickname, class: "blogit_form__field" %>
   <% end %>
 
   <%= field do %>
-    <%= f.label :name, t(:name, scope: 'blogit.comments') %><br>
-    <%= f.text_field :name %>
+    <%= f.label :name, t(:name, scope: 'blogit.comments'),
+      class: "blogit_form__label" %>
+    <%= f.text_field :name, class: "blogit_form__field", required: true  %>
     <%= errors_on(comment, :name) %>
   <% end %>
 
   <%= field do %>
-    <%= f.label :email, t(:email_never_displayed, scope: 'blogit.comments') %><br>
-    <%= f.email_field :email %>
+    <%= f.label :email, t(:email_never_displayed, scope: 'blogit.comments'), 
+       class: "blogit_form__label" %>
+    <%= f.email_field :email, class: "blogit_form__field", required: true %>
     <%= errors_on(comment, :email) %>
   <% end %>
 
   <%= field do %>
-    <%= f.label :website, t(:your_website, scope: 'blogit.comments') %><br>
-    <%= f.url_field :website %>
+    <%= f.label :website, t(:your_website, scope: 'blogit.comments'),
+       class: "blogit_form__label" %>
+    <%= f.url_field :website, class: "blogit_form__field" %>
     <%= errors_on(comment, :website) %>
   <% end %>
 
   <%= field do %>
-    <%= f.label :body, t(:your_comment, scope: 'blogit.comments') %><br>
-    <%= f.text_area :body %><br>
+    <%= f.label :body, t(:your_comment, scope: 'blogit.comments'), 
+       class: "blogit_form__label"  %>
+    <%= f.text_area :body, required: true,
+       class: "blogit_form__field blogit_form__field--textarea" %>
     <%= errors_on(comment, :body) %>
   <% end %>
 
   <%= actions do %>
-    <%= f.submit t(:add_comment, scope: 'blogit.comments'), :disable_with => t(:adding_comment, scope: 'blogit.comments') %>
+    <%= f.submit t(:add_comment, scope: 'blogit.comments'), 
+      disable_with: t(:adding_comment, scope: 'blogit.comments') %>
   <% end %>
-<% end -%>
+  
+<% end -%>

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

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

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

@@ -0,0 +1,3 @@
+<li class="blogit_archive__item blogit_archive__item--post">
+  <%= link_to(post.title, post_path(post), class: "blogit_archive__item_link") %>
+</li>

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

@@ -1 +1 @@
-<hr class="blog_post_spacer">
+<hr class="blogit_post_spacer">

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

@@ -1,4 +1,9 @@
-<%= blog_tag :footer do %>
-    <%=t :written_by, scope: 'blogit.posts', author: post.blogger_display_name %>
-    <%= time_tag(post.created_at, pubdate: true, format: blogit_conf.datetime_format) %>
-<% end %>
+<div class="blogit_post__information">
+  <span class="blogit_post__blogger">
+    <%= t(:written_by, scope: 'blogit.posts', 
+      author: post.blogger_display_name) %>
+  </span>
+
+  <%= time_tag(post.created_at, pubdate: true, 
+    class: "blogit_post__published_at" ,format: blogit_conf.datetime_format) %>
+</div>

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

@@ -0,0 +1,32 @@
+<%= tag(:meta, name: "description", content: description) %>
+<%= tag(:meta, property: "author", content: post.blogger_display_name) %>
+
+<!-- Open Graph Tags: http://ogp.me -->
+<%= tag(:meta, property: "og:site_name", content: "") %>
+<%= tag(:meta, property: "og:url", content: url_for(params)) %>
+<%= tag(:meta, property: "og:title", content: title) %>
+<%= tag(:meta, property: "og:description", content: description) %>
+<%= tag(:meta, property: "og:type", content: "article") %>
+<% # TODO: Support images in blogit (sorry) %> 
+<%= tag(:meta, property: "og:image", content: nil) %>
+
+<% for tag_name in post.tags.map(&:name) do%>
+  <%= tag(:meta, property: "article:tag", content: tag_name) %>
+<% end %>
+
+<% # TODO: Support published time %> 
+<%= tag(:meta, property: "article:published_time", 
+  content: post.created_at.to_s(:iso8601)) %>
+
+<%= tag(:meta, property: "article:modified_time", 
+  content: post.updated_at.to_s(:iso8601)) %>
+  
+<!-- Twitter Card tags -->
+<%= tag(:meta, property: "twitter:card", content: "summary_large_image") %>
+<%= tag(:meta, property: "twitter:site", content: blogit_conf.twitter_username) %>
+<%= tag(:meta, property: "twitter:creator", 
+  content: post.blogger_twitter_username || blogit_conf.twitter_username) %>
+<%= tag(:meta, property: "twitter:title", content: title) %>
+<%= tag(:meta, property: "twitter:description", content: description) %>
+<% # TODO: Support images in blogit (sorry) %> 
+<%= tag(:meta, property: "twitter:time", content: nil) %>

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

@@ -1,16 +1,13 @@
-<%= content_tag(:article, id: "blog_post_#{post.id}", class: "blog_post") do %>
+<%= content_tag(:article, id: "blogit_post_#{post.id}", 
+  class: "blogit_post blog_post--is_preview") do %>
 
   <%# Render the header for this blog post %>
   <%= render "blogit/posts/post_head", post: post %>
-
-  <%# 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 body of this blog post (as Markdown) %>
+  <%= format_content(blogit_conf.show_post_description ? post.description : post.body) %>
 
   <%# Render the no. of comments %>
   <%= render "blogit/posts/comments_count",

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

@@ -0,0 +1 @@
+<% # Left blank, but it's here to replace if you want a post footer %>

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

@@ -1,3 +1,4 @@
-<%= blog_tag :header do %>
-  <%= content_tag(:h1, link_to(post.title, post)) %>
+<%= content_tag(:h1, class: "blogit_post__header") do %>
+  <%= link_to(post.title, post, class: "blogit_post__header_link") %>
 <% end %>
+

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

@@ -1,18 +1,9 @@
-<div id="blog_related">
-  <div id="blog_tags">
-    <h2><%= t :tags, :scope => "blogit.posts" %></h2>
-    <ul>
-      <% post.tag_list.each do |tag| %>
-        <li><%= link_to tag, tagged_blog_posts_path(tag) %></li>
-      <% end %>
-    </ul>
-  </div>
-  <div id="blog_related_posts">
-    <h2><%= t :related_posts, :scope => "blogit.posts" %></h2>
-    <ul>
-      <% post.find_related_on_tags.each do |other_post| %>
-        <li><%= link_to other_post.title, post_path(other_post) %></li>
-      <% end %>
-    </ul>
+<div id="blogit_related_posts">
+  <h3 class="blogit_related_posts__header blogit_header--section">
+    <%= t :related_posts, :scope => "blogit.posts" %>
+  </h3>
+  <div class="blogit_related_posts__list">
+    <%= render partial: "blogit/posts/related_post", 
+      collection: related_posts_for_post(post), as: :related_post %>
   </div>
 </div>

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

@@ -0,0 +1,4 @@
+<div class="blogit_related_post">
+  <%= link_to related_post.title, post_path(related_post), 
+    class: "blogit_related_post__title" %>
+</div>

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

@@ -1,6 +1,6 @@
-<div id="blog_share_bar">
+<div id="blogit_share_bar">
 
-  <div id="google-plus" class="social_button">
+  <div class="blogit_share_bar__social_button blogit_share_bar__social_button--google_plus">
     <!-- GOOGLE +1 -->
     <g:plusone size="medium"></g:plusone>
     <script type="text/javascript">
@@ -15,8 +15,7 @@
     <!-- /GOOGLE +1 -->
   </div>
 
-  <div id="twitter" class="social_button">
-    <!-- TWITTER -->
+  <div class="blogit_share_bar__social_button blogit_share_bar__social_button--twitter">    <!-- 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("//","/") %>"
@@ -28,7 +27,7 @@
     <!-- /TWITTER -->
   </div>
 
-  <div id="facebook" class="social_button">
+  <div class="blogit_share_bar__social_button blogit_share_bar__social_button--facebook"> 
     <!-- FACEBOOK LIKE -->
     <div id="fb-root"></div>
     <script>(function(d, s, id) {
@@ -42,4 +41,4 @@
     <!-- /FACEBOOK LIKE -->
   </div>
 
-</div>
+</div>

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

@@ -0,0 +1,8 @@
+<div id="blogit_tags">
+  <h3 class="blogit_tags__header blogit_header--section">
+    <%= t :tags, :scope => "blogit.posts" %>
+  </h3>
+  <ul class="blogit_tags__list">
+    <%= render partial: "blogit/tags/tag", collection: post.tag_list %>
+  </ul>
+</div>

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

@@ -1,17 +1,22 @@
-<%= login_required class: "actions", id: "new_blog_post_link" do %>
-  <%= link_to t(:new_blog_post, scope: 'blogit.posts'), new_post_path %>
+<% if params[:tag] %>
+  <h2 class="blogit_header--page">
+    <%= t(:showing_posts_tagged_with, scope: "blogit.posts", tag: params[:tag])  %>
+  </h2>
 <% end %>
 
-<% if @posts.any? %>
+<div class="blogit_posts_list">
+  <% if @posts.any? %>
+    <%= render partial: "blogit/posts/post",
+      collection: @posts,
+      spacer_template: "blog_post_spacer",
+      locals: { 
+        show_comments_count: (Blogit.configuration.include_comments == :active_records) 
+      }  %>
+  <% else %>
 
-  <%= render partial: "blogit/posts/post",
-    collection: @posts,
-    spacer_template: "blog_post_spacer",
-    locals: {show_comments_count: (Blogit.configuration.include_comments == :active_records) }  %>
-<% else %>
+    <%= render partial: "blogit/posts/empty" %>
 
-  <%= render partial: "blogit/posts/empty" %>
-
-<% end %>
+  <% end %>
+</div>
 
 <%= render "pagination" %>

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

@@ -1,4 +1,28 @@
-<%= render @post %>
-<%= share_bar_for @post %>
-<%= render "blogit/posts/post_footer", post: @post %>
-<%= comments_for @post %>
+<% title @post.title %>
+<% description @post.description.to_s %>
+
+<%= content_tag(:article, id: "blogit_post_#{@post.id}", class: "blogit_post") do %>
+
+  
+  <%# Render the header for this blog post %>
+  <%= render "blogit/posts/post_head", post: @post %>
+
+  <%= render "blogit/posts/blogger_information", post: @post %>
+
+  <%# Render the body of this blog post (as Markdown) %>
+  <%= format_content(@post.body) %>
+
+  <%# Render info about the person who wrote this post %>
+  <%= share_bar_for_post @post %>
+
+  <%# Render the no. of comments %>
+  <%= render "blogit/posts/comments_count",
+    post: post if defined?(show_comments_count) and show_comments_count %>
+
+  <%= render "blogit/posts/tags", post: @post %>
+  <%= render "blogit/posts/related", post: @post %>
+
+  <%= comments_for_post @post %>
+
+<% end %>
+

data/app/views/blogit/tags/_tag.html.erb

@@ -0,0 +1,3 @@
+<li class="blogit_tag">
+  <%= link_to tag, tagged_blog_posts_path(tag), class: "blogit_tag__link" %>
+</li>

data/config/locales/en.yml

@@ -15,6 +15,7 @@ en:
       successfully_added_comment: "Successfully added comment!"
       successfully_removed_comment: "Successfully removed comment."
     posts:
+      showing_posts_tagged_with: "Showing posts tagged with \"%{tag}\""
       written_by: "Written by %{author} on"
       prohibited_this_post_from_being_saved:
         one: "One error prohibited this post form being saved:"
@@ -38,10 +39,10 @@ en:
       blog_post_was_successfully_destroyed: "Blog post was successfully destroyed."
       related_posts: "Related posts"
       tag_placeholder: "Add tags to your post"
-      
+      tags: "Tags"
+      state: "State"
     share_bar:
       facebook: "en_US"
-
   time:
     formats:
       plain_month_only: "%B"

data/config/spring.rb

@@ -0,0 +1 @@
+Spring.application_root = "./spec/dummy"

data/db/migrate/20150618184415_add_description_to_posts.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToPosts < ActiveRecord::Migration
+  def change
+    add_column :blogit_posts, :description, :text
+  end
+end

data/lib/blogit.rb

@@ -1,7 +1,6 @@
 # Third-party requirements
 require "kaminari"
 require "redcarpet"
-require "pingr"
 
 require "blogit/configuration"
 require "blogit/blogs"
@@ -17,14 +16,14 @@ module Blogit
   # Exception raised when gem may not be configured properly
   class ConfigurationError < StandardError;end
   
-  # Set global configuration options for Blogit
-  # @see README.md
+  # Set global configuration options for Blogit. {file:README.md read more}
   def self.configure(&block)
     block.call(configuration)
   end
   
-  # Returns Blogit's globalconfiguration. Will initialize a new instance
-  # if not already set
+  # Blogit's global configuration.
+  #
+  # Returns a Configuration
   def self.configuration
     @configuration ||= Configuration.new
   end

data/lib/blogit/archive.rb

@@ -0,0 +1,8 @@
+module Blogit
+  module Archive
+    require 'blogit/archive/list'
+    require 'blogit/archive/year'
+    require 'blogit/archive/month'
+    require "blogit/archive/archive_error"
+  end
+end

data/lib/blogit/archive/archive_error.rb

@@ -0,0 +1,3 @@
+# Exception returned when invalid arguments are passed to an {Archive} class
+class Blogit::Archive::ArchiveError < ArgumentError
+end

data/lib/blogit/archive/archiveable.rb

@@ -0,0 +1,20 @@
+module Blogit
+  module Archive
+    
+    # This class is for documentation only, to define the Archiveable type
+    class Archiveable
+      
+      # Archiveables must respond to :published_at and return a DateTime object.
+      attr_accessor :published_at
+        
+      # Do not use this.
+      #
+      # Raises an exception.
+      def initialize
+        raise "Can't initialize an Archiveable. Class is for documentation only."
+      end
+      
+    end
+    
+  end
+end

data/lib/blogit/archive/list.rb

@@ -0,0 +1,52 @@
+module Blogit
+  module Archive
+    
+    # Public: The main class to be accessed when creating a HTML post archive.
+    class List
+    
+      # Gets/Sets the list of years for this archive object.
+      attr_accessor :years
+
+      # Gets/Sets the list of _{Archiveable archiveable}_ objects for this Archive List.
+      attr_accessor :archiveables
+  
+      # Create a new {List List} object
+      #
+      # archiveables - A collection of _archiveable_ objects. An archiveable is any
+      #                object that responds to published_at.
+      #
+      def initialize(archiveables)
+        @archiveables = archiveables
+        ensure_archiveables_are_valid
+        @years = create_years_from_archiveables
+      end
+      
+      # The name of the partial to load for a {List List} object
+      #
+      # Returns a String
+      def to_partial_path
+        self.class.name.underscore
+      end
+  
+  
+      private
+      
+      
+      def ensure_archiveables_are_valid
+        return true unless archiveables.detect { |a| !a.respond_to?(:published_at) }
+        raise Blogit::Archive::ArchiveError, 
+          "Invalid archive object detected. Please make sure your archiveable objects \
+           respond to :published_at."
+      end
+      
+      def create_years_from_archiveables
+        years_with_archiveables.map { |year, archs| Year.new(year, archs) }
+      end
+      
+      def years_with_archiveables
+        archiveables.chunk { |a| a.published_at.year }
+      end
+      
+    end
+  end
+end