rostra 0.1.12 → 0.1.13

data/app/assets/javascripts/rostra/application.js

@@ -37,7 +37,7 @@ $(document).ready(function() {
       preFill: prefill
     });
 
-    $('input.as-values').attr('name', name); // force name to not
+    $('input.as-values').attr('name', name); // force name to use rails-style hash params
   });
 
 
@@ -46,6 +46,13 @@ $(document).ready(function() {
       $(this).closest('.answer').find('form.comment').fadeIn();
       return false;
     });
+
+    $('form.comment a.cancel').click(function() {
+      var form = $(this).closest('form.comment');
+      form.fadeOut();
+      form[0].reset();
+      return false;
+    });
   }();
 
 

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

@@ -197,6 +197,9 @@ form.comment textarea {
   height: 100px;
   margin-top: 25px !important;
 }
+form.comment input[type="submit"] {
+  margin-right: 10px;
+}
 
 /* comments */
 .comments {

data/app/helpers/rostra/base/application_helper.rb

@@ -72,6 +72,14 @@ module Rostra
         resource.class.name.split('::').last.downcase
       end
 
+      # Checks for the current page using rails 3 route-style syntax:
+      #
+      #   current_rostra_page?('questions#new')
+      #
+      def current_rostra_page?(controller_and_action)
+        controller_and_action == "#{controller_name}##{action_name}"
+      end
+
       private
 
       def vote_path(resource, direction)

data/app/models/rostra/question.rb

@@ -9,7 +9,7 @@ module Rostra
 
     acts_as_taggable
     acts_as_voteable
-    is_impressionable
+    is_impressionable counter_cache: { unique: true }
 
     validates :title, :presence => true, :uniqueness => true, :length => { :minimum => 15 }
     validates :user, :presence => true
@@ -25,18 +25,7 @@ module Rostra
     # 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)
-
-      # Maybe try to use a subquery?
-      # User.where(:id => accounts.project(:user_id).where(accounts[:user_id].not_eq(6)))
-
-      # This code doesn't work in postgres.
-      # Question
-      #   .where(created_at: (15.days.ago)..(Time.now))
-      #   .limit(limit)
-      #   .joins(:impressions)
-      #   .group('impressions.impressionable_id')
-      #   .order('count(impressions.impressionable_id) desc')
+      Question.where(created_at: (15.days.ago)..(Time.now)).limit(limit).order('impressions_count desc')
     end
 
     def answer_count

data/app/views/rostra/application_mailer/notification.html.erb

@@ -1,5 +1,3 @@
 <h3>Hi <%= @user.rostra_user_name %>,</h3>
 
 <p>Just letting you know there's been recent activity on <%= link_to @question.title, question_url(@question) %></p>
-
-<p><%= link_to "View the question", question_path(@question) %></p>

data/app/views/rostra/application_mailer/notification.text.erb

@@ -2,4 +2,4 @@
 
 Just letting you know there's been recent activity on <%= @question.title %>
 
-View the question visit: <%= question_path(@question) %>
+View the question visit: <%= question_url(@question) %>

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

@@ -20,8 +20,8 @@
                 <span class="type"><%= question.answer_count.abs == 1 ? 'answer' : 'answers' %></span>
               </div>
               <div class="views_count" title="Number of times this question was viewed">
-                <span class="count"><%= question.unique_page_views %></span>
-                <span class="type"><%= question.unique_page_views.abs == 1 ? 'view' : 'views' %></span>
+                <span class="count"><%= question.impressions_count %></span>
+                <span class="type"><%= question.impressions_count.abs == 1 ? 'view' : 'views' %></span>
               </div>
             </div>
 

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

@@ -63,6 +63,7 @@
               <%= f.hidden_field :commentable_type, value: "Rostra::Answer" %>
               <%= f.input :comment, label: '' %>
               <%= f.submit 'post comment' %>
+              <%= link_to 'cancel', '#', class: 'cancel' %>
             <% end %>
           <% end %>
 

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

@@ -1,11 +1,13 @@
 <div id="sidebar">
   <% if can_participate_in_rostra? %>
-    <%= link_to 'Ask a question', new_question_path, class: "button" %>
+    <% unless current_rostra_page?('questions#new') || current_rostra_page?('questions#edit') %>
+      <%= link_to 'Ask a question', new_question_path, class: "button" %>
+    <% end %>
   <% else %>
     <%= link_to 'Login to ask a question', main_app_login_path, class: "button" %>
   <% end %>
 
-  <% if can_participate_in_rostra? && controller_name == 'questions' && action_name == 'show' %>
+  <% if can_participate_in_rostra? && current_rostra_page?('questions#show') %>
     <%= render partial: 'rostra/shared/toggle_following_question_button', locals: { question: @question } %>
   <% end %>
 

data/db/migrate/20111029214642_add_impressions_count_to_questions.rb

@@ -0,0 +1,5 @@
+class AddImpressionsCountToQuestions < ActiveRecord::Migration
+  def change
+    add_column :rostra_questions, :impressions_count, :integer, default: 0
+  end
+end

data/lib/rostra/version.rb

@@ -1,3 +1,3 @@
 module Rostra
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

metadata

@@ -2,7 +2,7 @@
 name: rostra
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors: 
 - Cory Schires
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 -05:00
-default_executable: 
+date: 2011-10-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -201,7 +200,7 @@ dependencies:
   type: :development
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: grb
+  name: pry
   prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
@@ -212,7 +211,7 @@ dependencies:
   type: :development
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: email_spec
+  name: grb
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
@@ -222,6 +221,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  name: email_spec
+  prerelease: false
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id020
 description: Don't use. Not production ready
 email: 
 - coryschires@gmail.com
@@ -545,6 +555,7 @@ files:
 - db/migrate/20111016021105_create_impressions_table.rb
 - db/migrate/20111019162723_create_rostra_question_followings.rb
 - db/migrate/20111024223022_add_send_email_notifications_to_question_followings.rb
+- db/migrate/20111029214642_add_impressions_count_to_questions.rb
 - lib/generators/rostra/install_generator.rb
 - lib/generators/rostra/templates/app/helpers/rostra/application_helper.rb
 - lib/generators/rostra/templates/config/initializers/rostra.rb
@@ -560,7 +571,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -584,7 +594,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Don't use. Not production ready