db/migrate/007_remove_user_from_ratings.rb test/functional/member/rates_controller_test.rb @@ -9,6 +9,7 @@ Edge * Caching Tog::Config values * Installation template now asks about installing gems as sudo * new generator for creating plugin's migrations, on installation and after updates +* using acts_as_rateable and acts_as_shareable as plugins, which fixes problem with timestamps while installing 0.5.4 ---- CHANGELOG.md @@ -5,16 +5,11 @@ class Member::RatesController < Member::BaseController id = params[:id] rateable = type.constantize.find(id) - if(!rateable.ratings.include?(Rating.find_by_user_id(current_user.id))) - rating = rateable.rate params[:rate] - rating.user_id = current_user.id - if rating.save - flash[:ok] = I18n.t("tog_core.site.rating.added") - else - flash[:error] = I18n.t("tog_core.site.rating.error") - end - else + if rateable.rated_by?(current_user) == true flash[:error] = I18n.t("tog_core.site.rating.already_rated") + else + rateable.rate_it params[:rate], current_user + flash[:ok] = I18n.t("tog_core.site.rating.added") end respond_to do |format| format.html { redirect_to request.referer } app/controllers/member/rates_controller.rb @@ -1,6 +1,5 @@ -<%if rateable.total_ratings > 0%> - <strong><%= I18n.t("tog_core.site.rating.rating")%></strong><br/> - <%= rateable.rating%><br/> +<%if rateable.ratings_count > 0%> + <strong><%= I18n.t("tog_core.site.rating.rating")%></strong>: <%= rateable.average_rating %><br/> <%end%> <%if logged_in? %> <%= [1,2,3,4,5].collect{|i| rate_link(rateable, i) + " "}%> app/views/shared/_rating.html.erb @@ -1,7 +1,6 @@ require_plugin 'acts_as_scribe' require_plugin 'acts_as_taggable_on_steroids' require_plugin 'acts_as_abusable' -require_plugin 'acts_as_rateable' require_plugin 'viking' # require the will_paginate as a gem. This could be ´config.gem´ as well. init.rb @@ -3,7 +3,6 @@ require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environme require 'test_help' require 'test/unit' require 'action_view/test_case' -require 'mocha' begin gem 'thoughtbot-shoulda', '>=2.10.1' test/test_helper.rb @@ -69,7 +69,8 @@ def install_require_gems gem 'tog-tog', :lib => 'tog', :version => '>= 0.5' gem 'thoughtbot-factory_girl', :lib => 'factory_girl' gem 'jackdempsey-acts_as_commentable', :lib => 'acts_as_commentable', :version => '2.0.1' - + gem "mreinsch-acts_as_rateable", :lib => "acts_as_rateable", :version => '2.0.1' + puts "\n" if yes?("Install required gems as root? (y/n)") rake "gems:install", :sudo => true @@ -102,47 +103,12 @@ def install_acts_as_commentable end def generate_acts_as_rateable_migration - sleep 1 # Template runner is too fast and generate multiple migrations with the same number - file "db/migrate/" + Time.now.strftime("%Y%m%d%H%M%S") + "_add_ratings.rb", - %q{class AddRatings < ActiveRecord::Migration - def self.up - create_table :ratings do |t| - t.column :rating, :integer # You can add a default value here if you wish - t.column :rateable_id, :integer, :null => false - t.column :rateable_type, :string, :null => false - end - add_index :ratings, [:rateable_id, :rating] # Not required, but should help more than it hurts - end - - def self.down - drop_table :ratings - end - end - } + generate "acts_as_rateable_migration " puts "* acts_as_rateable migration... #{"generated".green.bold}"; end def generate_acts_as_shareable_migration - sleep 1 # Template runner is too fast and generate multiple migrations with the same number - file "db/migrate/" + Time.now.strftime("%Y%m%d%H%M%S") + "_create_shares.rb", - %q{class CreateShares < ActiveRecord::Migration - def self.up - create_table :shares, :force => true do |t| - t.column :user_id, :integer - t.column :shareable_type, :string, :limit => 30 - t.column :shareable_id, :integer - t.column :shared_to_type, :string, :limit => 30 - t.column :shared_to_id, :integer - t.column :created_at, :datetime - t.column :updated_at, :datetime - end - end - - def self.down - drop_table :shares - end - end - } + generate "share_migration" puts "* acts_as_shareable migration... #{"generated".green.bold}"; end @@ -283,12 +249,11 @@ installation_step "Installing plugin dependencies..." do install_git_plugins({ 'acts_as_taggable_on_steroids' => "git://github.com/jviney/acts_as_taggable_on_steroids.git", - 'acts_as_rateable' => "git://github.com/andry1/acts_as_rateable.git", 'acts_as_abusable' => "git://github.com/linkingpaths/acts_as_abusable.git", 'acts_as_scribe' => "git://github.com/linkingpaths/acts_as_scribe.git", 'paperclip' => "git://github.com/thoughtbot/paperclip.git", 'viking' => "git://github.com/technoweenie/viking.git", - 'acts_as_shareable' => "git://github.com/IamPersistent/acts_as_shareable.git" + 'acts_as_shareable' => "git://github.com/molpe/acts_as_shareable.git" }) end tog_template.rb 11a4c3dcbc2e69c06f69e2ed46e54203a362e4e4 Alberto Molpeceres alberto.molpeceres@gmail.com http://github.com/tog/tog_core/commit/67a28fb7e7461e6141b8a279337bb0b0af532f4e 67a28fb7e7461e6141b8a279337bb0b0af532f4e 2009-09-27T14:33:29-07:00 2009-09-27T14:33:29-07:00 using acts_as_ratable as gem and changed repo for acts_As_shareable. Usig a different version of acts_as_rateable, hard migration required for ratings if upgrading 3ee1f809f364cbcb11c4d363f8de664ce5a0dc98 Alberto Molpeceres alberto.molpeceres@gmail.com