cartoonist-pages 0.0.8 → 0.0.9

data/app/controllers/{page_admin_controller.rb → admin/page_controller.rb}

@@ -1,4 +1,4 @@
-class PageAdminController < CartoonistController
+class Admin::PageController < CartoonistController
   before_filter :preview!, :only => [:preview]
   before_filter :ensure_ssl!
   before_filter :check_admin!
@@ -21,13 +21,13 @@ class PageAdminController < CartoonistController
     path = params[:path].downcase
     raise "Invalid path" unless path =~ /^[-_a-z0-9]+$/
     page = Page.create :title => params[:title], :path => path, :content => params[:content], :locked => true
-    redirect_to "/page_admin/#{page.id}/edit"
+    redirect_to "/admin/page/#{page.id}/edit"
   end
 
   def edit
     @page = Page.find params[:id].to_i
   rescue ActiveRecord::RecordNotFound
-    redirect_to "/page_admin/new"
+    redirect_to "/admin/page/new"
   end
 
   def update
@@ -49,20 +49,20 @@ class PageAdminController < CartoonistController
     end
 
     page.save!
-    redirect_to "/page_admin/#{page.id}/edit"
+    redirect_to "/admin/page/#{page.id}/edit"
   end
 
   def lock
     page = Page.find params[:id].to_i
     page.locked = true
     page.save!
-    redirect_to "/page_admin/#{page.id}/edit"
+    redirect_to "/admin/page/#{page.id}/edit"
   end
 
   def unlock
     page = Page.find params[:id].to_i
     page.locked = false
     page.save!
-    redirect_to "/page_admin/#{page.id}/edit"
+    redirect_to "/admin/page/#{page.id}/edit"
   end
 end

data/app/helpers/{page_admin_helper.rb → admin/page_helper.rb}

@@ -1,4 +1,4 @@
-module PageAdminHelper
+module Admin::PageHelper
   def lock_toggle_target
     if @page.locked
       "unlock"

data/app/models/page.rb

@@ -1,6 +1,20 @@
 class Page < ActiveRecord::Base
+  include Postable
+  include Entity
+  entity_type :page
+  entity_url &:url
+  entity_edit_url &:edit_url
+  entity_description &:title
   attr_accessible :title, :path, :posted_at, :content, :locked, :comments, :in_sitemap
 
+  def url
+    "/#{path}"
+  end
+
+  def edit_url
+    "/admin/page/#{id}/edit"
+  end
+
   def has_comments?
     comments
   end
@@ -18,14 +32,6 @@ class Page < ActiveRecord::Base
       where :in_sitemap => true
     end
 
-    def posted
-      where "posted_at IS NOT NULL"
-    end
-
-    def unposted
-      where "posted_at IS NULL"
-    end
-
     def ordered
       order "pages.title ASC"
     end

data/app/views/{page_admin → admin/page}/edit.html.erb

@@ -1,14 +1,19 @@
+<% Cartoonist::Entity.hooks_with(:edit_entity_before_partial).each do |hook| %>
+  <%= render :partial => hook.edit_entity_before_partial, :locals => { :entity => @page } %>
+  <hr />
+<% end %>
+
 <p>
-  <a href="/page_admin/<%= @page.path %>/preview">Preview this page</a>
+  <a href="/admin/page/<%= @page.path %>/preview">Preview this page</a>
 </p>
 
 <p>
-  <%= form_tag "/page_admin/#{@page.id}/#{lock_toggle_target}", :method => :post do %>
+  <%= form_tag "/admin/page/#{@page.id}/#{lock_toggle_target}", :method => :post do %>
     <input type="submit" value="<%= lock_toggle_target %>" />
   <% end %>
 </p>
 
-<%= form_tag "/page_admin/#{@page.id}", :method => :put do %>
+<%= form_tag "/admin/page/#{@page.id}", :method => :put do %>
   <p>
     <label>
       <input type="checkbox" name="posted" value="true" <%= checked="checked".html_safe if @page.posted_at %> <%= lock_disabled %> />
@@ -65,7 +70,7 @@
     $(".preview-content").click(function() {
       var $this = $(this).attr("disabled", "disabled");
       $.ajax({
-        url: "/page_admin/preview_content",
+        url: "/admin/page/preview_content",
         type: "post",
         data: {
           authenticity_token: $("form input[name='authenticity_token']").val(),
@@ -85,3 +90,8 @@
     });
   });
 <% end %>
+
+<% Cartoonist::Entity.hooks_with(:edit_entity_after_partial).each do |hook| %>
+  <hr />
+  <%= render :partial => hook.edit_entity_after_partial, :locals => { :entity => @page } %>
+<% end %>

data/app/views/{page_admin → admin/page}/index.html.erb

@@ -3,8 +3,8 @@
 <ul>
   <% @unposted.each do |page| %>
     <li>
-      <a href="/page_admin/<%= page.id %>/edit"><%= page.title %></a>
-      (<a href="/page_admin/<%= page.path %>/preview"><%= t "admin.page.index.preview" %></a>)
+      <a href="/admin/page/<%= page.id %>/edit"><%= page.title %></a>
+      (<a href="/admin/page/<%= page.path %>/preview"><%= t "admin.page.index.preview" %></a>)
     </li>
   <% end %>
 </ul>
@@ -14,8 +14,8 @@
 <ul>
   <% @posted.each do |page| %>
     <li>
-      <a href="/page_admin/<%= page.id %>/edit"><%= page.title %></a>
-      (<a href="/page_admin/<%= page.path %>/preview"><%= t "admin.page.index.preview" %></a>)
+      <a href="/admin/page/<%= page.id %>/edit"><%= page.title %></a>
+      (<a href="/admin/page/<%= page.path %>/preview"><%= t "admin.page.index.preview" %></a>)
       (<a href="/<%= page.path %>"><%= t "admin.page.index.show" %></a>)
     </li>
   <% end %>

data/app/views/{page_admin → admin/page}/new.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag "/page_admin", :method => :post do %>
+<%= form_tag "/admin/page", :method => :post do %>
   <p>
     Path: <input type="text" name="path" autofocus="autofocus" size="20" /><br />
   </p>
@@ -29,7 +29,7 @@
     $(".preview-content").click(function() {
       var $this = $(this).attr("disabled", "disabled");
       $.ajax({
-        url: "/page_admin/preview_content",
+        url: "/admin/page/preview_content",
         type: "post",
         data: {
           authenticity_token: $("form input[name='authenticity_token']").val(),

data/app/views/layouts/{page_admin.html.erb → admin/page.html.erb}

@@ -1,6 +1,6 @@
 <% content_for :subtabs do %>
-  <a class="subtab" href="/page_admin"><%= t "admin.page.layout.list" %></a>
-  <a class="subtab" href="/page_admin/new"><%= t "admin.page.layout.new" %></a>
+  <a class="subtab" href="/admin/page"><%= t "admin.page.layout.list" %></a>
+  <a class="subtab" href="/admin/page/new"><%= t "admin.page.layout.new" %></a>
 <% end %>
 
 <% content_for :page_title, t("admin.page.layout.section") %>

data/config/locales/en.yml

@@ -13,3 +13,6 @@ en:
         list: List
         new: New Page
         section: Pages
+  cartoonist:
+    entity:
+      page: Page

data/lib/cartoonist-pages/engine.rb

@@ -1,6 +1,7 @@
 module CartoonistPages
   class Engine < ::Rails::Engine
-    Cartoonist::Admin::Tab.add :pages, :url => "/page_admin", :order => 2
+    Cartoonist::Entity.add :page, "Page"
+    Cartoonist::Admin::Tab.add :pages, :url => "/admin/page", :order => 2
     Cartoonist::Migration.add_for self
 
     Cartoonist::Backup.for :pages do
@@ -9,7 +10,7 @@ module CartoonistPages
 
     Cartoonist::Sitemap.add do
       Page.sitemap.map do |page|
-        SitemapEntry.new "/#{page.path}", page.posted_at, :monthly, "0.4"
+        SitemapEntry.new page.entity_relative_url, page.posted_at, :monthly, "0.4"
       end
     end
 
@@ -18,17 +19,19 @@ module CartoonistPages
     end
 
     Cartoonist::Routes.add do
-      resources :page_admin do
-        member do
-          post "lock"
-          post "post"
-          get "preview"
-          post "unlock"
-          post "unpost"
-        end
+      namespace :admin do
+        resources :page do
+          member do
+            post "lock"
+            post "post"
+            get "preview"
+            post "unlock"
+            post "unpost"
+          end
 
-        collection do
-          post "preview_content"
+          collection do
+            post "preview_content"
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist-pages
 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: &8217840 !ruby/object:Gem::Requirement
+  requirement: &13672880 !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: *8217840
+  version_requirements: *13672880
 description: This core plugin for Cartoonist adds arbitrary pages.
 email: reasonnumber@gmail.com
 executables: []
@@ -29,16 +29,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- app/controllers/page_admin_controller.rb
+- app/controllers/admin/page_controller.rb
 - app/controllers/page_controller.rb
-- app/helpers/page_admin_helper.rb
+- app/helpers/admin/page_helper.rb
 - app/models/page.rb
+- app/views/admin/page/edit.html.erb
+- app/views/admin/page/index.html.erb
+- app/views/admin/page/new.html.erb
+- app/views/layouts/admin/page.html.erb
 - app/views/layouts/page.html.erb
-- app/views/layouts/page_admin.html.erb
 - app/views/page/show.html.erb
-- app/views/page_admin/edit.html.erb
-- app/views/page_admin/index.html.erb
-- app/views/page_admin/new.html.erb
 - cartoonist-pages.gemspec
 - config/locales/en.yml
 - db/migrate/20120316072549_create_pages.rb