lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Code review feedback

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4040237
This commit is contained in:
rpaquay
2009-11-13 22:45:26 +00:00
parent eb19e30a95
commit 958c61ac69
13 changed files with 126 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Tests/UI/Navigation/MenuItemComparerTests.cs
View File

@@ -54,7 +54,7 @@ namespace Orchard.Tests.UI.Navigation {
public void PositionAndChildrenDontMatter() {
var item1 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "2" }) };
var item2 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "2" }), Position = "4.0" };
var item3 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "2" }), Contained = new[] { new MenuItem() } };
var item3 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "2" }), Items = new[] { new MenuItem() } };
AssertSameSameSame(item1, item2, item3);
}

10
src/Orchard.Tests/UI/Navigation/NavigationManagerTests.cs
View File

@@ -24,8 +24,8 @@ namespace Orchard.Tests.UI.Navigation {
Assert.That(menuItems.Count(), Is.EqualTo(2));
Assert.That(menuItems.First(), Has.Property("Text").EqualTo("Foo"));
Assert.That(menuItems.Last(), Has.Property("Text").EqualTo("Bar"));
Assert.That(menuItems.Last().Contained.Count(), Is.EqualTo(1));
Assert.That(menuItems.Last().Contained.Single().Text, Is.EqualTo("Frap"));
Assert.That(menuItems.Last().Items.Count(), Is.EqualTo(1));
Assert.That(menuItems.Last().Items.Single().Text, Is.EqualTo("Frap"));
}
[Test]
@@ -46,9 +46,9 @@ namespace Orchard.Tests.UI.Navigation {
Assert.That(item3.Text, Is.EqualTo("Frap"));
Assert.That(item3.Position, Is.EqualTo("3.0"));
Assert.That(item2.Contained.Count(), Is.EqualTo(2));
var subitem1 = item2.Contained.First();
var subitem2 = item2.Contained.Last();
Assert.That(item2.Items.Count(), Is.EqualTo(2));
var subitem1 = item2.Items.First();
var subitem2 = item2.Items.Last();
Assert.That(subitem1.Text, Is.EqualTo("Quad"));
Assert.That(subitem1.Position, Is.EqualTo("1.a"));
Assert.That(subitem2.Text, Is.EqualTo("Frap"));

2
src/Orchard.Web/Packages/Orchard.Users/Services/MembershipService.cs
View File

@@ -41,7 +41,7 @@ namespace Orchard.Users.Services {
return _modelManager.Get(userRecord.Id).As<IUser>();
}
public IUser Identify(string username, string password) {
public IUser ValidateUser(string username, string password) {
return GetUser(username);
}
}

2
src/Orchard.Web/Views/Admin/Footer.aspx
View File

@@ -13,7 +13,7 @@
<%if (Model.AdminMenu != null) {
foreach (var menuSection in Model.AdminMenu) {%>
<div class="leftNavMod"><h4><%=Html.Encode(menuSection.Text)%></h4><ul><%foreach (var menuItem in menuSection.Contained) { %>
<div class="leftNavMod"><h4><%=Html.Encode(menuSection.Text)%></h4><ul><%foreach (var menuItem in menuSection.Items) { %>
<li><%=Html.ActionLink(menuItem.Text, (string)menuItem.RouteValues["action"], menuItem.RouteValues)%></li>
<%} %></ul></div>
<%

2
src/Orchard/Controllers/AccountController.cs
View File

@@ -154,7 +154,7 @@ namespace Orchard.Controllers {
if (String.IsNullOrEmpty(password)) {
ModelState.AddModelError("password", "You must specify a password.");
}
var user = _membershipService.Identify(userName, password);
var user = _membershipService.ValidateUser(userName, password);
if (user == null) {
ModelState.AddModelError("_FORM", "The username or password provided is incorrect.");
}

2
src/Orchard/Orchard.csproj
View File

@@ -163,7 +163,7 @@
<Compile Include="Security\SecurityModule.cs" />
<Compile Include="UI\Menus\AdminMenuFilter.cs" />
<Compile Include="UI\Models\ModelEditor.cs" />
<Compile Include="UI\Navigation\INavigationBuilder.cs" />
<Compile Include="UI\Navigation\NavigationBuilder.cs" />
<Compile Include="UI\Navigation\INavigationProvider.cs" />
<Compile Include="UI\Navigation\MenuItem.cs" />
<Compile Include="UI\Navigation\MenuItemComparer.cs" />

1
src/Orchard/Security/CreateUserParams.cs
View File

@@ -1,4 +1,5 @@
namespace Orchard.Security {
//TEMP: Add setters, provide default constructor and remove parameterized constructor
public class CreateUserParams {
private readonly string _username;
private readonly string _password;

2
src/Orchard/Security/IMembershipService.cs
View File

@@ -11,7 +11,7 @@ namespace Orchard.Security {
IUser CreateUser(CreateUserParams createUserParams);
IUser GetUser(string username);
IUser Identify(string username, string password);
IUser ValidateUser(string username, string password);
}
public class MembershipSettings {

2
src/Orchard/Security/Providers/OrchardMembershipProvider.cs
View File

@@ -76,7 +76,7 @@ namespace Orchard.Security.Providers {
}
public override bool ValidateUser(string username, string password) {
return true;
return (GetService().ValidateUser(username, password) != null);
}
public override bool UnlockUser(string userName) {

49
src/Orchard/Storage/FileSystemStorageProvider.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
namespace Orchard.Storage {
public class FileSystemStorageProvider : IStorageProvider {
@@ -10,7 +11,7 @@ namespace Orchard.Storage {
if (!File.Exists(path)) {
throw new ArgumentException("File " + path + " does not exist");
}
return new FileSystemStorageFile(path);
return new FileSystemStorageFile(new FileInfo(path));
}
public IEnumerable<IStorageFile> ListFiles(string path) {
@@ -18,12 +19,11 @@ namespace Orchard.Storage {
throw new ArgumentException("Directory " + path + " does not exist");
}
List<IStorageFile> files = new List<IStorageFile>();
foreach (string file in Directory.GetFiles(path)) {
files.Add(new FileSystemStorageFile(file));
}
return files;
return new DirectoryInfo(path)
.GetFiles()
.Where(fi => !IsHidden(fi))
.Select<FileInfo, IStorageFile>(fi => new FileSystemStorageFile(fi))
.ToList();
}
public IEnumerable<IStorageFolder> ListFolders(string path) {
@@ -31,13 +31,15 @@ namespace Orchard.Storage {
throw new ArgumentException("Directory " + path + " does not exist");
}
List<IStorageFolder> folders = new List<IStorageFolder>();
return new DirectoryInfo(path)
.GetDirectories()
.Where(di => !IsHidden(di))
.Select<DirectoryInfo, IStorageFolder>(di => new FileSystemStorageFolder(di))
.ToList();
}
foreach (string folder in Directory.GetDirectories(path)) {
folders.Add(new FileSystemStorageFolder(folder));
}
return folders;
private static bool IsHidden(FileSystemInfo di) {
return (di.Attributes & FileAttributes.Hidden) != 0;
}
public void CreateFolder(string path) {
@@ -64,17 +66,18 @@ namespace Orchard.Storage {
if (Directory.Exists(newPath)) {
throw new ArgumentException("Directory " + newPath + " already exists");
}
Directory.Move(path, newPath);
}
public IStorageFile CreateFile(string path) {
if (!File.Exists(path)) {
if (File.Exists(path)) {
throw new ArgumentException("File " + path + " already exists");
}
File.Create(path);
return new FileSystemStorageFile(path);
var fileInfo = new FileInfo(path);
fileInfo.Create();
return new FileSystemStorageFile(fileInfo);
}
public void DeleteFile(string path) {
@@ -102,8 +105,8 @@ namespace Orchard.Storage {
private class FileSystemStorageFile : IStorageFile {
private readonly FileInfo _fileInfo;
public FileSystemStorageFile(string path) {
_fileInfo = new FileInfo(path);
public FileSystemStorageFile(FileInfo fileInfo) {
_fileInfo = fileInfo;
}
#region Implementation of IStorageFile
@@ -138,8 +141,8 @@ namespace Orchard.Storage {
private class FileSystemStorageFolder : IStorageFolder {
private readonly DirectoryInfo _directoryInfo;
public FileSystemStorageFolder(string path) {
_directoryInfo = new DirectoryInfo(path);
public FileSystemStorageFolder(DirectoryInfo directoryInfo) {
_directoryInfo = directoryInfo;
}
#region Implementation of IStorageFolder
@@ -158,9 +161,9 @@ namespace Orchard.Storage {
public IStorageFolder GetParent() {
if (_directoryInfo.Parent != null) {
return new FileSystemStorageFolder(_directoryInfo.Parent.FullName);
return new FileSystemStorageFolder(_directoryInfo.Parent);
}
throw new ArgumentException("Directory " + _directoryInfo.Name + "does not have a parent directory");
throw new ArgumentException("Directory " + _directoryInfo.Name + " does not have a parent directory");
}
#endregion

2
src/Orchard/UI/Navigation/MenuItem.cs
View File

@@ -6,6 +6,6 @@ namespace Orchard.UI.Navigation {
public string Text { get; set; }
public string Position { get; set; }
public RouteValueDictionary RouteValues { get; set; }
public IEnumerable<MenuItem> Contained { get; set; }
public IEnumerable<MenuItem> Items { get; set; }
}
}

85
src/Orchard/UI/Navigation/NavigationBuilder.cs Normal file
View File

@@ -0,0 +1,85 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web.Routing;
namespace Orchard.UI.Navigation {
public class NavigationBuilder {
IEnumerable<MenuItem> Contained { get; set; }
public NavigationBuilder Add(string caption, string position, Action<NavigationItemBuilder> itemBuilder) {
var childBuilder = new NavigationItemBuilder();
if (!string.IsNullOrEmpty(caption))
childBuilder.Caption(caption);
if (!string.IsNullOrEmpty(position))
childBuilder.Position(position);
itemBuilder(childBuilder);
Contained = (Contained ?? Enumerable.Empty<MenuItem>()).Concat(childBuilder.Build());
return this;
}
public NavigationBuilder Add(string caption, Action<NavigationItemBuilder> itemBuilder) {
return Add(caption, null, itemBuilder);
}
public NavigationBuilder Add(Action<NavigationItemBuilder> itemBuilder) {
return Add(null, null, itemBuilder);
}
public NavigationBuilder Add(string caption, string position) {
return Add(caption, position, x=> { });
}
public NavigationBuilder Add(string caption) {
return Add(caption, null, x => { });
}
public IEnumerable<MenuItem> Build() {
return (Contained ?? Enumerable.Empty<MenuItem>()).ToList();
}
}
public class NavigationItemBuilder : NavigationBuilder {
private readonly MenuItem _item;
public NavigationItemBuilder() {
_item = new MenuItem();
}
public NavigationItemBuilder Caption(string caption) {
_item.Text = caption;
return this;
}
public NavigationItemBuilder Position(string position) {
_item.Position = position;
return this;
}
public new IEnumerable<MenuItem> Build() {
_item.Items = base.Build();
return new[] { _item };
}
public NavigationItemBuilder Action(string actionName) {
return Action(actionName, null, new RouteValueDictionary());
}
public NavigationItemBuilder Action(string actionName, string controllerName) {
return Action(actionName, controllerName, new RouteValueDictionary());
}
public NavigationItemBuilder Action(string actionName, string controllerName, object values) {
return Action(actionName, controllerName, new RouteValueDictionary(values));
}
public NavigationItemBuilder Action(string actionName, string controllerName, RouteValueDictionary values) {
_item.RouteValues = new RouteValueDictionary(values);
if (!string.IsNullOrEmpty(actionName))
_item.RouteValues["action"] = actionName;
if (!string.IsNullOrEmpty(controllerName))
_item.RouteValues["controller"] = controllerName;
return this;
}
}
}

2
src/Orchard/UI/Navigation/NavigationManager.cs
View File

@@ -45,7 +45,7 @@ namespace Orchard.UI.Navigation {
var joined = new MenuItem {
Text = items.First().Text,
RouteValues = items.First().RouteValues,
Contained = Merge(items.Select(x => x.Contained)).ToArray(),
Items = Merge(items.Select(x => x.Items)).ToArray(),
Position = SelectBestPositionValue(items.Select(x => x.Position))
};
return joined;