commontator 1.1.1 → 1.1.2

data/app/assets/stylesheets/commontator/comments.css~

@@ -1,83 +0,0 @@
-.comment {
-  font-size: 12px;
-  font-weight: normal;
-  font-style: normal;
-
-  border-top: 1px solid;
-  border-left: 1px solid;
-  
-  margin-top: 15px;
-  margin-bottom: 15px;
-
-  padding-top: 8px;
-  padding-left: 15px;
-
-  color: #000;
-  border-color: #ddd;
-  background-color: #fff;
-  
-  clear: both;
-}
-
-.comment_actions {
-  float: right;
-}
-
-.comment_body {
-  margin-left: 55px;
-  margin-top: -60px;
-  margin-right: 45px;
-   
-  padding: 8px;
-}
-
-.comment_body p {
-	margin: 0px;
-	
-	overflow: hidden;
-}
-
-.comment_body textarea {
-	
-}
-
-.comment_form_actions {
-  margin-top: 15px;
-}
-
-.comment_form_field > .field_with_errors {
-  display: block;
-  padding-right: 4px;
-}
-
-.comment_form_field textarea {
-  padding: 0px;
-  
-  width: 100%;
-}
-
-.comment_gravatar_image img {
-  margin-top: 5px;
-}
-
-.comment_timestamp {
-	color: #777;
-}
-
-.comment_votes {
-  float: right;
-  
-  text-align: center;
-}
-
-.comment_votes input,
-.comment_votes img {
-  border: none;
-  background-color: transparent;
-  padding: 0px;
-  margin: 0px;
-}
-
-.comment_vote_count p {
-  margin: 0px;
-}

data/app/assets/stylesheets/commontator/threads.css~

@@ -1,18 +0,0 @@
-.thread {
-  display: block !important;
-}
-
-.thread_actions {
-  float: right;
-}
-
-.thread_header {
-  font-size: 16px;
-  font-weight: bold;
-  font-style: normal;
-}
-
-.thread_new_comment {
-  display: none;
-  padding-left: 15px;
-}

data/app/controllers/commontator/application_controller.rb~

@@ -1,28 +0,0 @@
-module Commontator
-  class ApplicationController < ActionController::Base
-    before_filter :get_user
-    
-    cattr_accessor :commontable_url
-    
-    rescue_from SecurityTransgression, :with => lambda { head(:forbidden) }
-    
-    protected
-    
-    def get_user
-      @user = self.send Commontator.current_user_method	
-      raise SecurityTransgression unless (@user.nil? || @user.is_commontator)
-    end
-    
-    def get_thread
-      @thread = params[:thread_id].blank? ? \
-        Commontator::Thread.find(params[:id]) : \
-        Commontator::Thread.find(params[:thread_id])
-      raise SecurityTransgression if @thread.commontable.nil?
-      set_commontable_url
-    end
-    
-    def set_commontable_url
-      self.commontable_url = @thread.config.commontable_url_proc.call(main_app, @thread.commontable)
-    end
-  end
-end

data/app/controllers/commontator/comments_controller.rb~

@@ -1,135 +0,0 @@
-module Commontator
-  class CommentsController < ApplicationController
-    before_filter :get_thread, :only => [:new, :create]
-    before_filter :get_comment_and_thread, :except => [:new, :create]
-    before_filter :set_commontable_url, :only => :create
-
-    # GET /1/comments/new
-    def new
-      @comment = Comment.new
-      @comment.thread = @thread
-      @comment.creator = @user
-
-      raise SecurityTransgression unless @comment.can_be_created_by?(@user)
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
-      end
-     
-    end
-
-    # POST /1/comments
-    def create
-      @comment = Comment.new(params[:comment])
-      @comment.thread = @thread
-      @comment.creator = @user
-      CommentObserver.instance
-      raise SecurityTransgression unless @comment.can_be_created_by?(@user)
-      
-      respond_to do |format|
-        if @comment.save
-          format.html { redirect_to @thread }
-          format.js
-        else
-          format.html { redirect_to @thread }
-          format.js { render :new }
-        end
-      end
-    end
-
-    # GET /comments/1/edit
-    def edit
-      raise SecurityTransgression unless @comment.can_be_edited_by?(@user)
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
-      end
-    end
-
-    # PUT /comments/1
-    def update
-      raise SecurityTransgression unless @comment.can_be_edited_by?(@user)
-
-      respond_to do |format|
-        if @comment.update_attributes(params[:comment])
-          format.html { redirect_to @thread }
-          format.js
-        else
-          format.html { redirect_to @thread }
-          format.js { render :edit }
-        end
-      end
-    end
-
-    # PUT /comments/1/delete
-    def delete
-      raise SecurityTransgression unless @comment.can_be_deleted_by?(@user)
-
-      @comment.errors.add(:base, 'This comment has already been deleted.') \
-        unless @comment.delete(@user)
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :delete }
-      end
-    end
-    
-    # PUT /comments/1/undelete
-    def undelete
-      raise SecurityTransgression unless @comment.can_be_deleted_by?(@user)
-
-      @comment.errors.add(:base, 'This comment is not deleted.') \
-        unless @comment.undelete
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :delete }
-      end
-    end
-    
-    # PUT /comments/1/upvote
-    def upvote
-      raise SecurityTransgression unless @comment.can_be_voted_on_by?(@user)
-      
-      @comment.upvote_from @user
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :vote }
-      end
-    end
-    
-    # PUT /comments/1/downvote
-    def downvote
-      raise SecurityTransgression unless @comment.can_be_voted_on_by?(@user)
-      
-      @comment.downvote_from @user
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :vote }
-      end
-    end
-    
-    # PUT /comments/1/unvote
-    def unvote
-      raise SecurityTransgression unless @comment.can_be_voted_on_by?(@user)
-      
-      @comment.unvote :voter => @user
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :vote }
-      end
-    end
-    
-    protected
-    
-    def get_comment_and_thread
-      @comment = Comment.find(params[:id])
-      @thread = @comment.thread
-    end
-  end
-end

data/app/controllers/commontator/commontator_controller.rb~

@@ -1,22 +0,0 @@
-module Commontator
-  class CommontatorController < ActionController::Base
-    before_filter :get_user
-    
-    protected
-    
-    def get_user
-      @user = ApplicationController.send Commontator.current_user_method	
-      raise SecurityTransgression unless (@user.nil? || @user.is_commontator)
-    end
-    
-    def get_thread
-      @thread = params[:thread_id].blank? ? \
-        Commontator::Thread.find(params[:id]) : \
-        Commontator::Thread.find(params[:thread_id])
-    end
-    
-    def get_commontable_url
-      @commontable_url = @thread.config.commontable_url_proc.call(main_app, @thread.commontable)
-    end
-  end
-end

data/app/controllers/commontator/subscriptions_controller.rb~

@@ -1,33 +0,0 @@
-module Commontator
-  class SubscriptionsController < ApplicationController
-    before_filter :get_thread
-    before_filter :get_commontable_url
-
-    # POST /1/subscribe
-    def create
-      raise SecurityTransgression unless @thread.can_subscribe?(@user)
-
-      @thread.errors.add(:subscription, "You are already subscribed to this thread") \
-        unless @thread.subscribe(@user)
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :subscribe }
-      end
-
-    end
-
-    # POST /1/unsubscribe
-    def destroy
-      raise SecurityTransgression unless @thread.can_subscribe?(@user)
-
-      @thread.errors.add(:subscription, "You are not subscribed to this thread") \
-        unless @thread.unsubscribe(@user)
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :subscribe }
-      end
-    end
-  end
-end

data/app/controllers/commontator/threads_controller.rb~

@@ -1,41 +0,0 @@
-module Commontator
-  class ThreadsController < ApplicationController
-    before_filter :get_thread
-
-    # GET /threads/1
-    def show
-      commontator_thread_show(@thread.commontable)
-
-      respond_to do |format|
-        format.html { redirect_to commontable_url }
-        format.js
-      end
-    end
-    
-    # PUT /threads/1/close
-    def close
-      raise SecurityTransgression unless @thread.can_be_edited_by?(@user)
-
-      @thread.errors.add(:base, 'This thread has already been closed.') \
-        unless @thread.close(@user)
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :show }
-      end
-    end
-    
-    # PUT /threads/1/reopen
-    def reopen
-      raise SecurityTransgression unless @thread.can_be_edited_by?(@user)
-
-      @thread.errors.add(:base, 'This thread is not closed.') \
-        unless @thread.reopen
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :show }
-      end
-    end
-  end
-end

data/app/helpers/commontator/comments_helper.rb~

@@ -1,41 +0,0 @@
-module Commontator
-  module CommentsHelper
-    def commontator_name(user)
-      return Commontator.user_missing_name if user.nil?
-      config = user.commontator_config
-      config.user_name_method.blank? ? config.user_missing_name : \
-        user.send(config.user_name_method)
-    end
-    
-    def comment_timestamp(comment)
-      config = comment.thread.config
-      (comment.is_modified? ? 'Last modified on ' : \
-        config.comment_create_verb_past.capitalize + \
-        ' on ') + comment.updated_at.strftime(config.timestamp_format)
-    end
-    
-    def commontator_gravatar_url(user, options = {})
-      return '' if user.nil?
-      config = user.commontator_config
-      
-      options[:secure] ||= request.ssl?
-      options[:size] ||= 50
-    
-      hash = Digest::MD5.hexdigest(user.send(config.user_email_method))
-      base = options[:secure] ? "s://secure" : "://www"
-      
-      "http#{base}.gravatar.com/avatar/#{hash}?s=#{options[:size]}"
-    end
-  
-    def commontator_gravatar_image(comment, options = {})
-      user = comment.creator
-      return '' if user.nil?
-      config = user.commontator_config
-      name = user.send(config.user_name_method)
-      image_tag(gravatar_url(comment, options), 
-                { :alt => name, 
-                  :title => name,
-                  :border => 1 })
-    end
-  end
-end

data/app/helpers/commontator/commontator_helper.rb~

@@ -1,7 +0,0 @@
-module Commontator
-  module CommontatorHelper
-    def javascript_proc
-      Commontator.javascript_proc.call(self).html_safe
-    end
-  end
-end

data/app/helpers/commontator/subscriptions_helper.rb~

@@ -1,8 +0,0 @@
-module Commontator
-  module SubscriptionsHelper
-    def commontator_email(user)
-      config = user.commontator_config
-      config.email_method.blank? ? '' : user.send(config.email_method)
-    end
-  end
-end

data/app/helpers/commontator/threads_helper.rb~

@@ -1,22 +0,0 @@
-module Commontator
-  module ThreadsHelper
-    def commontable_name(thread)
-      config = thread.config
-      config.commontable_name.blank? ? \
-      thread.commontable.class.name : \
-      config.commontable_name
-    end
-    
-    def commontable_id(thread)
-      thread.commontable.send(thread.config.commontable_id_method)
-    end
-    
-    def closer_name(thread)
-      user = thread.closer
-      return Commontator.user_missing_name if user.nil?
-      config = user.commontator_config
-      config.user_name_method.blank? ? config.user_missing_name : \
-        user.send(config.user_name_method)
-    end
-  end
-end