community_engine 2.0.0.beta3 → 2.0.0

data/.gitignore

@@ -3,6 +3,7 @@ log/*.log
 test/testapp/db/*.sqlite3
 test/testapp/log/*.log
 Gemfile.lock
+doc
 
 .DS_Store
 *~
@@ -12,4 +13,4 @@ coverage
 bin/
 
 pkg
-*.gem
+*.gem

data/CHANGELOG

@@ -1,36 +1,18 @@
 = TODO
-# * replace paginating find with will paginate
-# * replace att_fu with paperclip
-# * fix boot; 
-# * recaptcha constants
-# * rip out beta mode and teaser stuff
-# * clean up routes
-# * take out vendors/offerings stuff
-# * take out ez where
-# * remote_form_for is gone (use dynamic_form gem/prototype legacy helper)
-# * finding transparently by login is broken (fixed using friendly_id)
-# * can't dup nilclass error in Rails timezone conversion (fixed with a little patch, should get fixed in a new version of Rails)
-# * tinymce isn't working
-# * fix responds-to-parent
-# * replace white_list with something (sanitize?) (preserve stuff from white list initializer)
-# * fix rakismet initializer
-# * configure configatron from ruby, not yaml
-
-* mce_opts initializer
 * replace old multiple uploader
 * fix photo uploading from welcome_photo page
 * add back searching to users index
-* remove all the theming stuff
-* replace setup template with something else more sensible
-* allow overriding initializers, autoloading assets, etc
-* remove stylesheet customization
-* use aato instead of aatos (and fix pg problems)
-* authlogic has problems: not sure it's recording last_login magic columns, investigate
-* Bug in rails fixtures.rb on 849 - use fixtures_path.to_s.size instead
 * swap jquery for prototype
-* photo cropping is not working
-* fix commentable routing (path prefix)
-* use Sanitize or Loofah gem
+
+
+* Upgrade to bcrybt crypto method
+
+=2.0.0.beta4
+* Replace white_list plugin with Sanitize gem (white_list.rb initizlizer format has changed)
+* Upgrade to Rails 3.2
+* Use act_as_taggable_on
+* fix photo cropping
+* remove theme controller (no more theming functionality)
 
 =2.0.0.pre
 * Rails 3.1.0.beta1 compatibility

data/README.markdown

@@ -1,4 +1,4 @@
-** Using Rails 2.x? You want the [master branch](https://github.com/bborn/communityengine)
+** Using Rails 2.x? You want the [rails2.x branch](https://github.com/bborn/communityengine/tree/rails2.x)
 
 CommunityEngine [![Build Status](https://secure.travis-ci.org/bborn/communityengine.png)](http://travis-ci.org/bborn/communityengine)
 
@@ -6,40 +6,42 @@ Information at: [http://www.communityengine.org](http://www.communityengine.org)
 
 Requirements:
 
-	- RAILS VERSION 3.1.3
+	- RAILS VERSION 3.2.8
 
 Getting CommunityEngine Running
 --------------------------------
 
 1. Copy the following into your `Gemfile`:
 
-		gem 'community_engine'
+    ```
+    gem 'community_engine'
+    ```
 
-2. From your app's root directory run:
+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
+
+3. From your app's root directory run:
 
 		$ bundle install --binstubs
 		$ bin/rake community_engine:install:migrations
 		$ bin/rake db:migrate
 
-3. 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
-
 4. Mount CommunityEngine in your `config/routes.rb` file:
 
 		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! 
+6. Start your 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)
 
@@ -65,7 +67,7 @@ Photo Uploading
 
 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`). 
+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
 
@@ -82,9 +84,9 @@ Once logged in as an admin, you'll be able to toggle other users between moderat
 
 Admins and moderators can edit and delete other users posts.
 
-There is a rake task to make an existing user into an admin: 
+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)
 
@@ -95,10 +97,10 @@ Localization
 
 Localization is done via Rails native I18n API. We've added some extensions to String and Symbol to let them respond to the `.l` method. That allows for a look up of the symbol (or a symbolized version of the string).
 
-For complex strings with substitutions, Symbols respond to the `.l` method with a hash passed as an argument, for example: 
+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
-  
+
 And in your language file you'd have:
 
 	welcome: "Welcome %{name}"
@@ -109,23 +111,23 @@ To customize the language, or add a new language create a new yaml file in `Rail
 Spam Control
 ------------
 
-Spam sucks. Most likely, you'll need to implement some custom solution to control spam on your site, but CE offers a few tools to help with the basics. 
+Spam sucks. Most likely, you'll need to implement some custom solution to control spam on your site, but CE offers a few tools to help with the basics.
 
 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
-    
+
 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
-    
+
 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
-  
-    
+
+
 Integrating with Your Application & Overriding CE
 -------------------------------------------------
 
@@ -133,27 +135,27 @@ To make a controller from your application use CE's layout and inherit CE's help
 
 		class RecipesController < BaseController
 
-			before_filter :login_required			
-			
+			before_filter :login_required
+
 			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
-			
+
 			#override an existing method
 			def	display_name
 				login.capitalize
 			end
-			
+
 		end
 
 
@@ -172,7 +174,7 @@ Contributors - Thanks! :)
 - Bryan Kearney - localization
 - Alex Nesbitt - forgot password bugs
 - Alejandro Raiczyk - Spanish localization
-- [Fritz Thielemann](http://github.com/fritzek) - German localization, il8n 
+- [Fritz Thielemann](http://github.com/fritzek) - German localization, il8n
 - [Oleg Ivanov](http://github.com/morhekil) - `acts_as_taggable_on_steroids`
 - David Fugere - French localization
 - Barry Paul - routes refactoring

data/UPGRADING.markdown

@@ -30,8 +30,8 @@ That's it!
 
 Note: this version adds a counter_cache to taggings, so you may need to update the counter on your existing tags by doing something like:
 
-Tag.all.each do |tag|
-  Tag.update_counters tag.id, :taggings_count => tag.taggings.length
+ActsAsTaggableOn::Tag.all.each do |tag|
+	tag.update_counters tag.id, :taggings_count => tag.taggings.length
 end
 
 If you have many tags, this could take a while, though.

data/app/controllers/ads_controller.rb

@@ -11,8 +11,7 @@ class AdsController < BaseController
     @ads = @search.page(params[:page]).per(15)
 
     respond_to do |format|
-      format.html # index.rhtml
-      format.xml  { render :xml => @ads.to_xml }
+      format.html
     end
   end
 
@@ -22,8 +21,7 @@ class AdsController < BaseController
     @ad = Ad.find(params[:id])
 
     respond_to do |format|
-      format.html # show.rhtml
-      format.xml  { render :xml => @ad.to_xml }
+      format.html 
     end
   end
 
@@ -46,10 +44,8 @@ class AdsController < BaseController
       if @ad.save
         flash[:notice] = :ad_was_successfully_created.l
         format.html { redirect_to ad_url(@ad) }
-        format.xml  { head :created, :location => ad_url(@ad) }
       else
         format.html { render :action => "new" }
-        format.xml  { render :xml => @ad.errors.to_xml }
       end
     end
   end
@@ -63,10 +59,8 @@ class AdsController < BaseController
       if @ad.update_attributes(params[:ad])
         flash[:notice] = :ad_was_successfully_updated.l
         format.html { redirect_to ad_url(@ad) }
-        format.xml  { head :ok }
       else
         format.html { render :action => "edit" }
-        format.xml  { render :xml => @ad.errors.to_xml }
       end
     end
   end

data/app/controllers/albums_controller.rb

@@ -52,7 +52,7 @@ class AlbumsController < BaseController
           flash[:notice] = :album_was_successfully_created.l 
           format.html { redirect_to(user_photo_manager_index_path(current_user)) }       
         else
-          format.html { redirect_to(new_user_album_photo_path(current_user,@album)) }
+          format.html { redirect_to(new_user_album_photo_path(current_user, @album)) }
         end
       else
         format.html { render :action => 'new' }
@@ -71,7 +71,7 @@ class AlbumsController < BaseController
           flash[:notice] = :album_updated.l
           format.html { redirect_to(user_album_path(current_user, @album)) }
         else
-          format.html { redirect_to(new_user_album_photo_path(current_user,@album)) }
+          format.html { redirect_to(new_user_album_photo_path(current_user, @album)) }
         end
       else
         format.html { render :action => "edit" }

data/app/controllers/authorizations_controller.rb

@@ -2,9 +2,9 @@ class AuthorizationsController < BaseController
   before_filter :login_required, :only => [:destroy]
 
   def create
-    omniauth = request.env['omniauth.auth'] #this is where you get all the data from your provider through omniauth    
-    provider_name = omniauth['provider'].capitalize    
-    
+    omniauth = request.env['omniauth.auth'] #this is where you get all the data from your provider through omniauth
+    provider_name = omniauth['provider'].to_s.capitalize
+
     @auth = Authorization.find_or_create_from_hash(omniauth, current_user)
 
     if logged_in?
@@ -17,25 +17,25 @@ class AuthorizationsController < BaseController
     if logged_in?
       redirect_to request.env['omniauth.origin'] || user_path(current_user)
     else
-      flash[:notice] = @auth.user.errors.full_messages.to_sentence 
+      flash[:notice] = @auth.user.errors.full_messages.to_sentence
       redirect_to login_path
     end
   end
-  
+
   def failure
     flash[:notice] = t('authorizations.failure.notice')
     redirect_to home_url
   end
-  
+
   def destroy
     @authorization = current_user.authorizations.find(params[:id])
 
     if @authorization.destroy
-      flash[:notice] = t('authorizations.destroy.notice', :provider => @authorization.provider.capitalize)      
+      flash[:notice] = t('authorizations.destroy.notice', :provider => @authorization.provider.to_s.capitalize)
     else
       flash[:notice] = @authorization.errors.full_messages.to_sentence
     end
-    
-    redirect_to edit_account_user_path    
+
+    redirect_to edit_account_user_path
   end
 end

data/app/controllers/base_controller.rb

@@ -11,6 +11,7 @@ class BaseController < ApplicationController
   helper_method :commentable_url
   before_filter :initialize_header_tabs
   before_filter :initialize_admin_tabs
+  before_filter :store_location, :except => :footer_content
 
   caches_action :site_index, :footer_content, :if => Proc.new{|c| c.cache_action? }
 
@@ -60,6 +61,25 @@ class BaseController < ApplicationController
   
   def css_help
   end
+
+  protected
+  def self.uses_tiny_mce(options = {}, &block)
+    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) || {}
+
+      c.instance_variable_set(:@tiny_mce_configuration, configuration.merge(new_configuration))
+      c.instance_variable_set(:@uses_tiny_mce, true)
+    end
+
+    before_filter p, options
+  end
   
   
   private
@@ -95,7 +115,7 @@ class BaseController < ApplicationController
     end
 
     def popular_tags(limit = 20, type = nil)
-      Tag.popular(limit, type)
+      ActsAsTaggableOn::Tag.popular(limit, type)
     end
   
 

data/app/controllers/clippings_controller.rb

@@ -39,7 +39,7 @@ class ClippingsController < BaseController
   def index
     @user = User.find(params[:user_id])
 
-    @clippings = Clipping.includes(:tags).where(:user_id => @user.id).order("created_at DESC")
+    @clippings = Clipping.includes(:tags).where(:user_id => @user.id).order("clippings.created_at DESC")
 
     @clippings = @clippings.where('tags.name = ?', params[:tag_name]) if params[:tag_name]
 
@@ -88,7 +88,6 @@ class ClippingsController < BaseController
     begin
       doc = Hpricot( open( uri ) )
     rescue
-      render :inline => "<h1>Sorry, there was an error fetching the images from the page you requested</h1><a href='#{params[:uri]}'>Go back...</a>"
       return
     end
     @page_title = (doc/"title")

data/app/controllers/comments_controller.rb

@@ -148,7 +148,7 @@ class CommentsController < BaseController
 
   
   def unsubscribe
-    @comment = Comment.find(params[:comment_id])
+    @comment = Comment.find(params[:id])
     if @comment.token_for(params[:email]).eql?(params[:token])
       @comment.unsubscribe_notifications(params[:email])
       flash[:notice] = :comment_unsubscribe_succeeded.l

data/app/controllers/forums_controller.rb

@@ -10,7 +10,7 @@ class ForumsController < BaseController
     @forums = Forum.find(:all, :order => "position")
     respond_to do |format|
       format.html
-      format.xml { render :xml => @forums.to_xml }
+      format.xml { render :xml => @forums }
     end
   end
 
@@ -24,15 +24,12 @@ class ForumsController < BaseController
       end
       
       format.xml do
-        render :xml => @forum.to_xml
+        render :xml => @forum
       end
     end
   end
-
-  # new renders new.rhtml
   
   def create
-    @forum.attributes = params[:forum]
     @forum.tag_list = params[:tag_list] || ''
     @forum.save!
     respond_to do |format|
@@ -42,9 +39,8 @@ class ForumsController < BaseController
   end
 
   def update
-    @forum.attributes = params[:forum]
     @forum.tag_list = params[:tag_list] || ''
-    @forum.save!
+    @forum.update_attributes!(params[:forum])
     respond_to do |format|
       format.html { redirect_to forums_path }
       format.xml  { head 200 }
@@ -61,7 +57,7 @@ class ForumsController < BaseController
   
   protected
     def find_or_initialize_forum
-      @forum = params[:id] ? Forum.find(params[:id]) : Forum.new
+      @forum = params[:id] ? Forum.find(params[:id]) : Forum.new(params[:forum])
     end