community_engine 2.3.1 → 2.3.2

data/db/migrate/090_add_comment_role.rb

@@ -0,0 +1,15 @@
+class AddCommentRole < ActiveRecord::Migration
+
+  def self.up
+    add_column :comments, :role, :string, :default => 'comments'
+  end
+
+  def self.down
+    remove_column :comments, :role
+  end
+
+end
+
+
+
+

data/lib/community_engine/authenticated_system.rb

@@ -1,19 +1,19 @@
 module AuthenticatedSystem
   def update_last_seen_at
      return unless logged_in?
-     User.update_all ['sb_last_seen_at = ?', Time.now.utc], ['id = ?', current_user.id] 
+     User.update_all ['sb_last_seen_at = ?', Time.now.utc], ['id = ?', current_user.id]
      current_user.sb_last_seen_at = Time.now.utc
   end
-  
+
   def login_by_token
   end
-      
+
   protected
     # Returns true or false if the user is logged in.
     def logged_in?
       current_user ? true : false
     end
-    
+
     # Accesses the current user from the session.
     def current_user
       return @current_user if defined?(@current_user)
@@ -23,7 +23,7 @@ module AuthenticatedSystem
     # Create a user session without credentials.
     def current_user=(user)
       return if current_user # Use act_as_user= to switch to another user account
-      @current_user_session = UserSession.create(user, true)
+      @current_user_session = UserSession.create(user)
       @current_user = @current_user_session.record
     end
 
@@ -76,9 +76,9 @@ module AuthenticatedSystem
      logged_in? && current_user.admin?
     end
     def moderator?
-     logged_in? && current_user.moderator?      
+     logged_in? && current_user.moderator?
     end
-    
+
     # Redirect as appropriate when an access request fails.
     #
     # The default action is to redirect to the login screen.
@@ -99,19 +99,19 @@ module AuthenticatedSystem
           render :text => "Couldn't authenticate you", :status => '401 Unauthorized'
         end
         accepts.js do
-          store_location 
+          store_location
           render :update do |page|
             page.redirect_to login_path
           end and return false
-        end        
+        end
       end
       false
     end
-    
+
     # Inclusion hook to make #current_user and #logged_in?
     # available as ActionView helper methods.
     def self.included(base)
-      base.send :helper_method, :current_user, :current_user_session, :logged_in?, :admin?, :moderator?
+      base.send :helper_method, :current_user=, :current_user, :current_user_session, :logged_in?, :admin?, :moderator?
     end
 
     private

data/lib/community_engine/engines_extensions.rb

@@ -1,7 +1,19 @@
 module EnginesExtensions
 
   def require_from_ce(path)
-    require_dependency CommunityEngine::Engine.config.root.join('app', path).to_s    
+    require_dependency CommunityEngine::Engine.config.root.join('app', path).to_s
   end
-  
+
+  def acts_as_moderated_commentable
+    acts_as_commentable :published, :pending
+    has_many :comments, {
+      :as => :commentable,
+      :dependent => :destroy,
+      :conditions => "role != 'pending'",
+      :before_add => Proc.new { |x, c| c.role = 'published' }
+    }
+    attr_protected :role
+  end
+
+
 end

data/lib/community_engine/version.rb

@@ -2,7 +2,7 @@ module CommunityEngine
   module Version
      MAJOR = 2
      MINOR = 3
-     PATCH = 1
+     PATCH = 2
      BUILD = nil
 
      STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/lib/tasks/community_engine_tasks.rake

@@ -1,7 +1,7 @@
 require 'rake/clean'
 
-namespace :community_engine do   
-  
+namespace :community_engine do
+
   desc  'Assign admin role to user. Usage: rake community_engine:make_admin email=admin@foo.com'
   task :make_admin => :environment do
     email = ENV["email"]
@@ -14,74 +14,5 @@ namespace :community_engine do
       puts "There is no user with the e-mail '#{email}'."
     end
   end
-      
-  # desc 'Test the community_engine plugin.'
-  # Rake::TestTask.new(:test) do |t|         
-  #   t.libs << 'lib'
-  #   t.pattern = 'vendor/plugins/community_engine/test/**/*_test.rb'
-  #   t.verbose = true    
-  # end
-  # Rake::Task['community_engine:test'].comment = "Run the community_engine plugin tests."
-  
-  # namespace :db do
-  #   namespace :fixtures do
-  #     desc "Load community engine fixtures"
-  #     task :load => :environment do
-  #       require 'active_record/fixtures'
-  #       ActiveRecord::Base.establish_connection(Rails.env.to_sym)
-  #       Dir.glob(File.join(Rails.root, 'vendor', 'plugins', 'community_engine','test','fixtures', '*.{yml,csv}')).each do |fixture_file|
-  #         Fixtures.create_fixtures('vendor/plugins/community_engine/test/fixtures', File.basename(fixture_file, '.*'))
-  #       end
-  #     end
-  #   end
-  # end
-  
-  # namespace :db do
-  #   namespace :migrate do 
-  #           
-  #     desc 'For CE coming from version < 1.0.1 that stored plugin migration info in the normal Rails schema_migrations table. Move that info back into the plugin_schema_migrations table.'
-  #     task :upgrade_desert_plugin_migrations => :environment do
-  #       plugin_migration_table = Desert::PluginMigrations::Migrator.schema_migrations_table_name
-  #       schema_migration_table = ActiveRecord::Migrator.schema_migrations_table_name
-  #         
-  #       unless ActiveRecord::Base.connection.table_exists?(plugin_migration_table)
-  #         ActiveRecord::Migration.create_table(plugin_migration_table, :id => false) do |schema_migrations_table|
-  #           schema_migrations_table.column :version, :string, :null => false
-  #           schema_migrations_table.column :plugin_name, :string, :null => false            
-  #         end
-  #       end
-  # 
-  #       def insert_new_version(plugin_name, version, table)
-  #         # Check if the row already exists for some reason - maybe run this task more than once.
-  #         return if ActiveRecord::Base.connection.select_rows("SELECT * FROM #{table} WHERE version = #{version} AND plugin_name = '#{plugin_name}'").size > 0
-  # 
-  #         puts "Inserting new version #{version} for plugin #{plugin_name} in #{table}."
-  #         ActiveRecord::Base.connection.insert("INSERT INTO #{table} (plugin_name, version) VALUES ('#{plugin_name}', #{version.to_i})")
-  #       end
-  #       
-  #       def remove_old_version(plugin_name, version, table)
-  #         puts "Removing old version #{version} for plugin #{plugin_name} in #{table}."          
-  #         ActiveRecord::Base.connection.execute("DELETE FROM #{table} WHERE version = '#{version}-#{plugin_name}'")
-  #       end
-  # 
-  #       existing_migrations = ActiveRecord::Base.connection.select_rows("SELECT * FROM #{schema_migration_table}").uniq
-  #       migrations = {}
-  #       existing_migrations.flatten.each do |m|
-  #         plugin_version, plugin_name = m.split('-')
-  #         next if plugin_name.blank?
-  #         migrations[plugin_name] ||= []
-  #         migrations[plugin_name] << plugin_version
-  #       end
-  #       
-  #       migrations.each do |plugin_name, versions|
-  #         versions.each do |version|
-  #           insert_new_version(plugin_name, version, plugin_migration_table)
-  #           remove_old_version(plugin_name, version, schema_migration_table)
-  #         end
-  #       end
-  # 
-  #     end
-  #   end
-  # end
 
-end
+end

data/test/functional/authorizations_controller_test.rb

@@ -0,0 +1,60 @@
+require 'test_helper'
+
+class AuthorizationsControllerTest < ActionController::TestCase
+  fixtures :all
+
+  setup do
+    OmniAuth.config.test_mode = true
+  end
+
+
+
+  test 'should create new authorization and log in' do
+
+    set_ommniauth
+
+    get :create
+
+    user = UserSession.find.record
+    assert_redirected_to user_path(user)
+  end
+
+  test 'should find existing authorization and log in' do
+    quentin = users(:quentin)
+    Authorization.create_from_hash(auth_hash(quentin.email), quentin)
+    set_ommniauth(quentin.email)
+
+    get :create
+
+    assert_redirected_to user_path(quentin)
+  end
+
+  test 'should authorize existing logged-in user' do
+    quentin = users(:quentin)
+    login_as :quentin
+
+    set_ommniauth(quentin.email)
+
+    get :create
+
+    assert_redirected_to user_path(quentin)
+  end
+
+
+  def set_ommniauth(email='email@example.com')
+    OmniAuth.config.mock_auth[:facebook] = auth_hash(email)
+    request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:facebook]
+  end
+
+  def auth_hash(email)
+    {
+      'provider' => 'facebook',
+      "info" => {
+        'nickname'  => 'Omniauth-user',
+        'email' => email
+      },
+      'uid' => '123545'
+    }
+  end
+
+end

data/test/functional/comments_controller_test.rb

@@ -2,60 +2,37 @@ require 'test_helper'
 
 class CommentsControllerTest < ActionController::TestCase
   fixtures :users, :photos, :posts, :comments, :roles
-    
-  def test_should_create_user_comment_with_notification
-    login_as :aaron
-    assert_difference Comment, :count, 1 do
-      assert_difference ActionMailer::Base.deliveries, :length, 1 do
-        create_user_comment
-      end
-    end
-    assert_response :redirect
-  end
-  
-  def test_should_create_user_comment_and_notify_previous_commenters
-    login_as :dwr
-    # aaron should get a notification, because he's being commented on
-    # quentin should get one too, because he previously commented on the profile
-    assert_difference ActionMailer::Base.deliveries, :length, 2 do
-      create_user_comment(:user_id => users(:aaron).id)
-    end
-  end  
 
-  def test_should_create_user_comment_without_notification
-    users(:quentin).notify_comments = false
-    users(:quentin).save!
+  def test_should_create_user_comment
     login_as :aaron
     assert_difference Comment, :count, 1 do
-      assert_no_difference ActionMailer::Base.deliveries, :length do
         create_user_comment
-      end
     end
     assert_response :redirect
   end
-    
+
   def test_should_fail_to_create_user_comment
     login_as :aaron
     assert_no_difference Comment, :count do
       create_user_comment(:comment => {:comment => nil})
-    end    
-    assert_response :redirect    
+    end
+    assert_response :redirect
   end
-  
+
   def test_should_create_photo_comment
     login_as :aaron
     assert_difference Comment, :count, 1 do
       create_photo_comment
     end
-    assert_response :redirect    
+    assert_response :redirect
   end
-  
+
   def test_should_fail_to_create_photo_comment
     login_as :aaron
     assert_no_difference Comment, :count do
       create_photo_comment(:comment => {:comment => nil})
-    end    
-    assert_response :redirect    
+    end
+    assert_response :redirect
   end
 
   def test_should_create_post_comment
@@ -63,41 +40,41 @@ class CommentsControllerTest < ActionController::TestCase
     assert_difference Comment, :count, 1 do
       create_post_comment
     end
-    assert_response :redirect    
+    assert_response :redirect
   end
-  
+
   def test_should_destroy_post_comment
     login_as :quentin
     assert_difference Comment, :count, -1 do
       delete :destroy, :commentable_type => 'Post', :commentable_id => comments(:quentins_comment_on_his_own_post).commentable_id, :id => comments(:quentins_comment_on_his_own_post)
     end
   end
-  
+
   def test_should_not_destroy_post_comment
     login_as :aaron
     assert_no_difference Comment, :count do
       delete :destroy, :commentable_type => 'Post', :commentable_id => comments(:quentins_comment_on_his_own_post).commentable_id, :id => comments(:quentins_comment_on_his_own_post)
     end
   end
-  
+
   def test_should_fail_to_create_post_comment
     login_as :aaron
     assert_no_difference Comment, :count do
       create_post_comment(:comment => {:comment => nil})
-    end    
-    assert_response :redirect    
+    end
+    assert_response :redirect
   end
 
   def test_should_fail_to_create_comment
     login_as :aaron
-    assert_raises(NameError) do 
+    assert_raises(NameError) do
       create_post_comment(:commentable_type => 'unkown_commentable_type')
     end
   end
 
   def test_should_show_comments_index
     login_as :quentin
-    get :index, :commentable_type => 'users', :commentable_id => users(:aaron).to_param    
+    get :index, :commentable_type => 'users', :commentable_id => users(:aaron).to_param
     assert_response :success
     assert !assigns(:comments).empty?
   end
@@ -108,14 +85,14 @@ class CommentsControllerTest < ActionController::TestCase
     assert_response :success
     assert !assigns(:comments).empty?
   end
-  
+
   def test_should_show_empty_comments_index
     login_as :aaron
-    get :index, :commentable_type => 'users', :commentable_id => users(:quentin).to_param    
+    get :index, :commentable_type => 'users', :commentable_id => users(:quentin).to_param
     assert_response :success
     assert assigns(:comments).empty?
   end
-  
+
   def test_should_show_empty_comments_index_rss
     login_as :aaron
     get :index, :commentable_type => 'users', :commentable_id => users(:quentin).to_param, :format => 'rss'
@@ -125,41 +102,41 @@ class CommentsControllerTest < ActionController::TestCase
 
   def test_should_show_private_comments_index_if_logged_in
     login_as :quentin
-    get :index, :commentable_type => 'users', :commentable_id => users(:privateuser).to_param    
-    assert !assigns(:comments).empty?    
+    get :index, :commentable_type => 'users', :commentable_id => users(:privateuser).to_param
+    assert !assigns(:comments).empty?
     assert_response :success
   end
 
   def test_should_not_show_private_comments_index
-    get :index, :commentable_type => 'users', :commentable_id => users(:privateuser).to_param    
+    get :index, :commentable_type => 'users', :commentable_id => users(:privateuser).to_param
     assert_response :redirect
   end
-  
+
   def test_should_show_comments_index_rss_if_logged_in
     login_as :quentin
     get :index, :commentable_type => 'users', :commentable_id => users(:aaron).to_param, :format => 'rss'
     assert !assigns(:comments).empty?
     assert_response :success
   end
-  
+
   def test_should_unsubscribe_with_token
     configatron.allow_anonymous_commenting = true
     comment = Comment.create!(:comment => 'foo', :author_email => 'bar@foo.com', :author_ip => '123.123.123', :recipient => users(:quentin), :commentable => users(:quentin), :notify_by_email => true)
     configatron.allow_anonymous_commenting = false
-        
+
     get :unsubscribe, :commentable_type => comment.commentable_type, :commentable_id => comment.commentable_id, :id => comment.id, :token => comment.token_for('bar@foo.com'), :email => 'bar@foo.com'
     assert comment.reload.notify_by_email.eql?(false)
   end
-  
+
   def test_should_not_unsubscribe_with_bad_token
     configatron.allow_anonymous_commenting = true
     comment = Comment.create!(:comment => 'foo', :author_email => 'bar@foo.com', :author_ip => '123.123.123', :recipient => users(:quentin), :commentable => users(:quentin), :notify_by_email => true)
     configatron.allow_anonymous_commenting = false
-        
-    get :unsubscribe, :commentable_type => 'User', :commentable_id => users(:quentin).to_param, :id => comment.id, :token => 'badtokengoeshere' 
-    assert comment.reload.notify_by_email.eql?(true)    
+
+    get :unsubscribe, :commentable_type => 'User', :commentable_id => users(:quentin).to_param, :id => comment.id, :token => 'badtokengoeshere'
+    assert comment.reload.notify_by_email.eql?(true)
   end
-  
+
   def test_should_get_edit_js_as_admin
     login_as :admin
     get :edit, :id => comments(:quentins_comment_on_his_own_post), :format => 'js'
@@ -170,42 +147,42 @@ class CommentsControllerTest < ActionController::TestCase
     login_as :admin
     edited_text = 'edited the comment body'
     put :update, :id => comments(:quentins_comment_on_his_own_post), :comment => {:comment => edited_text}, :format => 'js'
-    
+
     assert assigns(:comment).comment.eql?(edited_text)
     assert_response :success
   end
-  
+
   def test_should_not_update_if_not_admin_or_moderator
     login_as :quentin
-    
-    edited_text = 'edited the comment body'    
+
+    edited_text = 'edited the comment body'
     put :update, :id => comments(:quentins_comment_on_his_own_post), :comment => {:comment => edited_text}, :format => "js"
-    
+
     assert_response :success #js redirect
     assert_not_equal(comments(:quentins_comment_on_his_own_post).comment, edited_text)
   end
 
 
-  
+
   protected
-    
+
   def create_user_comment(options = {})
-    post :create, {:commentable_type => (options[:commentable_type] || "users"), 
-        :commentable_id => (options[:user_id] || users(:quentin).id), 
+    post :create, {:commentable_type => (options[:commentable_type] || "users"),
+        :commentable_id => (options[:user_id] || users(:quentin).id),
         :comment => {:title => "test comment to quentin", :comment => "hey man, how are you?"}.merge(options[:comment] || {})
       }
   end
 
   def create_photo_comment(options = {})
-    post :create, {:commentable_type => (options[:commentable_type] || "photos"), 
-        :commentable_id => (options[:photo_id] || photos(:library_pic).id), 
+    post :create, {:commentable_type => (options[:commentable_type] || "photos"),
+        :commentable_id => (options[:photo_id] || photos(:library_pic).id),
         :comment => {:title => "test comment on a photo", :comment => "hey man, nice pic?"}.merge(options[:comment] || {})
       }
   end
 
   def create_post_comment(options = {})
-    post :create, {:commentable_type => (options[:commentable_type] || "posts"), 
-        :commentable_id => (options[:post_id] || posts(:funny_post).id), 
+    post :create, {:commentable_type => (options[:commentable_type] || "posts"),
+        :commentable_id => (options[:post_id] || posts(:funny_post).id),
         :comment => {:title => "test comment on a posts", :comment => "hey man, nice posts?"}.merge(options[:comment] || {})
       }
   end