community_engine 2.3.1 → 2.3.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjU1NTFjMTI0MzAzMmE4ZGFjNWJhZTIxOWRlMzdjOTgyOTQwMzRjMQ==
-  data.tar.gz: !binary |-
-    N2YyNjY5YTliNTE0N2Q1YTNmOTY1ZTcwMzcwNzRhYjg5ODJiNDY1OA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NTdmZGFlZTY4NzgyZDFkYTNmZGIzZjI4ZjM1MTU2MmVjOTE4NmJlMzk2Yjhj
-    NDI3YWM0MzRiMzBjYmY0ZjA3ZTQ5NzgwZDZjMTEyNjE5ZTM5NWRlMzZiMDA4
-    MWU4OWY5N2IyM2M2OTlmODllMjU3ZTc2YzFkMGY4Njk3NmZiNzk=
-  data.tar.gz: !binary |-
-    MTgyNDJlYzYwYmY4MTMzOTY3MTM5OWI2MjgyZDUyOTk0NDc5NjBhY2VlYWVi
-    YTQzM2FkMjcxOWUwMDA4YjhiYmM1NGNlZmM0OTZkOGExMWQ3ZDA0N2FlODll
-    ZTZmNDQ5ZWE1NTUxNjQyMDdmYWMxMDQ0ZDY2NTZmOTQ4OTgwNjI=
+SHA1:
+  metadata.gz: b9de87bef90a83355c574952e438ec062645ae69
+  data.tar.gz: 8d5b30da07b1907ddf84009ef4f23b8babb1ce27
+SHA512:
+  metadata.gz: 39d7289ca53c143fe0add0222ecabb3b3c474375f1b39e436fd022e32795261117ecb6b9b2adafdf5005fef927260a9fd70641f12306199c775e1a0f6e2b13f2
+  data.tar.gz: f5448eb0f8fa19a45098cf884fc82075c6ac19de9e7704c677ea0b58ab1d4a2ed72b219a5f6e51e35d105c3f1f8f6af7b8a13ae6b30415963cccd45cf9e75e18

data/.travis.yml

@@ -1,10 +1,10 @@
 bundler_args: --binstubs
 
 rvm:
-  - 1.9.2
+  - 1.9.3
   - 2.0.0
 env:
   - "RAILS_ENV='test' RAILS_VERSION=3.2.0"
-  - "RAILS_ENV='test' RAILS_VERSION=3.2.14"
+  - "RAILS_ENV='test' RAILS_VERSION=3.2.19"
 
 script: "bundle exec rake db:drop db:create db:migrate test"

data/CHANGELOG

@@ -7,6 +7,7 @@
 
 =2.3.1
 * Remove automatic loading of omniauth middleware, in favor of letting users load it themselves as specified in the README (this was causing bugs with duplicate inits of omniauth-facebook middleware)
+* Add spam comment moderation (comments identified as spam as held in 'pending status')
 
 =2.3.0
 * Upgrade omniauth to 1.1

data/Gemfile

@@ -1,9 +1,11 @@
 source 'http://rubygems.org'
 
 gem 'omniauth-facebook'
+gem 'acts_as_commentable', :git => 'https://github.com/jackdempsey/acts_as_commentable'
 
 group :test do
   gem 'sqlite3'
+  gem 'mocha', :require => false
 end
 
 rails_version = ENV["RAILS_VERSION"] || "default"

data/README.markdown

@@ -1,69 +1,84 @@
-** Using Rails 2.x? You want the [rails2.x branch](https://github.com/bborn/communityengine/tree/rails2.x)
+CommunityEngine
+===============
 
-CommunityEngine [![Build Status](https://secure.travis-ci.org/bborn/communityengine.png)](http://travis-ci.org/bborn/communityengine)
+[![Build Status](https://travis-ci.org/bborn/communityengine.svg?branch=master)](https://travis-ci.org/bborn/communityengine)
+[![Gem Version](https://badge.fury.io/rb/community_engine.svg)](https://badge.fury.io/rb/community_engine)
 
 Information at: [http://www.communityengine.org](http://www.communityengine.org)
 
-Requirements:
+**Requirements:**
 
 	- RAILS VERSION 3.2.8
 
+For Rails 2.x use the [rails2.x branch](https://github.com/bborn/communityengine/tree/rails2.x)
+
+For Rails 4.x use the [rails4 branch](https://github.com/bborn/communityengine/tree/rails4)
+
 Getting CommunityEngine Running
 --------------------------------
 
 1. Copy the following into your `Gemfile`:
 
-    ```
-    gem 'community_engine'
-    ```
+  ```ruby
+  gem 'community_engine'
+  ```
 
 2. Add a file called `application_config.rb` to your `config` directory. In it put (at least):
 
-		configatron.community_name = "Your Application Name"
-		# See CE's application_config.rb to see all the other configuration options available
+  ```ruby
+  configatron.community_name = "Your Application Name"
+  # See CE's application_config.rb to see all the other configuration options available
+  ```
 
 3. From your app's root directory run:
 
-		$ bundle install --binstubs
-		$ bin/rake community_engine:install:migrations
-		$ bin/rake db:migrate
+  ```
+	$ bundle install --binstubs
+	$ bin/rake community_engine:install:migrations
+	$ bin/rake db:migrate
+  ```
 
 4. Mount CommunityEngine in your `config/routes.rb` file:
 
-		mount CommunityEngine::Engine => "/"
+  ```ruby
+  mount CommunityEngine::Engine => "/"
+  ```
 
 5. Delete the default `views/layouts/application.html.erb` that Rails created for you. Delete `public/index.html` if you haven't already.
 
 6. Start your server!
 
-		$ bin/rails server
+  ```
+	$ bin/rails server
+  ```
 
 Optional Configuration
-======================
+----------------------
 
-To override the default configuration, create an `application_config.rb` file in `Rails.root/config`
+To override the default configuration, create an `application_config.rb` file in `Rails.root/config`.
 
-The application configuration defined in this file overrides the one defined in the [CommunityEngine gem](https://github.com/bborn/communityengine/blob/rails3/config/application_config.rb)
+The application configuration defined in this file overrides the one defined in the [CommunityEngine gem](https://github.com/bborn/communityengine/blob/master/config/application_config.rb).
 
 This is where you can change commonly used configuration variables, like `configatron.community_name`, etc.
 
 
-OmniAuth Configuration:
-=======================
+OmniAuth Configuration
+----------------------
 
-You can allow users to sign up and log in using their accounts from other social networks (like Facbeook, Twitter, LinkedIn, etc.). To do so, just add an initializer in your app's `config/initializers` directory called `omniauth.rb`. In it, put:
-
-	Rails.application.config.middleware.use OmniAuth::Builder do
-	  provider :twitter, 'CONSUMER_KEY', 'CONSUMER_SECRET'
-	  provider :facebook, 'APP_ID', 'APP_SECRET'
-	  provider :linked_in, 'CONSUMER_KEY', 'CONSUMER_SECRET'
-	end
+You can allow users to sign up and log in using their accounts from other social networks (like Facbeook, Twitter, LinkedIn, etc.). To do so, just add an initializer in your app's `config/initializers` directory called `omniauth.rb` and add the following lines:
 
-You must also add the corresponding provider gem, for example to use facebook login you will need to add
+```ruby
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :twitter, configatron.auth_providers.twitter.key, configatron.auth_providers.twitter.secret
+  provider :facebook, configatron.auth_providers.facebook.key, configatron.auth_providers.facebook.secret, {:provider_ignores_state => true}
+end
+```
 
-		gem 'omniauth-facebook'
+You must also add the corresponding provider gem, for example to use facebook login you will need to add the following to your gemfile:
 
-to your gemfile
+```ruby
+gem 'omniauth-facebook'
+```
 
 See the [OmniAuth Github repository](https://github.com/intridea/omniauth) for more information and configuration options.
 
@@ -75,7 +90,7 @@ By default CommunityEngine uses the filesystem to store photos.
 
 To use Amazon S3 as the backend for your file uploads,you'll need to add a file called `s3.yml` to the application's root config directory (examples are in `/community_engine/sample_files`).
 
-You'll need to change your configuration in your `application_config.rb` to tell CommunityEngine to use s3 as the photo backend. For more, see the Paperclip documentation on S3 storage for uploads: https://github.com/thoughtbot/paperclip/blob/master/lib/paperclip/storage/s3.rb
+You'll need to change your configuration in your `application_config.rb` to tell CommunityEngine to use s3 as the photo backend. For more, see the Paperclip documentation on S3 storage for uploads: https://github.com/thoughtbot/paperclip/blob/master/lib/paperclip/storage/s3.rb.
 
 Finally, you'll need an S3 account for S3 photo uploading.
 
@@ -84,7 +99,7 @@ Finally, you'll need an S3 account for S3 photo uploading.
 Roles
 ------
 
-CommunityEngine Users have a Role (by default, it's admin, moderator, or member)
+CommunityEngine Users have a Role (by default, it's admin, moderator, or member).
 
 Once logged in as an admin, you'll be able to toggle other users between moderator and member (just go to their profile page and look on the sidebar.)
 
@@ -92,7 +107,9 @@ Admins and moderators can edit and delete other users posts.
 
 There is a rake task to make an existing user into an admin:
 
-	rake community_engine:make_admin email=user@foo.com
+```
+$ rake community_engine:make_admin email=user@foo.com
+```
 
 (Pass in the e-mail of the user you'd like to make an admin)
 
@@ -105,11 +122,15 @@ Localization is done via Rails native I18n API. We've added some extensions to S
 
 For complex strings with substitutions, Symbols respond to the `.l` method with a hash passed as an argument, for example:
 
-	:welcome.l :name => current_user.name
+```ruby
+:welcome.l :name => current_user.name
+```
 
 And in your language file you'd have:
 
-	welcome: "Welcome %{name}"
+```yaml
+welcome: "Welcome %{name}"
+```
 
 To customize the language, or add a new language create a new yaml file in `Rails.root/config/locales`. The name of the file should be `LANG-LOCALE.yml` (`e.g. en-US.yml` or `es-PR`). The language only file (`es.yml`) will support all locales.
 
@@ -121,17 +142,38 @@ Spam sucks. Most likely, you'll need to implement some custom solution to contro
 
 ReCaptcha: to allow non-logged-in commenting and use [ReCaptcha](http://recaptcha.net/) to ensure robots aren't submitting comments to your site, just add the following lines to your `application_config.rb`:
 
-    :allow_anonymous_commenting => true,
-    :recaptcha_pub_key => YOUR_PUBLIC_KEY,
-    :recaptcha_priv_key => YOUR_PRIVATE_KEY
+```ruby
+:allow_anonymous_commenting => true,
+:recaptcha_pub_key => YOUR_PUBLIC_KEY,
+:recaptcha_priv_key => YOUR_PRIVATE_KEY
+```
 
 You can also require ReCaptcha on signup (to prevent automated signups) by adding this in your `application_config.rb` (you'll still need to add your ReCaptcha keys):
 
-    :require_captcha_on_signup => true
+```ruby
+:require_captcha_on_signup => true
+```
 
 Akismet: Unfortunately, bots aren't the only ones submitting spam; humans do it too. [Akismet](http://akismet.com/) is a great collaborative spam filter from the makers of Wordpress, and you can use it to check for spam comments by adding one line to your `application_config.rb`:
 
-    :akismet_key => YOUR_KEY
+```ruby
+:akismet_key => YOUR_KEY
+```
+
+
+Ads
+------------
+
+Ads are snippets of HTML that will be inserted into your templates. You have to declare where they show up in your view. For example, if you wanted a sidebar ad slot, add ```Ad.display()``` in your application template (or wherever your sidebar is):
+
+```haml
+#sidebar
+  %h1 This is the sidebar
+
+  =Ad.display(:sidebar, logged_in?)
+```
+
+Then on the admin dashboard, create an ad and use "sidebar" as the location to target it to the :sidebar slot. You can create multiple ads for the same slot and they'll rotate according to their weight.
 
 
 Integrating with Your Application & Overriding CE
@@ -139,39 +181,41 @@ Integrating with Your Application & Overriding CE
 
 To make a controller from your application use CE's layout and inherit CE's helper methods, make it inherit from `BaseController`. For example:
 
-		class RecipesController < BaseController
+```ruby
+class RecipesController < BaseController
 
-			before_filter :login_required
+	before_filter :login_required
 
-			uses_tiny_mce do
-				{:only => [:show], :options => configatron.default_mce_options}
-			end
+	uses_tiny_mce do
+		{:only => [:show], :options => configatron.default_mce_options}
+	end
 
-		end
+end
+```
 
 To override or modify a controller, helper, or model from CE, you can use the `require_from_ce` helper method. For example, to override a method in CE's `User` model, create `app/models/user.rb`:
 
-		class User < ActiveRecordBase
-			require_from_ce('models/user')
-
-			#add a new association
-			has_many :recipes
+```ruby
+class User < ActiveRecord::Base
+	require_from_ce('models/user')
 
-			#override an existing method
-			def	display_name
-				login.capitalize
-			end
+	#add a new association
+	has_many :recipes
 
-		end
+	#override an existing method
+	def	display_name
+		login.capitalize
+	end
 
+end
+```
 
 
 
-Other notes
+Other Notes
 -----------
 
-Any views you create in your app directory will override those in CommunityEngine
-For example, you could create `Rails.root/app/views/layouts/application.html.haml` and have that include your own stylesheets, etc.
+Any views you create in your app directory will override those in CommunityEngine. For example, you could create `Rails.root/app/views/layouts/application.html.haml` and have that include your own stylesheets, etc.
 
 
 Contributors - Thanks! :)

data/about.yml

@@ -4,4 +4,4 @@ homepage: http://www.missingmethod.com
 summary: A social networking engine
 description: Adds basic social networking capabilities to your existing application, including users, blogs, photos, clippings, favorites, and more.
 license: MIT
-version: 2.0.0.beta3
+version: 2.3.2

data/app/controllers/authorizations_controller.rb

@@ -11,7 +11,8 @@ class AuthorizationsController < BaseController
       flash[:notice] = t('authorizations.create.success_existing_user', :provider => provider_name)
     elsif @auth.valid?
       flash[:notice] = t('authorizations.create.success_message', :provider => provider_name)
-      UserSession.create(@auth.user, true)
+      user_session = UserSession.create(@auth.user, true)
+      self.current_user = user_session.user
     end
 
     if logged_in?

data/app/controllers/base_controller.rb

@@ -6,9 +6,10 @@ class BaseController < ApplicationController
 
   include AuthenticatedSystem
   include LocalizedApplication
-  around_filter :set_locale  
+  include BaseHelper
+
+  around_filter :set_locale
   skip_before_filter :verify_authenticity_token, :only => :footer_content
-  helper_method :commentable_url
   before_filter :initialize_header_tabs
   before_filter :initialize_admin_tabs
   before_filter :store_location, :except => :footer_content
@@ -16,13 +17,13 @@ class BaseController < ApplicationController
   caches_action :site_index, :footer_content, :if => Proc.new{|c| c.cache_action? }
 
   def cache_action?
-    !logged_in? && controller_name.eql?('base') && params[:format].blank? 
-  end  
-  
+    !logged_in? && controller_name.eql?('base') && params[:format].blank?
+  end
+
   def rss_site_index
     redirect_to :controller => 'base', :action => 'site_index', :format => 'rss'
   end
-  
+
   def plaxo
     render :layout => false
   end
@@ -42,23 +43,23 @@ class BaseController < ApplicationController
                                          :pub_date => :published_at}
           })
       end
-    end    
+    end
   end
-  
+
   def footer_content
-    get_recent_footer_content 
-    render :partial => 'shared/footer_content' and return    
+    get_recent_footer_content
+    render :partial => 'shared/footer_content' and return
   end
-  
+
   def homepage_features
     @homepage_features = HomepageFeature.find_features
     @homepage_features.shift
     render :partial => 'homepage_feature', :collection => @homepage_features and return
   end
-    
+
   def advertise
   end
-  
+
   def css_help
   end
 
@@ -67,9 +68,9 @@ class BaseController < ApplicationController
     if block_given?
       options = block.call
     end
-    
+
     new_configuration = TinyMCE::Rails.configuration.merge(options.delete(:options)).options
-    
+
     # Set instance vars in the current class
     p = Proc.new do |c|
       configuration = c.instance_variable_get(:@tiny_mce_configuration) || {}
@@ -80,23 +81,23 @@ class BaseController < ApplicationController
 
     before_filter p, options
   end
-  
-  
+
+
   private
     def admin_required
       current_user && current_user.admin? ? true : access_denied
     end
-  
+
     def admin_or_moderator_required
       current_user && (current_user.admin? || current_user.moderator?) ? true : access_denied
     end
-  
+
     def find_user
       if @user = User.active.find(params[:user_id] || params[:id])
         @is_current_user = (@user && @user.eql?(current_user))
         unless logged_in? || @user.profile_public?
           flash[:error] = :private_user_profile_message.l
-          access_denied 
+          access_denied
         else
           return @user
         end
@@ -105,7 +106,7 @@ class BaseController < ApplicationController
         access_denied
       end
     end
-  
+
     def require_current_user
       @user ||= User.find(params[:user_id] || params[:id] )
       unless admin? || (@user && (@user.eql?(current_user)))
@@ -117,7 +118,7 @@ class BaseController < ApplicationController
     def popular_tags(limit = 20, type = nil)
       ActsAsTaggableOn::Tag.popular(limit, type)
     end
-  
+
 
     def get_recent_footer_content
       @recent_clippings = Clipping.find_recent(:limit => 10)
@@ -125,47 +126,34 @@ class BaseController < ApplicationController
       @recent_comments = Comment.find_recent(:limit => 13)
       @popular_tags = popular_tags(30)
       @recent_activity = User.recent_activity(:size => 15, :current => 1)
-    
+
     end
 
     def get_additional_homepage_data
       @sidebar_right = true
       @homepage_features = HomepageFeature.find_features
       @homepage_features_data = @homepage_features.collect {|f| [f.id, f.image.url(:large) ]  }
-    
+
       @active_users = User.find_by_activity({:limit => 5, :require_avatar => false})
       @featured_writers = User.find_featured
 
       @featured_posts = Post.find_featured
-    
+
       @topics = Topic.find(:all, :limit => 5, :order => "replied_at DESC")
 
-      @popular_posts = Post.find_popular({:limit => 10})    
+      @popular_posts = Post.find_popular({:limit => 10})
       @popular_polls = Poll.find_popular(:limit => 8)
     end
 
-
-    def commentable_url(comment)
-      if comment.recipient && comment.commentable
-        if comment.commentable_type != "User"
-          polymorphic_url([comment.recipient, comment.commentable])+"#comment_#{comment.id}"
-        elsif comment
-          user_url(comment.recipient)+"#comment_#{comment.id}"
-        end
-      elsif comment.commentable
-        polymorphic_url(comment.commentable)+"#comment_#{comment.id}"      
-      end
-    end
-    
     def initialize_header_tabs
       # This hook allows plugins or host apps to easily add tabs to the header by adding to the @header_tabs array
       # Usage: @header_tabs << {:name => "My tab", :url => my_tab_path, :section => 'my_tab_section' }
-      @header_tabs = []      
-    end 
+      @header_tabs = []
+    end
     def initialize_admin_tabs
       # This hook allows plugins or host apps to easily add tabs to the admin nav by adding to the @admin_nav_links array
       # Usage: @admin_nav_links << {:name => "My link", :url => my_link_path,  }
-      @admin_nav_links = []      
-    end 
+      @admin_nav_links = []
+    end
 
 end