spud_blog 0.9.5 → 0.9.7

data/app/models/spud_post.rb

@@ -1,5 +1,5 @@
 class SpudPost < ActiveRecord::Base
-	searchable
+	spud_searchable
 
 	has_and_belongs_to_many :categories,
 		:class_name => 'SpudPostCategory',
@@ -16,10 +16,11 @@ class SpudPost < ActiveRecord::Base
 	validates_presence_of :title, :content, :published_at, :spud_user_id, :url_name
 	validates_uniqueness_of :url_name
 	before_validation :set_url_name
+	before_save :postprocess_content
 
 	after_save :set_spud_site_ids
 
-	attr_accessible :is_news,:published_at,:title,:content,:spud_user_id,:url_name,:visible,:comments_enabled,:meta_keywords,:meta_description,:category_ids, :spud_site_ids
+	attr_accessible :is_news,:published_at,:title,:content,:spud_user_id,:url_name,:visible,:comments_enabled,:meta_keywords,:meta_description,:category_ids, :spud_site_ids, :content_format
 	attr_accessor :spud_site_ids
 
 	def self.for_spud_site(spud_site_id)
@@ -97,6 +98,29 @@ class SpudPost < ActiveRecord::Base
 		end
 	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
+			self.content_processed = content
+		end
+	end
+
+	def content_processed
+		if read_attribute(:content_processed).blank?
+			postprocess_content
+		end
+		read_attribute(:content_processed)
+	end
+
+	def content_processed=(content)
+		write_attribute(:content_processed,content)
+	end
+
 	def display_date
 		return published_at.strftime("%b %d, %Y")
 	end

data/app/models/spud_post_category.rb

@@ -1,12 +1,12 @@
 class SpudPostCategory < ActiveRecord::Base
-	searchable
+	spud_searchable
 	acts_as_nested_set
 
 	has_and_belongs_to_many :posts,
 		:class_name => 'SpudPost',
 		:join_table => 'spud_post_categories_posts',
 		:foreign_key => 'spud_post_category_id'
-	
+
 	validates_presence_of :name, :url_name
 	validates_uniqueness_of :name, :url_name
 	before_validation :set_url_name
@@ -67,4 +67,4 @@ class SpudPostCategory < ActiveRecord::Base
 		self.children.update_all(:parent_id => self.parent_id)
 		self.class.rebuild!
 	end
-end
+end

data/app/models/spud_post_sweeper.rb

@@ -41,7 +41,7 @@ class SpudPostSweeper < ActionController::Caching::Sweeper
         expire_page blog_post_path(record.url_name)
       end
     end
-    expire_page spud_sitemap_path(:format => :xml)
+    # expire_page spud_sitemap_path(:format => :xml)
   end
 
 end

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

@@ -23,7 +23,7 @@
 				<h3><%= link_to post.title, blog_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.html_safe, :length => 250 %>
+					<%= truncate_html post.content_processed.html_safe, :length => 250 %>
 				</div>
 			</div>
 		<% end %>

data/app/views/blog/index.rss.builder

@@ -1,18 +1,18 @@
-xml.instruct! :xml, :version => "1.0" 
+xml.instruct! :xml, :version => "1.0"
 xml.rss :version => "2.0" do
   xml.channel do
     xml.title "#{Spud::Core.site_name} Blog Articles"
     xml.description "Blog articles for #{Spud::Core.site_name}"
     xml.link blog_url(:format => :rss)
-    
+
     for article in @posts
       xml.item do
         xml.title article.title
-        xml.description article.content
+        xml.description article.content_processed
         xml.pubDate article.created_at.to_s(:rfc822)
         xml.link blog_post_url(article.url_name)
         xml.guid blog_post_url(article.url_name)
       end
     end
   end
-end
+end

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

@@ -22,7 +22,7 @@
 	</p>
 	<% end %>
 	<div id="spud_blog_post_content">
-		<%= raw @post.content %>
+		<%= raw @post.content_processed %>
 	</div>
 </div>
 

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

@@ -1,12 +1,20 @@
 <%=error_messages_for(f.object)%>
 
 <fieldset>
+	<div class="control-group">
 	<%= f.label :title, :required=>true,:style =>"display:none;" %>
   <%= f.text_field :title, :class => "full-width",:placeholder=>"Enter title here" %>
+	</div>
 </fieldset>
-
-<div>
-	<%= f.text_area :content,:style => "width:100%;", :class => 'tinymce full-width' %>
+<%if Spud::Blog.config.markdown_enabled%>
+	<div class="control-group">
+		<div class="controls">
+			<%=f.select :content_format,[["HTML"],["Markdown"]], {:include_blank => false}, :class => "pull-right", "data-formatter" => "spud_post_content"%>
+		</div>
+	</div>
+<%end%>
+<div style="clear:both;">
+	<%= f.text_area :content,:style => "width:100%;", :class => 'tinymce full-width', "data-format" => f.object.content_format%>
 </div>
 
 <% if Spud::Blog.config.has_custom_fields %>

data/db/migrate/20130120151857_add_content_format_to_spud_posts.rb

@@ -0,0 +1,5 @@
+class AddContentFormatToSpudPosts < ActiveRecord::Migration
+  def change
+    add_column :spud_posts, :content_format, :string, :default => "HTML"
+  end
+end

data/db/migrate/20130121130612_add_content_processed_to_spud_post.rb

@@ -0,0 +1,5 @@
+class AddContentProcessedToSpudPost < ActiveRecord::Migration
+  def change
+    add_column :spud_posts, :content_processed, :text
+  end
+end

data/lib/spud_blog/configuration.rb

@@ -6,7 +6,7 @@ module Spud
       :news_enabled, :posts_per_page, :blog_path,
       :news_path, :enable_sitemap, :has_custom_fields,
       :cache_mode, :action_caching_duration,
-      :enable_rakismet
+      :enable_rakismet, :enable_markdown
     )
     self.base_layout = 'application'
     self.news_layout = nil
@@ -20,5 +20,6 @@ module Spud
     self.cache_mode = nil #options :full_page, :action
     self.action_caching_duration = 3600
     self.enable_rakismet = false
+    self.enable_markdown = false
   end
 end

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Blog
-	  VERSION = "0.9.5"
+	  VERSION = "0.9.7"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_blog
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.9.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.9.10
 - !ruby/object:Gem::Dependency
   name: spud_permalinks
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +310,8 @@ files:
 - db/migrate/20120825142547_add_spam_fields_to_spud_post_comments.rb
 - db/migrate/20120825144506_add_permalink_to_spud_post_comments.rb
 - db/migrate/20121113135812_add_nested_set_to_post_categories.rb
+- db/migrate/20130120151857_add_content_format_to_spud_posts.rb
+- db/migrate/20130121130612_add_content_processed_to_spud_post.rb
 - lib/generators/spud/blog/random_posts_generator.rb
 - lib/generators/spud/blog/views_generator.rb
 - lib/spud_blog/configuration.rb
@@ -320,7 +338,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4047856296351614869
+      hash: 1495090918977313494
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -329,7 +347,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4047856296351614869
+      hash: 1495090918977313494
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24