cartoonist-comics 0.0.16 → 0.0.17

data/app/controllers/comic_controller.rb

@@ -43,27 +43,28 @@ class ComicController < CartoonistController
   end
 
   def feed
+    respond_to_feed "feed"
+  end
+
+  def mfeed
+    respond_to_feed "mfeed"
+  end
+
+  private
+  def respond_to_feed(name)
     respond_to do |format|
       format.html { redirect_to "/comic" }
 
       format.rss do
-        @feed = feed_contents
-        render :content_type => "application/xml", :layout => "cartoonist"
+        @feed = ComicFeed.new Comic.feed
+
+        cache_page_as "comic/#{name}.#{cache_type}.tmp.rss" do
+          render :content_type => "application/xml", :layout => "cartoonist"
+        end
       end
     end
   end
 
-  private
-  def feed_contents
-    key = "feed"
-    key = "#{key}-mobile" if mobile?
-    result = comic_cache.read key
-    return result if result
-    result = ComicFeed.new Comic.feed
-    comic_cache.write key, result
-    result
-  end
-
   def max_comic
     result = comic_cache.read "max-comic"
     return result if result

data/app/helpers/admin/comic_helper.rb

@@ -1,15 +1,5 @@
 module Admin::ComicHelper
-  def lock_toggle_target
-    if @comic.locked
-      "unlock"
-    else
-      "lock"
-    end
-  end
-
   def lock_disabled
-    if @comic.locked
-      'disabled="disabled"'.html_safe
-    end
+    @comic.lock_disabled_html
   end
 end

data/app/models/comic.rb

@@ -1,6 +1,7 @@
 class Comic < ActiveRecord::Base
   include Postable
   include Entity
+  include Lockable
   entity_type :comic
   entity_global_url "/comic"
   entity_url &:url
@@ -26,16 +27,6 @@ class Comic < ActiveRecord::Base
     Markdown.render description
   end
 
-  def lock!
-    self.locked = true
-    save!
-  end
-
-  def unlock!
-    self.locked = false
-    save!
-  end
-
   def real?
     number
   end
@@ -92,7 +83,7 @@ class Comic < ActiveRecord::Base
 
     def update_comic(params)
       comic = from_number params[:id].to_i
-      raise "Cannot update locked comic!" if comic.locked
+      comic.ensure_unlocked!
       comic.title = params[:title]
       comic.description = params[:description]
       comic.scene_description = params[:scene_description]

data/app/views/admin/comic/edit.html.erb

@@ -1,11 +1,11 @@
 <% Cartoonist::Entity.hooks_with(:edit_entity_before_partial).each do |hook| %>
-  <%= render :partial => hook.edit_entity_before_partial, :locals => { :entity => @comic } %>
+  <%= partial hook.edit_entity_before_partial, :entity => @comic %>
   <hr />
 <% end %>
 
 <p>
-  <%= form_tag "/admin/comic/#{@comic.number}/#{lock_toggle_target}", :method => :post do %>
-    <input type="submit" value="<%= lock_toggle_target %>" />
+  <%= form_tag "/admin/comic/#{@comic.number}/#{@comic.toggle_lock_target}", :method => :post do %>
+    <input type="submit" value="<%= @comic.toggle_lock_target %>" />
   <% end %>
 </p>
 
@@ -65,5 +65,5 @@
 
 <% Cartoonist::Entity.hooks_with(:edit_entity_after_partial).each do |hook| %>
   <hr />
-  <%= render :partial => hook.edit_entity_after_partial, :locals => { :entity => @comic } %>
+  <%= partial hook.edit_entity_after_partial, :entity => @comic %>
 <% end %>

data/app/views/comic/feed.rss.erb

@@ -1,4 +1,4 @@
-<% content_for :rss_title, "#{Setting[:site_name]} Comic#{" (Mobile Edition)" if mobile?}" %>
+<% content_for :rss_title, "#{Setting[:site_name]} Comic" %>
 <% content_for :pub_date, @feed.pub_date %>
 
 <% @feed.items.each do |item| %>
@@ -12,13 +12,6 @@
         </p>
         #{item.description}
       } %>
-      <% if mobile? %>
-        <%= %{
-          <p style="background: #eff8bd; width: 85%; margin: 20px auto 0 auto; border: 1px solid #d5eab7; padding: 4px 10px; display: block;">
-            #{h item.title_text}
-          </p>
-        } %>
-      <% end %>
     </description>
     <link>http://<%= Setting[:domain] %>/comic/<%= item.number %></link>
     <guid>http://<%= Setting[:domain] %>/comic/<%= item.number %></guid>

data/app/views/comic/mfeed.rss.erb

@@ -0,0 +1,23 @@
+<% content_for :rss_title, "#{Setting[:site_name]} Comic (Mobile Edition)" %>
+<% content_for :pub_date, @feed.pub_date %>
+
+<% @feed.items.each do |item| %>
+  <item>
+    <title><%= item.title %></title>
+    <description>
+      <%= %{
+        <h1>#{h item.title}</h1>
+        <p>
+          <img src="#{h item.img_url}" title="#{h item.title_text}" />
+        </p>
+        #{item.description}
+        <p style="background: #eff8bd; width: 85%; margin: 20px auto 0 auto; border: 1px solid #d5eab7; padding: 4px 10px; display: block;">
+          #{h item.title_text}
+        </p>
+      } %>
+    </description>
+    <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/layouts/comic.html.erb

@@ -13,7 +13,7 @@
 
 <% content_for :content do %>
   <% Cartoonist::Entity.hooks_with(:show_entity_before_partial).each do |hook| %>
-    <%= render :partial => hook.show_entity_before_partial, :locals => { :entity => @comic } %>
+    <%= partial hook.show_entity_before_partial, :entity => @comic %>
     <hr />
   <% end %>
 
@@ -70,7 +70,7 @@
   </div>
 
   <% Cartoonist::Entity.hooks_with(:show_entity_after_partial).each do |hook| %>
-    <%= render :partial => hook.show_entity_after_partial, :locals => { :entity => @comic } %>
+    <%= partial hook.show_entity_after_partial, :entity => @comic %>
     <hr />
   <% end %>
 <% end %>

data/lib/cartoonist-comics/engine.rb

@@ -34,6 +34,7 @@ module CartoonistComics
         collection do
           get "random"
           get "feed", :defaults => { :format => "rss" }
+          get "mfeed", :defaults => { :format => "rss" }
         end
       end
 

data/lib/cartoonist-comics/version.rb

@@ -2,7 +2,7 @@ module CartoonistComics
   class Version
     class << self
       def to_s
-        "0.0.16"
+        "0.0.17"
       end
     end
   end

metadata

@@ -1,37 +1,38 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cartoonist-comics
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.17
   prerelease: 
-  version: 0.0.16
 platform: ruby
-authors: 
+authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cartoonist
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.0.16
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.17
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.17
 description: This core plugin for Cartoonist adds comics.
 email: reasonnumber@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - app/controllers/admin/comic_controller.rb
 - app/controllers/comic_controller.rb
 - app/helpers/admin/comic_helper.rb
@@ -42,6 +43,7 @@ files:
 - app/views/admin/comic/index.html.erb
 - app/views/admin/comic/new.html.erb
 - app/views/comic/feed.rss.erb
+- app/views/comic/mfeed.rss.erb
 - app/views/comic/show.html.erb
 - app/views/layouts/admin/comic.html.erb
 - app/views/layouts/comic.html.erb
@@ -54,30 +56,26 @@ files:
 - lib/cartoonist-comics/version.rb
 homepage: http://reasonnumber.com/cartoonist
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Cartoonist Comics
 test_files: []
-