rostra 0.0.3 → 0.0.4

data/app/assets/stylesheets/rostra/application.css

@@ -19,22 +19,45 @@ nav {
   float: right;
 }
 #page_content {
-  width: 550px;
+  width: 630px;
   border-right: 1px solid #ccc;
   padding-right: 100px;
 }
+body#questions.index #page_content,
+body#questions.show #page_content {
+  margin-left: 80px;
+  width: 550px;
+}
 #sidebar {
   float: right;
-  width: 300px;
-  text-align: center;
+  width: 180px;
+  padding: 0 30px;
+}
+#sidebar .button {
+  width: 100%;
 }
+#sidebar ul {
+  list-style: none;
+  padding: 0;
+}
+
+
+img.avatar {
+  float: right;
+  box-shadow: 0 1px 4px #666;
+  width: 48px;
+  height: 48px;
+  margin: 0 0 10px 20px;
+}
+
+
 div#questions {
   min-height: 250px;
 }
 .question {
-  margin-bottom: 10px;
+  margin-bottom: 43px;
   border-bottom: dashed 1px #E0E0E0;
-  padding-bottom: 15px;
+  padding-bottom: 45px;
 }
 .question h3 {
   margin-bottom: 5px;
@@ -59,6 +82,7 @@ div#questions {
 }
 .question .text {
   margin-bottom: 25px;
+  min-height: 73px;
 }
 .question a.view_more {
   margin-left: 10px;
@@ -74,17 +98,44 @@ div#questions {
   float: right;
 }
 
-.vote h4 p.already_voted {
-  color: #e6e6e6;
+/* questions stats section */
+.question .stats {
+  float: left;
+  width: 43px;
+  margin-left: -80px;
+  padding: 7px 4px 10px;
+  background: #e0e0e0;
+  border: 1px solid #aaa;
 }
+.question .stats span {
+  display: block;
+  text-align: center;
+}
+.question .stats > div {
+  padding: 8px 0 11px;
+  border-top: 1px solid #aaa;
+}
+.question .stats .vote_count {
+  padding-top: 0;
+  border-top: none;
+}
+.question .stats .views_count {
+  padding-bottom: 0;
+}
+.question .stats span.count {
+  font-size: 24px;
+  font-weight: bold;
+}
+.question .stats span.type {
+  font-size: 10px;
+}
+
+
 
 /* styles for question on question show page */
 body#questions.show .question {
   border-bottom: none;
-  margin-bottom: 50px;
-}
-body#questions.show #page_content {
-  margin-left: 50px;
+  margin-bottom: 20px;
 }
 
 
@@ -105,12 +156,15 @@ body#questions.show #page_content {
 }
 #answers .answer cite {
   color: #aaa;
+  display: block;
+  margin-top: 20px;
 }
 #answers .answer cite a {
   font-style: normal;
   margin-left: 5px;
 }
 #answers .answer .text {
+  clear: right;
   margin-top: 10px;
 }
 
@@ -123,6 +177,7 @@ form#new_rostra_answer {
 }
 form#new_rostra_answer .field label {
   font-size: 16px;
+  margin-bottom: 10px;
 }
 form#new_rostra_answer .field label abbr {
   display: none;
@@ -133,15 +188,59 @@ form#new_rostra_answer .field textarea {
   margin: 10px 0;
 }
 
+/* comment form */
+form.comment {
+  display: none;
+}
+form.comment label {
+  display: none;
+}
+form.comment textarea {
+  height: 100px;
+  margin-top: 25px !important;
+}
+
+/* comments */
+.comments {
+  clear: both;
+  padding: 5px 0 15px;
+}
+.comments .comment {
+  background: #E0E0E0;
+  padding: 8px 10px;
+  margin-top: 10px;
+}
+.comments .comment .timestamp {
+  float: none;
+  text-align: right;
+  margin-top: 5px
+}
+.comments .comment .timestamp a {
+  margin-right: 5px
+}
+.comments .comment .timestamp a:first-child {
+  margin-left: 10px
+}
+.comments .editable form textarea {
+  min-height: 50px;
+  margin-bottom: 0;
+}
+.comments .editable form button {
+  padding: 3px 6px 4px;
+  margin-right: 5px;
+  font-size: 10px;
+}
+
+
 /*voting styles*/
-.vote_wrapper, .answers_vote_wrapper {
+.vote_wrapper {
  text-align: center;
  width: 43px;
  font-size: 22px;
  font-weight: bold;
  line-height: 12px;
  float: left;
- margin: -5px 0 0 -55px;
+ margin: -5px 0 0 -66px;
 }
 .vote {
   background-image: url("vote_arrows.png");
@@ -149,29 +248,23 @@ form#new_rostra_answer .field textarea {
   width: 43px;
   height: 43px;
   display: block;
-  text-indent: -999px;
+  text-indent: -9999px;
   background-color: transparent;
 }
-
 .vote:hover{
   background-color: transparent;
 }
-
 .vote.up{
   background-position: 0 0;
 }
-
 .vote.up:hover, .vote.up.selected{
   background-position: 0 -43px;
 }
-
 .vote.down{
   background-position: 0 -129px;
 }
-
 .vote.down:hover, .vote.down.selected{
   background-position: 0 -86px;
 }
 
 
-

data/app/assets/stylesheets/rostra/flash_messages.css

@@ -3,6 +3,9 @@
   padding: 7px 7px 5px 7px;
   margin: 10px 0 10px;
 }
+.flash a.close {
+  float: right;
+}
 #flash_notice {
   border: 1px solid green;
   background: #e6ffe6;

data/app/assets/stylesheets/rostra/forms.css

@@ -1,6 +1,6 @@
 form .hint {
   display: block;
-  margin-top: -10px;
+  margin-top: 5px;
   color: #aaa;
 }
 form label abbr {
@@ -10,7 +10,8 @@ form label abbr {
 }
 form .field {
   position: relative;
-  width: 550px;
+  width: 100%;
+  margin-bottom: 15px;
 }
 form label {
   font-weight: bold;
@@ -19,7 +20,6 @@ form label {
 }
 form input,
 form textarea {
-  margin-bottom: 15px;
   padding: 3px;
   width: 100%;
 }
@@ -36,5 +36,5 @@ span.error {
 .field_with_errors input,
 .field_with_errors textarea {
   background: #fde6e4;
-  border: 1px solid red;
+  border: 2px solid red;
 }

data/app/assets/stylesheets/rostra/typography.css

@@ -3,5 +3,6 @@ a, a:visited {  }
 a:hover {  }
 h1 { font-size: 36px; margin: 20px 0 50px; padding-bottom: 5px; border-bottom: 1px #ccc solid; }
 h3 { font-size: 22px; margin: 0 0 10px 0; }
+h4 { font-size: 18px; margin: 30px 0 10px 0; border-bottom: 1px #ccc solid; padding-bottom: 5px; }
 
 

data/app/controllers/rostra/answers_controller.rb

@@ -4,14 +4,7 @@ module Rostra
     before_filter :fetch_question
 
     def vote
-      if current_user.voted_for?(@answer) && params[:vote_type] == 'up'
-        current_user.clear_votes(@answer)
-      elsif current_user.voted_against?(@answer) && params[:vote_type] == 'down'
-        current_user.clear_votes(@answer)
-      else
-        current_user.vote_exclusively_for(@answer) if params[:vote_type] == 'up'
-        current_user.vote_exclusively_against(@answer) if params[:vote_type] == 'down'
-      end
+      rostra_user.vote_on(@answer, params[:vote_direction])
 
       respond_to do |format|
         format.html { redirect_to question_path(@question, anchor: "rostra_answer_#{@answer.id}") }

data/app/controllers/rostra/application_controller.rb

@@ -1,16 +1,30 @@
 module Rostra
   class ApplicationController < ActionController::Base
 
-    helper_method :user_logged_in?
+    include Rostra::Config
+
+    helper_method :user_logged_in?, :rostra_user, :main_app_login_path, :main_app_signup_path
 
     rescue_from CanCan::AccessDenied do |exception|
       after_access_denied
     end
 
+    def rostra_user
+      send(Rostra::Config.rostra_user)
+    end
+
+    def main_app_login_path
+      send(:main_app).send(Rostra::Config.main_app_login_path)
+    end
+
+    def main_app_signup_path
+      send(:main_app).send(Rostra::Config.main_app_signup_path)
+    end
+
     # Check if a user is logged in
     #
     def user_signed_in?
-      current_user
+      rostra_user
     end
 
     private
@@ -18,7 +32,7 @@ module Rostra
     # Override <tt>cancan</tt>'s default class of <tt>Ability</tt> to user <tt>Rostra::Ability</tt>.
     #
     def current_ability
-      @current_ability ||= Rostra::Ability.new(current_user)
+      @current_ability ||= Rostra::Ability.new(rostra_user)
     end
 
     # Override this method to if finer control over what happens when <tt>cancan</tt> denies access.

data/app/controllers/rostra/comments_controller.rb

@@ -0,0 +1,31 @@
+module Rostra
+  class CommentsController < ApplicationController
+    load_and_authorize_resource
+
+    before_filter :fetch_question
+
+    def create
+
+      if @comment.save
+        redirect_to @question
+      end
+    end
+
+    def update
+      @comment.update_attributes(:comment => params[:value])
+      render :text => @comment.comment
+    end
+
+    def destroy
+      @comment.destroy
+      redirect_to @question
+    end
+
+    private
+
+    def fetch_question
+      @question = Question.find(params[:question_id])
+    end
+
+  end
+end

data/app/controllers/rostra/questions_controller.rb

@@ -3,14 +3,7 @@ module Rostra
     load_and_authorize_resource
 
     def vote
-      if current_user.voted_for?(@question) && params[:vote_type] == 'up'
-        current_user.clear_votes(@question)
-      elsif current_user.voted_against?(@question) && params[:vote_type] == 'down'
-        current_user.clear_votes(@question)
-      else
-        current_user.vote_exclusively_for(@question) if params[:vote_type] == 'up'
-        current_user.vote_exclusively_against(@question) if params[:vote_type] == 'down'
-      end
+      rostra_user.vote_on(@question, params[:vote_direction])
 
       respond_to do |format|
         format.html { redirect_to @question }
@@ -20,11 +13,12 @@ module Rostra
 
     def index
       @questions = Question.order('created_at desc')
-      @user = current_user
+      @user = rostra_user
     end
 
     def show
       @answers = @question.answers
+      impressionist(@question) # increments page views
     end
 
     def new

data/app/helpers/rostra/application_helper.rb

@@ -1,4 +1,62 @@
 module Rostra
   module ApplicationHelper
+
+    # Creates a list of tags linking to...TODO: Where should these link?
+    #
+    def tag_list(question)
+      content_tag :div, "Tags: #{question.tags.map { |tag| link_to tag, ''}.join}".html_safe, class: 'tags'
+    end
+
+    # Finds the url to the user's avatar following this logic:
+    #
+    #   1. Calls the method defined in the <tt>Rostra::Config</tt>
+    #   2. Uses the users email address to looks for a gravatar
+    #   3. Renders <tt>app/assets/images/rostra/anonymous_avatar.png</tt>
+    #
+    def avatar_url(user)
+      avatar_method = Rostra::Config.rostra_user_avatar
+
+      if user.respond_to?(avatar_method)
+        user.send(avatar_method)
+      else
+        default_url = "#{main_app.root_url}assets/rostra/anonymous_avatar.png"
+        gravatar_id = Digest::MD5.hexdigest(user.rostra_user_email.downcase)
+        "http://gravatar.com/avatar/#{gravatar_id}.png?s=48&d=#{CGI.escape(default_url)}"
+      end
+    end
+
+    # Method to build links for ajax-y voting arrows.
+    #
+    def link_to_vote(direction, resource)
+      if user_signed_in? && ( (direction == :up && rostra_user.voted_for?(resource)) || (direction == :down && rostra_user.voted_against?(resource)) )
+        selected = 'selected'
+      else
+        selected = ''
+      end
+
+      link_to "Vote #{direction.capitalize}", vote_path(resource, direction), method: :put, remote: true, class: "vote #{direction} #{selected}"
+    end
+
+    # Returns a rostra object's base class name. For example, <tt>@question</tt> is an instance of
+    # Rostra::Question and so:
+    #
+    #   class_name(@question)  # => 'question'
+    #
+    def class_name(resource)
+      resource.class.name.split('::').last.downcase
+    end
+
+    private
+
+    def vote_path(resource, direction)
+      return '#' if !user_signed_in? || can?(:manage, resource)
+
+      if resource.is_a?(Rostra::Question)
+        vote_question_path(resource, vote_direction: direction)
+      else
+        vote_question_answer_path(resource.question, resource, vote_direction: direction)
+      end
+    end
+
   end
 end

data/app/models/comment.rb

@@ -0,0 +1,13 @@
+class Comment < ActiveRecord::Base
+
+  include ActsAsCommentable::Comment
+
+  belongs_to :commentable, :polymorphic => true
+  belongs_to :user
+
+  validates :comment, :presence => true
+  validates_presence_of :user_id, :commentable_type, :commentable_id
+
+  default_scope :order => 'created_at ASC'
+
+end

data/app/models/rostra/ability.rb

@@ -10,8 +10,13 @@ module Rostra
       if logged_in?
         can :manage, Question, :user => user
         can :manage, Answer, :user => user
-        can [:vote_up, :vote_down], Question
-        can [:vote_up, :vote_down], Answer
+        can :manage, Comment, :user => user
+
+        can :vote, Question
+        cannot :vote, Question, :user => user
+
+        can :vote, Answer
+        cannot :vote, Answer, :user => user
       end
 
       can :read, :all

data/app/models/rostra/answer.rb

@@ -4,6 +4,7 @@ module Rostra
     belongs_to :user
 
     acts_as_voteable
+    acts_as_commentable
 
     validates :text, :presence => true
   end

data/app/models/rostra/question.rb

@@ -6,10 +6,30 @@ module Rostra
 
     acts_as_taggable
     acts_as_voteable
+    is_impressionable
 
     validates :title, :presence => true, :uniqueness => true, :length => { :minimum => 15 }
     validates :user, :presence => true
     validates :tag_list, :presence => true
 
+    # Finds questions asked within the last 15 days ordered by non-unique page views.
+    #
+    def self.trending(limit = 5)
+      Question
+        .where(created_at: (15.days.ago)..(Time.now))
+        .limit(limit)
+        .joins(:impressions)
+        .group('impressions.impressionable_id')
+        .order('count(impressions.impressionable_id) desc')
+    end
+
+    def answer_count
+      @answer_count = answers.count
+    end
+
+    def unique_page_views
+      impressionist_count(filter: :ip_address)
+    end
+
   end
 end

data/app/views/layouts/rostra/application.html.erb

@@ -10,8 +10,6 @@
   <div id="page_wrap">
     <nav>
       <%= link_to 'Recent questions', questions_path %>
-      <%= link_to 'Logout', main_app.destroy_user_session_path, :method => :post %>
-
     </nav>
     <% flash.each do |name, msg| %>
       <%= content_tag :div, msg, id: "flash_#{name}", class: 'flash' %>

data/app/views/rostra/answers/_form.html.erb

@@ -1,8 +1,8 @@
 <% @answer ||= @question.answers.build  %>
 
 <%= simple_form_for [@question, @answer], validate: true do |f| %>
-  <%= f.hidden_field :user_id, value: current_user.id %>
+  <%= f.hidden_field :user_id, value: rostra_user.id %>
   <%= f.hidden_field :question_id, value: @question.id %>
-  <%= f.input :text, label: 'Answer this question' %>
+  <%= f.input :text, label: 'Answer this question', input_html: { class: 'wysiwyg' } %>
   <%= f.submit @answer.new_record? ? 'Answer' : 'Update' %>
 <% end %>

data/app/views/rostra/answers/vote.js.erb

@@ -1 +1,2 @@
-$('.answers_vote_wrapper').replaceWith('<%= escape_javascript(render(:partial => 'rostra/shared/answers_votes', locals: {answer: @answer})) %>');
+var selector = "#rostra_answer_<%= @answer.id%> .vote_wrapper";
+$(selector).replaceWith('<%= escape_javascript(render(:partial => 'rostra/shared/votes', locals: {resource: @answer})) %>');

data/app/views/rostra/questions/_form.html.erb

@@ -1,7 +1,7 @@
 <%= simple_form_for @question, validate: true do |f| %>
-  <%= f.hidden_field :user_id, value: current_user.id %>
+  <%= f.hidden_field :user_id, value: rostra_user.id %>
   <%= f.input :title %>
-  <%= f.input :details %>
+  <%= f.input :details, input_html: {class: 'wysiwyg'}  %>
   <%= f.input :tag_list, label: 'Tags', hint: 'Separate tags with commas' %>
   <%= f.submit "Post your question" %>
 <% end %>

data/app/views/rostra/questions/index.html.erb

@@ -11,29 +11,39 @@
 
         <% @questions.each do |question| %>
           <div class="question">
+
+            <div class="stats">
+              <div class="vote_count">
+                <span class="count"><%= question.plusminus %></span>
+                <span class="type"><%= question.plusminus.abs == 1 ? 'vote' : 'votes' %></span>
+              </div>
+              <div class="answer_count">
+                <span class="count"><%= question.answer_count %></span>
+                <span class="type"><%= question.answer_count.abs == 1 ? 'answer' : 'answers' %></span>
+              </div>
+              <div class="views_count">
+                <span class="count"><%= question.unique_page_views %></span>
+                <span class="type"><%= question.unique_page_views.abs == 1 ? 'view' : 'views' %></span>
+
+              </div>
+            </div>
+
+            <%= image_tag avatar_url(question.user), class: 'avatar' %>
+
             <h3 class="title"><%= link_to question.title, question %></h3>
             <cite>
-              Asked by <%= question.user.name %>
+              Asked by <%= question.user.rostra_user_name %>
               <%= link_to 'edit', edit_question_path(question) if can? :manage, question %>
             </cite>
             <div class="text">
-              <% if question.details.length > 250 %>
-                <%= simple_format(
-                  truncate(question.details, length: 250) +
-                  link_to("view more", question, class: "view_more")
-                ) %>
-
+              <% if question.details.length > 500 %>
+                <%= strip_tags(truncate(question.details, length: 500)) + link_to("view more", question, class: "view_more") %>
               <% else %>
-                <%= simple_format(question.details) %>
+                <%= strip_tags(question.details) %>
               <% end %>
             </div>
             <div class="timestamp"><%= time_ago_in_words(question.updated_at) %> ago</div>
-            <div class="tags">
-              Tags:
-              <% question.tags.each do |tag| %>
-                <%= link_to tag, "" %>
-              <% end %>
-            </div>
+            <%= tag_list(question) %>
           </div>
         <% end %>