aslakjo-comatose 2.0.5.2

data/test/unit/processing_context_test.rb

@@ -0,0 +1,108 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'comatose'
+
+class ProcessingContextTest < Test::Unit::TestCase
+
+  fixtures :comatose_pages
+  
+  def setup
+    @root = comatose_page( :home_page ) 
+    @binding = Comatose::ProcessingContext.new(@root)
+  end
+
+  # should "process liquid tags with no filters correctly" do
+  #   result = TextFilters.transform('{{ page.title }}', @binding, :none, :liquid)
+  #   assert_equal 'Home Page', result
+  # end
+  # 
+  should "process erb tags correctly" do
+    result = TextFilters.transform('<%= page.title %>', @binding, :none, :erb)
+    assert_equal 'Home Page', result
+  end
+
+  should "support text translation and processing with ERB" do
+    src = 'The title is *<%= title %>*'
+    if TextFilters.all.keys.include? 'None'
+      assert_equal "The title is *Home Page*", TextFilters.transform(src, @binding, :none, :erb)
+    end    
+    if TextFilters.all.keys.include? 'Textile'
+      assert_equal "<p>The title is <strong>Home Page</strong></p>", TextFilters.transform(src, @binding, :textile, :erb)
+    end    
+    if TextFilters.all.keys.include? 'Markdown'
+      assert_equal "<p>The title is <em>Home Page</em></p>", TextFilters.transform(src, @binding, 'Markdown', :erb)
+    end    
+    if TextFilters.all.keys.include? 'RDoc'
+      assert_equal "<p>\nThe title is *Home Page*\n</p>\n", TextFilters.transform(src, @binding, :rdoc, :erb)
+    end
+  end
+  
+  should "support text translation and processing with Liquid" do
+    src = 'The title is *{{ page.title }}*'
+    assert_equal "The title is *Home Page*", TextFilters.transform(src, @binding, :none, :liquid)
+    if TextFilters.all_titles.include? 'Textile'
+      assert_equal "<p>The title is <strong>Home Page</strong></p>", TextFilters.transform(src, @binding, :textile, :liquid)
+    end    
+    if TextFilters.all_titles.include? 'Markdown'
+      assert_equal "<p>The title is <em>Home Page</em></p>", TextFilters.transform(src, @binding, :markdown, :liquid)
+    end    
+    if TextFilters.all_titles.include? 'RDoc'
+      assert_equal "<p>\nThe title is *Home Page*\n</p>\n", TextFilters.transform(src, @binding, :rdoc, :liquid)
+    end
+  end
+  
+  UNSAFE_PROPS = %w(version position)
+  SAFE_PROPS = %w(id full_path uri slug keywords title to_html filter_type author updated_on created_on)
+  
+  should "allow access to safe properties and methods when processing with ERB" do
+    binding = Comatose::ProcessingContext.new( comatose_page(:faq) )
+    SAFE_PROPS.each do |prop|
+      assert_not_equal '', TextFilters.transform("<%= page.#{prop} %>", binding, :none, :liquid), "on page.#{prop}"
+    end
+  end
+  
+  should "prevent access to protected properties and methods when processing with ERB" do
+    binding = Comatose::ProcessingContext.new( comatose_page(:faq) )
+    UNSAFE_PROPS.each do |prop|
+      assert_equal "<%= page.#{prop} %>", TextFilters.transform("<%= page.#{prop} %>", binding, :none, :liquid), "on page.#{prop}"
+    end    
+  end
+  
+  should "allow access to safe properties and methods when processing with Liquid" do
+    binding = Comatose::ProcessingContext.new( comatose_page(:faq) )
+    SAFE_PROPS.each do |prop|
+      assert_not_equal '', TextFilters.transform("{{ page.#{prop} }}", binding, :none, :liquid), "on page.#{prop}"
+    end
+  end
+  
+  should "prevent access to protected properties and methods when processing with Liquid" do
+    binding = Comatose::ProcessingContext.new( comatose_page(:faq) )
+    UNSAFE_PROPS.each do |prop|
+      assert_equal '', TextFilters.transform("{{ page.#{prop} }}", binding, :none, :liquid), "on page.#{prop}"
+    end    
+  end
+  
+  should "allow referenceing of defined ComatoseDrops" do
+    Comatose.define_drop "app" do
+      def test
+        "TEST"
+      end
+    end
+    
+    result = TextFilters.transform('{{ app.test }}', @binding, :none, :liquid)
+    assert_equal 'TEST', result
+    
+    result2 = TextFilters.transform('<%= app.test %>', @binding, :none, :erb)
+    assert_equal 'TEST', result2
+  end
+  
+  should "let ComatoseDrop errors bubble upward" do
+    Comatose.define_drop "broken" do
+      def test
+        "TEST #{crap}"
+      end
+    end
+    
+    assert_raise(RuntimeError) { TextFilters.transform('{{ broken.test }}', @binding, :none, :liquid) }
+  end
+
+end

data/test/unit/text_filters_test.rb

@@ -0,0 +1,52 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+require 'erb'
+require 'liquid'
+
+require 'text_filters'
+# require 'comatose/page'
+# require 'comatose/processing_context'
+
+class TextFiltersTest < Test::Unit::TestCase
+  # fixtures :comatose_pages
+  # self.use_instantiated_fixtures  = true
+
+  should "not alter output when using filter :none" do
+    assert_equal "line one\nline two", TextFilters.render_text("line one\nline two", :none)
+  end
+
+  should "convert newlines into <br/>s when using :simple filter" do
+    assert_equal "line one<br/>line two", TextFilters.render_text("line one\nline two", :simple)
+  end
+
+  should "support Textile, if it's available, using :textile or 'Textile' as a key" do
+    if TextFilters.all.keys.include? 'Textile'
+      assert_equal "<p>testing <strong>bold</strong></p>", TextFilters.render_text("testing *bold*", :textile)
+      assert_equal "<p>testing <strong>bold</strong></p>", TextFilters.render_text("testing *bold*", 'Textile')
+    end
+  end
+  
+  should "support Markdown, if it's available, using :markdown or 'Markdown' as a key" do
+    if TextFilters.all.keys.include? 'Markdown'
+      assert_equal "<p>testing <em>bold</em></p>", TextFilters.render_text("testing *bold*", :markdown)
+    end
+  end
+
+  should "support RDoc, if it's available, using :rdoc or 'RDoc' as a key" do
+    if TextFilters.all.keys.include? 'RDoc'
+      assert_equal "<p>\ntesting <b>bold</b>\n</p>\n", TextFilters.render_text("testing *bold*", :rdoc)
+      assert_equal "<p>\ntesting <b>bold</b>\n</p>\n", TextFilters.render_text("testing *bold*", 'RDoc')
+    end
+  end
+
+  should "support transformation of parameters via ERB" do
+    src = 'Hello, <%= name %>'
+    assert_equal "Hello, Matt", TextFilters.transform(src, {'name'=>'Matt'}, :none, :erb)
+  end
+
+  should "support transformation of parameters via Liquid" do
+    src = 'Hello, {{ name }}'
+    assert_equal "Hello, Matt", TextFilters.transform(src, {'name'=>'Matt'}, :none, :liquid)
+  end
+  
+end

data/views/comatose_admin/_form.html.erb

@@ -0,0 +1,96 @@
+<%= error_messages_for :page %>
+
+<% form_for :page, @page do |f| %>
+<table class="page-form" cellpadding="0" cellspacing="0">
+
+  <tr>
+    <td class="label"><label for="page_title">Title</label></td>
+    <td class="field"><%= f.text_field :title, :tabindex=>1, :maxlength=>255, :size=>50 %> <%= link_to_function "More...", "ComatoseEditForm.toggle_extra_fields(this)", :id=>'more-options' %></td>
+  </tr>
+
+  <tr id="slug_row" class="meta-info">
+    <td class="label"><label for="page_slug">Slug</label></td>
+    <td class="field"><%= f.text_field :slug, :tabindex=>6, :maxlength=>255, :size=>50, :disabled=>@root_pages.include?(@page) %></td>
+  </tr>
+
+<% if show_field? 'keywords' %>
+  <tr id="keywords_row" class="meta-info">
+    <td class="label"><label for="page_keywords">Keywords</label></td>
+    <td class="field"><%= f.text_field :keywords, :tabindex=>7, :maxlength=>1000, :size=>50 %></td>
+  </tr>
+<% end %>
+
+<% if show_field? 'parent' %>
+  <tr id="parent_row" class="meta-info">
+    <td class="label"><label for="page_parent">Parent</label></td>
+    <td class="field">
+      <% if mode != :new and @root_pages.include? @page %>
+      <select id="page_parent" disabled="true"><option><%= @page.title %> is a root page</option></select>
+      <% else %>
+      <select id="page_parent" name="page[parent_id]" tabindex="8"><%= tree_select_box @root_pages, @page.parent_id, @page.id %></select>
+       <% end %>
+    </td>
+  </tr>
+<% end %>
+
+  <tr>
+    <td class="label body"><label for="page_body">Body</label></td>
+    <td class="field"><%= f.text_area :body, :rows=>20, :tabindex=>2 %></td>
+  </tr>
+
+<% if show_field? 'filter' %>
+  <tr id="filter_row" class="meta-info">
+    <td class="label"><label for="page_filter_type">Filter</label></td>
+    <td class="field">
+      <%= select_tag 'page[filter_type]', options_for_select(TextFilters.all_titles.sort, @page.filter_type || Comatose.config.default_filter), :tabindex=>3, :id=>'page_filter_type' %>
+      <span class="field-help">Converts plain text into html</span>
+    </td>
+  </tr>
+<% end %>
+
+<% if show_field? 'created_on' %>
+  <tr id="created_row" class="meta-info">
+    <td class="label"><label for="page_created_on">Created</label></td>
+    <td class="field">
+      <%= f.datetime_select :created_on %>
+    </td>
+  </tr>
+<% end %>
+
+</table>
+
+<div id="button-group">
+<% unless @page.updated_on.nil? %>
+  <div class="last-update">
+    <label>
+      Updated <%= time_ago_in_words @page.updated_on, true %> ago by
+      <%= @page.author %>.
+      <%= link_to(pluralize(@page.versions.length, 'revision', 'revisions'), :action=>'versions', :id=>@page) if @page.versions.length > 0 %>
+    </label>
+  </div>
+<% end %>
+<%= image_tag 'comatose/spinner.gif', :id=>'spinner', :align=>'absmiddle', :style=>'display:none;' %>
+  <%= button_to_function('Preview', "ComatoseEditForm.preview_content('#{url_for :controller=>controller.controller_name, :action=>'preview', :id=>@page}')", :tabindex=>3, :id=>'preview-btn' ) if show_field? 'preview' %> &nbsp;
+  <%= submit_tag ((mode == :edit) ? 'Save Changes' : 'Create Page'), :tabindex=>4 %>
+  <% if @page.versions.length > 0 %>
+  &nbsp; <%= link_to "Revert", :action=>'versions', :id=>@page %>
+  <% end %>
+  or
+  <a href="<%= url_for :controller=>controller.controller_name, :action=>'index' %>" onlick="ComatoseEditForm.cancel(this.href); return false;" tabindex="5">Cancel</a>
+</div>
+<% end %>
+
+<div id="preview-area">
+  <fieldset>
+    <legend>Page Preview</legend>
+    <div class="preview-body">
+      <div id="preview-panel"><span style='color:blue;'>Loading Preview...</span></div>
+      <div style="clear:both"></div>
+    </div>
+  </fieldset>
+  <div class="commands">
+    <a href="#" onclick="$('preview-area').hide();">Close Preview</a> or <a href="#">Back to top</a>
+  </div>
+</div>
+
+<%= javascript_tag "ComatoseEditForm.init('#{mode.to_s}');" %>

data/views/comatose_admin/_page_list_item.html.erb

@@ -0,0 +1,60 @@
+<%# Params:
+#     - page  (Page Node)
+#     - level (integer indicating current tree depth)
+#   Called From:
+#     - index
+#   Description:
+#     This partial is used recursively. Render it with the root node, and it will recurse
+#     down all of the child nodes to build a list with proper indentation to indicate
+#     tree depth.
+%>
+
+<%
+# Create the page-level links...
+links = []
+links << link_to(pluralize(page.versions.length, 'revision', 'revisions'), :action=>'versions', :id=>page) if !page.nil? and !page.versions.nil? and page.versions.length > 0
+links << link_to('add child page', {:action=>'new', :parent=>page}, :title=>"Add a child to '#{page.title}'", :class=>'add-page')
+links << link_to_function('reorder children', "ComatoseList.toggle_reorder('page_list_#{page.id}',this,#{page.id})", :title=>"Reorder children of '#{page.title}'", :class=>'reorder-children', :href=>url_for(:action=>'reorder', :id=>page)) if !page.children.empty? and page.children.length > 1
+links << link_to('delete', {:action=>'delete', :id=>page}, :confirm=>'This will delete this page, and any children. Are you sure?', :title=>"Delete page '#{page.title}' and all it's children", :class=>'delete-page', :method=>'post', :onmouseover=>"ComatoseList.item_hover('page_#{page.id}', 'over', true)", :onmouseout=>"ComatoseList.item_hover('page_#{page.id}', 'out', true)") unless @root_pages.include? page
+# Level check, one, two, three...
+collapse_children = (level >= Comatose.config.default_tree_level)
+%>
+
+<li id="page_<%= page.id %>">
+  <table cellpadding="0" cellspacing="0">
+    <tr>
+      <td rowspan="2" valign="center">
+      <% if !page.children.empty? %>
+        <%=  image_tag( ((collapse_children) ? 'comatose/collapsed.gif' : 'comatose/expanded.gif'), :title=>'Expand/Collapse', :onclick=>"ComatoseList.toggle_tree_nodes(this,#{page.id});", :class=>'tree-controller', :size=>'12x12', :id=>"page_controller_#{page.id}" ) %>
+      <% else %>
+        <%= image_tag 'comatose/no-children.gif', :size=>'12x12', :class=>'tree-controller' %>
+      <% end %>        
+      </td>
+      <td rowspan="2" valign="center">
+        <%= image_tag 'comatose/page.gif', :size=>'25x31', :align=>"absmiddle" %>
+        <span class="handle">DRAG</span>
+      </td>
+      <td>
+        <%= link_to page.title, {:action=>'edit', :id=>page}, :title=>"Path:#{page.full_path}", :class=>'page' %>
+      </td>
+    </tr>
+    <tr>
+      <td class="commands">
+        Updated <span title="Created on <%= page.created_on %>"><%= time_ago_in_words page.updated_on, true %> ago</span><%= " by #{page.author}" unless page.author.nil? or page.author.empty? %>,
+        <%= links.join(', ') %>.
+      </td>
+    </tr>
+  </table>
+
+  <ul id="page_list_<%= page.id %>" old="lvl-<%= page.id %>" class="page-list <%= 'collapsed' if collapse_children %>" >
+    <% for child in page.children %>
+      <%= render :partial=>'page_list_item', :locals=>{ :page=>child, :level=>level+1 } %>
+    <% end %>
+  </ul>
+
+  <%= sortable_element( "page_list_#{page.id}", 
+        :complete => visual_effect(:highlight, "page_list_#{page.id}"), 
+        :handle=>'handle',
+        :update=>'flash-content',
+        :url => { :action => "reorder", :id=>page } ) if !page.children.empty? and page.children.length > 1 %>
+</li>

data/views/comatose_admin/delete.html.erb

@@ -0,0 +1,18 @@
+<h1>
+  Page Delete Confirmation
+</h1>
+
+<blockquote>
+  <p>Are you sure you want to delete the page titled  "<b><%= @page.title %></b>"?</p>
+<% unless @page.children.empty? %>
+  <p>It has <b><%= @page.children.length %></b> child pages that will also be deleted...</p>
+<% end %>
+</blockquote>
+
+<%= start_form_tag %>
+<div id="button-group">
+  <%= submit_tag "Yes, Delete The Page" %>
+  or
+  <%= link_to "Cancel", :action=>'index' %>
+</div>
+<%= end_form_tag %>

data/views/comatose_admin/edit.html.erb

@@ -0,0 +1,5 @@
+<h1>
+  Edit Page
+</h1>
+
+<%= render :partial=>'form', :locals=>{:mode=>:edit} %>

data/views/comatose_admin/index.html.erb

@@ -0,0 +1,29 @@
+<div class="action">
+  <%= link_to 'Clear Page Cache', :controller=>controller.controller_name, :action=>'expire_page_cache' %>
+<% if Comatose.config.allow_import_export %>
+  <%= link_to 'Import', '#', :id => 'import_link2', :onclick => "$('import_form').setStyle({display: 'inline'}); return false;" %>
+  <%= link_to 'Export', :controller=>controller.controller_name, :action=>'export' %>
+  <div id="import_form" style="display: none;">
+  <% form_tag(url_for(:action => 'import'), :multipart => true) do %>
+    <%= file_field_tag 'import_file' %>
+    <%= submit_tag 'Upload and Import' %>
+    <a href="#" onclick="$('import_form').hide(); return false;">Cancel</a>
+  <% end %>
+  </div>
+<% end %>
+</div>
+  
+<h1>
+  Page List
+  <%= image_tag 'comatose/spinner.gif', :id=>'spinner', :align=>'absmiddle', :style=>'display:none;' %>
+</h1>
+
+<ul class="page-list root">
+<% @root_pages.each do |page| %>
+  <%= render :partial=>'page_list_item', :locals=>{ :page=>page, :level=>1 } %>
+<% end %>
+</ul>
+
+<div id="status"></div>
+
+<%= javascript_tag "ComatoseList.init()" %>

data/views/comatose_admin/new.html.erb

@@ -0,0 +1,5 @@
+<h1>
+  New Page
+</h1>
+
+<%= render :partial=>'form', :locals=>{:mode=>:new} %>

data/views/comatose_admin/reorder.html.erb

@@ -0,0 +1,30 @@
+<h1>Reorder Pages</h1>
+
+<h3>"<%= @page.title %>" child pages:</h3>
+
+<ul class="page-list">
+<% @page.children.each do |page| %>
+  <li>
+    <table cellpadding="0" cellspacing="0">
+      <tr>
+        <td rowspan="2" valign="center">
+          <%= image_tag 'comatose/page.gif', :size=>'25x31', :align=>"absmiddle" %>
+        </td>
+        <td>
+          <a class="page"><%= page.title %></a>
+        </td>
+      </tr>
+      <tr>
+        <td class="commands">
+          <%= link_to "Move Up", :action=>'reorder', :cmd=>'up', :page=>page.id %>,
+          <%= link_to "Move Down", :action=>'reorder', :cmd=>'down', :page=>page.id %>
+        </td>
+      </tr>
+    </table>
+  </li>
+<% end %>
+</ul>
+
+<div id="button-group">
+  <%= link_to "Finished", :action=>'index' %>
+</div>

data/views/comatose_admin/versions.html.erb

@@ -0,0 +1,40 @@
+<h1>Page Revisions</h1>
+<form>
+<div class="revisions older-content">
+  <div class="header">
+    <div class="header-actions">
+    <% form_tag :action => 'versions', :id => @page, :html => { :method => :get } do %>
+      View Version: <%= select_tag "version", options_from_collection_for_select(@page.versions, 'version', 'version', @version_num), {'onchange'=>'this.form.submit();'} %>
+      <%= submit_tag 'Go', {'id'=>'go-btn'} %>
+    <% end %>
+    </div>
+    Version <%= @version_num %>
+  </div>
+  <div class="meta">
+    <label class="title"><span>Title:</span><%= @version.title %></label>
+    <label><span>Slug:</span> <%= @version.slug %></label>
+    <label><span>Keywords:</span> <%= @version.keywords %></label>
+  </div>
+  <%= @version.body.split("\n").join('<br/>') unless @version.body.nil? %>
+  <div id="button-group" class="footer">
+    <% form_tag :action=>'set_version', :id => @page, :version => @version_num do %>
+      <%= submit_tag "Set As Current Version" %>
+      or
+      <%= link_to "Cancel", :action=>'index' %>
+    <% end %>
+  </div>
+</div>
+
+<div class="revisions current-content">
+  <div class="header">
+    Current Version
+  </div>
+  <div class="meta">
+    <label class="title"><span>Title:</span><%= @page.title %></label>
+    <label><span>Slug:</span> <%= @page.slug %></label>
+    <label><span>Keywords:</span> <%= @page.keywords %></label>
+  </div>
+  <%= @page.body.split("\n").join('<br/>') unless @page.body.nil? %>
+</div>
+
+<div style="clear:both">&nbsp;</div>