tb_blog 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 250051e40ce087fa0ce2207cfd3f452bb2b6c6dc
-  data.tar.gz: 8eb90c01fff8917f672846f2e16c1b62f559e842
+  metadata.gz: b9170ccda1ef782dbf78a563fa1efc265b2a4f68
+  data.tar.gz: 95ca57b1a0bfc7ecba20870a9a78bc168e9e5632
 SHA512:
-  metadata.gz: 6290aab7f3741c21640a533c408aaddf096e975a7104e674c7f96906e22482fad28030952bdeb98696df1e7e9dbd876d1d584609e16f1bb08cdec84d3d4ad369
-  data.tar.gz: a269a9c499629f36a1df5d7a88d1f1c01a52c17cf21e4e0b5f24af6c3473f2b0a044787c60bdd3927a9d2218bd7d82f2c28ba2496c5efd550e999406216f3dc2
+  metadata.gz: b11edd82dd1eb74576d3c3278474645fb313d0cdb57f4eb8fc4b265f5fafe15e1666a3aa41626f8b385bc5eacc43c0f9145e3bff7d77bf11d72c02c03b9ce802
+  data.tar.gz: ec964ab180f1bbdf53b62fa408ca624c203c79488d64edccd45fe51d59add9b353cf533361d0c3ade859d30c3a475f95d5bb5f83bff94be2dd784b5f4c4098a2

data/app/assets/javascripts/admin/blog/posts.js

@@ -4,6 +4,8 @@ spud.admin.posts = {
   edit: function(){
     $('body').on('click', '.spud-post-add-category', clickedPostAddCategory);
     $('body').on('submit', '.spud-post-category-form', submittedPostCategoryForm);
+    $('body').on('blur', '.spud-post-title', blurredPostTitle);
+    $('body').on('click', '.spud-post-url-name-regen', clickedUrlNameRegen);
   }
 };
 
@@ -56,4 +58,37 @@ var savePostCategoryError = function(jqXHR, textStatus, errorThrown){
   }
 };
 
+var blurredPostTitle = function(){
+  generateUrlName(false);
+};
+
+var clickedUrlNameRegen = function(e){
+  e.preventDefault();
+  generateUrlName(true);
+};
+
+/*
+* Populate the url name field
+*
+* Pass force=true to replace the value currently in the field
+*/
+var generateUrlName = function(force){
+  var title = $('.spud-post-title').val();
+  var $urlNameField = $('.spud-post-url-name');
+  if(title !== '' && (force || $urlNameField.val() === '')){
+    $urlNameField.val(encodeTitleForUrlName(title));
+  }
+};
+
+/*
+* Return a url name for a given title
+*/
+var encodeTitleForUrlName = function(title){
+  var string;
+  string = title.toLowerCase();
+  string = string.replace(/\s+/g, '-'); // replace spaces with dashes
+  string = string.replace(/[^a-z0-9\-]+/g, ''); // remove symbols
+  return string;
+};
+
 })();

data/app/assets/stylesheets/admin/blog/application.css.scss

@@ -10,6 +10,14 @@
 #spud_post_published_at_1i, #spud_post_published_at_4i{
 	width: 50px;
 }
+.spud-post-url-name{
+	width: calc(100% - 52px);
+	float: left;
+}
+.spud-post-url-name-regen{
+	width: 50px;
+	margin-left: 2px;
+}
 
 // Categories
 //////////////

data/app/helpers/blog_helper.rb

@@ -1,15 +1,21 @@
 module BlogHelper
 
+	def options_for_post_category_select
+		return options_from_collection_for_select(SpudPostCategory.ordered, :url_name, :name, params[:category_url_name])
+	end
+
+	def options_for_post_archive_select
+		return options_for_select(SpudPost.months_with_public_posts.collect{ |d| 
+			[d.strftime('%B %Y'), d.strftime('%Y-%b').downcase]
+		}, params[:archive_date])
+	end
+
 	def spud_post_category_select
-		return select_tag('category_url_name',
-			options_from_collection_for_select(SpudPostCategory.ordered, :url_name, :name, params[:category_url_name]),
-			{:prompt => 'All Categories'})
+		return select_tag('category_url_name', options_for_post_category_select(), {:prompt => 'All Categories', :class => 'form-control'})
 	end
 
 	def spud_post_archive_select
-		return select_tag 'archive_date', options_for_select(SpudPost.months_with_public_posts.collect{ |d| 
-			[d.strftime('%B %Y'), d.strftime('%Y-%b').downcase]
-		}, params[:archive_date]), :prompt => 'All Dates', :rel => 'archive'
+		return select_tag 'archive_date', options_for_post_archive_select(), :prompt => 'All Dates', :rel => 'archive', :class => 'form-control'
 	end
 
 	def spud_blog_rss_link

data/app/models/spud/spud_post_model.rb

@@ -31,7 +31,8 @@ class Spud::SpudPostModel < ActiveRecord::Base
     end
   }
 
-  validates_presence_of :title, :content, :published_at, :spud_user_id, :url_name
+  validates_presence_of :title, :content, :published_at, :spud_user_id
+  validates :url_name, :presence => true, :uniqueness => true, :format => {:with => /\A[\w\-]+\z/, :message => 'must contain only letters, numbers, and dashes'}
   validates_uniqueness_of :url_name
   before_validation :set_url_name
 
@@ -69,18 +70,7 @@ class Spud::SpudPostModel < ActiveRecord::Base
     return self.read_attribute(:is_news)
   end
 
-  #def self.posts_for_category_archive(category, )
-
-  # Returns an array of Date objects for months with public posts
   def self.months_with_public_posts
-    # Select
-    #   Month(published_at) as published_month,
-    #   Year(published_at) as published_year
-    # From spud_posts
-    # Where visible = 1
-    # And published_at < '2012-01-30'
-    # Group By published_month, published_year
-    # Order By published_year desc, published_month desc
     records = SpudPost.select('Extract(Month from published_at) as published_month, Extract(Year from published_at) as published_year').where('visible = ? AND published_at < ?', true, DateTime.now).group('published_month, published_year').order('published_year desc, published_month desc')
     begin
       return records.collect{ |r| Date.new(r[:published_year].to_i, r[:published_month].to_i) }
@@ -91,16 +81,8 @@ class Spud::SpudPostModel < ActiveRecord::Base
   end
 
   def postprocess_content
-    # if self.content_format == 'Markdown'
-    #   require 'redcarpet'
-   #    renderer = Redcarpet::Render::HTML.new
-   #    extensions = {fenced_code_blocks: true}
-   #    redcarpet = Redcarpet::Markdown.new(renderer, extensions)
-   #    self.content_processed = redcarpet.render self.content
-    # else
-      template = Liquid::Template.parse(self.content)
-      self.content_processed = template.render()
-    # end
+    template = Liquid::Template.parse(self.content)
+    self.content_processed = template.render()
   end
 
   def content_processed
@@ -133,6 +115,9 @@ class Spud::SpudPostModel < ActiveRecord::Base
 private
 
   def set_url_name
-    self.url_name = "#{self.published_at.strftime('%Y-%m-%d')}-#{self.title.parameterize}"
+    if url_name.blank?
+      self.url_name = title.parameterize
+    end
   end
+
 end

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

@@ -3,7 +3,7 @@
 <div class="form-group">
   <div class="col-sm-12">
   	<%= f.label :title, :required => true,:class=> "control-label" %>
-  	<%= f.text_field :title, :class=>'form-control', :placeholder => "Enter title here" %>
+  	<%= f.text_field :title, :class=>'form-control spud-post-title', :placeholder => "Enter title here" %>
   </div>
 </div>
 
@@ -73,17 +73,27 @@
 	
 <h4>Meta Data</h4>
 
+<div class="form-group">
+  <%= f.label :url_name, :required => true, :class=> "col-sm-2 control-label" %>
+  <div class="col-sm-10">
+    <%= f.text_field :url_name, :class=>'form-control spud-post-url-name', :placeholder => 'Optional' %>
+    <a href="#" class="btn btn-default spud-post-url-name-regen" title="Regenerate URL Slug">
+      <span class="glyphicon glyphicon-refresh"></span>
+    </a>
+  </div>
+</div>
+
 <div class="form-group">
   <%= f.label :meta_keywords, :required => true, :class=> "col-sm-2 control-label" %>
   <div class="col-sm-10">
-    <%= f.text_field :meta_keywords, :class=>'form-control' %>
+    <%= f.text_field :meta_keywords, :class=>'form-control', :placeholder => 'Optional' %>
   </div>
 </div>
 
 <div class="form-group">
   <%= f.label :meta_description, :required => true, :class=> "col-sm-2 control-label" %>
   <div class="col-sm-10">
-    <%= f.text_field :meta_description, :class=>'form-control' %>
+    <%= f.text_field :meta_description, :class=>'form-control', :placeholder => 'Optional' %>
   </div>
 </div>
 

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

@@ -1,3 +1,3 @@
-<%= form_for @post, :url => admin_post_path(@post), :html => {:class => 'form-horizontal'} do |f| %>	
+<%= tb_form_for @post, :url => admin_post_path(@post), :html => {:class => 'form-horizontal'}, :remote => true, :data => {:errors => :inline, :success => admin_posts_path} do |f| %>	
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>

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

@@ -1,3 +1,3 @@
-<%= form_for @post, :url => admin_posts_path, :html => {:class => 'form-horizontal'} do |f| %>	
+<%= tb_form_for @post, :url => admin_posts_path, :html => {:class => 'form-horizontal'}, :remote => true, :data => {:errors => :inline, :success => admin_posts_path} do |f| %>	
 	<%= render :partial => 'form', :locals => {:f => f} %>
-<% end %>
+<% end %>

data/app/views/posts/_comment_form.html.erb

@@ -11,20 +11,20 @@
     </div>
 	<% end %>
 
-	<div>
+	<div class="form-group">
 		<%= f.label :author %>
-		<%= f.text_field :author %>
+		<%= f.text_field :author, :class => 'form-control' %>
 	</div>
-	<div>
+	<div class="form-group">
 		<%= f.label :content %>
-		<%= f.text_area :content %>
+		<%= f.text_area :content, :class => 'form-control' %>
 	</div>
-	<div class="comment_validity">
+	<div class="comment_validity hidden">
 		<%= label_tag 'Comment Validation' %>
 		<%= text_field_tag 'comment_validation' %>
 	</div>
-	<div>
-		<%= f.submit 'Post Comment' %>
+	<div class="form-group">
+		<%= f.submit 'Post Comment', :class => 'btn btn-primary' %>
 	</div>
 
 <% end %>

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

@@ -5,33 +5,53 @@
 <% end %>
 
 <% cache(cache_key_for_spud_collection(@posts, :cache_params => [:category_url_name, :archive_date, :page], :for_user => true)) do %>
-  <div id="spud_blog_filters">
-    <%= form_tag posts_path, :class => 'spud_blog_filter_form' do %>
-      <label>Category:</label>
-      <%= spud_post_category_select %>
-      <label>Month:</label>
-      <%= spud_post_archive_select %>
-      <input type="submit" value="Submit" />
-    <% end %>
+
+  <div class="row">
+    <div class="col-sm-12">
+      <%= form_tag posts_path, :class => 'form-inline blog-filters' do %>
+        <div class="form-group">
+          <label>Category:</label>
+          <%= spud_post_category_select %>
+        </div>
+        <div class="form-group">
+          <label>Month:</label>
+          <%= spud_post_archive_select %>
+        </div>
+        <input type="submit" value="Submit" class="btn btn-default" />
+      <% end %>
+    </div>
   </div>
 
-  <div id="spud_blog_posts">
-    <% if @posts.length > 0 %>
-      <% @posts.includes(:categories, :author).each do |post| %>
-        <% cache(post) do %>
-          <div class="spud_blog_post">
-            <h3><%= link_to post.title, post_path(post.url_name) %></h3>
-            <h4>Posted by <%= post.author.full_name %> on <%= post.display_date %></h4>
-            <div class="spud_blog_post_content">
-              <%= truncate_html post.content_processed.html_safe, :length => 250 %>
+  <div class="row">
+
+    <div class="col-sm-8 blog-posts">
+      <% if @posts.length > 0 %>
+        <% @posts.includes(:categories, :author).each do |post| %>
+          <% cache(post) do %>
+            <div class="blog-post blog-post-partial">
+              <h3 class="blog-post-title"><%= link_to post.title, post_path(post.url_name) %></h3>
+              <h4 class="blog-post-author">Posted by <%= post.author.full_name %> on <%= post.display_date %></h4>
+              <div class="blog-post-content">
+                <%= truncate_html post.content_processed.html_safe, :length => 250 %>
+              </div>
             </div>
-          </div>
+          <% end %>
         <% end %>
+      <% else %>
+        <p>No posts were found in this category</p>
       <% end %>
-    <% else %>
-      <p>No posts were found in this category</p>
-    <% end %>
+      <%= will_paginate @posts %>
+    </div>
+
+    <div class="col-sm-4 blog-recent-posts">
+      <h3>Recent Posts</h3>
+      <ul class="blog-recent-posts-list">
+        <% SpudPost.for_blog(params[:blog_key]).recent_posts.each do |post| %>
+          <li><%= link_to post.title, post_path(post.url_name) %></li>
+        <% end %>
+      </ul>
+    </div>
+
   </div>
 
-  <%= will_paginate @posts %>
 <% end %>

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

@@ -13,36 +13,45 @@
 <% end %>
 
 <% cache(@post) do %>
-  <div class="spud_blog_post">
-    <h3><%= @post.title %></h3>
-    <h4>Posted by <%= @post.author.full_name %> on <%= @post.display_date %></h4>
-    <% if @post.categories.any? %>
-    <p id="spud_blog_post_categories">
-      Filed under
-      <%= raw(@post.categories.collect{ |c| link_to c.name, post_category_path(c.url_name) }.join(', ')) %>
-    </p>
-    <% end %>
-    <div id="spud_blog_post_content">
-      <%= raw @post.content_processed %>
+  <div class="row">
+    <div class="col-sm-12">
+      <div class="blog-post blog-post-partial">
+        <h1 class="blog-post-title"><%= @post.title %></h1>
+        <h4 class="blog-post-author">Posted by <%= @post.author.full_name %> on <%= @post.display_date %></h4>
+        <% if @post.categories.any? %>
+          <p class="blog-post-categories">
+            <span>Filed under</span>
+            <%= raw(@post.categories.collect{ |c| link_to c.name, post_category_path(c.url_name) }.join(', ')) %>
+          </p>
+        <% end %>
+        <div class="blog-post-content">
+          <%= raw @post.content_processed %>
+        </div>
+        <p><%= link_to 'Back to all posts', posts_path %></p>
+      </div>
     </div>
   </div>
 
   <% if @post.comments_enabled %>
-    <div class="spud_blog_post_comment">
-      <h5>Post a Comment:</h5>
-      <%= render 'comment_form' %>
-    </div>
-    <% cache(cache_key_for_spud_collection(@post.visible_comments, key:'comments')) do %>
-      <ul id="spud_blog_post_comments">
-        <% @post.visible_comments.each do |comment| %>
-          <% cache(comment) do %>
-            <li>
-              <h6>Posted by: <%= comment.author %></h6>
-              <p><%= comment.content %></p>
-            </li>
-          <% end %>
+    <div class="row">
+      <div class="col-sm-12">
+        <div class="blog-post-comment">
+          <h5>Post a Comment:</h5>
+          <%= render 'comment_form' %>
+        </div>
+        <% cache(cache_key_for_spud_collection(@post.visible_comments, key:'comments')) do %>
+          <ul id="blog-post-comments">
+            <% @post.visible_comments.each do |comment| %>
+              <% cache(comment) do %>
+                <li>
+                  <h6>Posted by: <%= comment.author %></h6>
+                  <p><%= comment.content %></p>
+                </li>
+              <% end %>
+            <% end %>
+          </ul>
         <% end %>
-      </ul>
-    <% end %>
+      </div>
+    </div>
   <% end %>
 <% end %>

data/config/locales/en.yml

@@ -0,0 +1,5 @@
+en:
+  activerecord:
+    attributes:
+      spud_post:
+        url_name: 'URL Slug'

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Blog
-	  VERSION = "1.3.1"
+	  VERSION = "1.3.2"
 	end
 end

data/spec/dummy/db/migrate/20140110180429_add_nested_set_to_post_categories.tb_blog.rb

@@ -8,8 +8,8 @@ class AddNestedSetToPostCategories < ActiveRecord::Migration
     end
 
     # Populates lft, rgt, and depth values for nested set
-    SpudPostCategory.where(:parent_id => 0).update_all({:parent_id => nil})
-    SpudPostCategory.rebuild!
+    #SpudPostCategory.where(:parent_id => 0).update_all({:parent_id => nil})
+    #SpudPostCategory.rebuild!
   end
 
   def down

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_blog
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -202,6 +202,7 @@ files:
 - app/views/posts/index.html.erb
 - app/views/posts/index.rss.builder
 - app/views/posts/show.html.erb
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20120125180945_create_spud_posts.rb
 - db/migrate/20120125181022_create_spud_post_categories.rb