community_engine 2.3.2 → 3.0.0

data/db/migrate/039_create_activities_table.rb

@@ -1,9 +1,9 @@
 class CreateActivitiesTable < ActiveRecord::Migration
   def self.up
     create_table :activities do |t|
-      t.column :user_id, :integer, :limit => 10
+      t.column :user_id, :integer
       t.column :action, :string, :limit => 50
-      t.column :item_id, :integer, :limit => 10
+      t.column :item_id, :integer
       t.column :item_type, :string
       t.column :created_at, :datetime
     end

data/db/migrate/056_create_roles.rb

@@ -5,17 +5,19 @@ class CreateRoles < ActiveRecord::Migration
     end
 
     Role.enumeration_model_updates_permitted = true
-    Role.create(:name => 'admin')    
-    Role.create(:name => 'moderator')
-    Role.create(:name => 'member')            
+    ['admin', 'moderator', 'member'].each do | role_name |
+      r = Role.new
+      r.name = role_name
+      r.save!
+    end
     Role.enumeration_model_updates_permitted = false
-    
+
     add_column :users, :role_id, :integer
 
     #set all existing users to 'member'
-    User.update_all("role_id = #{Role[:member].id}", ["admin = ?", false])
+    User.where("admin = ?", false).update_all("role_id = #{Role[:member].id}")
     #set admins to 'admin'
-    User.update_all("role_id = #{Role[:admin].id}", ["admin = ?", true])    
+    User.where("admin = ?", true).update_all("role_id = #{Role[:admin].id}")
 
     remove_column :users, :admin
   end

data/db/migrate/069_create_pages.rb

@@ -4,7 +4,7 @@ end
 
 
 class CreatePages < ActiveRecord::Migration
-  def self.up    
+  def self.up
     create_table :pages do |t|
       t.string :title
       t.text :body
@@ -12,14 +12,14 @@ class CreatePages < ActiveRecord::Migration
       t.boolean :page_public, :default => true
       t.timestamps
     end
-    
+
     #remove static pages table id needed and migrate StaticPages to Pages
     if ActiveRecord::Base.connection.tables.include?('static_pages')
       StaticPage.all.each do |page|
         Page.create(:title => page.title, :body => page.content, :published_as=>"live", :page_public => true)
       end
 
-      drop_table :static_pages          
+      drop_table :static_pages
     end
   end
 

data/db/migrate/081_upgrade_to_friendly_id_5x.rb

@@ -0,0 +1,25 @@
+class UpgradeToFriendlyId5x < ActiveRecord::Migration
+  
+  def self.up
+    add_column :categories, :slug, :string
+    add_index :categories, :slug, :unique => true
+
+    drop_table :slugs
+  end  
+  
+  def self.down
+    remove_column :categories, :slug
+
+    create_table :slugs do |t|
+      t.string :name
+      t.integer :sluggable_id
+      t.integer :sequence, :null => false, :default => 1
+      t.string :sluggable_type, :limit => 40
+      t.string :scope
+      t.datetime :created_at
+    end
+    add_index :slugs, :sluggable_id
+    add_index :slugs, [:name, :sluggable_type, :sequence, :scope], :name => "index_slugs_on_n_s_s_and_s", :unique => true
+    
+  end
+end

data/db/migrate/082_upgrade_to_acts_as_commentable_4x.rb

@@ -0,0 +1,29 @@
+class UpgradeToActsAsCommentable4x < ActiveRecord::Migration
+  def self.up
+    change_table :comments do |t|
+      t.string :new_title, :limit => 50, :default => ""
+      t.text :new_comment
+      t.string :role, :default => "comments"
+    end
+
+    Comment.all.map do |comment|
+      comment.new_title = comment.title
+      comment.new_comment = comment.comment
+      comment.save
+    end
+
+    change_table :comments do |t|
+      t.remove :title
+      t.remove :comment
+      t.rename :new_title, :title
+      t.rename :new_comment, :comment
+    end
+
+  end
+
+  def self.down
+    change_table :columns do |t|
+      t.remove :role
+    end
+  end
+end

data/lib/activity_tracker.rb

@@ -0,0 +1,3 @@
+require 'activity_tracker/activity'
+require 'activity_tracker/activity_tracker'
+ActiveRecord::Base.send(:include, ActivityTracker)

data/{vendor/plugins/activity_tracker/lib → lib/activity_tracker}/activity.rb

@@ -6,17 +6,17 @@ class Activity < ActiveRecord::Base
   after_save :update_counter_on_user
 
   scope :of_item_type, lambda {|type|
-    {:conditions => ["activities.item_type = ?", type]}
+    where("activities.item_type = ?", type)
   }
   scope :since, lambda { |time|
-    {:conditions => ["activities.created_at > ?", time] }
+    where("activities.created_at > ?", time)
   }
   scope :before, lambda {|time|
-    {:conditions => ["activities.created_at < ?", time] }
+    where("activities.created_at < ?", time)
   }
-  scope :recent, :order => "activities.created_at DESC"
+  scope :recent, lambda { order("activities.created_at DESC") }
   scope :by_users, lambda {|user_ids|
-    {:conditions => ['activities.user_id in (?)', user_ids]}
+    where('activities.user_id in (?)', user_ids)
   }
 
 
@@ -28,7 +28,7 @@ class Activity < ActiveRecord::Base
   end
 
   def self.by(user)
-    Activity.count(:all, :conditions => ["user_id = ?", user.id])
+    Activity.where("user_id = ?", user.id).count
   end
 
   def can_be_deleted_by?(user)

data/{vendor/plugins/acts_as_publishable/init.rb → lib/acts_as_publishable.rb}

@@ -1,3 +1,3 @@
-require 'acts_as_publishable'
+require 'acts_as_publishable/acts_as_publishable'
 ActiveRecord::Base.send(:include, Acts::As::Publishable)
 

data/{vendor/plugins/acts_as_publishable/lib → lib/acts_as_publishable}/acts_as_publishable.rb

@@ -19,9 +19,9 @@ module Acts
           self.publish_states = args.collect{|state| state.to_s.downcase.to_sym }
           include InstanceMethods
           
-          scope :live, where(:published_as => 'live')
-          scope :draft, where(:published_as => 'draft')
-          default_scope live
+          scope :live, lambda { where(:published_as => 'live') }
+          scope :draft, lambda { where(:published_as => 'draft') }
+          default_scope -> { live }
 
           # class << self
           #   alias_method_chain :find, :published_as

data/lib/community_engine.rb

@@ -3,12 +3,12 @@ require 'acts-as-taggable-on'
 require 'community_engine/engine'
 
 require 'community_engine/authenticated_system'
-require 'community_engine/localized_application'  
-require 'community_engine/community_engine_sha1_crypto_method'    
-require 'community_engine/i18n_extensions'  
-require 'community_engine/viewable'    
-require 'community_engine/url_upload'  
-require 'community_engine/engines_extensions'  
+require 'community_engine/localized_application'
+require 'community_engine/community_engine_sha1_crypto_method'
+require 'community_engine/i18n_extensions'
+require 'community_engine/viewable'
+require 'community_engine/url_upload'
+require 'community_engine/engines_extensions'
 
 require 'configatron'
 require 'hpricot'
@@ -22,15 +22,37 @@ require 'kaminari'
 require 'dynamic_form'
 require 'friendly_id'
 require 'paperclip'
+require 'paperclip_processors/cropper.rb'
 require 'acts_as_commentable'
 require 'recaptcha/rails'
 require 'omniauth'
 require 'authlogic'
-require 'prototype-rails'
 require 'rails_autolink'
-require 'meta_search'
+require 'ransack'
 require 'tinymce-rails'
 require 'sanitize'
+require 'bootstrap-sass'
+require 'bootstrap_form'
+require 'font-awesome-rails'
+require 'jquery-rails'
+require 'jquery-ui-rails'
 
+# Rails 2.3 Plugins converted to lib
+require 'activity_tracker'
+require 'acts_as_publishable'
+require 'white_list'
+require 'resource_feeder'
 
-include EnginesExtensions
+# Rails 2.3 Plugin enumeration_mixin replaced by power_enum gem
+require 'power_enum'
+require 'acts_as_list'
+
+# Rails 4
+require 'rails/observers/railtie'
+require 'actionpack/action_caching'
+require 'actionpack/page_caching'
+
+# We need this here because it will not get autoloaded.      Maybe this should go in lib?
+require File.dirname(__FILE__) + "/../app/models/acts_as_taggable_on/tag"
+
+include EnginesExtensions

data/lib/community_engine/engine.rb

@@ -16,8 +16,24 @@ module CommunityEngine
       end
     end
 
+    initializer "#{engine_name}.rails4", :after => "active_record.observer" do
+      ActiveSupport.on_load(:action_controller) do
+        ActionController::Base.send :include, ActionController::Caching::Pages
+        ActionController::Base.send :include, ActionController::Caching::Actions
+      end
+    end
+
+    initializer "#{engine_name}.sweeper.rails4", :after => "action_controller.caching.sweepers" do
+      ActiveSupport.on_load(:action_controller) do
+        ActionController::Caching::Sweeper.send(:include, ActiveSupport::Configurable)
+        ActionController::Caching::Sweeper.send(:include, ActionController::Caching)
+        ActionController::Caching::Sweeper.send(:include, ActionController::Caching::Pages)
+        ActionController::Caching::Sweeper.send(:include, ActionController::Caching::Actions)
+      end
+    end
+
     initializer "#{engine_name}.rakismet_config", :before => "rakismet.setup" do |app|
-      if !configatron.akismet_key.nil?
+      if configatron.has_key?(:akismet_key)
         app.config.rakismet.key  = configatron.akismet_key
         app.config.rakismet.url  = configatron.app_host
       end

data/lib/community_engine/engines_extensions.rb

@@ -6,13 +6,11 @@ module EnginesExtensions
 
   def acts_as_moderated_commentable
     acts_as_commentable :published, :pending
-    has_many :comments, {
+    has_many :comments, -> { where "role != 'pending'"}, {
       :as => :commentable,
       :dependent => :destroy,
-      :conditions => "role != 'pending'",
       :before_add => Proc.new { |x, c| c.role = 'published' }
     }
-    attr_protected :role
   end
 
 

data/lib/community_engine/version.rb

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

data/{config/initializers → lib/paperclip_processors}/cropper.rb

@@ -3,12 +3,12 @@ module Paperclip
   class Cropper < Thumbnail
     def transformation_command
       if crop_command
-        crop_command + super.join(" ").sub(/ -crop \S+/, '').split(" ")        
+        crop_command + super.join(" ").sub(/ -crop \S+/, '').split(" ")
       else
         super
       end
     end
-    
+
     def crop_command
       target = @attachment.instance
       if target.cropping?
@@ -16,4 +16,4 @@ module Paperclip
       end
     end
   end
-end
+end

data/lib/resource_feeder.rb

@@ -0,0 +1,3 @@
+require 'resource_feeder/rss'
+require 'resource_feeder/atom'
+ActionController::Base.send(:include, ResourceFeeder::Rss, ResourceFeeder::Atom)

data/{vendor/plugins/white_list/init.rb → lib/white_list.rb}

@@ -1,4 +1,4 @@
-require 'white_list_helper'
+require 'white_list/white_list_helper'
 ActionView::Base.send :include, WhiteListHelper
 ActiveRecord::Base.send :include, WhiteListHelper
 

data/test/fixtures/messages.yml

@@ -7,7 +7,7 @@ message_from_kevin_to_aaron:
   recipient_deleted: false
   subject: Test message
   body: Test body
-  read_at: nil
+  read_at:
   created_at: <%= 2.days.ago.iso8601 %>
   updated_at: <%= 2.days.ago.iso8601 %>
 message_from_aaron_to_leopoldo:
@@ -18,7 +18,7 @@ message_from_aaron_to_leopoldo:
   recipient_deleted: true
   subject: Test message
   body: Test body
-  read_at: nil
+  read_at:
   created_at: <%= 2.days.ago.iso8601 %>
   updated_at: <%= 2.days.ago.iso8601 %>
 

data/test/functional/admin_controller_test.rb

@@ -16,20 +16,20 @@ class AdminControllerTest < ActionController::TestCase
   end
   
   def test_should_not_activate_user
-    login_as :quentin
     users(:quentin).update_attribute('activation_code', 'test')
-    users(:quentin).update_attribute('activated_at', nil)    
-        
-    put :activate_user, :id => 1
+    users(:quentin).update_attribute('activated_at', nil)
+
+    login_as :quentin
+    patch :activate_user, :id => users(:quentin).id
     assert !users(:quentin).active?
     assert_redirected_to login_path
   end
   
   def test_should_not_activate_user_js
     users(:quentin).update_attribute('activation_code', 'test')
-    users(:quentin).update_attribute('activated_at', nil)    
-    
-    get :activate_user, :id => 1, :format => 'js'
+    users(:quentin).update_attribute('activated_at', nil)
+
+    get :activate_user, :id => users(:quentin).id, :format => 'js'
     assert !users(:quentin).active?
   end
   
@@ -39,14 +39,14 @@ class AdminControllerTest < ActionController::TestCase
     users(:quentin).update_attribute('activated_at', nil)    
 
     login_as :admin
-    put :activate_user, :id => users(:quentin).id
+    patch :activate_user, :id => users(:quentin).id
     assert_response :redirect    
     assert users(:quentin).reload.active?
   end
   
   def test_should_deactivate_user
     login_as :admin
-    put :deactivate_user, :id => users(:quentin).id
+    patch :deactivate_user, :id => users(:quentin).id
     assert_response :redirect    
     assert !users(:quentin).reload.active?    
   end
@@ -60,9 +60,9 @@ class AdminControllerTest < ActionController::TestCase
   
   test "should search users" do
     login_as :admin
-    get :users, :login => 'admin'
+    get :users, :login => 'uenti'
     assert_response :success
-    assert !assigns(:users).empty?
+    assert_equal assigns(:users).first, users(:quentin)
   end
   
   test "should clear cache" do

data/test/functional/ads_controller_test.rb

@@ -19,33 +19,33 @@ class AdsControllerTest < ActionController::TestCase
   end
   
   def test_should_create_ad
-    old_count = Ad.count
-    post :create, :ad => { :html => 'Our company is great!', :frequency => 1, :audience => 'all'}
-    assert_equal old_count+1, Ad.count
-    
+    assert_difference Ad, :count do
+      post :create, :ad => { :html => 'Our company is great!', :frequency => 1, :audience => 'all'}
+    end
+
     assert_redirected_to ad_path(assigns(:ad))
   end
 
   def test_should_show_ad
-    get :show, :id => 1
+    get :show, :id => ads(:hgtv).id
     assert_response :success
   end
 
   def test_should_get_edit
-    get :edit, :id => 1
+    get :edit, :id => ads(:hgtv).id
     assert_response :success
   end
   
   def test_should_update_ad
-    put :update, :id => 1, :ad => { }
+    patch :update, :id => ads(:hgtv).id, :ad => { }
     assert_redirected_to ad_path(assigns(:ad))
   end
   
   def test_should_destroy_ad
-    old_count = Ad.count
-    delete :destroy, :id => 1
-    assert_equal old_count-1, Ad.count
-    
+    assert_difference Ad, :count, -1 do
+      delete :destroy, :id => ads(:hgtv).id
+    end
+
     assert_redirected_to ads_path
   end
 end