cartoonist-comics 0.0.8 → 0.0.9

data/app/controllers/{comic_admin_controller.rb → admin/comic_controller.rb}

@@ -1,4 +1,4 @@
-class ComicAdminController < CartoonistController
+class Admin::ComicController < CartoonistController
   helper :comic
   before_filter :preview!, :only => [:preview, :preview_random]
   before_filter :ensure_ssl!
@@ -14,11 +14,11 @@ class ComicAdminController < CartoonistController
       format.html do
         if params[:id].present?
           begin
-            return redirect_to "/comic_admin/1/preview" if params[:id].to_i < 1
+            return redirect_to "/admin/comic/1/preview" if params[:id].to_i < 1
             @comic = Comic.from_number params[:id]
             @disabled_next = @comic.maybe_newest?
           rescue
-            return redirect_to "/comic_admin/preview"
+            return redirect_to "/admin/comic/preview"
           end
         else
           @comic = Comic.preview_current
@@ -37,7 +37,7 @@ class ComicAdminController < CartoonistController
   end
 
   def preview_random
-    redirect_to "/comic_admin/#{rand(max_preview_comic) + 1}/preview"
+    redirect_to "/admin/comic/#{rand(max_preview_comic) + 1}/preview"
   end
 
   def new
@@ -50,11 +50,11 @@ class ComicAdminController < CartoonistController
   def create
     unless params[:image]
       flash[:message] = "Error: You must include an image when creating a new comic."
-      return redirect_to "/comic_admin/new"
+      return redirect_to "/admin/comic/new"
     end
 
     comic = Comic.create_comic params
-    redirect_to "/comic_admin/#{comic.number}/edit"
+    redirect_to "/admin/comic/#{comic.number}/edit"
   end
 
   def edit
@@ -62,24 +62,24 @@ class ComicAdminController < CartoonistController
     @edit_last_number = @comic.number - 1
     @edit_next_number = @comic.number + 1
   rescue ActiveRecord::RecordNotFound
-    redirect_to "/comic_admin/new"
+    redirect_to "/admin/comic/new"
   end
 
   def lock
     comic = Comic.from_number params[:id].to_i
     comic.lock!
-    redirect_to "/comic_admin/#{comic.number}/edit"
+    redirect_to "/admin/comic/#{comic.number}/edit"
   end
 
   def unlock
     comic = Comic.from_number params[:id].to_i
     comic.unlock!
-    redirect_to "/comic_admin/#{comic.number}/edit"
+    redirect_to "/admin/comic/#{comic.number}/edit"
   end
 
   def update
     comic = Comic.update_comic params
-    redirect_to "/comic_admin/#{comic.number}/edit"
+    redirect_to "/admin/comic/#{comic.number}/edit"
   end
 
   private

data/app/helpers/{comic_admin_helper.rb → admin/comic_helper.rb}

@@ -1,4 +1,4 @@
-module ComicAdminHelper
+module Admin::ComicHelper
   def lock_toggle_target
     if @comic.locked
       "unlock"

data/app/helpers/comic_helper.rb

@@ -1,7 +1,7 @@
 module ComicHelper
   def comic_current_url
     if preview?
-      "/comic_admin/preview"
+      "/admin/comic/preview"
     else
       "/comic"
     end
@@ -9,7 +9,7 @@ module ComicHelper
 
   def comic_url(number)
     if preview?
-      "/comic_admin/#{number}/preview"
+      "/admin/comic/#{number}/preview"
     else
       "/comic/#{number}"
     end
@@ -25,7 +25,7 @@ module ComicHelper
 
   def random_url
     if preview?
-      "/comic_admin/preview_random"
+      "/admin/comic/preview_random"
     else
       "/comic/random"
     end

data/app/models/comic.rb

@@ -1,7 +1,21 @@
 class Comic < ActiveRecord::Base
-  attr_accessible :number, :posted_at, :title, :description, :scene_description, :dialogue, :title_text, :database_file_id, :database_file, :tweet, :tweeted_at, :locked
+  include Postable
+  include Entity
+  entity_type :comic
+  entity_global_url "/comic"
+  entity_url &:url
+  entity_edit_url &:edit_url
+  entity_description &:title
+  attr_accessible :number, :posted_at, :title, :description, :scene_description, :dialogue, :title_text, :database_file_id, :database_file, :locked
   belongs_to :database_file
-  include Tweetable
+
+  def url
+    "/comic/#{number}"
+  end
+
+  def edit_url
+    "/admin/comic/#{number}/edit"
+  end
 
   def lock!
     self.locked = true
@@ -13,18 +27,6 @@ class Comic < ActiveRecord::Base
     save!
   end
 
-  def expected_tweet_time
-    Time.local posted_at.year, posted_at.month, posted_at.day, 8, 0
-  end
-
-  def formatted_posted_at(default_msg = "not yet posted")
-    if posted_at
-      posted_at.strftime "%-m/%-d/%Y"
-    else
-      default_msg
-    end
-  end
-
   def real?
     number
   end
@@ -51,16 +53,12 @@ class Comic < ActiveRecord::Base
     end
   end
 
-  def absolute_url
-    "http://#{Setting[:domain]}/comic/#{number}"
-  end
-
   def img_url
     "/comic/#{number}.png"
   end
 
   def preview_img_url
-    "/comic_admin/#{number}/preview.png"
+    "/admin/comic/#{number}/preview.png"
   end
 
   def absolute_img_url
@@ -76,7 +74,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], :tweet => params[:tweet], :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(:content => params[:image].read), :locked => true
     end
 
     def update_comic(params)
@@ -87,7 +85,6 @@ class Comic < ActiveRecord::Base
       comic.scene_description = params[:scene_description]
       comic.dialogue = params[:dialogue]
       comic.title_text = params[:title_text]
-      comic.tweet = params[:tweet] unless comic.tweeted?
       comic.locked = true
       comic.database_file = DatabaseFile.create(:content => params[:image].read) if params[:image]
       comic.save!
@@ -122,18 +119,6 @@ class Comic < ActiveRecord::Base
       preview_current.number
     end
 
-    def untweeted
-      posted.where(:tweeted_at => nil).all
-    end
-
-    def posted
-      where "comics.posted_at <= ?", Date.today
-    end
-
-    def unposted
-      where "comics.posted_at > ?", Date.today
-    end
-
     def reverse_numerical
       order "comics.number DESC"
     end

data/app/views/{comic_admin → admin/comic}/edit.html.erb

@@ -1,10 +1,15 @@
+<% Cartoonist::Entity.hooks_with(:edit_entity_before_partial).each do |hook| %>
+  <%= render :partial => hook.edit_entity_before_partial, :locals => { :entity => @comic } %>
+  <hr />
+<% end %>
+
 <p>
-  <%= form_tag "/comic_admin/#{@comic.number}/#{lock_toggle_target}", :method => :post do %>
+  <%= form_tag "/admin/comic/#{@comic.number}/#{lock_toggle_target}", :method => :post do %>
     <input type="submit" value="<%= lock_toggle_target %>" />
   <% end %>
 </p>
 
-<%= form_tag "/comic_admin/#{@comic.number}", :method => :put, :multipart => true do %>
+<%= form_tag "/admin/comic/#{@comic.number}", :method => :put, :multipart => true do %>
   <table>
     <tr><td colspan="2">Comic: <%= @comic.number %></td></tr>
     <tr><td colspan="2">Post Date: <%= @comic.posted_at.strftime "%a, %-m/%-d/%Y" %></td></tr>
@@ -38,17 +43,6 @@
       </td>
     </tr>
 
-    <tr>
-      <td colspan="2">
-        Tweet:
-        <% if @comic.tweeted_at %>
-          <em>(sent <%= @comic.tweeted_at.strftime "%-m/%-d/%Y %-l:%M %P" %>)</em>
-        <% end %>
-        <br />
-        <textarea name="tweet" rows="2" cols="100" tabindex="6" <%= lock_disabled %>><%= @comic.tweet %></textarea>
-      </td>
-    </tr>
-
     <tr>
       <td colspan="2">
         Image:<br />
@@ -68,3 +62,8 @@
   Current Image:<br />
   <img src="<%= @comic.preview_img_url %>" />
 </p>
+
+<% Cartoonist::Entity.hooks_with(:edit_entity_after_partial).each do |hook| %>
+  <hr />
+  <%= render :partial => hook.edit_entity_after_partial, :locals => { :entity => @comic } %>
+<% end %>

data/app/views/{comic_admin → admin/comic}/index.html.erb

@@ -4,8 +4,8 @@
   <% @unposted.each do |comic| %>
     <li>
       <%= 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="/admin/comic/<%= comic.number %>/edit"><%= comic.title %></a>
+      (<a href="/admin/comic/<%= comic.number %>/preview"><%= t "admin.comic.index.preview" %></a>)
     </li>
   <% end %>
 </ul>
@@ -16,8 +16,8 @@
   <% @posted.each do |comic| %>
     <li>
       <%= 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="/admin/comic/<%= comic.number %>/edit"><%= comic.title %></a>
+      (<a href="/admin/comic/<%= comic.number %>/preview"><%= t "admin.comic.index.preview" %></a>)
       (<a href="/comic/<%= comic.number %>"><%= t "admin.comic.index.show" %></a>)
     </li>
   <% end %>

data/app/views/{comic_admin → admin/comic}/new.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag "/comic_admin", :method => :post, :multipart => true do %>
+<%= form_tag "/admin/comic", :method => :post, :multipart => true do %>
   <table>
     <tr><td colspan="2">Comic: <%= @next_number %></td></tr>
     <tr><td colspan="2">Post Date: <%= @next_post_date.strftime "%a, %-m/%-d/%Y" %></td></tr>
@@ -32,13 +32,6 @@
       </td>
     </tr>
 
-    <tr>
-      <td colspan="2">
-        Tweet:<br />
-        <textarea name="tweet" rows="2" cols="100" tabindex="6"><%= SimpleTemplate[Setting[:default_tweet], :next_number => @next_number] %></textarea>
-      </td>
-    </tr>
-
     <tr>
       <td colspan="2">
         Image:<br />

data/app/views/layouts/{comic_admin.html.erb → admin/comic.html.erb}

@@ -1,14 +1,14 @@
 <% content_for :subtabs do %>
   <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>
+  <a class="subtab" href="/admin/comic"><%= t "admin.comic.layout.list" %></a>
+  <a class="subtab" href="/admin/comic/new"><%= t "admin.comic.layout.new" %></a>
   <% if @edit_last_number && @edit_last_number > 0 %>
-    <a class="subtab" href="/comic_admin/<%= @edit_last_number %>/edit"><%= t "admin.comic.layout.edit_last" %></a>
+    <a class="subtab" href="/admin/comic/<%= @edit_last_number %>/edit"><%= t "admin.comic.layout.edit_last" %></a>
   <% end %>
   <% if @edit_next_number %>
-    <a class="subtab" href="/comic_admin/<%= @edit_next_number %>/edit"><%= t "admin.comic.layout.edit_next" %></a>
+    <a class="subtab" href="/admin/comic/<%= @edit_next_number %>/edit"><%= t "admin.comic.layout.edit_next" %></a>
   <% end %>
-  <a class="subtab" href="/comic_admin/preview"><%= t "admin.comic.layout.preview" %></a>
+  <a class="subtab" href="/admin/comic/preview"><%= t "admin.comic.layout.preview" %></a>
 <% end %>
 
 <% content_for :page_title, t("admin.comic.layout.section") %>

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

@@ -4,9 +4,9 @@
 
 <% content_for :small_buttons do %>
   <% if @comic.real? %>
-    <a class="facebook" href="https://www.facebook.com/sharer.php?u=<%= u @comic.absolute_url %>&t=<%= u t("comic.layout.facebook_text_message", :title => @comic.title) %>" title="<%= t "comic.layout.facebook_title" %>"><%= t "comic.layout.facebook" %></a>
-    <a class="twitter" href="https://twitter.com/intent/tweet?source=<%= u Setting[:domain] %>&text=<%= u t("comic.layout.twitter_text_message", :title => @comic.title, :url => @comic.absolute_url) %>" title="<%= t "comic.layout.twitter_title" %>"><%= t "comic.layout.twitter" %></a>
-    <a class="google-plus" href="https://plus.google.com/share?url=<%= u @comic.absolute_url %>" title="<%= t "comic.layout.google_plus_title" %>"><%= t "comic.layout.google_plus" %></a>
+    <a class="facebook" href="https://www.facebook.com/sharer.php?u=<%= u @comic.entity_absolute_url %>&t=<%= u t("comic.layout.facebook_text_message", :title => @comic.title) %>" title="<%= t "comic.layout.facebook_title" %>"><%= t "comic.layout.facebook" %></a>
+    <a class="twitter" href="https://twitter.com/intent/tweet?source=<%= u Setting[:domain] %>&text=<%= u t("comic.layout.twitter_text_message", :title => @comic.title, :url => @comic.entity_absolute_url) %>" title="<%= t "comic.layout.twitter_title" %>"><%= t "comic.layout.twitter" %></a>
+    <a class="google-plus" href="https://plus.google.com/share?url=<%= u @comic.entity_absolute_url %>" title="<%= t "comic.layout.google_plus_title" %>"><%= t "comic.layout.google_plus" %></a>
     <a class="rss" href="<%= rss_path %>" title="<%= rss_title %>"><%= t "comic.layout.rss" %></a>
   <% end %>
 <% end %>

data/config/locales/en.yml

@@ -18,6 +18,8 @@ en:
       tab:
         comics: Comics
   cartoonist:
+    entity:
+      comic: Comic
     layout:
       navigation:
         comic: Comic

data/db/migrate/20120107035512_create_comics.rb

@@ -9,8 +9,6 @@ class CreateComics < ActiveRecord::Migration
       t.text :dialogue, :null => false
       t.text :title_text, :null => false
       t.integer :database_file_id, :null => false
-      t.string :tweet, :null => false
-      t.datetime :tweeted_at
       t.boolean :locked, :default => false, :null => false
       t.timestamps
     end

data/lib/cartoonist-comics/engine.rb

@@ -1,8 +1,9 @@
 module CartoonistComics
   class Engine < ::Rails::Engine
-    Cartoonist::Admin::Tab.add :comics, :url => "/comic_admin", :order => 0
+    Cartoonist::Entity.add :comic, "Comic"
+    Cartoonist::Admin::Tab.add :comics, :url => "/admin/comic", :order => 0
     Cartoonist::RootPath.add :comics, "comic#index"
-    Cartoonist::Navigation::Link.add :url => "/comic", :preview_url => "/comic_admin/preview", :class => "comic", :label => "cartoonist.layout.navigation.comic", :order => 0
+    Cartoonist::Navigation::Link.add :url => "/comic", :preview_url => "/admin/comic/preview", :class => "comic", :label => "cartoonist.layout.navigation.comic", :order => 0
     Cartoonist::Migration.add_for self
 
     Cartoonist::Backup.for :comics do
@@ -32,16 +33,18 @@ module CartoonistComics
         end
       end
 
-      resources :comic_admin do
-        member do
-          post "lock"
-          get "preview"
-          post "unlock"
-        end
-
-        collection do
-          get "preview"
-          get "preview_random"
+      namespace :admin do
+        resources :comic do
+          member do
+            post "lock"
+            get "preview"
+            post "unlock"
+          end
+
+          collection do
+            get "preview"
+            get "preview_random"
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist-comics
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cartoonist
-  requirement: &19861160 !ruby/object:Gem::Requirement
+  requirement: &6936700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *19861160
+  version_requirements: *6936700
 description: This core plugin for Cartoonist adds comics.
 email: reasonnumber@gmail.com
 executables: []
@@ -29,19 +29,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- app/controllers/comic_admin_controller.rb
+- app/controllers/admin/comic_controller.rb
 - app/controllers/comic_controller.rb
-- app/helpers/comic_admin_helper.rb
+- app/helpers/admin/comic_helper.rb
 - app/helpers/comic_helper.rb
 - app/models/comic.rb
 - app/models/comic_feed.rb
+- app/views/admin/comic/edit.html.erb
+- app/views/admin/comic/index.html.erb
+- app/views/admin/comic/new.html.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
-- app/views/comic_admin/new.html.erb
+- app/views/layouts/admin/comic.html.erb
 - app/views/layouts/comic.html.erb
-- app/views/layouts/comic_admin.html.erb
 - cartoonist-comics.gemspec
 - config/locales/en.yml
 - db/migrate/20120107035512_create_comics.rb