cartoonist-blog 0.0.9 → 0.0.10

data/app/controllers/blog_controller.rb

@@ -1,16 +1,20 @@
 class BlogController < CartoonistController
   def archives
     @posts = BlogPost.archives
-    render :layout => "blog_archives"
-    cache_page_as "blog/archives.#{cache_type}.tmp.html"
+
+    cache_page_as "blog/archives.#{cache_type}.tmp.html" do
+      render :layout => "blog_archives"
+    end
   end
 
   def show
     @post = BlogPost.from_url_title params[:id]
     @disabled_prev = @post.oldest?
     @disabled_next = @post.newest?
-    render
-    cache_show_page
+
+    cache_page_as show_page_cache_path do
+      render
+    end
   rescue
     redirect_to "/blog"
   end
@@ -20,9 +24,11 @@ class BlogController < CartoonistController
     @disabled_prev = true if @post.oldest?
     @disabled_next = true
     @title = "Blog for #{Setting[:site_name]}"
-    render :show
-    cache_page_as ".#{cache_type}.tmp.html" if Cartoonist::RootPath.current_key == :blog
-    cache_page_as "blog.#{cache_type}.tmp.html"
+
+    cache_page_as "blog.#{cache_type}.tmp.html" do
+      render :show
+      cache_page_as ".#{cache_type}.tmp.html" if Cartoonist::RootPath.current_key == :blog
+    end
   end
 
   def feed
@@ -49,11 +55,11 @@ class BlogController < CartoonistController
     @@blog_cache ||= ActiveSupport::Cache::MemoryStore.new(:expires_in => 2.hours)
   end
 
-  def cache_show_page
+  def show_page_cache_path
     if @disabled_next
-      cache_page_as "blog/#{@post.url_title}.#{cache_type}.tmp.html"
+      "blog/#{@post.url_title}.#{cache_type}.tmp.html"
     else
-      cache_page_as "blog/#{@post.url_title}.#{cache_type}.html"
+      "blog/#{@post.url_title}.#{cache_type}.html"
     end
   end
 end

data/app/models/blog_feed.rb

@@ -21,7 +21,7 @@ class BlogFeed
 
     def initialize(post)
       @title = post.title
-      @content = Markdown.render post.content, false
+      @content = Markdown.render post.content, :html_safe => false, :link_to_absolute => true
       @url_title = post.url_title
       @pub_date = post.posted_at.localtime.strftime "%a, %d %b %Y %H:%M:00 %z"
     end

data/app/models/blog_post.rb

@@ -9,6 +9,12 @@ class BlogPost < ActiveRecord::Base
   attr_accessor :for_preview
   attr_accessible :title, :url_title, :author, :posted_at, :content, :locked
 
+  def to_backup_entries
+    post = Backup::Entry.new id, url_title, "markdown", content
+    meta = Backup::Entry.new id, "#{url_title}.meta", "json", to_json(:except => :content)
+    [post, meta]
+  end
+
   def url
     "/blog/#{url_title}"
   end

data/lib/cartoonist-blog/engine.rb

@@ -7,7 +7,7 @@ module CartoonistBlog
     Cartoonist::Migration.add_for self
 
     Cartoonist::Backup.for :blog_posts do
-      BlogPost.order(:id).all
+      BlogPost.order(:id)
     end
 
     Cartoonist::Sitemap.add do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist-blog
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cartoonist
-  requirement: &15371600 !ruby/object:Gem::Requirement
+  requirement: &16264880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *15371600
+  version_requirements: *16264880
 description: This core plugin for Cartoonist adds a simple blog.
 email: reasonnumber@gmail.com
 executables: []