cortex-reaver 0.0.6 → 0.0.7

data/lib/cortex_reaver/support/renderer.rb

@@ -11,34 +11,11 @@ module CortexReaver
       require 'bluecloth'
       require 'hpricot'
       require 'coderay'
+      require 'sanitize'
 
-      # Elements to allow in sanitized HTML.
-      ELEMENTS = [
-        'a', 'b', 'blockquote', 'br', 'code', 'dd', 'dl', 'dt', 'em', 'i', 'li',
-        'ol', 'p', 'pre', 'small', 'strike', 'strong', 'sub', 'sup', 'u', 'ul'
-      ]
-   
-      # Attributes to allow in sanitized HTML elements.
-      ATTRIBUTES = {
-        'a' => ['href', 'title'],
-        'pre' => ['class']
-      }
-      
-      # Attributes to add to sanitized HTML elements.
-      ADD_ATTRIBUTES = {
-        'a' => {'rel' => 'nofollow'}
-      }
-   
-      # Attributes that should be checked for valid protocols.
-      PROTOCOL_ATTRIBUTES = {'a' => ['href']}
-   
-      # Valid protocols.
-      PROTOCOLS = ['ftp', 'http', 'https', 'mailto']
-
-      
       # Renders plain text and html to html. If parse_code isn't true, only
       # runs bluecloth on text *outside* any <code>...</code> blocks.
-      def bluecloth(text, parse_code = true)
+      def bluecloth(text, parse_code = true, increment_headers = true)
         return text if text.nil?
 
         if parse_code
@@ -57,7 +34,12 @@ module CortexReaver
            
             if j != 0
               # Convert to bluecloth
-              out << BlueCloth::new(text[0..j]).to_html
+              blue = BlueCloth::new(text[0..j]).to_html
+              if increment_headers
+                # Increment headings by two (h1, h2 are page/entry headers)
+                blue.gsub!(/<(\/)?h(\d)>/) { |match| "<#{$1}h#{$2.to_i + 2}>" }
+              end
+              out << blue
             end
           else
             # Find end of code block
@@ -129,7 +111,7 @@ module CortexReaver
             case prefix
             when 'image'
               # Create an inline image
-              "<img src=\"#{target.public_path}\" alt=\"#{name.gsub('"', '&quot;')}\" title=\"#{name.gsub('"', '&quot')}\" />"
+              "<img class=\"attachment\" src=\"#{target.public_path}\" alt=\"#{name.gsub('"', '&quot;')}\" title=\"#{name.gsub('"', '&quot')}\" />"
             when 'url'
               # Create a URL
               target.public_path
@@ -171,54 +153,10 @@ module CortexReaver
         end
       end
 
-      # Stolen wholesale from Ryan's Thoth (http://github.com/rgrove/thoth/)
-      # Who adapted it from http://rid.onkulo.us/archives/14-sanitizing-html-with-ruby-and-hpricot
       def sanitize_html(html)
         return html if html.nil?
 
-        h = Hpricot(html)
-  
-        h.search('*').each do |el|
-          if el.elem?
-            tag = el.name.downcase
-   
-            if ELEMENTS.include?(tag)
-              if ATTRIBUTES.has_key?(tag)
-                # Delete any attribute that isn't in the whitelist for this
-                # particular element.
-                el.raw_attributes.delete_if do |key, val|
-                  !ATTRIBUTES[tag].include?(key.downcase)
-                end
-   
-                # Check applicable attributes for valid protocols.
-                if PROTOCOL_ATTRIBUTES.has_key?(tag)
-                  el.raw_attributes.delete_if do |key, val|
-                    PROTOCOL_ATTRIBUTES[tag].include?(key.downcase) &&
-                        (!(val.downcase =~ /^([^:]+)\:/) || !PROTOCOLS.include?($1))
-                  end
-                end
-              else
-                # Delete all attributes from elements with no whitelisted
-                # attributes.
-                el.raw_attributes = {}
-              end
-   
-              # Add required attributes.
-              if ADD_ATTRIBUTES.has_key?(tag)
-                el.raw_attributes.merge!(ADD_ATTRIBUTES[tag])
-              end
-            else
-              # Delete any element that isn't in the whitelist.
-              el.parent.replace_child(el, el.children)
-            end
-          elsif el.comment?
-            # Delete all comments, since it's possible to make IE execute JS
-            # within conditional comments.
-            el.swap('')
-          end
-        end
-   
-        h.to_s
+        Sanitize.clean(html, Sanitize::Config::BASIC)
       end
 
       # Default renderer

data/lib/cortex_reaver/support/sequenceable.rb

@@ -235,7 +235,7 @@ module CortexReaver
       # Returns a url for this record, viewed in an absolute window. TODO: handle non-default window sizes.
       def absolute_window_url(size = self.class.window_size)
         page = (Float(position) / size).floor
-        self.class.url + '/page/' + page.to_s + '#' + self.class.to_s.underscore + 
+        self.class.url + '/page/' + page.to_s + '#' + self.class.to_s.demodulize.underscore + 
           '_' + send(self.class.canonical_name_attr)
       end
 

data/lib/cortex_reaver/support/tags.rb

@@ -32,8 +32,13 @@ module CortexReaver
             remove_all_tags
           end
 
+          # Returns all models with ANY of the following tags
+          def self.tagged_with_any_of(tags)
+            tagged_with(tags, false)
+          end
+          
           # Returns all models with ALL the following tags:
-          def self.tagged_with(tags)
+          def self.tagged_with(tags, all=true)
             # Find map between this model and tags, e.g. pages_tags
             map = [table_name.to_s, 'tags'].sort.join('_').to_sym
             
@@ -48,11 +53,17 @@ module CortexReaver
             # to contain only rows with one of our interesting tags.
             #
             # Man, don't you wish MySQL had intersect?
-            filter(:id =>
-              CortexReaver.db[map].filter(:tag_id => ids).group(own_id).having(
-                "count(*) = #{ids.size}"
-              ).select(own_id)
-            )
+            if all
+              filter(:id =>
+                CortexReaver.db[map].filter(:tag_id => ids).group(own_id).having(
+                  "count(*) = #{ids.size}"
+                ).select(own_id)
+              )
+            else
+              filter(:id => 
+                CortexReaver.db[map].filter(:tag_id => ids).select(own_id)
+              )
+            end
           end
         end
       end

data/lib/cortex_reaver/version.rb

@@ -1,8 +1,8 @@
 module CortexReaver
   APP_NAME = 'Cortex Reaver'
-  APP_VERSION = '0.0.6'
+  APP_VERSION = '0.0.7'
   APP_AUTHOR = 'aphyr'
   APP_EMAIL = 'aphyr@aphyr.com'
   APP_URL = 'http://aphyr.com'
-  APP_COPYRIGHT = 'Copyright (c) 2008 aphyr <aphyr@aphyr.com>. All rights reserved.'
+  APP_COPYRIGHT = 'Copyright (c) 2009 aphyr <aphyr@aphyr.com>. All rights reserved.'
 end

data/lib/cortex_reaver/view/journals/journal.rhtml

@@ -1,4 +1,4 @@
-<div class="journal text-entry">
+<div class="journal text-entry <%= @journal.tags.map {|t| 'tagged_' + t.name}.join(' ')%>">
   <h2><a id="journal_<%= @journal.name %>" href="<%= @journal.url %>"><%=h @journal.title %></a></h2>
   <div class="byline">
     <span class="written">
@@ -8,6 +8,7 @@
   </div>
   <div class="body">
     <%= @journal.body_cache %>
+    <div class="clear"></div>
   </div>
   <div class="footer">
     <ul class="actions">
@@ -16,11 +17,11 @@
         <%= @journal.comment_count %> <%= @journal.comment_count == 1 ? 'comment' : 'comments' %>
       </a></li>
       <% if admin? %>
-        <li><a class="edit-link" href="/journals/edit/<%= @journal.name %>">
+        <li><a class="edit-link" href="/journals/edit/<%= @journal.id %>">
           <img src="/images/edit.gif" class="icon" alt="edit" /> Edit
         </a></li>
         <li >
-          <%= A '<img src="/images/delete.gif" class="icon" alt="delete" /> Delete', :href => "/journals/delete/#{@journal.name}", :onclick => "return confirm('Are you sure you want to delete this journal?');" %>
+          <%= A '<img src="/images/delete.gif" class="icon" alt="delete" /> Delete', :href => "/journals/delete/#{@journal.id}", :onclick => "return confirm('Are you sure you want to delete this journal?');" %>
         </li>
       <% end %>
     </ul>

data/lib/cortex_reaver/view/pages/form.rhtml

@@ -3,6 +3,7 @@
 <%= errors_on @page %>
 
 <form class="edit-form" action="<%= Rs(@form_action) %>" method="post" enctype="multipart/form-data">
+  <%= page_select 'page_id', :default_id => @page.page_id, :skip_id => @page.id, :description => 'Parent page' %>
   <%= form_p 'title', :model => @page %>
   <%= live_name_field @page %>
   <%= live_tags_field @page %>

data/lib/cortex_reaver/view/pages/list.rhtml

@@ -11,13 +11,13 @@
       </tr>
     </thead>
     <tbody>
-      <% @pages.each do |page| %>
+      <% @pages.all.each do |page| %>
         <tr>
           <td><%= A(page.name, :href => page.url) %></td>
           <td><%= page.title %></td>
           <% if admin? %>
-            <td><a href="/pages/edit/<%= page.name %>">Edit</a></td>
-            <td><%= A 'Delete', :href => "/page/delete/#{page.name}", :onclick => "return confirm('Are you sure you want to delete this page?');" %></td>
+            <td><a href="/pages/edit/<%= page.id %>">Edit</a></td>
+            <td><%= A 'Delete', :href => "/pages/delete/#{page.id}", :onclick => "return confirm('Are you sure you want to delete this page?');" %></td>
           <% end %>
         </tr>
       <% end %>

data/lib/cortex_reaver/view/pages/show.rhtml

@@ -1,12 +1,6 @@
-<% if admin? %>
-  <ul class="actions">
-    <li><a href="/pages/edit/<%= @page.name %>">Edit</a></li>
-    <li><a href="/pages/delete/<%= @page.name %>">Delete</a></li>
-  </ul>
-<% end %>
-
-<div class="page" id="page_<%= @page.name %>">
+<div class="page <%= @page.tags.map {|t| 'tagged_' + t.name}.join(' ')%>" id="page_<%= @page.name %>">
   <div class="body">
     <%= @page.body_cache %>
+    <div class="clear"></div>
   </div>
 </div>

data/lib/cortex_reaver/view/photographs/show.rhtml

@@ -20,7 +20,7 @@
             </li>
             <% if admin? %>
               <li>
-                <%= A('Edit', :href => Rs(:edit, @photograph.name)) %>
+                <%= A('Edit', :href => Rs(:edit, @photograph.id)) %>
               </li>
             <% end %>
             <% if next_photo = @photograph.next %>

data/lib/cortex_reaver/view/projects/show.rhtml

@@ -8,6 +8,7 @@
   </div>
   <div class="body">
     <%= @project.body_cache %>
+    <div class="clear"></div>
   </div>
   <%= attachment_list @project %>
   <div class="footer">
@@ -17,10 +18,10 @@
         <%= @project.comment_count %> <%= @project.comment_count == 1 ? 'comment' : 'comments' %>
       </a></li>
       <% if admin? %>
-        <li><a href="/projects/edit/<%= @project.name %>">
+        <li><a href="/projects/edit/<%= @project.id %>">
           <img src="/images/edit.gif" class="icon" alt="edit" /> Edit
         </a></li>
-        <li><%= A '<img src="/images/delete.gif" class="icon" alt="delete" /> Delete', :href => "/projects/delete/#{@project.name}", :onclick => "return confirm('Are you sure you want to delete this project?');" %></li>
+        <li><%= A '<img src="/images/delete.gif" class="icon" alt="delete" /> Delete', :href => "/projects/delete/#{@project.id}", :onclick => "return confirm('Are you sure you want to delete this project?');" %></li>
       <% end %>
     </ul> 
   </div>

data/lib/cortex_reaver/view/tags/list.rhtml

@@ -12,13 +12,14 @@
       </tr>
     </thead>
     <tbody>
-      <% max_count = (@tags.order(:count).reverse.first || []).count %>
+      <% top_tag = @tags.order(:count).reverse.first %>
+      <% max_count = top_tag ? top_tag.count : 1 %>
       <% @tags.each do |tag| %>
         <tr>
           <td class="title"><%= A(tag.title, :href => tag.url) %></td>
            <% if admin? %>
-            <td><a href="/tags/edit/<%= tag.name %>">Edit</a></td>
-            <td><%= A 'Delete', :href => "/tags/delete/#{tag.name}", :onclick => "return confirm('Are you sure you want to delete this tag?');" %></td>
+            <td><a href="/tags/edit/<%= tag.id %>">Edit</a></td>
+            <td><%= A 'Delete', :href => "/tags/delete/#{tag.id}", :onclick => "return confirm('Are you sure you want to delete this tag?');" %></td>
           <% end %>
          <td class="count" style="width: <%= admin? ? 60 : 80 %>%"><div class="percent-bar" style="width: <%= tag.count.to_f / max_count * 100 %>%"><%= tag.count %></div></td>
         </tr>

data/lib/cortex_reaver/view/tags/show.rhtml

@@ -41,10 +41,10 @@
   <div class="footer">
     <ul class="actions">
       <% if admin? and @tags.size == 1 %>
-        <li><a href="/tags/edit/<%= @tags.first.name %>">
+        <li><a href="/tags/edit/<%= @tags.first.id %>">
           <img src="/images/edit.gif" class="icon" alt="comment" /> Edit
         </a></li>
-        <li><%= A '<img src="/images/delete.gif" class="icon" alt="delete" /> Delete', :href => "/tags/delete/#{@tags.first.name}", :onclick => "return confirm('Are you sure you want to delete this tag?');" %></li>
+        <li><%= A '<img src="/images/delete.gif" class="icon" alt="delete" /> Delete', :href => "/tags/delete/#{@tags.first.id}", :onclick => "return confirm('Are you sure you want to delete this tag?');" %></li>
       <% end %>
     </ul> 
   </div>

data/lib/cortex_reaver/view/text_layout.rhtml

@@ -30,22 +30,25 @@
     <script type="text/javascript" src="/js/jquery.js"></script>
     <script type="text/javascript" defer="defer" src="/js/cookie.js"></script>
     <script type="text/javascript" defer="defer" src="/js/admin.js"></script>
+    <% if admin? %>
+      <script type="text/javascript" defer="defer" src="/js/autocompletefb.js"></script>
+    <% end %>
   
     <div id="top">
       <a href="/">
-        <img id="header" src="/images/header.png" alt="Aphyr" />
+        <img id="header" src="/images/header.png" alt="<%= attr_h CortexReaver.config[:site][:name] %>" />
       </a>
     </div>
 
     <div id="sections">
-      <ul>
-        <li><a href="/journals">Journal</a></li>
-        <li><a href="/photographs">Photography</a></li>
-        <li><a href="/projects">Projects</a></li>
-        <li><a href="/tags">Tags</a></li>
-        <li><a href="/comments">Comments</a></li>
-        <li><a href="/about">About</a></li>
-      </ul>
+      <%= section_nav([
+            ['Journals', '/journals'],
+            ['Photographs', '/photographs'],
+            ['Projects', '/projects'],
+            ['Tags', '/tags'],
+            ['Comments', '/comments'],
+            ['About', '/about']
+      ]) %>
     </div>
 
     <div id="middle">

data/lib/cortex_reaver/view/users/list.rhtml

@@ -20,12 +20,12 @@
         <td><%= h user.name %></td>
         <% if admin? %>
           <td>
-            <a class="edit-link" href="/users/edit/<%= user.login %>">
+            <a class="edit-link" href="/users/edit/<%= user.id %>">
               <img src="/images/edit.gif" class="icon" alt="edit" /> Edit
             </a>
           </td>
           <td>
-            <%= A '<img src="/images/delete.gif" class="icon" alt="delete" /> Delete', :href => "/users/delete/#{user.login}", :onclick => "return confirm('Are you sure you want to delete this user?');" %>
+            <%= A '<img src="/images/delete.gif" class="icon" alt="delete" /> Delete', :href => "/users/delete/#{user.id}", :onclick => "return confirm('Are you sure you want to delete this user?');" %>
           </td>
         <% end %>
       </tr>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cortex-reaver
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - aphyr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-29 00:00:00 -06:00
+date: 2009-03-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: "2008.11"
+        version: "2009.02"
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -43,14 +43,14 @@ dependencies:
         version: 2.6.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: sanitize
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.6"
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: BlueCloth
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.7.1
+        version: 2.11.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: thin
@@ -124,6 +124,7 @@ files:
 - lib/cortex_reaver/helper/photographs.rb
 - lib/cortex_reaver/helper/date.rb
 - lib/cortex_reaver/helper/auth.rb
+- lib/cortex_reaver/helper/pages.rb
 - lib/cortex_reaver/helper/workflow.rb
 - lib/cortex_reaver/helper/navigation.rb
 - lib/cortex_reaver/helper/error.rb
@@ -203,6 +204,7 @@ files:
 - lib/cortex_reaver/view/blank_layout.rhtml
 - lib/cortex_reaver/view/documentation
 - lib/cortex_reaver/view/documentation/formatting.rhtml
+- lib/cortex_reaver/plugin.rb
 - lib/cortex_reaver/model
 - lib/cortex_reaver/model/comment.rb
 - lib/cortex_reaver/model/project.rb
@@ -228,6 +230,7 @@ files:
 - lib/cortex_reaver/public/images/border_bottom_right.png
 - lib/cortex_reaver/public/images/dark_trans.png
 - lib/cortex_reaver/public/images/border_bottom_left.png
+- lib/cortex_reaver/public/images/tag.gif
 - lib/cortex_reaver/public/images/comment.gif
 - lib/cortex_reaver/public/images/body.png
 - lib/cortex_reaver/public/images/border_top_right.png
@@ -237,6 +240,7 @@ files:
 - lib/cortex_reaver/public/images/rss-xml-icon.png
 - lib/cortex_reaver/public/js
 - lib/cortex_reaver/public/js/jquery.js
+- lib/cortex_reaver/public/js/autocompletefb.js
 - lib/cortex_reaver/public/js/admin.js
 - lib/cortex_reaver/public/js/photo.js
 - lib/cortex_reaver/public/js/cookie.js
@@ -264,6 +268,7 @@ files:
 - lib/cortex_reaver/migrations/005_projects.rb
 - lib/cortex_reaver/migrations/006_tags.rb
 - lib/cortex_reaver/migrations/008_config.rb
+- lib/cortex_reaver/migrations/010_pageparents.rb
 - lib/cortex_reaver/migrations/007_comments.rb
 - lib/cortex_reaver/migrations/009_mysql.rb
 - lib/cortex_reaver/migrations/001_users.rb