jarednova / timber

lib/integrations/acf-timber.php

Indentation +51 added lines, -51 removed lines

@@ -2,57 +2,57 @@
 
 class ACFTimber {
 
-    function __construct() {
-        add_filter( 'timber_post_get_meta', array( $this, 'post_get_meta' ), 10, 2 );
-        add_filter( 'timber_post_get_meta_field', array( $this, 'post_get_meta_field' ), 10, 3 );
-        add_filter( 'timber_term_get_meta', array( $this, 'term_get_meta' ), 10, 3 );
-        add_filter( 'timber_term_get_meta_field', array( $this, 'term_get_meta_field' ), 10, 4 );
-        add_filter( 'timber_user_get_meta_field_pre', array( $this, 'user_get_meta_field' ), 10, 3 );
-        add_filter( 'timber_term_set_meta', array( $this, 'term_set_meta'), 10, 4 );
-    }
-
-    function post_get_meta( $customs, $post_id ) {
-        return $customs;
-    }
-
-    function post_get_meta_field( $value, $post_id, $field_name ) {
-        return get_field( $field_name, $post_id );
-    }
-
-    function term_get_meta_field( $value, $term_id, $field_name, $term ) {
-        $searcher = $term->taxonomy . "_" . $term->ID;
-        return get_field( $field_name, $searcher );
-    }
-
-    function term_set_meta( $value, $field, $term_id, $term ) {
-        $searcher = $term->taxonomy . "_" . $term->ID;
-        update_field( $field, $value, $searcher );
-        return $value;
-    }
-
-    function term_get_meta( $fields, $term_id, $term ) {
-        $searcher = $term->taxonomy . "_" . $term->ID; // save to a specific category
-        $fds = get_fields( $searcher );
-        if ( is_array( $fds ) ) {
-            foreach ( $fds as $key => $value ) {
-                $key = preg_replace( '/_/', '', $key, 1 );
-                $key = str_replace( $searcher, '', $key );
-                $key = preg_replace( '/_/', '', $key, 1 );
-                $field = get_field( $key, $searcher );
-                $fields[$key] = $field;
-            }
-            $fields = array_merge( $fields, $fds );
-        }
-        return $fields;
-    }
-
-    function user_get_meta( $fields, $user_id ) {
-        return $fields;
-    }
-
-    function user_get_meta_field( $value, $uid, $field ) {
-        return get_field( $field, 'user_' . $uid );
-    }
+	function __construct() {
+		add_filter( 'timber_post_get_meta', array( $this, 'post_get_meta' ), 10, 2 );
+		add_filter( 'timber_post_get_meta_field', array( $this, 'post_get_meta_field' ), 10, 3 );
+		add_filter( 'timber_term_get_meta', array( $this, 'term_get_meta' ), 10, 3 );
+		add_filter( 'timber_term_get_meta_field', array( $this, 'term_get_meta_field' ), 10, 4 );
+		add_filter( 'timber_user_get_meta_field_pre', array( $this, 'user_get_meta_field' ), 10, 3 );
+		add_filter( 'timber_term_set_meta', array( $this, 'term_set_meta'), 10, 4 );
+	}
+
+	function post_get_meta( $customs, $post_id ) {
+		return $customs;
+	}
+
+	function post_get_meta_field( $value, $post_id, $field_name ) {
+		return get_field( $field_name, $post_id );
+	}
+
+	function term_get_meta_field( $value, $term_id, $field_name, $term ) {
+		$searcher = $term->taxonomy . "_" . $term->ID;
+		return get_field( $field_name, $searcher );
+	}
+
+	function term_set_meta( $value, $field, $term_id, $term ) {
+		$searcher = $term->taxonomy . "_" . $term->ID;
+		update_field( $field, $value, $searcher );
+		return $value;
+	}
+
+	function term_get_meta( $fields, $term_id, $term ) {
+		$searcher = $term->taxonomy . "_" . $term->ID; // save to a specific category
+		$fds = get_fields( $searcher );
+		if ( is_array( $fds ) ) {
+			foreach ( $fds as $key => $value ) {
+				$key = preg_replace( '/_/', '', $key, 1 );
+				$key = str_replace( $searcher, '', $key );
+				$key = preg_replace( '/_/', '', $key, 1 );
+				$field = get_field( $key, $searcher );
+				$fields[$key] = $field;
+			}
+			$fields = array_merge( $fields, $fds );
+		}
+		return $fields;
+	}
+
+	function user_get_meta( $fields, $user_id ) {
+		return $fields;
+	}
+
+	function user_get_meta_field( $value, $uid, $field ) {
+		return get_field( $field, 'user_' . $uid );
+	}
 }
 
 

lib/integrations/timber-command.php

Indentation +24 added lines, -24 removed lines

@@ -6,31 +6,31 @@
  */
 class TimberCommand {
 
-    public static function clear_cache($mode = 'all'){
-        if (is_array($mode)){
-            $mode = reset($mode);
-        }
-        if ($mode == 'all') {
-            $twig_cache = self::clear_cache_twig();
-            $timber_cache = self::clear_cache_timber();
-            if ($twig_cache && $timber_cache){
-                return true;
-            }
-        } else if ($mode == 'twig') {
-            return self::clear_cache_twig();
-        } else if ($mode == 'timber') {
-            return self::clear_cache_timber();
-        }
-    }
+	public static function clear_cache($mode = 'all'){
+		if (is_array($mode)){
+			$mode = reset($mode);
+		}
+		if ($mode == 'all') {
+			$twig_cache = self::clear_cache_twig();
+			$timber_cache = self::clear_cache_timber();
+			if ($twig_cache && $timber_cache){
+				return true;
+			}
+		} else if ($mode == 'twig') {
+			return self::clear_cache_twig();
+		} else if ($mode == 'timber') {
+			return self::clear_cache_timber();
+		}
+	}
 
-    static function clear_cache_timber(){
-        $loader = new TimberLoader();
-        return $loader->clear_cache_timber();
-    }
+	static function clear_cache_timber(){
+		$loader = new TimberLoader();
+		return $loader->clear_cache_timber();
+	}
 
-    static function clear_cache_twig(){
-        $loader = new TimberLoader();
-        return $loader->clear_cache_twig();
-    }
+	static function clear_cache_twig(){
+		$loader = new TimberLoader();
+		return $loader->clear_cache_twig();
+	}
 
 }

lib/integrations/wpcli-timber.php

Indentation +46 added lines, -46 removed lines

@@ -5,53 +5,53 @@
 
 class Timber_WP_CLI_Command extends WP_CLI_Command {
 
-    /**
-     * Clears Timber and Twig's Cache
-     *
-     * ## EXAMPLES
-     *
-     *    wp timber clear_cache
-     *
-     */
-    public function clear_cache($mode = 'all') {
-        TimberCommand::clear_cache($mode);
-    }
+	/**
+	 * Clears Timber and Twig's Cache
+	 *
+	 * ## EXAMPLES
+	 *
+	 *    wp timber clear_cache
+	 *
+	 */
+	public function clear_cache($mode = 'all') {
+		TimberCommand::clear_cache($mode);
+	}
 
-    /**
-     * Clears Twig's Cache
-     *
-     * ## EXAMPLES
-     *
-     *    wp timber clear_cache_twig
-     *
-     */
-    function clear_cache_twig(){
-        $clear = TimberCommand::clear_cache_twig();
-        if ($clear){
-            WP_CLI::success('Cleared contents of twig cache');
-        } else {
-            WP_CLI::warning('Failed to clear twig cache');
-        }
-    }
+	/**
+	 * Clears Twig's Cache
+	 *
+	 * ## EXAMPLES
+	 *
+	 *    wp timber clear_cache_twig
+	 *
+	 */
+	function clear_cache_twig(){
+		$clear = TimberCommand::clear_cache_twig();
+		if ($clear){
+			WP_CLI::success('Cleared contents of twig cache');
+		} else {
+			WP_CLI::warning('Failed to clear twig cache');
+		}
+	}
 
-    /**
-     * Clears Timber's Cache
-     *
-     * ## EXAMPLES
-     *
-     *    wp timber clear_cache_timber
-     *
-     */
-    function clear_cache_timber() {
-        $clear = TimberCommand::clear_cache_timber();
-        $message = 'Failed to clear timber cache';
-        if ($clear){
-            $message = "Cleared contents of Timber's Cache";
-            WP_CLI::success($message);
-        } else {
-            WP_CLI::warning($message);
-        }
-        return $message;
-    }
+	/**
+	 * Clears Timber's Cache
+	 *
+	 * ## EXAMPLES
+	 *
+	 *    wp timber clear_cache_timber
+	 *
+	 */
+	function clear_cache_timber() {
+		$clear = TimberCommand::clear_cache_timber();
+		$message = 'Failed to clear timber cache';
+		if ($clear){
+			$message = "Cleared contents of Timber's Cache";
+			WP_CLI::success($message);
+		} else {
+			WP_CLI::warning($message);
+		}
+		return $message;
+	}
 
 }

lib/timber-admin.php

Indentation +3 added lines, -3 removed lines

@@ -2,9 +2,9 @@
 
 class TimberAdmin {
 
-    public static function init() {
-        return add_filter( 'plugin_row_meta', array( __CLASS__, 'meta_links' ), 10, 2 );
-    }
+	public static function init() {
+		return add_filter( 'plugin_row_meta', array( __CLASS__, 'meta_links' ), 10, 2 );
+	}
 
 	/**
 	 * @param array   $links

lib/timber-core.php

Indentation +103 added lines, -103 removed lines

@@ -2,116 +2,116 @@
 
 abstract class TimberCore {
 
-    public $id;
-    public $ID;
-    public $object_type;
+	public $id;
+	public $ID;
+	public $object_type;
 
-    /**
-     *
-     *
-     * @return boolean
-     */
-    function __isset( $field ) {
-        if ( isset( $this->$field ) ) {
-            return $this->$field;
-        }
-        return false;
-    }
+	/**
+	 *
+	 *
+	 * @return boolean
+	 */
+	function __isset( $field ) {
+		if ( isset( $this->$field ) ) {
+			return $this->$field;
+		}
+		return false;
+	}
 
-    /**
-     * This is helpful for twig to return properties and methods see: https://github.com/fabpot/Twig/issues/2
-     * @return mixed
-     */
-    function __call( $field, $args ) {
-        return $this->__get( $field );
-    }
+	/**
+	 * This is helpful for twig to return properties and methods see: https://github.com/fabpot/Twig/issues/2
+	 * @return mixed
+	 */
+	function __call( $field, $args ) {
+		return $this->__get( $field );
+	}
 
-    /**
-     * This is helpful for twig to return properties and methods see: https://github.com/fabpot/Twig/issues/2
-     *
-     * @return mixed
-     */
-    function __get( $field ) {
-    	if ( property_exists($this, $field) ) {
-    		return $this->$field;
-    	}
-        if ( method_exists($this, 'meta') && $meta_value = $this->meta( $field ) ) {
-            return $this->$field = $meta_value;
-        }
-        if ( method_exists($this, $field) ) {
-            return $this->$field = $this->$field();
-        }
-        return $this->$field = false;
-    }
+	/**
+	 * This is helpful for twig to return properties and methods see: https://github.com/fabpot/Twig/issues/2
+	 *
+	 * @return mixed
+	 */
+	function __get( $field ) {
+		if ( property_exists($this, $field) ) {
+			return $this->$field;
+		}
+		if ( method_exists($this, 'meta') && $meta_value = $this->meta( $field ) ) {
+			return $this->$field = $meta_value;
+		}
+		if ( method_exists($this, $field) ) {
+			return $this->$field = $this->$field();
+		}
+		return $this->$field = false;
+	}
 
-    /**
-     * Takes an array or object and adds the properties to the parent object
-     * @example
-     * ```php
-     * $data = array('airplane' => '757-200', 'flight' => '5316');
-     * $post = new TimberPost()
-     * $post->import(data);
-     * echo $post->airplane; //757-200
-     * ```
-     * @param array|object $info an object or array you want to grab data from to attach to the Timber object
-     */
-    function import( $info, $force = false ) {
-        if ( is_object( $info ) ) {
-            $info = get_object_vars( $info );
-        }
-        if ( is_array( $info ) ) {
-            foreach ( $info as $key => $value ) {
-                if ( !empty( $key ) && $force ) {
-                    $this->$key = $value;
-                } else if ( !empty( $key ) && !method_exists($this, $key) ){
-                    $this->$key = $value;
-                }
-            }
-        }
-    }
+	/**
+	 * Takes an array or object and adds the properties to the parent object
+	 * @example
+	 * ```php
+	 * $data = array('airplane' => '757-200', 'flight' => '5316');
+	 * $post = new TimberPost()
+	 * $post->import(data);
+	 * echo $post->airplane; //757-200
+	 * ```
+	 * @param array|object $info an object or array you want to grab data from to attach to the Timber object
+	 */
+	function import( $info, $force = false ) {
+		if ( is_object( $info ) ) {
+			$info = get_object_vars( $info );
+		}
+		if ( is_array( $info ) ) {
+			foreach ( $info as $key => $value ) {
+				if ( !empty( $key ) && $force ) {
+					$this->$key = $value;
+				} else if ( !empty( $key ) && !method_exists($this, $key) ){
+					$this->$key = $value;
+				}
+			}
+		}
+	}
 
 
-    /**
-     * @ignore
-     * @param string  $key
-     * @param mixed   $value
-     */
-    function update( $key, $value ) {
-        update_metadata( $this->object_type, $this->ID, $key, $value );
-    }
+	/**
+	 * @ignore
+	 * @param string  $key
+	 * @param mixed   $value
+	 */
+	function update( $key, $value ) {
+		update_metadata( $this->object_type, $this->ID, $key, $value );
+	}
 
-    /**
-     * Can you edit this post/term/user? Well good for you. You're no better than me.
-     * @example
-     * ```twig
-     * {% if post.can_edit %}
-     * <a href="{{ post.edit_link }}">Edit</a>
-     * {% endif %}
-     * ```
-     * ```html
-     * <a href="http://example.org/wp-admin/edit.php?p=242">Edit</a>
-     * ```
-     * @return bool
-     */
-    function can_edit() {
-        if ( !function_exists( 'current_user_can' ) ) {
-            return false;
-        }
-        if ( current_user_can( 'edit_post', $this->ID ) ) {
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * Can you edit this post/term/user? Well good for you. You're no better than me.
+	 * @example
+	 * ```twig
+	 * {% if post.can_edit %}
+	 * <a href="{{ post.edit_link }}">Edit</a>
+	 * {% endif %}
+	 * ```
+	 * ```html
+	 * <a href="http://example.org/wp-admin/edit.php?p=242">Edit</a>
+	 * ```
+	 * @return bool
+	 */
+	function can_edit() {
+		if ( !function_exists( 'current_user_can' ) ) {
+			return false;
+		}
+		if ( current_user_can( 'edit_post', $this->ID ) ) {
+			return true;
+		}
+		return false;
+	}
 
-    /**
-     *
-     *
-     * @return array
-     */
-    function get_method_values() {
-        $ret = array();
-        $ret['can_edit'] = $this->can_edit();
-        return $ret;
-    }
+	/**
+	 *
+	 *
+	 * @return array
+	 */
+	function get_method_values() {
+		$ret = array();
+		$ret['can_edit'] = $this->can_edit();
+		return $ret;
+	}
 
 }

lib/timber-integrations.php

Indentation +11 added lines, -11 removed lines

@@ -5,20 +5,20 @@
  * @package  timber
  */
 class TimberIntegrations {
-    public static function init() {
+	public static function init() {
 
-        add_action( 'init', array( __CLASS__, 'maybe_init_acftimber' ) );
+		add_action( 'init', array( __CLASS__, 'maybe_init_acftimber' ) );
 
-        if ( class_exists( 'WP_CLI_Command' ) ) {
-            WP_CLI::add_command( 'timber', 'Timber_WP_CLI_Command' );
-        }
-    }
+		if ( class_exists( 'WP_CLI_Command' ) ) {
+			WP_CLI::add_command( 'timber', 'Timber_WP_CLI_Command' );
+		}
+	}
 
-    public static function maybe_init_acftimber() {
+	public static function maybe_init_acftimber() {
 
-        if ( class_exists( 'ACF' ) ) {
-            new ACFTimber();
-        }
+		if ( class_exists( 'ACF' ) ) {
+			new ACFTimber();
+		}
 
-    }
+	}
 }

lib/timber-posts-collection.php

Indentation +84 added lines, -84 removed lines

@@ -2,96 +2,96 @@
 
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) )
-    exit;
+	exit;
 
 class TimberPostsCollection extends ArrayObject {
 
-    public function __construct( $posts = array(), $post_class = 'TimberPost' ) {
-        $returned_posts = array();
-        if ( is_null( $posts ) ){
-            $posts = array();
-        }
-        foreach ( $posts as $post_object ) {
-            $post_class_use = $post_class;
-
-            if ( is_array( $post_class ) ) {
-                $post_type      = get_post_type( $post_object );
-                $post_class_use = 'TimberPost';
-
-                if ( isset( $post_class[$post_type] ) ) {
-                    $post_class_use = $post_class[$post_type];
-
-                } else {
-                    if ( is_array( $post_class ) ) {
-                        TimberHelper::error_log( $post_type . ' of ' . $post_object->ID . ' not found in ' . print_r( $post_class, true ) );
-                    } else {
-                        TimberHelper::error_log( $post_type . ' not found in ' . $post_class );
-                    }
-                }
-            }
-
-            // Don't create yet another object if $post_object is already of the right type
-            if ( is_a( $post_object, $post_class_use ) ) {
-                $post = $post_object;
-            } else {
-                $post = new $post_class_use( $post_object );
-            }
-
-            if ( isset( $post->ID ) ) {
-                $returned_posts[] = $post;
-            }
-        }
-
-        $returned_posts = self::maybe_set_preview($returned_posts);
-
-        parent::__construct( $returned_posts, $flags = 0, 'TimberPostsIterator' );
-    }
-
-    public function get_posts() {
-        return $this->getArrayCopy();
-    }
-
-     /**
-     * @param array $posts
-     * @return array
-     */
-    static function maybe_set_preview( $posts ) {
-        if ( is_array( $posts ) && isset( $_GET['preview'] ) && $_GET['preview']
-               && isset( $_GET['preview_id'] ) && $_GET['preview_id']
-               && current_user_can( 'edit_post', $_GET['preview_id'] ) ) {
-            // No need to check the nonce, that already happened in _show_post_preview on init
-
-            $preview_id = $_GET['preview_id'];
-            foreach( $posts as &$post ) {
-                if ( is_object( $post ) && $post->ID == $preview_id ) {
-                    // Based on _set_preview( $post ), but adds import_custom
-                    $preview = wp_get_post_autosave( $preview_id );
-                    if ( is_object($preview) ) {
-
-                        $preview = sanitize_post($preview);
-
-                        $post->post_content = $preview->post_content;
-                        $post->post_title = $preview->post_title;
-                        $post->post_excerpt = $preview->post_excerpt;
-                        $post->import_custom( $preview_id );
-
-                        add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 );
-                    }
-                }
-            }
-
-        }
-
-        return $posts;
-    }
+	public function __construct( $posts = array(), $post_class = 'TimberPost' ) {
+		$returned_posts = array();
+		if ( is_null( $posts ) ){
+			$posts = array();
+		}
+		foreach ( $posts as $post_object ) {
+			$post_class_use = $post_class;
+
+			if ( is_array( $post_class ) ) {
+				$post_type      = get_post_type( $post_object );
+				$post_class_use = 'TimberPost';
+
+				if ( isset( $post_class[$post_type] ) ) {
+					$post_class_use = $post_class[$post_type];
+
+				} else {
+					if ( is_array( $post_class ) ) {
+						TimberHelper::error_log( $post_type . ' of ' . $post_object->ID . ' not found in ' . print_r( $post_class, true ) );
+					} else {
+						TimberHelper::error_log( $post_type . ' not found in ' . $post_class );
+					}
+				}
+			}
+
+			// Don't create yet another object if $post_object is already of the right type
+			if ( is_a( $post_object, $post_class_use ) ) {
+				$post = $post_object;
+			} else {
+				$post = new $post_class_use( $post_object );
+			}
+
+			if ( isset( $post->ID ) ) {
+				$returned_posts[] = $post;
+			}
+		}
+
+		$returned_posts = self::maybe_set_preview($returned_posts);
+
+		parent::__construct( $returned_posts, $flags = 0, 'TimberPostsIterator' );
+	}
+
+	public function get_posts() {
+		return $this->getArrayCopy();
+	}
+
+	 /**
+	  * @param array $posts
+	  * @return array
+	  */
+	static function maybe_set_preview( $posts ) {
+		if ( is_array( $posts ) && isset( $_GET['preview'] ) && $_GET['preview']
+			   && isset( $_GET['preview_id'] ) && $_GET['preview_id']
+			   && current_user_can( 'edit_post', $_GET['preview_id'] ) ) {
+			// No need to check the nonce, that already happened in _show_post_preview on init
+
+			$preview_id = $_GET['preview_id'];
+			foreach( $posts as &$post ) {
+				if ( is_object( $post ) && $post->ID == $preview_id ) {
+					// Based on _set_preview( $post ), but adds import_custom
+					$preview = wp_get_post_autosave( $preview_id );
+					if ( is_object($preview) ) {
+
+						$preview = sanitize_post($preview);
+
+						$post->post_content = $preview->post_content;
+						$post->post_title = $preview->post_title;
+						$post->post_excerpt = $preview->post_excerpt;
+						$post->import_custom( $preview_id );
+
+						add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 );
+					}
+				}
+			}
+
+		}
+
+		return $posts;
+	}
 
 }
 
 class TimberPostsIterator extends ArrayIterator {
 
-    public function current() {
-        global $post;
-        $post = parent::current();
-        return $post;
-    }
+	public function current() {
+		global $post;
+		$post = parent::current();
+		return $post;
+	}
 }

lib/timber-query-iterator.php

Indentation +148 added lines, -148 removed lines

@@ -1,156 +1,156 @@
 <?php
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) )
-    exit;
+	exit;
 
 class TimberQueryIterator implements Iterator {
 
-    /**
-     *
-     *
-     * @var WP_Query
-     */
-    private $_query = null;
-    private $_posts_class = 'TimberPost';
-
-    public function __construct( $query = false, $posts_class = 'TimberPost' ) {
-        add_action( 'pre_get_posts', array($this, 'fix_number_posts_wp_quirk' ));
-        if ( $posts_class )
-            $this->_posts_class = $posts_class;
-
-        if ( is_a( $query, 'WP_Query' ) ) {
-            // We got a full-fledged WP Query, look no further!
-            $the_query = $query;
-
-        } elseif ( false === $query ) {
-            // If query is explicitly set to false, use the main loop
-            global $wp_query;
-            $the_query =& $wp_query;
-            //if we're on a custom posts page?
-            $the_query = self::handle_maybe_custom_posts_page($the_query);
-        } elseif ( TimberHelper::is_array_assoc( $query ) || ( is_string( $query ) && strstr( $query, '=' ) ) ) {
-            // We have a regularly formed WP query string or array to use
-            $the_query = new WP_Query( $query );
-
-        } elseif ( is_numeric( $query ) || is_string( $query ) ) {
-            // We have what could be a post name or post ID to pull out
-            $the_query = self::get_query_from_string( $query );
-
-        } elseif ( is_array( $query ) && count( $query ) && ( is_integer( $query[0] ) || is_string( $query[0] ) ) ) {
-            // We have a list of pids (post IDs) to extract from
-            $the_query = self::get_query_from_array_of_ids( $query );
-        } elseif ( is_array($query) && empty($query)) {
-            // it's an empty array
-            $the_query = array();
-        } else {
-            TimberHelper::error_log( 'I have failed you! in ' . basename( __FILE__ ) . '::' . __LINE__ );
-            TimberHelper::error_log( $query );
-
-            // We have failed hard, at least let get something.
-            $the_query = new WP_Query();
-        }
-
-        $this->_query = $the_query;
-
-    }
-
-    public function get_posts( $return_collection = false ) {
-        if (isset($this->_query->posts)){
-            $posts = new TimberPostsCollection( $this->_query->posts, $this->_posts_class );
-            return ( $return_collection ) ? $posts : $posts->get_posts();
-        }
-    }
-
-    //
-    // GET POSTS
-    //
-    public static function get_query_from_array_of_ids( $query = array() ) {
-        if ( !is_array( $query ) || !count( $query ) )
-            return null;
-
-        return new WP_Query( array(
-                'post_type'=> 'any',
-                'ignore_sticky_posts' => true,
-                'post__in' => $query,
-                'orderby'  => 'post__in',
-                'nopaging' => true
-            ) );
-    }
-
-    public static function get_query_from_string( $string = '' ) {
-        $post_type = false;
-
-        if ( is_string( $string ) && strstr( $string, '#' ) ) {
-            //we have a post_type directive here
-            list( $post_type, $string ) = explode( '#', $string );
-        }
-
-        $query = array(
-            'post_type' => ( $post_type ) ? $post_type : 'any'
-        );
-
-        if ( is_numeric( $string ) ) {
-            $query['p'] = $string;
-
-        } else {
-            $query['name'] = $string;
-        }
-
-        return new WP_Query( $query );
-    }
-
-    //
-    // Iterator Interface
-    //
-
-    public function valid() {
-        return $this->_query->have_posts();
-    }
-
-    public function current() {
-        global $post;
-
-        $this->_query->the_post();
-
-        // Sets up the global post, but also return the post, for use in Twig template
-        $posts_class = $this->_posts_class;
-        return new $posts_class( $post );
-    }
-
-    /**
-     * Don't implement next, because current already advances the loop
-     */
-    final public function next() {}
-
-    public function rewind() {
-        $this->_query->rewind_posts();
-    }
-
-    public function key() {
-        $this->_query->current_post;
-    }
-
-    //get_posts users numberposts
-    static function fix_number_posts_wp_quirk( $query ) {
-        if (isset($query->query) && isset($query->query['numberposts'])
-                && !isset($query->query['posts_per_page'])) {
-            $query->set( 'posts_per_page', $query->query['numberposts'] );
-        }
-        return $query;
-    }
-
-    /**
-     * this will test for whether a custom page to display posts is active, and if so, set the query to the default
-     * @param  WP_Query $query the original query recived from WordPress
-     * @return WP_Query
-     */
-    static function handle_maybe_custom_posts_page( $query ) {
-    	if ($custom_posts_page = get_option('page_for_posts')) {
-        	if ( isset($query->query['p']) && $query->query['p'] == $custom_posts_page ) {
-        		return new WP_Query(array('post_type' => 'post'));
-        	}
-        }
-        return $query;
-    }
+	/**
+	 *
+	 *
+	 * @var WP_Query
+	 */
+	private $_query = null;
+	private $_posts_class = 'TimberPost';
+
+	public function __construct( $query = false, $posts_class = 'TimberPost' ) {
+		add_action( 'pre_get_posts', array($this, 'fix_number_posts_wp_quirk' ));
+		if ( $posts_class )
+			$this->_posts_class = $posts_class;
+
+		if ( is_a( $query, 'WP_Query' ) ) {
+			// We got a full-fledged WP Query, look no further!
+			$the_query = $query;
+
+		} elseif ( false === $query ) {
+			// If query is explicitly set to false, use the main loop
+			global $wp_query;
+			$the_query =& $wp_query;
+			//if we're on a custom posts page?
+			$the_query = self::handle_maybe_custom_posts_page($the_query);
+		} elseif ( TimberHelper::is_array_assoc( $query ) || ( is_string( $query ) && strstr( $query, '=' ) ) ) {
+			// We have a regularly formed WP query string or array to use
+			$the_query = new WP_Query( $query );
+
+		} elseif ( is_numeric( $query ) || is_string( $query ) ) {
+			// We have what could be a post name or post ID to pull out
+			$the_query = self::get_query_from_string( $query );
+
+		} elseif ( is_array( $query ) && count( $query ) && ( is_integer( $query[0] ) || is_string( $query[0] ) ) ) {
+			// We have a list of pids (post IDs) to extract from
+			$the_query = self::get_query_from_array_of_ids( $query );
+		} elseif ( is_array($query) && empty($query)) {
+			// it's an empty array
+			$the_query = array();
+		} else {
+			TimberHelper::error_log( 'I have failed you! in ' . basename( __FILE__ ) . '::' . __LINE__ );
+			TimberHelper::error_log( $query );
+
+			// We have failed hard, at least let get something.
+			$the_query = new WP_Query();
+		}
+
+		$this->_query = $the_query;
+
+	}
+
+	public function get_posts( $return_collection = false ) {
+		if (isset($this->_query->posts)){
+			$posts = new TimberPostsCollection( $this->_query->posts, $this->_posts_class );
+			return ( $return_collection ) ? $posts : $posts->get_posts();
+		}
+	}
+
+	//
+	// GET POSTS
+	//
+	public static function get_query_from_array_of_ids( $query = array() ) {
+		if ( !is_array( $query ) || !count( $query ) )
+			return null;
+
+		return new WP_Query( array(
+				'post_type'=> 'any',
+				'ignore_sticky_posts' => true,
+				'post__in' => $query,
+				'orderby'  => 'post__in',
+				'nopaging' => true
+			) );
+	}
+
+	public static function get_query_from_string( $string = '' ) {
+		$post_type = false;
+
+		if ( is_string( $string ) && strstr( $string, '#' ) ) {
+			//we have a post_type directive here
+			list( $post_type, $string ) = explode( '#', $string );
+		}
+
+		$query = array(
+			'post_type' => ( $post_type ) ? $post_type : 'any'
+		);
+
+		if ( is_numeric( $string ) ) {
+			$query['p'] = $string;
+
+		} else {
+			$query['name'] = $string;
+		}
+
+		return new WP_Query( $query );
+	}
+
+	//
+	// Iterator Interface
+	//
+
+	public function valid() {
+		return $this->_query->have_posts();
+	}
+
+	public function current() {
+		global $post;
+
+		$this->_query->the_post();
+
+		// Sets up the global post, but also return the post, for use in Twig template
+		$posts_class = $this->_posts_class;
+		return new $posts_class( $post );
+	}
+
+	/**
+	 * Don't implement next, because current already advances the loop
+	 */
+	final public function next() {}
+
+	public function rewind() {
+		$this->_query->rewind_posts();
+	}
+
+	public function key() {
+		$this->_query->current_post;
+	}
+
+	//get_posts users numberposts
+	static function fix_number_posts_wp_quirk( $query ) {
+		if (isset($query->query) && isset($query->query['numberposts'])
+				&& !isset($query->query['posts_per_page'])) {
+			$query->set( 'posts_per_page', $query->query['numberposts'] );
+		}
+		return $query;
+	}
+
+	/**
+	 * this will test for whether a custom page to display posts is active, and if so, set the query to the default
+	 * @param  WP_Query $query the original query recived from WordPress
+	 * @return WP_Query
+	 */
+	static function handle_maybe_custom_posts_page( $query ) {
+		if ($custom_posts_page = get_option('page_for_posts')) {
+			if ( isset($query->query['p']) && $query->query['p'] == $custom_posts_page ) {
+				return new WP_Query(array('post_type' => 'post'));
+			}
+		}
+		return $query;
+	}
 
 }

lib/timber-site.php

Indentation +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
 	/** @api
 	 * @var string for people who like trackback spam
-	*/
+	 */
 	public $pingback_url;
 	public $siteurl;
 	/**