Refactor gulp to use new Repo class

src/Gulp.php

@@ -1,131 +1,64 @@
 <?php
 namespace WillFarrell\AlfredPkgMan;
 
-/*
-gulp
-
-*/
-
-// ****************
-
 require_once('Cache.php');
+require_once('Repo.php');
 
-class Repo {
-
-	private $id = 'gulp';
-	private $kind = 'plugins'; // for none found msg
-	private $min_query_length = 1; // increase for slow DBs
-	private $max_return = 25;
-
-	private $cache;
-	private $w;
-	private $pkgs;
-
-	function __construct() {
-
-		$this->cache = new Cache();
-
-		// get DB here if not dynamic search
-		$data = (array) $this->cache->get_db($this->id)->results;
-		$this->pkgs = $data;
-	}
-
-	// return id | url | pkgstr
-	function makeArg($id, $url, $version) {
-		return $id . "|" . $url . "|" . $id;//"\"$id\":\"$version\",";
-	}
-
-	function check($pkg, $query) {
-		if (!$query) { return true; }
-		if (strpos($pkg->name, $query) !== false) {
-			return true;
-		} else if (strpos($pkg->description, $query) !== false) {
-			return true;
-		} 
-
-		return false;
-	}
-
-	function search($query) {
-		if ( strlen($query) < $this->min_query_length) {
-			if ( strlen($query) === 0 ) { return; }
-			$this->cache->w->result(
-				"{$this->id}-min",
-				$query,
-				"Minimum query length of {$this->min_query_length} not met.",
-				"",
-				"icon-cache/{$this->id}.png"
-			);
-			return;
+class Gulp extends Repo
+{
+	protected $id         = 'gulp';
+	protected $kind       = 'plugins';
+	protected $url        = 'http://gulpjs.com';
+	protected $search_url = 'http://gulpjs.com/plugins/#?q=';
+	protected $has_db     = true;
+
+	public function search($query)
+	{
+		if (!$this->hasMinQueryLength($query)) {
+			return $this->xml(); 
 		}
 
-		//$this->pkgs = $this->cache->get_query_json($this->id, $query, "_TEMPLATE_SEARCH_URL_{$query}");
-
-		foreach($this->pkgs as $pkg) {
+		foreach($this->pkgs->results as $pkg) {
 
 			// make params
 			if ($this->check($pkg, $query)) {
-				$title = str_replace('gulp-', '', $pkg->name); // remove pulp- from title
+				$title = str_replace('gulp-', '', $pkg->name); // remove gulp- from title
 
 				// add version to title
 				if (isset($pkg->version)) {
-					$title .= ' v'.$pkg->version;
+					$title .= " v{$pkg->version}";
 				}
 				// add author to title
 				if (isset($pkg->author)) {
-					$title .= " by " . $pkg->author;
+					$title .= " by {$pkg->author}";
 				}
 
-				//if (strpos($plugin->description, "DEPRECATED") !== false) { continue; } // skip DEPRECATED repos
+				// skip DEPRECATED repos
+				// if (strpos($plugin->description, "DEPRECATED") !== false) {
+				// 	continue;
+				// }
+
 				$this->cache->w->result(
 					$pkg->name,
-					$this->makeArg($pkg->name, $pkg->homepage, "*"),
+					$this->makeArg($pkg->name, $pkg->homepage),
 					$title,
 					$pkg->description,
 					"icon-cache/{$this->id}.png"
 				);
 			}
-
-
-
+
 			// only search till max return reached
 			if ( count ( $this->cache->w->results() ) == $this->max_return ) {
 				break;
 			}
 		}
-
-		if ( count( $this->cache->w->results() ) == 0) {
-			$this->cache->w->result(
-				"{$this->id}-search",
-				"http://gulpjs.com/plugins/#?q={$query}",
-				"No {$this->kind} were found that matched \"{$query}\"",
-				"Click to see the results for yourself",
-				"icon-cache/{$this->id}.png"
-			);
-		}
-	}
-
-	function xml() {
-		$this->cache->w->result(
-			"{$this->id}-www",
-			'http://gulpjs.com/',
-			'Go to the website',
-			'http://gulpjs.com',
-			"icon-cache/{$this->id}.png"
-		);
-
-		return $this->cache->w->toxml();
-	}
-
-}
 
-// ****************
+		$this->noResults($query, "{$this->search_url}{$query}");
 
-/*
-$query = "min";
-$repo = new Repo();
-$repo->search($query);
-echo $repo->xml();
-*/
+		return $this->xml();
+	}
+}
 
-?>
+// Test code, uncomment to debug this script from the command-line
+// $repo = new Gulp();
+// echo $repo->search('min');