cartoonist-comics 0.0.4 → 0.0.5

data/app/controllers/comic_controller.rb

@@ -1,29 +1,30 @@
 class ComicController < ApplicationController
-  def current
+  def index
     @comic = Comic.current
     @disabled_prev = true if @comic.oldest?
     @disabled_next = true
     @title = Setting[:site_name]
     render :show
-    cache_current_page
+    cache_page_as ".#{cache_type}.tmp.html" if Cartoonist::RootPath.current_key == :comics
+    cache_page_as "comic.#{cache_type}.tmp.html"
   end
 
   def random
-    redirect_to "/#{rand(max_comic) + 1}"
+    redirect_to "/comic/#{rand(max_comic) + 1}"
   end
 
   def show
     respond_to do |format|
       format.html do
         begin
-          return redirect_to "/1" if params[:id].to_i < 1
+          return redirect_to "/comic/1" if params[:id].to_i < 1
           @comic = Comic.from_number params[:id], true
           @disabled_prev = true if @comic.oldest?
           @disabled_next = @comic.maybe_newest?
           render
           cache_show_page
         rescue
-          redirect_to "/"
+          redirect_to "/comic"
         end
       end
 
@@ -35,19 +36,19 @@ class ComicController < ApplicationController
     end
   end
 
-  def index
+  def feed
     respond_to do |format|
-      format.html { redirect_to "/" }
+      format.html { redirect_to "/comic" }
 
       format.rss do
-        @feed = feed
+        @feed = feed_contents
         render :content_type => "application/xml"
       end
     end
   end
 
   private
-  def feed
+  def feed_contents
     result = comic_cache.read "feed"
     return result if result
     result = ComicFeed.new Comic.feed
@@ -67,15 +68,11 @@ class ComicController < ApplicationController
     @@comic_cache ||= ActiveSupport::Cache::MemoryStore.new(:expires_in => 2.hours)
   end
 
-  def cache_current_page
-    cache_page_as ".#{cache_type}.tmp.html"
-  end
-
   def cache_show_page
     if @disabled_next
-      cache_page_as "#{@comic.number}.#{cache_type}.tmp.html"
+      cache_page_as "comic/#{@comic.number}.#{cache_type}.tmp.html"
     else
-      cache_page_as "#{@comic.number}.#{cache_type}.html"
+      cache_page_as "comic/#{@comic.number}.#{cache_type}.html"
     end
   end
 end

data/app/helpers/comic_helper.rb

@@ -3,7 +3,7 @@ module ComicHelper
     if preview?
       "/comic_admin/preview"
     else
-      "/"
+      "/comic"
     end
   end
 
@@ -11,7 +11,7 @@ module ComicHelper
     if preview?
       "/comic_admin/#{number}/preview"
     else
-      "/#{number}"
+      "/comic/#{number}"
     end
   end
 
@@ -27,7 +27,7 @@ module ComicHelper
     if preview?
       "/comic_admin/preview_random"
     else
-      "/random"
+      "/comic/random"
     end
   end
 end

data/app/models/comic.rb

@@ -41,7 +41,7 @@ class Comic < ActiveRecord::Base
   end
 
   def absolute_url
-    "http://#{Setting[:domain]}/#{number}"
+    "http://#{Setting[:domain]}/comic/#{number}"
   end
 
   def img_url

data/app/views/comic/{index.rss.erb → feed.rss.erb}

@@ -22,8 +22,8 @@
         } %>
       <% end %>
     </description>
-    <link>http://<%= Setting[:domain] %>/<%= item.number %></link>
-    <guid>http://<%= Setting[:domain] %>/<%= item.number %></guid>
+    <link>http://<%= Setting[:domain] %>/comic/<%= item.number %></link>
+    <guid>http://<%= Setting[:domain] %>/comic/<%= item.number %></guid>
     <pubDate><%= item.pub_date %></pubDate>
   </item>
 <% end %>

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

@@ -18,7 +18,7 @@
       <%= comic.formatted_posted_at "" %>
       <a href="/comic_admin/<%= comic.number %>/edit"><%= comic.title %></a>
       (<a href="/comic_admin/<%= comic.number %>/preview"><%= t "admin.comic.index.preview" %></a>)
-      (<a href="/<%= comic.number %>"><%= t "admin.comic.index.show" %></a>)
+      (<a href="/comic/<%= comic.number %>"><%= t "admin.comic.index.show" %></a>)
     </li>
   <% end %>
 </ul>

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

@@ -1,6 +1,6 @@
 <% content_for :content_class, "comic-content" %>
 <% licensed! %>
-<% rss! "/feed", t("comic.layout.rss_title", :site_name => Setting[:site_name]) %>
+<% rss! "/comic/feed", t("comic.layout.rss_title", :site_name => Setting[:site_name]) %>
 
 <% content_for :small_buttons do %>
   <% if @comic.real? %>

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

@@ -1,5 +1,5 @@
 <% content_for :subtabs do %>
-  <a class="subtab" href="/"><%= t "admin.comic.layout.latest" %></a>
+  <a class="subtab" href="/comic"><%= t "admin.comic.layout.latest" %></a>
   <a class="subtab" href="/comic_admin"><%= t "admin.comic.layout.list" %></a>
   <a class="subtab" href="/comic_admin/new"><%= t "admin.comic.layout.new" %></a>
   <% if @edit_last_number && @edit_last_number > 0 %>

data/cartoonist-comics.gemspec

@@ -1,7 +1,8 @@
 Gem::Specification.new do |s|
-  s.name          = "cartoonist-comics"
   raise "Cannot find version file!" unless File.exists?(File.join(File.dirname(__FILE__), "../CARTOONIST_VERSION"))
-  s.version       = File.read File.join(File.dirname(__FILE__), "../CARTOONIST_VERSION")
+  cartoonist_version = File.read(File.join(File.dirname(__FILE__), "../CARTOONIST_VERSION")).strip
+  s.name          = "cartoonist-comics"
+  s.version       = cartoonist_version
   s.date          = Time.now.strftime "%Y-%m-%d"
   s.summary       = "Cartoonist Comics"
   s.description   = "This core plugin for Cartoonist adds comics."
@@ -10,4 +11,5 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
   s.homepage      = "http://reasonnumber.com/cartoonist"
+  s.add_dependency "cartoonist", cartoonist_version
 end

data/lib/cartoonist-comics/engine.rb

@@ -1,7 +1,8 @@
 module CartoonistComics
   class Engine < ::Rails::Engine
     Cartoonist::Admin::Tab.add :comics, :url => "/comic_admin", :order => 0
-    Cartoonist::Navigation::Link.add :url => "/", :preview_url => "/comic_admin/preview", :class => "comic", :label => "application.layout.navigation.comic", :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::Migration.add_for self
 
     Cartoonist::Backup.for :comics do
@@ -12,24 +13,24 @@ module CartoonistComics
       comics = Comic.sitemap
 
       result = comics.map do |comic|
-        SitemapEntry.new "/#{comic.number}", comic.posted_at, :never
+        SitemapEntry.new "/comic/#{comic.number}", comic.posted_at, :never
       end
 
-      first = comics.first
-      result << SitemapEntry.new("/", first.posted_at, :daily, "1.0")
-      result
-    end
+      unless result.empty?
+        first = comics.first
+        result << SitemapEntry.new("/comic", first.posted_at, :daily, "1.0")
+      end
 
-    Cartoonist::Routes.add_begin do
-      root :to => "comic#current"
-      match ":id", :controller => "comic", :action => "show", :id => /\d+/
+      result
     end
 
     Cartoonist::Routes.add do
-      match "comic/:id.png", :controller => "comic", :action => "show", :id => /\d+/, :defaults => { :format => "png" }
-      match "current" => "comic#current"
-      match "random" => "comic#random"
-      match "feed" => "comic#index", :defaults => { :format => "rss" }
+      resources :comic do
+        collection do
+          get "random"
+          get "feed", :defaults => { :format => "rss" }
+        end
+      end
 
       resources :comic_admin do
         member do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist-comics
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
-dependencies: []
+date: 2012-04-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: cartoonist
+  requirement: &9936240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *9936240
 description: This core plugin for Cartoonist adds comics.
 email: reasonnumber@gmail.com
 executables: []
@@ -24,7 +35,7 @@ files:
 - app/helpers/comic_helper.rb
 - app/models/comic.rb
 - app/models/comic_feed.rb
-- app/views/comic/index.rss.erb
+- app/views/comic/feed.rss.erb
 - app/views/comic/show.html.erb
 - app/views/comic_admin/edit.html.erb
 - app/views/comic_admin/index.html.erb