Merge branch 'release/Radical-1.4.3.0-Beta-1-Gonzales'

Author: mauroservienti

Radical.sln

@@ -233,7 +233,7 @@ protected PropertyMetadata<T> SetInitialPropertyValue<T>( String property, T val
         /// </returns>
         protected PropertyMetadata<T> GetPropertyMetadata<T>( Expression<Func<T>> property )
         {
-            Ensure.That( property ).Named( () => property ).IsNotNull();
+            Ensure.That( property ).Named( "property" ).IsNotNull();
 
             return ( PropertyMetadata<T> )this.GetPropertyMetadata<T>( property.GetMemberName() );
         }
@@ -246,7 +246,7 @@ protected PropertyMetadata<T> GetPropertyMetadata<T>( Expression<Func<T>> proper
         /// <returns>An instance of the requested property metadata.</returns>
         protected PropertyMetadata<T> GetPropertyMetadata<T>( String propertyName )
         {
-            Ensure.That( propertyName ).Named( () => propertyName ).IsNotNullNorEmpty();
+            Ensure.That( propertyName ).Named( "propertyName" ).IsNotNullNorEmpty();
 
             //return ( PropertyMetadata<T> )this.GetPropertyMetadata( propertyName, typeof( T ) );
 

src/net35/Radical/Model/Entity/Entity.cs

@@ -62,7 +62,23 @@ public static PropertyMetadata<T> Create<T>( Object propertyOwner, String proper
         readonly HashSet<String> cascadeChangeNotifications = new HashSet<String>();
 #endif
 
-        protected PropertyInfo Property { get; private set; }
+		readonly Object propertyOwner;
+		PropertyInfo _property;
+
+		protected PropertyInfo Property 
+		{
+			get 
+			{
+				if ( this._property == null ) 
+				{
+					this._property = this.propertyOwner
+						.GetType()
+						.GetProperty( this.PropertyName );
+				}
+
+				return this._property;
+			} 
+		}
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PropertyMetadata" /> class.
@@ -71,10 +87,10 @@ public static PropertyMetadata<T> Create<T>( Object propertyOwner, String proper
         /// <param name="propertyName">Name of the property.</param>
         protected PropertyMetadata( Object propertyOwner, String propertyName )
         {
-            Ensure.That( propertyOwner ).Named( () => propertyOwner ).IsNotNull();
+            Ensure.That( propertyOwner ).Named( "propertyOwner" ).IsNotNull();
             Ensure.That( propertyName ).Named( "propertyName" ).IsNotNullNorEmpty();
 
-            this.Property = propertyOwner.GetType().GetProperty( propertyName );
+            this.propertyOwner = propertyOwner;
             this.PropertyName = propertyName;
             this.NotifyChanges = true;
         }

src/net35/Radical/Model/Entity/PropertyMetadata.cs

@@ -693,7 +693,8 @@ String IBindingListView.Filter
             get { return this.Filter.ToString(); }
             set
             {
-                throw new NotSupportedException( "Setting a Instance as String is currently not supported" );
+				var msg = String.Format( "Setting '{0}' directly as Filter is not supported.", value ?? "<null>");
+                throw new NotSupportedException( msg );
                 //TODO: IBindingListView.Instance
                 /* Bisogna capire se siamo in grado data 
                  * una stringa di convertirla in un filtro 

src/net35/Radical/Model/EntityView/EntityView.cs

@@ -3,5 +3,5 @@
 
 #pragma warning disable 1607
 //This is the build number userd to publish the NuGet package.
-[assembly: AssemblyInformationalVersion( "1.4.3.0-Alfa" )]
+[assembly: AssemblyInformationalVersion( "1.4.3.0-Beta-1" )]
 #pragma warning restore 1607

src/net35/Radical/Properties/NugetInfo.cs

@@ -543,7 +543,7 @@
         del "$(SolutionDir)build\$(ConfigurationName)\$(ProjectName)\lib\net35\it-it\*.*"  /Q
     )
 
-    del "$(SolutionDir)build\$(ConfigurationName)\$(ProjectName)\lib\net35\*.*"  /Q
+del "$(SolutionDir)build\$(ConfigurationName)\$(ProjectName)\lib\net35\*.*"  /Q
     echo "Build/NuGet folder purged".
 ) else (
     echo "no Build/NuGet folder to purge.".

src/net35/Radical/Radical.csproj

@@ -10,40 +10,127 @@ namespace Topics.Radical.Validation
 	/// </summary>
 	public static class Ensure
 	{
+#if DEBUG
+		static SourceInfoLoadStrategy _sourceInfoLoadStrategy = SourceInfoLoadStrategy.Load;
+#else
+		static SourceInfoLoadStrategy _sourceInfoLoadStrategy = SourceInfoLoadStrategy.Skip;
+#endif
+
+		/// <summary>
+		/// Determines if the Ensure class tries to load the Stack before moving on.
+		/// </summary>
+		public static SourceInfoLoadStrategy SourceInfoLoadStrategy
+		{
+			get { return _sourceInfoLoadStrategy; }
+			set { _sourceInfoLoadStrategy = value; }
+		}
+
 		internal class SourceInfo
 		{
 			public readonly static SourceInfo Empty = new SourceInfo( "", "", MemberTypes.Custom );
 
+			private StackFrame frame;
+			private bool lazy;
+			private bool loaded;
+
+			private MemberTypes _sourceType;
+			private string _className;
+			private string _methodName;
+
+			public static SourceInfo FromStack( StackTrace st, bool lazy )
+			{
+				SourceInfo si = SourceInfo.Empty;
+				if ( st.FrameCount > 0 )
+				{
+					var frame = st.GetFrame( 0 );
+					si = new SourceInfo( frame, lazy );
+				}
+
+				return si;
+			}
+
 			/// <summary>
 			/// Initializes a new instance of the <see cref="SourceInfo"/> class.
 			/// </summary>
 			/// <param name="methodName">Name of the method.</param>
 			/// <param name="className">Name of the class.</param>
 			/// <param name="sourceType">Type of the source.</param>
-			public SourceInfo( String methodName, String className, MemberTypes sourceType )
+			private SourceInfo( String methodName, String className, MemberTypes sourceType )
 			{
-				this.MethodName = methodName;
-				this.ClassName = className;
-				this.SourceType = sourceType;
+				this._methodName = methodName;
+				this._className = className;
+				this._sourceType = sourceType;
+			}
+
+			private SourceInfo( StackFrame frame, bool lazy )
+			{
+				this.frame = frame;
+				this.lazy = lazy;
+				if ( !this.lazy )
+				{
+					this.EnsureDataAreLoaded();
+				}
+			}
+
+			void EnsureDataAreLoaded()
+			{
+				if ( !this.loaded )
+				{
+					var mi = this.frame.GetMethod();
+					if ( mi != null )
+					{
+						this._methodName = mi.Name;
+						this._className = mi.DeclaringType.Name;
+						this._sourceType = mi.MemberType;
+					}
+					else 
+					{
+						this._methodName = SourceInfo.Empty.MethodName;
+						this._className = SourceInfo.Empty.ClassName;
+						this._sourceType = SourceInfo.Empty.SourceType;
+					}
+
+					this.loaded = true;
+				}
 			}
 
 			/// <summary>
 			/// Gets the name of the method.
 			/// </summary>
 			/// <value>The name of the method.</value>
-			public String MethodName { get; private set; }
+			public String MethodName 
+			{
+				get 
+				{
+					this.EnsureDataAreLoaded();
+					return this._methodName; 
+				} }
 
 			/// <summary>
 			/// Gets the name of the class.
 			/// </summary>
 			/// <value>The name of the class.</value>
-			public String ClassName { get; private set; }
+			public String ClassName
+			{
+				get
+				{
+					this.EnsureDataAreLoaded();
+					return this._className;
+				}
+			}
 
 			/// <summary>
 			/// Gets the type of the source.
 			/// </summary>
 			/// <value>The type of the source.</value>
-			public MemberTypes SourceType { get; private set; }
+			public MemberTypes SourceType
+			{
+				get
+				{
+					this.EnsureDataAreLoaded();
+					return this._sourceType;
+				}
+			}
 		}
 
 		/// <summary>
@@ -54,25 +141,40 @@ public SourceInfo( String methodName, String className, MemberTypes sourceType )
 		/// <param name="obj">The object value to inspect.</param>
 		/// <returns>The Ensure instance for fluent interface usage.</returns>
 		public static IConfigurableEnsure<T> That<T>( T obj )
+		{
+			return That<T>( obj, Ensure.SourceInfoLoadStrategy );
+		}
+
+		/// <summary>
+		/// Initialize a new instance of the generic Ensure class using the supplied
+		/// value as the value to insepct.
+		/// </summary>
+		/// <typeparam name="T">The type of the inepcted object value.</typeparam>
+		/// <param name="obj">The object value to inspect.</param>
+		/// <param name="strategy">Determines if the Ensure instance should load the current Stack.</param>
+		/// <returns>The Ensure instance for fluent interface usage.</returns>
+		public static IConfigurableEnsure<T> That<T>( T obj, SourceInfoLoadStrategy strategy )
 		{
 			var si = SourceInfo.Empty;
 
 #if !SILVERLIGHT
 
-			var st = new StackTrace( 1 );
-			if( st.FrameCount > 0 )
+			if ( strategy != Validation.SourceInfoLoadStrategy.Skip ) 
 			{
-				var f = st.GetFrame( 0 );
-				var mi = f.GetMethod();
-				if( mi != null )
-				{
-					si = new SourceInfo( mi.Name, mi.DeclaringType.Name, mi.MemberType );
-				}
+				var lazy = strategy == Validation.SourceInfoLoadStrategy.LazyLoad;
+				si = SourceInfo.FromStack( new StackTrace( 1 ), lazy: lazy );
 			}
 
 #endif
 
 			return new Ensure<T>( obj, si );
 		}
 	}
+
+	public enum SourceInfoLoadStrategy
+	{
+		Load=0,
+		Skip,
+		LazyLoad
+	}
 }

src/net35/Radical/Validation/Ensure/Ensure.cs

@@ -17,11 +17,13 @@ public static class EnsureExtensions
 		public static IEnsure<T> IsNotNull<T>( this IEnsure<T> validator )
 			where T : class
 		{
-			return validator.If( s => s == null )
-				.ThenThrow( v =>
-				{
-					return new ArgumentNullException( v.Name, v.GetFullErrorMessage( "The inspected value should be non null." ) );
-				} );
+			var value = validator.GetValue<T>();
+			if ( value == null ) 
+			{
+				throw new ArgumentNullException( validator.Name, validator.GetFullErrorMessage( "The inspected value should be non null." ) );
+			}
+
+			return validator;
 		}
 	}
 }

src/net35/Radical/Validation/Ensure/EnsureExtensions.cs

@@ -21,11 +21,12 @@ public static class StringEnsureExtension
 		/// is raised if the current inspected object is an empty string.</exception>
 		public static IEnsure<String> IsNotEmpty( this IEnsure<String> validator )
 		{
-			validator.If( s => s.Length == 0 )
-				.ThenThrow( v =>
-				{
-					return new ArgumentOutOfRangeException( v.Name, v.GetFullErrorMessage( "The inspected string value should be not empty." ) );
-				} );
+			var value = validator.GetValue<String>();
+
+			if ( value != null && value.Length == 0 ) 
+			{
+				throw new ArgumentOutOfRangeException( validator.Name, validator.GetFullErrorMessage( "The inspected string value should be not empty." ) );
+			}
 
 			return validator;
 		}

src/net35/Radical/Validation/Ensure/StringEnsureExtension.cs

@@ -81,7 +81,7 @@ protected virtual IValidationService GetValidationService()
 		/// </summary>
 		protected AbstractViewModel()
 		{
-			this.ValidationErrors = new ObservableCollection<ValidationError>();
+			
 		}
 
 		//protected virtual void OnLoading()
@@ -163,14 +163,23 @@ public virtual Boolean IsValid
 			get { return this.ValidationService.IsValid; }
 		}
 
+		ObservableCollection<ValidationError> _validationErrors;
+
 		/// <summary>
 		/// Gets the validation errors if any.
 		/// </summary>
 		/// <value>The validation errors.</value>
 		public virtual ObservableCollection<ValidationError> ValidationErrors
 		{
-			get;
-			private set;
+			get 
+			{
+				if ( this._validationErrors == null ) 
+				{
+					this._validationErrors = new ObservableCollection<ValidationError>();
+				}
+
+				return this._validationErrors;
+			}
 		}
 
 		/// <summary>