app/views/versions/vote.rjs db/migrate/20090705092959_vote_rejig.rb @@ -37,20 +37,28 @@ class VersionsController < ApplicationController @diff = HTMLDiff::diff(@vb.text.split(/\n|<p>/), @va.text.split(/\n|<p>/)) rescue ActiveRecord::RecordNotFound => e flash[:error] = e.message - redirect_to :action => :list + redirect_to articles_url end def vote @version = NewsArticleVersion.find(params[:id]) - if is_admin? - # An admin vote is with 5, and gets unlimited votes - 5.times { @voted = Vote.vote @version } - else - @voted = Vote.vote @version, cookies['_session_id'] + @vote = Vote.vote! @version, session[:session_id] + respond_to do |format| + format.html do + flash[:notice] = 'Thank you for your recommendation' + redirect_to news_article_version_url(@version.article, @version) + end + format.js end - unless request.xhr? - flash[:notice] = 'Thank you for your recommendation' - redirect_to :controller => 'news_articles', :action => 'list' #FIXME + rescue ActiveRecord::RecordNotFound => e + rescue ActiveRecord::RecordInvalid => e + @exception = e + respond_to do |format| + format.html do + flash[:error] = e.message + redirect_to news_articles_url + end + format.js end end app/controllers/versions_controller.rb @@ -17,25 +17,13 @@ # class Vote < ActiveRecord::Base - before_destroy :dec_class_votes + validates_presence_of :thing + validates_uniqueness_of :thing_id, :scope => [:thing_type, :sessionid], :message => 'already voted' + + belongs_to :thing, :polymorphic => true, :counter_cache => :votes - def voted_object - eval(read_attribute('class')).find(self.relation_id) - end - - def self.vote(ob, sessionid = rand(99999999)) - return false unless ob.is_a? ActiveRecord::Base - return false if Vote.find(:first, - :conditions => ['class = ? and sessionid = ? and relation_id = ?', ob.class.class_name, sessionid, ob.id]) - ob.class.increment_counter('votes', ob.id) if ob.class.column_names.include? "votes" - return Vote.create( { :class => ob.class.class_name, :sessionid => sessionid, :relation_id => ob.id } ) - end - - private - - def dec_class_votes - obclass = eval(read_attribute('class')) - obclass.decrement_counter('votes', relation_id) if obclass.column_names.include? "votes" + def self.vote!(thing, sessionid = rand(99999999)) + Vote.create!(:thing => thing, :sessionid => sessionid) end end app/models/vote.rb @@ -4,7 +4,7 @@ on <strong><%= @article.created_at.utc.to_s(:long) %> (UTC)</strong> and has <strong><%= @article.versions_count %> versions</strong>.</p <p>It has <span id="reccounter<%=@va.id %>"><%= @va.votes %> recommendations</span> - <span id="recommend-<%=@va.id %>"> - <%= link_to_remote 'Recommend this revision', { :url => { :controller => 'news_articles', :action => 'vote', :id => @va.id } }, + <%= link_to_remote 'Recommend this revision', { :url => vote_version_url(@va) }, :title => "Vote for this revision" %>. </span> </p> app/views/versions/diff.html.erb @@ -5,7 +5,7 @@ ActionController::Routing::Routes.draw do |map| map.diff 'articles/:article_id/diff/:version_b/:version_a', :controller => 'versions', :action => 'diff' - map.resources :versions + map.resources :versions, :member => { :vote => :post } map.resources :articles, :controller => :news_articles do |article| article.resources :versions config/routes.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090628191505) do +ActiveRecord::Schema.define(:version => 20090705092959) do create_table "comments", :force => true do |t| t.string "name", :limit => 64 @@ -94,12 +94,10 @@ ActiveRecord::Schema.define(:version => 20090628191505) do create_table "votes", :force => true do |t| t.string "sessionid", :limit => 32 t.datetime "created_at" - t.string "class", :limit => 32 - t.integer "relation_id" + t.string "thing_class", :limit => 32 + t.integer "thing_id" end - add_index "votes", ["class"], :name => "votes_class_index" - add_index "votes", ["relation_id"], :name => "votes_relation_id_index" - add_index "votes", ["sessionid"], :name => "votes_sessionid_index" + add_index "votes", ["thing_id", "thing_class", "sessionid"], :name => "index_votes_on_thing_id_and_thing_class_and_sessionid" end db/schema.rb app/views/news_articles/vote.rjs 8650c61234ec3160e24f5b615ebf0dd6cdbe89be John Leach john@johnleach.co.uk http://github.com/johnl/news-sniffer/commit/a431bf77fa5dd8394523cc0f53960b3c9384e60d a431bf77fa5dd8394523cc0f53960b3c9384e60d 2009-07-05T10:48:05-07:00 2009-07-05T10:48:05-07:00 Updated Vote model to use new Rails features ee9a4f4f3dd69385fbb03a159ff0d8f54a04298a John Leach john@johnleach.co.uk