litefeel / writing-on-github

lib/api.php

Indentation +48 added lines, -48 removed lines

@@ -9,59 +9,59 @@
  */
 class Writing_On_GitHub_Api {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
 
-    /**
-     * GitHub fetch client.
-     *
-     * @var Writing_On_GitHub_Fetch_Client
-     */
-    protected $fetch;
+	/**
+	 * GitHub fetch client.
+	 *
+	 * @var Writing_On_GitHub_Fetch_Client
+	 */
+	protected $fetch;
 
-    /**
-     * Github persist client.
-     *
-     * @var Writing_On_GitHub_Persist_Client
-     */
-    protected $persist;
+	/**
+	 * Github persist client.
+	 *
+	 * @var Writing_On_GitHub_Persist_Client
+	 */
+	protected $persist;
 
-    /**
-     * Instantiates a new Api object.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
+	/**
+	 * Instantiates a new Api object.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
 
-    /**
-     * Lazy-load fetch client.
-     *
-     * @return Writing_On_GitHub_Fetch_Client
-     */
-    public function fetch() {
-        if ( ! $this->fetch ) {
-            $this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
-        }
+	/**
+	 * Lazy-load fetch client.
+	 *
+	 * @return Writing_On_GitHub_Fetch_Client
+	 */
+	public function fetch() {
+		if ( ! $this->fetch ) {
+			$this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
+		}
 
-        return $this->fetch;
-    }
+		return $this->fetch;
+	}
 
-    /**
-     * Lazy-load persist client.
-     *
-     * @return Writing_On_GitHub_Persist_Client
-     */
-    public function persist() {
-        if ( ! $this->persist ) {
-            $this->persist = new Writing_On_GitHub_Persist_Client( $this->app );
-        }
+	/**
+	 * Lazy-load persist client.
+	 *
+	 * @return Writing_On_GitHub_Persist_Client
+	 */
+	public function persist() {
+		if ( ! $this->persist ) {
+			$this->persist = new Writing_On_GitHub_Persist_Client( $this->app );
+		}
 
-        return $this->persist;
-    }
+		return $this->persist;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
      *
      * @param Writing_On_GitHub $app Application container.
      */
-    public function __construct( Writing_On_GitHub $app ) {
+    public function __construct(Writing_On_GitHub $app) {
         $this->app = $app;
     }
 
@@ -45,8 +45,8 @@ 
      * @return Writing_On_GitHub_Fetch_Client
      */
     public function fetch() {
-        if ( ! $this->fetch ) {
-            $this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
+        if ( ! $this->fetch) {
+            $this->fetch = new Writing_On_GitHub_Fetch_Client($this->app);
         }
 
         return $this->fetch;
@@ -58,8 +58,8 @@ 
      * @return Writing_On_GitHub_Persist_Client
      */
     public function persist() {
-        if ( ! $this->persist ) {
-            $this->persist = new Writing_On_GitHub_Persist_Client( $this->app );
+        if ( ! $this->persist) {
+            $this->persist = new Writing_On_GitHub_Persist_Client($this->app);
         }
 
         return $this->persist;

lib/payload.php

Indentation +112 added lines, -112 removed lines

@@ -9,116 +9,116 @@
  */
 class Writing_On_GitHub_Payload {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Payload data.
-     *
-     * @var stdClass
-     */
-    protected $data;
-
-    /**
-     * Writing_On_GitHub_Payload constructor.
-     *
-     * @param Writing_On_GitHub $app      Application container.
-     * @param string                $raw_data Raw request data.
-     */
-    public function __construct( Writing_On_GitHub $app, $raw_data ) {
-        $this->app  = $app;
-        $this->data = json_decode( $raw_data );
-    }
-
-    /**
-     * Returns whether payload should be imported.
-     *
-     * @return bool
-     */
-    public function should_import() {
-        // @todo how do we get this without importing the whole api object just for this?
-        if ( strtolower( $this->data->repository->full_name ) !== strtolower( $this->app->api()->fetch()->repository() ) ) {
-            return false;
-        }
-
-        // The last term in the ref is the payload_branch name.
-        $refs   = explode( '/', $this->data->ref );
-        $payload_branch = array_pop( $refs );
-
-        $branch = $this->app->api()->fetch()->branch();
-
-        if ( $branch !== $payload_branch ) {
-            return false;
-        }
-
-        // We add a tag to commits we push out, so we shouldn't pull them in again.
-        $tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
-
-        if ( ! $tag ) {
-            throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
-        }
-
-        if ( $tag === substr( $this->message(), -1 * strlen( $tag ) ) ) {
-            return false;
-        }
-
-        if ( ! $this->get_commit_id() ) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function get_before_commit_id() {
-        return $this->data->before ? $this->data->before : null;
-    }
-
-    /**
-     * Returns the sha of the head commit.
-     *
-     * @return string
-     */
-    public function get_commit_id() {
-        return $this->data->head_commit ? $this->data->head_commit->id : null;
-    }
-
-    /**
-     * Returns the email address for the commit author.
-     *
-     * @return string
-     */
-    public function get_author_email() {
-        return $this->data->head_commit->author->email;
-    }
-
-    /**
-     * Returns array commits for the payload.
-     *
-     * @return array
-     */
-    public function get_commits() {
-        return $this->data->commits;
-    }
-
-    /**
-     * Returns the repository's full name.
-     *
-     * @return string
-     */
-    public function get_repository_name() {
-        return $this->data->repository->full_name;
-    }
-
-    /**
-     * Returns the payload's commit message.
-     *
-     * @return string
-     */
-    protected function message() {
-        return $this->data->head_commit->message;
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Payload data.
+	 *
+	 * @var stdClass
+	 */
+	protected $data;
+
+	/**
+	 * Writing_On_GitHub_Payload constructor.
+	 *
+	 * @param Writing_On_GitHub $app      Application container.
+	 * @param string                $raw_data Raw request data.
+	 */
+	public function __construct( Writing_On_GitHub $app, $raw_data ) {
+		$this->app  = $app;
+		$this->data = json_decode( $raw_data );
+	}
+
+	/**
+	 * Returns whether payload should be imported.
+	 *
+	 * @return bool
+	 */
+	public function should_import() {
+		// @todo how do we get this without importing the whole api object just for this?
+		if ( strtolower( $this->data->repository->full_name ) !== strtolower( $this->app->api()->fetch()->repository() ) ) {
+			return false;
+		}
+
+		// The last term in the ref is the payload_branch name.
+		$refs   = explode( '/', $this->data->ref );
+		$payload_branch = array_pop( $refs );
+
+		$branch = $this->app->api()->fetch()->branch();
+
+		if ( $branch !== $payload_branch ) {
+			return false;
+		}
+
+		// We add a tag to commits we push out, so we shouldn't pull them in again.
+		$tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
+
+		if ( ! $tag ) {
+			throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
+		}
+
+		if ( $tag === substr( $this->message(), -1 * strlen( $tag ) ) ) {
+			return false;
+		}
+
+		if ( ! $this->get_commit_id() ) {
+			return false;
+		}
+
+		return true;
+	}
+
+	public function get_before_commit_id() {
+		return $this->data->before ? $this->data->before : null;
+	}
+
+	/**
+	 * Returns the sha of the head commit.
+	 *
+	 * @return string
+	 */
+	public function get_commit_id() {
+		return $this->data->head_commit ? $this->data->head_commit->id : null;
+	}
+
+	/**
+	 * Returns the email address for the commit author.
+	 *
+	 * @return string
+	 */
+	public function get_author_email() {
+		return $this->data->head_commit->author->email;
+	}
+
+	/**
+	 * Returns array commits for the payload.
+	 *
+	 * @return array
+	 */
+	public function get_commits() {
+		return $this->data->commits;
+	}
+
+	/**
+	 * Returns the repository's full name.
+	 *
+	 * @return string
+	 */
+	public function get_repository_name() {
+		return $this->data->repository->full_name;
+	}
+
+	/**
+	 * Returns the payload's commit message.
+	 *
+	 * @return string
+	 */
+	protected function message() {
+		return $this->data->head_commit->message;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -29,9 +29,9 @@ 
      * @param Writing_On_GitHub $app      Application container.
      * @param string                $raw_data Raw request data.
      */
-    public function __construct( Writing_On_GitHub $app, $raw_data ) {
+    public function __construct(Writing_On_GitHub $app, $raw_data) {
         $this->app  = $app;
-        $this->data = json_decode( $raw_data );
+        $this->data = json_decode($raw_data);
     }
 
     /**
@@ -41,32 +41,32 @@ 
      */
     public function should_import() {
         // @todo how do we get this without importing the whole api object just for this?
-        if ( strtolower( $this->data->repository->full_name ) !== strtolower( $this->app->api()->fetch()->repository() ) ) {
+        if (strtolower($this->data->repository->full_name) !== strtolower($this->app->api()->fetch()->repository())) {
             return false;
         }
 
         // The last term in the ref is the payload_branch name.
-        $refs   = explode( '/', $this->data->ref );
-        $payload_branch = array_pop( $refs );
+        $refs   = explode('/', $this->data->ref);
+        $payload_branch = array_pop($refs);
 
         $branch = $this->app->api()->fetch()->branch();
 
-        if ( $branch !== $payload_branch ) {
+        if ($branch !== $payload_branch) {
             return false;
         }
 
         // We add a tag to commits we push out, so we shouldn't pull them in again.
-        $tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
+        $tag = apply_filters('wogh_commit_msg_tag', 'wogh');
 
-        if ( ! $tag ) {
-            throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
+        if ( ! $tag) {
+            throw new Exception(__('Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github'));
         }
 
-        if ( $tag === substr( $this->message(), -1 * strlen( $tag ) ) ) {
+        if ($tag === substr($this->message(), -1 * strlen($tag))) {
             return false;
         }
 
-        if ( ! $this->get_commit_id() ) {
+        if ( ! $this->get_commit_id()) {
             return false;
         }
 

lib/fileinfo.php

Indentation +8 added lines, -8 removed lines

@@ -6,13 +6,13 @@
  */
 class Writing_On_GitHub_File_Info {
 
-    public function __construct( stdClass $data ) {
-        $this->sha          = $data->sha;
-        $this->path         = $data->path;
-        $this->status       = $data->status;
-    }
+	public function __construct( stdClass $data ) {
+		$this->sha          = $data->sha;
+		$this->path         = $data->path;
+		$this->status       = $data->status;
+	}
 
-    public $sha;
-    public $path;
-    public $status;  // added removed modified
+	public $sha;
+	public $path;
+	public $status;  // added removed modified
 }

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
  */
 class Writing_On_GitHub_File_Info {
 
-    public function __construct( stdClass $data ) {
+    public function __construct(stdClass $data) {
         $this->sha          = $data->sha;
         $this->path         = $data->path;
         $this->status       = $data->status;
@@ -14,5 +14,5 @@ 
 
     public $sha;
     public $path;
-    public $status;  // added removed modified
+    public $status; // added removed modified
 }

lib/semaphore.php

Indentation +51 added lines, -51 removed lines

@@ -9,55 +9,55 @@
  */
 class Writing_On_GitHub_Semaphore {
 
-    /**
-     * Sempahore's option key.
-     */
-    const KEY = 'wogh_semaphore_lock';
-
-    /**
-     * Option key when semaphore is locked.
-     */
-    const VALUE_LOCKED = 'yes';
-
-    /**
-     * Option key when semaphore is unlocked.
-     */
-    const VALUE_UNLOCKED = 'no';
-
-    /**
-     * Clean up the old values on instantiation.
-     */
-    public function __construct() {
-        delete_option( self::KEY );
-    }
-
-    /**
-     * Checks if the Semaphore is open.
-     *
-     * Fails to report it's open if the the Api class can't make a call
-     * or the push lock has been enabled.
-     *
-     * @return bool
-     */
-    public function is_open() {
-        if ( self::VALUE_LOCKED === get_transient( self::KEY ) ) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Enables the push lock.
-     */
-    public function lock() {
-        set_transient( self::KEY, self::VALUE_LOCKED, MINUTE_IN_SECONDS );
-    }
-
-    /**
-     * Disables the push lock.
-     */
-    public function unlock() {
-        set_transient( self::KEY, self::VALUE_UNLOCKED, MINUTE_IN_SECONDS );
-    }
+	/**
+	 * Sempahore's option key.
+	 */
+	const KEY = 'wogh_semaphore_lock';
+
+	/**
+	 * Option key when semaphore is locked.
+	 */
+	const VALUE_LOCKED = 'yes';
+
+	/**
+	 * Option key when semaphore is unlocked.
+	 */
+	const VALUE_UNLOCKED = 'no';
+
+	/**
+	 * Clean up the old values on instantiation.
+	 */
+	public function __construct() {
+		delete_option( self::KEY );
+	}
+
+	/**
+	 * Checks if the Semaphore is open.
+	 *
+	 * Fails to report it's open if the the Api class can't make a call
+	 * or the push lock has been enabled.
+	 *
+	 * @return bool
+	 */
+	public function is_open() {
+		if ( self::VALUE_LOCKED === get_transient( self::KEY ) ) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Enables the push lock.
+	 */
+	public function lock() {
+		set_transient( self::KEY, self::VALUE_LOCKED, MINUTE_IN_SECONDS );
+	}
+
+	/**
+	 * Disables the push lock.
+	 */
+	public function unlock() {
+		set_transient( self::KEY, self::VALUE_UNLOCKED, MINUTE_IN_SECONDS );
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
      * Clean up the old values on instantiation.
      */
     public function __construct() {
-        delete_option( self::KEY );
+        delete_option(self::KEY);
     }
 
     /**
@@ -40,7 +40,7 @@ 
      * @return bool
      */
     public function is_open() {
-        if ( self::VALUE_LOCKED === get_transient( self::KEY ) ) {
+        if (self::VALUE_LOCKED === get_transient(self::KEY)) {
             return false;
         }
 
@@ -51,13 +51,13 @@ 
      * Enables the push lock.
      */
     public function lock() {
-        set_transient( self::KEY, self::VALUE_LOCKED, MINUTE_IN_SECONDS );
+        set_transient(self::KEY, self::VALUE_LOCKED, MINUTE_IN_SECONDS);
     }
 
     /**
      * Disables the push lock.
      */
     public function unlock() {
-        set_transient( self::KEY, self::VALUE_UNLOCKED, MINUTE_IN_SECONDS );
+        set_transient(self::KEY, self::VALUE_UNLOCKED, MINUTE_IN_SECONDS);
     }
 }

lib/request.php

Indentation +132 added lines, -132 removed lines

@@ -9,136 +9,136 @@
  */
 class Writing_On_GitHub_Request {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Raw request data.
-     *
-     * @var string
-     */
-    protected $raw_data;
-
-    /**
-     * Headers
-     * @var array
-     */
-    protected $headers;
-
-    /**
-     * Writing_On_GitHub_Request constructor.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Validates the header's secret.
-     *
-     * @return true|WP_Error
-     */
-    public function is_secret_valid() {
-        $headers = $this->headers();
-
-        $this->raw_data = $this->read_raw_data();
-
-        // Validate request secret.
-        $hash = hash_hmac( 'sha1', $this->raw_data, $this->secret() );
-        if ( 'sha1=' . $hash !== $headers['X-Hub-Signature'] ) {
-            return false;
-        }
-
-        //      [X-Hub-Signature] => sha1=3cf3da70de401f7dfff053392f60cc534efed3b4
-        //     [Content-Type] => application/json
-        //     [X-Github-Delivery] => b2102500-0acf-11e7-8acb-fd86a3497c2f
-        //     [X-Github-Event] => ping
-
-        return true;
-    }
-
-    /**
-     * Validates the ping event.
-     * @return boolean
-     */
-    public function is_ping() {
-        $headers = $this->headers();
-
-        $event = $headers['X-Github-Event'];
-        return 'ping' == $event;
-    }
-
-    /**
-     * Validates the push event.
-     * @return boolean
-     */
-    public function is_push() {
-        $headers = $this->headers();
-
-        $event = $headers['X-Github-Event'];
-        return 'push' == $event;
-    }
-
-    /**
-     * Returns a payload object for the given request.
-     *
-     * @return Writing_On_GitHub_Payload
-     */
-    public function payload() {
-        return new Writing_On_GitHub_Payload( $this->app, $this->raw_data );
-    }
-
-    /**
-     * Cross-server header support.
-     *
-     * Returns an array of the request's headers.
-     *
-     * @return array
-     */
-    protected function headers() {
-        if ( ! empty( $this->headers ) ) {
-            return $this->headers;
-        }
-
-        if ( function_exists( 'getallheaders' ) ) {
-
-            $this->headers = getallheaders();
-            return $this->headers;
-        }
-        /**
-         * Nginx and pre 5.4 workaround.
-         * @see http://www.php.net/manual/en/function.getallheaders.php
-         */
-        $this->headers = array();
-        foreach ( $_SERVER as $name => $value ) {
-            if ( 'HTTP_' === substr( $name, 0, 5 ) ) {
-                $this->headers[ str_replace( ' ', '-', ucwords( strtolower( str_replace( '_', ' ', substr( $name, 5 ) ) ) ) ) ] = $value;
-            }
-        }
-
-        return $this->headers;
-    }
-
-    /**
-     * Reads the raw data from STDIN.
-     *
-     * @return string
-     */
-    protected function read_raw_data() {
-        return file_get_contents( 'php://input' );
-    }
-
-    /**
-     * Returns the Webhook secret
-     *
-     * @return string
-     */
-    protected function secret() {
-        return get_option( 'wogh_secret' );
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Raw request data.
+	 *
+	 * @var string
+	 */
+	protected $raw_data;
+
+	/**
+	 * Headers
+	 * @var array
+	 */
+	protected $headers;
+
+	/**
+	 * Writing_On_GitHub_Request constructor.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Validates the header's secret.
+	 *
+	 * @return true|WP_Error
+	 */
+	public function is_secret_valid() {
+		$headers = $this->headers();
+
+		$this->raw_data = $this->read_raw_data();
+
+		// Validate request secret.
+		$hash = hash_hmac( 'sha1', $this->raw_data, $this->secret() );
+		if ( 'sha1=' . $hash !== $headers['X-Hub-Signature'] ) {
+			return false;
+		}
+
+		//      [X-Hub-Signature] => sha1=3cf3da70de401f7dfff053392f60cc534efed3b4
+		//     [Content-Type] => application/json
+		//     [X-Github-Delivery] => b2102500-0acf-11e7-8acb-fd86a3497c2f
+		//     [X-Github-Event] => ping
+
+		return true;
+	}
+
+	/**
+	 * Validates the ping event.
+	 * @return boolean
+	 */
+	public function is_ping() {
+		$headers = $this->headers();
+
+		$event = $headers['X-Github-Event'];
+		return 'ping' == $event;
+	}
+
+	/**
+	 * Validates the push event.
+	 * @return boolean
+	 */
+	public function is_push() {
+		$headers = $this->headers();
+
+		$event = $headers['X-Github-Event'];
+		return 'push' == $event;
+	}
+
+	/**
+	 * Returns a payload object for the given request.
+	 *
+	 * @return Writing_On_GitHub_Payload
+	 */
+	public function payload() {
+		return new Writing_On_GitHub_Payload( $this->app, $this->raw_data );
+	}
+
+	/**
+	 * Cross-server header support.
+	 *
+	 * Returns an array of the request's headers.
+	 *
+	 * @return array
+	 */
+	protected function headers() {
+		if ( ! empty( $this->headers ) ) {
+			return $this->headers;
+		}
+
+		if ( function_exists( 'getallheaders' ) ) {
+
+			$this->headers = getallheaders();
+			return $this->headers;
+		}
+		/**
+		 * Nginx and pre 5.4 workaround.
+		 * @see http://www.php.net/manual/en/function.getallheaders.php
+		 */
+		$this->headers = array();
+		foreach ( $_SERVER as $name => $value ) {
+			if ( 'HTTP_' === substr( $name, 0, 5 ) ) {
+				$this->headers[ str_replace( ' ', '-', ucwords( strtolower( str_replace( '_', ' ', substr( $name, 5 ) ) ) ) ) ] = $value;
+			}
+		}
+
+		return $this->headers;
+	}
+
+	/**
+	 * Reads the raw data from STDIN.
+	 *
+	 * @return string
+	 */
+	protected function read_raw_data() {
+		return file_get_contents( 'php://input' );
+	}
+
+	/**
+	 * Returns the Webhook secret
+	 *
+	 * @return string
+	 */
+	protected function secret() {
+		return get_option( 'wogh_secret' );
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -34,7 +34,7 @@ 
      *
      * @param Writing_On_GitHub $app Application container.
      */
-    public function __construct( Writing_On_GitHub $app ) {
+    public function __construct(Writing_On_GitHub $app) {
         $this->app = $app;
     }
 
@@ -49,8 +49,8 @@ 
         $this->raw_data = $this->read_raw_data();
 
         // Validate request secret.
-        $hash = hash_hmac( 'sha1', $this->raw_data, $this->secret() );
-        if ( 'sha1=' . $hash !== $headers['X-Hub-Signature'] ) {
+        $hash = hash_hmac('sha1', $this->raw_data, $this->secret());
+        if ('sha1=' . $hash !== $headers['X-Hub-Signature']) {
             return false;
         }
 
@@ -90,7 +90,7 @@ 
      * @return Writing_On_GitHub_Payload
      */
     public function payload() {
-        return new Writing_On_GitHub_Payload( $this->app, $this->raw_data );
+        return new Writing_On_GitHub_Payload($this->app, $this->raw_data);
     }
 
     /**
@@ -101,11 +101,11 @@ 
      * @return array
      */
     protected function headers() {
-        if ( ! empty( $this->headers ) ) {
+        if ( ! empty($this->headers)) {
             return $this->headers;
         }
 
-        if ( function_exists( 'getallheaders' ) ) {
+        if (function_exists('getallheaders')) {
 
             $this->headers = getallheaders();
             return $this->headers;
@@ -115,9 +115,9 @@ 
          * @see http://www.php.net/manual/en/function.getallheaders.php
          */
         $this->headers = array();
-        foreach ( $_SERVER as $name => $value ) {
-            if ( 'HTTP_' === substr( $name, 0, 5 ) ) {
-                $this->headers[ str_replace( ' ', '-', ucwords( strtolower( str_replace( '_', ' ', substr( $name, 5 ) ) ) ) ) ] = $value;
+        foreach ($_SERVER as $name => $value) {
+            if ('HTTP_' === substr($name, 0, 5)) {
+                $this->headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
             }
         }
 
@@ -130,7 +130,7 @@ 
      * @return string
      */
     protected function read_raw_data() {
-        return file_get_contents( 'php://input' );
+        return file_get_contents('php://input');
     }
 
     /**
@@ -139,6 +139,6 @@ 
      * @return string
      */
     protected function secret() {
-        return get_option( 'wogh_secret' );
+        return get_option('wogh_secret');
     }
 }

lib/database.php

Indentation +508 added lines, -508 removed lines

@@ -9,512 +9,512 @@
  */
 class Writing_On_GitHub_Database {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Currently whitelisted post types.
-     *
-     * @var array
-     */
-    protected $whitelisted_post_types = array( 'post', 'page' );
-
-    /**
-     * Currently whitelisted post statuses.
-     *
-     * @var array
-     */
-    protected $whitelisted_post_statuses = array( 'publish' );
-
-    /**
-     * Instantiates a new Database object.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Queries the database for all of the supported posts.
-     *
-     * @param  bool $force
-     *
-     * @return Writing_On_GitHub_Post[]|WP_Error
-     */
-    public function fetch_all_supported( $force = false ) {
-        $args  = array(
-            'post_type'   => $this->get_whitelisted_post_types(),
-            'post_status' => $this->get_whitelisted_post_statuses(),
-            'nopaging'    => true,
-            'fields'      => 'ids',
-        );
-
-        $query = new WP_Query( apply_filters( 'wogh_pre_fetch_all_supported', $args ) );
-
-        $post_ids = $query->get_posts();
-
-        if ( ! $post_ids ) {
-            return new WP_Error(
-                'no_results',
-                __( 'Querying for supported posts returned no results.', 'writing-on-github' )
-            );
-        }
-
-        /* @var Writing_On_GitHub_Post[] $results */
-        $results = array();
-        foreach ( $post_ids as $post_id ) {
-            // Do not export posts that have already been exported
-            if ( $force || ! get_post_meta( $post_id, '_wogh_sha', true ) ||
-                 ! get_post_meta( $post_id, '_wogh_github_path', true ) ) {
-
-                $results[] = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * Queries a post and returns it if it's supported.
-     *
-     * @param int $post_id Post ID to fetch.
-     *
-     * @return WP_Error|Writing_On_GitHub_Post
-     */
-    public function fetch_by_id( $post_id ) {
-        $post = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
-
-        if ( ! $this->is_post_supported( $post ) ) {
-            return new WP_Error(
-                'unsupported_post',
-                sprintf(
-                    __(
-                        'Post ID %s is not supported by WOGH. See wiki to find out how to add support.',
-                        'writing-on-github'
-                    ),
-                    $post_id
-                )
-            );
-        }
-
-        return $post;
-    }
-
-    /**
-     * Save an post to database
-     * and associates their author as well as their latest
-     *
-     * @param  Writing_On_GitHub_Post $post [description]
-     * @return WP_Error|true
-     */
-    public function save_post( Writing_On_GitHub_Post $post ) {
-        $args = apply_filters( 'wogh_pre_import_args', $this->post_args( $post ), $post );
-
-        remove_filter( 'content_save_pre', 'wp_filter_post_kses' );
-        $post_id = $post->is_new() ?
-            wp_insert_post( $args, true ) :
-            wp_update_post( $args, true );
-        add_filter( 'content_save_pre', 'wp_filter_post_kses' );
-
-        if ( is_wp_error( $post_id ) ) {
-            /* @var WP_Error $post_id */
-            return $post_id;
-        }
-
-        if ( $post->is_new() ) {
-            $author = false;
-            $meta = $post->get_meta();
-            if ( ! empty( $meta ) && ! empty( $meta['author'] ) ) {
-                $author = $meta['author'];
-            }
-            $user    = $this->fetch_commit_user( $author );
-            $user_id = is_wp_error( $user ) ? 0 : $user->ID;
-            $this->set_post_author( $post_id, $user_id );
-        }
-
-        $post->set_post( get_post( $post_id ) );
-
-        $meta = apply_filters( 'wogh_pre_import_meta', $post->get_meta(), $post );
-
-        update_post_meta( $post_id, '_wogh_sha', $meta['_wogh_sha'] );
-
-        // unset( $meta['tags'] );
-        // unset( $meta['categories'] );
-        // unset( $meta['author'] );
-        // unset( $meta['post_date'] );
-        // unset( $meta['post_excerpt'] );
-        // unset( $meta['permalink'] );
-        // unset( $meta['link'] );
-
-        // foreach ( $meta as $key => $value ) {
-        //  update_post_meta( $post_id, $key, $value );
-        // }
-        return true;
-    }
-
-    protected function post_args( $post ) {
-        $args = $post->get_args();
-        $meta = $post->get_meta();
-
-        // prevent backslash loss
-        $args['post_content'] = addslashes( $args['post_content'] );
-
-        // update tags
-        if ( ! empty( $meta['tags'] ) ) {
-            $args['tags_input'] = $meta['tags'];
-        }
-
-        // update categories
-        if ( ! empty( $meta['categories'] ) ) {
-            $categories = $meta['categories'];
-            if ( ! is_array( $categories ) ) {
-                $categories = array( $categories );
-            }
-            $terms = get_terms( array(
-                'taxonomy' => 'category',
-                'fields' => 'id=>name',
-                'hide_empty' => 0,
-                'name' => $categories
-                )
-            );
-            $map = array();
-            foreach ( $categories as $name ) {
-                $map[$name] = 1;
-            }
-
-            $ids = array();
-            if ( ! empty( $terms ) ) {
-                foreach ( $terms as $id => $name ) {
-                    $ids[] = $id;
-                    unset( $map[$name] );
-                }
-            }
-
-            // create new terms
-            if ( ! empty( $map ) ) {
-                foreach ( $map as $name => $value ) {
-                    $term = wp_insert_term( $name, 'category', array( 'parent' => 0 ) );
-                    // array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
-                    $ids[] = $term['term_id'];
-                }
-            }
-
-            $args['post_category'] = $ids;
-        }
-
-        return $args;
-    }
-
-    private function get_post_id_by_filename( $filename, $pattern  ) {
-        preg_match( $pattern , $filename, $matches );
-        $title = $matches[4];
-
-        $query = new WP_Query( array(
-            'name'     => $title,
-            'posts_per_page' => 1,
-            'post_type' => $this->get_whitelisted_post_types(),
-            'fields'         => 'ids',
-        ) );
-
-        $post_id = $query->get_posts();
-        $post_id = array_pop( $post_id );
-        return $post_id;
-    }
-
-    /**
-     * Deletes a post from the database based on its GitHub path.
-     *
-     * @param string $path Path of Post to delete.
-     *
-     * @return string|WP_Error
-     */
-    public function delete_post_by_path( $path ) {
-        $query = new WP_Query( array(
-            'meta_key'       => '_wogh_github_path',
-            'meta_value'     => $path,
-            'meta_compare'   => '=',
-            'posts_per_page' => 1,
-            'fields'         => 'ids',
-        ) );
-
-        $post_id = $query->get_posts();
-        $post_id = array_pop( $post_id );
-
-        if ( ! $post_id ) {
-            $parts     = explode( '/', $path );
-            $filename  = array_pop( $parts );
-            $directory = $parts ? array_shift( $parts ) : '';
-
-            if ( false !== strpos( $directory, 'post' ) ) {
-                $post_id = get_post_id_by_filename( $filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/' );
-            }
-
-            if ( ! $post_id ) {
-                $post_id = get_post_id_by_filename( $filename, '/(.*)\.md/' );
-            }
-        }
-
-        if ( ! $post_id ) {
-            return new WP_Error(
-                'path_not_found',
-                sprintf(
-                    __( 'Post not found for path %s.', 'writing-on-github' ),
-                    $path
-                )
-            );
-        }
-
-        $result = wp_delete_post( $post_id );
-
-        // If deleting fails...
-        if ( false === $result ) {
-            $post = get_post( $post_id );
-
-            // ...and the post both exists and isn't in the trash...
-            if ( $post && 'trash' !== $post->post_status ) {
-                // ... then something went wrong.
-                return new WP_Error(
-                    'db_error',
-                    sprintf(
-                        __( 'Failed to delete post ID %d.', 'writing-on-github' ),
-                        $post_id
-                    )
-                );
-            }
-        }
-
-        return sprintf(
-            __( 'Successfully deleted post ID %d.', 'writing-on-github' ),
-            $post_id
-        );
-    }
-
-    public function delete_post( $post_id ) {
-        $result = wp_delete_post( $post_id );
-
-        // If deleting fails...
-        if ( false === $result ) {
-            $post = get_post( $post_id );
-
-            // ...and the post both exists and isn't in the trash...
-            if ( $post && 'trash' !== $post->post_status ) {
-                // ... then something went wrong.
-                return new WP_Error(
-                    'db_error',
-                    sprintf(
-                        __( 'Failed to delete post ID %d.', 'writing-on-github' ),
-                        $post_id
-                    )
-                );
-            }
-        }
-
-        return sprintf(
-            __( 'Successfully deleted post ID %d.', 'writing-on-github' ),
-            $post_id
-        );
-    }
-
-    /**
-     * Returns the list of post type permitted.
-     *
-     * @return array
-     */
-    protected function get_whitelisted_post_types() {
-        return apply_filters( 'wogh_whitelisted_post_types', $this->whitelisted_post_types );
-    }
-
-    /**
-     * Returns the list of post status permitted.
-     *
-     * @return array
-     */
-    protected function get_whitelisted_post_statuses() {
-        return apply_filters( 'wogh_whitelisted_post_statuses', $this->whitelisted_post_statuses );
-    }
-
-    /**
-     * Formats a whitelist array for a query.
-     *
-     * @param array $whitelist Whitelisted posts to format into query.
-     *
-     * @return string Whitelist formatted for query
-     */
-    protected function format_for_query( $whitelist ) {
-        foreach ( $whitelist as $key => $value ) {
-            $whitelist[ $key ] = "'$value'";
-        }
-
-        return implode( ', ', $whitelist );
-    }
-
-    /**
-     * Verifies that both the post's status & type
-     * are currently whitelisted
-     *
-     * @param  Writing_On_GitHub_Post $post Post to verify.
-     *
-     * @return boolean                          True if supported, false if not.
-     */
-    protected function is_post_supported( Writing_On_GitHub_Post $post ) {
-        if ( wp_is_post_revision( $post->id ) ) {
-            return false;
-        }
-
-        // We need to allow trashed posts to be queried, but they are not whitelisted for export.
-        if ( ! in_array( $post->status(), $this->get_whitelisted_post_statuses() ) && 'trash' !== $post->status() ) {
-            return false;
-        }
-
-        if ( ! in_array( $post->type(), $this->get_whitelisted_post_types() ) ) {
-            return false;
-        }
-
-        if ( $post->has_password() ) {
-            return false;
-        }
-
-        return apply_filters( 'wogh_is_post_supported', true, $post );
-    }
-
-    /**
-     * Retrieves the commit user for a provided display name
-     *
-     * Searches for a user with provided display name or returns
-     * the default user saved in the database.
-     *
-     * @param string $display_name User display name to search for.
-     *
-     * @return WP_Error|WP_User
-     */
-    protected function fetch_commit_user( $display_name ) {
-        // If we can't find a user and a default hasn't been set,
-        // we're just going to set the revision author to 0.
-        $user = false;
-
-        if ( ! empty( $display_name ) ) {
-            $search_string = esc_attr( $display_name );
-            $query = new WP_User_Query( array(
-                'search'         => "{$search_string}",
-                'search_columns' => array(
-                    'display_name',
-                    'user_nicename',
-                    'user_login',
-                )
-            ) );
-            $users = $query->get_results();
-            $user = empty($users) ? false : $users[0];
-        }
-
-        if ( ! $user ) {
-            // Use the default user.
-            $user = get_user_by( 'id', (int) get_option( 'wogh_default_user' ) );
-        }
-
-        if ( ! $user ) {
-            return new WP_Error(
-                'user_not_found',
-                sprintf(
-                    __( 'Commit user not found for email %s', 'writing-on-github' ),
-                    $email
-                )
-            );
-        }
-
-        return $user;
-    }
-
-    // /**
-    //  * Sets the author latest revision
-    //  * of the provided post ID to the provided user.
-    //  *
-    //  * @param int $post_id Post ID to update revision author.
-    //  * @param int $user_id User ID for revision author.
-    //  *
-    //  * @return string|WP_Error
-    //  */
-    // protected function set_revision_author( $post_id, $user_id ) {
-    //  $revision = wp_get_post_revisions( $post_id );
-
-    //  if ( ! $revision ) {
-    //      $new_revision = wp_save_post_revision( $post_id );
-
-    //      if ( ! $new_revision || is_wp_error( $new_revision ) ) {
-    //          return new WP_Error( 'db_error', 'There was a problem saving a new revision.' );
-    //      }
-
-    //      // `wp_save_post_revision` returns the ID, whereas `get_post_revision` returns the whole object
-    //      // in order to be consistent, let's make sure we have the whole object before continuing.
-    //      $revision = get_post( $new_revision );
-
-    //      if ( ! $revision ) {
-    //          return new WP_Error( 'db_error', 'There was a problem retrieving the newly recreated revision.' );
-    //      }
-    //  } else {
-    //      $revision = array_shift( $revision );
-    //  }
-
-    //  return $this->set_post_author( $revision->ID, $user_id );
-    // }
-
-    /**
-     * Updates the user ID for the provided post ID.
-     *
-     * Bypassing triggering any hooks, including creating new revisions.
-     *
-     * @param int $post_id Post ID to update.
-     * @param int $user_id User ID to update to.
-     *
-     * @return string|WP_Error
-     */
-    protected function set_post_author( $post_id, $user_id ) {
-        global $wpdb;
-
-        $result = $wpdb->update(
-            $wpdb->posts,
-            array(
-                'post_author' => (int) $user_id,
-            ),
-            array(
-                'ID' => (int) $post_id,
-            ),
-            array( '%d' ),
-            array( '%d' )
-        );
-
-        if ( false === $result ) {
-            return new WP_Error( 'db_error', $wpdb->last_error );
-        }
-
-        if ( 0 === $result ) {
-            return sprintf(
-                __( 'No change for post ID %d.', 'writing-on-github' ),
-                $post_id
-            );
-        }
-
-        clean_post_cache( $post_id );
-
-        return sprintf(
-            __( 'Successfully updated post ID %d.', 'writing-on-github' ),
-            $post_id
-        );
-    }
-
-    // *
-    //  * Update the provided post's blob sha.
-    //  *
-    //  * @param Writing_On_GitHub_Post $post Post to update.
-    //  * @param string                     $sha Sha to update to.
-    //  *
-    //  * @return bool|int
-
-    // public function set_post_sha( $post, $sha ) {
-    //  return update_post_meta( $post->id, '_wogh_sha', $sha );
-    // }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Currently whitelisted post types.
+	 *
+	 * @var array
+	 */
+	protected $whitelisted_post_types = array( 'post', 'page' );
+
+	/**
+	 * Currently whitelisted post statuses.
+	 *
+	 * @var array
+	 */
+	protected $whitelisted_post_statuses = array( 'publish' );
+
+	/**
+	 * Instantiates a new Database object.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Queries the database for all of the supported posts.
+	 *
+	 * @param  bool $force
+	 *
+	 * @return Writing_On_GitHub_Post[]|WP_Error
+	 */
+	public function fetch_all_supported( $force = false ) {
+		$args  = array(
+			'post_type'   => $this->get_whitelisted_post_types(),
+			'post_status' => $this->get_whitelisted_post_statuses(),
+			'nopaging'    => true,
+			'fields'      => 'ids',
+		);
+
+		$query = new WP_Query( apply_filters( 'wogh_pre_fetch_all_supported', $args ) );
+
+		$post_ids = $query->get_posts();
+
+		if ( ! $post_ids ) {
+			return new WP_Error(
+				'no_results',
+				__( 'Querying for supported posts returned no results.', 'writing-on-github' )
+			);
+		}
+
+		/* @var Writing_On_GitHub_Post[] $results */
+		$results = array();
+		foreach ( $post_ids as $post_id ) {
+			// Do not export posts that have already been exported
+			if ( $force || ! get_post_meta( $post_id, '_wogh_sha', true ) ||
+				 ! get_post_meta( $post_id, '_wogh_github_path', true ) ) {
+
+				$results[] = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Queries a post and returns it if it's supported.
+	 *
+	 * @param int $post_id Post ID to fetch.
+	 *
+	 * @return WP_Error|Writing_On_GitHub_Post
+	 */
+	public function fetch_by_id( $post_id ) {
+		$post = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
+
+		if ( ! $this->is_post_supported( $post ) ) {
+			return new WP_Error(
+				'unsupported_post',
+				sprintf(
+					__(
+						'Post ID %s is not supported by WOGH. See wiki to find out how to add support.',
+						'writing-on-github'
+					),
+					$post_id
+				)
+			);
+		}
+
+		return $post;
+	}
+
+	/**
+	 * Save an post to database
+	 * and associates their author as well as their latest
+	 *
+	 * @param  Writing_On_GitHub_Post $post [description]
+	 * @return WP_Error|true
+	 */
+	public function save_post( Writing_On_GitHub_Post $post ) {
+		$args = apply_filters( 'wogh_pre_import_args', $this->post_args( $post ), $post );
+
+		remove_filter( 'content_save_pre', 'wp_filter_post_kses' );
+		$post_id = $post->is_new() ?
+			wp_insert_post( $args, true ) :
+			wp_update_post( $args, true );
+		add_filter( 'content_save_pre', 'wp_filter_post_kses' );
+
+		if ( is_wp_error( $post_id ) ) {
+			/* @var WP_Error $post_id */
+			return $post_id;
+		}
+
+		if ( $post->is_new() ) {
+			$author = false;
+			$meta = $post->get_meta();
+			if ( ! empty( $meta ) && ! empty( $meta['author'] ) ) {
+				$author = $meta['author'];
+			}
+			$user    = $this->fetch_commit_user( $author );
+			$user_id = is_wp_error( $user ) ? 0 : $user->ID;
+			$this->set_post_author( $post_id, $user_id );
+		}
+
+		$post->set_post( get_post( $post_id ) );
+
+		$meta = apply_filters( 'wogh_pre_import_meta', $post->get_meta(), $post );
+
+		update_post_meta( $post_id, '_wogh_sha', $meta['_wogh_sha'] );
+
+		// unset( $meta['tags'] );
+		// unset( $meta['categories'] );
+		// unset( $meta['author'] );
+		// unset( $meta['post_date'] );
+		// unset( $meta['post_excerpt'] );
+		// unset( $meta['permalink'] );
+		// unset( $meta['link'] );
+
+		// foreach ( $meta as $key => $value ) {
+		//  update_post_meta( $post_id, $key, $value );
+		// }
+		return true;
+	}
+
+	protected function post_args( $post ) {
+		$args = $post->get_args();
+		$meta = $post->get_meta();
+
+		// prevent backslash loss
+		$args['post_content'] = addslashes( $args['post_content'] );
+
+		// update tags
+		if ( ! empty( $meta['tags'] ) ) {
+			$args['tags_input'] = $meta['tags'];
+		}
+
+		// update categories
+		if ( ! empty( $meta['categories'] ) ) {
+			$categories = $meta['categories'];
+			if ( ! is_array( $categories ) ) {
+				$categories = array( $categories );
+			}
+			$terms = get_terms( array(
+				'taxonomy' => 'category',
+				'fields' => 'id=>name',
+				'hide_empty' => 0,
+				'name' => $categories
+				)
+			);
+			$map = array();
+			foreach ( $categories as $name ) {
+				$map[$name] = 1;
+			}
+
+			$ids = array();
+			if ( ! empty( $terms ) ) {
+				foreach ( $terms as $id => $name ) {
+					$ids[] = $id;
+					unset( $map[$name] );
+				}
+			}
+
+			// create new terms
+			if ( ! empty( $map ) ) {
+				foreach ( $map as $name => $value ) {
+					$term = wp_insert_term( $name, 'category', array( 'parent' => 0 ) );
+					// array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
+					$ids[] = $term['term_id'];
+				}
+			}
+
+			$args['post_category'] = $ids;
+		}
+
+		return $args;
+	}
+
+	private function get_post_id_by_filename( $filename, $pattern  ) {
+		preg_match( $pattern , $filename, $matches );
+		$title = $matches[4];
+
+		$query = new WP_Query( array(
+			'name'     => $title,
+			'posts_per_page' => 1,
+			'post_type' => $this->get_whitelisted_post_types(),
+			'fields'         => 'ids',
+		) );
+
+		$post_id = $query->get_posts();
+		$post_id = array_pop( $post_id );
+		return $post_id;
+	}
+
+	/**
+	 * Deletes a post from the database based on its GitHub path.
+	 *
+	 * @param string $path Path of Post to delete.
+	 *
+	 * @return string|WP_Error
+	 */
+	public function delete_post_by_path( $path ) {
+		$query = new WP_Query( array(
+			'meta_key'       => '_wogh_github_path',
+			'meta_value'     => $path,
+			'meta_compare'   => '=',
+			'posts_per_page' => 1,
+			'fields'         => 'ids',
+		) );
+
+		$post_id = $query->get_posts();
+		$post_id = array_pop( $post_id );
+
+		if ( ! $post_id ) {
+			$parts     = explode( '/', $path );
+			$filename  = array_pop( $parts );
+			$directory = $parts ? array_shift( $parts ) : '';
+
+			if ( false !== strpos( $directory, 'post' ) ) {
+				$post_id = get_post_id_by_filename( $filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/' );
+			}
+
+			if ( ! $post_id ) {
+				$post_id = get_post_id_by_filename( $filename, '/(.*)\.md/' );
+			}
+		}
+
+		if ( ! $post_id ) {
+			return new WP_Error(
+				'path_not_found',
+				sprintf(
+					__( 'Post not found for path %s.', 'writing-on-github' ),
+					$path
+				)
+			);
+		}
+
+		$result = wp_delete_post( $post_id );
+
+		// If deleting fails...
+		if ( false === $result ) {
+			$post = get_post( $post_id );
+
+			// ...and the post both exists and isn't in the trash...
+			if ( $post && 'trash' !== $post->post_status ) {
+				// ... then something went wrong.
+				return new WP_Error(
+					'db_error',
+					sprintf(
+						__( 'Failed to delete post ID %d.', 'writing-on-github' ),
+						$post_id
+					)
+				);
+			}
+		}
+
+		return sprintf(
+			__( 'Successfully deleted post ID %d.', 'writing-on-github' ),
+			$post_id
+		);
+	}
+
+	public function delete_post( $post_id ) {
+		$result = wp_delete_post( $post_id );
+
+		// If deleting fails...
+		if ( false === $result ) {
+			$post = get_post( $post_id );
+
+			// ...and the post both exists and isn't in the trash...
+			if ( $post && 'trash' !== $post->post_status ) {
+				// ... then something went wrong.
+				return new WP_Error(
+					'db_error',
+					sprintf(
+						__( 'Failed to delete post ID %d.', 'writing-on-github' ),
+						$post_id
+					)
+				);
+			}
+		}
+
+		return sprintf(
+			__( 'Successfully deleted post ID %d.', 'writing-on-github' ),
+			$post_id
+		);
+	}
+
+	/**
+	 * Returns the list of post type permitted.
+	 *
+	 * @return array
+	 */
+	protected function get_whitelisted_post_types() {
+		return apply_filters( 'wogh_whitelisted_post_types', $this->whitelisted_post_types );
+	}
+
+	/**
+	 * Returns the list of post status permitted.
+	 *
+	 * @return array
+	 */
+	protected function get_whitelisted_post_statuses() {
+		return apply_filters( 'wogh_whitelisted_post_statuses', $this->whitelisted_post_statuses );
+	}
+
+	/**
+	 * Formats a whitelist array for a query.
+	 *
+	 * @param array $whitelist Whitelisted posts to format into query.
+	 *
+	 * @return string Whitelist formatted for query
+	 */
+	protected function format_for_query( $whitelist ) {
+		foreach ( $whitelist as $key => $value ) {
+			$whitelist[ $key ] = "'$value'";
+		}
+
+		return implode( ', ', $whitelist );
+	}
+
+	/**
+	 * Verifies that both the post's status & type
+	 * are currently whitelisted
+	 *
+	 * @param  Writing_On_GitHub_Post $post Post to verify.
+	 *
+	 * @return boolean                          True if supported, false if not.
+	 */
+	protected function is_post_supported( Writing_On_GitHub_Post $post ) {
+		if ( wp_is_post_revision( $post->id ) ) {
+			return false;
+		}
+
+		// We need to allow trashed posts to be queried, but they are not whitelisted for export.
+		if ( ! in_array( $post->status(), $this->get_whitelisted_post_statuses() ) && 'trash' !== $post->status() ) {
+			return false;
+		}
+
+		if ( ! in_array( $post->type(), $this->get_whitelisted_post_types() ) ) {
+			return false;
+		}
+
+		if ( $post->has_password() ) {
+			return false;
+		}
+
+		return apply_filters( 'wogh_is_post_supported', true, $post );
+	}
+
+	/**
+	 * Retrieves the commit user for a provided display name
+	 *
+	 * Searches for a user with provided display name or returns
+	 * the default user saved in the database.
+	 *
+	 * @param string $display_name User display name to search for.
+	 *
+	 * @return WP_Error|WP_User
+	 */
+	protected function fetch_commit_user( $display_name ) {
+		// If we can't find a user and a default hasn't been set,
+		// we're just going to set the revision author to 0.
+		$user = false;
+
+		if ( ! empty( $display_name ) ) {
+			$search_string = esc_attr( $display_name );
+			$query = new WP_User_Query( array(
+				'search'         => "{$search_string}",
+				'search_columns' => array(
+					'display_name',
+					'user_nicename',
+					'user_login',
+				)
+			) );
+			$users = $query->get_results();
+			$user = empty($users) ? false : $users[0];
+		}
+
+		if ( ! $user ) {
+			// Use the default user.
+			$user = get_user_by( 'id', (int) get_option( 'wogh_default_user' ) );
+		}
+
+		if ( ! $user ) {
+			return new WP_Error(
+				'user_not_found',
+				sprintf(
+					__( 'Commit user not found for email %s', 'writing-on-github' ),
+					$email
+				)
+			);
+		}
+
+		return $user;
+	}
+
+	// /**
+	//  * Sets the author latest revision
+	//  * of the provided post ID to the provided user.
+	//  *
+	//  * @param int $post_id Post ID to update revision author.
+	//  * @param int $user_id User ID for revision author.
+	//  *
+	//  * @return string|WP_Error
+	//  */
+	// protected function set_revision_author( $post_id, $user_id ) {
+	//  $revision = wp_get_post_revisions( $post_id );
+
+	//  if ( ! $revision ) {
+	//      $new_revision = wp_save_post_revision( $post_id );
+
+	//      if ( ! $new_revision || is_wp_error( $new_revision ) ) {
+	//          return new WP_Error( 'db_error', 'There was a problem saving a new revision.' );
+	//      }
+
+	//      // `wp_save_post_revision` returns the ID, whereas `get_post_revision` returns the whole object
+	//      // in order to be consistent, let's make sure we have the whole object before continuing.
+	//      $revision = get_post( $new_revision );
+
+	//      if ( ! $revision ) {
+	//          return new WP_Error( 'db_error', 'There was a problem retrieving the newly recreated revision.' );
+	//      }
+	//  } else {
+	//      $revision = array_shift( $revision );
+	//  }
+
+	//  return $this->set_post_author( $revision->ID, $user_id );
+	// }
+
+	/**
+	 * Updates the user ID for the provided post ID.
+	 *
+	 * Bypassing triggering any hooks, including creating new revisions.
+	 *
+	 * @param int $post_id Post ID to update.
+	 * @param int $user_id User ID to update to.
+	 *
+	 * @return string|WP_Error
+	 */
+	protected function set_post_author( $post_id, $user_id ) {
+		global $wpdb;
+
+		$result = $wpdb->update(
+			$wpdb->posts,
+			array(
+				'post_author' => (int) $user_id,
+			),
+			array(
+				'ID' => (int) $post_id,
+			),
+			array( '%d' ),
+			array( '%d' )
+		);
+
+		if ( false === $result ) {
+			return new WP_Error( 'db_error', $wpdb->last_error );
+		}
+
+		if ( 0 === $result ) {
+			return sprintf(
+				__( 'No change for post ID %d.', 'writing-on-github' ),
+				$post_id
+			);
+		}
+
+		clean_post_cache( $post_id );
+
+		return sprintf(
+			__( 'Successfully updated post ID %d.', 'writing-on-github' ),
+			$post_id
+		);
+	}
+
+	// *
+	//  * Update the provided post's blob sha.
+	//  *
+	//  * @param Writing_On_GitHub_Post $post Post to update.
+	//  * @param string                     $sha Sha to update to.
+	//  *
+	//  * @return bool|int
+
+	// public function set_post_sha( $post, $sha ) {
+	//  return update_post_meta( $post->id, '_wogh_sha', $sha );
+	// }
 }

Spacing +105 added lines, -106 removed lines

@@ -21,21 +21,21 @@ 
      *
      * @var array
      */
-    protected $whitelisted_post_types = array( 'post', 'page' );
+    protected $whitelisted_post_types = array('post', 'page');
 
     /**
      * Currently whitelisted post statuses.
      *
      * @var array
      */
-    protected $whitelisted_post_statuses = array( 'publish' );
+    protected $whitelisted_post_statuses = array('publish');
 
     /**
      * Instantiates a new Database object.
      *
      * @param Writing_On_GitHub $app Application container.
      */
-    public function __construct( Writing_On_GitHub $app ) {
+    public function __construct(Writing_On_GitHub $app) {
         $this->app = $app;
     }
 
@@ -46,33 +46,33 @@ 
      *
      * @return Writing_On_GitHub_Post[]|WP_Error
      */
-    public function fetch_all_supported( $force = false ) {
-        $args  = array(
+    public function fetch_all_supported($force = false) {
+        $args = array(
             'post_type'   => $this->get_whitelisted_post_types(),
             'post_status' => $this->get_whitelisted_post_statuses(),
             'nopaging'    => true,
             'fields'      => 'ids',
         );
 
-        $query = new WP_Query( apply_filters( 'wogh_pre_fetch_all_supported', $args ) );
+        $query = new WP_Query(apply_filters('wogh_pre_fetch_all_supported', $args));
 
         $post_ids = $query->get_posts();
 
-        if ( ! $post_ids ) {
+        if ( ! $post_ids) {
             return new WP_Error(
                 'no_results',
-                __( 'Querying for supported posts returned no results.', 'writing-on-github' )
+                __('Querying for supported posts returned no results.', 'writing-on-github')
             );
         }
 
         /* @var Writing_On_GitHub_Post[] $results */
         $results = array();
-        foreach ( $post_ids as $post_id ) {
+        foreach ($post_ids as $post_id) {
             // Do not export posts that have already been exported
-            if ( $force || ! get_post_meta( $post_id, '_wogh_sha', true ) ||
-                 ! get_post_meta( $post_id, '_wogh_github_path', true ) ) {
+            if ($force || ! get_post_meta($post_id, '_wogh_sha', true) ||
+                 ! get_post_meta($post_id, '_wogh_github_path', true)) {
 
-                $results[] = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
+                $results[] = new Writing_On_GitHub_Post($post_id, $this->app->api());
             }
         }
 
@@ -86,10 +86,10 @@ 
      *
      * @return WP_Error|Writing_On_GitHub_Post
      */
-    public function fetch_by_id( $post_id ) {
-        $post = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
+    public function fetch_by_id($post_id) {
+        $post = new Writing_On_GitHub_Post($post_id, $this->app->api());
 
-        if ( ! $this->is_post_supported( $post ) ) {
+        if ( ! $this->is_post_supported($post)) {
             return new WP_Error(
                 'unsupported_post',
                 sprintf(
@@ -112,36 +112,35 @@ 
      * @param  Writing_On_GitHub_Post $post [description]
      * @return WP_Error|true
      */
-    public function save_post( Writing_On_GitHub_Post $post ) {
-        $args = apply_filters( 'wogh_pre_import_args', $this->post_args( $post ), $post );
+    public function save_post(Writing_On_GitHub_Post $post) {
+        $args = apply_filters('wogh_pre_import_args', $this->post_args($post), $post);
 
-        remove_filter( 'content_save_pre', 'wp_filter_post_kses' );
+        remove_filter('content_save_pre', 'wp_filter_post_kses');
         $post_id = $post->is_new() ?
-            wp_insert_post( $args, true ) :
-            wp_update_post( $args, true );
-        add_filter( 'content_save_pre', 'wp_filter_post_kses' );
+            wp_insert_post($args, true) : wp_update_post($args, true);
+        add_filter('content_save_pre', 'wp_filter_post_kses');
 
-        if ( is_wp_error( $post_id ) ) {
+        if (is_wp_error($post_id)) {
             /* @var WP_Error $post_id */
             return $post_id;
         }
 
-        if ( $post->is_new() ) {
+        if ($post->is_new()) {
             $author = false;
             $meta = $post->get_meta();
-            if ( ! empty( $meta ) && ! empty( $meta['author'] ) ) {
+            if ( ! empty($meta) && ! empty($meta['author'])) {
                 $author = $meta['author'];
             }
-            $user    = $this->fetch_commit_user( $author );
-            $user_id = is_wp_error( $user ) ? 0 : $user->ID;
-            $this->set_post_author( $post_id, $user_id );
+            $user    = $this->fetch_commit_user($author);
+            $user_id = is_wp_error($user) ? 0 : $user->ID;
+            $this->set_post_author($post_id, $user_id);
         }
 
-        $post->set_post( get_post( $post_id ) );
+        $post->set_post(get_post($post_id));
 
-        $meta = apply_filters( 'wogh_pre_import_meta', $post->get_meta(), $post );
+        $meta = apply_filters('wogh_pre_import_meta', $post->get_meta(), $post);
 
-        update_post_meta( $post_id, '_wogh_sha', $meta['_wogh_sha'] );
+        update_post_meta($post_id, '_wogh_sha', $meta['_wogh_sha']);
 
         // unset( $meta['tags'] );
         // unset( $meta['categories'] );
@@ -157,25 +156,25 @@ 
         return true;
     }
 
-    protected function post_args( $post ) {
+    protected function post_args($post) {
         $args = $post->get_args();
         $meta = $post->get_meta();
 
         // prevent backslash loss
-        $args['post_content'] = addslashes( $args['post_content'] );
+        $args['post_content'] = addslashes($args['post_content']);
 
         // update tags
-        if ( ! empty( $meta['tags'] ) ) {
+        if ( ! empty($meta['tags'])) {
             $args['tags_input'] = $meta['tags'];
         }
 
         // update categories
-        if ( ! empty( $meta['categories'] ) ) {
+        if ( ! empty($meta['categories'])) {
             $categories = $meta['categories'];
-            if ( ! is_array( $categories ) ) {
-                $categories = array( $categories );
+            if ( ! is_array($categories)) {
+                $categories = array($categories);
             }
-            $terms = get_terms( array(
+            $terms = get_terms(array(
                 'taxonomy' => 'category',
                 'fields' => 'id=>name',
                 'hide_empty' => 0,
@@ -183,22 +182,22 @@ 
                 )
             );
             $map = array();
-            foreach ( $categories as $name ) {
+            foreach ($categories as $name) {
                 $map[$name] = 1;
             }
 
             $ids = array();
-            if ( ! empty( $terms ) ) {
-                foreach ( $terms as $id => $name ) {
+            if ( ! empty($terms)) {
+                foreach ($terms as $id => $name) {
                     $ids[] = $id;
-                    unset( $map[$name] );
+                    unset($map[$name]);
                 }
             }
 
             // create new terms
-            if ( ! empty( $map ) ) {
-                foreach ( $map as $name => $value ) {
-                    $term = wp_insert_term( $name, 'category', array( 'parent' => 0 ) );
+            if ( ! empty($map)) {
+                foreach ($map as $name => $value) {
+                    $term = wp_insert_term($name, 'category', array('parent' => 0));
                     // array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
                     $ids[] = $term['term_id'];
                 }
@@ -210,19 +209,19 @@ 
         return $args;
     }
 
-    private function get_post_id_by_filename( $filename, $pattern  ) {
-        preg_match( $pattern , $filename, $matches );
+    private function get_post_id_by_filename($filename, $pattern) {
+        preg_match($pattern, $filename, $matches);
         $title = $matches[4];
 
-        $query = new WP_Query( array(
+        $query = new WP_Query(array(
             'name'     => $title,
             'posts_per_page' => 1,
             'post_type' => $this->get_whitelisted_post_types(),
             'fields'         => 'ids',
-        ) );
+        ));
 
         $post_id = $query->get_posts();
-        $post_id = array_pop( $post_id );
+        $post_id = array_pop($post_id);
         return $post_id;
     }
 
@@ -233,55 +232,55 @@ 
      *
      * @return string|WP_Error
      */
-    public function delete_post_by_path( $path ) {
-        $query = new WP_Query( array(
+    public function delete_post_by_path($path) {
+        $query = new WP_Query(array(
             'meta_key'       => '_wogh_github_path',
             'meta_value'     => $path,
             'meta_compare'   => '=',
             'posts_per_page' => 1,
             'fields'         => 'ids',
-        ) );
+        ));
 
         $post_id = $query->get_posts();
-        $post_id = array_pop( $post_id );
+        $post_id = array_pop($post_id);
 
-        if ( ! $post_id ) {
-            $parts     = explode( '/', $path );
-            $filename  = array_pop( $parts );
-            $directory = $parts ? array_shift( $parts ) : '';
+        if ( ! $post_id) {
+            $parts     = explode('/', $path);
+            $filename  = array_pop($parts);
+            $directory = $parts ? array_shift($parts) : '';
 
-            if ( false !== strpos( $directory, 'post' ) ) {
-                $post_id = get_post_id_by_filename( $filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/' );
+            if (false !== strpos($directory, 'post')) {
+                $post_id = get_post_id_by_filename($filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/');
             }
 
-            if ( ! $post_id ) {
-                $post_id = get_post_id_by_filename( $filename, '/(.*)\.md/' );
+            if ( ! $post_id) {
+                $post_id = get_post_id_by_filename($filename, '/(.*)\.md/');
             }
         }
 
-        if ( ! $post_id ) {
+        if ( ! $post_id) {
             return new WP_Error(
                 'path_not_found',
                 sprintf(
-                    __( 'Post not found for path %s.', 'writing-on-github' ),
+                    __('Post not found for path %s.', 'writing-on-github'),
                     $path
                 )
             );
         }
 
-        $result = wp_delete_post( $post_id );
+        $result = wp_delete_post($post_id);
 
         // If deleting fails...
-        if ( false === $result ) {
-            $post = get_post( $post_id );
+        if (false === $result) {
+            $post = get_post($post_id);
 
             // ...and the post both exists and isn't in the trash...
-            if ( $post && 'trash' !== $post->post_status ) {
+            if ($post && 'trash' !== $post->post_status) {
                 // ... then something went wrong.
                 return new WP_Error(
                     'db_error',
                     sprintf(
-                        __( 'Failed to delete post ID %d.', 'writing-on-github' ),
+                        __('Failed to delete post ID %d.', 'writing-on-github'),
                         $post_id
                     )
                 );
@@ -289,25 +288,25 @@ 
         }
 
         return sprintf(
-            __( 'Successfully deleted post ID %d.', 'writing-on-github' ),
+            __('Successfully deleted post ID %d.', 'writing-on-github'),
             $post_id
         );
     }
 
-    public function delete_post( $post_id ) {
-        $result = wp_delete_post( $post_id );
+    public function delete_post($post_id) {
+        $result = wp_delete_post($post_id);
 
         // If deleting fails...
-        if ( false === $result ) {
-            $post = get_post( $post_id );
+        if (false === $result) {
+            $post = get_post($post_id);
 
             // ...and the post both exists and isn't in the trash...
-            if ( $post && 'trash' !== $post->post_status ) {
+            if ($post && 'trash' !== $post->post_status) {
                 // ... then something went wrong.
                 return new WP_Error(
                     'db_error',
                     sprintf(
-                        __( 'Failed to delete post ID %d.', 'writing-on-github' ),
+                        __('Failed to delete post ID %d.', 'writing-on-github'),
                         $post_id
                     )
                 );
@@ -315,7 +314,7 @@ 
         }
 
         return sprintf(
-            __( 'Successfully deleted post ID %d.', 'writing-on-github' ),
+            __('Successfully deleted post ID %d.', 'writing-on-github'),
             $post_id
         );
     }
@@ -326,7 +325,7 @@ 
      * @return array
      */
     protected function get_whitelisted_post_types() {
-        return apply_filters( 'wogh_whitelisted_post_types', $this->whitelisted_post_types );
+        return apply_filters('wogh_whitelisted_post_types', $this->whitelisted_post_types);
     }
 
     /**
@@ -335,7 +334,7 @@ 
      * @return array
      */
     protected function get_whitelisted_post_statuses() {
-        return apply_filters( 'wogh_whitelisted_post_statuses', $this->whitelisted_post_statuses );
+        return apply_filters('wogh_whitelisted_post_statuses', $this->whitelisted_post_statuses);
     }
 
     /**
@@ -345,12 +344,12 @@ 
      *
      * @return string Whitelist formatted for query
      */
-    protected function format_for_query( $whitelist ) {
-        foreach ( $whitelist as $key => $value ) {
-            $whitelist[ $key ] = "'$value'";
+    protected function format_for_query($whitelist) {
+        foreach ($whitelist as $key => $value) {
+            $whitelist[$key] = "'$value'";
         }
 
-        return implode( ', ', $whitelist );
+        return implode(', ', $whitelist);
     }
 
     /**
@@ -361,25 +360,25 @@ 
      *
      * @return boolean                          True if supported, false if not.
      */
-    protected function is_post_supported( Writing_On_GitHub_Post $post ) {
-        if ( wp_is_post_revision( $post->id ) ) {
+    protected function is_post_supported(Writing_On_GitHub_Post $post) {
+        if (wp_is_post_revision($post->id)) {
             return false;
         }
 
         // We need to allow trashed posts to be queried, but they are not whitelisted for export.
-        if ( ! in_array( $post->status(), $this->get_whitelisted_post_statuses() ) && 'trash' !== $post->status() ) {
+        if ( ! in_array($post->status(), $this->get_whitelisted_post_statuses()) && 'trash' !== $post->status()) {
             return false;
         }
 
-        if ( ! in_array( $post->type(), $this->get_whitelisted_post_types() ) ) {
+        if ( ! in_array($post->type(), $this->get_whitelisted_post_types())) {
             return false;
         }
 
-        if ( $post->has_password() ) {
+        if ($post->has_password()) {
             return false;
         }
 
-        return apply_filters( 'wogh_is_post_supported', true, $post );
+        return apply_filters('wogh_is_post_supported', true, $post);
     }
 
     /**
@@ -392,35 +391,35 @@ 
      *
      * @return WP_Error|WP_User
      */
-    protected function fetch_commit_user( $display_name ) {
+    protected function fetch_commit_user($display_name) {
         // If we can't find a user and a default hasn't been set,
         // we're just going to set the revision author to 0.
         $user = false;
 
-        if ( ! empty( $display_name ) ) {
-            $search_string = esc_attr( $display_name );
-            $query = new WP_User_Query( array(
+        if ( ! empty($display_name)) {
+            $search_string = esc_attr($display_name);
+            $query = new WP_User_Query(array(
                 'search'         => "{$search_string}",
                 'search_columns' => array(
                     'display_name',
                     'user_nicename',
                     'user_login',
                 )
-            ) );
+            ));
             $users = $query->get_results();
             $user = empty($users) ? false : $users[0];
         }
 
-        if ( ! $user ) {
+        if ( ! $user) {
             // Use the default user.
-            $user = get_user_by( 'id', (int) get_option( 'wogh_default_user' ) );
+            $user = get_user_by('id', (int) get_option('wogh_default_user'));
         }
 
-        if ( ! $user ) {
+        if ( ! $user) {
             return new WP_Error(
                 'user_not_found',
                 sprintf(
-                    __( 'Commit user not found for email %s', 'writing-on-github' ),
+                    __('Commit user not found for email %s', 'writing-on-github'),
                     $email
                 )
             );
@@ -472,7 +471,7 @@ 
      *
      * @return string|WP_Error
      */
-    protected function set_post_author( $post_id, $user_id ) {
+    protected function set_post_author($post_id, $user_id) {
         global $wpdb;
 
         $result = $wpdb->update(
@@ -483,25 +482,25 @@ 
             array(
                 'ID' => (int) $post_id,
             ),
-            array( '%d' ),
-            array( '%d' )
+            array('%d'),
+            array('%d')
         );
 
-        if ( false === $result ) {
-            return new WP_Error( 'db_error', $wpdb->last_error );
+        if (false === $result) {
+            return new WP_Error('db_error', $wpdb->last_error);
         }
 
-        if ( 0 === $result ) {
+        if (0 === $result) {
             return sprintf(
-                __( 'No change for post ID %d.', 'writing-on-github' ),
+                __('No change for post ID %d.', 'writing-on-github'),
                 $post_id
             );
         }
 
-        clean_post_cache( $post_id );
+        clean_post_cache($post_id);
 
         return sprintf(
-            __( 'Successfully updated post ID %d.', 'writing-on-github' ),
+            __('Successfully updated post ID %d.', 'writing-on-github'),
             $post_id
         );
     }

lib/import.php

Indentation +313 added lines, -313 removed lines

@@ -10,317 +10,317 @@
  */
 class Writing_On_GitHub_Import {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Initializes a new import manager.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Imports a payload.
-     * @param  Writing_On_GitHub_Payload $payload
-     *
-     * @return string|WP_Error
-     */
-    public function payload( Writing_On_GitHub_Payload $payload ) {
-
-        $result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() );
-
-        if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
-            return $result;
-        }
-
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result );
-        }
-
-        if ( is_wp_error( $result ) ) {
-            return $files;
-        }
-
-        return __( 'Payload processed', 'writing-on-github' );
-    }
-
-    /**
-     * import blob by files
-     * @param  Writing_On_GitHub_File_Info[] $files
-     *
-     * @return true|WP_Error
-     */
-    protected function import_files( $files ) {
-
-        $error = true;
-
-        foreach ( $files as $file ) {
-            if ( ! $this->importable_file( $file ) ) {
-                continue;
-            }
-
-            $blob = $this->app->api()->fetch()->blob( $file );
-            // network error ?
-            if ( ! $blob instanceof Writing_On_GitHub_Blob ) {
-                continue;
-            }
-
-            $is_remove = 'removed' == $file->status;
-
-            $result = false;
-            if ( $this->importable_raw_file( $blob ) ) {
-                $result = $this->import_raw_file( $blob, $is_remove );
-            } elseif ( $this->importable_post( $blob ) ) {
-                if ( $is_remove ) {
-                    $result = $this->delete_post( $blob );
-                } else {
-                    $result = $this->import_post( $blob );
-                }
-            }
-
-            if ( is_wp_error( $result ) ) {
-                /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
-            }
-        }
-
-        return $error;
-    }
-
-    /**
-     * Imports the latest commit on the master branch.
-     *
-     * @return string|WP_Error
-     */
-    public function master() {
-        $result = $this->app->api()->fetch()->tree_recursive();
-
-        if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
-            return $result;
-        }
-
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result );
-        }
-
-        if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
-            return $result;
-        }
-
-        return __( 'Payload processed', 'writing-on-github' );
-    }
-
-    /**
-     * Checks whether the provided blob should be imported.
-     *
-     * @param Writing_On_GitHub_File_Info $file
-     *
-     * @return bool
-     */
-    protected function importable_file( Writing_On_GitHub_File_Info $file ) {
-
-        $path = $file->path;
-
-        // only _pages, _posts and images
-        $prefixs = array( '_pages/', '_posts/', 'images/');
-        foreach ($prefixs as $prefix) {
-            if ( ! strncasecmp($path, $prefix, strlen( $prefix ) ) ) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Checks whether the provided blob should be imported.
-     *
-     * @param Writing_On_GitHub_Blob $blob Blob to validate.
-     *
-     * @return bool
-     */
-    protected function importable_post( Writing_On_GitHub_Blob $blob ) {
-        // global $wpdb;
-
-        // // Skip the repo's readme.
-        // if ( 'readme' === strtolower( substr( $blob->path(), 0, 6 ) ) ) {
-        //  return false;
-        // }
-
-        // // If the blob sha already matches a post, then move on.
-        // if ( ! is_wp_error( $this->app->database()->fetch_by_sha( $blob->sha() ) ) ) {
-        //  return false;
-        // }
-
-        if ( ! $blob->has_frontmatter() ) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Delete post
-     * @param  Writing_On_GitHub_Blob $blob
-     * @return WP_Error|bool
-     */
-    protected function delete_post( Writing_On_GitHub_Blob $blob ) {
-        $id = $blob->id();
-        if ( empty( $id ) ) {
-            return false;
-        }
-        $result = $this->app->database()->delete_post( $id );
-        if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
-            return $result;
-        }
-        return true;
-    }
-
-    /**
-     * Imports a post into wordpress
-     * @param  Writing_On_GitHub_Blob $blob
-     * @return WP_Error|bool
-     */
-    protected function import_post( Writing_On_GitHub_Blob $blob ) {
-        $post = $this->blob_to_post( $blob );
-
-        if ( ! $post instanceof Writing_On_GitHub_Post ) {
-            return false;
-        }
-
-        $result = $this->app->database()->save_post( $post );
-        if ( is_wp_error( $result ) ) {
-            /** @var WP_Error $result */
-            return $result;
-        }
-
-        if ( $post->is_new() ||
-                ! wogh_equal_front_matter( $post, $blob ) ) {
-
-            $result = $this->app->export()->export_post( $post );
-
-            if ( is_wp_error( $result ) ) {
-                /** @var WP_Error $result */
-                return $result;
-            }
-        }
-
-        clean_post_cache( $post->id() );
-
-        return true;
-    }
-
-    /**
-     * import raw file
-     * @param  Writing_On_GitHub_Blob $blob
-     * @return bool
-     */
-    protected function importable_raw_file( Writing_On_GitHub_Blob $blob ) {
-        if ( $blob->has_frontmatter() ) {
-            return false;
-        }
-
-        // only images
-        if ( strncasecmp($blob->path(), 'images/', strlen('images/') ) != 0) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Imports a raw file content into file system.
-     * @param  Writing_On_GitHub_Blob $blob
-     * @param  bool                   $is_remove
-     */
-    protected function import_raw_file( Writing_On_GitHub_Blob $blob, $is_remove ) {
-        $arr = wp_upload_dir();
-        $path = $arr['basedir'] . '/writing-on-github/' . $blob->path();
-        if ( $is_remove ) {
-            if ( file_exists($path) ) {
-                unlink($path);
-            }
-        } else {
-            $dirname = dirname($path);
-            if ( ! file_exists($dirname) ) {
-                wp_mkdir_p($dirname);
-            }
-
-            file_put_contents($path, $blob->content());
-        }
-        return true;
-    }
-
-    /**
-     * Imports a single blob content into matching post.
-     *
-     * @param Writing_On_GitHub_Blob $blob Blob to transform into a Post.
-     *
-     * @return Writing_On_GitHub_Post|false
-     */
-    protected function blob_to_post( Writing_On_GitHub_Blob $blob ) {
-        $args = array( 'post_content' => $blob->content_import() );
-        $meta = $blob->meta();
-
-        $id = false;
-
-        if ( ! empty( $meta ) ) {
-            if ( array_key_exists( 'layout', $meta ) ) {
-                $args['post_type'] = $meta['layout'];
-                unset( $meta['layout'] );
-            }
-
-            if ( array_key_exists( 'published', $meta ) ) {
-                $args['post_status'] = true === $meta['published'] ? 'publish' : 'draft';
-                unset( $meta['published'] );
-            }
-
-            if ( array_key_exists( 'post_title', $meta ) ) {
-                $args['post_title'] = $meta['post_title'];
-                unset( $meta['post_title'] );
-            }
-
-            if ( array_key_exists( 'post_name', $meta ) ) {
-                $args['post_name'] = $meta['post_name'];
-                unset( $meta['post_name'] );
-            }
-
-            if ( array_key_exists( 'ID', $meta ) ) {
-                $id = $args['ID'] = $meta['ID'];
-                $blob->set_id($id);
-                unset( $meta['ID'] );
-            }
-        }
-
-        $meta['_wogh_sha'] = $blob->sha();
-
-        if ( $id ) {
-            $old_sha = get_post_meta( $id, '_wogh_sha', true );
-            $old_github_path = get_post_meta( $id, '_wogh_github_path', true );
-
-            // dont save post when has same sha
-            if ( $old_sha  && $old_sha == $meta['_wogh_sha'] &&
-                 $old_github_path && $old_github_path == $blob->path() ) {
-                return false;
-            }
-        }
-
-        $post = new Writing_On_GitHub_Post( $args, $this->app->api() );
-        $post->set_old_github_path( $blob->path() );
-        $post->set_meta( $meta );
-        $post->set_blob( $blob );
-        $blob->set_id( $post->id() );
-
-        return $post;
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Initializes a new import manager.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Imports a payload.
+	 * @param  Writing_On_GitHub_Payload $payload
+	 *
+	 * @return string|WP_Error
+	 */
+	public function payload( Writing_On_GitHub_Payload $payload ) {
+
+		$result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() );
+
+		if ( is_wp_error( $result ) ) {
+			/* @var WP_Error $result */
+			return $result;
+		}
+
+		if ( is_array( $result ) ) {
+			$result = $this->import_files( $result );
+		}
+
+		if ( is_wp_error( $result ) ) {
+			return $files;
+		}
+
+		return __( 'Payload processed', 'writing-on-github' );
+	}
+
+	/**
+	 * import blob by files
+	 * @param  Writing_On_GitHub_File_Info[] $files
+	 *
+	 * @return true|WP_Error
+	 */
+	protected function import_files( $files ) {
+
+		$error = true;
+
+		foreach ( $files as $file ) {
+			if ( ! $this->importable_file( $file ) ) {
+				continue;
+			}
+
+			$blob = $this->app->api()->fetch()->blob( $file );
+			// network error ?
+			if ( ! $blob instanceof Writing_On_GitHub_Blob ) {
+				continue;
+			}
+
+			$is_remove = 'removed' == $file->status;
+
+			$result = false;
+			if ( $this->importable_raw_file( $blob ) ) {
+				$result = $this->import_raw_file( $blob, $is_remove );
+			} elseif ( $this->importable_post( $blob ) ) {
+				if ( $is_remove ) {
+					$result = $this->delete_post( $blob );
+				} else {
+					$result = $this->import_post( $blob );
+				}
+			}
+
+			if ( is_wp_error( $result ) ) {
+				/* @var WP_Error $result */
+				$error = wogh_append_error( $error, $result );
+			}
+		}
+
+		return $error;
+	}
+
+	/**
+	 * Imports the latest commit on the master branch.
+	 *
+	 * @return string|WP_Error
+	 */
+	public function master() {
+		$result = $this->app->api()->fetch()->tree_recursive();
+
+		if ( is_wp_error( $result ) ) {
+			/* @var WP_Error $result */
+			return $result;
+		}
+
+		if ( is_array( $result ) ) {
+			$result = $this->import_files( $result );
+		}
+
+		if ( is_wp_error( $result ) ) {
+			/* @var WP_Error $result */
+			return $result;
+		}
+
+		return __( 'Payload processed', 'writing-on-github' );
+	}
+
+	/**
+	 * Checks whether the provided blob should be imported.
+	 *
+	 * @param Writing_On_GitHub_File_Info $file
+	 *
+	 * @return bool
+	 */
+	protected function importable_file( Writing_On_GitHub_File_Info $file ) {
+
+		$path = $file->path;
+
+		// only _pages, _posts and images
+		$prefixs = array( '_pages/', '_posts/', 'images/');
+		foreach ($prefixs as $prefix) {
+			if ( ! strncasecmp($path, $prefix, strlen( $prefix ) ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Checks whether the provided blob should be imported.
+	 *
+	 * @param Writing_On_GitHub_Blob $blob Blob to validate.
+	 *
+	 * @return bool
+	 */
+	protected function importable_post( Writing_On_GitHub_Blob $blob ) {
+		// global $wpdb;
+
+		// // Skip the repo's readme.
+		// if ( 'readme' === strtolower( substr( $blob->path(), 0, 6 ) ) ) {
+		//  return false;
+		// }
+
+		// // If the blob sha already matches a post, then move on.
+		// if ( ! is_wp_error( $this->app->database()->fetch_by_sha( $blob->sha() ) ) ) {
+		//  return false;
+		// }
+
+		if ( ! $blob->has_frontmatter() ) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Delete post
+	 * @param  Writing_On_GitHub_Blob $blob
+	 * @return WP_Error|bool
+	 */
+	protected function delete_post( Writing_On_GitHub_Blob $blob ) {
+		$id = $blob->id();
+		if ( empty( $id ) ) {
+			return false;
+		}
+		$result = $this->app->database()->delete_post( $id );
+		if ( is_wp_error( $result ) ) {
+			/* @var WP_Error $result */
+			return $result;
+		}
+		return true;
+	}
+
+	/**
+	 * Imports a post into wordpress
+	 * @param  Writing_On_GitHub_Blob $blob
+	 * @return WP_Error|bool
+	 */
+	protected function import_post( Writing_On_GitHub_Blob $blob ) {
+		$post = $this->blob_to_post( $blob );
+
+		if ( ! $post instanceof Writing_On_GitHub_Post ) {
+			return false;
+		}
+
+		$result = $this->app->database()->save_post( $post );
+		if ( is_wp_error( $result ) ) {
+			/** @var WP_Error $result */
+			return $result;
+		}
+
+		if ( $post->is_new() ||
+				! wogh_equal_front_matter( $post, $blob ) ) {
+
+			$result = $this->app->export()->export_post( $post );
+
+			if ( is_wp_error( $result ) ) {
+				/** @var WP_Error $result */
+				return $result;
+			}
+		}
+
+		clean_post_cache( $post->id() );
+
+		return true;
+	}
+
+	/**
+	 * import raw file
+	 * @param  Writing_On_GitHub_Blob $blob
+	 * @return bool
+	 */
+	protected function importable_raw_file( Writing_On_GitHub_Blob $blob ) {
+		if ( $blob->has_frontmatter() ) {
+			return false;
+		}
+
+		// only images
+		if ( strncasecmp($blob->path(), 'images/', strlen('images/') ) != 0) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Imports a raw file content into file system.
+	 * @param  Writing_On_GitHub_Blob $blob
+	 * @param  bool                   $is_remove
+	 */
+	protected function import_raw_file( Writing_On_GitHub_Blob $blob, $is_remove ) {
+		$arr = wp_upload_dir();
+		$path = $arr['basedir'] . '/writing-on-github/' . $blob->path();
+		if ( $is_remove ) {
+			if ( file_exists($path) ) {
+				unlink($path);
+			}
+		} else {
+			$dirname = dirname($path);
+			if ( ! file_exists($dirname) ) {
+				wp_mkdir_p($dirname);
+			}
+
+			file_put_contents($path, $blob->content());
+		}
+		return true;
+	}
+
+	/**
+	 * Imports a single blob content into matching post.
+	 *
+	 * @param Writing_On_GitHub_Blob $blob Blob to transform into a Post.
+	 *
+	 * @return Writing_On_GitHub_Post|false
+	 */
+	protected function blob_to_post( Writing_On_GitHub_Blob $blob ) {
+		$args = array( 'post_content' => $blob->content_import() );
+		$meta = $blob->meta();
+
+		$id = false;
+
+		if ( ! empty( $meta ) ) {
+			if ( array_key_exists( 'layout', $meta ) ) {
+				$args['post_type'] = $meta['layout'];
+				unset( $meta['layout'] );
+			}
+
+			if ( array_key_exists( 'published', $meta ) ) {
+				$args['post_status'] = true === $meta['published'] ? 'publish' : 'draft';
+				unset( $meta['published'] );
+			}
+
+			if ( array_key_exists( 'post_title', $meta ) ) {
+				$args['post_title'] = $meta['post_title'];
+				unset( $meta['post_title'] );
+			}
+
+			if ( array_key_exists( 'post_name', $meta ) ) {
+				$args['post_name'] = $meta['post_name'];
+				unset( $meta['post_name'] );
+			}
+
+			if ( array_key_exists( 'ID', $meta ) ) {
+				$id = $args['ID'] = $meta['ID'];
+				$blob->set_id($id);
+				unset( $meta['ID'] );
+			}
+		}
+
+		$meta['_wogh_sha'] = $blob->sha();
+
+		if ( $id ) {
+			$old_sha = get_post_meta( $id, '_wogh_sha', true );
+			$old_github_path = get_post_meta( $id, '_wogh_github_path', true );
+
+			// dont save post when has same sha
+			if ( $old_sha  && $old_sha == $meta['_wogh_sha'] &&
+				 $old_github_path && $old_github_path == $blob->path() ) {
+				return false;
+			}
+		}
+
+		$post = new Writing_On_GitHub_Post( $args, $this->app->api() );
+		$post->set_old_github_path( $blob->path() );
+		$post->set_meta( $meta );
+		$post->set_blob( $blob );
+		$blob->set_id( $post->id() );
+
+		return $post;
+	}
 }

Spacing +75 added lines, -75 removed lines

@@ -22,7 +22,7 @@ 
      *
      * @param Writing_On_GitHub $app Application container.
      */
-    public function __construct( Writing_On_GitHub $app ) {
+    public function __construct(Writing_On_GitHub $app) {
         $this->app = $app;
     }
 
@@ -32,24 +32,24 @@ 
      *
      * @return string|WP_Error
      */
-    public function payload( Writing_On_GitHub_Payload $payload ) {
+    public function payload(Writing_On_GitHub_Payload $payload) {
 
-        $result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() );
+        $result = $this->app->api()->fetch()->compare($payload->get_before_commit_id());
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
 
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result );
+        if (is_array($result)) {
+            $result = $this->import_files($result);
         }
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             return $files;
         }
 
-        return __( 'Payload processed', 'writing-on-github' );
+        return __('Payload processed', 'writing-on-github');
     }
 
     /**
@@ -58,37 +58,37 @@ 
      *
      * @return true|WP_Error
      */
-    protected function import_files( $files ) {
+    protected function import_files($files) {
 
         $error = true;
 
-        foreach ( $files as $file ) {
-            if ( ! $this->importable_file( $file ) ) {
+        foreach ($files as $file) {
+            if ( ! $this->importable_file($file)) {
                 continue;
             }
 
-            $blob = $this->app->api()->fetch()->blob( $file );
+            $blob = $this->app->api()->fetch()->blob($file);
             // network error ?
-            if ( ! $blob instanceof Writing_On_GitHub_Blob ) {
+            if ( ! $blob instanceof Writing_On_GitHub_Blob) {
                 continue;
             }
 
             $is_remove = 'removed' == $file->status;
 
             $result = false;
-            if ( $this->importable_raw_file( $blob ) ) {
-                $result = $this->import_raw_file( $blob, $is_remove );
-            } elseif ( $this->importable_post( $blob ) ) {
-                if ( $is_remove ) {
-                    $result = $this->delete_post( $blob );
+            if ($this->importable_raw_file($blob)) {
+                $result = $this->import_raw_file($blob, $is_remove);
+            } elseif ($this->importable_post($blob)) {
+                if ($is_remove) {
+                    $result = $this->delete_post($blob);
                 } else {
-                    $result = $this->import_post( $blob );
+                    $result = $this->import_post($blob);
                 }
             }
 
-            if ( is_wp_error( $result ) ) {
+            if (is_wp_error($result)) {
                 /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
+                $error = wogh_append_error($error, $result);
             }
         }
 
@@ -103,21 +103,21 @@ 
     public function master() {
         $result = $this->app->api()->fetch()->tree_recursive();
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
 
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result );
+        if (is_array($result)) {
+            $result = $this->import_files($result);
         }
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
 
-        return __( 'Payload processed', 'writing-on-github' );
+        return __('Payload processed', 'writing-on-github');
     }
 
     /**
@@ -127,14 +127,14 @@ 
      *
      * @return bool
      */
-    protected function importable_file( Writing_On_GitHub_File_Info $file ) {
+    protected function importable_file(Writing_On_GitHub_File_Info $file) {
 
         $path = $file->path;
 
         // only _pages, _posts and images
-        $prefixs = array( '_pages/', '_posts/', 'images/');
+        $prefixs = array('_pages/', '_posts/', 'images/');
         foreach ($prefixs as $prefix) {
-            if ( ! strncasecmp($path, $prefix, strlen( $prefix ) ) ) {
+            if ( ! strncasecmp($path, $prefix, strlen($prefix))) {
                 return true;
             }
         }
@@ -148,7 +148,7 @@ 
      *
      * @return bool
      */
-    protected function importable_post( Writing_On_GitHub_Blob $blob ) {
+    protected function importable_post(Writing_On_GitHub_Blob $blob) {
         // global $wpdb;
 
         // // Skip the repo's readme.
@@ -161,7 +161,7 @@ 
         //  return false;
         // }
 
-        if ( ! $blob->has_frontmatter() ) {
+        if ( ! $blob->has_frontmatter()) {
             return false;
         }
 
@@ -173,13 +173,13 @@ 
      * @param  Writing_On_GitHub_Blob $blob
      * @return WP_Error|bool
      */
-    protected function delete_post( Writing_On_GitHub_Blob $blob ) {
+    protected function delete_post(Writing_On_GitHub_Blob $blob) {
         $id = $blob->id();
-        if ( empty( $id ) ) {
+        if (empty($id)) {
             return false;
         }
-        $result = $this->app->database()->delete_post( $id );
-        if ( is_wp_error( $result ) ) {
+        $result = $this->app->database()->delete_post($id);
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
@@ -191,31 +191,31 @@ 
      * @param  Writing_On_GitHub_Blob $blob
      * @return WP_Error|bool
      */
-    protected function import_post( Writing_On_GitHub_Blob $blob ) {
-        $post = $this->blob_to_post( $blob );
+    protected function import_post(Writing_On_GitHub_Blob $blob) {
+        $post = $this->blob_to_post($blob);
 
-        if ( ! $post instanceof Writing_On_GitHub_Post ) {
+        if ( ! $post instanceof Writing_On_GitHub_Post) {
             return false;
         }
 
-        $result = $this->app->database()->save_post( $post );
-        if ( is_wp_error( $result ) ) {
+        $result = $this->app->database()->save_post($post);
+        if (is_wp_error($result)) {
             /** @var WP_Error $result */
             return $result;
         }
 
-        if ( $post->is_new() ||
-                ! wogh_equal_front_matter( $post, $blob ) ) {
+        if ($post->is_new() ||
+                ! wogh_equal_front_matter($post, $blob)) {
 
-            $result = $this->app->export()->export_post( $post );
+            $result = $this->app->export()->export_post($post);
 
-            if ( is_wp_error( $result ) ) {
+            if (is_wp_error($result)) {
                 /** @var WP_Error $result */
                 return $result;
             }
         }
 
-        clean_post_cache( $post->id() );
+        clean_post_cache($post->id());
 
         return true;
     }
@@ -225,13 +225,13 @@ 
      * @param  Writing_On_GitHub_Blob $blob
      * @return bool
      */
-    protected function importable_raw_file( Writing_On_GitHub_Blob $blob ) {
-        if ( $blob->has_frontmatter() ) {
+    protected function importable_raw_file(Writing_On_GitHub_Blob $blob) {
+        if ($blob->has_frontmatter()) {
             return false;
         }
 
         // only images
-        if ( strncasecmp($blob->path(), 'images/', strlen('images/') ) != 0) {
+        if (strncasecmp($blob->path(), 'images/', strlen('images/')) != 0) {
             return false;
         }
 
@@ -243,16 +243,16 @@ 
      * @param  Writing_On_GitHub_Blob $blob
      * @param  bool                   $is_remove
      */
-    protected function import_raw_file( Writing_On_GitHub_Blob $blob, $is_remove ) {
+    protected function import_raw_file(Writing_On_GitHub_Blob $blob, $is_remove) {
         $arr = wp_upload_dir();
         $path = $arr['basedir'] . '/writing-on-github/' . $blob->path();
-        if ( $is_remove ) {
-            if ( file_exists($path) ) {
+        if ($is_remove) {
+            if (file_exists($path)) {
                 unlink($path);
             }
         } else {
             $dirname = dirname($path);
-            if ( ! file_exists($dirname) ) {
+            if ( ! file_exists($dirname)) {
                 wp_mkdir_p($dirname);
             }
 
@@ -268,58 +268,58 @@ 
      *
      * @return Writing_On_GitHub_Post|false
      */
-    protected function blob_to_post( Writing_On_GitHub_Blob $blob ) {
-        $args = array( 'post_content' => $blob->content_import() );
+    protected function blob_to_post(Writing_On_GitHub_Blob $blob) {
+        $args = array('post_content' => $blob->content_import());
         $meta = $blob->meta();
 
         $id = false;
 
-        if ( ! empty( $meta ) ) {
-            if ( array_key_exists( 'layout', $meta ) ) {
+        if ( ! empty($meta)) {
+            if (array_key_exists('layout', $meta)) {
                 $args['post_type'] = $meta['layout'];
-                unset( $meta['layout'] );
+                unset($meta['layout']);
             }
 
-            if ( array_key_exists( 'published', $meta ) ) {
+            if (array_key_exists('published', $meta)) {
                 $args['post_status'] = true === $meta['published'] ? 'publish' : 'draft';
-                unset( $meta['published'] );
+                unset($meta['published']);
             }
 
-            if ( array_key_exists( 'post_title', $meta ) ) {
+            if (array_key_exists('post_title', $meta)) {
                 $args['post_title'] = $meta['post_title'];
-                unset( $meta['post_title'] );
+                unset($meta['post_title']);
             }
 
-            if ( array_key_exists( 'post_name', $meta ) ) {
+            if (array_key_exists('post_name', $meta)) {
                 $args['post_name'] = $meta['post_name'];
-                unset( $meta['post_name'] );
+                unset($meta['post_name']);
             }
 
-            if ( array_key_exists( 'ID', $meta ) ) {
+            if (array_key_exists('ID', $meta)) {
                 $id = $args['ID'] = $meta['ID'];
                 $blob->set_id($id);
-                unset( $meta['ID'] );
+                unset($meta['ID']);
             }
         }
 
         $meta['_wogh_sha'] = $blob->sha();
 
-        if ( $id ) {
-            $old_sha = get_post_meta( $id, '_wogh_sha', true );
-            $old_github_path = get_post_meta( $id, '_wogh_github_path', true );
+        if ($id) {
+            $old_sha = get_post_meta($id, '_wogh_sha', true);
+            $old_github_path = get_post_meta($id, '_wogh_github_path', true);
 
             // dont save post when has same sha
-            if ( $old_sha  && $old_sha == $meta['_wogh_sha'] &&
-                 $old_github_path && $old_github_path == $blob->path() ) {
+            if ($old_sha && $old_sha == $meta['_wogh_sha'] &&
+                 $old_github_path && $old_github_path == $blob->path()) {
                 return false;
             }
         }
 
-        $post = new Writing_On_GitHub_Post( $args, $this->app->api() );
-        $post->set_old_github_path( $blob->path() );
-        $post->set_meta( $meta );
-        $post->set_blob( $blob );
-        $blob->set_id( $post->id() );
+        $post = new Writing_On_GitHub_Post($args, $this->app->api());
+        $post->set_old_github_path($blob->path());
+        $post->set_meta($meta);
+        $post->set_blob($blob);
+        $blob->set_id($post->id());
 
         return $post;
     }

lib/client/fetch.php

Indentation +114 added lines, -114 removed lines

@@ -9,118 +9,118 @@
  */
 class Writing_On_GitHub_Fetch_Client extends Writing_On_GitHub_Base_Client {
 
-    /**
-     * Compare a commit by sha with master from the GitHub API
-     *
-     * @param string $sha Sha for commit to retrieve.
-     *
-     * @return Writing_On_GitHub_File_Info[]|WP_Error
-     */
-    public function compare( $sha ) {
-        // https://api.github.com/repos/litefeel/testwpsync/compare/861f87e8851b8debb78db548269d29f8da4d94ac...master
-        $endpoint = $this->compare_endpoint();
-        $branch = $this->branch();
-        $data = $this->call( 'GET', "$endpoint/$sha...$branch" );
-
-        if ( is_wp_error( $data ) ) {
-            return $data;
-        }
-
-        $files = array();
-        foreach ($data->files as $file) {
-            $file->path = $file->filename;
-            $files[] = new Writing_On_GitHub_File_Info($file);
-        }
-
-        return $files;
-    }
-
-    /**
-     * Calls the content API to get the post's contents and metadata
-     *
-     * Returns Object the response from the API
-     *
-     * @param Writing_On_GitHub_Post $post Post to retrieve remote contents for.
-     *
-     * @return mixed
-     */
-    public function remote_contents( $post ) {
-        return $this->call( 'GET', $this->content_endpoint( $post->github_path() ) );
-    }
-
-
-
-    public function exists( $path ) {
-        $result = $this->call( 'GET', $this->content_endpoint( $path ) );
-        if ( is_wp_error( $result ) ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Retrieves a tree by sha recursively from the GitHub API
-     *
-     * @param string $sha Commit sha to retrieve tree from.
-     *
-     * @return Writing_On_GitHub_File_Info[]|WP_Error
-     */
-    public function tree_recursive( $sha = '_default' ) {
-
-        if ( '_default' === $sha ) {
-            $sha = $this->branch();
-        }
-
-        $data = $this->call( 'GET', $this->tree_endpoint() . '/' . $sha . '?recursive=1' );
-
-        if ( is_wp_error( $data ) ) {
-            return $data;
-        }
-
-        $files = array();
-
-        foreach ( $data->tree as $index => $thing ) {
-            // We need to remove the trees because
-            // the recursive tree includes both
-            // the subtrees as well the subtrees' blobs.
-            if ( 'blob' === $thing->type ) {
-                $thing->status = '';
-                $files[] = new Writing_On_GitHub_File_Info( $thing );
-            }
-        }
-
-        return $files;
-    }
-
-    /**
-     * Retrieves the blob data for a given sha
-     *
-     * @param Writing_On_GitHub_File_Info $fileinfo
-     *
-     * @return Writing_On_GitHub_Blob|WP_Error
-     */
-    public function blob( Writing_On_GitHub_File_Info $fileinfo ) {
-        $data = $this->call( 'GET', $this->blob_endpoint() . '/' . $fileinfo->sha );
-
-        if ( is_wp_error( $data ) ) {
-            return $data;
-        }
-
-        $data->path = $fileinfo->path;
-        return new Writing_On_GitHub_Blob( $data );
-    }
-
-    /**
-     * Get blob by path
-     * @param  string $path
-     * @return Writing_On_GitHub_Blob|WP_Error
-     */
-    public function blob_by_path( $path ) {
-        $result = $this->call( 'GET', $this->content_endpoint( $path ) );
-        if ( is_wp_error( $result ) ) {
-            return $result;
-        }
-
-        return new Writing_On_GitHub_Blob( $result );
-    }
+	/**
+	 * Compare a commit by sha with master from the GitHub API
+	 *
+	 * @param string $sha Sha for commit to retrieve.
+	 *
+	 * @return Writing_On_GitHub_File_Info[]|WP_Error
+	 */
+	public function compare( $sha ) {
+		// https://api.github.com/repos/litefeel/testwpsync/compare/861f87e8851b8debb78db548269d29f8da4d94ac...master
+		$endpoint = $this->compare_endpoint();
+		$branch = $this->branch();
+		$data = $this->call( 'GET', "$endpoint/$sha...$branch" );
+
+		if ( is_wp_error( $data ) ) {
+			return $data;
+		}
+
+		$files = array();
+		foreach ($data->files as $file) {
+			$file->path = $file->filename;
+			$files[] = new Writing_On_GitHub_File_Info($file);
+		}
+
+		return $files;
+	}
+
+	/**
+	 * Calls the content API to get the post's contents and metadata
+	 *
+	 * Returns Object the response from the API
+	 *
+	 * @param Writing_On_GitHub_Post $post Post to retrieve remote contents for.
+	 *
+	 * @return mixed
+	 */
+	public function remote_contents( $post ) {
+		return $this->call( 'GET', $this->content_endpoint( $post->github_path() ) );
+	}
+
+
+
+	public function exists( $path ) {
+		$result = $this->call( 'GET', $this->content_endpoint( $path ) );
+		if ( is_wp_error( $result ) ) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Retrieves a tree by sha recursively from the GitHub API
+	 *
+	 * @param string $sha Commit sha to retrieve tree from.
+	 *
+	 * @return Writing_On_GitHub_File_Info[]|WP_Error
+	 */
+	public function tree_recursive( $sha = '_default' ) {
+
+		if ( '_default' === $sha ) {
+			$sha = $this->branch();
+		}
+
+		$data = $this->call( 'GET', $this->tree_endpoint() . '/' . $sha . '?recursive=1' );
+
+		if ( is_wp_error( $data ) ) {
+			return $data;
+		}
+
+		$files = array();
+
+		foreach ( $data->tree as $index => $thing ) {
+			// We need to remove the trees because
+			// the recursive tree includes both
+			// the subtrees as well the subtrees' blobs.
+			if ( 'blob' === $thing->type ) {
+				$thing->status = '';
+				$files[] = new Writing_On_GitHub_File_Info( $thing );
+			}
+		}
+
+		return $files;
+	}
+
+	/**
+	 * Retrieves the blob data for a given sha
+	 *
+	 * @param Writing_On_GitHub_File_Info $fileinfo
+	 *
+	 * @return Writing_On_GitHub_Blob|WP_Error
+	 */
+	public function blob( Writing_On_GitHub_File_Info $fileinfo ) {
+		$data = $this->call( 'GET', $this->blob_endpoint() . '/' . $fileinfo->sha );
+
+		if ( is_wp_error( $data ) ) {
+			return $data;
+		}
+
+		$data->path = $fileinfo->path;
+		return new Writing_On_GitHub_Blob( $data );
+	}
+
+	/**
+	 * Get blob by path
+	 * @param  string $path
+	 * @return Writing_On_GitHub_Blob|WP_Error
+	 */
+	public function blob_by_path( $path ) {
+		$result = $this->call( 'GET', $this->content_endpoint( $path ) );
+		if ( is_wp_error( $result ) ) {
+			return $result;
+		}
+
+		return new Writing_On_GitHub_Blob( $result );
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -16,13 +16,13 @@ 
      *
      * @return Writing_On_GitHub_File_Info[]|WP_Error
      */
-    public function compare( $sha ) {
+    public function compare($sha) {
         // https://api.github.com/repos/litefeel/testwpsync/compare/861f87e8851b8debb78db548269d29f8da4d94ac...master
         $endpoint = $this->compare_endpoint();
         $branch = $this->branch();
-        $data = $this->call( 'GET', "$endpoint/$sha...$branch" );
+        $data = $this->call('GET', "$endpoint/$sha...$branch");
 
-        if ( is_wp_error( $data ) ) {
+        if (is_wp_error($data)) {
             return $data;
         }
 
@@ -44,15 +44,15 @@ 
      *
      * @return mixed
      */
-    public function remote_contents( $post ) {
-        return $this->call( 'GET', $this->content_endpoint( $post->github_path() ) );
+    public function remote_contents($post) {
+        return $this->call('GET', $this->content_endpoint($post->github_path()));
     }
 
 
 
-    public function exists( $path ) {
-        $result = $this->call( 'GET', $this->content_endpoint( $path ) );
-        if ( is_wp_error( $result ) ) {
+    public function exists($path) {
+        $result = $this->call('GET', $this->content_endpoint($path));
+        if (is_wp_error($result)) {
             return false;
         }
         return true;
@@ -65,27 +65,27 @@ 
      *
      * @return Writing_On_GitHub_File_Info[]|WP_Error
      */
-    public function tree_recursive( $sha = '_default' ) {
+    public function tree_recursive($sha = '_default') {
 
-        if ( '_default' === $sha ) {
+        if ('_default' === $sha) {
             $sha = $this->branch();
         }
 
-        $data = $this->call( 'GET', $this->tree_endpoint() . '/' . $sha . '?recursive=1' );
+        $data = $this->call('GET', $this->tree_endpoint() . '/' . $sha . '?recursive=1');
 
-        if ( is_wp_error( $data ) ) {
+        if (is_wp_error($data)) {
             return $data;
         }
 
         $files = array();
 
-        foreach ( $data->tree as $index => $thing ) {
+        foreach ($data->tree as $index => $thing) {
             // We need to remove the trees because
             // the recursive tree includes both
             // the subtrees as well the subtrees' blobs.
-            if ( 'blob' === $thing->type ) {
+            if ('blob' === $thing->type) {
                 $thing->status = '';
-                $files[] = new Writing_On_GitHub_File_Info( $thing );
+                $files[] = new Writing_On_GitHub_File_Info($thing);
             }
         }
 
@@ -99,15 +99,15 @@ 
      *
      * @return Writing_On_GitHub_Blob|WP_Error
      */
-    public function blob( Writing_On_GitHub_File_Info $fileinfo ) {
-        $data = $this->call( 'GET', $this->blob_endpoint() . '/' . $fileinfo->sha );
+    public function blob(Writing_On_GitHub_File_Info $fileinfo) {
+        $data = $this->call('GET', $this->blob_endpoint() . '/' . $fileinfo->sha);
 
-        if ( is_wp_error( $data ) ) {
+        if (is_wp_error($data)) {
             return $data;
         }
 
         $data->path = $fileinfo->path;
-        return new Writing_On_GitHub_Blob( $data );
+        return new Writing_On_GitHub_Blob($data);
     }
 
     /**
@@ -115,12 +115,12 @@ 
      * @param  string $path
      * @return Writing_On_GitHub_Blob|WP_Error
      */
-    public function blob_by_path( $path ) {
-        $result = $this->call( 'GET', $this->content_endpoint( $path ) );
-        if ( is_wp_error( $result ) ) {
+    public function blob_by_path($path) {
+        $result = $this->call('GET', $this->content_endpoint($path));
+        if (is_wp_error($result)) {
             return $result;
         }
 
-        return new Writing_On_GitHub_Blob( $result );
+        return new Writing_On_GitHub_Blob($result);
     }
 }

lib/post.php

Indentation +476 added lines, -476 removed lines

@@ -9,480 +9,480 @@
  */
 class Writing_On_GitHub_Post {
 
-    /**
-     * Api object
-     *
-     * @var Writing_On_GitHub_Api
-     */
-    public $api;
-
-    /**
-     * Post ID
-     * @var integer
-     */
-    public $id = 0;
-
-    /**
-     * Blob object
-     * @var Writing_On_GitHub_Blob
-     */
-    public $blob;
-
-    /**
-     * Post object
-     * @var WP_Post
-     */
-    public $post;
-
-    /**
-     * Post args.
-     *
-     * @var array
-     */
-    protected $args;
-
-    /**
-     * Post meta.
-     *
-     * @var array
-     */
-    protected $meta;
-
-    /**
-     * Whether the post has been saved.
-     *
-     * @var bool
-     */
-    protected $new = true;
-
-
-    protected $old_github_path;
-
-    /**
-     * Instantiates a new Post object
-     *
-     * @param int|array                 $id_or_args Either a post ID or an array of arguments.
-     * @param Writing_On_GitHub_Api $api API object.
-     *
-     * @todo remove database operations from this method
-     */
-    public function __construct( $id_or_args, Writing_On_GitHub_Api $api ) {
-        $this->api = $api;
-
-        if ( is_numeric( $id_or_args ) ) {
-            $this->id   = (int) $id_or_args;
-            $this->post = get_post( $this->id );
-            $this->new  = false;
-        }
-
-        if ( is_array( $id_or_args ) ) {
-            $this->args = $id_or_args;
-
-            if ( isset( $this->args['ID'] ) ) {
-                $this->post = get_post( $this->args['ID'] );
-
-                if ( $this->post ) {
-                    $this->id  = $this->post->ID;
-                    $this->new = false;
-                } else {
-                    unset( $this->args['ID'] );
-                }
-            }
-        }
-    }
-
-    public function id() {
-        return $this->id;
-    }
-
-    /**
-     * Returns the post type
-     */
-    public function type() {
-        return $this->post->post_type;
-    }
-
-    /**
-     * Returns the post type
-     */
-    public function status() {
-        return $this->post->post_status;
-    }
-
-    /**
-     * Returns the post name
-     */
-    public function name() {
-        return $this->post->post_name;
-    }
-
-    /**
-     * Returns true if the post has a password
-     * @return bool
-     */
-    public function has_password() {
-        return ! empty( $this->post->post_password );
-    }
-
-    /**
-     * Combines the 2 content parts for GitHub
-     */
-    public function github_content() {
-        $use_blob = wogh_is_dont_export_content() && $this->blob;
-        $content = $use_blob ?
-            $this->blob->post_content() :
-            $this->post_content();
-
-        return $this->front_matter() . $content;
-        // $content = $this->front_matter() . $content;
-        // $ending  = apply_filters( 'wogh_line_endings', "\n" );
-
-        // return preg_replace( '~(*BSR_ANYCRLF)\R~', $ending, $content );
-    }
-
-    /**
-     * The post's YAML frontmatter
-     *
-     * Returns String the YAML frontmatter, ready to be written to the file
-     */
-    public function front_matter() {
-        return "---\n" . spyc_dump( $this->meta() ) . "---\n";
-    }
-
-    /**
-     * Returns the post_content
-     *
-     * Markdownify's the content if applicable
-     */
-    public function post_content() {
-        $content = $this->post->post_content;
-
-        if ( function_exists( 'wpmarkdown_html_to_markdown' ) ) {
-            $content = wpmarkdown_html_to_markdown( $content );
-        } else if ( class_exists( 'WPCom_Markdown' ) ) {
-            if ( WPCom_Markdown::get_instance()->is_markdown( $this->post->ID ) ) {
-                $content = $this->post->post_content_filtered;
-            }
-        }
-
-        return apply_filters( 'wogh_content_export', $content, $this );
-    }
-
-    public function old_github_path() {
-        return $this->old_github_path;
-    }
-
-    public function set_old_github_path( $path ) {
-        $this->old_github_path = $path;
-        update_post_meta( $this->id, '_wogh_github_path', $path );
-    }
-
-
-    /**
-     * Retrieves or calculates the proper GitHub path for a given post
-     *
-     * Returns (string) the path relative to repo root
-     */
-    public function github_path() {
-        $path = $this->github_directory() . $this->github_filename();
-
-        return $path;
-    }
-
-    /**
-     * Get GitHub directory based on post
-     *
-     * @return string
-     */
-    public function github_directory() {
-        if ( 'publish' !== $this->status() ) {
-            return apply_filters( 'wogh_directory_unpublished', '_drafts/', $this );
-        }
-
-        $name = '';
-
-        switch ( $this->type() ) {
-            case 'post':
-                $name = 'posts';
-                break;
-            case 'page':
-                $name = 'pages';
-                break;
-            default:
-                $obj = get_post_type_object( $this->type() );
-
-                if ( $obj ) {
-                    $name = strtolower( $obj->labels->name );
-                }
-
-                if ( ! $name ) {
-                    $name = '';
-                }
-        }
-
-        if ( $name ) {
-            $name = '_' . $name . '/';
-        }
-
-        return apply_filters( 'wogh_directory_published', $name, $this );
-    }
-
-    /**
-     * Build GitHub filename based on post
-     */
-    public function github_filename() {
-        if ( 'post' === $this->type() ) {
-            $filename = get_the_time( 'Y-m-d-', $this->id ) . $this->get_name() . '.md';
-        } else {
-            $filename = $this->get_name() . '.md';
-        }
-
-        return apply_filters( 'wogh_filename', $filename, $this );
-    }
-
-    /**
-     * Returns a post slug we can use in the GitHub filename
-     *
-     * @return string
-     */
-    protected function get_name() {
-        if ( '' !== $this->name() ) {
-            return $this->name();
-        }
-
-        return sanitize_title( get_the_title( $this->post ) );
-    }
-
-    /**
-     * is put on github
-     * @return boolean
-     */
-    public function is_on_github() {
-        $sha = get_post_meta( $this->id, '_wogh_sha', true );
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
-        if ( $sha && $github_path ) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Returns the URL for the post on GitHub.
-     *
-     * @return string
-     */
-    public function github_view_url() {
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
-        $repository = $this->api->fetch()->repository();
-        $branch = $this->api->fetch()->branch();
-
-        return "https://github.com/$repository/blob/$branch/$github_path";
-    }
-
-    /**
-     * Returns the URL for the post on GitHub.
-     *
-     * @return string
-     */
-    public function github_edit_url() {
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
-        $repository = $this->api->fetch()->repository();
-        $branch = $this->api->fetch()->branch();
-
-        return "https://github.com/$repository/edit/$branch/$github_path";
-    }
-
-    /**
-     * Retrieve post type directory from blob path.
-     *
-     * @param string $path Path string.
-     *
-     * @return string
-     */
-    public function get_directory_from_path( $path ) {
-        $directory = explode( '/', $path );
-        $directory = count( $directory ) > 0 ? $directory[0] : '';
-
-        return $directory;
-    }
-
-    /**
-     * Determines the last author to modify the post
-     *
-     * Returns Array an array containing the author name and email
-     */
-    public function last_modified_author() {
-        if ( $last_id = get_post_meta( $this->id, '_edit_last', true ) ) {
-            $user = get_userdata( $last_id );
-
-            if ( $user ) {
-                return array( 'name' => $user->display_name, 'email' => $user->user_email );
-            }
-        }
-
-        return array();
-    }
-
-    /**
-     * The post's sha
-     * Cached as post meta, or will make a live call if need be
-     *
-     * Returns String the sha1 hash
-     */
-    public function sha() {
-        $sha = get_post_meta( $this->id, '_wogh_sha', true );
-
-        // If we've done a full export and we have no sha
-        // then we should try a live check to see if it exists.
-        // if ( ! $sha && 'yes' === get_option( '_wogh_fully_exported' ) ) {
-
-        //  // @todo could we eliminate this by calling down the full tree and searching it
-        //  $data = $this->api->fetch()->remote_contents( $this );
-
-        //  if ( ! is_wp_error( $data ) ) {
-        //      update_post_meta( $this->id, '_wogh_sha', $data->sha );
-        //      $sha = $data->sha;
-        //  }
-        // }
-
-        // if the sha still doesn't exist, then it's empty
-        if ( ! $sha || is_wp_error( $sha ) ) {
-            $sha = '';
-        }
-
-        return $sha;
-    }
-
-    /**
-     * Save the sha to post
-     *
-     * @param string $sha
-     */
-    public function set_sha( $sha ) {
-        update_post_meta( $this->id, '_wogh_sha', $sha );
-    }
-
-    /**
-     * The post's metadata
-     *
-     * Returns Array the post's metadata
-     */
-    public function meta() {
-        $meta = array(
-            'ID'           => $this->id,
-            'post_title'   => get_the_title( $this->post ),
-            'post_name'    => $this->post->post_name,
-            'author'       => ( $author = get_userdata( $this->post->post_author ) ) ? $author->display_name : '',
-            'post_date'    => $this->post->post_date,
-            'post_excerpt' => $this->post->post_excerpt,
-            'layout'       => get_post_type( $this->post ),
-            'link'         => get_permalink( $this->post ),
-            'published'    => 'publish' === $this->status() ? true : false,
-            'tags'         => wp_get_post_tags( $this->id, array( 'fields' => 'names' ) ),
-            'categories'   => wp_get_post_categories( $this->id, array( 'fields' => 'names' ) )
-        );
-        if ( empty($this->post->post_name) ) {
-            unset($meta['post_name']);
-        }
-        if ( empty($this->post->post_excerpt) ) {
-            unset($meta['post_excerpt']);
-        }
-        if ( 'yes' == get_option('wogh_ignore_author') ) {
-            unset($meta['author']);
-        }
-
-        //convert traditional post_meta values, hide hidden values, skip already populated values
-        // foreach ( get_post_custom( $this->id ) as $key => $value ) {
-
-        //  if ( '_' === substr( $key, 0, 1 ) || isset( $meta[ $key ] ) ) {
-        //      continue;
-        //  }
-
-        //  $meta[ $key ] = $value;
-
-        // }
-
-        return apply_filters( 'wogh_post_meta', $meta, $this );
-    }
-
-    /**
-     * Returns whether the Post has been saved in the DB yet.
-     *
-     * @return bool
-     */
-    public function is_new() {
-        return $this->new;
-    }
-
-    /**
-     * Sets the Post's meta.
-     *
-     * @param array $meta
-     */
-    public function set_meta( $meta ) {
-        $this->meta = $meta;
-    }
-
-    /**
-     * Returns the Post's arguments.
-     *
-     * @return array
-     */
-    public function get_args() {
-        return $this->args;
-    }
-
-    /**
-     * Returns the Post's meta.
-     *
-     * @return array
-     */
-    public function get_meta() {
-        return $this->meta;
-    }
-
-    /**
-     * Get the blob
-     * @return Writing_On_GitHub_Blob
-     */
-    public function get_blob() {
-        return $this->blob;
-    }
-
-    /**
-     * Set the blob
-     * @param Writing_On_GitHub_Blob $blob
-     */
-    public function set_blob( Writing_On_GitHub_Blob $blob ) {
-        $this->blob = $blob;
-    }
-
-    /**
-     * Sets the Post's WP_Post object.
-     *
-     * @param WP_Post $post
-     *
-     * @return $this
-     */
-    public function set_post( WP_Post $post ) {
-        $this->post = $post;
-        $this->id   = $post->ID;
-
-        return $this;
-    }
-
-    /**
-     * Transforms the Post into a Blob.
-     *
-     * @return Writing_On_GitHub_Blob
-     */
-    public function to_blob() {
-        $data = new stdClass;
-
-        $data->path    = $this->github_path();
-        $data->content = $this->github_content();
-        $data->sha     = $this->sha();
-
-        return new Writing_On_GitHub_Blob( $data );
-    }
+	/**
+	 * Api object
+	 *
+	 * @var Writing_On_GitHub_Api
+	 */
+	public $api;
+
+	/**
+	 * Post ID
+	 * @var integer
+	 */
+	public $id = 0;
+
+	/**
+	 * Blob object
+	 * @var Writing_On_GitHub_Blob
+	 */
+	public $blob;
+
+	/**
+	 * Post object
+	 * @var WP_Post
+	 */
+	public $post;
+
+	/**
+	 * Post args.
+	 *
+	 * @var array
+	 */
+	protected $args;
+
+	/**
+	 * Post meta.
+	 *
+	 * @var array
+	 */
+	protected $meta;
+
+	/**
+	 * Whether the post has been saved.
+	 *
+	 * @var bool
+	 */
+	protected $new = true;
+
+
+	protected $old_github_path;
+
+	/**
+	 * Instantiates a new Post object
+	 *
+	 * @param int|array                 $id_or_args Either a post ID or an array of arguments.
+	 * @param Writing_On_GitHub_Api $api API object.
+	 *
+	 * @todo remove database operations from this method
+	 */
+	public function __construct( $id_or_args, Writing_On_GitHub_Api $api ) {
+		$this->api = $api;
+
+		if ( is_numeric( $id_or_args ) ) {
+			$this->id   = (int) $id_or_args;
+			$this->post = get_post( $this->id );
+			$this->new  = false;
+		}
+
+		if ( is_array( $id_or_args ) ) {
+			$this->args = $id_or_args;
+
+			if ( isset( $this->args['ID'] ) ) {
+				$this->post = get_post( $this->args['ID'] );
+
+				if ( $this->post ) {
+					$this->id  = $this->post->ID;
+					$this->new = false;
+				} else {
+					unset( $this->args['ID'] );
+				}
+			}
+		}
+	}
+
+	public function id() {
+		return $this->id;
+	}
+
+	/**
+	 * Returns the post type
+	 */
+	public function type() {
+		return $this->post->post_type;
+	}
+
+	/**
+	 * Returns the post type
+	 */
+	public function status() {
+		return $this->post->post_status;
+	}
+
+	/**
+	 * Returns the post name
+	 */
+	public function name() {
+		return $this->post->post_name;
+	}
+
+	/**
+	 * Returns true if the post has a password
+	 * @return bool
+	 */
+	public function has_password() {
+		return ! empty( $this->post->post_password );
+	}
+
+	/**
+	 * Combines the 2 content parts for GitHub
+	 */
+	public function github_content() {
+		$use_blob = wogh_is_dont_export_content() && $this->blob;
+		$content = $use_blob ?
+			$this->blob->post_content() :
+			$this->post_content();
+
+		return $this->front_matter() . $content;
+		// $content = $this->front_matter() . $content;
+		// $ending  = apply_filters( 'wogh_line_endings', "\n" );
+
+		// return preg_replace( '~(*BSR_ANYCRLF)\R~', $ending, $content );
+	}
+
+	/**
+	 * The post's YAML frontmatter
+	 *
+	 * Returns String the YAML frontmatter, ready to be written to the file
+	 */
+	public function front_matter() {
+		return "---\n" . spyc_dump( $this->meta() ) . "---\n";
+	}
+
+	/**
+	 * Returns the post_content
+	 *
+	 * Markdownify's the content if applicable
+	 */
+	public function post_content() {
+		$content = $this->post->post_content;
+
+		if ( function_exists( 'wpmarkdown_html_to_markdown' ) ) {
+			$content = wpmarkdown_html_to_markdown( $content );
+		} else if ( class_exists( 'WPCom_Markdown' ) ) {
+			if ( WPCom_Markdown::get_instance()->is_markdown( $this->post->ID ) ) {
+				$content = $this->post->post_content_filtered;
+			}
+		}
+
+		return apply_filters( 'wogh_content_export', $content, $this );
+	}
+
+	public function old_github_path() {
+		return $this->old_github_path;
+	}
+
+	public function set_old_github_path( $path ) {
+		$this->old_github_path = $path;
+		update_post_meta( $this->id, '_wogh_github_path', $path );
+	}
+
+
+	/**
+	 * Retrieves or calculates the proper GitHub path for a given post
+	 *
+	 * Returns (string) the path relative to repo root
+	 */
+	public function github_path() {
+		$path = $this->github_directory() . $this->github_filename();
+
+		return $path;
+	}
+
+	/**
+	 * Get GitHub directory based on post
+	 *
+	 * @return string
+	 */
+	public function github_directory() {
+		if ( 'publish' !== $this->status() ) {
+			return apply_filters( 'wogh_directory_unpublished', '_drafts/', $this );
+		}
+
+		$name = '';
+
+		switch ( $this->type() ) {
+			case 'post':
+				$name = 'posts';
+				break;
+			case 'page':
+				$name = 'pages';
+				break;
+			default:
+				$obj = get_post_type_object( $this->type() );
+
+				if ( $obj ) {
+					$name = strtolower( $obj->labels->name );
+				}
+
+				if ( ! $name ) {
+					$name = '';
+				}
+		}
+
+		if ( $name ) {
+			$name = '_' . $name . '/';
+		}
+
+		return apply_filters( 'wogh_directory_published', $name, $this );
+	}
+
+	/**
+	 * Build GitHub filename based on post
+	 */
+	public function github_filename() {
+		if ( 'post' === $this->type() ) {
+			$filename = get_the_time( 'Y-m-d-', $this->id ) . $this->get_name() . '.md';
+		} else {
+			$filename = $this->get_name() . '.md';
+		}
+
+		return apply_filters( 'wogh_filename', $filename, $this );
+	}
+
+	/**
+	 * Returns a post slug we can use in the GitHub filename
+	 *
+	 * @return string
+	 */
+	protected function get_name() {
+		if ( '' !== $this->name() ) {
+			return $this->name();
+		}
+
+		return sanitize_title( get_the_title( $this->post ) );
+	}
+
+	/**
+	 * is put on github
+	 * @return boolean
+	 */
+	public function is_on_github() {
+		$sha = get_post_meta( $this->id, '_wogh_sha', true );
+		$github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+		if ( $sha && $github_path ) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Returns the URL for the post on GitHub.
+	 *
+	 * @return string
+	 */
+	public function github_view_url() {
+		$github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+		$repository = $this->api->fetch()->repository();
+		$branch = $this->api->fetch()->branch();
+
+		return "https://github.com/$repository/blob/$branch/$github_path";
+	}
+
+	/**
+	 * Returns the URL for the post on GitHub.
+	 *
+	 * @return string
+	 */
+	public function github_edit_url() {
+		$github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+		$repository = $this->api->fetch()->repository();
+		$branch = $this->api->fetch()->branch();
+
+		return "https://github.com/$repository/edit/$branch/$github_path";
+	}
+
+	/**
+	 * Retrieve post type directory from blob path.
+	 *
+	 * @param string $path Path string.
+	 *
+	 * @return string
+	 */
+	public function get_directory_from_path( $path ) {
+		$directory = explode( '/', $path );
+		$directory = count( $directory ) > 0 ? $directory[0] : '';
+
+		return $directory;
+	}
+
+	/**
+	 * Determines the last author to modify the post
+	 *
+	 * Returns Array an array containing the author name and email
+	 */
+	public function last_modified_author() {
+		if ( $last_id = get_post_meta( $this->id, '_edit_last', true ) ) {
+			$user = get_userdata( $last_id );
+
+			if ( $user ) {
+				return array( 'name' => $user->display_name, 'email' => $user->user_email );
+			}
+		}
+
+		return array();
+	}
+
+	/**
+	 * The post's sha
+	 * Cached as post meta, or will make a live call if need be
+	 *
+	 * Returns String the sha1 hash
+	 */
+	public function sha() {
+		$sha = get_post_meta( $this->id, '_wogh_sha', true );
+
+		// If we've done a full export and we have no sha
+		// then we should try a live check to see if it exists.
+		// if ( ! $sha && 'yes' === get_option( '_wogh_fully_exported' ) ) {
+
+		//  // @todo could we eliminate this by calling down the full tree and searching it
+		//  $data = $this->api->fetch()->remote_contents( $this );
+
+		//  if ( ! is_wp_error( $data ) ) {
+		//      update_post_meta( $this->id, '_wogh_sha', $data->sha );
+		//      $sha = $data->sha;
+		//  }
+		// }
+
+		// if the sha still doesn't exist, then it's empty
+		if ( ! $sha || is_wp_error( $sha ) ) {
+			$sha = '';
+		}
+
+		return $sha;
+	}
+
+	/**
+	 * Save the sha to post
+	 *
+	 * @param string $sha
+	 */
+	public function set_sha( $sha ) {
+		update_post_meta( $this->id, '_wogh_sha', $sha );
+	}
+
+	/**
+	 * The post's metadata
+	 *
+	 * Returns Array the post's metadata
+	 */
+	public function meta() {
+		$meta = array(
+			'ID'           => $this->id,
+			'post_title'   => get_the_title( $this->post ),
+			'post_name'    => $this->post->post_name,
+			'author'       => ( $author = get_userdata( $this->post->post_author ) ) ? $author->display_name : '',
+			'post_date'    => $this->post->post_date,
+			'post_excerpt' => $this->post->post_excerpt,
+			'layout'       => get_post_type( $this->post ),
+			'link'         => get_permalink( $this->post ),
+			'published'    => 'publish' === $this->status() ? true : false,
+			'tags'         => wp_get_post_tags( $this->id, array( 'fields' => 'names' ) ),
+			'categories'   => wp_get_post_categories( $this->id, array( 'fields' => 'names' ) )
+		);
+		if ( empty($this->post->post_name) ) {
+			unset($meta['post_name']);
+		}
+		if ( empty($this->post->post_excerpt) ) {
+			unset($meta['post_excerpt']);
+		}
+		if ( 'yes' == get_option('wogh_ignore_author') ) {
+			unset($meta['author']);
+		}
+
+		//convert traditional post_meta values, hide hidden values, skip already populated values
+		// foreach ( get_post_custom( $this->id ) as $key => $value ) {
+
+		//  if ( '_' === substr( $key, 0, 1 ) || isset( $meta[ $key ] ) ) {
+		//      continue;
+		//  }
+
+		//  $meta[ $key ] = $value;
+
+		// }
+
+		return apply_filters( 'wogh_post_meta', $meta, $this );
+	}
+
+	/**
+	 * Returns whether the Post has been saved in the DB yet.
+	 *
+	 * @return bool
+	 */
+	public function is_new() {
+		return $this->new;
+	}
+
+	/**
+	 * Sets the Post's meta.
+	 *
+	 * @param array $meta
+	 */
+	public function set_meta( $meta ) {
+		$this->meta = $meta;
+	}
+
+	/**
+	 * Returns the Post's arguments.
+	 *
+	 * @return array
+	 */
+	public function get_args() {
+		return $this->args;
+	}
+
+	/**
+	 * Returns the Post's meta.
+	 *
+	 * @return array
+	 */
+	public function get_meta() {
+		return $this->meta;
+	}
+
+	/**
+	 * Get the blob
+	 * @return Writing_On_GitHub_Blob
+	 */
+	public function get_blob() {
+		return $this->blob;
+	}
+
+	/**
+	 * Set the blob
+	 * @param Writing_On_GitHub_Blob $blob
+	 */
+	public function set_blob( Writing_On_GitHub_Blob $blob ) {
+		$this->blob = $blob;
+	}
+
+	/**
+	 * Sets the Post's WP_Post object.
+	 *
+	 * @param WP_Post $post
+	 *
+	 * @return $this
+	 */
+	public function set_post( WP_Post $post ) {
+		$this->post = $post;
+		$this->id   = $post->ID;
+
+		return $this;
+	}
+
+	/**
+	 * Transforms the Post into a Blob.
+	 *
+	 * @return Writing_On_GitHub_Blob
+	 */
+	public function to_blob() {
+		$data = new stdClass;
+
+		$data->path    = $this->github_path();
+		$data->content = $this->github_content();
+		$data->sha     = $this->sha();
+
+		return new Writing_On_GitHub_Blob( $data );
+	}
 }

Spacing +62 added lines, -63 removed lines

@@ -66,26 +66,26 @@ 
      *
      * @todo remove database operations from this method
      */
-    public function __construct( $id_or_args, Writing_On_GitHub_Api $api ) {
+    public function __construct($id_or_args, Writing_On_GitHub_Api $api) {
         $this->api = $api;
 
-        if ( is_numeric( $id_or_args ) ) {
+        if (is_numeric($id_or_args)) {
             $this->id   = (int) $id_or_args;
-            $this->post = get_post( $this->id );
+            $this->post = get_post($this->id);
             $this->new  = false;
         }
 
-        if ( is_array( $id_or_args ) ) {
+        if (is_array($id_or_args)) {
             $this->args = $id_or_args;
 
-            if ( isset( $this->args['ID'] ) ) {
-                $this->post = get_post( $this->args['ID'] );
+            if (isset($this->args['ID'])) {
+                $this->post = get_post($this->args['ID']);
 
-                if ( $this->post ) {
+                if ($this->post) {
                     $this->id  = $this->post->ID;
                     $this->new = false;
                 } else {
-                    unset( $this->args['ID'] );
+                    unset($this->args['ID']);
                 }
             }
         }
@@ -121,7 +121,7 @@ 
      * @return bool
      */
     public function has_password() {
-        return ! empty( $this->post->post_password );
+        return ! empty($this->post->post_password);
     }
 
     /**
@@ -130,8 +130,7 @@ 
     public function github_content() {
         $use_blob = wogh_is_dont_export_content() && $this->blob;
         $content = $use_blob ?
-            $this->blob->post_content() :
-            $this->post_content();
+            $this->blob->post_content() : $this->post_content();
 
         return $this->front_matter() . $content;
         // $content = $this->front_matter() . $content;
@@ -146,7 +145,7 @@ 
      * Returns String the YAML frontmatter, ready to be written to the file
      */
     public function front_matter() {
-        return "---\n" . spyc_dump( $this->meta() ) . "---\n";
+        return "---\n" . spyc_dump($this->meta()) . "---\n";
     }
 
     /**
@@ -157,24 +156,24 @@ 
     public function post_content() {
         $content = $this->post->post_content;
 
-        if ( function_exists( 'wpmarkdown_html_to_markdown' ) ) {
-            $content = wpmarkdown_html_to_markdown( $content );
-        } else if ( class_exists( 'WPCom_Markdown' ) ) {
-            if ( WPCom_Markdown::get_instance()->is_markdown( $this->post->ID ) ) {
+        if (function_exists('wpmarkdown_html_to_markdown')) {
+            $content = wpmarkdown_html_to_markdown($content);
+        } else if (class_exists('WPCom_Markdown')) {
+            if (WPCom_Markdown::get_instance()->is_markdown($this->post->ID)) {
                 $content = $this->post->post_content_filtered;
             }
         }
 
-        return apply_filters( 'wogh_content_export', $content, $this );
+        return apply_filters('wogh_content_export', $content, $this);
     }
 
     public function old_github_path() {
         return $this->old_github_path;
     }
 
-    public function set_old_github_path( $path ) {
+    public function set_old_github_path($path) {
         $this->old_github_path = $path;
-        update_post_meta( $this->id, '_wogh_github_path', $path );
+        update_post_meta($this->id, '_wogh_github_path', $path);
     }
 
 
@@ -195,13 +194,13 @@ 
      * @return string
      */
     public function github_directory() {
-        if ( 'publish' !== $this->status() ) {
-            return apply_filters( 'wogh_directory_unpublished', '_drafts/', $this );
+        if ('publish' !== $this->status()) {
+            return apply_filters('wogh_directory_unpublished', '_drafts/', $this);
         }
 
         $name = '';
 
-        switch ( $this->type() ) {
+        switch ($this->type()) {
             case 'post':
                 $name = 'posts';
                 break;
@@ -209,35 +208,35 @@ 
                 $name = 'pages';
                 break;
             default:
-                $obj = get_post_type_object( $this->type() );
+                $obj = get_post_type_object($this->type());
 
-                if ( $obj ) {
-                    $name = strtolower( $obj->labels->name );
+                if ($obj) {
+                    $name = strtolower($obj->labels->name);
                 }
 
-                if ( ! $name ) {
+                if ( ! $name) {
                     $name = '';
                 }
         }
 
-        if ( $name ) {
+        if ($name) {
             $name = '_' . $name . '/';
         }
 
-        return apply_filters( 'wogh_directory_published', $name, $this );
+        return apply_filters('wogh_directory_published', $name, $this);
     }
 
     /**
      * Build GitHub filename based on post
      */
     public function github_filename() {
-        if ( 'post' === $this->type() ) {
-            $filename = get_the_time( 'Y-m-d-', $this->id ) . $this->get_name() . '.md';
+        if ('post' === $this->type()) {
+            $filename = get_the_time('Y-m-d-', $this->id) . $this->get_name() . '.md';
         } else {
             $filename = $this->get_name() . '.md';
         }
 
-        return apply_filters( 'wogh_filename', $filename, $this );
+        return apply_filters('wogh_filename', $filename, $this);
     }
 
     /**
@@ -246,11 +245,11 @@ 
      * @return string
      */
     protected function get_name() {
-        if ( '' !== $this->name() ) {
+        if ('' !== $this->name()) {
             return $this->name();
         }
 
-        return sanitize_title( get_the_title( $this->post ) );
+        return sanitize_title(get_the_title($this->post));
     }
 
     /**
@@ -258,9 +257,9 @@ 
      * @return boolean
      */
     public function is_on_github() {
-        $sha = get_post_meta( $this->id, '_wogh_sha', true );
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
-        if ( $sha && $github_path ) {
+        $sha = get_post_meta($this->id, '_wogh_sha', true);
+        $github_path = get_post_meta($this->id, '_wogh_github_path', true);
+        if ($sha && $github_path) {
             return true;
         }
         return false;
@@ -272,7 +271,7 @@ 
      * @return string
      */
     public function github_view_url() {
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+        $github_path = get_post_meta($this->id, '_wogh_github_path', true);
         $repository = $this->api->fetch()->repository();
         $branch = $this->api->fetch()->branch();
 
@@ -285,7 +284,7 @@ 
      * @return string
      */
     public function github_edit_url() {
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+        $github_path = get_post_meta($this->id, '_wogh_github_path', true);
         $repository = $this->api->fetch()->repository();
         $branch = $this->api->fetch()->branch();
 
@@ -299,9 +298,9 @@ 
      *
      * @return string
      */
-    public function get_directory_from_path( $path ) {
-        $directory = explode( '/', $path );
-        $directory = count( $directory ) > 0 ? $directory[0] : '';
+    public function get_directory_from_path($path) {
+        $directory = explode('/', $path);
+        $directory = count($directory) > 0 ? $directory[0] : '';
 
         return $directory;
     }
@@ -312,11 +311,11 @@ 
      * Returns Array an array containing the author name and email
      */
     public function last_modified_author() {
-        if ( $last_id = get_post_meta( $this->id, '_edit_last', true ) ) {
-            $user = get_userdata( $last_id );
+        if ($last_id = get_post_meta($this->id, '_edit_last', true)) {
+            $user = get_userdata($last_id);
 
-            if ( $user ) {
-                return array( 'name' => $user->display_name, 'email' => $user->user_email );
+            if ($user) {
+                return array('name' => $user->display_name, 'email' => $user->user_email);
             }
         }
 
@@ -330,7 +329,7 @@ 
      * Returns String the sha1 hash
      */
     public function sha() {
-        $sha = get_post_meta( $this->id, '_wogh_sha', true );
+        $sha = get_post_meta($this->id, '_wogh_sha', true);
 
         // If we've done a full export and we have no sha
         // then we should try a live check to see if it exists.
@@ -346,7 +345,7 @@ 
         // }
 
         // if the sha still doesn't exist, then it's empty
-        if ( ! $sha || is_wp_error( $sha ) ) {
+        if ( ! $sha || is_wp_error($sha)) {
             $sha = '';
         }
 
@@ -358,8 +357,8 @@ 
      *
      * @param string $sha
      */
-    public function set_sha( $sha ) {
-        update_post_meta( $this->id, '_wogh_sha', $sha );
+    public function set_sha($sha) {
+        update_post_meta($this->id, '_wogh_sha', $sha);
     }
 
     /**
@@ -370,24 +369,24 @@ 
     public function meta() {
         $meta = array(
             'ID'           => $this->id,
-            'post_title'   => get_the_title( $this->post ),
+            'post_title'   => get_the_title($this->post),
             'post_name'    => $this->post->post_name,
-            'author'       => ( $author = get_userdata( $this->post->post_author ) ) ? $author->display_name : '',
+            'author'       => ($author = get_userdata($this->post->post_author)) ? $author->display_name : '',
             'post_date'    => $this->post->post_date,
             'post_excerpt' => $this->post->post_excerpt,
-            'layout'       => get_post_type( $this->post ),
-            'link'         => get_permalink( $this->post ),
+            'layout'       => get_post_type($this->post),
+            'link'         => get_permalink($this->post),
             'published'    => 'publish' === $this->status() ? true : false,
-            'tags'         => wp_get_post_tags( $this->id, array( 'fields' => 'names' ) ),
-            'categories'   => wp_get_post_categories( $this->id, array( 'fields' => 'names' ) )
+            'tags'         => wp_get_post_tags($this->id, array('fields' => 'names')),
+            'categories'   => wp_get_post_categories($this->id, array('fields' => 'names'))
         );
-        if ( empty($this->post->post_name) ) {
+        if (empty($this->post->post_name)) {
             unset($meta['post_name']);
         }
-        if ( empty($this->post->post_excerpt) ) {
+        if (empty($this->post->post_excerpt)) {
             unset($meta['post_excerpt']);
         }
-        if ( 'yes' == get_option('wogh_ignore_author') ) {
+        if ('yes' == get_option('wogh_ignore_author')) {
             unset($meta['author']);
         }
 
@@ -402,7 +401,7 @@ 
 
         // }
 
-        return apply_filters( 'wogh_post_meta', $meta, $this );
+        return apply_filters('wogh_post_meta', $meta, $this);
     }
 
     /**
@@ -419,7 +418,7 @@ 
      *
      * @param array $meta
      */
-    public function set_meta( $meta ) {
+    public function set_meta($meta) {
         $this->meta = $meta;
     }
 
@@ -453,7 +452,7 @@ 
      * Set the blob
      * @param Writing_On_GitHub_Blob $blob
      */
-    public function set_blob( Writing_On_GitHub_Blob $blob ) {
+    public function set_blob(Writing_On_GitHub_Blob $blob) {
         $this->blob = $blob;
     }
 
@@ -464,7 +463,7 @@ 
      *
      * @return $this
      */
-    public function set_post( WP_Post $post ) {
+    public function set_post(WP_Post $post) {
         $this->post = $post;
         $this->id   = $post->ID;
 
@@ -483,6 +482,6 @@ 
         $data->content = $this->github_content();
         $data->sha     = $this->sha();
 
-        return new Writing_On_GitHub_Blob( $data );
+        return new Writing_On_GitHub_Blob($data);
     }
 }