Follow Packages

Facts/Controllers/ApiControllerFacts.cs

@@ -837,4 +837,4 @@ public async void VerifyRecentPopularityStatsDownloadsCount()
             }
         }
     }
-}
+}

Facts/Controllers/CuratedFeedsControllerFacts.cs

@@ -231,4 +231,4 @@ public void WillSearchForAPackage()
             }
         }
     }
-}
+}

Facts/Controllers/JsonApiControllerFacts.cs

@@ -22,6 +22,7 @@ public class JsonApiControllerFacts
 
             var httpContext = new Mock<HttpContextBase>();
             httpContext.Setup(c => c.User).Returns(currentUser.Object);
+
             var controller = new JsonApiController(packageService.Object, userService.Object, repository.Object, messageService.Object);
             TestUtility.SetupHttpContextMockForUrlGeneration(httpContext, controller);
             return controller;

Facts/Services/MessageServiceFacts.cs

@@ -275,4 +275,4 @@ public void WillSendInstructions()
             }
         }
     }
-}
+}

Facts/Services/PackageServiceFacts.cs

@@ -98,6 +98,7 @@ private static Mock<INupkg> CreateNuGetPackage(Action<Mock<IPackageMetadata>> se
             packageRepository = packageRepository ?? new Mock<IEntityRepository<Package>>();
             packageStatsRepo = packageStatsRepo ?? new Mock<IEntityRepository<PackageStatistics>>();
             packageOwnerRequestRepo = packageOwnerRequestRepo ?? new Mock<IEntityRepository<PackageOwnerRequest>>();
+            var followsRepository = new Mock<IEntityRepository<PackageFollow>>();
             indexingService = indexingService ?? new Mock<IIndexingService>();
 
             var packageService = new Mock<PackageService>(
@@ -106,6 +107,7 @@ private static Mock<INupkg> CreateNuGetPackage(Action<Mock<IPackageMetadata>> se
                 packageRepository.Object,
                 packageStatsRepo.Object,
                 packageOwnerRequestRepo.Object,
+                followsRepository.Object,
                 indexingService.Object);
 
             packageService.CallBase = true;

Facts/Services/UserServiceFacts.cs

@@ -18,11 +18,15 @@ private static UserService CreateMockUserService(Action<Mock<UserService>> setup
 
             cryptoService = cryptoService ?? new Mock<ICryptographyService>();
             userRepo = userRepo ?? new Mock<IEntityRepository<User>>();
-
+            var followsRepo = new Mock<IEntityRepository<PackageFollow>>();
+            var packageRegRepo = new Mock<IEntityRepository<PackageRegistration>>();
+
             var userService = new Mock<UserService>(
                 config.Object,
                 cryptoService.Object,
-                userRepo.Object)
+                userRepo.Object,
+                followsRepo.Object,
+                packageRegRepo.Object)
             {
                 CallBase = true
             };
@@ -763,21 +767,73 @@ public void ThrowsArgumentExceptionForNullUser()
             }
         }
 
+        public class TheWhereIsFollowingMethod
+        {
+            [Fact]
+            public void GetsAListOfPackageIds()
+            {
+                var user = new User { EmailAddress = "old@example.com", Key = 1400, Username = "Bill" };
+                var allUsers = (new[] { user });
+                var allFollows = new []
+                {
+                    new PackageFollow
+                    {
+                        UserKey = 1400,
+                        PackageRegistrationKey = 1,
+                        PackageRegistration = new PackageRegistration
+                        {
+                            Key = 1,
+                            Id = "Package1",
+                        },
+                        User = user,
+                        IsFollowing = true,
+                    }
+                };
+
+                var service = new TestableUserService();
+                service.MockUserRepository
+                    .Setup(repo => repo.GetAll())
+                    .Returns(allUsers.AsQueryable());
+                service.MockFollowsRepository
+                    .Setup(repo => repo.GetAll())
+                    .Returns(allFollows.AsQueryable());
+
+                string[] results = service.WhereIsFollowing("Bill", new[] { "Package1", "Package2" }).ToArray();
+                Assert.Equal(1, results.Length);
+                Assert.Equal("Package1", results[0]);
+            }
+
+            [Fact]
+            public void CanThrowUserNotFound()
+            {
+                var service = new TestableUserService();
+                service.MockUserRepository
+                    .Setup(repo => repo.GetAll())
+                    .Returns(new User[0].AsQueryable());
+
+                Assert.Throws<UserNotFoundException>(() =>
+                    service.WhereIsFollowing("Bill", new[] { "Package1" })
+                );
+            }
+        }
+
         public class TestableUserService : UserService
         {
             public Mock<ICryptographyService> MockCrypto { get; protected set; }
             public Mock<IConfiguration> MockConfig { get; protected set; }
             public Mock<IEntityRepository<User>> MockUserRepository { get; protected set; }
+            public Mock<IEntityRepository<PackageFollow>> MockFollowsRepository { get; protected set; }
 
             public TestableUserService()
             {
-                Crypto = (MockCrypto = new Mock<ICryptographyService>()).Object;
+                CryptoService = (MockCrypto = new Mock<ICryptographyService>()).Object;
                 Config = (MockConfig = new Mock<IConfiguration>()).Object;
                 UserRepository = (MockUserRepository = new Mock<IEntityRepository<User>>()).Object;
+                FollowsRepository = (MockFollowsRepository = new Mock<IEntityRepository<PackageFollow>>()).Object;
 
                 // Set ConfirmEmailAddress to a default of true
                 MockConfig.Setup(c => c.ConfirmEmailAddresses).Returns(true);
             }
         }
     }
-}
+}

Facts/TestUtils/TestUtility.cs

@@ -86,4 +86,4 @@ public static T GetAnonymousPropertyValue<T>(Object source, string propertyName)
             return (T)property.GetValue(source, null);
         }
     }
-}
+}

Website/App_Code/ViewHelpers.cshtml

@@ -102,17 +102,14 @@
             <li>
                 @OwnerGravatar(owner, size, url, showName)
             </li>
-        }  
+        }
     </ul>
 }
 
 @helper OwnerGravatar(User owner, int size, UrlHelper url, bool showName = true)
 {
     <a class="owner" href="@url.User(owner)" title="@owner.Username">
-        @if (!String.IsNullOrEmpty(owner.EmailAddress))
-        {
-            @GravatarImage(owner.EmailAddress, owner.Username, size)
-        }
+        @GravatarImage(owner.EmailAddress, owner.Username, size)
         @if (showName)
         {<text>@owner.Username</text>
         }
@@ -121,12 +118,15 @@
 
 @helper GravatarImage(string email, string username, int size)
 {
-    var gravatarHtml = Gravatar.GetHtml(email, size, "retro", GravatarRating.G, attributes: new { width = size, height = size, title = username, @class = "owner-image" });
-    if (gravatarHtml != null && Request.IsSecureConnection)
+    if (!String.IsNullOrWhiteSpace(email))
     {
-        gravatarHtml = new HtmlString(gravatarHtml.ToHtmlString().Replace("http://www.gravatar.com/", "https://secure.gravatar.com/"));
+        var gravatarHtml = Gravatar.GetHtml(email, size, "retro", GravatarRating.G, attributes: new { width = size, height = size, title = username, @class = "owner-image" });
+        if (gravatarHtml != null && Request.IsSecureConnection)
+        {
+            gravatarHtml = new HtmlString(gravatarHtml.ToHtmlString().Replace("http://www.gravatar.com/", "https://secure.gravatar.com/"));
+        }
+        @gravatarHtml
     }
-    @gravatarHtml
 }
 
 @helper ReleaseTag()

Website/App_Start/ContainerBindings.cs

@@ -115,6 +115,10 @@ public override void Load()
                 .To<EntityRepository<PackageStatistics>>()
                 .InRequestScope();
 
+            Bind<IEntityRepository<PackageFollow>>()
+                .To<EntityRepository<PackageFollow>>()
+                .InRequestScope();
+
             Bind<ICuratedFeedService>()
                 .To<CuratedFeedService>()
                 .InRequestScope();

Website/App_Start/Routes.cs

@@ -76,6 +76,11 @@ public static void RegisterRoutes(RouteCollection routes)
                 "packages/cancel-upload",
                 new { controller = MVC.Packages.Name, action = "CancelUpload"});
 
+            routes.MapRoute(
+                RouteName.PackageFollowers,
+                "packages/{id}/followers",
+                new { controller = MVC.Packages.Name, action = "Followers" });
+
             routes.MapRoute(
                 RouteName.PackageOwnerConfirmation,
                 "packages/{id}/owners/{username}/confirm/{token}",
@@ -329,6 +334,12 @@ public static void RegisterServiceRoutes(RouteCollection routes)
                 "api/v2/curated-feed",
                 typeof(V2CuratedFeed));
 
+            // Disabling followed packages feed until we work out where we want it.
+            // routes.MapServiceRoute(
+            //     "v2" + RouteName.FollowedPackagesFeed,
+            //     "api/v2/followed-packages",
+            //     typeof(V2FollowedPackagesFeed));
+
             routes.MapServiceRoute(
                 RouteName.V2ApiFeed,
                 "api/v2/",

Website/Content/Site.css

@@ -524,26 +524,31 @@ hgroup.page-heading h2 { padding-left: 7px; }
 #actions li h2 { font-size: 1.5em; }
 
 #actions li#uploadPackage h2 {
-    background: url("Images/uploadPackage.png") no-repeat 0 50%;
+    background: url(../Content/Images/uploadPackage.png) no-repeat 0 50%;
     font-size: 1.7em;
     padding-left: 20px;
 }
 
-#actions li#changePassword h2 {
-    background: url("Images/changePassword.png") no-repeat 0 50%;
+#actions li#managePackages h2 {
+    background: url(../Content/Images/managePackages.png) no-repeat 0 50%;
     padding-left: 20px;
 }
 
-#actions li#managePackages h2 {
-    background: url("Images/managePackages.png") no-repeat 0 50%;
+#actions li#managedFollowedPackages h2 {
+    background: url(../Content/Images/managePackages.png) no-repeat 0 50%;
     padding-left: 20px;
 }
 
 #actions li#editProfile h2 {
-    background: url("Images/editProfile.png") no-repeat 0 50%;
+    background: url(../Content/Images/editProfile.png) no-repeat 0 50%;
     padding-left: 20px;
 }
-
+
+#actions li#changePassword h2 {
+    background: url(../Content/Images/changePassword.png) no-repeat 0 50%;
+    padding-left: 20px;
+}
+
     /* Account/API Key */
 
 #apiKey h1 { font-size: 2em; }
@@ -784,6 +789,66 @@ fieldset.search label {
     padding: 0;
 }
 
+    /* Profile Page FollowedPackages */
+
+#followedPackages {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+    /* Follow Buttons */
+
+a.followbtn,
+a.unfollowbtn,
+a.followloginbtn {
+  font-family: FontAwesome;
+  display: table;
+  font-size: 12px;
+  font-weight: bold;
+  font-style: normal;
+  text-decoration: none;
+  -webkit-font-smoothing: antialiased;
+  border: thin;
+  border-color: lightgray;
+  padding: 2px 2px 2px 2px;
+  border-radius: 2px;
+  box-shadow: 1px 1px 3px #222;
+  display: none;
+}
+
+a.followbtn {
+  background-color: #e4f1f7;
+}
+
+a.unfollowbtn {
+  background-color: #fffedc;
+  box-shadow: 0px 0px 3px #222;
+}
+
+a.followloginbtn {
+    display: inline;
+}
+
+a.followbtn i:before,
+a.followloginbtn i:before {
+  content: "\f006";
+}
+
+a.unfollowbtn i:before {
+  content: "\f005";
+}
+
+a.followbtn i,
+a.unfollowbtn i,
+a.followloginbtn i {
+  font-family: FontAwesome;
+  font-weight: inherit;
+  font-style: inherit;
+  text-decoration: inherit;
+  -webkit-font-smoothing: antialiased;
+}
+
     /* List Package */
 
 section.package {
@@ -825,6 +890,14 @@ section.package .downloads {
     font-weight: 600;
 }
 
+section.package div.follows {
+    border-left: 1px solid #ccc;
+    display: inline;
+    margin-left: 10px;
+    padding-left: 10px;
+    min-height: 16px;
+}
+
 section.package div.tags {
     border-left: 1px solid #ccc;
     display: inline;
@@ -1278,6 +1351,10 @@ footer#footer div.license {
     font-size: .7em;
 }
 
+.footer-acknowledgements {
+    font-size: .7em
+}
+
 /* async upload */
 form .async-upload-panel
 {