added some support for url aliases

composer.json

@@ -12,6 +12,7 @@
   "require": {
     "hashids/hashids": "~1.0@dev",
     "united-prototype/php-ga": "dev-composer",
+    "ivkos/pushbullet": "2.*",
     "php": ">=5.3.2"
   },
   "require-dev": {

src/Pean/Wash.php

@@ -80,7 +80,13 @@ protected function identifyURL($url) {
       return FALSE;
     }
 
-    $url_id = $this->hashids('decode',$hash);
+    // Check alias first
+    $url_id = $this->getAlias($hash);
+
+    // If not an alias, go to hash
+    if($url_id === FALSE) {
+      $url_id = $this->hashids('decode',$hash);
+    }
 
     if(preg_match('/^[\d]+$/',$url_id)) {
       // Something there
@@ -133,6 +139,22 @@ protected function gotoURL($url, $output = 'redirect') {
     }
   }
 
+  protected function getAlias($alias) {
+    $this->db();
+    $sql = "select url_id from wash_aliases where alias=?";
+    $stmt = $this->dbh->prepare($sql);
+    try {
+      $stmt->execute(array($alias));
+      $url_id = $stmt->fetchColumn();
+    } catch (PDOException $e) {
+      $this->response(0,"errorMsg","Could not fetch alias: ".$e->getMessage());
+    }
+    if(!empty($url_id)) {
+      return $url_id;
+    }
+    return FALSE;
+  }
+
   protected function getUser() {
 
     if(empty($this->arr['token'])) {

tables.sql

@@ -19,3 +19,10 @@ created datetime,
 primary key(id),
 foreign key uid(user_id) references wash_users(id) on delete cascade
 )engine=InnoDB;
+
+
+create table wash_aliases(
+url_id int,
+alias varchar(255) unique,
+foreign key uid(url_id) references wash_urls(id) on delete cascade
+)engine=InnoDB;

tests/WashTests.php

@@ -85,6 +85,18 @@ public function testIdentifyURL() {
 
   }
 
+  public function testGetAlias() {
+
+    $alias = 'wash';
+
+    $method = new ReflectionMethod($this->wash,'getAlias');
+    $method->setAccessible(TRUE);
+
+    $id = $method->invokeArgs($this->wash, array($alias));
+    $this->assertEquals(FALSE,$id);
+
+  }
+
   public function testGotoURL() {
     $method = new ReflectionMethod($this->wash,'gotoURL');
     $method->setAccessible(TRUE);