@@ -13,7 +13,13 @@ class PackagesController < ApplicationController params[:search] = @search_term end - @packages = Package.paginating_search(@search_term, page_no) + options = {} + if params[:popcon] + options = {:order => "score DESC, package_users_count DESC"} + end + + @packages = Package.paginating_search(@search_term, page_no, options) + @title = "#{Package.count} R packages" respond_to do |format| @@ -81,6 +87,7 @@ class PackagesController < ApplicationController def toggle_usage @package = Package.find_by_param(params[:id]) usage = self.current_user.toggle_usage(@package) + @package.update_score! flash[:notice] = (usage ? "Thanks!" : "You no longer use this package") redirect_to(@package) end app/controllers/packages_controller.rb @@ -28,6 +28,7 @@ class Package < ActiveRecord::Base has_many :versions, :order => "id DESC", :dependent => :destroy has_many :package_ratings, :dependent => :destroy has_many :package_users, :dependent => :destroy + alias :users :package_users has_many :reviews, :dependent => :destroy has_many :taggings, :dependent => :destroy has_many :tags, :through => :taggings, :uniq => true do @@ -54,6 +55,10 @@ class Package < ActiveRecord::Base :conditions => "#{self.table_name}.created_at IS NOT NULL", :limit => 50 + named_scope :most_popular, :order => "score DESC, package_users_count DESC", + :include => :latest_version, + :limit => 5 + validates_presence_of :name validates_uniqueness_of :name validates_length_of :name, :in => 2..255 @@ -191,4 +196,8 @@ class Package < ActiveRecord::Base score end + def update_score! + self.update_attribute(:score, self.calculate_score) + end + end app/models/package.rb @@ -28,6 +28,9 @@ class PackageRating < ActiveRecord::Base validates_format_of :rating, :with => /^[1-5]$/ validates_inclusion_of :aspect, :in => %w(overall documentation) + after_create lambda { |obj| obj.package.update_score! } + after_update lambda { |obj| obj.package.update_score! } + # Calculates the average rating for a given package def self.calculate_average(package_id, aspect="overall") average('rating', :conditions => ["aspect = ? AND package_id = ?", app/models/package_rating.rb @@ -14,7 +14,7 @@ # Parts of this code has been derived from the vote_fu plugin class PackageUser < ActiveRecord::Base - belongs_to :package, :counter_cache => true + belongs_to :package belongs_to :user named_scope :active, :conditions => { :active => true } @@ -34,4 +34,7 @@ class PackageUser < ActiveRecord::Base validates_existence_of :package_id validates_existence_of :user_id + # Can't use counter cache because it makes the attribute read-only + after_create lambda { |obj| obj.package.increment(:package_users_count) } + end app/models/package_user.rb @@ -136,7 +136,12 @@ class User < ActiveRecord::Base usage = PackageUser.find(:first, :conditions => { :user_id => self, :package_id => pkg }) - return usage.toggle!(:active) && usage.active if usage + if usage + res = usage.toggle!(:active) && usage.active + res ? pkg.increment(:package_users_count) : pkg.decrement(:package_users_count) + pkg.save + return res + end self.package_users << PackageUser.new(:package => pkg) true end app/models/user.rb @@ -3,6 +3,15 @@ to <span class="red">crantastic</span>, a community site for R packages where you can search for, review and tag CRAN packages. +%div(style="margin: 15px 0 15px 0") + %h1(style="font-size: 220%") Most popular packages + %ul.tags.cloud + - Package.most_popular.each_with_index do |pkg, i| + %li + = "#{i+1}. #{link_to pkg, pkg}" + %li + \...#{link_to "more!", popcon_url, :style => "background: transparent"} + %h1(style="font-size: 220%") Recent activity #timeline= render :partial => "paginated_events", :locals => { :events => @timeline_events } app/views/timeline_events/index.html.haml @@ -52,6 +52,7 @@ ActionController::Routing::Routes.draw do |map| map.activate '/activate/:activation_code', :controller => 'users', :action => 'activate' map.login '/login', :controller => 'sessions', :action => 'new' map.logout '/logout', :controller => 'sessions', :action => 'destroy' + map.popcon '/popcon', :controller => 'packages', :action => 'index', :popcon => '1' map.connect ':controller/:action/:id.:format' config/routes.rb @@ -38,6 +38,7 @@ describe PackagesController do login_as_user(:id => 1, :login => "test") pkg_mock = mock_model(Package) + pkg_mock.should_receive(:update_score!) controller.instance_eval do current_user.should_receive(:toggle_usage).with(pkg_mock).and_return(true) end spec/controllers/packages_controller_spec.rb ded0dabc22bfcfaedb31d2df20b9c1d9dd0182e6 Bjørn Arild Mæland bjorn.maeland@gmail.com http://github.com/hadley/crantastic/commit/962e6b76678a04309acbc1ba0b2d277679dd00c0 962e6b76678a04309acbc1ba0b2d277679dd00c0 2009-10-10T14:56:56-07:00 2009-10-10T14:56:56-07:00 Now updating packages scores when ratings/usages are updated. Also displaying most popular packages on the front page. 24f9ab150298a8902ebc3a2e3a5ad5db6da7842f Bjørn Arild Mæland bjorn.maeland@gmail.com