community_engine 2.3.0 → 2.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTUxNzQzYzY5OGRjZDgzZjRiNDIxNmMyNDg1NmUxNTFiN2NkOGFlNg==
+    ZjU1NTFjMTI0MzAzMmE4ZGFjNWJhZTIxOWRlMzdjOTgyOTQwMzRjMQ==
   data.tar.gz: !binary |-
-    NGE1ODk0ODU2MjhmNmNiZWVkMWI2NGU5MDdhMzNlMDY2ZDJiZDIxOA==
+    N2YyNjY5YTliNTE0N2Q1YTNmOTY1ZTcwMzcwNzRhYjg5ODJiNDY1OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2M0MTBmMWIyMGIxZDAxMGMwMDVhMWYwZGVlZDVjZTE3YmYzMGZhNDIxNjdh
-    M2RjYTFiODk4OTY2NzJiZjFiZWY3ZDg1Yzc4NzBmMjljOGZhN2MwMGE2Mzc1
-    MTNhMzcxZGJjYmQ4ZTBlN2E3ZGZmY2M1OGRjY2UwYzk1YmY2ZmY=
+    NTdmZGFlZTY4NzgyZDFkYTNmZGIzZjI4ZjM1MTU2MmVjOTE4NmJlMzk2Yjhj
+    NDI3YWM0MzRiMzBjYmY0ZjA3ZTQ5NzgwZDZjMTEyNjE5ZTM5NWRlMzZiMDA4
+    MWU4OWY5N2IyM2M2OTlmODllMjU3ZTc2YzFkMGY4Njk3NmZiNzk=
   data.tar.gz: !binary |-
-    MGQ3YTNmYmUwMjJhYTc3OWE3OTRmMjM5YWVkNTJiYjI5YzA2OGIzYTAyNjQ1
-    ZWQxOTFjYzkzOTg2Y2ZjZmU5NjJlNDM1ZWI1MjgyZjRjNGI4ZWJmYTQ1NDRh
-    ZTYzYmZlMjhiMzVkZmUyYTQzYTNkMzg2NmM1NzhjMzdlMDdiMzc=
+    MTgyNDJlYzYwYmY4MTMzOTY3MTM5OWI2MjgyZDUyOTk0NDc5NjBhY2VlYWVi
+    YTQzM2FkMjcxOWUwMDA4YjhiYmM1NGNlZmM0OTZkOGExMWQ3ZDA0N2FlODll
+    ZTZmNDQ5ZWE1NTUxNjQyMDdmYWMxMDQ0ZDY2NTZmOTQ4OTgwNjI=

data/.travis.yml

@@ -2,7 +2,9 @@ bundler_args: --binstubs
 
 rvm:
   - 1.9.2
-  - 2.0.0  
-env: "RAILS_ENV='test' "
-  
+  - 2.0.0
+env:
+  - "RAILS_ENV='test' RAILS_VERSION=3.2.0"
+  - "RAILS_ENV='test' RAILS_VERSION=3.2.14"
+
 script: "bundle exec rake db:drop db:create db:migrate test"

data/CHANGELOG

@@ -5,6 +5,8 @@
 * swap jquery for prototype
 * Upgrade to bcrybt crypto method
 
+=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)
 
 =2.3.0
 * Upgrade omniauth to 1.1

data/Gemfile

@@ -6,4 +6,18 @@ group :test do
   gem 'sqlite3'
 end
 
-gemspec
+rails_version = ENV["RAILS_VERSION"] || "default"
+
+rails = case rails_version
+when "master"
+  {github: "rails/rails"}
+when "default"
+  ">= 3.2.0"
+else
+  "~> #{rails_version}"
+end
+
+gem "rails", rails
+
+
+gemspec

data/app/controllers/categories_controller.rb

@@ -1,6 +1,8 @@
 class CategoriesController < BaseController
   before_filter :login_required, :except => [:show, :most_viewed, :rss]
   before_filter :admin_required, :only => [:new, :edit, :update, :create, :destroy, :index]
+
+  cache_sweeper :category_sweeper, :only => [:create, :update, :destroy]
   
   # GET /categories
   # GET /categories.xml

data/app/controllers/category_sweeper.rb

@@ -0,0 +1,27 @@
+class CategorySweeper < ActionController::Caching::Sweeper
+  observe Category # This sweeper is going to keep an eye on the Category model
+
+  # If our sweeper detects that a Category was created call this
+  def after_create(category)
+    expire_cache_for(category)
+  end
+
+  # If our sweeper detects that a Category was updated call this
+  def after_update(category)
+    expire_cache_for(category)
+  end
+
+  # If our sweeper detects that a Category was deleted call this
+  def after_destroy(category)
+    expire_cache_for(category)
+  end
+
+  private
+  def expire_cache_for(record)
+    # Expire the home page
+    expire_action(:controller => 'base', :action => 'site_index')
+
+    # Also expire the sitemap
+    expire_action(:controller => 'sitemap', :action => 'index')
+  end
+end

data/app/controllers/comment_sweeper.rb

@@ -4,30 +4,28 @@ class CommentSweeper < ActionController::Caching::Sweeper
   def after_create(comment)
     expire_cache_for(comment)
   end
-  
+
   # If our sweeper detects that a comment was updated call this
   def after_update(comment)
     expire_cache_for(comment)
   end
-  
+
   # If our sweeper detects that a comment was deleted call this
   def after_destroy(comment)
     expire_cache_for(comment)
   end
-          
+
   private
   def expire_cache_for(record)
     # Expire the footer content
     expire_action :controller => 'base', :action => 'footer_content'
 
-    if record.commentable_type.eql?('Post') 
+    if record.commentable_type.eql?('Post')
       expire_action :controller => 'posts', :action => 'show', :id => record.commentable.to_param , :user_id => record.commentable.user.to_param
-      
+
       if Post.find_recent(:limit => 16).include?(record.commentable)
-        # Expire the home page    
+        # Expire the home page
         expire_action :controller => 'base', :action => 'site_index'
-        # Expire the category pages
-        expire_action :controller => 'categories', :action => 'show', :id => record.commentable.category
       end
     end
 

data/app/controllers/comments_controller.rb

@@ -12,7 +12,7 @@ class CommentsController < BaseController
   end
 
   cache_sweeper :comment_sweeper, :only => [:create, :destroy]
-  
+
   def edit
     @comment = Comment.find(params[:id])
     respond_to do |format|
@@ -22,10 +22,10 @@ class CommentsController < BaseController
 
   def update
     @comment = Comment.find(params[:id])
-    @comment.update_attributes(params[:comment])    
+    @comment.update_attributes(params[:comment])
     respond_to do |format|
       format.js
-    end    
+    end
   end
 
 
@@ -34,15 +34,15 @@ class CommentsController < BaseController
     commentable_class = commentable_type.singularize.constantize
     commentable_type_humanized = commentable_type.humanize
     commentable_type_tableized = commentable_type.tableize
-    
+
     if @commentable = commentable_class.find(params[:commentable_id])
       unless logged_in? || (@commentable.owner && @commentable.owner.profile_public?)
         flash.now[:error] = :private_user_profile_message.l
         redirect_to login_path and return
       end
-      
+
       @comments = @commentable.comments.recent.page(params[:page])
-      @title = commentable_type_humanized            
+      @title = commentable_type_humanized
       @rss_url = commentable_comments_url(commentable_type_tableized, @commentable, :format => :rss)
 
       if @comments.any?
@@ -51,12 +51,12 @@ class CommentsController < BaseController
         @title = first_comment.commentable_name
         @back_url = commentable_url(first_comment)
         respond_to do |format|
-          @rss_title = "#{configatron.community_name}: #{commentable_type_humanized} Comments - #{@title}"                
+          @rss_title = "#{configatron.community_name}: #{commentable_type_humanized} Comments - #{@title}"
           format.html
           format.rss {
             render_comments_rss_feed_for(@comments, @commentable, @rss_title) and return
           }
-        end              
+        end
       else
         if @commentable.is_a?(User)
           @user = @commentable
@@ -66,19 +66,19 @@ class CommentsController < BaseController
           @title = @commentable.respond_to?(:title) ? @commentable.title : @title
           @back_url = url_for([@user, @commentable])
         end
-        
+
         respond_to do |format|
           format.html
           format.rss {
-            @rss_title = "#{configatron.community_name}: #{commentable_type_humanized} Comments - #{@title}"                            
+            @rss_title = "#{configatron.community_name}: #{commentable_type_humanized} Comments - #{@title}"
             render_comments_rss_feed_for([], @commentable, @rss_title) and return
           }
-        end        
-      end   
+        end
+      end
     else
       flash[:notice] = :no_comments_found.l_with_args(:type => commentable_type_humanized)
       redirect_to home_path
-    end          
+    end
   end
 
   def new
@@ -131,7 +131,7 @@ class CommentsController < BaseController
       }
     end
   end
-  
+
   def delete_selected
     if request.post?
       if params[:delete]
@@ -141,12 +141,12 @@ class CommentsController < BaseController
           comment.destroy if comment.can_be_deleted_by(current_user)
         }
       end
-      flash[:notice] = :comments_deleted.l                
+      flash[:notice] = :comments_deleted.l
       redirect_to admin_comments_path
     end
-  end  
+  end
+
 
-  
   def unsubscribe
     @comment = Comment.find(params[:id])
     if @comment.token_for(params[:email]).eql?(params[:token])
@@ -158,11 +158,11 @@ class CommentsController < BaseController
 
 
   private
-    
+
     def get_commentable_type(string)
       string.camelize
     end
-        
+
     def render_comments_rss_feed_for(comments, commentable, title)
       render_rss_feed_for(comments,
         { :class => commentable.class,
@@ -175,5 +175,5 @@ class CommentsController < BaseController
                      }
         })
     end
-  
+
 end

data/app/controllers/page_sweeper.rb

@@ -20,9 +20,6 @@ class PageSweeper < ActionController::Caching::Sweeper
   def expire_cache_for(record)
     # Expire the home page
     expire_action(:controller => 'base', :action => 'site_index')
-
-    # Expire the footer content
-    expire_action(:controller => 'base', :action => 'footer_content')
     
     # Also expire the sitemap
     expire_action(:controller => 'sitemap', :action => 'index')

data/app/controllers/pages_controller.rb

@@ -8,7 +8,7 @@ class PagesController < BaseController
 
   def cache_action?
     !logged_in? && controller_name.eql?('pages')
-  end 
+  end
 
   before_filter :login_required, :only => [:index, :new, :edit, :update, :destroy, :create, :preview]
   before_filter :require_moderator, :only => [:index, :new, :edit, :update, :destroy, :create, :preview]
@@ -26,7 +26,7 @@ class PagesController < BaseController
     @page = Page.live.find(params[:id])
     unless logged_in? || @page.page_public
       flash[:error] = :page_not_public_warning.l
-      redirect_to :controller => 'sessions', :action => 'new'      
+      redirect_to :controller => 'sessions', :action => 'new'
     end
   rescue
     flash[:error] = :page_not_found.l
@@ -59,7 +59,7 @@ class PagesController < BaseController
   end
 
   private
-  
+
   def require_moderator
     @page ||= Page.find(params[:id]) if params[:id]
     unless admin? || moderator?

data/app/controllers/post_sweeper.rb

@@ -5,17 +5,17 @@ class PostSweeper < ActionController::Caching::Sweeper
   def after_create(post)
     expire_cache_for(post)
   end
-  
+
   # If our sweeper detects that a Post was updated call this
   def after_update(post)
     expire_cache_for(post)
   end
-  
+
   # If our sweeper detects that a Post was deleted call this
   def after_destroy(post)
     expire_cache_for(post)
   end
-          
+
   private
   def expire_cache_for(record)
     # Expire the home page
@@ -23,13 +23,10 @@ class PostSweeper < ActionController::Caching::Sweeper
 
     # Expire the footer content
     expire_action(:controller => 'base', :action => 'footer_content')
-    
+
     # Also expire the sitemap
     expire_action(:controller => 'sitemap', :action => 'index')
 
-    # Expire the category pages
-    expire_action(:controller => 'categories', :action => 'index')
-
     # Also expire the show pages, in case we just edited a blog entry
     expire_action(:controller => 'posts', :action => 'show', :id => record.to_param, :user_id => record.user.to_param)
   end

data/app/controllers/posts_controller.rb

@@ -8,17 +8,17 @@ class PostsController < BaseController
   uses_tiny_mce do
     {:only => [:show], :options => configatron.simple_mce_options}
   end
-         
+
   cache_sweeper :post_sweeper, :only => [:create, :update, :destroy]
-  cache_sweeper :taggable_sweeper, :only => [:create, :update, :destroy]    
+  cache_sweeper :taggable_sweeper, :only => [:create, :update, :destroy]
   caches_action :show, :if => Proc.new{|c| !logged_in? }
-                           
+
   before_filter :login_required, :only => [:new, :edit, :update, :destroy, :create, :manage, :preview]
   before_filter :find_user, :only => [:new, :edit, :index, :show, :update_views, :manage, :preview]
   before_filter :require_ownership_or_moderator, :only => [:edit, :update, :destroy, :create, :manage, :new]
 
-  skip_before_filter :verify_authenticity_token, :only => [:update_views, :send_to_friend] #called from ajax on cached pages 
-  
+  skip_before_filter :verify_authenticity_token, :only => [:update_views, :send_to_friend] #called from ajax on cached pages
+
   def manage
     Post.unscoped do
       @search = Post.search(params[:search])
@@ -28,20 +28,20 @@ class PostsController < BaseController
   end
 
   def index
-    @user = User.find(params[:user_id])            
+    @user = User.find(params[:user_id])
     @category = Category.find_by_name(params[:category_name]) if params[:category_name]
 
     @posts = @user.posts.recent
     @posts = @post.where('category_id = ?', @category.id) if @category
     @posts = @posts.page(params[:page]).per(10)
-    
+
     @is_current_user = @user.eql?(current_user)
 
     @popular_posts = @user.posts.order("view_count DESC").limit(10).all
-    
+
     @rss_title = "#{configatron.community_name}: #{@user.login}'s posts"
     @rss_url = user_posts_path(@user,:format => :rss)
-        
+
     respond_to do |format|
       format.html # index.rhtml
       format.rss {
@@ -54,14 +54,13 @@ class PostsController < BaseController
       }
     end
   end
-  
-    
+
   # GET /posts/1
   # GET /posts/1.xml
   def show
     @rss_title = "#{configatron.community_name}: #{@user.login}'s posts"
     @rss_url = user_posts_path(@user,:format => :rss)
-    
+
     @post = Post.unscoped.find(params[:id])
 
     @user = @post.user
@@ -71,31 +70,31 @@ class PostsController < BaseController
     @comments = @post.comments.includes(:user).order('created_at DESC').limit(20)
 
     @previous = @post.previous_post
-    @next = @post.next_post    
+    @next = @post.next_post
     @popular_posts = @user.posts.except(:order).order('view_count DESC').limit(10).all
     @related = Post.find_related_to(@post)
-    @most_commented = Post.find_most_commented    
+    @most_commented = Post.find_most_commented
   end
-  
+
   def update_views
     @post = Post.find(params[:id])
     updated = update_view_count(@post)
     render :text => updated ? 'updated' : 'duplicate'
   end
-  
+
   def preview
     @post = Post.unscoped.find(params[:id])
     redirect_to(:controller => 'sessions', :action => 'new') and return false unless @post.user.eql?(current_user) || admin? || moderator?
   end
-  
+
   # GET /posts/new
   def new
-    @user = User.find(params[:user_id])    
+    @user = User.find(params[:user_id])
     @post = Post.new(params[:post])
     @post.published_as = 'live'
     @categories = Category.find(:all)
   end
-  
+
   # GET /posts/1;edit
   def edit
     @post = Post.unscoped.find(params[:id])
@@ -103,20 +102,20 @@ class PostsController < BaseController
 
   # POST /posts
   # POST /posts.xml
-  def create    
+  def create
     @user = User.find(params[:user_id])
     @post = Post.new(params[:post])
     @post.user = @user
     @post.tag_list = params[:tag_list] || ''
-    
+
     respond_to do |format|
       if @post.save
         @post.create_poll(params[:poll], params[:choices]) if params[:poll]
-        
+
         flash[:notice] = @post.category ? :post_created_for_category.l_with_args(:category => @post.category.name.singularize) : :your_post_was_successfully_created.l
-        format.html { 
+        format.html {
           if @post.is_live?
-            redirect_to @post.category ? category_path(@post.category) : user_post_path(@user, @post) 
+            redirect_to @post.category ? category_path(@post.category) : user_post_path(@user, @post)
           else
             redirect_to manage_user_posts_path(@user)
           end
@@ -124,51 +123,51 @@ class PostsController < BaseController
         format.js
       else
         format.html { render :action => "new" }
-        format.js        
+        format.js
       end
     end
   end
-  
+
   # PUT /posts/1
   # PUT /posts/1.xml
   def update
     @post = Post.unscoped.find(params[:id])
     @user = @post.user
     @post.tag_list = params[:tag_list] || ''
-    
+
     respond_to do |format|
       if @post.update_attributes(params[:post])
         @post.update_poll(params[:poll], params[:choices]) if params[:poll]
-        
+
         format.html { redirect_to user_post_path(@post.user, @post) }
       else
-        format.html { render :action => "edit" }  
+        format.html { render :action => "edit" }
       end
     end
   end
-  
+
   # DELETE /posts/1
   # DELETE /posts/1.xml
   def destroy
     @user = User.find(params[:user_id])
     @post = Post.find(params[:id])
     @post.destroy
-    
+
     respond_to do |format|
-      format.html { 
+      format.html {
         flash[:notice] = :your_post_was_deleted.l
-        redirect_to manage_user_posts_url(@user)   
+        redirect_to manage_user_posts_url(@user)
         }
     end
   end
-    
+
   def send_to_friend
     unless params[:emails]
       render :partial => 'posts/send_to_friend', :locals => {:user_id => params[:user_id], :post_id => params[:post_id]} and return
     end
     @post = Post.find(params[:id])
     if @post.send_to(params[:emails], params[:message], (current_user || nil))
-      render :inline => "It worked!"            
+      render :inline => "It worked!"
     else
       render :inline => "You entered invalid addresses: <ul>"+ @post.invalid_emails.collect{|email| '<li>'+email+'</li>' }.join+"</ul> Please correct these and try again.", :status => 500
     end
@@ -179,13 +178,13 @@ class PostsController < BaseController
     @posts = Post.find_popular({:limit => 15, :since => 3.days})
 
     @monthly_popular_posts = Post.find_popular({:limit => 20, :since => 30.days})
-    
-    @related_tags = ActsAsTaggableOn::Tag.find_by_sql("SELECT tags.id, tags.name, count(*) AS count 
-      FROM taggings, tags 
+
+    @related_tags = ActsAsTaggableOn::Tag.find_by_sql("SELECT tags.id, tags.name, count(*) AS count
+      FROM taggings, tags
       WHERE tags.id = taggings.tag_id GROUP BY tags.id, tags.name");
 
     @rss_title = "#{configatron.community_name} "+:popular_posts.l
-    @rss_url = popular_rss_url    
+    @rss_url = popular_rss_url
     respond_to do |format|
       format.html # index.rhtml
       format.rss {
@@ -195,51 +194,51 @@ class PostsController < BaseController
       }
     end
   end
-  
+
   def recent
     @posts = Post.recent.page(params[:page]).per(20)
 
     @recent_clippings = Clipping.find_recent(:limit => 15)
     @recent_photos = Photo.find_recent(:limit => 10)
-    
+
     @rss_title = "#{configatron.community_name} "+:recent_posts.l
     @rss_url = recent_rss_url
     respond_to do |format|
-      format.html 
+      format.html
       format.rss {
         render_rss_feed_for(@posts, { :feed => {:title => @rss_title, :link => recent_url},
           :item => {:title => :title, :link => Proc.new {|post| user_post_url(post.user, post)}, :description => :post, :pub_date => :published_at}
           })
       }
-    end    
+    end
   end
-  
+
   def featured
     @posts = Post.by_featured_writers.recent.page(params[:page])
     @featured_writers = User.featured
-        
+
     @rss_title = "#{configatron.community_name} "+:featured_posts.l
     @rss_url = featured_rss_url
     respond_to do |format|
-      format.html 
+      format.html
       format.rss {
         render_rss_feed_for(@posts, { :feed => {:title => @rss_title, :link => recent_url},
           :item => {:title => :title, :link => Proc.new {|post| user_post_url(post.user, post)}, :description => :post, :pub_date => :published_at}
           })
       }
-    end    
-  end  
-  
+    end
+  end
+
   def category_tips_update
     return unless request.xhr?
     @category = Category.find(params[:post_category_id] )
-    render :partial => "categories/tips", :locals => {:category => @category}    
+    render :partial => "categories/tips", :locals => {:category => @category}
   rescue ActiveRecord::RecordNotFound
-    render :partial => "categories/tips", :locals => {:category => nil}    
+    render :partial => "categories/tips", :locals => {:category => nil}
   end
-  
+
   private
-  
+
   def require_ownership_or_moderator
     @user ||= User.find(params[:user_id])
     @post ||= Post.unscoped.find(params[:id]) if params[:id]
@@ -248,5 +247,5 @@ class PostsController < BaseController
     end
     return @user
   end
-  
+
 end

data/app/models/category.rb

@@ -2,7 +2,7 @@ class Category < ActiveRecord::Base
   has_many :posts, :order => "published_at desc"
   validates_presence_of :name
   
-  attr_accessible :name
+  attr_accessible :name, :tips, :new_post_text, :nav_text
   
   has_friendly_id :name, :use_slug => true
       

data/app/models/clipping.rb

@@ -16,6 +16,8 @@ class Clipping < ActiveRecord::Base
   
   acts_as_taggable
   acts_as_activity :user
+
+  attr_accessible :user, :url, :description, :image_url
     
   scope :recent, :order => 'clippings.created_at DESC'    
     

data/app/models/invitation.rb

@@ -25,7 +25,9 @@ class Invitation < ActiveRecord::Base
       record.email_addresses = (emails - invalid_emails).join(', ')
     end
   end
-  
+
+  attr_accessible :email_addresses, :message
+
   def send_invite
     emails = self.email_addresses.split(",").collect{|email| email.strip }.uniq 
     emails.each{|email|

data/app/models/photo.rb

@@ -24,7 +24,7 @@ class Photo < ActiveRecord::Base
   #Named scopes
   scope :recent, :order => "photos.created_at DESC"
   scope :new_this_week, :order => "photos.created_at DESC", :conditions => ["photos.created_at > ?", 7.days.ago.iso8601]
-  attr_accessible :name, :description, :photo, :photo_remote_url, :crop_x, :crop_y, :crop_w, :crop_h, :user_id
+  attr_accessible :name, :description, :photo, :photo_remote_url, :crop_x, :crop_y, :crop_w, :crop_h, :user_id, :album_id
 
   def display_name
     (self.name && self.name.length>0) ? self.name : "#{:created_at.l.downcase}: #{I18n.l(self.created_at, :format => :published_date)}"

data/app/views/clippings/edit.html.haml

@@ -18,7 +18,7 @@
         %label
           =:tags.l
           %em="(#{:optional_keywords_describing_this_clipping_separated_by_commas.l})"
-        = text_field_tag 'tag_list', @clipping.tag_list
+        = text_field_tag 'tag_list', @clipping.tag_list.to_s
 
         %p
           = submit_tag :save.l

data/app/views/forums/_form.html.haml

@@ -12,7 +12,7 @@
       %label
         =:tags.l
         %em="(#{:optional_keywords_describing_this_forum_separated_by_commas.l})"
-      = text_field_tag 'tag_list', @forum.tag_list, {:autocomplete => "off", :size => 35}
+      = text_field_tag 'tag_list', @forum.tag_list.to_s, {:autocomplete => "off", :size => 35}
       #tag_list_auto_complete.auto_complete
       
       -content_for :end_javascript do

data/app/views/photos/edit.html.haml

@@ -22,7 +22,7 @@
       %label 
         = :tags.l
         %em="(#{:optional_keywords_describing_this_photo_separated_by_commas.l})"
-      = text_field_tag 'tag_list', @photo.tag_list.join(', '), {:autocomplete => "off", :size => 35}
+      = text_field_tag 'tag_list', @photo.tag_list.to_s, {:autocomplete => "off", :size => 35}
       #tag_list_auto_complete.auto_complete{"class"=>"auto_complete"} 
       -content_for :end_javascript do
         = auto_complete_field 'tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }

data/app/views/shared/_header.html.haml

@@ -1,9 +1,4 @@
 #hd
-  - if !configatron.community_locale
-    %div
-      %a{:href=>url_for(:subdomain => 'ru', :only_path => false ), :title=>"#{configatron.community_locale} russian translation"}= "rus"
-      %a{:href=>url_for(:subdomain => 'en', :only_path =>false), :title=>"english translation" }= "eng"
-
   %h1
     %a{:href=>home_url, :title=>"#{configatron.community_name}"}= configatron.community_name
   - if logged_in?

data/app/views/topics/_form.html.haml

@@ -13,7 +13,7 @@
 %label
   = :tags.l
   %em="(#{:optional_keywords_describing_this_topic_separated_by_commas.l})"
-= text_field_tag 'tag_list', @topic.tag_list, {:autocomplete => "off", :size => 35}
+= text_field_tag 'tag_list', @topic.tag_list.to_s, {:autocomplete => "off", :size => 35}
 #tag_list_auto_complete.auto_complete
 
 -content_for :end_javascript do

data/app/views/users/edit.html.haml

@@ -52,7 +52,7 @@
       -box do 
         %h3= :tags.l
         #user_tags
-          = text_field_tag 'tag_list', @user.tag_list.join(", "), {:autocomplete => "off"}
+          = text_field_tag 'tag_list', @user.tag_list.join.to_s, {:autocomplete => "off"}
           #tag_list_auto_complete.auto_complete
           -content_for :end_javascript do
             = auto_complete_field 'tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }

data/community_engine.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n") rescue ''
   s.test_files  = `git ls-files -- {test}/*`.split("\n")
 
-  s.add_dependency(%q<rails>, ["~> 3.2.0"])
+  s.add_dependency(%q<rails>, [">= 3.2.0"])
   s.add_dependency(%q<rack>, [">= 1.4.1"])
   s.add_dependency(%q<authlogic>, [">= 0"])
   s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
@@ -36,12 +36,12 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<sass-rails>, ["~> 3.2.3"])
   s.add_dependency(%q<ri_cal>, [">= 0"])
   s.add_dependency(%q<rakismet>, [">= 0"])
-  s.add_dependency(%q<aws-s3>, [">= 0"])
+  s.add_dependency(%q<aws-sdk>, [">= 0"])
   s.add_dependency(%q<kaminari>, [">= 0"])
   s.add_dependency(%q<dynamic_form>, [">= 0"])
   s.add_dependency(%q<friendly_id>, ["~> 3.3"])
-  s.add_dependency(%q<paperclip>, ["~> 2.4.3"])
-  s.add_dependency(%q<cocaine>, ["0.3.2"])
+  s.add_dependency(%q<paperclip>, ["~> 3.5.1"])
+  s.add_dependency(%q<cocaine>, ["0.5.1"])
   s.add_dependency(%q<acts_as_commentable>, ["= 3.0.1"])
   s.add_dependency(%q<recaptcha>, [">= 0"])
   s.add_dependency(%q<omniauth>, ["~> 1.1.0"])

data/config/application_config.rb

@@ -52,6 +52,9 @@ configuration = {
     :missing_thumb => '/assets/icon_missing_thumb.gif',
     :missing_medium => "/assets/icon_missing_medium.gif",
     :paperclip_options => {
+      :default_url => "",
+      :path => "#{Rails.root}/public/system/:attachment/:id/:style/:filename",
+      :url => "/system/:attachment/:id/:style/:filename",
       :styles => {
         :thumb => {
           :geometry => "100x100#",
@@ -71,6 +74,9 @@ configuration = {
     :use_thumbs => true,
     :dimensions => [150, 635],
     :paperclip_options => {
+      :default_url => "",
+      :path => "#{Rails.root}/public/system/:attachment/:id/:style/:filename",
+      :url => "/system/:attachment/:id/:style/:filename",
       :styles => {
         :original => '465>',
         :thumb => "45x45#",
@@ -85,6 +91,9 @@ configuration = {
 
   :clipping => {
     :paperclip_options => {
+      :default_url => "",
+      :path => "#{Rails.root}/public/system/:attachment/:id/:style/:filename",
+      :url => "/system/:attachment/:id/:style/:filename",
       :styles => {
         :thumb => "100x100#",
         :medium => "290x320#",

data/lib/community_engine/engine.rb

@@ -7,35 +7,22 @@ module CommunityEngine
 
     initializer engine_name do |app|
       require root.join('config','application_config.rb')
-      require app.root.join('config','application_config.rb')            
+      require app.root.join('config','application_config.rb')
     end
-    
-    initializer "#{engine_name}.initializers", :before => :load_config_initializers do       
-      Dir["#{root}/config/initializers/**/*.rb"].each do |initializer| 
+
+    initializer "#{engine_name}.initializers", :before => :load_config_initializers do
+      Dir["#{root}/config/initializers/**/*.rb"].each do |initializer|
         load(initializer) unless File.exists?("#{root.to_s}/config/initializers/#{File.basename(initializer)}")
-      end                
+      end
     end
-        
+
     initializer "#{engine_name}.rakismet_config", :before => "rakismet.setup" do |app|
       if !configatron.akismet_key.nil?
         app.config.rakismet.key  = configatron.akismet_key
         app.config.rakismet.url  = configatron.app_host
       end
     end
-    
-    initializer "#{engine_name}.load_middleware", :after => :load_config_initializers do
-      if !configatron.auth_providers.nil?
-        configatron.protect(:auth_providers)
-        configatron.auth_providers.to_hash.each do |name, hash|
-          provider = "::OmniAuth::Strategies::#{name.to_s.classify}".constantize
-          config.app_middleware.use provider, hash[:key], hash[:secret]          
-        end
-      end
-    end
-    
-    
 
-     
   end
 end
 

data/lib/community_engine/version.rb

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

data/sample_files/s3.yml

@@ -1,17 +1,17 @@
 development:
-  bucket_name: bucket
+  bucket: bucket
   access_key_id: 'KEY'
   secret_access_key: 'SECRET_KEY'
   use_persistent: true
 
 test:
-  bucket_name: bucket
+  bucket: bucket
   access_key_id: 'KEY'
   secret_access_key: 'SECRET_KEY'
   use_persistent: false
 
 production:
-  bucket_name: bucket
+  bucket: bucket
   access_key_id: 'KEY'
   secret_access_key: 'SECRET_KEY'
   use_persistent: false

data/test/unit/invitation_test.rb

@@ -12,14 +12,16 @@ class InvitationTest < ActiveSupport::TestCase
   
   def test_send_with_names_in_emails
     addresses = '"Valid Example" <valid@example.com>, valid_2@example.com'
-    invitation = Invitation.new(:email_addresses => addresses, :user => users(:quentin))
+    invitation = Invitation.new(:email_addresses => addresses)
+    invitation.user = users(:quentin)
     assert invitation.valid?
     assert invitation.send_invite    
   end
   
   def test_send_invite
     addresses = "valid@example.com, valid_2@example.com"
-    invitation = Invitation.new(:email_addresses => addresses, :user => users(:quentin))
+    invitation = Invitation.new(:email_addresses => addresses)
+    invitation.user = users(:quentin)
     assert invitation.valid?
     assert invitation.send_invite
   end

data/vendor/plugins/enumerations_mixin/lib/active_record/acts/enumerated.rb

@@ -14,6 +14,7 @@ module ActiveRecord
           valid_keys = [:conditions, :order, :on_lookup_failure]
           options.assert_valid_keys(*valid_keys)
           valid_keys.each do |key|   
+          class_attribute :acts_enumerated_on_lookup_failure
             class_attribute "acts_enumerated_#{key.to_s}"
             if options.has_key?( key )
               self.send "acts_enumerated_#{key.to_s}=", options[key]
@@ -55,7 +56,7 @@ module ActiveRecord
           else
             raise TypeError, "#{self.name}[]: argument should be a String, Symbol or Fixnum but got a: #{arg.class.name}"            
           end
-          self.send((read_inheritable_attribute(:acts_enumerated_on_lookup_failure) || :enforce_strict_literals), arg)
+          self.send(:acts_enumerated_on_lookup_failure) || self.send(:enforce_strict_literals, arg)
         end
 
         def lookup_id(arg)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: community_engine
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Bruno Bornsztein
@@ -14,14 +14,14 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-s3
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -226,28 +226,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: acts_as_commentable
   requirement: !ruby/object:Gem::Requirement
@@ -526,6 +526,7 @@ files:
 - app/controllers/authorizations_controller.rb
 - app/controllers/base_controller.rb
 - app/controllers/categories_controller.rb
+- app/controllers/category_sweeper.rb
 - app/controllers/clippings_controller.rb
 - app/controllers/comment_sweeper.rb
 - app/controllers/comments_controller.rb