cartoonist-comics 0.0.9.1 → 0.0.10

data/app/controllers/comic_controller.rb

@@ -4,9 +4,11 @@ class ComicController < CartoonistController
     @disabled_prev = true if @comic.oldest?
     @disabled_next = true
     @title = Setting[:site_name]
-    render :show
-    cache_page_as ".#{cache_type}.tmp.html" if Cartoonist::RootPath.current_key == :comics
-    cache_page_as "comic.#{cache_type}.tmp.html"
+
+    cache_page_as "comic.#{cache_type}.tmp.html" do
+      render :show
+      cache_page_as ".#{cache_type}.tmp.html" if Cartoonist::RootPath.current_key == :comics
+    end
   end
 
   def random
@@ -21,8 +23,10 @@ class ComicController < CartoonistController
           @comic = Comic.from_number params[:id], true
           @disabled_prev = true if @comic.oldest?
           @disabled_next = @comic.maybe_newest?
-          render
-          cache_show_page
+
+          cache_page_as show_page_cache_path do
+            render
+          end
         rescue
           redirect_to "/comic"
         end
@@ -30,8 +34,10 @@ class ComicController < CartoonistController
 
       format.png do
         comic = Comic.from_number params[:id], true
-        send_data comic.database_file.content, :filename => "comic_#{comic.number}.png", :type => "image/png", :disposition => "inline"
-        cache_page_as "static/comic/#{comic.number}.png"
+
+        cache_page_as "static/comic/#{comic.number}.png" do
+          send_data comic.database_file.content, :filename => "comic_#{comic.number}.png", :type => "image/png", :disposition => "inline"
+        end
       end
     end
   end
@@ -68,11 +74,11 @@ class ComicController < CartoonistController
     @@comic_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 "comic/#{@comic.number}.#{cache_type}.tmp.html"
+      "comic/#{@comic.number}.#{cache_type}.tmp.html"
     else
-      cache_page_as "comic/#{@comic.number}.#{cache_type}.html"
+      "comic/#{@comic.number}.#{cache_type}.html"
     end
   end
 end

data/app/models/comic.rb

@@ -78,7 +78,7 @@ class Comic < ActiveRecord::Base
 
     def create_comic(params)
       last = current_created
-      create :number => next_number(last), :title => params[:title], :posted_at => next_post_date(last), :description => params[:description], :scene_description => params[:scene_description], :dialogue => params[:dialogue], :title_text => params[:title_text], :database_file => DatabaseFile.create(:content => params[:image].read), :locked => true
+      create :number => next_number(last), :title => params[:title], :posted_at => next_post_date(last), :description => params[:description], :scene_description => params[:scene_description], :dialogue => params[:dialogue], :title_text => params[:title_text], :database_file => DatabaseFile.create_from_param(params[:image], :allowed_extensions => ["png"]), :locked => true
     end
 
     def update_comic(params)
@@ -90,7 +90,7 @@ class Comic < ActiveRecord::Base
       comic.dialogue = params[:dialogue]
       comic.title_text = params[:title_text]
       comic.locked = true
-      comic.database_file = DatabaseFile.create(:content => params[:image].read) if params[:image]
+      comic.database_file = DatabaseFile.create_from_param params[:image], :allowed_extensions => ["png"]
       comic.save!
       comic
     end

data/app/models/comic_feed.rb

@@ -24,7 +24,7 @@ class ComicFeed
       @title = comic.title
       @img_url = comic.absolute_img_url
       @title_text = comic.title_text
-      @description = comic.formatted_description
+      @description = Markdown.render comic.description, :link_to_absolute => true
       @pub_date = comic.posted_at.to_time.strftime "%a, %d %b %Y 00:00:01 %z"
     end
   end

data/cartoonist-comics.gemspec

@@ -2,8 +2,7 @@ Gem::Specification.new do |s|
   raise "Cannot find version file!" unless File.exists?(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.version       = "0.0.9.1"
+  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."
@@ -12,6 +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
-  s.add_dependency "cartoonist", "0.0.9"
+  s.add_dependency "cartoonist", cartoonist_version
 end

data/lib/cartoonist-comics/engine.rb

@@ -7,7 +7,7 @@ module CartoonistComics
     Cartoonist::Migration.add_for self
 
     Cartoonist::Backup.for :comics do
-      Comic.order(:id).all
+      Comic.order(:id)
     end
 
     Cartoonist::Sitemap.add do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist-comics
 version: !ruby/object:Gem::Version
-  version: 0.0.9.1
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cartoonist
-  requirement: &18234840 !ruby/object:Gem::Requirement
+  requirement: &21009960 !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: *18234840
+  version_requirements: *21009960
 description: This core plugin for Cartoonist adds comics.
 email: reasonnumber@gmail.com
 executables: []