Merge pull request #4 from RobertGrubb/updates

[Fixes] Fix delete and get by id when does not exist

examples/todo/database/todo/items.json

@@ -0,0 +1,8 @@
+[
+    {
+        "title": "An example",
+        "id": "5ed559fc3669f",
+        "createdAt": 1591040508,
+        "updatedAt": 1591040508
+    }
+]

examples/todo/filerdb.php

@@ -0,0 +1,28 @@
+<?php
+
+require_once __DIR__ . '/../../vendor/autoload.php';
+require_once __DIR__ . '/../../src/FilerDB.php';
+
+try {
+  // Instantiate Database
+  $filerdb = new FilerDB\Instance([
+
+    // Required
+    'root' => __DIR__ . '/database',
+
+    // Optional configurations
+    'includeTimestamps' => true,
+
+    // Specify database
+    'database' => 'todo',
+
+    // Configs
+    'createRootIfNotExist' => true,
+    'createDatabaseIfNotExist' => true,
+    'createCollectionIfNotExist' => true
+  ]);
+
+  return $filerdb;
+} catch (Exception $e) {
+  return false;
+}

examples/todo/index.php

@@ -0,0 +1,50 @@
+<?php
+
+// Include a file that returns the filerdb instance.
+$filerdb = require __DIR__ . '/filerdb.php';
+
+if (!$filerdb) die('FilerDB was unable to instantiate.');
+
+// Current action
+$action = (isset($_GET['a']) ? $_GET['a'] : false);
+
+if ($action === 'submit') {
+  $todo = (isset($_POST['todo']) ? $_POST['todo'] : false);
+
+  if ($todo !== false) {
+    $filerdb->collection('items')->insert([
+      'title' => $todo
+    ]);
+  }
+
+  header('Location: index.php');
+  exit;
+
+} elseif ($action === 'remove') {
+  $id = (isset($_GET['id']) ? $_GET['id'] : false);
+
+  if ($id !== false) {
+    $filerdb->collection('items')->id($id)->delete();
+  }
+
+  header('Location: index.php');
+  exit;
+}
+
+// Retrieve all todo items
+$items = $filerdb->collection('items')->all();
+
+?>
+
+<h1>Todo Items</h1>
+
+<form action="index.php?a=submit" method="POST">
+  <input type="text" name="todo" />
+  <button type="submit">Add</button>
+</form>
+
+<ul>
+  <?php foreach ($items as $item): ?>
+    <li><?= $item->title; ?>&nbsp;&nbsp;<a href="index.php?a=remove&id=<?= $item->id; ?>">[X]</a></li>
+  <?php endforeach; ?>
+</ul>

example/backup.php → examples/usage/backup.php

@@ -1,7 +1,7 @@
 <?php
 
-require '../vendor/autoload.php';
-require_once __DIR__ . '/../src/FilerDB.php';
+require_once __DIR__ , '/../../vendor/autoload.php';
+require_once __DIR__ . '/../../src/FilerDB.php';
 
 try {
   // Instantiate Database

example/dev.php → examples/usage/dev.php

@@ -1,7 +1,7 @@
 <?php
 
-require '../vendor/autoload.php';
-require_once __DIR__ . '/../src/FilerDB.php';
+require_once __DIR__ , '/../../vendor/autoload.php';
+require_once __DIR__ . '/../../src/FilerDB.php';
 
 try {
   // Instantiate Database

example/test.php → examples/usage/test.php

@@ -1,7 +1,7 @@
 <?php
 
-require '../vendor/autoload.php';
-require_once __DIR__ . '/../src/FilerDB.php';
+require_once __DIR__ , '/../../vendor/autoload.php';
+require_once __DIR__ . '/../../src/FilerDB.php';
 
 use FilerDB\Instance;
 

src/FilerDB/Core/Helpers/Document.php

@@ -47,7 +47,7 @@ public static function byId ($documents, $id = null) {
     }
 
     // If no index was set, return false.
-    if (!$index) return false;
+    if ($index === false) return false;
 
     // Return object with data.
     return (object) [

src/FilerDB/Core/Libraries/Collection.php

@@ -100,7 +100,13 @@ public function __construct ($config = null, $database, $collection) {
   public function id ($id) {
     $documents = $this->documents;
     $data = Document::byId($documents, $id);
-    if ($data === false) return false;
+
+    if ($data === false) {
+      $this->documents = false;
+      $this->response = false;
+      return $this;
+    }
+
     $this->documents = $documents[$data->index];
     $this->response  = $this->documents;
     return $this;
@@ -113,13 +119,17 @@ public function id ($id) {
    */
   public function get ($fields = false) {
 
-    /**
-     * If the columns parameter is provided,
-     * and is an array.
-     */
-    if (is_array($fields)) {
-      if (count($fields) >= 1) {
-        return $this->pickFieldsFromData($this->response, $fields);
+    // Make sure there is a document(s) to iterate through.
+    if ($this->response !== false) {
+
+      /**
+       * If the columns parameter is provided,
+       * and is an array.
+       */
+      if (is_array($fields)) {
+        if (count($fields) >= 1) {
+          return $this->pickFieldsFromData($this->response, $fields);
+        }
       }
     }
 
@@ -489,24 +499,21 @@ public function delete () {
     $documentsToDelete = $this->documents;
     $originalDocuments = $this->getDocuments();
 
-    /**
-     * Fail safe, we do not want to delete all records
-     * with this method.
-     *
-     * Warn them to use ->empty() instead.
-     */
-    if (count($documentsToDelete) === count($originalDocuments)) {
-      throw new FilerDBException("Please use ->empty() to delete all records");
-      return false;
-    }
-
     /**
      * Filter out records that match the documents
      * to be deleted.
      */
-    foreach ($documentsToDelete as $deleteDoc) {
+    if (is_array($documentsToDelete)) {
+      foreach ($documentsToDelete as $deleteDoc) {
+        foreach ($originalDocuments as $key => $origDoc) {
+          if ($origDoc->id === $deleteDoc->id) {
+            unset($originalDocuments[$key]);
+          }
+        }
+      }
+    } else {
       foreach ($originalDocuments as $key => $origDoc) {
-        if ($origDoc->id === $deleteDoc->id) {
+        if ($origDoc->id === $documentsToDelete->id) {
           unset($originalDocuments[$key]);
         }
       }

src/FilerDB/Core/Libraries/Databases.php

@@ -121,13 +121,4 @@ private function retrieveDatabases() {
     $this->databases = $result;
   }
 
-  /**
-   * Builds the path for the database in the file system.
-   * @return string $path
-   */
-  private function path ($database) {
-    $path = $this->config->root . DIRECTORY_SEPARATOR . $database . DIRECTORY_SEPARATOR;
-    return $path;
-  }
-
 }