From 3d0587d8cee572312ac38620f31315c0426c6a2c Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 29 May 2013 14:18:02 -0400
Subject: [PATCH] Refactor: move category slug helper to Category model

---
 .../discourse/components/utilities.js         | 10 +--------
 .../javascripts/discourse/models/category.js  |  8 +++++++
 .../discourse/routes/list_category_route.js   |  2 +-
 .../views/modal/edit_category_view.js         |  2 +-
 spec/javascripts/components/utilities_spec.js | 16 --------------
 spec/javascripts/models/category_spec.js      | 21 +++++++++++++++++++
 6 files changed, 32 insertions(+), 27 deletions(-)
 create mode 100644 spec/javascripts/models/category_spec.js

diff --git a/app/assets/javascripts/discourse/components/utilities.js b/app/assets/javascripts/discourse/components/utilities.js
index 2a08c38cea6..60719fe0e78 100644
--- a/app/assets/javascripts/discourse/components/utilities.js
+++ b/app/assets/javascripts/discourse/components/utilities.js
@@ -29,14 +29,6 @@ Discourse.Utilities = {
     }
   },
 
-  categoryUrlId: function(category) {
-    if (!category) return "";
-    var id = Em.get(category, 'id');
-    var slug = Em.get(category, 'slug');
-    if ((!slug) || slug.isBlank()) return "" + id + "-category";
-    return slug;
-  },
-
   // Create a badge like category link
   categoryLink: function(category) {
     if (!category) return "";
@@ -47,7 +39,7 @@ Discourse.Utilities = {
     var description = Em.get(category, 'description');
 
     // Build the HTML link
-    var result = "<a href=\"" + Discourse.getURL("/category/") + this.categoryUrlId(category) + "\" class=\"badge-category\" ";
+    var result = "<a href=\"" + Discourse.getURL("/category/") + Discourse.Category.slugFor(category) + "\" class=\"badge-category\" ";
 
     // Add description if we have it
     if (description) result += "title=\"" + Handlebars.Utils.escapeExpression(description) + "\" ";
diff --git a/app/assets/javascripts/discourse/models/category.js b/app/assets/javascripts/discourse/models/category.js
index abe1efeb4e3..76c04dc71bd 100644
--- a/app/assets/javascripts/discourse/models/category.js
+++ b/app/assets/javascripts/discourse/models/category.js
@@ -82,6 +82,14 @@ Discourse.Category.reopenClass({
     return this.uncategorized;
   },
 
+  slugFor: function(category) {
+    if (!category) return "";
+    var id = Em.get(category, 'id');
+    var slug = Em.get(category, 'slug');
+    if ((!slug) || slug.isBlank()) return "" + id + "-category";
+    return slug;
+  },
+
   list: function() {
     return Discourse.Site.instance().get('categories');
   },
diff --git a/app/assets/javascripts/discourse/routes/list_category_route.js b/app/assets/javascripts/discourse/routes/list_category_route.js
index bd491dcab38..f2a3602de48 100644
--- a/app/assets/javascripts/discourse/routes/list_category_route.js
+++ b/app/assets/javascripts/discourse/routes/list_category_route.js
@@ -36,7 +36,7 @@ Discourse.ListCategoryRoute = Discourse.FilteredListRoute.extend({
     }
 
     var listController = this.controllerFor('list');
-    var urlId = Discourse.Utilities.categoryUrlId(category);
+    var urlId = Discourse.Category.slugFor(category);
     listController.set('filterMode', "category/" + urlId);
 
     var router = this;
diff --git a/app/assets/javascripts/discourse/views/modal/edit_category_view.js b/app/assets/javascripts/discourse/views/modal/edit_category_view.js
index c79d317d493..a5bbfcee966 100644
--- a/app/assets/javascripts/discourse/views/modal/edit_category_view.js
+++ b/app/assets/javascripts/discourse/views/modal/edit_category_view.js
@@ -152,7 +152,7 @@ Discourse.EditCategoryView = Discourse.ModalBodyView.extend({
       this.get('category').save().then(function(result) {
         // success
         $('#discourse-modal').modal('hide');
-        Discourse.URL.redirectTo("/category/" + Discourse.Utilities.categoryUrlId(result.category));
+        Discourse.URL.redirectTo("/category/" + Discourse.Category.slugFor(result.category));
       }, function(errors) {
         // errors
         if(errors.length === 0) errors.push(Em.String.i18n("category.creation_error"));
diff --git a/spec/javascripts/components/utilities_spec.js b/spec/javascripts/components/utilities_spec.js
index 9f4685a8ac1..a9b10dfaff0 100644
--- a/spec/javascripts/components/utilities_spec.js
+++ b/spec/javascripts/components/utilities_spec.js
@@ -2,22 +2,6 @@
 
 describe("Discourse.Utilities", function() {
 
-  describe("categoryUrlId", function() {
-
-    it("returns the slug when it exists", function() {
-      expect(Discourse.Utilities.categoryUrlId({ slug: 'hello' })).toBe("hello");
-    });
-
-    it("returns id-category when slug is an empty string", function() {
-      expect(Discourse.Utilities.categoryUrlId({ id: 123, slug: '' })).toBe("123-category");
-    });
-
-    it("returns id-category without a slug", function() {
-      expect(Discourse.Utilities.categoryUrlId({ id: 456 })).toBe("456-category");
-    });
-
-  });
-
   describe("emailValid", function() {
 
     it("allows upper case in first part of emails", function() {
diff --git a/spec/javascripts/models/category_spec.js b/spec/javascripts/models/category_spec.js
new file mode 100644
index 00000000000..2859a0d71ce
--- /dev/null
+++ b/spec/javascripts/models/category_spec.js
@@ -0,0 +1,21 @@
+/*global waitsFor:true expect:true describe:true beforeEach:true it:true spyOn:true */
+
+describe("Discourse.Category", function() {
+
+  describe("slugFor", function() {
+
+    it("returns the slug when it exists", function() {
+      expect(Discourse.Category.slugFor({ slug: 'hello' })).toBe("hello");
+    });
+
+    it("returns id-category when slug is an empty string", function() {
+      expect(Discourse.Category.slugFor({ id: 123, slug: '' })).toBe("123-category");
+    });
+
+    it("returns id-category without a slug", function() {
+      expect(Discourse.Category.slugFor({ id: 456 })).toBe("456-category");
+    });
+
+  });
+
+});
\ No newline at end of file