cartoonist-pages 0.0.16 → 0.0.17

data/app/controllers/admin/page_controller.rb

@@ -16,9 +16,7 @@ class Admin::PageController < AdminCartoonistController
   end
 
   def create
-    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
+    page = Page.create_page params
     redirect_to "/admin/page/#{page.id}/edit"
   end
 
@@ -29,38 +27,19 @@ class Admin::PageController < AdminCartoonistController
   end
 
   def update
-    path = params[:path].downcase
-    raise "Invalid path" unless path =~ /^[-_a-z0-9]+$/
-    page = Page.find params[:id].to_i
-    raise "Cannot update locked page!" if page.locked
-    page.title = params[:title]
-    page.path = path
-    page.content = params[:content]
-    page.locked = true
-    page.comments = !!params[:comments]
-    page.in_sitemap = !!params[:in_sitemap]
-
-    if params[:posted]
-      page.posted_at = Date.today
-    else
-      page.posted_at = nil
-    end
-
-    page.save!
+    page = Page.update_page params
     redirect_to "/admin/page/#{page.id}/edit"
   end
 
   def lock
     page = Page.find params[:id].to_i
-    page.locked = true
-    page.save!
+    page.lock!
     redirect_to "/admin/page/#{page.id}/edit"
   end
 
   def unlock
     page = Page.find params[:id].to_i
-    page.locked = false
-    page.save!
+    page.unlock!
     redirect_to "/admin/page/#{page.id}/edit"
   end
 end

data/app/helpers/admin/page_helper.rb

@@ -1,16 +1,6 @@
 module Admin::PageHelper
-  def lock_toggle_target
-    if @page.locked
-      "unlock"
-    else
-      "lock"
-    end
-  end
-
   def lock_disabled
-    if @page.locked
-      'disabled="disabled"'.html_safe
-    end
+    @page.lock_disabled_html
   end
 
   def format_posted_at(fmt)

data/app/models/page.rb

@@ -1,6 +1,7 @@
 class Page < ActiveRecord::Base
   include Postable
   include Entity
+  include Lockable
   entity_type :page
   entity_url &:url
   entity_preview_url &:preview_url
@@ -35,6 +36,34 @@ class Page < ActiveRecord::Base
   end
 
   class << self
+    def create_page(params)
+      path = params[:path].downcase
+      raise "Invalid path" unless path =~ /^[-_a-z0-9]+$/
+      Page.create :title => params[:title], :path => path, :content => params[:content], :locked => true
+    end
+
+    def update_page(params)
+      path = params[:path].downcase
+      raise "Invalid path" unless path =~ /^[-_a-z0-9]+$/
+      page = Page.find params[:id].to_i
+      page.ensure_unlocked!
+      page.title = params[:title]
+      page.path = path
+      page.content = params[:content]
+      page.locked = true
+      page.comments = !!params[:comments]
+      page.in_sitemap = !!params[:in_sitemap]
+
+      if params[:posted]
+        page.posted_at = Date.today
+      else
+        page.posted_at = nil
+      end
+
+      page.save!
+      page
+    end
+
     def search(query)
       ordered.where "LOWER(title) LIKE :query OR LOWER(path) LIKE :query OR LOWER(content) LIKE :query", :query => "%#{query.downcase}%"
     end

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

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

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

@@ -2,7 +2,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 => @page } %>
+    <%= partial hook.show_entity_before_partial, :entity => @page %>
     <hr />
   <% end %>
 
@@ -13,7 +13,7 @@
   </div>
 
   <% Cartoonist::Entity.hooks_with(:show_entity_after_partial).each do |hook| %>
-    <%= render :partial => hook.show_entity_after_partial, :locals => { :entity => @page } %>
+    <%= partial hook.show_entity_after_partial, :entity => @page %>
     <hr />
   <% end %>
 <% end %>

data/lib/cartoonist-pages/version.rb

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

metadata

@@ -1,48 +1,54 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cartoonist-pages
-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: jquery-rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.1.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cartoonist
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.4
+- !ruby/object:Gem::Dependency
+  name: cartoonist
+  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: *id002
+  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 arbitrary pages.
 email: reasonnumber@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - app/assets/javascripts/admin/page.js.coffee
 - app/controllers/admin/page_controller.rb
 - app/controllers/page_controller.rb
@@ -62,30 +68,26 @@ files:
 - lib/cartoonist-pages/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 Pages
 test_files: []
-