refactored the create method to actually produce meaningful error messages when something goes wrong. added tests for corner cases

4 files changed, 44 insertions, 13 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 0d4a3fe..b34c19e 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -26,23 +26,24 @@ class NodesController < ApplicationController
   def new
     @node = Node.new params[:node]
   end
-
+  
   def create
-    parent = case params[:kind]
-    when "top_level"  then Node.root
-    when "update"     then Update.find_or_create_parent
-    when "generic"    then Node.find(params[:parent_id])
-    end
+    params[:title] ||= ""
     
-    if parent
-      @node = parent.children.create(:slug => params[:title].parameterize.to_s)
+    @node = Node.new
+    @node.parent_id = find_parent
+    @node.slug = params[:title].parameterize.to_s
+    
+    if @node.save
       @node.draft.update_attributes(:title => params[:title])
       redirect_to(edit_node_path(@node))
     else
-      render :action => :new
+      debugger
+      #@node.errors.add_to_base("Titel zu kurz") if @node.errors["slug"]
+      render :new
     end
   end
-
+  
   def show
     @page = Node.find(params[:id]).pages.last
   end
@@ -105,4 +106,19 @@ class NodesController < ApplicationController
     def find_node
       @node = Node.find(params[:id])
     end
+    
+    def find_parent
+      case params[:kind]
+      when "top_level"
+        Node.root.id
+      when "update"
+        Update.find_or_create_parent.id
+      when "generic"
+        if params[:parent_id] && Node.find(params[:parent_id])
+          params[:parent_id]
+        else
+          nil
+        end
+      end
+    end
 end
diff --git a/app/models/node.rb b/app/models/node.rb
index 057248e..fa9d519 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -16,7 +16,8 @@ class Node < ActiveRecord::Base
   after_save    :update_unique_names_of_children
   
   # Validations
-  # validates_length_of :slug, :within => 3..40
+  validates_length_of :slug, :within => 1..255
+  validates_presence_of   :slug
   validates_uniqueness_of :slug, :scope => :parent_id
   
   # Index for Fulltext Search
diff --git a/app/views/nodes/create.html.erb b/app/views/nodes/create.html.erb
deleted file mode 100644
index 05b6282..0000000
--- a/app/views/nodes/create.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>Nodes#create</h1>
-<p>Find me in app/views/nodes/create.html.erb</p>
diff --git a/test/functional/nodes_controller_test.rb b/test/functional/nodes_controller_test.rb
index 08e50fd..801f2c0 100644
--- a/test/functional/nodes_controller_test.rb
+++ b/test/functional/nodes_controller_test.rb
@@ -70,6 +70,22 @@ class NodesControllerTest < ActionController::TestCase
     assert_equal 1, Node.last.level
   end
   
+  test "creating a top_level node without a title should not work" do
+    login_as :quentin
+    
+    assert_no_difference "Node.count" do
+      post(:create, :kind => "top_level")
+    end
+  end
+  
+  test "creating a generic node without a parent_id should not work" do
+    login_as :quentin
+    
+    assert_no_difference "Node.count" do
+      post(:create, :kind => "generic")
+    end
+  end
+  
   def test_editing_a_node
     login_as :quentin