cartoonist-blog 0.0.6 → 0.0.7

data/app/controllers/blog_admin_controller.rb

@@ -1,4 +1,4 @@
-class BlogAdminController < ApplicationController
+class BlogAdminController < CartoonistController
   helper :blog
   before_filter :preview!, :only => [:preview]
   before_filter :ensure_ssl!

data/app/controllers/blog_controller.rb

@@ -1,7 +1,7 @@
-class BlogController < ApplicationController
+class BlogController < CartoonistController
   def archives
     @posts = BlogPost.archives
-    render :layout => "page"
+    render :layout => "blog_archives"
     cache_page_as "blog/archives.#{cache_type}.tmp.html"
   end
 
@@ -31,7 +31,7 @@ class BlogController < ApplicationController
 
       format.rss do
         @feed = feed_content
-        render :content_type => "application/xml"
+        render :content_type => "application/xml", :layout => "cartoonist"
       end
     end
   end

data/app/models/blog_feed.rb

@@ -2,7 +2,15 @@ class BlogFeed
   attr_reader :pub_date, :items
 
   def initialize(feed)
-    @pub_date = feed.first.posted_at.localtime.strftime "%a, %d %b %Y %H:%M:00 %z"
+    first = feed.first
+
+    if first
+      first_date = first.posted_at
+    else
+      first_date = Time.now
+    end
+
+    @pub_date = first_date.localtime.strftime "%a, %d %b %Y %H:%M:00 %z"
     @items = feed.map do |item|
       BlogFeed::Item.new item
     end

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

@@ -1,4 +1,4 @@
-<% content_for(:title, "Blog Archives for #{Setting[:site_name]}") %>
+<% content_for :title, "Blog Archives for #{Setting[:site_name]}" %>
 
 <ul>
   <% @posts.each do |post| %>

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

@@ -67,4 +67,4 @@
   <% end %>
 <% end %>
 
-<%= render :template => "layouts/application" %>
+<%= render :template => "layouts/cartoonist" %>

data/app/views/layouts/blog_archives.html.erb

@@ -0,0 +1,17 @@
+<% content_for :content_class, "blog-archives-content" %>
+
+<% content_for :content do %>
+  <div class="blog-archives-page">
+    <h1><%= yield :title %></h1>
+
+    <%= yield %>
+  </div>
+<% end %>
+
+<% content_for :admin_content do %>
+  <% if preview? %>
+    <p><a href="/admin/main">admin</a></p>
+  <% end %>
+<% end %>
+
+<%= render :template => "layouts/cartoonist" %>

data/config/locales/en.yml

@@ -14,7 +14,7 @@ en:
     layout:
       tab:
         blog: Blog
-  application:
+  cartoonist:
     layout:
       navigation:
         blog: Blog

data/lib/cartoonist-blog/engine.rb

@@ -2,7 +2,7 @@ module CartoonistBlog
   class Engine < ::Rails::Engine
     Cartoonist::Admin::Tab.add :blog, :url => "/blog_admin", :order => 1
     Cartoonist::RootPath.add :blog, "blog#index"
-    Cartoonist::Navigation::Link.add :url => "/blog", :preview_url => "/blog_admin/preview", :class => "blog", :label => "application.layout.navigation.blog", :order => 1
+    Cartoonist::Navigation::Link.add :url => "/blog", :preview_url => "/blog_admin/preview", :class => "blog", :label => "cartoonist.layout.navigation.blog", :order => 1
     Cartoonist::Migration.add_for self
 
     Cartoonist::Backup.for :blog_posts do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist-blog
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cartoonist
-  requirement: &17149620 !ruby/object:Gem::Requirement
+  requirement: &15495680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *17149620
+  version_requirements: *15495680
 description: This core plugin for Cartoonist adds a simple blog.
 email: reasonnumber@gmail.com
 executables: []
@@ -43,6 +43,7 @@ files:
 - app/views/blog_admin/new.html.erb
 - app/views/layouts/blog.html.erb
 - app/views/layouts/blog_admin.html.erb
+- app/views/layouts/blog_archives.html.erb
 - cartoonist-blog.gemspec
 - config/locales/en.yml
 - db/migrate/20120308064117_create_blog_posts.rb