rostra 0.0.3 → 0.0.4

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

@@ -4,22 +4,17 @@
 
 <div id="page_content">
 
-  <div class="question">
-    <%= render 'rostra/shared/votes' %>
+  <div class="question" id="<%= dom_id(@question) %>">
+    <%= render partial: 'rostra/shared/votes', locals: { resource: @question } %>
+    <%= image_tag avatar_url(@question.user), class: 'avatar' %>
     <h3 class="title"><%= @question.title %></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"><%= simple_format(@question.details) %></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>
 
   <% unless @answers.empty? %>
@@ -27,13 +22,51 @@
     <div id="answers">
       <% @answers.each do |answer| %>
         <div class="answer" id="<%= dom_id(answer) %>">
-          <%= render partial: 'rostra/shared/answers_votes', locals: {answer: answer} %>
+          <%= render partial: 'rostra/shared/votes', locals: { resource: answer } %>
+          <%= image_tag avatar_url(answer.user), class: 'avatar' %>
           <cite>
-            <%= answer.user.name %> says:
+            <%= answer.user.rostra_user_name %> says:
             <%= link_to('edit', edit_question_answer_path(@question, answer)) if can? :manage, answer %>
           </cite>
           <div class="text"><%= simple_format(answer.text) %></div>
           <div class="timestamp"><%= time_ago_in_words(answer.updated_at) %> ago</div>
+
+          <% if answer.comments.any? %>
+            <div class="comments">
+              <% answer.comments.each do |comment| %>
+                <div class="comment text">
+                  <div class="editable" data-ajax_url="<%= question_comment_path(@question, comment) %>"><%= comment.comment %></div>
+                  <div class="timestamp">
+                    <%= comment.user.rostra_user_name %> – <%= time_ago_in_words(comment.updated_at) %> ago
+                    <% if can? :manage, comment %>
+                      <%= link_to('edit', question_comment_path(@question, comment), class: 'edit_comment') %>
+                      <%= link_to('delete', question_comment_path(@question, comment), method: :delete, confirm: 'Are you sure?') if can? :manage, comment %>
+                    <% end %>
+                  </div>
+                </div>
+              <% end %>
+            </div>
+          <% end %>
+
+
+          <% if can? :manage, Comment %>
+            <%= link_to("leave comment", '#', class: 'leave_comment') %>
+          <% else %>
+            <%= link_to("login leave comment", main_app_login_path) %>
+          <% end %>
+
+
+          <% if can? :manage, Comment  %>
+            <%= simple_form_for [@question, answer.comments.build], validate: true do |f| %>
+              <% # TODO: Should not need hidden fields. Why doesn't build apply the foreign keys? %>
+              <%= f.hidden_field :user_id, value: rostra_user.id %>
+              <%= f.hidden_field :commentable_id, value: answer.id %>
+              <%= f.hidden_field :commentable_type, value: "Rostra::Answer" %>
+              <%= f.input :comment, label: '' %>
+              <%= f.submit 'post comment' %>
+            <% end %>
+          <% end %>
+
         </div>
       <% end %>
     </div>
@@ -42,6 +75,6 @@
   <% if user_signed_in? %>
     <%= render 'rostra/answers/form' %>
   <% else %>
-    <%= link_to "Login to answer this question", main_app.new_user_session_path, class: 'button' %>
+    <%= link_to "Login to answer this question", main_app_login_path, class: 'button' %>
   <% end %>
 </div><!-- page_content -->

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

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

data/app/views/rostra/shared/_sidebar.html.erb

@@ -2,7 +2,14 @@
   <% if user_signed_in? %>
     <%= link_to 'Ask a question', new_question_path, class: "button" %>
   <% else %>
-    <%= link_to 'Login to ask a question', main_app.new_user_session_path, class: "button" %>
+    <%= link_to 'Login to ask a question', main_app_login_path, class: "button" %>
   <% end %>
-</div><!--sidebar-->
 
+  <h4>Trending questions</h4>
+  <ul id="trending_questions">
+  <% Rostra::Question.trending.each do |question| %>
+    <li><%= link_to question.title, question %></li>
+  <% end %>
+  </ul>
+
+</div>

data/app/views/rostra/shared/_votes.html.erb

@@ -1,27 +1,19 @@
 <div class="vote_wrapper">
-
-  <% if user_signed_in? %>
-
-    <% up_selected =  current_user.voted_for?(@question) ? 'selected' : "" %>
-    <%= link_to('Vote Question Up', vote_question_path(@question, vote_type: 'up'), method: :put, remote: true, class: "vote up #{up_selected}") %>
-
-    <div class="count"><%= @question.plusminus %></div>
-
-    <% down_selected = current_user.voted_against?(@question) ? 'selected' : "" %>
-    <%= link_to('Vote Question Down', vote_question_path(@question, vote_type: 'down'), method: :put, remote: true, class: "vote down #{down_selected}") %>
-
-  <% else %>
-
-    <%= link_to('Vote Question Up', '#', class: "vote up login_flash") %>
-    <div class="count"><%= @question.plusminus %></div>
-    <%= link_to('Vote Question Down', '#', class: "vote down login_flash") %>
-
-  <% end %>
-
+  <%= link_to_vote(:up, resource) %>
+  <div class="count"><%= resource.plusminus %></div>
+  <%= link_to_vote(:down, resource) %>
 </div>
 
 <% unless user_signed_in? %>
   <div class="hidden flash" id="flash_notice">
-    You must <%= link_to 'login', main_app.new_user_session_path %> or <%= link_to 'signup', main_app.new_user_registration_path %> in order to vote
+    You must <%= link_to 'login', main_app_login_path %> or <%= link_to 'signup', main_app_signup_path %> in order to vote
+    <%= link_to 'close', '#', class: 'close' %>
+  </div>
+<% end %>
+
+<% if can? :manage, resource %>
+  <div class="hidden flash" id="flash_notice">
+    You cannot vote on your own <%= class_name(resource) %>
+    <%= link_to 'close', '#', class: 'close' %>
   </div>
-<% end %>
+<% end %>

data/config/routes.rb

@@ -4,6 +4,7 @@ Rostra::Engine.routes.draw do
     resources :answers do
       put :vote, :on => :member
     end
+    resources :comments, :only => [:create, :update, :destroy]
   end
 
   root :to => "questions#index"

data/db/migrate/20111012020025_create_comments.rb

@@ -0,0 +1,18 @@
+class CreateComments < ActiveRecord::Migration
+  def self.up
+    create_table :comments do |t|
+      t.text :comment
+      t.references :commentable, :polymorphic => true
+      t.references :user
+      t.timestamps
+    end
+
+    add_index :comments, :commentable_type
+    add_index :comments, :commentable_id
+    add_index :comments, :user_id
+  end
+
+  def self.down
+    drop_table :comments
+  end
+end

data/db/migrate/20111016021105_create_impressions_table.rb

@@ -0,0 +1,37 @@
+class CreateImpressionsTable < ActiveRecord::Migration
+  def self.up
+    create_table :impressions, :force => true do |t|
+      t.string :impressionable_type
+      t.integer :impressionable_id
+      t.integer :user_id
+      t.string :controller_name
+      t.string :action_name
+      t.string :view_name
+      t.string :request_hash
+      t.string :session_hash
+      t.string :ip_address
+      t.string :message
+      t.string :referrer
+      t.timestamps
+    end
+    add_index :impressions, [:impressionable_type, :impressionable_id, :request_hash], :name => "poly_request_index", :unique => false
+    add_index :impressions, [:impressionable_type, :impressionable_id, :ip_address], :name => "poly_ip_index", :unique => false
+    add_index :impressions, [:impressionable_type, :impressionable_id, :session_hash], :name => "poly_session_index", :unique => false    
+    add_index :impressions, [:controller_name,:action_name,:request_hash], :name => "controlleraction_request_index", :unique => false
+    add_index :impressions, [:controller_name,:action_name,:ip_address], :name => "controlleraction_ip_index", :unique => false
+    add_index :impressions, [:controller_name,:action_name,:session_hash], :name => "controlleraction_session_index", :unique => false        
+    add_index :impressions, :user_id
+  end
+
+  def self.down
+    remove_index :impressions, :name => :poly_request_index
+    remove_index :impressions, :name => :poly_ip_index
+    remove_index :impressions, :name => :poly_session_index        
+    remove_index :impressions, :name => :controlleraction_request_index
+    remove_index :impressions, :name => :controlleraction_ip_index
+    remove_index :impressions, :name => :controlleraction_session_index        
+    remove_index :impressions, :user_id
+    
+    drop_table :impressions
+  end
+end

data/lib/generators/rostra/install_generator.rb

@@ -0,0 +1,14 @@
+module Rostra
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      desc "Copy Rostra config file"
+      source_root File.expand_path('../templates', __FILE__)
+      class_option :template_engine
+
+      def copy_config
+        directory 'config'
+      end
+
+    end
+  end
+end

data/lib/generators/rostra/templates/config/initializers/rostra.rb

@@ -0,0 +1,26 @@
+# Use this setup block to configure all options available in Rostra.
+Rostra::Config.setup do |config|
+  # Helper method used to access current user in the view
+  # config.rostra_user = :current_user
+
+  # Method called on the rostra'd model (e.g. User) to access the users full name
+  # config.rostra_user_name = :name
+
+  # Method called on the rostra'd model (e.g. User) to access the users email address
+  # config.rostra_user_email = :email
+
+  # Method called on the rostra'd model (e.g. User) to access the users avatar. It
+  # looks for an avatar in this order:
+  #
+  #   1. Calls the method defined here
+  #   2. Uses the users email address to looks for a gravatar
+  #   3. Renders <tt>app/assets/images/rostra/anonymous_avatar.png</tt>
+  #
+  # config.rostra_user_avatar = :avatar
+
+  # Route to your login page
+  # config.main_app_login_path = :new_user_session_path
+
+  # Route to your signup page
+  # config.main_app_signup_path = :new_user_registration_path
+end

data/lib/rostra/config.rb

@@ -0,0 +1,38 @@
+module Rostra
+  module Config
+    # Helper method used to access current user in the view
+    mattr_accessor :rostra_user
+    @@rostra_user = :current_user
+
+    # Method called on the rostra'd model (e.g. User) to access the users full name
+    mattr_accessor :rostra_user_name
+    @@rostra_user_name = :name
+
+    # Method called on the rostra'd model (e.g. User) to access the users email
+    mattr_accessor :rostra_user_email
+    @@rostra_user_email = :email
+
+    # Method called on the rostra'd model (e.g. User) to access the users avatar. It looks
+    # for an avatar in this order:
+    #
+    #   1. Calls the method defined here
+    #   2. Uses the users email address to looks for a gravatar
+    #   3. Renders <tt>app/assets/images/rostra/anonymous_avatar.png</tt>
+    #
+    mattr_accessor :rostra_user_avatar
+    @@rostra_user_avatar = :avatar
+
+    # Route to your login page
+    mattr_accessor :main_app_login_path
+    @@main_app_login_path = :new_user_session_path
+
+    # Route to your signup page
+    mattr_accessor :main_app_signup_path
+    @@main_app_signup_path = :new_user_registration_path
+
+    def self.setup
+      yield self
+    end
+
+  end
+end

data/lib/rostra/engine.rb

@@ -6,8 +6,10 @@ module Rostra
     require 'jquery-rails'
     require 'client_side_validations'
     require 'thumbs_up'
-    require 'grb'
+    require 'acts_as_commentable'
+    require 'impressionist'
 
     isolate_namespace Rostra
+
   end
 end

data/lib/rostra/version.rb

@@ -1,3 +1,3 @@
 module Rostra
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/rostra.rb

@@ -1,11 +1,66 @@
 require "rostra/engine"
+require "rostra/config"
 
 module Rostra
 
-  # def self.included(base)
-  #   def base.rostra
-  #     base.has_many :questions
-  #   end
-  # end
+  module ActsAsRostra
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+
+      # Include this method in your <tt>rostra</tt>'d model to add the necessary accociations and
+      # and methods:
+      #
+      #   class User < ActiveRecord::Base
+      #     rostra
+      #   end
+      #
+      def rostra
+        has_many :questions
+        has_many :answers
+        has_many :comments
+        acts_as_voter
+
+        include InstanceMethods
+      end
+    end
+
+    module InstanceMethods
+
+      # Built atop the <tt>thumbs_up</tt> API, this method does some conditional voting:
+      #
+      #   * Clear the user's existing vote if...
+      #     - they've already voted up and attempt to vote up again
+      #     - they've already voted down and attempt to vote down again
+      #   * Ensure the user only votes once per resource (i.e. question or answer)
+      #   * Clear previous votes before casting a new vote (e.g. they've already voted up and
+      #     click to vote down, then clear the old up vote prior to casting the new down vote)
+      #
+      def vote_on(resource, direction)
+        direction = direction.to_sym
+        if (direction == :up && voted_for?(resource)) || (direction == :down && voted_against?(resource))
+          clear_votes(resource)
+        else
+          vote(resource, {:exclusive => true, :direction => direction})
+        end
+      end
+
+      # Rostra will use this method to find a user's full name.
+      #
+      def rostra_user_name
+        send(Rostra::Config.rostra_user_name)
+      end
+
+      # Rostra will use this method to find a user's email address.
+      #
+      def rostra_user_email
+        send(Rostra::Config.rostra_user_email)
+      end
+    end
+  end
 
 end
+
+ActiveRecord::Base.send(:include, Rostra::ActsAsRostra)