From 01b49fede8ef9f43016fb8caf1e6e4b8b260b20d Mon Sep 17 00:00:00 2001
From: Taras Mankovski <taras@quandl.com>
Date: Sun, 2 Mar 2014 15:12:06 -0500
Subject: [PATCH] Minor refactoring of the routers:

- Moved post route under posts resource
- Changed ajax to use ic.ajax.request instead of ic.ajax.raw
---
 ghost/admin/app.js                          | 36 ++-------------------
 ghost/admin/controllers/{ => posts}/post.js |  0
 ghost/admin/fixtures/init.js                | 24 ++++++++++++++
 ghost/admin/fixtures/posts.js               | 24 ++++++++++++++
 ghost/admin/models/.gitkeep                 |  0
 ghost/admin/models/post.js                  |  5 +++
 ghost/admin/router.js                       |  2 +-
 ghost/admin/routes/posts/index.js           |  4 +--
 ghost/admin/routes/posts/post.js            |  7 ++++
 ghost/admin/templates/posts.hbs             |  5 ++-
 ghost/admin/templates/{ => posts}/post.hbs  |  0
 ghost/admin/utils/ajax.js                   |  6 ++--
 12 files changed, 70 insertions(+), 43 deletions(-)
 rename ghost/admin/controllers/{ => posts}/post.js (100%)
 create mode 100644 ghost/admin/fixtures/init.js
 create mode 100644 ghost/admin/fixtures/posts.js
 delete mode 100644 ghost/admin/models/.gitkeep
 create mode 100644 ghost/admin/models/post.js
 create mode 100644 ghost/admin/routes/posts/post.js
 rename ghost/admin/templates/{ => posts}/post.hbs (100%)

diff --git a/ghost/admin/app.js b/ghost/admin/app.js
index 3df79d1e80..e40b0f9ce6 100755
--- a/ghost/admin/app.js
+++ b/ghost/admin/app.js
@@ -1,6 +1,5 @@
-/*global Ember, ic */
-
 import Resolver from 'ember/resolver';
+import initFixtures from 'ghost/fixtures/init';
 
 var App = Ember.Application.extend({
     /**
@@ -15,6 +14,7 @@ var App = Ember.Application.extend({
     Resolver: Resolver['default']
 });
 
+initFixtures();
 
 // TODO move into ext/route.js
 // needed to add body class depending on current route
@@ -39,36 +39,4 @@ Ember.Route.reopen({
     }
 });
 
-
-ic.ajax.defineFixture('/ghost/api/v0.1/posts', {
-    response: {
-        "posts": [
-            {
-                "id": 2,
-                "title": "Ghost Ember Demo Post",
-                "markdown": "Lorem **ipsum** dolor sit amet, consectetur adipiscing elit. Fusce id felis nec est suscipit scelerisque vitae eu arcu. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam erat volutpat. Sed pellentesque metus vel velit tincidunt aliquet. Nunc condimentum tempus convallis. Sed tincidunt, leo et congue blandit, lorem tortor imperdiet sapien, et porttitor turpis nisl sed tellus. In ultrices urna sit amet mauris suscipit adipiscing.",
-                "html": "<p>Lorem <strong>ipsum<\/strong> dolor sit amet, consectetur adipiscing elit. Fusce id felis nec est suscipit scelerisque vitae eu arcu. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam erat volutpat. Sed pellentesque metus vel velit tincidunt aliquet. Nunc condimentum tempus convallis. Sed tincidunt, leo et congue blandit, lorem tortor imperdiet sapien, et porttitor turpis nisl sed tellus. In ultrices urna sit amet mauris suscipit adipiscing.<\/p>",
-                "status": "draft",
-                "author": {
-                    "id": 1,
-                    "name": "manuel_mitasch",
-                },
-            },
-            {
-                "id": 1,
-                "title": "Welcome to Ghost",
-                "markdown": "You're live! Nice. We've put together a little post to introduce you to the Ghost editor and get you started. You can manage your content by signing in to the admin area at `<your blog URL>\/ghost\/`. When you arrive, you can select this post from a list on the left and see a preview of it on the right. Click the little pencil icon at the top of the preview to edit this post and read the next section!\n\n## Getting Started\n\nGhost uses something called Markdown for writing. Essentially, it's a shorthand way to manage your post formatting as you write!\n\nWriting in Markdown is really easy. In the left hand panel of Ghost, you simply write as you normally would. Where appropriate, you can use *shortcuts* to **style** your content. For example, a list:\n\n* Item number one\n* Item number two\n    * A nested item\n* A final item\n\nor with numbers!\n\n1. Remember to buy some milk\n2. Drink the milk\n3. Tweet that I remembered to buy the milk, and drank it\n\n### Links\n\nWant to link to a source? No problem. If you paste in url, like http:\/\/ghost.org - it'll automatically be linked up. But if you want to customise your anchor text, you can do that too! Here's a link to [the Ghost website](http:\/\/ghost.org). Neat.\n\n### What about Images?\n\nImages work too! Already know the URL of the image you want to include in your article? Simply paste it in like this to make it show up:\n\n![The Ghost Logo](https:\/\/ghost.org\/images\/ghost.png)\n\nNot sure which image you want to use yet? That's ok too. Leave yourself a descriptive placeholder and keep writing. Come back later and drag and drop the image in to upload:\n\n![A bowl of bananas]\n\n\n### Quoting\n\nSometimes a link isn't enough, you want to quote someone on what they've said. It was probably very wisdomous. Is wisdomous a word? Find out in a future release when we introduce spellcheck! For now - it's definitely a word.\n\n> Wisdomous - it's definitely a word.\n\n### Working with Code\n\nGot a streak of geek? We've got you covered there, too. You can write inline `<code>` blocks really easily with back ticks. Want to show off something more comprehensive? 4 spaces of indentation gets you there.\n\n    .awesome-thing {\n        display: block;\n        width: 100%;\n    }\n\n### Ready for a Break? \n\nThrow 3 or more dashes down on any new line and you've got yourself a fancy new divider. Aw yeah.\n\n---\n\n### Advanced Usage\n\nThere's one fantastic secret about Markdown. If you want, you can  write plain old HTML and it'll still work! Very flexible.\n\n<input type=\"text\" placeholder=\"I'm an input field!\" \/>\n\nThat should be enough to get you started. Have fun - and let us know what you think :)",
-                "html": "<p>You're live! Nice. We've put together a little post to introduce you to the Ghost editor and get you started. You can manage your content by signing in to the admin area at <code>&lt;your blog URL&gt;\/ghost\/<\/code>. When you arrive, you can select this post from a list on the left and see a preview of it on the right. Click the little pencil icon at the top of the preview to edit this post and read the next section!<\/p>\n\n<h2 id=\"gettingstarted\">Getting Started<\/h2>\n\n<p>Ghost uses something called Markdown for writing. Essentially, it's a shorthand way to manage your post formatting as you write!<\/p>\n\n<p>Writing in Markdown is really easy. In the left hand panel of Ghost, you simply write as you normally would. Where appropriate, you can use <em>shortcuts<\/em> to <strong>style<\/strong> your content. For example, a list:<\/p>\n\n<ul>\n<li>Item number one<\/li>\n<li>Item number two\n<ul><li>A nested item<\/li><\/ul><\/li>\n<li>A final item<\/li>\n<\/ul>\n\n<p>or with numbers!<\/p>\n\n<ol>\n<li>Remember to buy some milk  <\/li>\n<li>Drink the milk  <\/li>\n<li>Tweet that I remembered to buy the milk, and drank it<\/li>\n<\/ol>\n\n<h3 id=\"links\">Links<\/h3>\n\n<p>Want to link to a source? No problem. If you paste in url, like <a href='http:\/\/ghost.org'>http:\/\/ghost.org<\/a> - it'll automatically be linked up. But if you want to customise your anchor text, you can do that too! Here's a link to <a href=\"http:\/\/ghost.org\">the Ghost website<\/a>. Neat.<\/p>\n\n<h3 id=\"whataboutimages\">What about Images?<\/h3>\n\n<p>Images work too! Already know the URL of the image you want to include in your article? Simply paste it in like this to make it show up:<\/p>\n\n<p><img src=\"https:\/\/ghost.org\/images\/ghost.png\" alt=\"The Ghost Logo\" \/><\/p>\n\n<p>Not sure which image you want to use yet? That's ok too. Leave yourself a descriptive placeholder and keep writing. Come back later and drag and drop the image in to upload:<\/p>\n\n<h3 id=\"quoting\">Quoting<\/h3>\n\n<p>Sometimes a link isn't enough, you want to quote someone on what they've said. It was probably very wisdomous. Is wisdomous a word? Find out in a future release when we introduce spellcheck! For now - it's definitely a word.<\/p>\n\n<blockquote>\n  <p>Wisdomous - it's definitely a word.<\/p>\n<\/blockquote>\n\n<h3 id=\"workingwithcode\">Working with Code<\/h3>\n\n<p>Got a streak of geek? We've got you covered there, too. You can write inline <code>&lt;code&gt;<\/code> blocks really easily with back ticks. Want to show off something more comprehensive? 4 spaces of indentation gets you there.<\/p>\n\n<pre><code>.awesome-thing {\n    display: block;\n    width: 100%;\n}\n<\/code><\/pre>\n\n<h3 id=\"readyforabreak\">Ready for a Break?<\/h3>\n\n<p>Throw 3 or more dashes down on any new line and you've got yourself a fancy new divider. Aw yeah.<\/p>\n\n<hr \/>\n\n<h3 id=\"advancedusage\">Advanced Usage<\/h3>\n\n<p>There's one fantastic secret about Markdown. If you want, you can  write plain old HTML and it'll still work! Very flexible.<\/p>\n\n<p><input type=\"text\" placeholder=\"I'm an input field!\" \/><\/p>\n\n<p>That should be enough to get you started. Have fun - and let us know what you think :)<\/p>",
-                "status": "published",
-                "author": {
-                    "id": 1,
-                    "name": "manuel_mitasch",
-                },
-            }
-        ],
-    },
-    jqXHR: {},
-    textStatus: 'success'
-});
-
 export default App;
diff --git a/ghost/admin/controllers/post.js b/ghost/admin/controllers/posts/post.js
similarity index 100%
rename from ghost/admin/controllers/post.js
rename to ghost/admin/controllers/posts/post.js
diff --git a/ghost/admin/fixtures/init.js b/ghost/admin/fixtures/init.js
new file mode 100644
index 0000000000..976f7b81d7
--- /dev/null
+++ b/ghost/admin/fixtures/init.js
@@ -0,0 +1,24 @@
+/*global ic */
+import postFixtures from 'ghost/fixtures/posts';
+
+var post = function (id) {
+    return {
+        response: postFixtures.findBy('id', id),
+        jqXHR: {},
+        textStatus: 'success'
+    };
+};
+
+var posts = function () {
+    return {
+        response: postFixtures,
+        jqXHR: {},
+        textStatus: 'success'
+    };
+};
+
+export default function () {
+    ic.ajax.defineFixture('/ghost/api/v0.1/posts', posts());
+    ic.ajax.defineFixture('/ghost/api/v0.1/posts/1', post(1));
+    ic.ajax.defineFixture('/ghost/api/v0.1/posts/2', post(2));
+}
diff --git a/ghost/admin/fixtures/posts.js b/ghost/admin/fixtures/posts.js
new file mode 100644
index 0000000000..3c40e103e2
--- /dev/null
+++ b/ghost/admin/fixtures/posts.js
@@ -0,0 +1,24 @@
+export default [
+    {
+        "id": 2,
+        "title": "Ghost Ember Demo Post",
+        "markdown": "Lorem **ipsum** dolor sit amet, consectetur adipiscing elit. Fusce id felis nec est suscipit scelerisque vitae eu arcu. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam erat volutpat. Sed pellentesque metus vel velit tincidunt aliquet. Nunc condimentum tempus convallis. Sed tincidunt, leo et congue blandit, lorem tortor imperdiet sapien, et porttitor turpis nisl sed tellus. In ultrices urna sit amet mauris suscipit adipiscing.",
+        "html": "<p>Lorem <strong>ipsum<\/strong> dolor sit amet, consectetur adipiscing elit. Fusce id felis nec est suscipit scelerisque vitae eu arcu. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam erat volutpat. Sed pellentesque metus vel velit tincidunt aliquet. Nunc condimentum tempus convallis. Sed tincidunt, leo et congue blandit, lorem tortor imperdiet sapien, et porttitor turpis nisl sed tellus. In ultrices urna sit amet mauris suscipit adipiscing.<\/p>",
+        "status": "draft",
+        "author": {
+            "id": 1,
+            "name": "manuel_mitasch"
+        }
+    },
+    {
+        "id": 1,
+        "title": "Welcome to Ghost",
+        "markdown": "You're live! Nice. We've put together a little post to introduce you to the Ghost editor and get you started. You can manage your content by signing in to the admin area at `<your blog URL>\/ghost\/`. When you arrive, you can select this post from a list on the left and see a preview of it on the right. Click the little pencil icon at the top of the preview to edit this post and read the next section!\n\n## Getting Started\n\nGhost uses something called Markdown for writing. Essentially, it's a shorthand way to manage your post formatting as you write!\n\nWriting in Markdown is really easy. In the left hand panel of Ghost, you simply write as you normally would. Where appropriate, you can use *shortcuts* to **style** your content. For example, a list:\n\n* Item number one\n* Item number two\n    * A nested item\n* A final item\n\nor with numbers!\n\n1. Remember to buy some milk\n2. Drink the milk\n3. Tweet that I remembered to buy the milk, and drank it\n\n### Links\n\nWant to link to a source? No problem. If you paste in url, like http:\/\/ghost.org - it'll automatically be linked up. But if you want to customise your anchor text, you can do that too! Here's a link to [the Ghost website](http:\/\/ghost.org). Neat.\n\n### What about Images?\n\nImages work too! Already know the URL of the image you want to include in your article? Simply paste it in like this to make it show up:\n\n![The Ghost Logo](https:\/\/ghost.org\/images\/ghost.png)\n\nNot sure which image you want to use yet? That's ok too. Leave yourself a descriptive placeholder and keep writing. Come back later and drag and drop the image in to upload:\n\n![A bowl of bananas]\n\n\n### Quoting\n\nSometimes a link isn't enough, you want to quote someone on what they've said. It was probably very wisdomous. Is wisdomous a word? Find out in a future release when we introduce spellcheck! For now - it's definitely a word.\n\n> Wisdomous - it's definitely a word.\n\n### Working with Code\n\nGot a streak of geek? We've got you covered there, too. You can write inline `<code>` blocks really easily with back ticks. Want to show off something more comprehensive? 4 spaces of indentation gets you there.\n\n    .awesome-thing {\n        display: block;\n        width: 100%;\n    }\n\n### Ready for a Break? \n\nThrow 3 or more dashes down on any new line and you've got yourself a fancy new divider. Aw yeah.\n\n---\n\n### Advanced Usage\n\nThere's one fantastic secret about Markdown. If you want, you can  write plain old HTML and it'll still work! Very flexible.\n\n<input type=\"text\" placeholder=\"I'm an input field!\" \/>\n\nThat should be enough to get you started. Have fun - and let us know what you think :)",
+        "html": "<p>You're live! Nice. We've put together a little post to introduce you to the Ghost editor and get you started. You can manage your content by signing in to the admin area at <code>&lt;your blog URL&gt;\/ghost\/<\/code>. When you arrive, you can select this post from a list on the left and see a preview of it on the right. Click the little pencil icon at the top of the preview to edit this post and read the next section!<\/p>\n\n<h2 id=\"gettingstarted\">Getting Started<\/h2>\n\n<p>Ghost uses something called Markdown for writing. Essentially, it's a shorthand way to manage your post formatting as you write!<\/p>\n\n<p>Writing in Markdown is really easy. In the left hand panel of Ghost, you simply write as you normally would. Where appropriate, you can use <em>shortcuts<\/em> to <strong>style<\/strong> your content. For example, a list:<\/p>\n\n<ul>\n<li>Item number one<\/li>\n<li>Item number two\n<ul><li>A nested item<\/li><\/ul><\/li>\n<li>A final item<\/li>\n<\/ul>\n\n<p>or with numbers!<\/p>\n\n<ol>\n<li>Remember to buy some milk  <\/li>\n<li>Drink the milk  <\/li>\n<li>Tweet that I remembered to buy the milk, and drank it<\/li>\n<\/ol>\n\n<h3 id=\"links\">Links<\/h3>\n\n<p>Want to link to a source? No problem. If you paste in url, like <a href='http:\/\/ghost.org'>http:\/\/ghost.org<\/a> - it'll automatically be linked up. But if you want to customise your anchor text, you can do that too! Here's a link to <a href=\"http:\/\/ghost.org\">the Ghost website<\/a>. Neat.<\/p>\n\n<h3 id=\"whataboutimages\">What about Images?<\/h3>\n\n<p>Images work too! Already know the URL of the image you want to include in your article? Simply paste it in like this to make it show up:<\/p>\n\n<p><img src=\"https:\/\/ghost.org\/images\/ghost.png\" alt=\"The Ghost Logo\" \/><\/p>\n\n<p>Not sure which image you want to use yet? That's ok too. Leave yourself a descriptive placeholder and keep writing. Come back later and drag and drop the image in to upload:<\/p>\n\n<h3 id=\"quoting\">Quoting<\/h3>\n\n<p>Sometimes a link isn't enough, you want to quote someone on what they've said. It was probably very wisdomous. Is wisdomous a word? Find out in a future release when we introduce spellcheck! For now - it's definitely a word.<\/p>\n\n<blockquote>\n  <p>Wisdomous - it's definitely a word.<\/p>\n<\/blockquote>\n\n<h3 id=\"workingwithcode\">Working with Code<\/h3>\n\n<p>Got a streak of geek? We've got you covered there, too. You can write inline <code>&lt;code&gt;<\/code> blocks really easily with back ticks. Want to show off something more comprehensive? 4 spaces of indentation gets you there.<\/p>\n\n<pre><code>.awesome-thing {\n    display: block;\n    width: 100%;\n}\n<\/code><\/pre>\n\n<h3 id=\"readyforabreak\">Ready for a Break?<\/h3>\n\n<p>Throw 3 or more dashes down on any new line and you've got yourself a fancy new divider. Aw yeah.<\/p>\n\n<hr \/>\n\n<h3 id=\"advancedusage\">Advanced Usage<\/h3>\n\n<p>There's one fantastic secret about Markdown. If you want, you can  write plain old HTML and it'll still work! Very flexible.<\/p>\n\n<p><input type=\"text\" placeholder=\"I'm an input field!\" \/><\/p>\n\n<p>That should be enough to get you started. Have fun - and let us know what you think :)<\/p>",
+        "status": "published",
+        "author": {
+            "id": 1,
+            "name": "manuel_mitasch"
+        }
+    }
+];
\ No newline at end of file
diff --git a/ghost/admin/models/.gitkeep b/ghost/admin/models/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ghost/admin/models/post.js b/ghost/admin/models/post.js
new file mode 100644
index 0000000000..1c101ee55f
--- /dev/null
+++ b/ghost/admin/models/post.js
@@ -0,0 +1,5 @@
+var PostModel = Ember.Object.extend({
+
+});
+
+export default PostModel;
\ No newline at end of file
diff --git a/ghost/admin/router.js b/ghost/admin/router.js
index b9f94b2752..485b96ca41 100755
--- a/ghost/admin/router.js
+++ b/ghost/admin/router.js
@@ -10,7 +10,7 @@ Router.reopen({
 
 Router.map(function () {
     this.resource('posts', { path: '/' }, function () {
-        this.resource('post', { path: '/:post_id' });
+        this.route('post', { path: ':post_id' });
     });
     this.resource('editor', { path: '/editor/:post_id' });
     this.route('new', { path: '/editor' });
diff --git a/ghost/admin/routes/posts/index.js b/ghost/admin/routes/posts/index.js
index d50b1cae2d..d70f3fb70d 100644
--- a/ghost/admin/routes/posts/index.js
+++ b/ghost/admin/routes/posts/index.js
@@ -1,10 +1,10 @@
 export default Ember.Route.extend({
     // redirect to first post subroute
     redirect: function () {
-        var firstPost = this.modelFor('posts').posts[0];
+        var firstPost = (this.modelFor('posts') || []).get('firstObject');
 
         if (firstPost) {
-            this.transitionTo('post', firstPost);
+            this.transitionTo('posts.post', firstPost);
         }
     }
 });
\ No newline at end of file
diff --git a/ghost/admin/routes/posts/post.js b/ghost/admin/routes/posts/post.js
new file mode 100644
index 0000000000..cfb4d7b0f5
--- /dev/null
+++ b/ghost/admin/routes/posts/post.js
@@ -0,0 +1,7 @@
+/*global ajax */
+
+export default Ember.Route.extend({
+    model: function (params) {
+        return ajax("/ghost/api/v0.1/posts/" + params.post_id);
+    }
+});
\ No newline at end of file
diff --git a/ghost/admin/templates/posts.hbs b/ghost/admin/templates/posts.hbs
index 1b2de6ec4e..323742203e 100644
--- a/ghost/admin/templates/posts.hbs
+++ b/ghost/admin/templates/posts.hbs
@@ -8,9 +8,9 @@
         </header>
         <section class="content-list-content">
             <ol class="posts-list">
-                {{#each posts itemController="post"}}
+                {{#each itemController="posts/post"}}
                     {{#view "post-item-view" tagName="li" post=this}} <!-- needed because of "active" class on li item -->
-                        {{#link-to 'post' this class="permalink" title="Edit this post"}}
+                        {{#link-to 'posts.post' this class="permalink" title="Edit this post"}}
                             <h3 class="entry-title">{{title}}</h3>
                             <section class="entry-meta">
                                 <span class="status">
@@ -30,7 +30,6 @@
             </ol>
         </section>
     </section>
-
     <section class="content-preview js-content-preview">
         {{outlet}}
     </section>
diff --git a/ghost/admin/templates/post.hbs b/ghost/admin/templates/posts/post.hbs
similarity index 100%
rename from ghost/admin/templates/post.hbs
rename to ghost/admin/templates/posts/post.hbs
diff --git a/ghost/admin/utils/ajax.js b/ghost/admin/utils/ajax.js
index 5761caf2c0..5b05dc365c 100644
--- a/ghost/admin/utils/ajax.js
+++ b/ghost/admin/utils/ajax.js
@@ -1,4 +1,4 @@
 /* global ic */
-export default function ajax() {
-    return ic.ajax.raw.apply(null, arguments);
-}
+export default window.ajax = function () {
+    return ic.ajax.request.apply(null, arguments);
+};