From c788c9ee70d949e465767c3690891adce16b95b4 Mon Sep 17 00:00:00 2001
From: PJ Dietz <pjdietz@gmail.com>
Date: Wed, 5 Dec 2012 16:20:28 -0500
Subject: [PATCH] Move ArticleControler.php

---
 samples/apisample/{data => }/ArticlesControler.inc.php    | 4 ++--
 .../apisample/handlers/ArticleCollectionHandler.inc.php   | 6 +++---
 samples/apisample/handlers/ArticleItemHandler.inc.php     | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename samples/apisample/{data => }/ArticlesControler.inc.php (96%)

diff --git a/samples/apisample/data/ArticlesControler.inc.php b/samples/apisample/ArticlesControler.inc.php
similarity index 96%
rename from samples/apisample/data/ArticlesControler.inc.php
rename to samples/apisample/ArticlesControler.inc.php
index c9538e1..7ec51cc 100644
--- a/samples/apisample/data/ArticlesControler.inc.php
+++ b/samples/apisample/ArticlesControler.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace apisample\data;
+namespace apisample;
 
 /**
  * Simple class for reading and writing articles to a text file.
@@ -11,7 +11,7 @@ class ArticlesControler {
     protected $path;
 
     public function __construct() {
-        $this->path = dirname(__FILE__) . '/articles.json';
+        $this->path = dirname(__FILE__) . '/data/articles.json';
         $this->load();
     }
 
diff --git a/samples/apisample/handlers/ArticleCollectionHandler.inc.php b/samples/apisample/handlers/ArticleCollectionHandler.inc.php
index 7b10310..3f7d899 100644
--- a/samples/apisample/handlers/ArticleCollectionHandler.inc.php
+++ b/samples/apisample/handlers/ArticleCollectionHandler.inc.php
@@ -3,7 +3,7 @@
 namespace apisample\handlers;
 
 require_once(dirname(__FILE__) . '/../../../Handler.inc.php');
-require_once(dirname(__FILE__) . '/../data/ArticlesControler.inc.php');
+require_once(dirname(__FILE__) . '/../ArticlesControler.inc.php');
 
 /**
  * Handler class for a list of articles.
@@ -16,7 +16,7 @@ class ArticleCollectionHandler extends \wellrested\Handler {
     protected function get() {
 
         // Display the list of articles.
-        $articles = new \apisample\data\ArticlesControler();
+        $articles = new \apisample\ArticlesControler();
 
         if (isset($articles->data)) {
 
@@ -73,7 +73,7 @@ class ArticleCollectionHandler extends \wellrested\Handler {
         }
 
         // Ensure slug is not a duplicate.
-        $articles = new \apisample\data\ArticlesControler();
+        $articles = new \apisample\ArticlesControler();
         if ($articles->getArticleBySlug($article['slug']) !== false) {
             $this->response->statusCode = 409;
             $this->response->setHeader('Content-type', 'text/plain');
diff --git a/samples/apisample/handlers/ArticleItemHandler.inc.php b/samples/apisample/handlers/ArticleItemHandler.inc.php
index 7b93fb0..23534f3 100644
--- a/samples/apisample/handlers/ArticleItemHandler.inc.php
+++ b/samples/apisample/handlers/ArticleItemHandler.inc.php
@@ -3,7 +3,7 @@
 namespace apisample\handlers;
 
 require_once(dirname(__FILE__) . '/../../../Handler.inc.php');
-require_once(dirname(__FILE__) . '/../data/ArticlesControler.inc.php');
+require_once(dirname(__FILE__) . '/../ArticlesControler.inc.php');
 
 /**
  * Handler class for one specific article.
@@ -19,7 +19,7 @@ class ArticleItemHandler extends \wellrested\Handler {
     protected function get() {
 
         // Read the list of articles.
-        $articles = new \apisample\data\ArticlesControler();
+        $articles = new \apisample\ArticlesControler();
 
         $article = false;
 
@@ -89,7 +89,7 @@ class ArticleItemHandler extends \wellrested\Handler {
         }
 
         // Read the list of articles.
-        $articles = new \apisample\data\ArticlesControler();
+        $articles = new \apisample\ArticlesControler();
 
         $oldArticle = false;
 
@@ -159,7 +159,7 @@ class ArticleItemHandler extends \wellrested\Handler {
     protected function delete() {
 
         // Read the list of articles.
-        $articles = new \apisample\data\ArticlesControler();
+        $articles = new \apisample\ArticlesControler();
 
         $article = false;