update code from mohiohio lib

Author: tim-field

Dispatch.php

@@ -5,12 +5,14 @@ Easily add custom URL endpoints in WordPress. Map a url to a function.
 ##Example
 
 ```
-new \TheFold\WordPress\Dispatch([
+use \TheFold\WordPress\Router;
+
+Router::routes([
 
     'testing-a-url' => function(){
-        echo 'Hello Ted'; 
+        echo 'Hello Ted';
     },
-    
+
     'hello-([a-z]+)' => function($request, $name){
         echo "Hello $name";
     }

README.md

@@ -2,107 +2,66 @@
 
 namespace TheFold\WordPress;
 
-class Router {
+class Dispatch {
 
-    function __construct(array $url_callbacks, $priority = 5) {
+    static function routes(array $url_callbacks, $priority = 5) {
 
         add_filter('rewrite_rules_array', function($rules) use ($url_callbacks) {
-
-            foreach (array_keys($url_callbacks) as $look_for_in_url) {
-
-                if(is_array($look_for_in_url)){
-                    list($method, $route) = each($look_for_in_url);
-                } else {
-                    $method = '*';
-                    $route = $look_for_in_url;
-                }
-
-                $newRule = ['^'.trim($route,'/').'/?$' => 'index.php?'.$this->query_var_name($look_for_in_url).'='.$method];
-                $rules = $newRule + $rules;
-            }
-
-            return $rules;
+            return array_reduce( array_keys($url_callbacks), function($rules, $route) {
+                $newRule = ['^'.trim($route,'/').'/?$' => 'index.php?'.static::query_var_name($route).'=1'];
+                return $newRule + $rules;
+            }, $rules );
         });
 
         add_filter('query_vars', function($qvars) use ($url_callbacks) {
-            
-            foreach (array_keys($url_callbacks) as $look_for_in_url) {
-                
-                $var = $this->query_var_name($look_for_in_url);
-                $qvars[] = $var; 
-            }
-            return $qvars;
+            return array_reduce(array_keys($url_callbacks), function($qvars, $route) {
+                $qvars[] = static::query_var_name($route);
+                return $qvars;
+            },$qvars);
         });
-        
-        add_action( 'template_redirect', function() use ($url_callbacks) {
 
+        add_action( 'template_redirect', function() use ($url_callbacks) {
             global $wp_query;
-
-            foreach ($url_callbacks as $url_key => $callback) {
-
-                if ($wp_query->get( $this->query_var_name($url_key))) {
-
-                    if(is_array($url_key)){
-                        list($method, $route) = $url_key;
+            foreach ($url_callbacks as $route => $callback) {
+                if ($wp_query->get( static::query_var_name($route))) {
+                    $wp_query->is_home = false;
+                    $params = null;
+                    preg_match('#'.trim($route,'/').'#',$_SERVER['REQUEST_URI'],$params);
+                    $res = call_user_func_array($callback,$params);
+                    if($res === false) {
+                        static::send_404();
                     } else {
-                        $method = '*';
-                        $route = $url_key;
-                    }
-
-                    if($method == '*' || $method == $_REQUEST['REQUEST_METHOD']){
-
-                        $wp_query->is_home = false;
-
-                        $params = null;
-
-                        preg_match('#'.trim($route,'/').'#',$_SERVER['REQUEST_URI'],$params);
-
-                        $res = call_user_func_array($callback,$params);
-
-                        if($res === false)
-                            $this->send_404();
-                        else{
-                            exit();
-                        }
+                        exit();
                     }
                 }
             }
-        }, get_option('url_access_priority',$priority) );
-       
+        }, get_option('thefold/router-priority',$priority) );
+
         add_action('init', function() use ($url_callbacks) {
-            $this->maybe_flush_rewrites($url_callbacks);
+            static::maybe_flush_rewrites($url_callbacks);
         }, 99);
     }
 
-    protected function maybe_flush_rewrites($url_callbacks) {
-
+    static protected function maybe_flush_rewrites($url_callbacks) {
         $current = md5(json_encode(array_keys($url_callbacks)));
-
         $cached = get_option(get_called_class(), null );
-
         if ( empty( $cached ) ||  $current !== $cached ) {
             flush_rewrite_rules();
             update_option(get_called_class(), $current );
         }
     }
-  
-    protected function query_var_name($route) {
 
+    static protected function query_var_name($route) {
         static $cache;
-
         if (!isset($cache[$route])) {
-            $cache[$route] = md5(json_encode($route));
+            $cache[$route] = md5($route);
         }
-
-        return $cache[$route]; 
+        return $cache[$route];
     }
 
-    protected function send_404() {
-
+    static protected function send_404() {
         global $wp_query;
-
         status_header('404');
-
         $wp_query->set_404();
     }
 }

Router.php

@@ -5,7 +5,7 @@
     "authors": [
         {
             "name": "Tim Field",
-            "email": "tim@thefold.co.nz"
+            "email": "field.tim@gmail.com"
         }
     ],
     "require": {

composer.json

@@ -1,12 +1,12 @@
 <?php
 /**
  * Plugin Name: WordPress Dispatcher
- * Plugin URI: https://github.com/timbofield/wordpress-dispatcher
+ * Plugin URI: https://github.com/tim-field/wordpress-dispatcher
  * Description: Create URL endpoints within WordPress
- * Version: 1.0
+ * Version: 2.0
  * Author: Tim Field
- * Author URI: http://www.thefold.co.nz
+ * Author URI: http://github.com/tim-field
  * License: MIT
  */
 
-require_once(__DIR__ . '/Dispatch.php');
+require_once(__DIR__ . '/Router.php');