cortex-reaver 0.2.3 → 0.2.4

data/lib/cortex_reaver/controller/comment.rb

@@ -24,7 +24,6 @@ module CortexReaver
     end
 
     on_save do |comment, request|
-      comment.title = request[:title]
       comment.body = request[:body]
       comment.comment_id = request[:comment_id]
       comment.journal_id = request[:journal_id]
@@ -80,11 +79,11 @@ module CortexReaver
         CortexReaver.db.transaction do
           @comment = Comment.new
 
-          @comment.title = request[:title]
           @comment.body = request[:body]
           @comment.comment_id = request[:comment_id]
           @comment.journal_id = request[:journal_id]
           @comment.photograph_id = request[:photograph_id]
+          @comment.page_id = request[:page_id]
 
           if session[:user]
             # A user is logged in. Use their account.
@@ -112,7 +111,7 @@ module CortexReaver
           # Clear action cache
           Ramaze::Cache.action.clear
 
-          flash[:notice] = "Your comment (<a href=\"##{@comment.url.gsub(/.*#/, '')}\">#{h @comment.title}</a>) has been posted."
+          flash[:notice] = "<a href=\"##{@comment.url.gsub(/.*#/, '')}\">Your comment</a> has been posted."
           redirect @comment.parent.url
         end
       rescue => e

data/lib/cortex_reaver/controller/controller.rb

@@ -4,7 +4,7 @@ module CortexReaver
     # trait :app => :cortex_reaver
     engine :Erubis
     layout :text
-    helper :form, :auth, :navigation, :workflow, :error, :sidebar, :aspect, :common
+    helper :form, :auth, :navigation, :workflow, :error, :sidebar, :aspect, :common, :gravatar
   end
 end
 

data/lib/cortex_reaver/controller/main.rb

@@ -45,6 +45,7 @@ module CortexReaver
         # Render that page.
         @title = @page.title
        
+        # Workflows
         if user.can_edit? Page.new
           workflow "Edit this page", PageController.r(:edit, @page.id), :edit, :page
         end
@@ -52,6 +53,14 @@ module CortexReaver
           workflow "Delete this page", PageController.r(:delete, @page.id), :delete, :page
         end
 
+        # Set up comments
+        if comment = session[:pending_comment] and comment.parent == @page
+          @new_comment = session.delete :pending_comment
+        else
+          # Create a comment to be posted
+          @new_comment = CortexReaver::Comment.new :page => @page
+        end
+
         PageController.render_view('show')
       elsif not ids.empty?
         # Didn't have that page

data/lib/cortex_reaver/controller/page.rb

@@ -34,6 +34,7 @@ module CortexReaver
       page.page_id = request[:page_id]
       page.name = Page.canonicalize request[:name], :id => page.id, :page_id => page.page_id
       page.draft = request[:draft]
+      page.comments_enabled = request[:comments_enabled]
       page.body = request[:body]
     end
 

data/lib/cortex_reaver/helper/gravatar.rb

@@ -0,0 +1,11 @@
+module Ramaze
+  module Helper
+    module Gravatar
+      # Returns an IMG tag for a comment.
+      def gravatar_img(o)
+         email = o.creator.email rescue o.email || 'anonymous'
+         "<img src=\"http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email)}?r=pg&s=60\" alt=\"#{email}\" title=\"#{email}\" />"
+      end
+    end
+  end
+end

data/lib/cortex_reaver/migrations/015_page_comments.rb

@@ -0,0 +1,11 @@
+module CortexReaver
+  class CommentsEnabledOnPagesSchema < Sequel::Migration
+    def down
+      alter_table(:pages) { drop_column :comments_enabled }
+    end
+
+    def up
+      alter_table(:pages) { add_column :comments_enabled, :boolean, :default => false }
+    end
+  end
+end

data/lib/cortex_reaver/migrations/016_drop_comment_titles.rb

@@ -0,0 +1,16 @@
+module CortexReaver
+  class DropCommentTitlesSchema < Sequel::Migration
+    def down
+      alter_table(:comments) { add_column :varchar, :title }
+    end
+
+    def up
+      if CortexReaver.db[:comments].filter(:title => nil).invert.count > 0
+        puts "About to drop titles on comments. Hit enter to confirm, ctrl-c to cancel."
+        gets
+      end
+                
+      alter_table(:comments) { drop_column :title }
+    end
+  end
+end

data/lib/cortex_reaver/model/comment.rb

@@ -15,19 +15,6 @@ module CortexReaver
     many_to_one :comment, :class => 'CortexReaver::Comment'
     one_to_many :comments, :class => 'CortexReaver::Comment'
 
-    # Infer blank titles
-    def before_save
-      return false unless super
-
-      if title.blank?
-        title = 'Re: ' + parent.title.to_s
-        title.gsub!(/^(Re: )+/, 'Re: ')
-        self.title = title
-      end
-
-      true
-    end
-
     # Update parent comment counts
     def before_destroy
       return false unless super
@@ -68,19 +55,8 @@ module CortexReaver
       '/comments'
     end
 
-    def self.infer_blank_titles
-      self.all.each do |comment|
-        if comment.title.blank?
-          comment.title = 'Re: ' + comment.parent.title.to_s
-          comment.title.gsub!(/^(Re: )+/, 'Re: ')
-          comment.skip_timestamp_update = true
-          comment.save
-        end
-      end
-    end
-
     def to_s
-      title || 'comment ' + id.to_s
+      'comment ' + id.to_s
     end
 
     def url
@@ -89,7 +65,6 @@ module CortexReaver
 
     def validate
       validates_presence :body
-      validates_max_length 255, :title, :allow_blank => true
       validates_max_length 255, :name, :allow_blank => true 
       validates_max_length 255, :http, :allow_blank => true
       validates_max_length 255, :email, :allow_blank => true
@@ -107,14 +82,14 @@ module CortexReaver
         unless self[field].blank?
           count += 1
           if count > 1
-            self.errors[attribute] << 'has too many kinds of parents'
+            self.errors[:comment] << 'has too many kinds of parents'
             break
           end
         end
       end
 
       if count == 0
-        self.errors[attribute] << "doesn't have a parent"
+        self.errors[:comment] << "doesn't have a parent"
       end
     end
   end

data/lib/cortex_reaver/public/css/commments.css

@@ -1,7 +1,48 @@
-.journal > .comments {
-  margin-top: 2em;
+div.comment {
+  margin-bottom: 10px;
+  padding: 6px;
+  -webkit-box-shadow: 0 0px 4px #bbb;
+  -moz-box-shadow: 0 0px 4px #bbb;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  position: relative;
+  min-height: 60px;
 }
 
-.comment {
-  margin-bottom: 10px;
+.comment .avatar {
+  position: absolute;
+  top: 6px;
+  left: 6px;
+}
+
+.comment .body {
+  margin-left: 66px;
+  margin-bottom: 20px;
+}
+
+.comment p:first-child {
+  margin-top: 0;
+}
+
+.comment .footer {
+  background: transparent;
+  position: absolute;
+  bottom: 6px;
+  left: 72px;
+  right: 6px;
+  height: 12px;
+  border: none;
+  padding: 2px;
+}
+
+.comment .footer .byline {
+  margin-bottom: 0;
+  position: relative;
+  height: auto;
+}
+
+.comment .footer .actions {
+  float: right;
+  width: 120px;
+  text-align: right;
 }

data/lib/cortex_reaver/public/css/fonts.css

@@ -10,7 +10,6 @@ h1 {
 
 h2 {
   font-size: 150%;
-  margin-top: 0;
 }
 
 h3 {

data/lib/cortex_reaver/public/css/page.css

@@ -0,0 +1,3 @@
+.page > .body *:first-child {
+  margin-top: 0;
+}

data/lib/cortex_reaver/public/css/text.css

@@ -11,15 +11,15 @@ h1 a, h2 a, h3 a {
   color: #555;
 }
 
-/* Text entries */
-.text-entry h2 {
+.text-entry > *:first-child {
+  margin-top: 0;
   margin-bottom: 0;
-  padding-bottom: 0;
 }
 
 .text-entry .byline {
   color: #666;
   position: relative;
+  height: 4px;
 }
 
 .text-entry .footer {

data/lib/cortex_reaver/version.rb

@@ -1,6 +1,6 @@
 module CortexReaver
   APP_NAME = 'Cortex Reaver'
-  APP_VERSION = '0.2.3'
+  APP_VERSION = '0.2.4'
   APP_AUTHOR = 'Kyle Kingsbury'
   APP_EMAIL = 'aphyr@aphyr.com'
   APP_URL = 'http://aphyr.com'

data/lib/cortex_reaver/view/comments/comment.rhtml

@@ -1,17 +1,17 @@
 <div class="comment text-entry">
-  <h2><a id="comment_<%= @comment.id %>" href="<%= @comment.url %>"><%=h @comment.title %></a></h2>
-  <div class="byline">
-    <%= author_info @comment %>
+  <a id="comment_<%= @comment.id %>"></a>
+  <div class="avatar">
+    <%= gravatar_img @comment %>
   </div>
   <div class="body">
     <%= @comment.body_cache %>
   </div>
+
   <div class="footer">
+    <div class="byline">
+      <%= author_info @comment %>
+    </div>
     <ul class="actions">
-      <li><a href="<%=@comment.url %>_comments">
-        <img src="/images/comment.gif" class="icon" alt="comment" />
-        <%= @comment.comment_count %> <%= @comment.comment_count == 1 ? 'comment' : 'comments' %>
-      </a></li>
       <% if user.can_edit? @comment %>
         <li><a href="/comments/edit/<%= @comment.id %>">
           <img src="/images/edit.gif" class="icon" alt="edit" /> Edit
@@ -24,8 +24,10 @@
           </a>
         </li>
       <% end %>
+      <li><a href="<%= @comment.url %>">Link</a></li>
     </ul>
   </div>
+  
   <% unless @hide_comments %>
     <a id="comment_<%= @comment.id %>_comments" ></a>
     <div class="comments">

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

@@ -12,7 +12,6 @@
   <% end %>
 
   <%= form_for @comment, Rs(@form_action), [
-      :title,
       :name,
       :email,
       :http,

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

@@ -1,4 +1,5 @@
 <div class="comments">
+  <h2>Recent Comments</h2>
   <% @comments.all.each do |comment| %>
     <%= CortexReaver::CommentController.render_view 'comment', 'comment' => comment, 'hide_comments' => true %>
   <% end %>

data/lib/cortex_reaver/view/comments/post_form.rhtml

@@ -5,7 +5,6 @@
   <%= errors_on @new_comment %>
 
   <form class="comment-form" action="<%= CortexReaver::CommentController.r :post %>" method="post">
-    <%= form_p :title, :model => @new_comment %>
     <p class="dont-read-me">
       Please avoid writing anything here unless you are a computer:
       <label for="captcha">Captcha</label>

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

@@ -31,7 +31,7 @@
 
   <% unless @hide_comments %>
     <div class="comments">
-      <a id="comments" />
+      <a id="comments" /><h2>Comments</h2>
       <% @journal.comments_dataset.order(:created_on).all.each do |comment| %>
         <%= CortexReaver::CommentController.render_view :comment, 'comment' => comment %>
       <% end %>

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

@@ -9,6 +9,7 @@
   <%= live_tags_field @page %>
   <%= form_p :body, :model => @page, :type => 'textarea' %>
   <%= attachment_form @page %>
+  <%= form_p :comments_enabled, :model => @page, :type => 'checkbox', :description => 'Allow comments' %>
   <%= form_p :draft, :model => @page, :type => 'checkbox', :description => 'This is a draft' %>
   <input type="submit" name="submit" />
 </form>

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

@@ -3,4 +3,15 @@
     <%= @page.body_cache %>
     <div class="clear"></div>
   </div>
+
+  <% if @page.comments_enabled %>
+    <div class="comments">
+    <a id="comments">
+    <% @page.comments_dataset.order(:created_on).all.each do |comment| %>
+      <%= CortexReaver::CommentController.render_view :comment, 'comment' => comment %>
+    <% end %>
+    </div>
+    
+    <%= CortexReaver::CommentController.render_view :post_form, 'comment' => @new_comment %>
+  <% end %>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cortex-reaver
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Kyle Kingsbury
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 -08:00
+date: 2009-12-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -158,6 +158,7 @@ files:
 - lib/cortex_reaver/public/css/custom.css
 - lib/cortex_reaver/public/css/table.css
 - lib/cortex_reaver/public/css/icons.css
+- lib/cortex_reaver/public/css/page.css
 - lib/cortex_reaver/public/css/actions.css
 - lib/cortex_reaver/public/css/journals.css
 - lib/cortex_reaver/public/css/fonts.css
@@ -273,6 +274,7 @@ files:
 - lib/cortex_reaver/view/head.rhtml
 - lib/cortex_reaver/cache.rb
 - lib/cortex_reaver/migrations/003_journals.rb
+- lib/cortex_reaver/migrations/015_page_comments.rb
 - lib/cortex_reaver/migrations/009_mysql.rb
 - lib/cortex_reaver/migrations/011_user_roles.rb
 - lib/cortex_reaver/migrations/002_pages.rb
@@ -284,6 +286,7 @@ files:
 - lib/cortex_reaver/migrations/007_comments.rb
 - lib/cortex_reaver/migrations/014_convert_projects_to_pages.rb
 - lib/cortex_reaver/migrations/013_draft.rb
+- lib/cortex_reaver/migrations/016_drop_comment_titles.rb
 - lib/cortex_reaver/migrations/001_users.rb
 - lib/cortex_reaver/migrations/004_photographs.rb
 - lib/cortex_reaver/controller/tag.rb
@@ -312,6 +315,7 @@ files:
 - lib/cortex_reaver/helper/sidebar.rb
 - lib/cortex_reaver/helper/workflow.rb
 - lib/cortex_reaver/helper/attachments.rb
+- lib/cortex_reaver/helper/gravatar.rb
 - lib/cortex_reaver/helper/navigation.rb
 - lib/cortex_reaver/helper/crud.rb
 - lib/cortex_reaver/helper/photographs.rb