From a3082526cd148f7bd961b4244fbd6f60e53f9975 Mon Sep 17 00:00:00 2001
From: hammett <hammett@73e77b4c-caa6-f847-a29a-24ab75ae54b6>
Date: Sun, 2 Dec 2007 04:14:38 +0000
Subject: [PATCH] - Fixed MR-84   "Nested classes are mapped wrongly to form
 fields"

git-svn-id: https://svn.castleproject.org/svn/castle/trunk@4552 73e77b4c-caa6-f847-a29a-24ab75ae54b6
---
 .../Framework/Internal/ActiveRecordModelBuilder.cs |  7 +++-
 .../Framework/Internal/Model/ActiveRecordModel.cs  | 11 ++++++
 .../CreateAction.cs                                |  3 +-
 .../Helpers/ARFormHelper.cs                        | 27 +++++++------
 .../Templates/edit.vm                              |  4 +-
 .../Templates/list.vm                              |  4 +-
 .../Templates/new.vm                               |  4 +-
 .../Templates/remove.vm                            |  4 +-
 .../ARDataBinder.cs                                |  9 ++++-
 .../Helpers/FormHelper.cs                          | 23 +++++++++++
 MonoRail/Changes.txt                               |  3 ++
 .../Controllers/CustomerController.cs              | 10 +++++
 MonoRail/TestSiteARSupport/Model/Customer.cs       | 45 ++++++++++++++++++++++
 MonoRail/TestSiteARSupport/MyHttpApplication.cs    |  2 +-
 .../TestSiteARSupport-vs2005.csproj                |  3 +-
 15 files changed, 132 insertions(+), 27 deletions(-)
 create mode 100644 MonoRail/TestSiteARSupport/Controllers/CustomerController.cs
 create mode 100644 MonoRail/TestSiteARSupport/Model/Customer.cs

diff --git a/ActiveRecord/Castle.ActiveRecord/Framework/Internal/ActiveRecordModelBuilder.cs b/ActiveRecord/Castle.ActiveRecord/Framework/Internal/ActiveRecordModelBuilder.cs
index 0a263fd5e..0a1e49ac7 100644
--- a/ActiveRecord/Castle.ActiveRecord/Framework/Internal/ActiveRecordModelBuilder.cs
+++ b/ActiveRecord/Castle.ActiveRecord/Framework/Internal/ActiveRecordModelBuilder.cs
@@ -257,12 +257,15 @@ namespace Castle.ActiveRecord.Framework.Internal
 
 						nestedModel.IsNestedType = true;
 
-						Type nestedType = propAtt.MapType != null ? propAtt.MapType : prop.PropertyType;
+						Type nestedType = propAtt.MapType ?? prop.PropertyType;
 						nestedModel.IsNestedCompositeType = model.IsNestedCompositeType;
 						ProcessProperties(nestedType, nestedModel);
 						ProcessFields(nestedType, nestedModel);
 
-						model.Components.Add(new NestedModel(prop, propAtt, nestedModel));
+						NestedModel nested = new NestedModel(prop, propAtt, nestedModel);
+						nestedModel.ParentNested = nested;
+
+						model.Components.Add(nested);
 					}
 					else if (attribute is NestedParentReferenceAttribute)
 					{
diff --git a/ActiveRecord/Castle.ActiveRecord/Framework/Internal/Model/ActiveRecordModel.cs b/ActiveRecord/Castle.ActiveRecord/Framework/Internal/Model/ActiveRecordModel.cs
index f764ee4f1..5429cdb28 100644
--- a/ActiveRecord/Castle.ActiveRecord/Framework/Internal/Model/ActiveRecordModel.cs
+++ b/ActiveRecord/Castle.ActiveRecord/Framework/Internal/Model/ActiveRecordModel.cs
@@ -59,6 +59,7 @@ namespace Castle.ActiveRecord.Framework.Internal
 		private KeyModel key;
 		private TimestampModel timestamp;
 		private VersionModel version;
+		private NestedModel parentNested;
 
 		private readonly IList imports = new ArrayList();
 		private readonly IList hasManyToAny = new ArrayList();
@@ -168,6 +169,16 @@ namespace Castle.ActiveRecord.Framework.Internal
 		}
 
 		/// <summary>
+		/// Gets or sets the parent nested.
+		/// </summary>
+		/// <value>The parent nested.</value>
+		public NestedModel ParentNested
+		{
+			get { return parentNested; }
+			set { parentNested = value; }
+		}
+
+		/// <summary>
 		/// Gets or sets a value indicating whether this instance is nested type.
 		/// </summary>
 		/// <value>
diff --git a/MonoRail/Castle.MonoRail.ActiveRecordScaffold/CreateAction.cs b/MonoRail/Castle.MonoRail.ActiveRecordScaffold/CreateAction.cs
index 286076d82..2cd08ba6b 100644
--- a/MonoRail/Castle.MonoRail.ActiveRecordScaffold/CreateAction.cs
+++ b/MonoRail/Castle.MonoRail.ActiveRecordScaffold/CreateAction.cs
@@ -46,8 +46,7 @@ namespace Castle.MonoRail.ActiveRecordScaffold
 			{
 				AssertIsPost(controller);
 
-				instance = binder.BindObject(Model.Type, Model.Type.Name, 
-				                                    builder.BuildSourceNode(controller.Form));
+				instance = binder.BindObject(Model.Type, Model.Type.Name, builder.BuildSourceNode(controller.Form));
 
 				CommonOperationUtils.SaveInstance(instance, controller, errors, ref prop2Validation, true);
 
diff --git a/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Helpers/ARFormHelper.cs b/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Helpers/ARFormHelper.cs
index 517fa0de4..71032a683 100644
--- a/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Helpers/ARFormHelper.cs
+++ b/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Helpers/ARFormHelper.cs
@@ -21,7 +21,6 @@ namespace Castle.MonoRail.ActiveRecordScaffold.Helpers
 	using System.Reflection;
 	using Castle.ActiveRecord;
 	using Castle.ActiveRecord.Framework.Internal;
-	using Castle.MonoRail.Framework;
 	using Castle.MonoRail.Framework.Helpers;
 
 	public class ARFormHelper : FormHelper
@@ -35,6 +34,7 @@ namespace Castle.MonoRail.ActiveRecordScaffold.Helpers
 		                                       11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 
 		                                       21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 };
 		private static readonly int[] Years;
+		private TextHelper textHelper = new TextHelper();
 
 		static ARFormHelper()
 		{
@@ -47,7 +47,12 @@ namespace Castle.MonoRail.ActiveRecordScaffold.Helpers
 				Years[year - 1950] = year;
 			}
 		}
-		
+
+		public TextHelper TextHelper
+		{
+			get { return textHelper; }
+		}
+
 		public ICollection GetModelHierarchy(ActiveRecordModel model, object instance)
 		{
 			ArrayList list = new ArrayList();
@@ -192,11 +197,11 @@ namespace Castle.MonoRail.ActiveRecordScaffold.Helpers
 
 			if (fieldInfo.FieldType == typeof(DateTime))
 			{
-				stringBuilder.Append(LabelFor(propName + "day", fieldInfo.Name + ": &nbsp;"));
+				stringBuilder.Append(LabelFor(propName + "day", TextHelper.PascalCaseToWord(fieldInfo.Name) + ": &nbsp;"));
 			}
 			else
 			{
-				stringBuilder.Append(LabelFor(propName, fieldInfo.Name + ": &nbsp;"));
+				stringBuilder.Append(LabelFor(propName, TextHelper.PascalCaseToWord(fieldInfo.Name) + ": &nbsp;"));
 			}
 
 			FieldAttribute propAtt = fieldModel.FieldAtt;
@@ -224,11 +229,11 @@ namespace Castle.MonoRail.ActiveRecordScaffold.Helpers
 
 			if (prop.PropertyType == typeof(DateTime))
 			{
-				stringBuilder.Append(LabelFor(propName + "day", prop.Name + ": &nbsp;"));
+				stringBuilder.Append(LabelFor(propName + "day", TextHelper.PascalCaseToWord(prop.Name) + ": &nbsp;"));
 			}
 			else
 			{
-				stringBuilder.Append(LabelFor(propName, prop.Name + ": &nbsp;"));
+				stringBuilder.Append(LabelFor(propName, TextHelper.PascalCaseToWord(prop.Name) + ": &nbsp;"));
 			}
 
 			PropertyAttribute propAtt = propertyModel.PropertyAtt;
@@ -254,11 +259,11 @@ namespace Castle.MonoRail.ActiveRecordScaffold.Helpers
 
 			if (prop.PropertyType == typeof(DateTime))
 			{
-				stringBuilder.Append(LabelFor(propName + "day", prop.Name + ": &nbsp;"));
+				stringBuilder.Append(LabelFor(propName + "day", TextHelper.PascalCaseToWord(prop.Name) + ": &nbsp;"));
 			}
 			else
 			{
-				stringBuilder.Append(LabelFor(propName, prop.Name + ": &nbsp;"));
+				stringBuilder.Append(LabelFor(propName, TextHelper.PascalCaseToWord(prop.Name) + ": &nbsp;"));
 			}
 
 			RenderAppropriateControl(model, prop.PropertyType,
@@ -289,7 +294,7 @@ namespace Castle.MonoRail.ActiveRecordScaffold.Helpers
 
 			String propName = CreatePropName(model, prefix, keyModel.Property.Name);
 
-			stringBuilder.Append(LabelFor(propName, prop.Name + ": &nbsp;"));
+			stringBuilder.Append(LabelFor(propName, TextHelper.PascalCaseToWord(prop.Name) + ": &nbsp;"));
 			
 			IDictionary attrs = new HybridDictionary(true);
 			
@@ -441,7 +446,7 @@ namespace Castle.MonoRail.ActiveRecordScaffold.Helpers
 				foreach(String name in names)
 				{
 					options.Add(String.Format("{0} {1}\r\n",
-					                          RadioField(propName, name), LabelFor(name, name)));
+					                          RadioField(propName, name), LabelFor(name, TextHelper.PascalCaseToWord(name))));
 				}
 			}
 		}
@@ -452,7 +457,7 @@ namespace Castle.MonoRail.ActiveRecordScaffold.Helpers
 
 			if (model.IsNestedType)
 			{
-				propName = String.Format("{0}.{1}.{2}", prefix, model.Type.Name, name);
+				propName = String.Format("{0}.{1}.{2}", prefix, model.ParentNested.Property.Name, name);
 			}
 			else
 			{
diff --git a/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/edit.vm b/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/edit.vm
index 6fa0ea6e9..0d72a18cd 100644
--- a/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/edit.vm
+++ b/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/edit.vm
@@ -1,4 +1,4 @@
-<h2>Edit ${model.Type.Name}</h2>
+<h2>Edit $Form.TextHelper.PascalCaseToWord($model.Type.Name)</h2>
 
 #if($flash.errors)
 <ul id="errors">
@@ -21,7 +21,7 @@ $Form.HiddenField("${prefix}.${keyprop.Name}")
 #foreach($model in $Form.GetModelHierarchy($model, $instance))
 
 #if($model.IsNestedType)
-  $Form.FieldSet("${model.Type.Name}:")
+	$Form.FieldSet($Form.TextHelper.PascalCaseToWord($model.ParentNested.Property.Name))
 #end
 
 #foreach($field in $model.Fields)
diff --git a/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/list.vm b/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/list.vm
index 56079c79b..cdeb92f95 100644
--- a/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/list.vm
+++ b/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/list.vm
@@ -1,6 +1,6 @@
 
 <p>
-$PresentationHelper.LinkToNew( $model, $useModelName, "Create a new $model.Type.Name", $DictHelper.CreateDict() )
+$PresentationHelper.LinkToNew( $model, $useModelName, "Create a new $Form.TextHelper.PascalCaseToWord($model.Type.Name)", "%{}" )
 </p>
 
 #set($cols = $properties.Count + 2)
@@ -9,7 +9,7 @@ $PresentationHelper.LinkToNew( $model, $useModelName, "Create a new $model.Type.
   <tr>
     <th>&nbsp;</th>
   #foreach($prop in $properties)
-    <th>$prop.Name</th>
+    <th>$Form.TextHelper.PascalCaseToWord( $prop.Name )</th>
   #end
     <th>&nbsp;</th>
   </tr>
diff --git a/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/new.vm b/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/new.vm
index 598fd69a9..9e95e8eab 100644
--- a/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/new.vm
+++ b/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/new.vm
@@ -1,4 +1,4 @@
-<h2>New ${model.Type.Name}</h2>
+<h2>New $Form.TextHelper.PascalCaseToWord( $model.Type.Name )</h2>
 
 #if($flash.errors)
 <ul id="errors">
@@ -19,7 +19,7 @@ $Form.FormTag("%{action='create', id='scaffoldingform'}")
 #foreach($curmodel in $Form.GetModelHierarchy($model, $instance))
 
 #if($curmodel.IsNestedType)
-  $Form.FieldSet("${curmodel.Type.Name}:")
+	$Form.FieldSet( $Form.TextHelper.PascalCaseToWord($curmodel.ParentNested.Property.Name ))
 #end
 
 #foreach($field in $curmodel.Fields)
diff --git a/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/remove.vm b/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/remove.vm
index b41d1b6fd..4124ee3f2 100644
--- a/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/remove.vm
+++ b/MonoRail/Castle.MonoRail.ActiveRecordScaffold/Templates/remove.vm
@@ -1,5 +1,5 @@
 #if($exception)
-  <h2>${model.Type.Name} could not be removed</h2>
+  <h2>$Form.TextHelper.PascalCaseToWord( $model.Type.Name ) could not be removed</h2>
   <p>
   Error message:
   </p>
@@ -7,7 +7,7 @@
   $exception.Message
   </pre>
 #else
-  <h2>${model.Type.Name} removed</h2>
+  <h2>$Form.TextHelper.PascalCaseToWord( $model.Type.Name ) removed</h2>
 #end
 
 <p>
diff --git a/MonoRail/Castle.MonoRail.ActiveRecordSupport/ARDataBinder.cs b/MonoRail/Castle.MonoRail.ActiveRecordSupport/ARDataBinder.cs
index c38954fcc..6375a143a 100644
--- a/MonoRail/Castle.MonoRail.ActiveRecordSupport/ARDataBinder.cs
+++ b/MonoRail/Castle.MonoRail.ActiveRecordSupport/ARDataBinder.cs
@@ -155,6 +155,13 @@ namespace Castle.MonoRail.ActiveRecordSupport
 				shouldLoad = StackDepth != 0;
 			}
 
+			ActiveRecordModel model = ActiveRecordModel.GetModel(instanceType);
+
+			if (shouldLoad && model == null) // Nested type or unregistered type
+			{
+				shouldLoad = false;
+			}
+
 			if (shouldLoad)
 			{
 				if (instanceType.IsArray)
@@ -162,8 +169,6 @@ namespace Castle.MonoRail.ActiveRecordSupport
 					throw new BindingException("ARDataBinder AutoLoad does not support arrays");
 				}
 
-				ActiveRecordModel model = ActiveRecordModel.GetModel(instanceType);
-
 				PrimaryKeyModel pkModel;
 
 				object id = ObtainPrimaryKeyValue(model, cNode, paramPrefix, out pkModel);
diff --git a/MonoRail/Castle.MonoRail.Framework/Helpers/FormHelper.cs b/MonoRail/Castle.MonoRail.Framework/Helpers/FormHelper.cs
index 20c75bcd2..35cb76ee4 100644
--- a/MonoRail/Castle.MonoRail.Framework/Helpers/FormHelper.cs
+++ b/MonoRail/Castle.MonoRail.Framework/Helpers/FormHelper.cs
@@ -1932,6 +1932,29 @@ namespace Castle.MonoRail.Framework.Helpers
 
 		#endregion
 
+		#region Field set
+
+		/// <summary>
+		/// Creates a field set element with a legend using the specified name.
+		/// </summary>
+		/// <param name="name">The name.</param>
+		/// <returns></returns>
+		public string FieldSet(string name)
+		{
+			return "<fieldset><legend>" + name + "</legend>";
+		}
+
+		/// <summary>
+		/// Creates an element to close a fieldset element.
+		/// </summary>
+		/// <returns></returns>
+		public string EndFieldSet()
+		{
+			return "</fieldset>";
+		}
+
+		#endregion
+
 		#region Enum
 
 		/// <summary>
diff --git a/MonoRail/Changes.txt b/MonoRail/Changes.txt
index 4e35578e4..7f3d1e127 100644
--- a/MonoRail/Changes.txt
+++ b/MonoRail/Changes.txt
@@ -1,6 +1,9 @@
 1.0
 ===
 
+- Fixed MR-84
+  "Nested classes are mapped wrongly to form fields"
+
 - Applied Kode Khan's patch changing logger creation to use type instead of controller's name
 
 - Implemented support for view component caching. Just use the attribute 
diff --git a/MonoRail/TestSiteARSupport/Controllers/CustomerController.cs b/MonoRail/TestSiteARSupport/Controllers/CustomerController.cs
new file mode 100644
index 000000000..a5550adf8
--- /dev/null
+++ b/MonoRail/TestSiteARSupport/Controllers/CustomerController.cs
@@ -0,0 +1,10 @@
+namespace TestSiteARSupport.Controllers
+{
+	using Castle.MonoRail.Framework;
+	using Model;
+
+	[Scaffolding(typeof(Customer))]
+	public class CustomerController : Controller
+	{
+	}
+}
diff --git a/MonoRail/TestSiteARSupport/Model/Customer.cs b/MonoRail/TestSiteARSupport/Model/Customer.cs
new file mode 100644
index 000000000..dc79de0f0
--- /dev/null
+++ b/MonoRail/TestSiteARSupport/Model/Customer.cs
@@ -0,0 +1,45 @@
+namespace TestSiteARSupport.Model
+{
+	using Castle.ActiveRecord;
+
+	[ActiveRecord]
+	public class Customer : ActiveRecordBase<Customer>
+	{
+		private int id;
+		private string name;
+		private Address homeAddress;
+
+		[PrimaryKey]
+		public int Id
+		{
+			get { return id; }
+			set { id = value; }
+		}
+
+		[Property]
+		public string Name
+		{
+			get { return name; }
+			set { name = value; }
+		}
+
+		[Nested]
+		public Address HomeAddress
+		{
+			get { return homeAddress; }
+			set { homeAddress = value; }
+		}
+	}
+
+	public class Address
+	{
+		private string street;
+
+		[Property]
+		public string Street
+		{
+			get { return street; }
+			set { street = value; }
+		}
+	}
+}
diff --git a/MonoRail/TestSiteARSupport/MyHttpApplication.cs b/MonoRail/TestSiteARSupport/MyHttpApplication.cs
index 161a3466d..b6b492b15 100644
--- a/MonoRail/TestSiteARSupport/MyHttpApplication.cs
+++ b/MonoRail/TestSiteARSupport/MyHttpApplication.cs
@@ -29,7 +29,7 @@ namespace TestSiteARSupport
 
 			ActiveRecordStarter.Initialize( Assembly.GetExecutingAssembly(), source );
 			
-//			ActiveRecordStarter.CreateSchema();
+			ActiveRecordStarter.CreateSchema();
 		}
 	}
 }
diff --git a/MonoRail/TestSiteARSupport/TestSiteARSupport-vs2005.csproj b/MonoRail/TestSiteARSupport/TestSiteARSupport-vs2005.csproj
index 358a9fd84..6b860455b 100644
--- a/MonoRail/TestSiteARSupport/TestSiteARSupport-vs2005.csproj
+++ b/MonoRail/TestSiteARSupport/TestSiteARSupport-vs2005.csproj
@@ -54,7 +54,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\SharedLibs\net\2.0\NHibernate.dll</HintPath>
     </Reference>
-    <Reference Include="NVelocity, Version=0.5.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Web" />
@@ -69,7 +68,9 @@
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="Controllers\AccountController.cs" />
     <Compile Include="Controllers\AccountPermissionController.cs" />
+    <Compile Include="Controllers\CustomerController.cs" />
     <Compile Include="Controllers\MR296.cs" />
+    <Compile Include="Model\Customer.cs" />
     <Compile Include="Scaffolds\AccountPermissionScaffoldController.cs" />
     <Compile Include="Scaffolds\AccountScaffoldController.cs" />
     <Compile Include="Controllers\CategoryController.cs" />
-- 
2.11.4.GIT