ActionItem21: checkpoint

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

ActionItem21: checkpoint
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@986 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent d7d70f16
Showing 5 changed files with 62 additions and 35 deletions Show diff stats
app/controllers/my_profile/cms/text_html.rb
app/controllers/my_profile/cms_controller.rb
app/helpers/cms_helper.rb
app/models/article.rb
test/functional/cms_controller_test.rb
 class CmsController
-  def text_html_new
-    @article = Article.new(params[:article])
-    if params[:parent_id]
-      @article.parent = profile.articles.find(params[:parent_id])
-    end
-    @article.profile = profile
-    @article.last_changed_by = user
-    if request.post?
-      if @article.save
-        redirect_to :action => 'view', :id => @article.id
-      end
-    end
-  end
-
-  def text_html_edit
-    @article = Article.find(params[:id])
-    if request.post?
-      @article.last_changed_by = user
-      if @article.update_attributes(params[:article])
-        redirect_to :action => 'view', :id => @article.id
-      end
-    end
-  end
+  # add eventual helper methods you need for editing your type of article. 
 end
@@ -19,8 +19,34 @@ class CmsController &lt; MyProfileController
   end
   def edit
-    article = profile.articles.find(params[:id])
-    redirect_to(url_for_edit_article(article))
+    @article = Article.find(params[:id])
+    if request.post?
+      @article.last_changed_by = user
+      if @article.update_attributes(params[:article])
+        redirect_to :action => 'view', :id => @article.id
+      end
+    end
+
+    render :action => "#{mime_type_to_action_name(@article.mime_type)}_edit"
+  end
+
+  def new
+    # FIXME until now, use text/html by default
+    type = params[:type] || 'text/html'
+
+    @article = Article.new(params[:article])
+    if params[:parent_id]
+      @article.parent = profile.articles.find(params[:parent_id])
+    end
+    @article.profile = profile
+    @article.last_changed_by = user
+    if request.post?
+      if @article.save
+        redirect_to :action => 'view', :id => @article.id
+      end
+    end
+
+    render :action => "#{mime_type_to_action_name(type)}_new"
   end
   post_only :set_home_page
@@ -5,13 +5,17 @@ module CmsHelper
   end
   def url_for_edit_article(article)
-    action = article.mime_type.gsub('/', '_') + '_edit'
+    action = mime_type_to_action_name(article.mime_type) + '_edit'
     url_for(:action => action, :id => article.id)
   end
   def link_to_new_article(mime_type)
-    action = mime_type.gsub('/', '_') + '_new'
+    action = mime_type_to_action_name(mime_type) + '_new'
     button('new', _("New %s") % mime_type, :action => action, :parent_id => params[:parent_id])
   end
+  def mime_type_to_action_name(mime_type)
+    mime_type.gsub('/', '_').gsub('-', '')
+  end
+
 end
@@ -31,6 +31,8 @@ class Article &lt; ActiveRecord::Base
   # provides the icon name to be used for this article. In this class this
   # method just returns 'text-html', but subclasses may (and should) override
   # to return their specific icons.
+  #
+  # FIXME use mime_type and generate this name dinamically
   def icon_name
     'text-html'
   end
@@ -42,6 +42,19 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   end
   should 'be able to edit a document' do
+    a = profile.articles.build(:name => 'test')
+    a.save!
+
+    get :edit, :profile => profile.identifier, :id => a.id
+    assert_template 'text_html_edit'
+  end
+
+  should 'be able to type a new document' do
+    get :new, :profile => profile.identifier
+    assert_template 'text_html_new'
+  end
+
+  should 'be able to create a new document' do
     flunk 'pending'
   end
@@ -73,19 +86,23 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     assert_equal [ 'text/html', 'image' ], CmsController.available_types
   end
-  should 'made the editor actions available' do
-    # ASSUMING that 'text/html' is always available and has 'new' and 'edit'
-    assert CmsController.instance_methods.include?('text_html_new')
-    assert CmsController.instance_methods.include?('text_html_edit')
-  end
-
-  should 'edit by redirecting to the correct editor depending on the mime-type' do
+  should 'edit by using the correct template to display the editor depending on the mime-type' do
     a = profile.articles.build(:name => 'test document')
     a.save!
     assert_equal 'text/html', a.mime_type
     get :edit, :profile => profile.identifier, :id => a.id
-    assert_redirected_to :action => 'text_html_edit', :id => a.id
+    assert_response :success
+    assert_template 'text_html_edit'
+  end
+
+  should 'convert mime-types to action names' do
+    obj = mock
+    obj.extend(CmsHelper)
+
+    assert_equal 'text_html', obj.mime_type_to_action_name('text/html')
+    assert_equal 'image', obj.mime_type_to_action_name('image')
+    assert_equal 'application_xnoosferosomething', obj.mime_type_to_action_name('application/x-noosfero-something')
   end
 end
1	class CmsController	1	class CmsController
2		2
3	- def text_html_new
4	- @article = Article.new(params[:article])
5	- if params[:parent_id]
6	- @article.parent = profile.articles.find(params[:parent_id])
7	- end
8	- @article.profile = profile
9	- @article.last_changed_by = user
10	- if request.post?
11	- if @article.save
12	- redirect_to :action => 'view', :id => @article.id
13	- end
14	- end
15	- end
16	-
17	- def text_html_edit
18	- @article = Article.find(params[:id])
19	- if request.post?
20	- @article.last_changed_by = user
21	- if @article.update_attributes(params[:article])
22	- redirect_to :action => 'view', :id => @article.id
23	- end
24	- end
25	- end	3	+ # add eventual helper methods you need for editing your type of article.
26		4
27	end	5	end
	@@ -19,8 +19,34 @@ class CmsController < MyProfileController		@@ -19,8 +19,34 @@ class CmsController < MyProfileController
19	end	19	end
20		20
21	def edit	21	def edit
22	- article = profile.articles.find(params[:id])
23	- redirect_to(url_for_edit_article(article))	22	+ @article = Article.find(params[:id])
		23	+ if request.post?
		24	+ @article.last_changed_by = user
		25	+ if @article.update_attributes(params[:article])
		26	+ redirect_to :action => 'view', :id => @article.id
		27	+ end
		28	+ end
		29	+
		30	+ render :action => "#{mime_type_to_action_name(@article.mime_type)}_edit"
		31	+ end
		32	+
		33	+ def new
		34	+ # FIXME until now, use text/html by default
		35	+ type = params[:type] \|\| 'text/html'
		36	+
		37	+ @article = Article.new(params[:article])
		38	+ if params[:parent_id]
		39	+ @article.parent = profile.articles.find(params[:parent_id])
		40	+ end
		41	+ @article.profile = profile
		42	+ @article.last_changed_by = user
		43	+ if request.post?
		44	+ if @article.save
		45	+ redirect_to :action => 'view', :id => @article.id
		46	+ end
		47	+ end
		48	+
		49	+ render :action => "#{mime_type_to_action_name(type)}_new"
24	end	50	end
25		51
26	post_only :set_home_page	52	post_only :set_home_page