community_engine 3.0.0 → 3.2.0

data/lib/community_engine/authenticated_system.rb

@@ -57,21 +57,6 @@ module AuthenticatedSystem
       @current_user_session = UserSession.find
     end
 
-    # Check if the user is authorized.
-    #
-    # Override this method in your controllers if you want to restrict access
-    # to only a few actions or if you want to check if the user
-    # has the correct rights.
-    #
-    # Example:
-    #
-    #  # only allow nonbobs
-    #  def authorize?
-    #    current_user.login != "bob"
-    #  end
-    def authorized?
-      true
-    end
     def admin?
      logged_in? && current_user.admin?
     end
@@ -87,7 +72,7 @@ module AuthenticatedSystem
     # behavior in case the user is not authorized
     # to access the requested action.  For example, a popup window might
     # simply close itself.
-    def access_denied
+    def access_denied(exception=nil)
       respond_to do |accepts|
         accepts.html do
           store_location
@@ -120,18 +105,18 @@ module AuthenticatedSystem
     #
     # To require logins for all actions, use this in your controllers:
     #
-    #   before_filter :login_required
+    #   before_action :login_required
     #
     # To require logins for specific actions, use this in your controllers:
     #
-    #   before_filter :login_required, :only => [ :edit, :update ]
+    #   before_action :login_required, :only => [ :edit, :update ]
     #
     # To skip this in a subclassed controller:
     #
-    #   skip_before_filter :login_required
+    #   skip_before_action :login_required
     #
     def login_required
-      logged_in? && authorized? ? true : access_denied
+      logged_in? ? true : access_denied
     end
 
     def require_user

data/lib/community_engine/engine.rb

@@ -5,9 +5,14 @@ module CommunityEngine
   class Engine < Rails::Engine
     engine_name "community_engine"
 
+    config.railties_order = [ CommunityEngine::Engine, :main_app, :all]
+
+
     initializer engine_name do |app|
       require root.join('config','application_config.rb')
       require app.root.join('config','application_config.rb')
+
+      ActiveAdmin.application.load_paths += Dir[File.dirname(__FILE__) + '/admin']
     end
 
     initializer "#{engine_name}.initializers", :before => :load_config_initializers do

data/lib/community_engine/version.rb

@@ -1,7 +1,7 @@
 module CommunityEngine
   module Version
      MAJOR = 3
-     MINOR = 0
+     MINOR = 2
      PATCH = 0
      BUILD = nil
 

data/lib/resource_feeder/atom.rb

@@ -1,3 +1,5 @@
+require "builder"
+
 module ResourceFeeder
   module Atom
     extend self

data/lib/resource_feeder/rss.rb

@@ -1,3 +1,5 @@
+require "builder"
+
 module ResourceFeeder
   module Rss
     extend self

data/lib/white_list.rb

@@ -3,30 +3,25 @@ ActionView::Base.send :include, WhiteListHelper
 ActiveRecord::Base.send :include, WhiteListHelper
 
 ActiveRecord::Base.class_eval do
-  include ActionView::Helpers::TagHelper, ActionView::Helpers::TextHelper, WhiteListHelper, ActionView::Helpers::UrlHelper
-  
+  # include ActionView::Helpers::TagHelper, ActionView::Helpers::TextHelper, WhiteListHelper, ActionView::Helpers::UrlHelper
+
   def self.format_attribute(attr_name)
     class << self; include ActionView::Helpers::TagHelper, ActionView::Helpers::TextHelper, WhiteListHelper; end
     define_method(:body)       { read_attribute attr_name }
-    define_method(:body=)      { |value| write_attribute "#{attr_name}", value }    
+    define_method(:body=)      { |value| write_attribute "#{attr_name}", value }
     define_method(:body_html)  { read_attribute "#{attr_name}_html" }
     define_method(:body_html=) { |value| write_attribute "#{attr_name}_html", value }
     before_save :format_content
   end
 
-  def dom_id
-    [self.class.name.downcase.pluralize.dasherize, id] * '-'
-  end
-
   protected
     def format_content
       body.strip! if body.respond_to?(:strip!)
       self.body_html = body.blank? ? '' : body_html_with_formatting
       self.body = white_list(self.body)
     end
-    
+
     def body_html_with_formatting
-      body_html = auto_link(body) { |text| truncate(text, :length => 50) }
-      white_list(body_html) 
+      white_list(body_html)
     end
-end
+end

data/test/fixtures/events.yml

@@ -59,3 +59,13 @@ no_rsvp_event:
   metro_area_id: 1
   allow_rsvp: false
 
+event_with_description:
+  id: 7
+  name: An event with description
+  description: <p>I am an event with a very nice description</p>
+  created_at: <%= 5.days.ago.iso8601 %>
+  updated_at: <%= 5.days.ago.iso8601 %>  
+  start_time: <%= 13.days.from_now.iso8601 %>
+  end_time:   <%= (13.days.from_now + 1.hour).iso8601 %>  
+  user_id: 4
+  metro_area_id: 1

data/test/fixtures/tags.yml

@@ -1,19 +1,20 @@
 general:
   id: 1
   name: General
-  
+  taggings_count: 1
 misc:
   id: 2
   name: Misc
-
+  taggings_count: 1
 extra:
   id: 3
   name: Extra
-
+  taggings_count: 1
 special_characters:
   id: 4
   name: Svår
-
+  taggings_count: 1
 related_to_misc:
   id: 5
-  name: Related
+  name: Related
+  taggings_count: 1

data/test/functional/activities_controller_test.rb

@@ -6,9 +6,9 @@ class ActivitiesControllerTest < ActionController::TestCase
   test "should get index" do
     login_as :quentin
     users(:quentin).track_activity(:updated_profile)
-        
+
     get :index
-    
+
     assert_response :success
     assert assigns(:activities).any?
     assert assigns(:popular_tags).any?
@@ -19,44 +19,44 @@ class ActivitiesControllerTest < ActionController::TestCase
     get :network, :user_id => users(:quentin).to_param
     assert_response :success
   end
-  
+
   def test_should_delete_activity
     @request.env["HTTP_REFERER"] = '/'
-    
+
     login_as :quentin
     users(:quentin).track_activity(:logged_in)
-    
+
     assert_difference Activity, :count, -1 do
-      delete :destroy, :id => Activity.last.id      
+      delete :destroy, :id => Activity.last.id
     end
-    
+
     assert_response :redirect
   end
-  
+
   def test_should_not_delete_activity
     @request.env["HTTP_REFERER"] = '/'
-    
+
     login_as :quentin
     users(:aaron).track_activity(:logged_in)
-    
+
     assert_difference Activity, :count, 0 do
-      delete :destroy, :id => Activity.last.id      
+      delete :destroy, :id => Activity.last.id
     end
-    
-    assert_response :redirect    
+
+    assert_response :redirect
   end
-  
+
   def test_should_delete_activity_as_admin
     @request.env["HTTP_REFERER"] = '/'
-    
+
     login_as :admin
     users(:quentin).track_activity(:logged_in)
-    
+
     assert_difference Activity, :count, -1 do
-      delete :destroy, :id => Activity.last.id      
+      delete :destroy, :id => Activity.last.id
     end
-    
-    assert_response :redirect    
+
+    assert_response :redirect
   end
 
 end

data/test/functional/admin/posts_controller_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class AdminPostControllerTest < ActionController::TestCase
+  fixtures :all
+
+  setup do
+    @controller = ::Admin::PostsController.new
+  end
+
+  test 'should get index' do
+    login_as :admin
+    get :index
+    assert_response :success
+  end
+
+end

data/test/functional/admin_controller_test.rb

@@ -1,82 +1,82 @@
-require 'test_helper'
-
-class AdminControllerTest < ActionController::TestCase
-  fixtures :users, :categories, :roles
-  
-  def test_should_get_index
-    login_as :admin
-    get :users
-    assert_response :success
-  end
-
-  def test_should_not_get_index
-    login_as :quentin
-    get :users
-    assert_redirected_to login_path
-  end
-  
-  def test_should_not_activate_user
-    users(:quentin).update_attribute('activation_code', 'test')
-    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 => users(:quentin).id, :format => 'js'
-    assert !users(:quentin).active?
-  end
-  
-
-  def test_should_activate_user
-    users(:quentin).update_attribute('activation_code', 'test')
-    users(:quentin).update_attribute('activated_at', nil)    
-
-    login_as :admin
-    patch :activate_user, :id => users(:quentin).id
-    assert_response :redirect    
-    assert users(:quentin).reload.active?
-  end
-  
-  def test_should_deactivate_user
-    login_as :admin
-    patch :deactivate_user, :id => users(:quentin).id
-    assert_response :redirect    
-    assert !users(:quentin).reload.active?    
-  end
-  
-  test "should list users" do
-    login_as :admin
-    get :users
-    assert_response :success
-    assert !assigns(:users).empty?
-  end
-  
-  test "should search users" do
-    login_as :admin
-    get :users, :login => 'uenti'
-    assert_response :success
-    assert_equal assigns(:users).first, users(:quentin)
-  end
-  
-  test "should clear cache" do
-    login_as :admin
-    get :clear_cache
-    assert_redirected_to admin_dashboard_path
-  end
-  
-  test "should get subscribers xml" do
-    authorize_as :admin
-
-    get :subscribers, :format => :xml
-    assert_response :success
-    assert assigns(:users).any?
-  end
-
-end
+# require 'test_helper'
+
+# class AdminControllerTest < ActionController::TestCase
+#   fixtures :users, :categories, :roles
+
+#   def test_should_get_index
+#     login_as :admin
+#     get :users
+#     assert_response :success
+#   end
+
+#   def test_should_not_get_index
+#     login_as :quentin
+#     get :users
+#     assert_redirected_to login_path
+#   end
+
+#   def test_should_not_activate_user
+#     users(:quentin).update_attribute('activation_code', 'test')
+#     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 => users(:quentin).id, :format => 'js'
+#     assert !users(:quentin).active?
+#   end
+
+
+#   def test_should_activate_user
+#     users(:quentin).update_attribute('activation_code', 'test')
+#     users(:quentin).update_attribute('activated_at', nil)
+
+#     login_as :admin
+#     patch :activate_user, :id => users(:quentin).id
+#     assert_response :redirect
+#     assert users(:quentin).reload.active?
+#   end
+
+#   def test_should_deactivate_user
+#     login_as :admin
+#     patch :deactivate_user, :id => users(:quentin).id
+#     assert_response :redirect
+#     assert !users(:quentin).reload.active?
+#   end
+
+#   test "should list users" do
+#     login_as :admin
+#     get :users
+#     assert_response :success
+#     assert !assigns(:users).empty?
+#   end
+
+#   test "should search users" do
+#     login_as :admin
+#     get :users, :login => 'uenti'
+#     assert_response :success
+#     assert_equal assigns(:users).first, users(:quentin)
+#   end
+
+#   test "should clear cache" do
+#     login_as :admin
+#     get :clear_cache
+#     assert_redirected_to admin_dashboard_path
+#   end
+
+#   test "should get subscribers xml" do
+#     authorize_as :admin
+
+#     get :subscribers, :format => :xml
+#     assert_response :success
+#     assert assigns(:users).any?
+#   end
+
+# end

data/test/functional/categories_controller_test.rb

@@ -3,49 +3,10 @@ require 'test_helper'
 class CategoriesControllerTest < ActionController::TestCase
   fixtures :categories, :users, :roles
 
-  def test_should_get_index
-    login_as :admin
-    get :index
-    assert_response :success
-    assert assigns(:categories)
-  end
-
-  def test_should_get_new
-    login_as :admin
-    get :new
-    assert_response :success
-  end
-  
-  def test_should_create_category
-    login_as :admin
-    assert_difference Category, :count, 1 do
-      post :create, :category => {:name => "Test Category"}
-    end    
-    assert_redirected_to category_path(assigns(:category))
-  end
 
   def test_should_show_category
     get :show, :id => categories(:how_to).id
     assert_response :success
   end
 
-  def test_should_get_edit
-    login_as :admin
-    get :edit, :id => categories(:how_to).id
-    assert_response :success
-  end
-  
-  def test_should_update_category
-    login_as :admin
-    patch :update, :id => categories(:how_to).id, :category => { }
-    assert_redirected_to category_path(assigns(:category))
-  end
-  
-  def test_should_destroy_category
-    login_as :admin
-    assert_difference Category, :count, -1 do
-      delete :destroy, :id => categories(:how_to).id
-    end
-    assert_redirected_to categories_path
-  end
 end