ActionItem114: abstracting needs_profile and making several tests pass

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@836 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem114: abstracting needs_profile and making several tests pass
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@836 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 5bc53780
Showing 5 changed files with 27 additions and 14 deletions Show diff stats
app/controllers/application.rb
app/controllers/profile_admin/cms_controller.rb
config/environment.rb
lib/needs_profile.rb
test/functional/cms_controller_test.rb
@@ -12,14 +12,11 @@ class ApplicationController &lt; ActionController::Base
   extend PermissionCheck
   init_gettext 'noosfero'
+  include NeedsProfile
+
   before_filter :detect_stuff_by_domain
   attr_reader :environment
-  def self.needs_profile
-    before_filter :load_profile
-    design :holder => 'profile' 
-  end
-
   def self.acts_as_environment_admin_controller
     before_filter :load_admin_controller
   end
@@ -32,10 +29,6 @@ class ApplicationController &lt; ActionController::Base
   protected 
-  def profile
-    @profile
-  end
-
   # TODO: move this logic somewhere else (Domain class?)
   def detect_stuff_by_domain
     @domain = Domain.find_by_name(request.host)
-class CmsController < ComatoseAdminController
+class CmsController < Comatose::AdminController
   extend PermissionCheck
-  ApplicationController.needs_profile
+  needs_profile
   define_option :page_class, Article
@@ -84,6 +84,7 @@ Comatose.configure do |config|
     # FIXME: also check permissions
   end
   config.admin_includes << :authenticated_system
+  config.admin_includes << :needs_profile
   config.admin_helpers << :application_helper
   config.admin_helpers << :document_helper
   config.admin_helpers << :language_helper
@@ -0,0 +1,20 @@
+module NeedsProfile
+
+  module ClassMethods
+    def needs_profile
+      before_filter :load_profile
+      design :holder => 'profile' 
+    end
+  end
+
+  def self.included(including)
+    including.send(:extend, NeedsProfile::ClassMethods)
+  end
+
+  protected 
+
+  def profile
+    @profile
+  end
+
+end
@@ -11,8 +11,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     @response   = ActionController::TestResponse.new
   end
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def test_missing
+    flunk 'need to add some tests for CmsController '
   end
 end
1	-class CmsController < ComatoseAdminController	1	+class CmsController < Comatose::AdminController
2	extend PermissionCheck	2	extend PermissionCheck
3		3
4	- ApplicationController.needs_profile	4	+ needs_profile
5		5
6	define_option :page_class, Article	6	define_option :page_class, Article
7		7
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+module NeedsProfile
	2	+
	3	+ module ClassMethods
	4	+ def needs_profile
	5	+ before_filter :load_profile
	6	+ design :holder => 'profile'
	7	+ end
	8	+ end
	9	+
	10	+ def self.included(including)
	11	+ including.send(:extend, NeedsProfile::ClassMethods)
	12	+ end
	13	+
	14	+ protected
	15	+
	16	+ def profile
	17	+ @profile
	18	+ end
	19	+
	20	+end