cartoonist-comics 0.0.6 → 0.0.7

data/app/controllers/comic_admin_controller.rb

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

data/app/controllers/comic_controller.rb

@@ -1,4 +1,4 @@
-class ComicController < ApplicationController
+class ComicController < CartoonistController
   def index
     @comic = Comic.current
     @disabled_prev = true if @comic.oldest?
@@ -42,7 +42,7 @@ class ComicController < ApplicationController
 
       format.rss do
         @feed = feed_contents
-        render :content_type => "application/xml"
+        render :content_type => "application/xml", :layout => "cartoonist"
       end
     end
   end

data/app/models/comic.rb

@@ -1,5 +1,5 @@
 class Comic < ActiveRecord::Base
-  attr_accessible :number, :posted_at, :title, :description, :scene_description, :dialogue, :title_text, :database_file_id, :tweet, :tweeted_at, :locked
+  attr_accessible :number, :posted_at, :title, :description, :scene_description, :dialogue, :title_text, :database_file_id, :database_file, :tweet, :tweeted_at, :locked
   belongs_to :database_file
   include Tweetable
 

data/app/models/comic_feed.rb

@@ -2,7 +2,15 @@ class ComicFeed
   attr_reader :pub_date, :items
 
   def initialize(feed)
-    @pub_date = feed.first.posted_at.to_time.strftime "%a, %d %b %Y 00:00:01 %z"
+    first = feed.first
+
+    if first
+      first_date = first.posted_at
+    else
+      first_date = Date.today
+    end
+
+    @pub_date = first_date.to_time.strftime "%a, %d %b %Y 00:00:01 %z"
     @items = feed.map do |item|
       ComicFeed::Item.new item
     end

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

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

data/config/locales/en.yml

@@ -17,7 +17,7 @@ en:
     layout:
       tab:
         comics: Comics
-  application:
+  cartoonist:
     layout:
       navigation:
         comic: Comic

data/lib/cartoonist-comics/engine.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist-comics
 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: &16089320 !ruby/object:Gem::Requirement
+  requirement: &11099940 !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: *16089320
+  version_requirements: *11099940
 description: This core plugin for Cartoonist adds comics.
 email: reasonnumber@gmail.com
 executables: []