beef-pages 0.3.5 → 0.3.6

data/Rakefile

@@ -4,14 +4,14 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "pages"
+    gem.name = "beef-pages"
     gem.summary = %Q{Pages engine}
     gem.email = "steve@wearebeef.co.uk"
     gem.homepage = "http://github.com/stengland/pages"
     gem.authors = ["Steve England"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
-
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/app/models/page.rb

@@ -15,6 +15,12 @@ class Page < ActiveRecord::Base
   validates_presence_of :title
   validates_presence_of :body, :tag_list, :description, :if => :publish
   
+  LOCK_LEVEL_DELETE = 1
+  LOCK_LEVEL_PERMALINK = 2
+  LOCK_LEVEL_TEMPLATE = 3
+  LOCK_LEVEL_SUBPAGE = 4
+  LOCK_LEVEL_TITLE = 5  
+  
   def first_child?
     self == self.self_and_siblings.first
   end
@@ -43,8 +49,19 @@ class Page < ActiveRecord::Base
     read_attribute(:lock_level) || 0
   end
 
+  def permalink=(permalink)
+    unless permalink.blank? || lock_level >= LOCK_LEVEL_PERMALINK
+      write_attribute :permalink, permalink.parameterize
+      @permalink_written = true
+    end
+  end
+
   private
 
+  def set_url
+    write_attribute :permalink, title.parameterize      unless permalink_written or !title_changed? || lock_level >= LOCK_LEVEL_PERMALINK
+  end
+
   # takes a given array of pages and recursively (or not) reindexes
   # if departing_child is supplied, it is removed from the array so 
   # that former siblings are reindexed as though it was already 

data/app/views/admin/pages/_page.html.erb

@@ -7,9 +7,10 @@
       <td class="date"><%= page.published_at.to_formatted_s(:short) unless page.published_at.nil? %></td>
       <td class="date"><%= page.published_to.to_formatted_s(:short) unless page.published_to.nil? %></td>
       <td class="action"><%= link_to 'Show', page_path(page.permalink), :class => 'show' if page.published? %></td>
-      <td class="action"><%= link_to 'Add page', new_admin_page_page_path(page), :class => 'add', :title => "Add a sub-page under #{page.title}" %></td>
+      <td class="action"><%= link_to 'Add page', new_admin_page_page_path(page), :class => 'add', :title => "Add a sub-page under #{page.title}" unless page.lock_level >= Page::LOCK_LEVEL_SUBPAGE %></td>
+      <% logger.debug Page::LOCK_LEVEL_SUBPAGE.inspect %>
       <td class="action"><%= link_to 'Edit', [:admin, page], :class => 'edit' %></td>
-      <td class="action"><%= link_to('Destroy', admin_page_path(page), :confirm => 'Are you sure?', :method => :delete, :class => 'delete') unless page.lock_level >=1 || !current_user.admin? %></td>
-      <td class="action"><%= link_to 'up', move_up_admin_page_path(page), { :class => "page_up" } if current_user.admin? && !page.first? %></td>
-      <td class="action"><%= link_to 'down', move_down_admin_page_path(page), { :class => 'page_down' } if current_user.admin? && !page.last? %></td>
+      <td class="action"><%= link_to('Destroy', admin_page_path(page), :confirm => 'Are you sure?', :method => :delete, :class => 'delete') unless page.lock_level >= Page::LOCK_LEVEL_DELETE %></td>
+      <td class="action"><%= link_to 'up', move_up_admin_page_path(page), { :class => "page_up" } unless page.first? %></td>
+      <td class="action"><%= link_to 'down', move_down_admin_page_path(page), { :class => 'page_down' } unless page.last? %></td>
     </tr>

data/app/views/admin/pages/index.html.erb

@@ -2,7 +2,7 @@
 
 <ul class="choices">
 <% unless @parent.nil? %>
-  <li><%= link_to 'New page', new_admin_page_page_path(@parent), :class => "button", :title => "Add a sub-page under #{@parent.title}" %></li>
+  <%= "<li>#{link_to 'New page', new_admin_page_page_path(@parent), :class => 'button', :title => "Add a sub-page under #{@parent.title}"}</li>" unless  @parent.lock_level >= Page::LOCK_LEVEL_SUBPAGE %>
 <%   if @parent.parent.nil? %>
   <li><%= link_to "All top pages", admin_pages_path(), :class => "up button" %></li>
 <%   else %>

data/app/views/admin/pages/show.html.erb

@@ -10,7 +10,7 @@
 
   <%= f.hidden_field :parent_id %>
   
-<% if @page.lock_level < 3 %>
+<% if @page.lock_level < Page::LOCK_LEVEL_TITLE %>
   <p>
     <%= f.label :title, 'Title*' %><br/>
     <%= f.text_field :title, :class => 'title' %>
@@ -22,7 +22,7 @@
   </p>
 <% end %>
 
-<% if @page.lock_level < 2 %>
+<% if @page.lock_level < Page::LOCK_LEVEL_PERMALINK %>
   <p>
     <%= f.label :permalink, "URL" %><br/>
     <%= root_url %><%= f.text_field :permalink %>
@@ -45,14 +45,14 @@
     <%= f.text_field :tag_list, :class => 'long' %>
   </p>
   
-  <% if @page.lock_level < 3 %>
+  <% if @page.lock_level < Page::LOCK_LEVEL_TEMPLATE %>
   <p>
     <%= f.label :template %>
     <%= f.select :template, get_template_names.collect{|t| [ t.titleize, t ] } %>
   </p>
   <% else %>
   <p>
-    <%= f.label :template %>
+    <%= f.label :template %> <%= @page.template.titleize %>
     (locked)
   </p>
   <% end %>
@@ -68,7 +68,7 @@
     <%= preview_link(@page) %>
     <%= f.submit 'Publish', :name => 'page[publish]' %>
     <%= f.submit 'Save as draft', :name => 'page[hide]' %>
-    or <%= link_to 'Cancel', admin_articles_path %>
+    or <%= link_to 'Cancel', admin_pages_path %>
   </p>
 
 <% end %>

data/{pages.gemspec → beef-pages.gemspec}

@@ -4,12 +4,12 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{pages}
-  s.version = "0.3.5"
+  s.name = %q{beef-pages}
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-09-25}
+  s.date = %q{2009-10-30}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -31,13 +31,13 @@ Gem::Specification.new do |s|
      "app/views/admin/pages/preview.rjs",
      "app/views/admin/pages/show.html.erb",
      "app/views/pages/_naviagtion.html.erb",
+     "beef-pages.gemspec",
      "config/routes.rb",
      "generators/page_tempate/page_template_generator.rb",
      "generators/page_tempate/templates/default.html.erb",
      "generators/pages_migration/pages_migration_generator.rb",
      "generators/pages_migration/templates/migration.rb",
      "lib/pages.rb",
-     "pages.gemspec",
      "test/pages_test.rb",
      "test/test_helper.rb"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-pages
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-25 00:00:00 -07:00
+date: 2009-10-30 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -38,18 +38,19 @@ files:
 - app/views/admin/pages/preview.rjs
 - app/views/admin/pages/show.html.erb
 - app/views/pages/_naviagtion.html.erb
+- beef-pages.gemspec
 - config/routes.rb
 - generators/page_tempate/page_template_generator.rb
 - generators/page_tempate/templates/default.html.erb
 - generators/pages_migration/pages_migration_generator.rb
 - generators/pages_migration/templates/migration.rb
 - lib/pages.rb
-- pages.gemspec
 - test/pages_test.rb
 - test/test_helper.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/stengland/pages
-licenses: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8