From e0faefee2390a3394be2d6ae077ed55e0c940173 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Thu, 7 Jan 2016 10:16:37 -0800
Subject: [PATCH 01/15] #1: Progress commit.

---
 app/Console/Commands/RebuildSearchIndex.php   |  93 +++++++
 app/Console/Kernel.php                        |   1 +
 .../Controllers/Api/Web/SearchController.php  |  59 ++++
 app/Http/routes.php                           |   4 +-
 app/Models/Album.php                          |  19 +-
 app/Models/Playlist.php                       |  16 +-
 app/Models/Track.php                          |  17 +-
 app/Models/User.php                           |  15 +-
 app/Traits/IndexedInElasticsearch.php         |  92 +++++++
 composer.json                                 |   3 +-
 composer.lock                                 | 252 +++++++++++++++++-
 config/app.php                                |   2 +
 config/elasticsearch.php                      | 167 ++++++++++++
 .../2016_01_14_021607_setup_elasticsearch.php |  88 ++++++
 vagrant/install.sh                            |  25 +-
 15 files changed, 838 insertions(+), 15 deletions(-)
 create mode 100644 app/Console/Commands/RebuildSearchIndex.php
 create mode 100644 app/Http/Controllers/Api/Web/SearchController.php
 create mode 100644 app/Traits/IndexedInElasticsearch.php
 create mode 100644 config/elasticsearch.php
 create mode 100644 database/migrations/2016_01_14_021607_setup_elasticsearch.php

diff --git a/app/Console/Commands/RebuildSearchIndex.php b/app/Console/Commands/RebuildSearchIndex.php
new file mode 100644
index 00000000..ec583e4c
--- /dev/null
+++ b/app/Console/Commands/RebuildSearchIndex.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2016 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Poniverse\Ponyfm\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Collection;
+use Poniverse\Ponyfm\Models\Album;
+use Poniverse\Ponyfm\Models\Playlist;
+use Poniverse\Ponyfm\Models\Track;
+use Poniverse\Ponyfm\Models\User;
+
+class RebuildSearchIndex extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'rebuild:search';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Rebuilds the Elasticsearch index.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $totalTracks = Track::withTrashed()->count();
+        $totalAlbums = Album::withTrashed()->count();
+        $totalPlaylists = Playlist::withTrashed()->count();
+        $totalUsers = User::count();
+
+        Track::withTrashed()->chunk(200, function(Collection $tracks) {
+            foreach($tracks as $track) {
+                $this->info("Processing track #{$track->id}...");
+                $track->ensureElasticsearchEntryIsUpToDate();
+            }
+        });
+
+        Album::withTrashed()->chunk(200, function(Collection $albums) {
+            foreach($albums as $album) {
+                $this->info("Processing album #{$album->id}...");
+                $album->ensureElasticsearchEntryIsUpToDate();
+            }
+        });
+
+//        Playlist::withTrashed()->chunk(200, function(Collection $playlists) {
+//            foreach($playlists as $playlist) {
+//                $this->info("Processing playlist #{$playlist->id}...");
+//                $playlist->ensureElasticsearchEntryIsUpToDate();
+//            }
+//        });
+//
+//        User::withTrashed()->chunk(200, function(User $user) {
+//            $user->ensureElasticsearchEntryIsUpToDate();
+//        });
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 4b1d2233..93446c6d 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -42,6 +42,7 @@ class Kernel extends ConsoleKernel
         \Poniverse\Ponyfm\Console\Commands\RebuildTrackCache::class,
         \Poniverse\Ponyfm\Console\Commands\RebuildTrack::class,
         \Poniverse\Ponyfm\Console\Commands\RebuildFilesizes::class,
+        \Poniverse\Ponyfm\Console\Commands\RebuildSearchIndex::class,
         \Poniverse\Ponyfm\Console\Commands\MergeDuplicateAccounts::class,
     ];
 
diff --git a/app/Http/Controllers/Api/Web/SearchController.php b/app/Http/Controllers/Api/Web/SearchController.php
new file mode 100644
index 00000000..5025259c
--- /dev/null
+++ b/app/Http/Controllers/Api/Web/SearchController.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2016 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
+
+use Elasticsearch;
+use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
+use Input;
+use Response;
+
+class SearchController extends ApiControllerBase
+{
+    public function getSearch()
+    {
+        $input = Input::all();
+
+        $elasticsearch = Elasticsearch::connection();
+
+        $results = $elasticsearch->search([
+            'index' => 'ponyfm',
+            'type'  => 'track,album',
+            'body'  => [
+                'query' => [
+                    'multi_match' => [
+                        'query'     => $input['query'],
+                        'fields'    => [
+                            'track.title',
+                            'album.title',
+                            'track.artist',
+                            'album.artist',
+                            'track.genre',
+                        ]
+                    ]
+                ]
+            ]
+        ]);
+
+        return Response::json([
+            'results' => $results,
+        ], 200);
+    }
+}
diff --git a/app/Http/routes.php b/app/Http/routes.php
index ec54763b..57f3edb5 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -82,8 +82,7 @@ Route::group(['prefix' => 'api/v1', 'middleware' => 'json-exceptions'], function
 
 Route::group(['prefix' => 'api/web'], function() {
     Route::get('/taxonomies/all', 'Api\Web\TaxonomiesController@getAll');
-
-    Route::get('/playlists/show/{id}', 'Api\Web\PlaylistsController@getShow');
+    Route::get('/search', 'Api\Web\SearchController@getSearch');
 
     Route::get('/tracks', 'Api\Web\TracksController@getIndex');
     Route::get('/tracks/{id}', 'Api\Web\TracksController@getShow')->where('id', '\d+');
@@ -94,6 +93,7 @@ Route::group(['prefix' => 'api/web'], function() {
     Route::get('/albums/cached/{id}/{format}', 'Api\Web\AlbumsController@getCachedAlbum')->where(['id' => '\d+', 'format' => '.+']);
 
     Route::get('/playlists', 'Api\Web\PlaylistsController@getIndex');
+    Route::get('/playlists/show/{id}', 'Api\Web\PlaylistsController@getShow');
     Route::get('/playlists/{id}', 'Api\Web\PlaylistsController@getShow')->where('id', '\d+');
     Route::get('/playlists/cached/{id}/{format}', 'Api\Web\PlaylistsController@getCachedPlaylist')->where(['id' => '\d+', 'format' => '.+']);
 
diff --git a/app/Models/Album.php b/app/Models/Album.php
index 6666a4eb..023ce002 100644
--- a/app/Models/Album.php
+++ b/app/Models/Album.php
@@ -28,6 +28,7 @@ use Illuminate\Foundation\Bus\DispatchesJobs;
 use Auth;
 use Cache;
 use Poniverse\Ponyfm\Exceptions\TrackFileNotFoundException;
+use Poniverse\Ponyfm\Traits\IndexedInElasticsearch;
 use Poniverse\Ponyfm\Traits\TrackCollection;
 use Poniverse\Ponyfm\Traits\SlugTrait;
 use Venturecraft\Revisionable\RevisionableTrait;
@@ -61,7 +62,9 @@ use Venturecraft\Revisionable\RevisionableTrait;
  */
 class Album extends Model
 {
-    use SoftDeletes, SlugTrait, DispatchesJobs, TrackCollection, RevisionableTrait;
+    use SoftDeletes, SlugTrait, DispatchesJobs, TrackCollection, RevisionableTrait, IndexedInElasticsearch;
+
+    protected $elasticsearchType = 'album';
 
     protected $dates = ['deleted_at'];
     protected $fillable = ['user_id', 'title', 'slug'];
@@ -403,4 +406,18 @@ class Album extends Model
     protected function recountTracks() {
         $this->track_count = $this->tracks->count();
     }
+
+    /**
+     * Returns this model in Elasticsearch-friendly form. The array returned by
+     * this method should match the current mapping for this model's ES type.
+     *
+     * @return array
+     */
+    public function toElasticsearch() {
+        return [
+            'title' => $this->title,
+            'artist' => $this->user->display_name,
+            'tracks' => $this->tracks->pluck('title'),
+        ];
+    }
 }
diff --git a/app/Models/Playlist.php b/app/Models/Playlist.php
index cc3c3be2..d84080d8 100644
--- a/app/Models/Playlist.php
+++ b/app/Models/Playlist.php
@@ -27,6 +27,7 @@ use Illuminate\Foundation\Bus\DispatchesJobs;
 use Auth;
 use Cache;
 use Poniverse\Ponyfm\Exceptions\TrackFileNotFoundException;
+use Poniverse\Ponyfm\Traits\IndexedInElasticsearch;
 use Poniverse\Ponyfm\Traits\TrackCollection;
 use Poniverse\Ponyfm\Traits\SlugTrait;
 use Venturecraft\Revisionable\RevisionableTrait;
@@ -60,10 +61,11 @@ use Venturecraft\Revisionable\RevisionableTrait;
  */
 class Playlist extends Model
 {
-    use SoftDeletes, SlugTrait, DispatchesJobs, TrackCollection, RevisionableTrait;
+    use SoftDeletes, SlugTrait, DispatchesJobs, TrackCollection, RevisionableTrait, IndexedInElasticsearch;
+
+    protected $elasticsearchType = 'playlist';
 
     protected $table = 'playlists';
-
     protected $dates = ['deleted_at'];
 
     public static function summary()
@@ -285,4 +287,14 @@ class Playlist extends Model
     {
         return 'playlist-' . $this->id . '-' . $key;
     }
+
+    /**
+     * Returns this model in Elasticsearch-friendly form. The array returned by
+     * this method should match the current mapping for this model's ES type.
+     *
+     * @return array
+     */
+    public function toElasticsearch() {
+        return $this->toArray();
+    }
 }
diff --git a/app/Models/Track.php b/app/Models/Track.php
index c32c5aba..b977be4a 100644
--- a/app/Models/Track.php
+++ b/app/Models/Track.php
@@ -24,7 +24,9 @@ use Auth;
 use Cache;
 use Config;
 use DB;
+use Elasticsearch;
 use Poniverse\Ponyfm\Exceptions\TrackFileNotFoundException;
+use Poniverse\Ponyfm\Traits\IndexedInElasticsearch;
 use Poniverse\Ponyfm\Traits\SlugTrait;
 use Exception;
 use External;
@@ -95,7 +97,9 @@ use Venturecraft\Revisionable\RevisionableTrait;
  */
 class Track extends Model
 {
-    use SoftDeletes;
+    use SoftDeletes, IndexedInElasticsearch;
+
+    protected $elasticsearchType = 'track';
 
     protected $dates = ['deleted_at', 'published_at', 'released_at'];
     protected $hidden = ['original_tags', 'metadata'];
@@ -826,4 +830,15 @@ class Track extends Model
     {
         return 'track-' . $this->id . '-' . $key;
     }
+
+    public function toElasticsearch() {
+        return [
+            'title'         => $this->title,
+            'artist'        => $this->user->display_name,
+            'published_at'  => $this->published_at ? $this->published_at->toIso8601String() : null,
+            'genre'         => $this->genre->name,
+            'track_type'    => $this->trackType->title,
+            'show_songs'    => $this->showSongs->pluck('title')
+        ];
+    }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index 9a956028..97b86b05 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -29,6 +29,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Auth\Access\Authorizable;
 use Auth;
 use Illuminate\Support\Str;
+use Poniverse\Ponyfm\Traits\IndexedInElasticsearch;
 use Venturecraft\Revisionable\RevisionableTrait;
 
 /**
@@ -64,7 +65,9 @@ use Venturecraft\Revisionable\RevisionableTrait;
  */
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract, \Illuminate\Contracts\Auth\Access\Authorizable
 {
-    use Authenticatable, CanResetPassword, Authorizable, RevisionableTrait;
+    use Authenticatable, CanResetPassword, Authorizable, RevisionableTrait, IndexedInElasticsearch;
+
+    protected $elasticsearchType = 'user';
 
     protected $table = 'users';
     protected $casts = [
@@ -247,4 +250,14 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
 
         return false;
     }
+
+    /**
+     * Returns this model in Elasticsearch-friendly form. The array returned by
+     * this method should match the current mapping for this model's ES type.
+     *
+     * @return array
+     */
+    public function toElasticsearch() {
+        return $this->toArray();
+    }
 }
diff --git a/app/Traits/IndexedInElasticsearch.php b/app/Traits/IndexedInElasticsearch.php
new file mode 100644
index 00000000..7e94b2d2
--- /dev/null
+++ b/app/Traits/IndexedInElasticsearch.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2016 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Poniverse\Ponyfm\Traits;
+
+use Elasticsearch;
+
+/**
+ * Class IndexedInElasticsearch
+ *
+ * Classes using this trait must declare the `$elasticsearchType` property
+ * and use the `SoftDeletes` trait.
+ *
+ * @package Poniverse\Ponyfm\Traits
+ */
+trait IndexedInElasticsearch
+{
+    /**
+     * Returns this model in Elasticsearch-friendly form. The array returned by
+     * this method should match the current mapping for this model's ES type.
+     *
+     * @return array
+     */
+    abstract public function toElasticsearch();
+
+    public static function bootIndexedInElasticsearch() {
+        static::saved(function ($model) {
+            $model->createOrUpdateElasticsearchEntry();
+        });
+
+        static::deleted(function ($model) {
+            $model->deleteElasticsearchEntry();
+        });
+    }
+
+    /**
+     * @param bool $includeBody set to false when deleting documents
+     * @return array
+     */
+    private function getElasticsearchParameters(bool $includeBody = true) {
+        $parameters = [
+            'index' => 'ponyfm',
+            'type'  => $this->elasticsearchType,
+            'id'    => $this->id,
+        ];
+
+        if ($includeBody) {
+            $parameters['body'] = $this->toElasticsearch();
+        }
+
+        return $parameters;
+    }
+
+    private function createOrUpdateElasticsearchEntry() {
+        Elasticsearch::connection()->index($this->getElasticsearchParameters());
+    }
+
+    private function deleteElasticsearchEntry() {
+        try {
+            Elasticsearch::connection()->delete($this->getElasticsearchParameters(false));
+
+        } catch (\Elasticsearch\Common\Exceptions\Missing404Exception $e) {
+            // If the track we're trying to delete isn't indexed in Elasticsearch,
+            // that's fine.
+        }
+    }
+
+    public function ensureElasticsearchEntryIsUpToDate() {
+        if ($this->trashed()) {
+            $this->deleteElasticsearchEntry();
+        } else {
+            $this->createOrUpdateElasticsearchEntry();
+        }
+    }
+}
diff --git a/composer.json b/composer.json
index 3c072416..bae0215b 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,8 @@
         "guzzlehttp/guzzle": "~6.0",
         "doctrine/dbal": "^2.5",
         "venturecraft/revisionable": "^1.23",
-        "pda/pheanstalk": "~3.0"
+        "pda/pheanstalk": "~3.0",
+        "cviebrock/laravel-elasticsearch": "^1.0"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",
diff --git a/composer.lock b/composer.lock
index 56be2782..6066c1cd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "d99fa4165b8a1c9e929248bbb16183ad",
-    "content-hash": "31347c82515003f78f1f9adef010f1f5",
+    "hash": "0deb7713636ee82aadee47da3a9217cc",
+    "content-hash": "9dea148233d815e53eb636413f2bcaed",
     "packages": [
         {
             "name": "barryvdh/laravel-ide-helper",
@@ -168,6 +168,55 @@
             ],
             "time": "2013-05-05 09:10:04"
         },
+        {
+            "name": "cviebrock/laravel-elasticsearch",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/cviebrock/laravel-elasticsearch.git",
+                "reference": "52aa1f8228006cb0bb60954e26c068af523bf47b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/cviebrock/laravel-elasticsearch/zipball/52aa1f8228006cb0bb60954e26c068af523bf47b",
+                "reference": "52aa1f8228006cb0bb60954e26c068af523bf47b",
+                "shasum": ""
+            },
+            "require": {
+                "elasticsearch/elasticsearch": "^2.0",
+                "illuminate/support": "~4|~5",
+                "monolog/monolog": "~1",
+                "php": ">=5.4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Cviebrock\\LaravelElasticsearch\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Colin Viebrock",
+                    "email": "colin@viebrock.ca"
+                },
+                {
+                    "name": "Brandon Martel",
+                    "email": "brandonmartel@gmail.com"
+                }
+            ],
+            "description": "An easy way to use the official PHP ElasticSearch client in your Laravel applications",
+            "keywords": [
+                "client",
+                "elasticsearch",
+                "laravel",
+                "search"
+            ],
+            "time": "2016-01-06 15:58:07"
+        },
         {
             "name": "danielstjules/stringy",
             "version": "1.10.0",
@@ -726,6 +775,60 @@
             ],
             "time": "2014-09-09 13:34:57"
         },
+        {
+            "name": "elasticsearch/elasticsearch",
+            "version": "v2.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/elastic/elasticsearch-php.git",
+                "reference": "7086a86cab241a77f19cdd653ae3d2e023b41699"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/7086a86cab241a77f19cdd653ae3d2e023b41699",
+                "reference": "7086a86cab241a77f19cdd653ae3d2e023b41699",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/ringphp": "~1.0",
+                "php": ">=5.4",
+                "psr/log": "~1.0"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1",
+                "cpliakas/git-wrapper": "~1.0",
+                "mockery/mockery": "0.9.4",
+                "phpunit/phpunit": "~4.7",
+                "symfony/yaml": "2.4.3 as 2.4.2",
+                "twig/twig": "1.*"
+            },
+            "suggest": {
+                "ext-curl": "*",
+                "monolog/monolog": "Allows for client-level logging and tracing"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Elasticsearch\\": "src/Elasticsearch/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache 2"
+            ],
+            "authors": [
+                {
+                    "name": "Zachary Tong"
+                }
+            ],
+            "description": "PHP Client for Elasticsearch",
+            "keywords": [
+                "client",
+                "elasticsearch",
+                "search"
+            ],
+            "time": "2015-12-15 18:42:26"
+        },
         {
             "name": "guzzlehttp/guzzle",
             "version": "6.1.1",
@@ -897,6 +1000,107 @@
             ],
             "time": "2015-11-03 01:34:55"
         },
+        {
+            "name": "guzzlehttp/ringphp",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/RingPHP.git",
+                "reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/dbbb91d7f6c191e5e405e900e3102ac7f261bc0b",
+                "reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/streams": "~3.0",
+                "php": ">=5.4.0",
+                "react/promise": "~2.0"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "ext-curl": "Guzzle will use specific adapters if cURL is present"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Ring\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
+            "time": "2015-05-20 03:37:09"
+        },
+        {
+            "name": "guzzlehttp/streams",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/streams.git",
+                "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
+                "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Stream\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Provides a simple abstraction over streams of data",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "Guzzle",
+                "stream"
+            ],
+            "time": "2014-10-12 19:18:40"
+        },
         {
             "name": "intouch/laravel-newrelic",
             "version": "2.0.0",
@@ -1864,6 +2068,50 @@
             ],
             "time": "2015-11-12 16:18:56"
         },
+        {
+            "name": "react/promise",
+            "version": "v2.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/promise.git",
+                "reference": "3b6fca09c7d56321057fa8867c8dbe1abf648627"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/3b6fca09c7d56321057fa8867c8dbe1abf648627",
+                "reference": "3b6fca09c7d56321057fa8867c8dbe1abf648627",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "React\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com"
+                }
+            ],
+            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
+            "time": "2015-07-03 13:48:55"
+        },
         {
             "name": "swiftmailer/swiftmailer",
             "version": "v5.4.1",
diff --git a/config/app.php b/config/app.php
index 8fcbfdd7..119b1bf4 100644
--- a/config/app.php
+++ b/config/app.php
@@ -147,6 +147,7 @@ return [
 
         Intouch\LaravelNewrelic\NewrelicServiceProvider::class,
         Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
+        Cviebrock\LaravelElasticsearch\ServiceProvider::class,
 
     ],
 
@@ -197,6 +198,7 @@ return [
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View'      => Illuminate\Support\Facades\View::class,
 
+        'Elasticsearch' => Cviebrock\LaravelElasticsearch\Facade::class,
         'Newrelic'  => Intouch\LaravelNewrelic\Facades\Newrelic::class,
 
     ],
diff --git a/config/elasticsearch.php b/config/elasticsearch.php
new file mode 100644
index 00000000..faa27549
--- /dev/null
+++ b/config/elasticsearch.php
@@ -0,0 +1,167 @@
+<?php
+
+return [
+
+	/**
+	 * You can specify one of several different connections when building an
+	 * Elasticsearch client.
+	 *
+	 * Here you may specify which of the connections below you wish to use
+	 * as your default connection when building an client. Of course you may
+	 * use create several clients at once, each with different configurations.
+	 */
+
+	'defaultConnection' => 'default',
+
+	/**
+	 * These are the connection parameters used when building a client.
+	 */
+
+	'connections' => [
+
+		'default' => [
+
+			/**
+			 * Hosts
+			 *
+			 * This is an array of hosts that the client will connect to. It can be a
+			 * single host name, or an array if you are running a cluster of Elasticsearch
+			 * instances.
+			 *
+			 * This is the only configuration value that is mandatory.
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_host_configuration
+			 */
+
+			'hosts' => [
+				'localhost:9200'
+			],
+
+			/**
+			 * SSL
+			 *
+			 * If your Elasticsearch instance uses an out-dated or self-signed SSL
+			 * certificate, you will need to pass in the certificate bundle.  This can
+			 * either be the path to the certificate file (for self-signed certs), or a
+			 * package like https://github.com/Kdyby/CurlCaBundle.  See the documentation
+			 * below for all the details.
+			 *
+			 * If you are using SSL instances, and the certificates are up-to-date and
+			 * signed by a public certificate authority, then you can leave this null and
+			 * just use "https" in the host path(s) above and you should be fine.
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_security.html#_ssl_encryption_2
+			 */
+
+			'sslVerification' => null,
+
+			/**
+			 * Logging
+			 *
+			 * Logging is handled by passing in an instance of Monolog\Logger (which
+			 * coincidentally is what Laravel's default logger is).
+			 *
+			 * If logging is enabled, you either need to set the path and log level
+			 * (some defaults are given for you below), or you can use a custom logger by
+			 * setting 'logObject' to an instance of Psr\Log\LoggerInterface.  In fact,
+			 * if you just want to use the default Laravel logger, then set 'logObject'
+			 * to \Log::getMonolog().
+			 *
+			 * Note: 'logObject' takes precedent over 'logPath'/'logLevel', so set
+			 * 'logObject' null if you just want file-based logging to a custom path.
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#enabling_logger
+			 */
+
+			'logging' => false,
+
+			// If you have an existing instance of Monolog you can use it here.
+			//'logObject' => \Log::getMonolog(),
+
+			'logPath' => storage_path('logs/elasticsearch.log'),
+
+			'logLevel' => Monolog\Logger::INFO,
+
+			/**
+			 * Retries
+			 *
+			 * By default, the client will retry n times, where n = number of nodes in
+			 * your cluster. If you would like to disable retries, or change the number,
+			 * you can do so here.
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_set_retries
+			 */
+
+			'retries' => null,
+
+			/**
+			 * The remainder of the configuration options can almost always be left
+			 * as-is unless you have specific reasons to change them.  Refer to the
+			 * appropriate sections in the Elasticsearch documentation for what each option
+			 * does and what values it expects.
+			 */
+
+			/**
+			 * Sniff On Start
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html
+			 */
+
+			'sniffOnStart' => false,
+
+			/**
+			 * HTTP Handler
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_configure_the_http_handler
+			 * @see http://ringphp.readthedocs.org/en/latest/client_handlers.html
+			 */
+
+			'httpHandler' => null,
+
+			/**
+			 * Connection Pool
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_the_connection_pool
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_connection_pool.html
+			 */
+
+			'connectionPool' => null,
+
+			/**
+			 * Connection Selector
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_the_connection_selector
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_selectors.html
+			 */
+
+			'connectionSelector' => null,
+
+			/**
+			 * Serializer
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_the_serializer
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_serializers.html
+			 */
+
+			'serializer' => null,
+
+			/**
+			 * Connection Factory
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_a_custom_connectionfactory
+			 */
+
+			'connectionFactory' => null,
+
+			/**
+			 * Endpoint
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_set_the_endpoint_closure
+			 */
+
+			'endpoint' => null,
+
+		]
+	]
+
+];
diff --git a/database/migrations/2016_01_14_021607_setup_elasticsearch.php b/database/migrations/2016_01_14_021607_setup_elasticsearch.php
new file mode 100644
index 00000000..f021afff
--- /dev/null
+++ b/database/migrations/2016_01_14_021607_setup_elasticsearch.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2016 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Poniverse\Ponyfm\Console\Commands\RebuildSearchIndex;
+
+class SetupElasticsearch extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $elasticsearch = Elasticsearch::connection();
+
+        $elasticsearch->indices()->create([
+            'index' => 'ponyfm',
+            'body'  => [
+                'mappings' => [
+                    'track' => [
+                        '_source' => ['enabled' => true],
+                        'dynamic' => 'strict',
+                        'properties' => [
+                            'title' => ['type' => 'string'],
+                            'artist' => ['type' => 'string'],
+                            'published_at' => ['type' => 'date'],
+                            'genre' => ['type' => 'string'],
+                            'track_type' => ['type' => 'string'],
+
+                            // This field is intended to be used as an array.
+                            // Note that all Elasticsearch fields can technically be used as arrays.
+                            // See: https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html
+                            'show_songs' => ['type' => 'string'],
+                        ]
+                    ],
+
+                    'album' => [
+                        '_source' => ['enabled' => true],
+                        'dynamic' => 'strict',
+                        'properties' => [
+                            'title' => ['type' => 'string'],
+                            'artist' => ['type' => 'string'],
+
+                            // This field is intended to be used as an array.
+                            // Note that all Elasticsearch fields can technically be used as arrays.
+                            // See: https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html
+                            'tracks' => ['type' => 'string']
+                        ]
+                    ]
+                ]
+            ]
+        ]);
+
+        Artisan::call('rebuild:search');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        $elasticsearch = Elasticsearch::connection();
+
+        $elasticsearch->indices()->delete(['index' => 'ponyfm']);
+    }
+}
diff --git a/vagrant/install.sh b/vagrant/install.sh
index 4b913554..654b251e 100755
--- a/vagrant/install.sh
+++ b/vagrant/install.sh
@@ -1,13 +1,28 @@
 #!/usr/bin/env bash
 
+
+if type java &>/dev/null; then
+    echo "Java is installed!"
+else
+    sudo add-apt-repository -y ppa:webupd8team/java
+    echo /usr/bin/debconf shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections
+    echo /usr/bin/debconf shared/accepted-oracle-license-v1-1 seen true  | sudo debconf-set-selections
+fi
+
+
+if type /usr/share/elasticsearch/bin/elasticsearch &>/dev/null; then
+    echo "ElasticSearch is installed!"
+else
+    wget -qO - https://packages.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add -
+    echo "deb http://packages.elastic.co/elasticsearch/2.x/debian stable main" | sudo tee -a /etc/apt/sources.list.d/elasticsearch-2.x.list
+fi
+
+
 echo "Running apt-get update..."
 sudo apt-get -qq update
 
-echo "Installing tagging tools..."
-sudo apt-get -qq install -y AtomicParsley flac vorbis-tools imagemagick
-
-echo "Installing ffmpeg dependencies.."
-sudo apt-get -qq install -y pkg-config yasm libfaac-dev libmp3lame-dev libvorbis-dev libtheora-dev
+echo "Installing tagging tools & other dependencies..."
+sudo apt-get -qq install -y AtomicParsley flac vorbis-tools imagemagick oracle-java8-installer pkg-config yasm libfaac-dev libmp3lame-dev libvorbis-dev libtheora-dev
 
 
 if type ffmpeg &>/dev/null; then

From 990916171cac4147fdf82f1992dc49bf0a5d70ec Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Thu, 14 Jan 2016 22:20:28 -0800
Subject: [PATCH 02/15] #1: Progress commit - some semblance of this is working
 now.

---
 .../Controllers/Api/Web/SearchController.php  |  24 +-
 app/Library/Search.php                        | 160 +++++++++++
 app/Models/Track.php                          |   2 +
 app/Providers/AppServiceProvider.php          |   9 +-
 composer.lock                                 | 254 +++++++++---------
 config/ponyfm.php                             |  13 +-
 .../2016_01_14_021607_setup_elasticsearch.php |   7 +-
 7 files changed, 315 insertions(+), 154 deletions(-)
 create mode 100644 app/Library/Search.php

diff --git a/app/Http/Controllers/Api/Web/SearchController.php b/app/Http/Controllers/Api/Web/SearchController.php
index 5025259c..367e08a4 100644
--- a/app/Http/Controllers/Api/Web/SearchController.php
+++ b/app/Http/Controllers/Api/Web/SearchController.php
@@ -23,34 +23,16 @@ namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 use Elasticsearch;
 use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
 use Input;
+use Poniverse\Ponyfm\Library\Search;
 use Response;
 
 class SearchController extends ApiControllerBase
 {
-    public function getSearch()
+    public function getSearch(Search $search)
     {
         $input = Input::all();
 
-        $elasticsearch = Elasticsearch::connection();
-
-        $results = $elasticsearch->search([
-            'index' => 'ponyfm',
-            'type'  => 'track,album',
-            'body'  => [
-                'query' => [
-                    'multi_match' => [
-                        'query'     => $input['query'],
-                        'fields'    => [
-                            'track.title',
-                            'album.title',
-                            'track.artist',
-                            'album.artist',
-                            'track.genre',
-                        ]
-                    ]
-                ]
-            ]
-        ]);
+        $results = $search->searchAllContent($input['query']);
 
         return Response::json([
             'results' => $results,
diff --git a/app/Library/Search.php b/app/Library/Search.php
new file mode 100644
index 00000000..3580fdf2
--- /dev/null
+++ b/app/Library/Search.php
@@ -0,0 +1,160 @@
+<?php
+
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2016 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Poniverse\Ponyfm\Library;
+
+use DB;
+use Elasticsearch\Client;
+use Illuminate\Database\Eloquent\Collection;
+use Poniverse\Ponyfm\Models\Album;
+use Poniverse\Ponyfm\Models\Playlist;
+use Poniverse\Ponyfm\Models\Track;
+use Poniverse\Ponyfm\Models\User;
+
+class Search {
+    protected $elasticsearch;
+    protected $index;
+
+    public function __construct(Client $connection, string $indexName) {
+        $this->elasticsearch = $connection;
+        $this->index = $indexName;
+    }
+
+    /**
+     * @param string $query
+     * @param int $resultsPerContentType
+     * @return array
+     */
+    public function searchAllContent(string $query, int $resultsPerContentType = 10) {
+        $results = $this->elasticsearch->msearch([
+            'index' => $this->index,
+            'body' => [
+                //===== Tracks=====//
+                ['type' => 'track'],
+                [
+                    'query' => [
+                        'multi_match' => [
+                            'query' => $query,
+                            'fields' => [
+                                'title',
+                                'artist',
+                                'genre',
+                                'track_type',
+                                'show_songs',
+                            ],
+                        ],
+                    ],
+                    'size' => $resultsPerContentType
+                ],
+
+                //===== Albums =====//
+                ['type' => 'album'],
+                [
+                    'query' => [
+                        'multi_match' => [
+                            'query' => $query,
+                            'fields' => [
+                                'title',
+                                'artist',
+                                'tracks',
+                            ],
+                        ],
+                    ],
+                    'size' => $resultsPerContentType
+                ],
+
+                //===== Playlists =====//
+                ['type' => 'playlist'],
+                [
+                    'query' => [
+                        'multi_match' => [
+                            'query' => $query,
+                            'fields' => [
+                                'title',
+                                'user',
+                            ],
+                        ],
+                    ],
+                    'size' => $resultsPerContentType
+                ],
+
+                //===== Users =====//
+                ['type' => 'user'],
+                [
+                    'query' => [
+                        'multi_match' => [
+                            'query' => $query,
+                            'fields' => [
+                                'display_name',
+                            ],
+                        ],
+                    ],
+                    'size' => $resultsPerContentType
+                ],
+            ]
+        ]);
+
+        $tracks = $this->transformToEloquent(Track::class, $results['responses'][0]['hits']['hits']);
+        $albums = $this->transformToEloquent(Album::class, $results['responses'][1]['hits']['hits']);
+        $playlists = $this->transformToEloquent(Playlist::class, $results['responses'][2]['hits']['hits']);
+        $users = $this->transformToEloquent(User::class, $results['responses'][3]['hits']['hits']);
+
+        return [
+            'tracks'    => $tracks,
+            'albums'    => $albums,
+            'playlists' => $playlists,
+            'users'     => $users
+        ];
+    }
+
+    /**
+     * Transforms the given Elasticsearch results into a collection of corresponding
+     * Eloquent models.
+     *
+     * This method assumes that the given class uses soft deletes.
+     *
+     * @param string $modelClass The Eloquent model class to instantiate these results as
+     * @param array $searchHits
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    protected function transformToEloquent(string $modelClass, array $searchHits) {
+        if (empty($searchHits)) {
+            return new Collection();
+        }
+
+        $ids = [];
+        $caseStatement = 'CASE id ';
+
+        $i = 0;
+        foreach ($searchHits as $result) {
+            $ids[$result['_id']] = $result['_score'];
+            $caseStatement .= "WHEN ${result['_id']} THEN $i ";
+            $i++;
+        }
+        $caseStatement .= 'END';
+
+        $modelInstances = $modelClass::withTrashed()
+            ->whereIn('id', array_keys($ids))
+            ->orderBy(DB::raw($caseStatement))
+            ->get();
+
+        return $modelInstances;
+    }
+}
diff --git a/app/Models/Track.php b/app/Models/Track.php
index b977be4a..862f4ce9 100644
--- a/app/Models/Track.php
+++ b/app/Models/Track.php
@@ -831,6 +831,8 @@ class Track extends Model
         return 'track-' . $this->id . '-' . $key;
     }
 
+    //============= Elasticsearch stuff ==================//
+
     public function toElasticsearch() {
         return [
             'title'         => $this->title,
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index df875e1a..58cc94cf 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -20,8 +20,6 @@
 
 namespace Poniverse\Ponyfm\Providers;
 
-use DB;
-use Illuminate\Database\SQLiteConnection;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 use PfmValidator;
@@ -53,5 +51,12 @@ class AppServiceProvider extends ServiceProvider
         $this->app->bind(Poniverse::class, function(Application $app) {
             return new Poniverse($app['config']->get('poniverse.client_id'), $app['config']->get('poniverse.secret'));
         });
+
+        $this->app->bind(Poniverse\Ponyfm\Library\Search::class, function(Application $app) {
+            return new Poniverse\Ponyfm\Library\Search(
+                \Elasticsearch::connection(),
+                $app['config']->get('ponyfm.elasticsearch_index')
+            );
+        });
     }
 }
diff --git a/composer.lock b/composer.lock
index 6066c1cd..f7ef8573 100644
--- a/composer.lock
+++ b/composer.lock
@@ -376,33 +376,33 @@
         },
         {
             "name": "doctrine/cache",
-            "version": "v1.5.4",
+            "version": "v1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136"
+                "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/47cdc76ceb95cc591d9c79a36dc3794975b5d136",
-                "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6",
+                "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.2"
+                "php": "~5.5|~7.0"
             },
             "conflict": {
                 "doctrine/common": ">2.2,<2.4"
             },
             "require-dev": {
-                "phpunit/phpunit": ">=3.7",
+                "phpunit/phpunit": "~4.8|~5.0",
                 "predis/predis": "~1.0",
                 "satooshi/php-coveralls": "~0.6"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.5.x-dev"
+                    "dev-master": "1.6.x-dev"
                 }
             },
             "autoload": {
@@ -442,7 +442,7 @@
                 "cache",
                 "caching"
             ],
-            "time": "2015-12-19 05:03:47"
+            "time": "2015-12-31 16:37:02"
         },
         {
             "name": "doctrine/collections",
@@ -512,16 +512,16 @@
         },
         {
             "name": "doctrine/common",
-            "version": "v2.5.2",
+            "version": "v2.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/common.git",
-                "reference": "311001fd9865a4d0d59efff4eac6d7dcb3f5270c"
+                "reference": "a579557bc689580c19fee4e27487a67fe60defc0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/common/zipball/311001fd9865a4d0d59efff4eac6d7dcb3f5270c",
-                "reference": "311001fd9865a4d0d59efff4eac6d7dcb3f5270c",
+                "url": "https://api.github.com/repos/doctrine/common/zipball/a579557bc689580c19fee4e27487a67fe60defc0",
+                "reference": "a579557bc689580c19fee4e27487a67fe60defc0",
                 "shasum": ""
             },
             "require": {
@@ -530,20 +530,20 @@
                 "doctrine/collections": "1.*",
                 "doctrine/inflector": "1.*",
                 "doctrine/lexer": "1.*",
-                "php": ">=5.3.2"
+                "php": "~5.5|~7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~3.7"
+                "phpunit/phpunit": "~4.8|~5.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5.x-dev"
+                    "dev-master": "2.7.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\": "lib/"
+                "psr-4": {
+                    "Doctrine\\Common\\": "lib/Doctrine/Common"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -581,24 +581,24 @@
                 "persistence",
                 "spl"
             ],
-            "time": "2015-12-04 12:49:42"
+            "time": "2015-12-25 13:18:31"
         },
         {
             "name": "doctrine/dbal",
-            "version": "v2.5.2",
+            "version": "v2.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c"
+                "reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/01dbcbc5cd0a913d751418e635434a18a2f2a75c",
-                "reference": "01dbcbc5cd0a913d751418e635434a18a2f2a75c",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/abbdfd1cff43a7b99d027af3be709bc8fc7d4769",
+                "reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769",
                 "shasum": ""
             },
             "require": {
-                "doctrine/common": ">=2.4,<2.6-dev",
+                "doctrine/common": ">=2.4,<2.7-dev",
                 "php": ">=5.3.2"
             },
             "require-dev": {
@@ -652,7 +652,7 @@
                 "persistence",
                 "queryobject"
             ],
-            "time": "2015-09-16 16:29:33"
+            "time": "2016-01-05 22:11:12"
         },
         {
             "name": "doctrine/inflector",
@@ -777,16 +777,16 @@
         },
         {
             "name": "elasticsearch/elasticsearch",
-            "version": "v2.1.3",
+            "version": "v2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/elastic/elasticsearch-php.git",
-                "reference": "7086a86cab241a77f19cdd653ae3d2e023b41699"
+                "reference": "9ce5bd7606f6c185d434de4f80863f998f74e179"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/7086a86cab241a77f19cdd653ae3d2e023b41699",
-                "reference": "7086a86cab241a77f19cdd653ae3d2e023b41699",
+                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/9ce5bd7606f6c185d434de4f80863f998f74e179",
+                "reference": "9ce5bd7606f6c185d434de4f80863f998f74e179",
                 "shasum": ""
             },
             "require": {
@@ -797,8 +797,8 @@
             "require-dev": {
                 "athletic/athletic": "~0.1",
                 "cpliakas/git-wrapper": "~1.0",
-                "mockery/mockery": "0.9.4",
-                "phpunit/phpunit": "~4.7",
+                "mockery/mockery": "dev-master@dev",
+                "phpunit/phpunit": "3.7.*",
                 "symfony/yaml": "2.4.3 as 2.4.2",
                 "twig/twig": "1.*"
             },
@@ -827,7 +827,7 @@
                 "elasticsearch",
                 "search"
             ],
-            "time": "2015-12-15 18:42:26"
+            "time": "2015-11-05 15:29:21"
         },
         {
             "name": "guzzlehttp/guzzle",
@@ -1333,16 +1333,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.1.27",
+            "version": "v5.1.28",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "b16f80878fd3603022d3c84593397cedd9af0bcf"
+                "reference": "3f0fd27939dfdafb1e50058423cd24e640894ba2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/b16f80878fd3603022d3c84593397cedd9af0bcf",
-                "reference": "b16f80878fd3603022d3c84593397cedd9af0bcf",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/3f0fd27939dfdafb1e50058423cd24e640894ba2",
+                "reference": "3f0fd27939dfdafb1e50058423cd24e640894ba2",
                 "shasum": ""
             },
             "require": {
@@ -1457,7 +1457,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2015-12-17 20:35:38"
+            "time": "2015-12-31 17:41:30"
         },
         {
             "name": "league/flysystem",
@@ -1764,16 +1764,16 @@
         },
         {
             "name": "paragonie/random_compat",
-            "version": "1.1.4",
+            "version": "1.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "d762ee5b099a29044603cd4649851e81aa66cb47"
+                "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/d762ee5b099a29044603cd4649851e81aa66cb47",
-                "reference": "d762ee5b099a29044603cd4649851e81aa66cb47",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/dd8998b7c846f6909f4e7a5f67fabebfc412a4f7",
+                "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7",
                 "shasum": ""
             },
             "require": {
@@ -1808,7 +1808,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2015-12-10 14:48:13"
+            "time": "2016-01-06 13:31:20"
         },
         {
             "name": "pda/pheanstalk",
@@ -2167,16 +2167,16 @@
         },
         {
             "name": "symfony/class-loader",
-            "version": "v2.8.0",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/class-loader.git",
-                "reference": "51f83451bf0ddfc696e47e4642d6cd10fcfce160"
+                "reference": "98e9089a428ed0e39423b67352c57ef5910a3269"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/class-loader/zipball/51f83451bf0ddfc696e47e4642d6cd10fcfce160",
-                "reference": "51f83451bf0ddfc696e47e4642d6cd10fcfce160",
+                "url": "https://api.github.com/repos/symfony/class-loader/zipball/98e9089a428ed0e39423b67352c57ef5910a3269",
+                "reference": "98e9089a428ed0e39423b67352c57ef5910a3269",
                 "shasum": ""
             },
             "require": {
@@ -2215,20 +2215,20 @@
             ],
             "description": "Symfony ClassLoader Component",
             "homepage": "https://symfony.com",
-            "time": "2015-11-26 07:00:59"
+            "time": "2016-01-03 15:33:41"
         },
         {
             "name": "symfony/console",
-            "version": "v2.7.7",
+            "version": "v2.7.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "16bb1cb86df43c90931df65f529e7ebd79636750"
+                "reference": "d3fc138b6ed8f8074591821d3416d8f9c04d6ca6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/16bb1cb86df43c90931df65f529e7ebd79636750",
-                "reference": "16bb1cb86df43c90931df65f529e7ebd79636750",
+                "url": "https://api.github.com/repos/symfony/console/zipball/d3fc138b6ed8f8074591821d3416d8f9c04d6ca6",
+                "reference": "d3fc138b6ed8f8074591821d3416d8f9c04d6ca6",
                 "shasum": ""
             },
             "require": {
@@ -2274,20 +2274,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2015-11-18 09:54:26"
+            "time": "2016-01-14 08:26:43"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v2.7.7",
+            "version": "v2.7.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "abb47717fb88aebd9437da2fc8bb01a50a36679f"
+                "reference": "1a869e59cc3b2802961fc2124139659e12b72fe5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/abb47717fb88aebd9437da2fc8bb01a50a36679f",
-                "reference": "abb47717fb88aebd9437da2fc8bb01a50a36679f",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/1a869e59cc3b2802961fc2124139659e12b72fe5",
+                "reference": "1a869e59cc3b2802961fc2124139659e12b72fe5",
                 "shasum": ""
             },
             "require": {
@@ -2327,20 +2327,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2015-10-30 20:10:21"
+            "time": "2016-01-03 15:32:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v2.7.7",
+            "version": "v2.7.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa"
+                "reference": "5aca4aa9600b943287b4a1799a4d1d78b5388175"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa",
-                "reference": "0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/5aca4aa9600b943287b4a1799a4d1d78b5388175",
+                "reference": "5aca4aa9600b943287b4a1799a4d1d78b5388175",
                 "shasum": ""
             },
             "require": {
@@ -2384,20 +2384,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2015-10-30 20:10:21"
+            "time": "2016-01-13 07:57:33"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v2.7.7",
+            "version": "v2.7.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "b33593cbfe1d81b50d48353f338aca76a08658d8"
+                "reference": "55cc79a177193eb3bd74ac54b353691fbb211d3a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b33593cbfe1d81b50d48353f338aca76a08658d8",
-                "reference": "b33593cbfe1d81b50d48353f338aca76a08658d8",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/55cc79a177193eb3bd74ac54b353691fbb211d3a",
+                "reference": "55cc79a177193eb3bd74ac54b353691fbb211d3a",
                 "shasum": ""
             },
             "require": {
@@ -2439,20 +2439,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2015-11-02 20:20:53"
+            "time": "2016-01-03 15:32:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.8.0",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc"
+                "reference": "ee278f7c851533e58ca307f66305ccb9188aceda"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5eb815363c0388e83247e7e9853e5dbc14999cc",
-                "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ee278f7c851533e58ca307f66305ccb9188aceda",
+                "reference": "ee278f7c851533e58ca307f66305ccb9188aceda",
                 "shasum": ""
             },
             "require": {
@@ -2499,20 +2499,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2015-10-30 20:15:42"
+            "time": "2016-01-13 10:28:07"
         },
         {
             "name": "symfony/finder",
-            "version": "v2.7.7",
+            "version": "v2.7.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "a06a0c0ff7db3736a50d530c908cca547bf13da9"
+                "reference": "d20ac81c81a67ab898b0c0afa435f3e9a7d460cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/a06a0c0ff7db3736a50d530c908cca547bf13da9",
-                "reference": "a06a0c0ff7db3736a50d530c908cca547bf13da9",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/d20ac81c81a67ab898b0c0afa435f3e9a7d460cf",
+                "reference": "d20ac81c81a67ab898b0c0afa435f3e9a7d460cf",
                 "shasum": ""
             },
             "require": {
@@ -2548,20 +2548,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2015-10-30 20:10:21"
+            "time": "2016-01-14 08:26:43"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v2.7.7",
+            "version": "v2.7.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "e83a3d105ddaf5a113e803c904fdec552d1f1c35"
+                "reference": "2f9d240056f026af5f7ba7f7052b0c6709bf288c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e83a3d105ddaf5a113e803c904fdec552d1f1c35",
-                "reference": "e83a3d105ddaf5a113e803c904fdec552d1f1c35",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/2f9d240056f026af5f7ba7f7052b0c6709bf288c",
+                "reference": "2f9d240056f026af5f7ba7f7052b0c6709bf288c",
                 "shasum": ""
             },
             "require": {
@@ -2603,20 +2603,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2015-11-20 17:41:18"
+            "time": "2016-01-13 10:26:43"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v2.7.7",
+            "version": "v2.7.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "5570de31e8fbc03777a8c61eb24f9b626e5e5941"
+                "reference": "aa2f1e544d6cb862452504b5479a5095b7bfc53f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5570de31e8fbc03777a8c61eb24f9b626e5e5941",
-                "reference": "5570de31e8fbc03777a8c61eb24f9b626e5e5941",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/aa2f1e544d6cb862452504b5479a5095b7bfc53f",
+                "reference": "aa2f1e544d6cb862452504b5479a5095b7bfc53f",
                 "shasum": ""
             },
             "require": {
@@ -2685,20 +2685,20 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2015-11-23 11:57:49"
+            "time": "2016-01-14 10:41:45"
         },
         {
             "name": "symfony/polyfill-php56",
-            "version": "v1.0.0",
+            "version": "v1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php56.git",
-                "reference": "a6bd4770a6967517e6610529e14afaa3111094a3"
+                "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/a6bd4770a6967517e6610529e14afaa3111094a3",
-                "reference": "a6bd4770a6967517e6610529e14afaa3111094a3",
+                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e2e77609a9e2328eb370fbb0e0d8b2000ebb488f",
+                "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f",
                 "shasum": ""
             },
             "require": {
@@ -2741,11 +2741,11 @@
                 "portable",
                 "shim"
             ],
-            "time": "2015-11-04 20:28:58"
+            "time": "2015-12-18 15:10:25"
         },
         {
             "name": "symfony/polyfill-util",
-            "version": "v1.0.0",
+            "version": "v1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-util.git",
@@ -2797,16 +2797,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v2.7.7",
+            "version": "v2.7.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "f6290983c8725d0afa29bdc3e5295879de3e58f5"
+                "reference": "0570b9ca51135ee7da0f19239eaf7b07ffb87034"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/f6290983c8725d0afa29bdc3e5295879de3e58f5",
-                "reference": "f6290983c8725d0afa29bdc3e5295879de3e58f5",
+                "url": "https://api.github.com/repos/symfony/process/zipball/0570b9ca51135ee7da0f19239eaf7b07ffb87034",
+                "reference": "0570b9ca51135ee7da0f19239eaf7b07ffb87034",
                 "shasum": ""
             },
             "require": {
@@ -2842,20 +2842,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2015-11-19 16:11:24"
+            "time": "2016-01-06 09:57:37"
         },
         {
             "name": "symfony/routing",
-            "version": "v2.7.7",
+            "version": "v2.7.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "7450f6196711b124fb8b04a12286d01a0401ddfe"
+                "reference": "6fec77993acfe19aecf60544b9c7d32f3d5b2506"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/7450f6196711b124fb8b04a12286d01a0401ddfe",
-                "reference": "7450f6196711b124fb8b04a12286d01a0401ddfe",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/6fec77993acfe19aecf60544b9c7d32f3d5b2506",
+                "reference": "6fec77993acfe19aecf60544b9c7d32f3d5b2506",
                 "shasum": ""
             },
             "require": {
@@ -2915,20 +2915,20 @@
                 "uri",
                 "url"
             ],
-            "time": "2015-11-18 13:41:01"
+            "time": "2016-01-03 15:32:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v2.7.7",
+            "version": "v2.7.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "e4ecb9c3ba1304eaf24de15c2d7a428101c1982f"
+                "reference": "8cbab8445ad4269427077ba02fff8718cb397e22"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/e4ecb9c3ba1304eaf24de15c2d7a428101c1982f",
-                "reference": "e4ecb9c3ba1304eaf24de15c2d7a428101c1982f",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/8cbab8445ad4269427077ba02fff8718cb397e22",
+                "reference": "8cbab8445ad4269427077ba02fff8718cb397e22",
                 "shasum": ""
             },
             "require": {
@@ -2978,20 +2978,20 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2015-11-18 13:41:01"
+            "time": "2016-01-03 15:32:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v2.7.7",
+            "version": "v2.7.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "72bcb27411780eaee9469729aace73c0d46fb2b8"
+                "reference": "ad39199e91f2f845a0181b14d459fda13a622138"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/72bcb27411780eaee9469729aace73c0d46fb2b8",
-                "reference": "72bcb27411780eaee9469729aace73c0d46fb2b8",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ad39199e91f2f845a0181b14d459fda13a622138",
+                "reference": "ad39199e91f2f845a0181b14d459fda13a622138",
                 "shasum": ""
             },
             "require": {
@@ -3037,20 +3037,20 @@
                 "debug",
                 "dump"
             ],
-            "time": "2015-11-18 13:41:01"
+            "time": "2016-01-07 11:12:32"
         },
         {
             "name": "venturecraft/revisionable",
-            "version": "1.24.0",
+            "version": "1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/VentureCraft/revisionable.git",
-                "reference": "99c27d94f80ae9240cec89c4276f61e748e989a5"
+                "reference": "7a3d5304de6c10d43cfb0d9ebe0bbdbb6e5b82ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/VentureCraft/revisionable/zipball/99c27d94f80ae9240cec89c4276f61e748e989a5",
-                "reference": "99c27d94f80ae9240cec89c4276f61e748e989a5",
+                "url": "https://api.github.com/repos/VentureCraft/revisionable/zipball/7a3d5304de6c10d43cfb0d9ebe0bbdbb6e5b82ee",
+                "reference": "7a3d5304de6c10d43cfb0d9ebe0bbdbb6e5b82ee",
                 "shasum": ""
             },
             "require": {
@@ -3085,7 +3085,7 @@
                 "model",
                 "revision"
             ],
-            "time": "2015-12-09 21:48:10"
+            "time": "2016-01-13 12:14:05"
         },
         {
             "name": "vlucas/phpdotenv",
@@ -3387,16 +3387,16 @@
         },
         {
             "name": "phpspec/phpspec",
-            "version": "2.4.0",
+            "version": "2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/phpspec.git",
-                "reference": "1d3938e6d9ffb1bd4805ea8ddac62ea48767f358"
+                "reference": "5528ce1e93a1efa090c9404aba3395c329b4e6ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/phpspec/zipball/1d3938e6d9ffb1bd4805ea8ddac62ea48767f358",
-                "reference": "1d3938e6d9ffb1bd4805ea8ddac62ea48767f358",
+                "url": "https://api.github.com/repos/phpspec/phpspec/zipball/5528ce1e93a1efa090c9404aba3395c329b4e6ed",
+                "reference": "5528ce1e93a1efa090c9404aba3395c329b4e6ed",
                 "shasum": ""
             },
             "require": {
@@ -3461,7 +3461,7 @@
                 "testing",
                 "tests"
             ],
-            "time": "2015-11-29 02:03:49"
+            "time": "2016-01-01 10:17:54"
         },
         {
             "name": "phpspec/prophecy",
@@ -4264,16 +4264,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.0.0",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002"
+                "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002",
-                "reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/3df409958a646dad2bc5046c3fb671ee24a1a691",
+                "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691",
                 "shasum": ""
             },
             "require": {
@@ -4309,7 +4309,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2015-11-30 12:36:17"
+            "time": "2015-12-26 13:39:53"
         }
     ],
     "aliases": [],
diff --git a/config/ponyfm.php b/config/ponyfm.php
index 1470dcd4..af45bf27 100644
--- a/config/ponyfm.php
+++ b/config/ponyfm.php
@@ -56,7 +56,7 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Cache Duration
+    | Cache duration
     |--------------------------------------------------------------------------
     |
     | Duration in minutes for track files to be stored in cache.
@@ -65,4 +65,15 @@ return [
 
     'track_file_cache_duration' => 1440,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Elasticsearch index name
+    |--------------------------------------------------------------------------
+    |
+    | The name of the Elasticsearch index to store Pony.fm's search data in.
+    |
+    */
+
+    'elasticsearch_index' => 'ponyfm',
+
 ];
diff --git a/database/migrations/2016_01_14_021607_setup_elasticsearch.php b/database/migrations/2016_01_14_021607_setup_elasticsearch.php
index f021afff..364da970 100644
--- a/database/migrations/2016_01_14_021607_setup_elasticsearch.php
+++ b/database/migrations/2016_01_14_021607_setup_elasticsearch.php
@@ -21,6 +21,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 use Poniverse\Ponyfm\Console\Commands\RebuildSearchIndex;
+use Poniverse\Ponyfm\Models\Track;
 
 class SetupElasticsearch extends Migration
 {
@@ -44,13 +45,13 @@ class SetupElasticsearch extends Migration
                             'title' => ['type' => 'string'],
                             'artist' => ['type' => 'string'],
                             'published_at' => ['type' => 'date'],
-                            'genre' => ['type' => 'string'],
-                            'track_type' => ['type' => 'string'],
+                            'genre' => ['type' => 'string', 'index' => 'not_analyzed'],
+                            'track_type' => ['type' => 'string', 'index' => 'not_analyzed'],
 
                             // This field is intended to be used as an array.
                             // Note that all Elasticsearch fields can technically be used as arrays.
                             // See: https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html
-                            'show_songs' => ['type' => 'string'],
+                            'show_songs' => ['type' => 'string', 'index' => 'not_analyzed'],
                         ]
                     ],
 

From a5bb117ae7274de41f28b877f6c4a166b4218699 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Fri, 15 Jan 2016 14:36:53 -0800
Subject: [PATCH 03/15] #1: Don't analyze the artist field in Elasticsearch.

---
 .../migrations/2016_01_14_021607_setup_elasticsearch.php    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/database/migrations/2016_01_14_021607_setup_elasticsearch.php b/database/migrations/2016_01_14_021607_setup_elasticsearch.php
index 364da970..c6869aec 100644
--- a/database/migrations/2016_01_14_021607_setup_elasticsearch.php
+++ b/database/migrations/2016_01_14_021607_setup_elasticsearch.php
@@ -18,10 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 use Poniverse\Ponyfm\Console\Commands\RebuildSearchIndex;
-use Poniverse\Ponyfm\Models\Track;
 
 class SetupElasticsearch extends Migration
 {
@@ -43,7 +41,7 @@ class SetupElasticsearch extends Migration
                         'dynamic' => 'strict',
                         'properties' => [
                             'title' => ['type' => 'string'],
-                            'artist' => ['type' => 'string'],
+                            'artist' => ['type' => 'string', 'index' => 'not_analyzed'],
                             'published_at' => ['type' => 'date'],
                             'genre' => ['type' => 'string', 'index' => 'not_analyzed'],
                             'track_type' => ['type' => 'string', 'index' => 'not_analyzed'],
@@ -60,7 +58,7 @@ class SetupElasticsearch extends Migration
                         'dynamic' => 'strict',
                         'properties' => [
                             'title' => ['type' => 'string'],
-                            'artist' => ['type' => 'string'],
+                            'artist' => ['type' => 'string', 'index' => 'not_analyzed'],
 
                             // This field is intended to be used as an array.
                             // Note that all Elasticsearch fields can technically be used as arrays.

From dbbaa03542480ab3e9ccdfba43effa450ecac0a6 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Fri, 15 Jan 2016 20:10:20 -0800
Subject: [PATCH 04/15] #1: Implemented Elasticsearch mappings for playlists
 and users.

---
 app/Commands/AddTrackToPlaylistCommand.php    |  1 +
 app/Console/Commands/RebuildSearchIndex.php   | 23 ++++++++------
 app/Library/Search.php                        | 26 +++++++++++-----
 app/Models/Album.php                          |  4 +--
 app/Models/Playlist.php                       | 10 ++++--
 app/Models/Track.php                          |  4 +--
 app/Models/User.php                           | 10 ++++--
 ...ch.php => IndexedInElasticsearchTrait.php} |  4 +--
 .../2016_01_14_021607_setup_elasticsearch.php | 31 ++++++++++++++++++-
 9 files changed, 82 insertions(+), 31 deletions(-)
 rename app/Traits/{IndexedInElasticsearch.php => IndexedInElasticsearchTrait.php} (96%)

diff --git a/app/Commands/AddTrackToPlaylistCommand.php b/app/Commands/AddTrackToPlaylistCommand.php
index 314e6ce2..499fcf74 100644
--- a/app/Commands/AddTrackToPlaylistCommand.php
+++ b/app/Commands/AddTrackToPlaylistCommand.php
@@ -54,6 +54,7 @@ class AddTrackToPlaylistCommand extends CommandBase
     {
         $songIndex = $this->_playlist->tracks()->count() + 1;
         $this->_playlist->tracks()->attach($this->_track, ['position' => $songIndex]);
+        $this->_playlist->touch();
 
         Playlist::whereId($this->_playlist->id)->update([
             'track_count' => DB::raw('(SELECT COUNT(id) FROM playlist_track WHERE playlist_id = ' . $this->_playlist->id . ')')
diff --git a/app/Console/Commands/RebuildSearchIndex.php b/app/Console/Commands/RebuildSearchIndex.php
index ec583e4c..72e66066 100644
--- a/app/Console/Commands/RebuildSearchIndex.php
+++ b/app/Console/Commands/RebuildSearchIndex.php
@@ -79,15 +79,18 @@ class RebuildSearchIndex extends Command
             }
         });
 
-//        Playlist::withTrashed()->chunk(200, function(Collection $playlists) {
-//            foreach($playlists as $playlist) {
-//                $this->info("Processing playlist #{$playlist->id}...");
-//                $playlist->ensureElasticsearchEntryIsUpToDate();
-//            }
-//        });
-//
-//        User::withTrashed()->chunk(200, function(User $user) {
-//            $user->ensureElasticsearchEntryIsUpToDate();
-//        });
+        Playlist::withTrashed()->chunk(200, function(Collection $playlists) {
+            foreach($playlists as $playlist) {
+                $this->info("Processing playlist #{$playlist->id}...");
+                $playlist->ensureElasticsearchEntryIsUpToDate();
+            }
+        });
+
+        User::chunk(200, function(Collection $users) {
+            foreach($users as $user) {
+                $this->info("Processing user #{$user->id}...");
+                $user->ensureElasticsearchEntryIsUpToDate();
+            }
+        });
     }
 }
diff --git a/app/Library/Search.php b/app/Library/Search.php
index 3580fdf2..d7259807 100644
--- a/app/Library/Search.php
+++ b/app/Library/Search.php
@@ -22,6 +22,7 @@ namespace Poniverse\Ponyfm\Library;
 
 use DB;
 use Elasticsearch\Client;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Poniverse\Ponyfm\Models\Album;
 use Poniverse\Ponyfm\Models\Playlist;
@@ -53,11 +54,11 @@ class Search {
                         'multi_match' => [
                             'query' => $query,
                             'fields' => [
-                                'title',
-                                'artist',
+                                'title^3',
+                                'artist^2',
                                 'genre',
                                 'track_type',
-                                'show_songs',
+                                'show_songs^2',
                             ],
                         ],
                     ],
@@ -71,7 +72,7 @@ class Search {
                         'multi_match' => [
                             'query' => $query,
                             'fields' => [
-                                'title',
+                                'title^2',
                                 'artist',
                                 'tracks',
                             ],
@@ -87,8 +88,9 @@ class Search {
                         'multi_match' => [
                             'query' => $query,
                             'fields' => [
-                                'title',
-                                'user',
+                                'title^3',
+                                'curator',
+                                'tracks^2',
                             ],
                         ],
                     ],
@@ -102,7 +104,8 @@ class Search {
                         'multi_match' => [
                             'query' => $query,
                             'fields' => [
-                                'display_name',
+                                'display_name^2',
+                                'tracks',
                             ],
                         ],
                     ],
@@ -150,7 +153,14 @@ class Search {
         }
         $caseStatement .= 'END';
 
-        $modelInstances = $modelClass::withTrashed()
+        /** @var Builder $modelInstances */
+        $modelInstances = $modelClass::query();
+
+        if (method_exists($modelClass, 'withTrashed')) {
+            $modelInstances = $modelInstances->withTrashed();
+        }
+
+        $modelInstances = $modelInstances
             ->whereIn('id', array_keys($ids))
             ->orderBy(DB::raw($caseStatement))
             ->get();
diff --git a/app/Models/Album.php b/app/Models/Album.php
index 023ce002..f32c69a8 100644
--- a/app/Models/Album.php
+++ b/app/Models/Album.php
@@ -28,7 +28,7 @@ use Illuminate\Foundation\Bus\DispatchesJobs;
 use Auth;
 use Cache;
 use Poniverse\Ponyfm\Exceptions\TrackFileNotFoundException;
-use Poniverse\Ponyfm\Traits\IndexedInElasticsearch;
+use Poniverse\Ponyfm\Traits\IndexedInElasticsearchTrait;
 use Poniverse\Ponyfm\Traits\TrackCollection;
 use Poniverse\Ponyfm\Traits\SlugTrait;
 use Venturecraft\Revisionable\RevisionableTrait;
@@ -62,7 +62,7 @@ use Venturecraft\Revisionable\RevisionableTrait;
  */
 class Album extends Model
 {
-    use SoftDeletes, SlugTrait, DispatchesJobs, TrackCollection, RevisionableTrait, IndexedInElasticsearch;
+    use SoftDeletes, SlugTrait, DispatchesJobs, TrackCollection, RevisionableTrait, IndexedInElasticsearchTrait;
 
     protected $elasticsearchType = 'album';
 
diff --git a/app/Models/Playlist.php b/app/Models/Playlist.php
index d84080d8..327dd67e 100644
--- a/app/Models/Playlist.php
+++ b/app/Models/Playlist.php
@@ -27,7 +27,7 @@ use Illuminate\Foundation\Bus\DispatchesJobs;
 use Auth;
 use Cache;
 use Poniverse\Ponyfm\Exceptions\TrackFileNotFoundException;
-use Poniverse\Ponyfm\Traits\IndexedInElasticsearch;
+use Poniverse\Ponyfm\Traits\IndexedInElasticsearchTrait;
 use Poniverse\Ponyfm\Traits\TrackCollection;
 use Poniverse\Ponyfm\Traits\SlugTrait;
 use Venturecraft\Revisionable\RevisionableTrait;
@@ -61,7 +61,7 @@ use Venturecraft\Revisionable\RevisionableTrait;
  */
 class Playlist extends Model
 {
-    use SoftDeletes, SlugTrait, DispatchesJobs, TrackCollection, RevisionableTrait, IndexedInElasticsearch;
+    use SoftDeletes, SlugTrait, DispatchesJobs, TrackCollection, RevisionableTrait, IndexedInElasticsearchTrait;
 
     protected $elasticsearchType = 'playlist';
 
@@ -295,6 +295,10 @@ class Playlist extends Model
      * @return array
      */
     public function toElasticsearch() {
-        return $this->toArray();
+        return [
+            'title'     => $this->title,
+            'curator'   => $this->user->display_name,
+            'tracks'    => $this->tracks->pluck('title'),
+        ];
     }
 }
diff --git a/app/Models/Track.php b/app/Models/Track.php
index 862f4ce9..6dbd1af2 100644
--- a/app/Models/Track.php
+++ b/app/Models/Track.php
@@ -26,7 +26,7 @@ use Config;
 use DB;
 use Elasticsearch;
 use Poniverse\Ponyfm\Exceptions\TrackFileNotFoundException;
-use Poniverse\Ponyfm\Traits\IndexedInElasticsearch;
+use Poniverse\Ponyfm\Traits\IndexedInElasticsearchTrait;
 use Poniverse\Ponyfm\Traits\SlugTrait;
 use Exception;
 use External;
@@ -97,7 +97,7 @@ use Venturecraft\Revisionable\RevisionableTrait;
  */
 class Track extends Model
 {
-    use SoftDeletes, IndexedInElasticsearch;
+    use SoftDeletes, IndexedInElasticsearchTrait;
 
     protected $elasticsearchType = 'track';
 
diff --git a/app/Models/User.php b/app/Models/User.php
index 97b86b05..d2f77bfd 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -29,7 +29,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Auth\Access\Authorizable;
 use Auth;
 use Illuminate\Support\Str;
-use Poniverse\Ponyfm\Traits\IndexedInElasticsearch;
+use Poniverse\Ponyfm\Traits\IndexedInElasticsearchTrait;
 use Venturecraft\Revisionable\RevisionableTrait;
 
 /**
@@ -65,7 +65,7 @@ use Venturecraft\Revisionable\RevisionableTrait;
  */
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract, \Illuminate\Contracts\Auth\Access\Authorizable
 {
-    use Authenticatable, CanResetPassword, Authorizable, RevisionableTrait, IndexedInElasticsearch;
+    use Authenticatable, CanResetPassword, Authorizable, RevisionableTrait, IndexedInElasticsearchTrait;
 
     protected $elasticsearchType = 'user';
 
@@ -258,6 +258,10 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      * @return array
      */
     public function toElasticsearch() {
-        return $this->toArray();
+        return [
+            'username'      => $this->username,
+            'display_name'  => $this->display_name,
+            'tracks'        => $this->tracks->pluck('title'),
+        ];
     }
 }
diff --git a/app/Traits/IndexedInElasticsearch.php b/app/Traits/IndexedInElasticsearchTrait.php
similarity index 96%
rename from app/Traits/IndexedInElasticsearch.php
rename to app/Traits/IndexedInElasticsearchTrait.php
index 7e94b2d2..de0c0ac6 100644
--- a/app/Traits/IndexedInElasticsearch.php
+++ b/app/Traits/IndexedInElasticsearchTrait.php
@@ -30,7 +30,7 @@ use Elasticsearch;
  *
  * @package Poniverse\Ponyfm\Traits
  */
-trait IndexedInElasticsearch
+trait IndexedInElasticsearchTrait
 {
     /**
      * Returns this model in Elasticsearch-friendly form. The array returned by
@@ -83,7 +83,7 @@ trait IndexedInElasticsearch
     }
 
     public function ensureElasticsearchEntryIsUpToDate() {
-        if ($this->trashed()) {
+        if (method_exists($this, 'trashed') && $this->trashed()) {
             $this->deleteElasticsearchEntry();
         } else {
             $this->createOrUpdateElasticsearchEntry();
diff --git a/database/migrations/2016_01_14_021607_setup_elasticsearch.php b/database/migrations/2016_01_14_021607_setup_elasticsearch.php
index c6869aec..2c697187 100644
--- a/database/migrations/2016_01_14_021607_setup_elasticsearch.php
+++ b/database/migrations/2016_01_14_021607_setup_elasticsearch.php
@@ -42,6 +42,7 @@ class SetupElasticsearch extends Migration
                         'properties' => [
                             'title' => ['type' => 'string'],
                             'artist' => ['type' => 'string', 'index' => 'not_analyzed'],
+
                             'published_at' => ['type' => 'date'],
                             'genre' => ['type' => 'string', 'index' => 'not_analyzed'],
                             'track_type' => ['type' => 'string', 'index' => 'not_analyzed'],
@@ -65,7 +66,35 @@ class SetupElasticsearch extends Migration
                             // See: https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html
                             'tracks' => ['type' => 'string']
                         ]
-                    ]
+                    ],
+
+                    'playlist' => [
+                        '_source' => ['enabled' => true],
+                        'dynamic' => 'strict',
+                        'properties' => [
+                            'title'     => ['type' => 'string'],
+                            'curator'   => ['type' => 'string', 'index' => 'not_analyzed'],
+
+                            // This field is intended to be used as an array.
+                            // Note that all Elasticsearch fields can technically be used as arrays.
+                            // See: https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html
+                            'tracks' => ['type' => 'string']
+                        ]
+                    ],
+
+                    'user' => [
+                        '_source' => ['enabled' => true],
+                        'dynamic' => 'strict',
+                        'properties' => [
+                            'username'      => ['type' => 'string', 'index' => 'not_analyzed'],
+                            'display_name'  => ['type' => 'string', 'index' => 'not_analyzed'],
+
+                            // This field is intended to be used as an array.
+                            // Note that all Elasticsearch fields can technically be used as arrays.
+                            // See: https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html
+                            'tracks' => ['type' => 'string']
+                        ]
+                    ],
                 ]
             ]
         ]);

From 6b5d3f67a3ee2aaecfa16049c2358e615df63ca3 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Sat, 16 Jan 2016 01:10:07 -0800
Subject: [PATCH 05/15] #1: Beginning of the search front-end.

---
 app/Library/Search.php                        | 30 +++++++++-
 public/templates/directives/search.html       | 19 ++++++
 .../scripts/app/directives/search.coffee      | 59 +++++++++++++++++++
 .../assets/scripts/app/services/search.coffee | 32 ++++++++++
 resources/assets/styles/app.less              |  1 +
 resources/assets/styles/search.less           | 58 ++++++++++++++++++
 resources/views/shared/_app_layout.blade.php  |  1 +
 7 files changed, 197 insertions(+), 3 deletions(-)
 create mode 100644 public/templates/directives/search.html
 create mode 100644 resources/assets/scripts/app/directives/search.coffee
 create mode 100644 resources/assets/scripts/app/services/search.coffee
 create mode 100644 resources/assets/styles/search.less

diff --git a/app/Library/Search.php b/app/Library/Search.php
index d7259807..f28e5f9a 100644
--- a/app/Library/Search.php
+++ b/app/Library/Search.php
@@ -114,9 +114,9 @@ class Search {
             ]
         ]);
 
-        $tracks = $this->transformToEloquent(Track::class, $results['responses'][0]['hits']['hits']);
-        $albums = $this->transformToEloquent(Album::class, $results['responses'][1]['hits']['hits']);
-        $playlists = $this->transformToEloquent(Playlist::class, $results['responses'][2]['hits']['hits']);
+        $tracks = $this->transformTracks($results['responses'][0]['hits']['hits']);
+        $albums = $this->transformAlbums($results['responses'][1]['hits']['hits']);
+        $playlists = $this->transformPlaylists($results['responses'][2]['hits']['hits']);
         $users = $this->transformToEloquent(User::class, $results['responses'][3]['hits']['hits']);
 
         return [
@@ -127,6 +127,30 @@ class Search {
         ];
     }
 
+    protected function transformTracks(array $searchHits) {
+        $tracks = $this->transformToEloquent(Track::class, $searchHits);
+        $tracks = $tracks->map(function (Track $track) {
+            return Track::mapPublicTrackSummary($track);
+        });
+        return $tracks;
+    }
+
+    protected function transformAlbums(array $searchHits) {
+        $albums = $this->transformToEloquent(Album::class, $searchHits);
+        $albums = $albums->map(function (Album $track) {
+            return Album::mapPublicAlbumSummary($track);
+        });
+        return $albums;
+    }
+
+    protected function transformPlaylists(array $searchHits) {
+        $playlists = $this->transformToEloquent(Playlist::class, $searchHits);
+        $playlists = $playlists->map(function (Playlist $track) {
+            return Playlist::mapPublicPlaylistSummary($track);
+        });
+        return $playlists;
+    }
+
     /**
      * Transforms the given Elasticsearch results into a collection of corresponding
      * Eloquent models.
diff --git a/public/templates/directives/search.html b/public/templates/directives/search.html
new file mode 100644
index 00000000..f86ce766
--- /dev/null
+++ b/public/templates/directives/search.html
@@ -0,0 +1,19 @@
+<div class="search" ng-blur="searchInProgress = false">
+    <input class="search-input" type="text" placeholder="Search&hellip;" ng-model="searchQuery" ng-keyup="quickSearch()" pfm-popup="search-results" />
+
+    <div class="search-results pfm-popup" id="search-results" ng-show="searchInProgress">
+        <h3 class="-section-header">Matching tracks</h3>
+        <pfm-tracks-list tracks="tracks"></pfm-tracks-list>
+
+        <h3 class="-section-header">Matching albums</h3>
+        <pfm-albums-list albums="albums"></pfm-albums-list>
+
+        <h3 class="-section-header">Matching playlists</h3>
+        <pfm-playlists-list playlists="playlists"></pfm-playlists-list>
+
+        <h3 class="-section-header">Matching users</h3>
+        <ol>
+            <li bindonce ng-repeat="user in users track by user.id" bo-text="user.display_name"></li>
+        </ol>
+    </div>
+</div>
diff --git a/resources/assets/scripts/app/directives/search.coffee b/resources/assets/scripts/app/directives/search.coffee
new file mode 100644
index 00000000..62ca04df
--- /dev/null
+++ b/resources/assets/scripts/app/directives/search.coffee
@@ -0,0 +1,59 @@
+# Pony.fm - A community for pony fan music.
+# Copyright (C) 2016 Peter Deltchev
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+angular.module('ponyfm').directive 'pfmSearch', () ->
+    restrict: 'E'
+    templateUrl: '/templates/directives/search.html'
+    scope:
+        resource: '=resource',
+        type: '@type'
+
+    controller: [
+        '$scope', 'search'
+        ($scope, search) ->
+            $scope.searchQuery = null
+            $scope.searchInProgress = false
+
+            $scope.tracks = []
+            $scope.albums = []
+            $scope.playlists = []
+            $scope.users = []
+
+            clearResults = ()->
+                $scope.tracks = []
+                $scope.albums = []
+                $scope.playlists = []
+                $scope.users = []
+
+            $scope.quickSearch = ()->
+                clearResults()
+                $scope.searchInProgress = true
+
+                search.searchAllContent($scope.searchQuery)
+                    .done (results)->
+                        for track in results.tracks
+                            $scope.tracks.push(track)
+
+                        for album in results.albums
+                            $scope.albums.push(album)
+
+                        for playlist in results.playlists
+                            $scope.playlists.push(playlist)
+
+                        for user in results.users
+                            $scope.users.push(user)
+
+    ]
diff --git a/resources/assets/scripts/app/services/search.coffee b/resources/assets/scripts/app/services/search.coffee
new file mode 100644
index 00000000..acc3fd37
--- /dev/null
+++ b/resources/assets/scripts/app/services/search.coffee
@@ -0,0 +1,32 @@
+# Pony.fm - A community for pony fan music.
+# Copyright (C) 2016 Peter Deltchev
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+angular.module('ponyfm').factory('search', [
+    '$http'
+    ($http) ->
+
+        self =
+            searchAllContent: (query) ->
+                searchDef = new $.Deferred()
+
+                $http.get('/api/web/search?query=' + encodeURIComponent(query))
+                    .success (results)->
+                        searchDef.resolve(results.results)
+
+                searchDef.promise()
+
+        self
+])
diff --git a/resources/assets/styles/app.less b/resources/assets/styles/app.less
index 73a7deae..33c7095c 100644
--- a/resources/assets/styles/app.less
+++ b/resources/assets/styles/app.less
@@ -32,3 +32,4 @@
 @import 'content';
 @import 'dashboard';
 @import 'uploader';
+@import 'search';
diff --git a/resources/assets/styles/search.less b/resources/assets/styles/search.less
new file mode 100644
index 00000000..612873ac
--- /dev/null
+++ b/resources/assets/styles/search.less
@@ -0,0 +1,58 @@
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2016 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+@import 'base/bootstrap/bootstrap';
+@import 'mixins';
+@import 'variables';
+
+
+.search-input {
+
+}
+
+.search-results {
+  position: absolute;
+  width: 500px;
+  padding: 10px;
+
+  background: #fff;
+
+  ol li {
+    list-style: disc;
+  }
+
+  li a {
+    padding: 0;
+    padding-right: 0;
+    overflow: hidden;
+    color: @pfm-light-grey;
+  }
+
+  .-section-header {
+    background: transparent;
+    color: @pfm-purple;
+
+    padding-left: 0;
+  }
+
+  .albums-listing, .playlists-listing {
+    li {
+      width: 100%;
+    }
+  }
+}
diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index 9970e97a..0ad04930 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -66,6 +66,7 @@
 
     <div class="site-body">
         <ul class="sidebar" ng-controller="sidebar">
+            <li><pfm-search></pfm-search></li>
             <li ng-class="{selected: stateIncludes('content.tracks') || stateIncludes('content.track')}"><a href="/tracks">Tracks</a></li>
             <li ng-class="{selected: stateIncludes('content.albums') || stateIncludes('content.album')}"><a href="/albums">Albums</a></li>
             <li ng-class="{selected: stateIncludes('content.playlists') || stateIncludes('content.playlist')}"><a href="/playlists">Playlists</a></li>

From 8960d1186992fd450ce5e4873e9dfdec50780cb5 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Sat, 16 Jan 2016 19:22:04 -0800
Subject: [PATCH 06/15] #1: IT'S ALIVE!

---
 public/templates/directives/search.html       |  4 +-
 .../scripts/app/directives/popup.coffee       |  5 ++-
 .../scripts/app/directives/search.coffee      | 40 ++++++++++---------
 .../assets/scripts/app/services/search.coffee |  3 ++
 4 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/public/templates/directives/search.html b/public/templates/directives/search.html
index f86ce766..c6ea160d 100644
--- a/public/templates/directives/search.html
+++ b/public/templates/directives/search.html
@@ -1,7 +1,7 @@
 <div class="search" ng-blur="searchInProgress = false">
-    <input class="search-input" type="text" placeholder="Search&hellip;" ng-model="searchQuery" ng-keyup="quickSearch()" pfm-popup="search-results" />
+    <input class="search-input" type="text" placeholder="Search&hellip;" ng-model="searchQuery" pfm-popup="search-results" />
 
-    <div class="search-results pfm-popup" id="search-results" ng-show="searchInProgress">
+    <div class="search-results pfm-popup" id="search-results">
         <h3 class="-section-header">Matching tracks</h3>
         <pfm-tracks-list tracks="tracks"></pfm-tracks-list>
 
diff --git a/resources/assets/scripts/app/directives/popup.coffee b/resources/assets/scripts/app/directives/popup.coffee
index f910517a..133c77ea 100644
--- a/resources/assets/scripts/app/directives/popup.coffee
+++ b/resources/assets/scripts/app/directives/popup.coffee
@@ -29,10 +29,11 @@ angular.module('ponyfm').directive 'pfmPopup', () ->
         open = false
 
 
-        documentClickHandler = () ->
+        documentClickHandler = (event) ->
             return if !open
             $popup.removeClass 'open'
             open = false
+            return true
 
         calculatePosition = ->
             $popup.parents().each () ->
@@ -79,7 +80,7 @@ angular.module('ponyfm').directive 'pfmPopup', () ->
             e.preventDefault()
             e.stopPropagation()
 
-            if open
+            if open and not $element.is(':focus')
                 open = false
                 $popup.removeClass 'open'
                 return
diff --git a/resources/assets/scripts/app/directives/search.coffee b/resources/assets/scripts/app/directives/search.coffee
index 62ca04df..9425ddf9 100644
--- a/resources/assets/scripts/app/directives/search.coffee
+++ b/resources/assets/scripts/app/directives/search.coffee
@@ -24,7 +24,7 @@ angular.module('ponyfm').directive 'pfmSearch', () ->
     controller: [
         '$scope', 'search'
         ($scope, search) ->
-            $scope.searchQuery = null
+            $scope.searchQuery = ''
             $scope.searchInProgress = false
 
             $scope.tracks = []
@@ -33,27 +33,31 @@ angular.module('ponyfm').directive 'pfmSearch', () ->
             $scope.users = []
 
             clearResults = ()->
-                $scope.tracks = []
-                $scope.albums = []
-                $scope.playlists = []
-                $scope.users = []
+                $scope.tracks.length = 0
+                $scope.albums.length = 0
+                $scope.playlists.length = 0
+                $scope.users.length = 0
 
-            $scope.quickSearch = ()->
-                clearResults()
-                $scope.searchInProgress = true
 
-                search.searchAllContent($scope.searchQuery)
-                    .done (results)->
-                        for track in results.tracks
-                            $scope.tracks.push(track)
+            $scope.$watch 'searchQuery', _.debounce((searchQuery)->
+                $scope.$apply ()->
+                    clearResults()
+                    return if searchQuery.length <3
 
-                        for album in results.albums
-                            $scope.albums.push(album)
+                    $scope.searchInProgress = true
 
-                        for playlist in results.playlists
-                            $scope.playlists.push(playlist)
+                    search.searchAllContent(searchQuery)
+                        .then (results)->
+                            for track in results.tracks
+                                $scope.tracks.push(track)
 
-                        for user in results.users
-                            $scope.users.push(user)
+                            for album in results.albums
+                                $scope.albums.push(album)
 
+                            for playlist in results.playlists
+                                $scope.playlists.push(playlist)
+
+                            for user in results.users
+                                $scope.users.push(user)
+            , 500)
     ]
diff --git a/resources/assets/scripts/app/services/search.coffee b/resources/assets/scripts/app/services/search.coffee
index acc3fd37..8529c763 100644
--- a/resources/assets/scripts/app/services/search.coffee
+++ b/resources/assets/scripts/app/services/search.coffee
@@ -26,6 +26,9 @@ angular.module('ponyfm').factory('search', [
                     .success (results)->
                         searchDef.resolve(results.results)
 
+                    .error (response)->
+                        searchDef.reject(response)
+
                 searchDef.promise()
 
         self

From ffca74f45da6cc4ab5cdb7ec0786d04577e646e9 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Sat, 16 Jan 2016 20:04:23 -0800
Subject: [PATCH 07/15] #1: Progress commit - the search popup now responds to
 clicks correctly!

---
 public/templates/directives/search.html       |  9 +++++-
 .../scripts/app/directives/popup.coffee       | 28 ++++++++++++++++---
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/public/templates/directives/search.html b/public/templates/directives/search.html
index c6ea160d..5455cb96 100644
--- a/public/templates/directives/search.html
+++ b/public/templates/directives/search.html
@@ -1,5 +1,12 @@
 <div class="search" ng-blur="searchInProgress = false">
-    <input class="search-input" type="text" placeholder="Search&hellip;" ng-model="searchQuery" pfm-popup="search-results" />
+    <input
+        class="search-input"
+        type="text"
+        placeholder="Search&hellip;"
+        ng-model="searchQuery"
+        pfm-popup="search-results"
+        pfm-popup-close-on-click
+    />
 
     <div class="search-results pfm-popup" id="search-results">
         <h3 class="-section-header">Matching tracks</h3>
diff --git a/resources/assets/scripts/app/directives/popup.coffee b/resources/assets/scripts/app/directives/popup.coffee
index 133c77ea..25ca462d 100644
--- a/resources/assets/scripts/app/directives/popup.coffee
+++ b/resources/assets/scripts/app/directives/popup.coffee
@@ -27,14 +27,29 @@ angular.module('ponyfm').directive 'pfmPopup', () ->
         $element = $ element
         $positionParent = null
         open = false
+        dontCloseOnClick = attrs.pfmPopupCloseOnClick?
+
+
+        close = () ->
+            $popup.removeClass 'open'
+            open = false
 
 
         documentClickHandler = (event) ->
+            console.log(event)
+            debugger
             return if !open
-            $popup.removeClass 'open'
-            open = false
+
+            if (dontCloseOnClick and
+                (event.target.id == elementId or
+                $(event.target).parents("##{elementId}").size())
+            )
+                return true
+
+            close()
             return true
 
+
         calculatePosition = ->
             $popup.parents().each () ->
                 $this = $ this
@@ -64,6 +79,7 @@ angular.module('ponyfm').directive 'pfmPopup', () ->
                 top: top - parentPosition.top,
                 height: height - 15}
 
+
         windowResizeHandler = () ->
             return if !open
             $popup.css 'height', 'auto'
@@ -81,8 +97,7 @@ angular.module('ponyfm').directive 'pfmPopup', () ->
             e.stopPropagation()
 
             if open and not $element.is(':focus')
-                open = false
-                $popup.removeClass 'open'
+                close
                 return
 
             $popup.addClass 'open'
@@ -98,6 +113,11 @@ angular.module('ponyfm').directive 'pfmPopup', () ->
                 open = true
             ), 0
 
+
+        scope.$on '$stateChangeStart', () ->
+            close()
+
+
         scope.$on '$destroy', () ->
             $(document.body).unbind 'click', documentClickHandler
             $(window).unbind 'click', windowResizeHandler

From 93b447f05c91f2559d54097c3928ca785b3d218d Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Sat, 16 Jan 2016 22:16:47 -0800
Subject: [PATCH 08/15] #1: Removed double negatives in the pfmPopup directive.

---
 public/templates/account/album.html           |  2 +-
 public/templates/account/track.html           |  4 ++--
 public/templates/directives/image-upload.html |  2 +-
 public/templates/directives/search.html       |  1 -
 .../scripts/app/directives/popup.coffee       | 22 ++++++++++---------
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/public/templates/account/album.html b/public/templates/account/album.html
index 1b41c092..aa6292b3 100644
--- a/public/templates/account/album.html
+++ b/public/templates/account/album.html
@@ -25,7 +25,7 @@
             <pfm-image-upload set-image="setCover" image="album.cover" />
         </div>
         <div class="form-row track-selector">
-            <a pfm-popup="track-selector,right" href="#" class="btn btn-small pull-right btn-info">Add Tracks</a>
+            <a pfm-popup="track-selector,right" pfm-popup-close-on-click href="#" class="btn btn-small pull-right btn-info">Add Tracks</a>
             <label class="strong">Album Tracks</label>
             <div id="track-selector" class="pfm-popup">
                 <ul>
diff --git a/public/templates/account/track.html b/public/templates/account/track.html
index 66a263df..dc4328d0 100644
--- a/public/templates/account/track.html
+++ b/public/templates/account/track.html
@@ -50,7 +50,7 @@
         </div>
         <div class="row-fluid">
             <div class="form-row album span6" ng-class="{'has-error': errors.album_id != null}">
-                <a pfm-popup="album-selector" href="#" class="btn btn-small">
+                <a pfm-popup="album-selector" pfm-popup-close-on-click href="#" class="btn btn-small">
                     Album:
                     <strong ng-show="selectedAlbum">{{selectedAlbum.title}}</strong>
                     <strong ng-hide="selectedAlbum">None</strong>
@@ -68,7 +68,7 @@
                 <div class="error">{{errors.album_id}}</div>
             </div>
             <div class="form-row show-songs span6" ng-show="edit.track_type_id == 2" ng-class="{'has-error': errors.show_song_ids != null}">
-                <a pfm-popup="song-selector" href="#" class="btn btn-small">Show Songs: <strong>{{selectedSongsTitle}}</strong></a>
+                <a pfm-popup="song-selector" pfm-popup-close-on-click href="#" class="btn btn-small">Show Songs: <strong>{{selectedSongsTitle}}</strong></a>
                 <div id="song-selector" class="pfm-popup">
                     <ul>
                         <li ng-repeat="song in taxonomies.showSongs" ng-class="{selected: selectedSongs[song.id]}">
diff --git a/public/templates/directives/image-upload.html b/public/templates/directives/image-upload.html
index 00e5f2e5..ececa03a 100644
--- a/public/templates/directives/image-upload.html
+++ b/public/templates/directives/image-upload.html
@@ -5,7 +5,7 @@
         <input type="file" onchange="angular.element(this).scope().setImageFile(this)" />
     </p>
     <div class="btn-group">
-        <a href="#" pfm-popup="image-selector" class="btn btn-small"><i class="icon-picture"></i> Gallery</a>
+        <a href="#" pfm-popup="image-selector" pfm-popup-close-on-click class="btn btn-small"><i class="icon-picture"></i> Gallery</a>
         <a href="#" pfm-eat-click ng-click="uploadImage()" class="btn btn-info btn-small"><i class="icon-upload"></i> Upload</a>
         <a href="#" pfm-eat-click ng-click="clearImage()" class="btn btn-danger btn-small" ng-show="isImageLoaded"><i class="icon-remove"></i></a>
     </div>
diff --git a/public/templates/directives/search.html b/public/templates/directives/search.html
index 5455cb96..f2ebdcae 100644
--- a/public/templates/directives/search.html
+++ b/public/templates/directives/search.html
@@ -5,7 +5,6 @@
         placeholder="Search&hellip;"
         ng-model="searchQuery"
         pfm-popup="search-results"
-        pfm-popup-close-on-click
     />
 
     <div class="search-results pfm-popup" id="search-results">
diff --git a/resources/assets/scripts/app/directives/popup.coffee b/resources/assets/scripts/app/directives/popup.coffee
index 25ca462d..d1f4311e 100644
--- a/resources/assets/scripts/app/directives/popup.coffee
+++ b/resources/assets/scripts/app/directives/popup.coffee
@@ -27,7 +27,7 @@ angular.module('ponyfm').directive 'pfmPopup', () ->
         $element = $ element
         $positionParent = null
         open = false
-        dontCloseOnClick = attrs.pfmPopupCloseOnClick?
+        closeOnClick = attrs.pfmPopupCloseOnClick?
 
 
         close = () ->
@@ -36,18 +36,20 @@ angular.module('ponyfm').directive 'pfmPopup', () ->
 
 
         documentClickHandler = (event) ->
-            console.log(event)
-            debugger
-            return if !open
+            if !open
+                return
 
-            if (dontCloseOnClick and
-                (event.target.id == elementId or
-                $(event.target).parents("##{elementId}").size())
-            )
+            if (closeOnClick)
+                close()
                 return true
 
-            close()
-            return true
+            # Based on: https://stackoverflow.com/a/4660738/3225811
+            else if event.target.id == elementId or $(event.target).parents("##{elementId}").size()
+                return true
+
+            else
+                close()
+                return true
 
 
         calculatePosition = ->

From 864112b1f2d15dd51e94bca0683b4c4bd5bb735f Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Sat, 16 Jan 2016 23:11:06 -0800
Subject: [PATCH 09/15] #1: Improved the layout of the search results.

---
 public/templates/directives/search.html       | 29 +++++++++++--------
 .../scripts/app/directives/popup.coffee       |  9 ++++--
 .../scripts/app/directives/search.coffee      |  2 +-
 resources/assets/styles/search.less           | 26 +++++++++++++----
 4 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/public/templates/directives/search.html b/public/templates/directives/search.html
index f2ebdcae..ec044091 100644
--- a/public/templates/directives/search.html
+++ b/public/templates/directives/search.html
@@ -7,19 +7,24 @@
         pfm-popup="search-results"
     />
 
-    <div class="search-results pfm-popup" id="search-results">
-        <h3 class="-section-header">Matching tracks</h3>
-        <pfm-tracks-list tracks="tracks"></pfm-tracks-list>
+    <section class="search-results pfm-popup" id="search-results">
+        <div class="-column1">
+            <h3 class="-section-header">Matching tracks</h3>
+            <pfm-tracks-list tracks="tracks"></pfm-tracks-list>
 
-        <h3 class="-section-header">Matching albums</h3>
-        <pfm-albums-list albums="albums"></pfm-albums-list>
+        </div>
 
-        <h3 class="-section-header">Matching playlists</h3>
-        <pfm-playlists-list playlists="playlists"></pfm-playlists-list>
+        <div class="-column2">
+            <h3 class="-section-header">Matching users</h3>
+            <ol>
+                <li bindonce ng-repeat="user in users track by user.id" bo-text="user.display_name"></li>
+            </ol>
 
-        <h3 class="-section-header">Matching users</h3>
-        <ol>
-            <li bindonce ng-repeat="user in users track by user.id" bo-text="user.display_name"></li>
-        </ol>
-    </div>
+            <h3 class="-section-header">Matching albums</h3>
+            <pfm-albums-list albums="albums"></pfm-albums-list>
+
+            <h3 class="-section-header">Matching playlists</h3>
+            <pfm-playlists-list playlists="playlists"></pfm-playlists-list>
+        </div>
+    </section>
 </div>
diff --git a/resources/assets/scripts/app/directives/popup.coffee b/resources/assets/scripts/app/directives/popup.coffee
index d1f4311e..d40cc307 100644
--- a/resources/assets/scripts/app/directives/popup.coffee
+++ b/resources/assets/scripts/app/directives/popup.coffee
@@ -55,10 +55,13 @@ angular.module('ponyfm').directive 'pfmPopup', () ->
         calculatePosition = ->
             $popup.parents().each () ->
                 $this = $ this
-                $positionParent = $this if $positionParent == null && ($this.css('position') == 'relative' || $this.is 'body')
+
+                if $positionParent == null && ($this.css('position') == 'relative' || $this.is 'body')
+                    $positionParent = $this
+                    return false
 
             position = $element.offset()
-            parentPosition = $positionParent.offset()
+            parentPosition = $positionParent.offset() + $positionParent.height()
 
             windowWidth = $(window).width() - 15
             left = position.left
@@ -89,7 +92,7 @@ angular.module('ponyfm').directive 'pfmPopup', () ->
             $popup.css
                 left: position.left
                 top: position.top
-                height: position.height
+                maxHeight: position.height
 
         $(document.body).bind 'click', documentClickHandler
         $(window).bind 'resize', windowResizeHandler
diff --git a/resources/assets/scripts/app/directives/search.coffee b/resources/assets/scripts/app/directives/search.coffee
index 9425ddf9..ed0280fb 100644
--- a/resources/assets/scripts/app/directives/search.coffee
+++ b/resources/assets/scripts/app/directives/search.coffee
@@ -59,5 +59,5 @@ angular.module('ponyfm').directive 'pfmSearch', () ->
 
                             for user in results.users
                                 $scope.users.push(user)
-            , 500)
+            , 200)
     ]
diff --git a/resources/assets/styles/search.less b/resources/assets/styles/search.less
index 612873ac..c980ab8f 100644
--- a/resources/assets/styles/search.less
+++ b/resources/assets/styles/search.less
@@ -20,25 +20,41 @@
 @import 'mixins';
 @import 'variables';
 
+.search {
+  position: relative;
+}
 
-.search-input {
-
+input.search-input {
+  font-size: 13px;
+  padding: 15px 10px;
+  margin-bottom: 0;
 }
 
 .search-results {
-  position: absolute;
-  width: 500px;
+  width: 600px;
   padding: 10px;
 
   background: #fff;
 
+  .-column1, .-column2 {
+    width: 48%;
+    float: left;
+  }
+
+  .-column1 {
+    padding-right: 2%;
+  }
+
+  .-column2 {
+    padding-left: 2%;
+  }
+
   ol li {
     list-style: disc;
   }
 
   li a {
     padding: 0;
-    padding-right: 0;
     overflow: hidden;
     color: @pfm-light-grey;
   }

From 7a7f4ee02a01a0cf904322183faab22f72017d05 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Sat, 16 Jan 2016 23:35:43 -0800
Subject: [PATCH 10/15] #1: Moved the artists list into its own directive +
 visual cleanup of search.

---
 .../Controllers/Api/Web/ArtistsController.php | 13 +--------
 .../Controllers/Api/Web/SearchController.php  |  4 +--
 app/Library/Search.php                        | 18 ++++++++----
 app/Models/User.php                           | 15 ++++++++++
 public/templates/artists/list.html            | 20 +------------
 public/templates/directives/search.html       |  4 +--
 public/templates/directives/users-list.html   | 19 ++++++++++++
 .../scripts/app/directives/search.coffee      |  2 +-
 .../scripts/app/directives/users-list.coffee  | 29 +++++++++++++++++++
 resources/assets/styles/content.less          |  6 ++--
 resources/assets/styles/search.less           |  2 +-
 11 files changed, 85 insertions(+), 47 deletions(-)
 create mode 100644 public/templates/directives/users-list.html
 create mode 100644 resources/assets/scripts/app/directives/users-list.coffee

diff --git a/app/Http/Controllers/Api/Web/ArtistsController.php b/app/Http/Controllers/Api/Web/ArtistsController.php
index 96e38554..5999432e 100644
--- a/app/Http/Controllers/Api/Web/ArtistsController.php
+++ b/app/Http/Controllers/Api/Web/ArtistsController.php
@@ -195,18 +195,7 @@ class ArtistsController extends ApiControllerBase
         $users = [];
 
         foreach ($query->get() as $user) {
-            $users[] = [
-                'id' => $user->id,
-                'name' => $user->display_name,
-                'slug' => $user->slug,
-                'url' => $user->url,
-                'is_archived' => $user->is_archived,
-                'avatars' => [
-                    'small' => $user->getAvatarUrl(Image::SMALL),
-                    'normal' => $user->getAvatarUrl(Image::NORMAL)
-                ],
-                'created_at' => $user->created_at
-            ];
+            $users[] = User::mapPublicUserSummary($user);
         }
 
         return Response::json(["artists" => $users, "current_page" => $page, "total_pages" => ceil($count / $perPage)],
diff --git a/app/Http/Controllers/Api/Web/SearchController.php b/app/Http/Controllers/Api/Web/SearchController.php
index 367e08a4..f2304bf0 100644
--- a/app/Http/Controllers/Api/Web/SearchController.php
+++ b/app/Http/Controllers/Api/Web/SearchController.php
@@ -30,9 +30,7 @@ class SearchController extends ApiControllerBase
 {
     public function getSearch(Search $search)
     {
-        $input = Input::all();
-
-        $results = $search->searchAllContent($input['query']);
+        $results = $search->searchAllContent(Input::query('query'));
 
         return Response::json([
             'results' => $results,
diff --git a/app/Library/Search.php b/app/Library/Search.php
index f28e5f9a..6e31a1ab 100644
--- a/app/Library/Search.php
+++ b/app/Library/Search.php
@@ -117,7 +117,7 @@ class Search {
         $tracks = $this->transformTracks($results['responses'][0]['hits']['hits']);
         $albums = $this->transformAlbums($results['responses'][1]['hits']['hits']);
         $playlists = $this->transformPlaylists($results['responses'][2]['hits']['hits']);
-        $users = $this->transformToEloquent(User::class, $results['responses'][3]['hits']['hits']);
+        $users = $this->transformUsers($results['responses'][3]['hits']['hits']);
 
         return [
             'tracks'    => $tracks,
@@ -137,20 +137,28 @@ class Search {
 
     protected function transformAlbums(array $searchHits) {
         $albums = $this->transformToEloquent(Album::class, $searchHits);
-        $albums = $albums->map(function (Album $track) {
-            return Album::mapPublicAlbumSummary($track);
+        $albums = $albums->map(function (Album $album) {
+            return Album::mapPublicAlbumSummary($album);
         });
         return $albums;
     }
 
     protected function transformPlaylists(array $searchHits) {
         $playlists = $this->transformToEloquent(Playlist::class, $searchHits);
-        $playlists = $playlists->map(function (Playlist $track) {
-            return Playlist::mapPublicPlaylistSummary($track);
+        $playlists = $playlists->map(function (Playlist $playlist) {
+            return Playlist::mapPublicPlaylistSummary($playlist);
         });
         return $playlists;
     }
 
+    protected function transformUsers(array $searchHits) {
+        $users = $this->transformToEloquent(User::class, $searchHits);
+        $users = $users->map(function (User $user) {
+            return User::mapPublicUserSummary($user);
+        });
+        return $users;
+    }
+
     /**
      * Transforms the given Elasticsearch results into a collection of corresponding
      * Eloquent models.
diff --git a/app/Models/User.php b/app/Models/User.php
index d2f77bfd..0a656b57 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -251,6 +251,21 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
         return false;
     }
 
+    public static function mapPublicUserSummary(User $user) {
+        return [
+            'id' => $user->id,
+            'name' => $user->display_name,
+            'slug' => $user->slug,
+            'url' => $user->url,
+            'is_archived' => $user->is_archived,
+            'avatars' => [
+                'small' => $user->getAvatarUrl(Image::SMALL),
+                'normal' => $user->getAvatarUrl(Image::NORMAL)
+            ],
+            'created_at' => $user->created_at
+        ];
+    }
+
     /**
      * Returns this model in Elasticsearch-friendly form. The array returned by
      * this method should match the current mapping for this model's ES type.
diff --git a/public/templates/artists/list.html b/public/templates/artists/list.html
index b18a502f..48635e61 100644
--- a/public/templates/artists/list.html
+++ b/public/templates/artists/list.html
@@ -1,21 +1,3 @@
 <div class="stretch-to-bottom">
-    <ul class="artist-listing">
-        <li class="artist" ng-class="{'x-archived': artist.is_archived}" ng-repeat="artist in artists" bindonce>
-            <a href="{{artist.url}}">
-                <img class="image" pfm-src-loader="artist.avatars.small" pfm-src-size="small" />
-                <span class="info">
-                    <span class="title" bo-text="artist.name"></span>
-                    <span ng-hide="artist.is_archived" class="published">
-                        joined <span bo-text="artist.created_at.date | momentFromNow"></span>
-                    </span>
-                    <span ng-show="artist.is_archived" class="published">
-                        archived artist
-                    </span>
-                </span>
-            </a>
-        </li>
-        <li ng-show="!artists.length" class="empty">
-            No artists found...
-        </li>
-    </ul>
+    <pfm-users-list users="artists"></pfm-users-list>
 </div>
diff --git a/public/templates/directives/search.html b/public/templates/directives/search.html
index ec044091..36e9a740 100644
--- a/public/templates/directives/search.html
+++ b/public/templates/directives/search.html
@@ -16,9 +16,7 @@
 
         <div class="-column2">
             <h3 class="-section-header">Matching users</h3>
-            <ol>
-                <li bindonce ng-repeat="user in users track by user.id" bo-text="user.display_name"></li>
-            </ol>
+            <pfm-users-list users="users"></pfm-users-list>
 
             <h3 class="-section-header">Matching albums</h3>
             <pfm-albums-list albums="albums"></pfm-albums-list>
diff --git a/public/templates/directives/users-list.html b/public/templates/directives/users-list.html
new file mode 100644
index 00000000..7fac5a81
--- /dev/null
+++ b/public/templates/directives/users-list.html
@@ -0,0 +1,19 @@
+<ul class="users-listing">
+    <li class="artist" ng-class="{'x-archived': user.is_archived}" ng-repeat="user in users track by user.id" bindonce>
+        <a bo-href="user.url">
+            <img class="image" pfm-src-loader="user.avatars.small" pfm-src-size="small" />
+            <span class="info">
+                <span class="title" bo-text="user.name"></span>
+                <span ng-hide="user.is_archived" class="published">
+                    joined <span bo-text="user.created_at.date | momentFromNow"></span>
+                </span>
+                <span ng-show="user.is_archived" class="published">
+                    archived artist
+                </span>
+            </span>
+        </a>
+    </li>
+    <li ng-show="!users.length" class="empty">
+        No users found&hellip;
+    </li>
+</ul>
diff --git a/resources/assets/scripts/app/directives/search.coffee b/resources/assets/scripts/app/directives/search.coffee
index ed0280fb..53d5abde 100644
--- a/resources/assets/scripts/app/directives/search.coffee
+++ b/resources/assets/scripts/app/directives/search.coffee
@@ -59,5 +59,5 @@ angular.module('ponyfm').directive 'pfmSearch', () ->
 
                             for user in results.users
                                 $scope.users.push(user)
-            , 200)
+            , 300)
     ]
diff --git a/resources/assets/scripts/app/directives/users-list.coffee b/resources/assets/scripts/app/directives/users-list.coffee
new file mode 100644
index 00000000..82f6e8c0
--- /dev/null
+++ b/resources/assets/scripts/app/directives/users-list.coffee
@@ -0,0 +1,29 @@
+# Pony.fm - A community for pony fan music.
+# Copyright (C) 2016 Peter Deltchev
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+angular.module('ponyfm').directive 'pfmUsersList', () ->
+    restrict: 'E'
+    replace: true
+    templateUrl: '/templates/directives/users-list.html'
+    scope:
+        users: '=users',
+        class: '@class'
+
+    controller: [
+        '$scope', 'auth'
+        ($scope, auth) ->
+            $scope.auth = auth.data
+    ]
diff --git a/resources/assets/styles/content.less b/resources/assets/styles/content.less
index 7423f206..bc9cf0d9 100644
--- a/resources/assets/styles/content.less
+++ b/resources/assets/styles/content.less
@@ -22,7 +22,7 @@
 
 @media (max-width: 1300px) and (min-width: 720px) {
   html {
-    .albums-listing, .playlists-listing, .artist-listing {
+    .albums-listing, .playlists-listing, .users-listing {
       &.two-columns li {
         width: auto;
         float: none;
@@ -37,7 +37,7 @@
 
 @media (max-width: 720px) {
   html {
-    .albums-listing, .playlists-listing, .artist-listing {
+    .albums-listing, .playlists-listing, .users-listing {
       &.two-columns li {
         width: auto;
         float: none;
@@ -51,7 +51,7 @@
   }
 }
 
-.albums-listing, .playlists-listing, .artist-listing {
+.albums-listing, .playlists-listing, .users-listing {
   margin: 0px;
   padding: 0px;
   list-style: none;
diff --git a/resources/assets/styles/search.less b/resources/assets/styles/search.less
index c980ab8f..b29d398a 100644
--- a/resources/assets/styles/search.less
+++ b/resources/assets/styles/search.less
@@ -66,7 +66,7 @@ input.search-input {
     padding-left: 0;
   }
 
-  .albums-listing, .playlists-listing {
+  .albums-listing, .playlists-listing, .users-listing {
     li {
       width: 100%;
     }

From 56edd5ec288d3310209d521b7bdfe7c2639ac892 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Sun, 17 Jan 2016 02:33:58 -0800
Subject: [PATCH 11/15] #1: Search relevancy improvements and other tweaks.

---
 app/Library/Search.php                        | 16 +++---
 app/Models/Album.php                          |  7 +++
 app/Models/Playlist.php                       | 22 +++++++++
 app/Models/Track.php                          | 15 +++++-
 app/Models/User.php                           |  7 +++
 app/Traits/IndexedInElasticsearchTrait.php    | 23 ++++++---
 .../2016_01_14_021607_setup_elasticsearch.php | 24 ++++-----
 public/templates/directives/search.html       | 28 ++++++-----
 .../scripts/app/directives/search.coffee      |  7 ++-
 resources/assets/styles/content.less          | 49 +++++++++++++------
 10 files changed, 143 insertions(+), 55 deletions(-)

diff --git a/app/Library/Search.php b/app/Library/Search.php
index 6e31a1ab..caa07bf9 100644
--- a/app/Library/Search.php
+++ b/app/Library/Search.php
@@ -43,7 +43,7 @@ class Search {
      * @param int $resultsPerContentType
      * @return array
      */
-    public function searchAllContent(string $query, int $resultsPerContentType = 10) {
+    public function searchAllContent(string $query) {
         $results = $this->elasticsearch->msearch([
             'index' => $this->index,
             'body' => [
@@ -60,9 +60,10 @@ class Search {
                                 'track_type',
                                 'show_songs^2',
                             ],
+                            'tie_breaker' => 0.3,
                         ],
                     ],
-                    'size' => $resultsPerContentType
+                    'size' => 11
                 ],
 
                 //===== Albums =====//
@@ -76,9 +77,10 @@ class Search {
                                 'artist',
                                 'tracks',
                             ],
+                            'tie_breaker' => 0.3,
                         ],
                     ],
-                    'size' => $resultsPerContentType
+                    'size' => 3
                 ],
 
                 //===== Playlists =====//
@@ -92,9 +94,10 @@ class Search {
                                 'curator',
                                 'tracks^2',
                             ],
+                            'tie_breaker' => 0.3,
                         ],
                     ],
-                    'size' => $resultsPerContentType
+                    'size' => 3
                 ],
 
                 //===== Users =====//
@@ -104,12 +107,13 @@ class Search {
                         'multi_match' => [
                             'query' => $query,
                             'fields' => [
-                                'display_name^2',
+                                'display_name',
                                 'tracks',
                             ],
+                            'tie_breaker' => 0.3,
                         ],
                     ],
-                    'size' => $resultsPerContentType
+                    'size' => 3
                 ],
             ]
         ]);
diff --git a/app/Models/Album.php b/app/Models/Album.php
index f32c69a8..38ff9588 100644
--- a/app/Models/Album.php
+++ b/app/Models/Album.php
@@ -420,4 +420,11 @@ class Album extends Model
             'tracks' => $this->tracks->pluck('title'),
         ];
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function shouldBeIndexed():bool {
+        return $this->track_count > 0 && !$this->trashed();
+    }
 }
diff --git a/app/Models/Playlist.php b/app/Models/Playlist.php
index 327dd67e..8a12d3fd 100644
--- a/app/Models/Playlist.php
+++ b/app/Models/Playlist.php
@@ -67,6 +67,19 @@ class Playlist extends Model
 
     protected $table = 'playlists';
     protected $dates = ['deleted_at'];
+    protected $casts = [
+        'id'                => 'integer',
+        'user_id'           => 'integer',
+        'title'             => 'string',
+        'description'       => 'string',
+        'is_public'         => 'boolean',
+        'track_count'       => 'integer',
+        'view_count'        => 'integer',
+        'download_count'    => 'integer',
+        'favourte_count'    => 'integer',
+        'follow_count'      => 'integer',
+        'comment_count'     => 'integer',
+    ];
 
     public static function summary()
     {
@@ -301,4 +314,13 @@ class Playlist extends Model
             'tracks'    => $this->tracks->pluck('title'),
         ];
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function shouldBeIndexed():bool {
+        return $this->is_public &&
+               $this->track_count > 0 &&
+               !$this->trashed();
+    }
 }
diff --git a/app/Models/Track.php b/app/Models/Track.php
index 6dbd1af2..f3cbaf66 100644
--- a/app/Models/Track.php
+++ b/app/Models/Track.php
@@ -831,9 +831,20 @@ class Track extends Model
         return 'track-' . $this->id . '-' . $key;
     }
 
-    //============= Elasticsearch stuff ==================//
 
-    public function toElasticsearch() {
+    /**
+     * @inheritdoc
+     */
+    public function shouldBeIndexed():bool {
+        return $this->is_listed &&
+               $this->published_at !== null &&
+               !$this->trashed();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toElasticsearch():array {
         return [
             'title'         => $this->title,
             'artist'        => $this->user->display_name,
diff --git a/app/Models/User.php b/app/Models/User.php
index 0a656b57..63371a66 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -279,4 +279,11 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
             'tracks'        => $this->tracks->pluck('title'),
         ];
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function shouldBeIndexed():bool {
+        return $this->disabled_at === null;
+    }
 }
diff --git a/app/Traits/IndexedInElasticsearchTrait.php b/app/Traits/IndexedInElasticsearchTrait.php
index de0c0ac6..92297a9a 100644
--- a/app/Traits/IndexedInElasticsearchTrait.php
+++ b/app/Traits/IndexedInElasticsearchTrait.php
@@ -21,6 +21,7 @@
 namespace Poniverse\Ponyfm\Traits;
 
 use Elasticsearch;
+use Elasticsearch\Common\Exceptions\Missing404Exception;
 
 /**
  * Class IndexedInElasticsearch
@@ -40,13 +41,19 @@ trait IndexedInElasticsearchTrait
      */
     abstract public function toElasticsearch();
 
-    public static function bootIndexedInElasticsearch() {
+    /**
+     * @return bool whether this particular object should be indexed or not
+     */
+    abstract public function shouldBeIndexed():bool;
+
+
+    public static function bootIndexedInElasticsearchTrait() {
         static::saved(function ($model) {
-            $model->createOrUpdateElasticsearchEntry();
+            $model->ensureElasticsearchEntryIsUpToDate();
         });
 
         static::deleted(function ($model) {
-            $model->deleteElasticsearchEntry();
+            $model->ensureElasticsearchEntryIsUpToDate();
         });
     }
 
@@ -76,17 +83,17 @@ trait IndexedInElasticsearchTrait
         try {
             Elasticsearch::connection()->delete($this->getElasticsearchParameters(false));
 
-        } catch (\Elasticsearch\Common\Exceptions\Missing404Exception $e) {
-            // If the track we're trying to delete isn't indexed in Elasticsearch,
+        } catch (Missing404Exception $e) {
+            // If the entity we're trying to delete isn't indexed in Elasticsearch,
             // that's fine.
         }
     }
 
     public function ensureElasticsearchEntryIsUpToDate() {
-        if (method_exists($this, 'trashed') && $this->trashed()) {
-            $this->deleteElasticsearchEntry();
-        } else {
+        if ($this->shouldBeIndexed()) {
             $this->createOrUpdateElasticsearchEntry();
+        } else {
+            $this->deleteElasticsearchEntry();
         }
     }
 }
diff --git a/database/migrations/2016_01_14_021607_setup_elasticsearch.php b/database/migrations/2016_01_14_021607_setup_elasticsearch.php
index 2c697187..33e48dfc 100644
--- a/database/migrations/2016_01_14_021607_setup_elasticsearch.php
+++ b/database/migrations/2016_01_14_021607_setup_elasticsearch.php
@@ -40,17 +40,17 @@ class SetupElasticsearch extends Migration
                         '_source' => ['enabled' => true],
                         'dynamic' => 'strict',
                         'properties' => [
-                            'title' => ['type' => 'string'],
-                            'artist' => ['type' => 'string', 'index' => 'not_analyzed'],
+                            'title' => ['type' => 'string', 'analyzer' => 'english'],
+                            'artist' => ['type' => 'string'],
 
                             'published_at' => ['type' => 'date'],
-                            'genre' => ['type' => 'string', 'index' => 'not_analyzed'],
+                            'genre' => ['type' => 'string', 'analyzer' => 'english'],
                             'track_type' => ['type' => 'string', 'index' => 'not_analyzed'],
 
                             // This field is intended to be used as an array.
                             // Note that all Elasticsearch fields can technically be used as arrays.
                             // See: https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html
-                            'show_songs' => ['type' => 'string', 'index' => 'not_analyzed'],
+                            'show_songs' => ['type' => 'string'],
                         ]
                     ],
 
@@ -58,13 +58,13 @@ class SetupElasticsearch extends Migration
                         '_source' => ['enabled' => true],
                         'dynamic' => 'strict',
                         'properties' => [
-                            'title' => ['type' => 'string'],
-                            'artist' => ['type' => 'string', 'index' => 'not_analyzed'],
+                            'title' => ['type' => 'string', 'analyzer' => 'english'],
+                            'artist' => ['type' => 'string'],
 
                             // This field is intended to be used as an array.
                             // Note that all Elasticsearch fields can technically be used as arrays.
                             // See: https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html
-                            'tracks' => ['type' => 'string']
+                            'tracks' => ['type' => 'string', 'analyzer' => 'english']
                         ]
                     ],
 
@@ -72,13 +72,13 @@ class SetupElasticsearch extends Migration
                         '_source' => ['enabled' => true],
                         'dynamic' => 'strict',
                         'properties' => [
-                            'title'     => ['type' => 'string'],
-                            'curator'   => ['type' => 'string', 'index' => 'not_analyzed'],
+                            'title'     => ['type' => 'string', 'analyzer' => 'english'],
+                            'curator'   => ['type' => 'string'],
 
                             // This field is intended to be used as an array.
                             // Note that all Elasticsearch fields can technically be used as arrays.
                             // See: https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html
-                            'tracks' => ['type' => 'string']
+                            'tracks' => ['type' => 'string', 'analyzer' => 'english']
                         ]
                     ],
 
@@ -87,12 +87,12 @@ class SetupElasticsearch extends Migration
                         'dynamic' => 'strict',
                         'properties' => [
                             'username'      => ['type' => 'string', 'index' => 'not_analyzed'],
-                            'display_name'  => ['type' => 'string', 'index' => 'not_analyzed'],
+                            'display_name'  => ['type' => 'string'],
 
                             // This field is intended to be used as an array.
                             // Note that all Elasticsearch fields can technically be used as arrays.
                             // See: https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html
-                            'tracks' => ['type' => 'string']
+                            'tracks' => ['type' => 'string', 'analyzer' => 'english']
                         ]
                     ],
                 ]
diff --git a/public/templates/directives/search.html b/public/templates/directives/search.html
index 36e9a740..079f023a 100644
--- a/public/templates/directives/search.html
+++ b/public/templates/directives/search.html
@@ -8,21 +8,27 @@
     />
 
     <section class="search-results pfm-popup" id="search-results">
-        <div class="-column1">
-            <h3 class="-section-header">Matching tracks</h3>
-            <pfm-tracks-list tracks="tracks"></pfm-tracks-list>
-
+        <div ng-hide="searchInProgress">
+            <p class="empty-box">Type something to begin searching!</p>
         </div>
 
-        <div class="-column2">
-            <h3 class="-section-header">Matching users</h3>
-            <pfm-users-list users="users"></pfm-users-list>
+        <div ng-show="searchInProgress">
+            <div class="-column1">
+                <h3 class="-section-header">Matching tracks</h3>
+                <pfm-tracks-list tracks="tracks"></pfm-tracks-list>
 
-            <h3 class="-section-header">Matching albums</h3>
-            <pfm-albums-list albums="albums"></pfm-albums-list>
+            </div>
 
-            <h3 class="-section-header">Matching playlists</h3>
-            <pfm-playlists-list playlists="playlists"></pfm-playlists-list>
+            <div class="-column2">
+                <h3 class="-section-header">Matching users</h3>
+                <pfm-users-list users="users" class="-condensed"></pfm-users-list>
+
+                <h3 class="-section-header">Matching albums</h3>
+                <pfm-albums-list albums="albums"></pfm-albums-list>
+
+                <h3 class="-section-header">Matching playlists</h3>
+                <pfm-playlists-list playlists="playlists"></pfm-playlists-list>
+            </div>
         </div>
     </section>
 </div>
diff --git a/resources/assets/scripts/app/directives/search.coffee b/resources/assets/scripts/app/directives/search.coffee
index 53d5abde..673123d0 100644
--- a/resources/assets/scripts/app/directives/search.coffee
+++ b/resources/assets/scripts/app/directives/search.coffee
@@ -41,13 +41,16 @@ angular.module('ponyfm').directive 'pfmSearch', () ->
 
             $scope.$watch 'searchQuery', _.debounce((searchQuery)->
                 $scope.$apply ()->
-                    clearResults()
-                    return if searchQuery.length <3
+                    if searchQuery.length <3
+                        clearResults()
+                        $scope.searchInProgress = false
+                        return
 
                     $scope.searchInProgress = true
 
                     search.searchAllContent(searchQuery)
                         .then (results)->
+                            clearResults()
                             for track in results.tracks
                                 $scope.tracks.push(track)
 
diff --git a/resources/assets/styles/content.less b/resources/assets/styles/content.less
index bc9cf0d9..37ab8e4f 100644
--- a/resources/assets/styles/content.less
+++ b/resources/assets/styles/content.less
@@ -345,20 +345,7 @@ html .single-player .play-button {
 html {
   li {
     &.empty {
-      .border-radius(0px);
-      background: lighten(@pfm-purple, 30%);
-      border: 1px solid lighten(@pfm-purple, 10%);
-      color: lighten(@pfm-purple, 3%);
-      float: none !important;
-      width: auto !important;
-      display: block;
-      margin-top: 5px;
-      padding: 5px;
-      font-size: 9pt;
-
-      &:hover {
-        background-color: lighten(@pfm-purple, 30%);
-      }
+      .empty-box;
     }
 
     .cache-loading {
@@ -374,6 +361,23 @@ html {
   }
 }
 
+.empty-box {
+  .border-radius(0px);
+  background: lighten(@pfm-purple, 30%);
+  border: 1px solid lighten(@pfm-purple, 10%);
+  color: lighten(@pfm-purple, 3%);
+  float: none !important;
+  width: auto !important;
+  display: block;
+  margin-top: 5px;
+  padding: 5px;
+  font-size: 9pt;
+
+  &:hover {
+    background-color: lighten(@pfm-purple, 30%);
+  }
+}
+
 .tracks-listing {
   margin: 0px;
   padding: 0px;
@@ -487,3 +491,20 @@ html {
     }
   }
 }
+
+.users-listing {
+  &.-condensed {
+    .image {
+      height: 30px;
+      width: 30px;
+    }
+
+    .info {
+      margin-left: 40px;
+    }
+
+    .published {
+      display: none;
+    }
+  }
+}

From e295c41243636896de33bd89a5a9bd13d477b86f Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Sun, 17 Jan 2016 05:22:14 -0800
Subject: [PATCH 12/15] #1: Made Elasticsearch hosts configurable in an
 environment variable.

---
 config/elasticsearch.php                                   | 7 ++++---
 .../migrations/2016_01_14_021607_setup_elasticsearch.php   | 1 -
 resources/environments/.env.example                        | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/elasticsearch.php b/config/elasticsearch.php
index faa27549..182f2a52 100644
--- a/config/elasticsearch.php
+++ b/config/elasticsearch.php
@@ -29,13 +29,14 @@ return [
 			 * instances.
 			 *
 			 * This is the only configuration value that is mandatory.
+             *
+             * If set in an environment variable, this should be a comma-separated
+             * list of hostnames. Port numbers are optional; 9200 is the default.
 			 *
 			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_host_configuration
 			 */
 
-			'hosts' => [
-				'localhost:9200'
-			],
+			'hosts' => explode(',', env('ELASTICSEARCH_HOSTS', 'localhost:9200')),
 
 			/**
 			 * SSL
diff --git a/database/migrations/2016_01_14_021607_setup_elasticsearch.php b/database/migrations/2016_01_14_021607_setup_elasticsearch.php
index 33e48dfc..b4980838 100644
--- a/database/migrations/2016_01_14_021607_setup_elasticsearch.php
+++ b/database/migrations/2016_01_14_021607_setup_elasticsearch.php
@@ -19,7 +19,6 @@
  */
 
 use Illuminate\Database\Migrations\Migration;
-use Poniverse\Ponyfm\Console\Commands\RebuildSearchIndex;
 
 class SetupElasticsearch extends Migration
 {
diff --git a/resources/environments/.env.example b/resources/environments/.env.example
index 663e44a8..5e0d4e6d 100644
--- a/resources/environments/.env.example
+++ b/resources/environments/.env.example
@@ -8,6 +8,8 @@ DB_DATABASE=homestead
 DB_USERNAME=homestead
 DB_PASSWORD=secret
 
+ELASTICSEARCH_HOSTS=localhost
+
 SESSION_HTTPS_ONLY=false
 QUEUE_DRIVER=sync
 

From 33befbe3d03dd42f705123024345da9d652d064a Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Sun, 17 Jan 2016 05:43:28 -0800
Subject: [PATCH 13/15] #1: Darklaunched search to site staff.

---
 app/Http/routes.php                          | 2 +-
 app/Providers/AuthServiceProvider.php        | 4 ++++
 resources/views/shared/_app_layout.blade.php | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index 57f3edb5..401fd813 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -82,7 +82,7 @@ Route::group(['prefix' => 'api/v1', 'middleware' => 'json-exceptions'], function
 
 Route::group(['prefix' => 'api/web'], function() {
     Route::get('/taxonomies/all', 'Api\Web\TaxonomiesController@getAll');
-    Route::get('/search', 'Api\Web\SearchController@getSearch');
+    Route::get('/search', ['middleware' => ['auth', 'can:access-search'], 'Api\Web\SearchController@getSearch']);
 
     Route::get('/tracks', 'Api\Web\TracksController@getIndex');
     Route::get('/tracks/{id}', 'Api\Web\TracksController@getShow')->where('id', '\d+');
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 96b1b6c1..e01fb068 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -48,6 +48,10 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function boot(GateContract $gate)
     {
+        $gate->define('access-search', function(User $user) {
+            return $user->hasRole('admin') || $user->hasRole('moderator');
+        });
+
         $gate->define('access-admin-area', function(User $user) {
             return $user->hasRole('admin');
         });
diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index 0ad04930..ba8c52c0 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -66,7 +66,9 @@
 
     <div class="site-body">
         <ul class="sidebar" ng-controller="sidebar">
-            <li><pfm-search></pfm-search></li>
+            @can('access-search')
+                <li><pfm-search></pfm-search></li>
+            @endcan
             <li ng-class="{selected: stateIncludes('content.tracks') || stateIncludes('content.track')}"><a href="/tracks">Tracks</a></li>
             <li ng-class="{selected: stateIncludes('content.albums') || stateIncludes('content.album')}"><a href="/albums">Albums</a></li>
             <li ng-class="{selected: stateIncludes('content.playlists') || stateIncludes('content.playlist')}"><a href="/playlists">Playlists</a></li>

From 845449c8cc0152f8a34284cc8b9ec648445d35c0 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Sun, 17 Jan 2016 07:16:16 -0800
Subject: [PATCH 14/15] #1: Reindexing now runs on its own queue + lots of code
 cleanup.

---
 app/Console/Commands/RebuildSearchIndex.php | 49 +++++++++++++-----
 app/Contracts/Searchable.php                | 39 ++++++++++++++
 app/Http/routes.php                         |  2 +-
 app/Jobs/UpdateSearchIndexForEntity.php     | 56 +++++++++++++++++++++
 app/Models/Album.php                        |  7 +--
 app/Models/Playlist.php                     |  7 +--
 app/Models/Track.php                        |  3 +-
 app/Models/User.php                         |  5 +-
 app/Traits/IndexedInElasticsearchTrait.php  | 50 +++++++++++-------
 config/ponyfm.php                           | 13 +++++
 config/queue.php                            | 31 ------------
 11 files changed, 190 insertions(+), 72 deletions(-)
 create mode 100644 app/Contracts/Searchable.php
 create mode 100644 app/Jobs/UpdateSearchIndexForEntity.php

diff --git a/app/Console/Commands/RebuildSearchIndex.php b/app/Console/Commands/RebuildSearchIndex.php
index 72e66066..41431e51 100644
--- a/app/Console/Commands/RebuildSearchIndex.php
+++ b/app/Console/Commands/RebuildSearchIndex.php
@@ -26,6 +26,7 @@ use Poniverse\Ponyfm\Models\Album;
 use Poniverse\Ponyfm\Models\Playlist;
 use Poniverse\Ponyfm\Models\Track;
 use Poniverse\Ponyfm\Models\User;
+use Symfony\Component\Console\Helper\ProgressBar;
 
 class RebuildSearchIndex extends Command
 {
@@ -65,32 +66,56 @@ class RebuildSearchIndex extends Command
         $totalPlaylists = Playlist::withTrashed()->count();
         $totalUsers = User::count();
 
-        Track::withTrashed()->chunk(200, function(Collection $tracks) {
+        $trackProgress = $this->output->createProgressBar($totalTracks);
+        $this->info("Processing tracks...");
+        Track::withTrashed()->chunk(200, function(Collection $tracks) use ($trackProgress) {
             foreach($tracks as $track) {
-                $this->info("Processing track #{$track->id}...");
-                $track->ensureElasticsearchEntryIsUpToDate();
+                /** @var Track $track */
+                $trackProgress->advance();
+                $track->updateElasticsearchEntry();
             }
         });
+        $trackProgress->finish();
+        $this->line('');
 
-        Album::withTrashed()->chunk(200, function(Collection $albums) {
+
+        $albumProgress = $this->output->createProgressBar($totalAlbums);
+        $this->info("Processing albums...");
+        Album::withTrashed()->chunk(200, function(Collection $albums) use ($albumProgress) {
             foreach($albums as $album) {
-                $this->info("Processing album #{$album->id}...");
-                $album->ensureElasticsearchEntryIsUpToDate();
+                /** @var Album $album */
+                $albumProgress->advance();
+                $album->updateElasticsearchEntry();
             }
         });
+        $albumProgress->finish();
+        $this->line('');
 
-        Playlist::withTrashed()->chunk(200, function(Collection $playlists) {
+
+        $playlistProgress = $this->output->createProgressBar($totalPlaylists);
+        $this->info("Processing playlists...");
+        Playlist::withTrashed()->chunk(200, function(Collection $playlists) use ($playlistProgress) {
             foreach($playlists as $playlist) {
-                $this->info("Processing playlist #{$playlist->id}...");
-                $playlist->ensureElasticsearchEntryIsUpToDate();
+                /** @var Playlist $playlist */
+                $playlistProgress->advance();
+                $playlist->updateElasticsearchEntry();
             }
         });
+        $playlistProgress->finish();
+        $this->line('');
 
-        User::chunk(200, function(Collection $users) {
+
+        $userProgress = $this->output->createProgressBar($totalUsers);
+        $this->info("Processing users...");
+        User::chunk(200, function(Collection $users) use ($userProgress) {
             foreach($users as $user) {
-                $this->info("Processing user #{$user->id}...");
-                $user->ensureElasticsearchEntryIsUpToDate();
+                /** @var User $user */
+                $userProgress->advance();
+                $user->updateElasticsearchEntry();
             }
         });
+        $userProgress->finish();
+        $this->line('');
+        $this->info('Everything has been queued for re-indexing!');
     }
 }
diff --git a/app/Contracts/Searchable.php b/app/Contracts/Searchable.php
new file mode 100644
index 00000000..8b81b440
--- /dev/null
+++ b/app/Contracts/Searchable.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2016 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Poniverse\Ponyfm\Contracts;
+
+interface Searchable {
+    /**
+     * Returns this model in Elasticsearch-friendly form. The array returned by
+     * this method should match the current mapping for this model's ES type.
+     *
+     * @return array
+     */
+    public function toElasticsearch():array;
+
+    /**
+     * @return bool whether this particular object should be indexed or not
+     */
+    public function shouldBeIndexed():bool;
+
+    public function updateElasticsearchEntry();
+    public function updateElasticsearchEntrySynchronously();
+}
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 401fd813..a3889ec7 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -82,7 +82,7 @@ Route::group(['prefix' => 'api/v1', 'middleware' => 'json-exceptions'], function
 
 Route::group(['prefix' => 'api/web'], function() {
     Route::get('/taxonomies/all', 'Api\Web\TaxonomiesController@getAll');
-    Route::get('/search', ['middleware' => ['auth', 'can:access-search'], 'Api\Web\SearchController@getSearch']);
+    Route::get('/search', ['middleware' => ['auth', 'can:access-search'], 'uses' => 'Api\Web\SearchController@getSearch']);
 
     Route::get('/tracks', 'Api\Web\TracksController@getIndex');
     Route::get('/tracks/{id}', 'Api\Web\TracksController@getShow')->where('id', '\d+');
diff --git a/app/Jobs/UpdateSearchIndexForEntity.php b/app/Jobs/UpdateSearchIndexForEntity.php
new file mode 100644
index 00000000..21b32131
--- /dev/null
+++ b/app/Jobs/UpdateSearchIndexForEntity.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2016 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Poniverse\Ponyfm\Jobs;
+
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Queue\InteractsWithQueue;
+use Poniverse\Ponyfm\Contracts\Searchable;
+use Poniverse\Ponyfm\Jobs\Job;
+use Illuminate\Contracts\Bus\SelfHandling;
+use SerializesModels;
+
+class UpdateSearchIndexForEntity extends Job implements SelfHandling, ShouldQueue
+{
+    use InteractsWithQueue, SerializesModels;
+
+    protected $entity;
+
+    /**
+     * Create a new job instance.
+     *
+     * @param Model $entity
+     */
+    public function __construct(Searchable $entity)
+    {
+        $this->entity = $entity;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $this->entity->updateElasticsearchEntrySynchronously();
+    }
+}
diff --git a/app/Models/Album.php b/app/Models/Album.php
index 38ff9588..64d709f6 100644
--- a/app/Models/Album.php
+++ b/app/Models/Album.php
@@ -27,6 +27,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Auth;
 use Cache;
+use Poniverse\Ponyfm\Contracts\Searchable;
 use Poniverse\Ponyfm\Exceptions\TrackFileNotFoundException;
 use Poniverse\Ponyfm\Traits\IndexedInElasticsearchTrait;
 use Poniverse\Ponyfm\Traits\TrackCollection;
@@ -60,9 +61,9 @@ use Venturecraft\Revisionable\RevisionableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection|\Venturecraft\Revisionable\Revision[] $revisionHistory
  * @method static \Illuminate\Database\Query\Builder|\Poniverse\Ponyfm\Models\Album userDetails()
  */
-class Album extends Model
+class Album extends Model implements Searchable
 {
-    use SoftDeletes, SlugTrait, DispatchesJobs, TrackCollection, RevisionableTrait, IndexedInElasticsearchTrait;
+    use SoftDeletes, SlugTrait, TrackCollection, RevisionableTrait, IndexedInElasticsearchTrait;
 
     protected $elasticsearchType = 'album';
 
@@ -413,7 +414,7 @@ class Album extends Model
      *
      * @return array
      */
-    public function toElasticsearch() {
+    public function toElasticsearch():array {
         return [
             'title' => $this->title,
             'artist' => $this->user->display_name,
diff --git a/app/Models/Playlist.php b/app/Models/Playlist.php
index 8a12d3fd..c9f4d7ad 100644
--- a/app/Models/Playlist.php
+++ b/app/Models/Playlist.php
@@ -26,6 +26,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Auth;
 use Cache;
+use Poniverse\Ponyfm\Contracts\Searchable;
 use Poniverse\Ponyfm\Exceptions\TrackFileNotFoundException;
 use Poniverse\Ponyfm\Traits\IndexedInElasticsearchTrait;
 use Poniverse\Ponyfm\Traits\TrackCollection;
@@ -59,9 +60,9 @@ use Venturecraft\Revisionable\RevisionableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection|\Venturecraft\Revisionable\Revision[] $revisionHistory
  * @method static \Illuminate\Database\Query\Builder|\Poniverse\Ponyfm\Models\Playlist userDetails()
  */
-class Playlist extends Model
+class Playlist extends Model implements Searchable
 {
-    use SoftDeletes, SlugTrait, DispatchesJobs, TrackCollection, RevisionableTrait, IndexedInElasticsearchTrait;
+    use SoftDeletes, SlugTrait, TrackCollection, RevisionableTrait, IndexedInElasticsearchTrait;
 
     protected $elasticsearchType = 'playlist';
 
@@ -307,7 +308,7 @@ class Playlist extends Model
      *
      * @return array
      */
-    public function toElasticsearch() {
+    public function toElasticsearch():array {
         return [
             'title'     => $this->title,
             'curator'   => $this->user->display_name,
diff --git a/app/Models/Track.php b/app/Models/Track.php
index f3cbaf66..7b29e6b6 100644
--- a/app/Models/Track.php
+++ b/app/Models/Track.php
@@ -25,6 +25,7 @@ use Cache;
 use Config;
 use DB;
 use Elasticsearch;
+use Poniverse\Ponyfm\Contracts\Searchable;
 use Poniverse\Ponyfm\Exceptions\TrackFileNotFoundException;
 use Poniverse\Ponyfm\Traits\IndexedInElasticsearchTrait;
 use Poniverse\Ponyfm\Traits\SlugTrait;
@@ -95,7 +96,7 @@ use Venturecraft\Revisionable\RevisionableTrait;
  * @method static \Illuminate\Database\Query\Builder|\Poniverse\Ponyfm\Models\Track withComments()
  * @method static \Illuminate\Database\Query\Builder|\Poniverse\Ponyfm\Models\Track mlpma()
  */
-class Track extends Model
+class Track extends Model implements Searchable
 {
     use SoftDeletes, IndexedInElasticsearchTrait;
 
diff --git a/app/Models/User.php b/app/Models/User.php
index 63371a66..5e83f5d8 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -29,6 +29,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Auth\Access\Authorizable;
 use Auth;
 use Illuminate\Support\Str;
+use Poniverse\Ponyfm\Contracts\Searchable;
 use Poniverse\Ponyfm\Traits\IndexedInElasticsearchTrait;
 use Venturecraft\Revisionable\RevisionableTrait;
 
@@ -63,7 +64,7 @@ use Venturecraft\Revisionable\RevisionableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection|\Venturecraft\Revisionable\Revision[] $revisionHistory
  * @method static \Illuminate\Database\Query\Builder|\Poniverse\Ponyfm\Models\User userDetails()
  */
-class User extends Model implements AuthenticatableContract, CanResetPasswordContract, \Illuminate\Contracts\Auth\Access\Authorizable
+class User extends Model implements AuthenticatableContract, CanResetPasswordContract, \Illuminate\Contracts\Auth\Access\Authorizable, Searchable
 {
     use Authenticatable, CanResetPassword, Authorizable, RevisionableTrait, IndexedInElasticsearchTrait;
 
@@ -272,7 +273,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      *
      * @return array
      */
-    public function toElasticsearch() {
+    public function toElasticsearch():array {
         return [
             'username'      => $this->username,
             'display_name'  => $this->display_name,
diff --git a/app/Traits/IndexedInElasticsearchTrait.php b/app/Traits/IndexedInElasticsearchTrait.php
index 92297a9a..8254521a 100644
--- a/app/Traits/IndexedInElasticsearchTrait.php
+++ b/app/Traits/IndexedInElasticsearchTrait.php
@@ -20,40 +20,39 @@
 
 namespace Poniverse\Ponyfm\Traits;
 
+use Config;
 use Elasticsearch;
 use Elasticsearch\Common\Exceptions\Missing404Exception;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Poniverse\Ponyfm\Contracts\Searchable;
+use Poniverse\Ponyfm\Jobs\UpdateSearchIndexForEntity;
 
 /**
  * Class IndexedInElasticsearch
  *
- * Classes using this trait must declare the `$elasticsearchType` property
- * and use the `SoftDeletes` trait.
+ * Classes using this trait must declare the `$elasticsearchType` property and
+ * implement the `Searchable` interface.
  *
  * @package Poniverse\Ponyfm\Traits
  */
 trait IndexedInElasticsearchTrait
 {
-    /**
-     * Returns this model in Elasticsearch-friendly form. The array returned by
-     * this method should match the current mapping for this model's ES type.
-     *
-     * @return array
-     */
-    abstract public function toElasticsearch();
+    use DispatchesJobs;
 
-    /**
-     * @return bool whether this particular object should be indexed or not
-     */
-    abstract public function shouldBeIndexed():bool;
+    // These two functions are from the Searchable interface. They're included
+    // here, without being implemented, to assist IDE's when editing this trait.
+    public abstract function toElasticsearch():array;
+    public abstract function shouldBeIndexed():bool;
 
 
+    // Laravel automatically runs this method based on the trait's name. #magic
     public static function bootIndexedInElasticsearchTrait() {
-        static::saved(function ($model) {
-            $model->ensureElasticsearchEntryIsUpToDate();
+        static::saved(function (Searchable $entity) {
+            $entity->updateElasticsearchEntry();
         });
 
-        static::deleted(function ($model) {
-            $model->ensureElasticsearchEntryIsUpToDate();
+        static::deleted(function (Searchable $entity) {
+            $entity->updateElasticsearchEntry();
         });
     }
 
@@ -63,7 +62,7 @@ trait IndexedInElasticsearchTrait
      */
     private function getElasticsearchParameters(bool $includeBody = true) {
         $parameters = [
-            'index' => 'ponyfm',
+            'index' => Config::get('ponyfm.elasticsearch_index'),
             'type'  => $this->elasticsearchType,
             'id'    => $this->id,
         ];
@@ -89,7 +88,20 @@ trait IndexedInElasticsearchTrait
         }
     }
 
-    public function ensureElasticsearchEntryIsUpToDate() {
+    /**
+     * Asynchronously updates the Elasticsearch entry.
+     * When in doubt, this is the method to use.
+     */
+    public function updateElasticsearchEntry() {
+        $job = (new UpdateSearchIndexForEntity($this))->onQueue(Config::get('ponyfm.indexing_queue'));
+        $this->dispatch($job);
+    }
+
+    /**
+     * Synchronously updates the Elasticsearch entry. This should only be
+     * called from the UpdateSearchIndexForEntity job.
+     */
+    public function updateElasticsearchEntrySynchronously() {
         if ($this->shouldBeIndexed()) {
             $this->createOrUpdateElasticsearchEntry();
         } else {
diff --git a/config/ponyfm.php b/config/ponyfm.php
index af45bf27..c94ed5c1 100644
--- a/config/ponyfm.php
+++ b/config/ponyfm.php
@@ -76,4 +76,17 @@ return [
 
     'elasticsearch_index' => 'ponyfm',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Indexing queue name
+    |--------------------------------------------------------------------------
+    |
+    | The name of the queue to process re-indexing jobs on. This is separated
+    | from the default queue to avoid having a site-wide re-index clog uploads
+    | and downloads.
+    |
+    */
+
+    'indexing_queue' => 'indexing',
+
 ];
diff --git a/config/queue.php b/config/queue.php
index cf9b09da..2092ae44 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -35,13 +35,6 @@ return [
             'driver' => 'sync',
         ],
 
-        'database' => [
-            'driver' => 'database',
-            'table' => 'jobs',
-            'queue' => 'default',
-            'expire' => 60,
-        ],
-
         'beanstalkd' => [
             'driver' => 'beanstalkd',
             'host'   => 'localhost',
@@ -49,30 +42,6 @@ return [
             'ttr'    => 60,
         ],
 
-        'sqs' => [
-            'driver' => 'sqs',
-            'key'    => 'your-public-key',
-            'secret' => 'your-secret-key',
-            'queue'  => 'your-queue-url',
-            'region' => 'us-east-1',
-        ],
-
-        'iron' => [
-            'driver'  => 'iron',
-            'host'    => 'mq-aws-us-east-1.iron.io',
-            'token'   => 'your-token',
-            'project' => 'your-project-id',
-            'queue'   => 'your-queue-name',
-            'encrypt' => true,
-        ],
-
-        'redis' => [
-            'driver' => 'redis',
-            'connection' => 'default',
-            'queue'  => 'default',
-            'expire' => 60,
-        ],
-
     ],
 
     /*

From d094dee075a98a095a8846b86bfff0d461cc6600 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Sun, 17 Jan 2016 07:53:18 -0800
Subject: [PATCH 15/15] #1: Elasticsearch should actually get installed in the
 dev environment.

---
 vagrant/copy-and-restart-configs.sh | 1 +
 vagrant/install.sh                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/vagrant/copy-and-restart-configs.sh b/vagrant/copy-and-restart-configs.sh
index 20a70c40..49a94161 100755
--- a/vagrant/copy-and-restart-configs.sh
+++ b/vagrant/copy-and-restart-configs.sh
@@ -7,6 +7,7 @@ sudo cp /vagrant/vagrant/php-overrides.ini /etc/php/7.0/fpm/99-overrides.ini
 
 sudo cp /vagrant/vagrant/pony.fm.redis.config /etc/redis/redis.conf
 
+sudo service elasticsearch restart
 sudo service nginx restart
 sudo service php7.0-fpm restart
 
diff --git a/vagrant/install.sh b/vagrant/install.sh
index 654b251e..14b55c27 100755
--- a/vagrant/install.sh
+++ b/vagrant/install.sh
@@ -22,7 +22,7 @@ echo "Running apt-get update..."
 sudo apt-get -qq update
 
 echo "Installing tagging tools & other dependencies..."
-sudo apt-get -qq install -y AtomicParsley flac vorbis-tools imagemagick oracle-java8-installer pkg-config yasm libfaac-dev libmp3lame-dev libvorbis-dev libtheora-dev
+sudo apt-get -qq install -y AtomicParsley flac vorbis-tools imagemagick oracle-java8-installer elasticsearch pkg-config yasm libfaac-dev libmp3lame-dev libvorbis-dev libtheora-dev
 
 
 if type ffmpeg &>/dev/null; then