Merge pull request #35 from Upstatement/trace_scheduled_posts

Trace scheduled posts

Author: jarednova

includes/class-stream-manager-admin.php

@@ -13,6 +13,7 @@
  * @package StreamManagerAdmin
  * @author  Chris Voll + Upstatement
  */
+
 class StreamManagerAdmin {
 
 	/**
@@ -74,10 +75,6 @@ private function __construct() {
 		// Saving Streams
 		add_action( 'save_post', array( $this, 'save_stream' ) );
 
-		// Saving Posts (= updating streams)
-		add_action( 'transition_post_status',  array( $this, 'on_save_post' ), 10, 3 );
-
-
 		// AJAX Helpers
 		// ------------
 
@@ -391,42 +388,6 @@ public static function parse_terms( $taxonomy, $terms, $return_objects = false )
 	}
 
 
-	/**
-	 * Update streams whenever any post status is changed
-	 *
-	 * @since     1.0.0
-	 *
-	 * @param     string  $new   new post status
-	 * @param     string  $old   old post status
-	 * @param     object  $post  WordPress post object
-	 */
-	public function on_save_post( $new, $old, $post ) {
-		if ( $post->post_type == 'sm_stream' ) return;
-
-		if ( $old == 'publish' && $new != 'publish' ) {
-			// Remove from streams
-			$streams = $this->plugin->get_streams();
-			foreach ( $streams as $stream ) {
-				$stream->remove_post( $post->ID );
-			}
-		}
-
-		if ( $old != 'publish' && $new == 'publish' ) {
-			//seems weird, but it's necessary for ACF
-			//and potentially other plugins
-			//we can't be sure what actions have been added
-			//so checking for infinite loop-type bugs isn't possible
-			do_action('save_post', $post->ID, $post, true );
-			remove_all_actions('save_post');
-			// Add to streams
-			$streams = $this->plugin->get_streams();
-			foreach ( $streams as $stream ) {
-				$stream->insert_post( $post->ID );
-			}
-		}
-	}
-
-
 	/**
 	 * Add help text to stream edit page
 	 *

includes/class-stream-manager-manager.php

@@ -0,0 +1,106 @@
+<?php
+/**
+ * Stream Manager.
+ *
+ * @package   StreamManagerManager
+ * @author    Upstatement
+ * @license   GPL-2.0+
+ * @link      http://upstatement.com
+ * @since     1.1
+ * @copyright 2015 Upstatement
+ */
+
+class StreamManagerManager {
+
+	/**
+	 * Instance of this class.
+	 *
+	 * @since    1.0.0
+	 *
+	 * @var      object
+	 */
+	protected static $instance = null;
+
+	/**
+	 * Instance of StreamManager.
+	 *
+	 * @since    1.0.0
+	 *
+	 * @var      object
+	 */
+	public $plugin = null;
+
+	/**
+	 * Initialize the plugin
+	 *
+	 * @since     1.1.0
+	 */
+	private function __construct() {
+		$this->plugin = StreamManager::get_instance();
+		$this->plugin_slug    = $this->plugin->get_plugin_slug();
+		$this->post_type_slug = $this->plugin->get_post_type_slug();
+
+		// Saving Posts (= updating streams)
+		add_action( 'transition_post_status', array( $this, 'on_save_post' ), 10, 3 );
+		add_action( 'publish_future_post', function($post_id) {
+			$post = get_post($post_id);
+			$this->on_save_post('publish', 'future', $post);
+		}, 10, 1);
+
+	}
+
+	/**
+	 * Return an instance of this class.
+	 *
+	 * @since     1.1.0
+	 *
+	 * @return    object    A single instance of this class.
+	 */
+	public static function get_instance() {
+
+		// If the single instance hasn't been set, set it now.
+		if ( null == self::$instance ) {
+			self::$instance = new self;
+		}
+
+		return self::$instance;
+	}
+
+
+	/**
+	 * Update streams whenever any post status is changed
+	 *
+	 * @since     1.1.0
+	 *
+	 * @param     string  $new   new post status
+	 * @param     string  $old   old post status
+	 * @param     object  $post  WordPress post object
+	 */
+	public function on_save_post( $new, $old, $post ) {
+		if ( $post->post_type == 'sm_stream' ) return;
+
+		if ( $old == 'publish' && $new != 'publish' ) {
+			// Remove from streams
+			$streams = $this->plugin->get_streams();
+			foreach ( $streams as $stream ) {
+				$stream->remove_post( $post->ID );
+			}
+		}
+
+		if ( $old != 'publish' && $new == 'publish' ) {
+			//seems weird, but it's necessary for ACF
+			//and potentially other plugins
+			//we can't be sure what actions have been added
+			//so checking for infinite loop-type bugs isn't possible
+			do_action('save_post', $post->ID, $post, true );
+			remove_all_actions('save_post');
+			// Add to streams
+			$streams = $this->plugin->get_streams();
+			foreach ( $streams as $stream ) {
+				$stream->insert_post( $post->ID );
+			}
+		}
+	}
+
+
+}

stream-manager.php

@@ -55,8 +55,11 @@
 
 require_once( plugin_dir_path( __FILE__ ) . 'includes/class-stream-manager.php' );
 require_once( plugin_dir_path( __FILE__ ) . 'includes/timber-stream.php' );
+require_once( plugin_dir_path( __FILE__ ) . 'includes/class-stream-manager-manager.php');
+
 
 add_action( 'plugins_loaded', array( 'StreamManager', 'get_instance' ) );
+add_action( 'plugins_loaded', array( 'StreamManagerManager', 'get_instance' ) );
 
 
 ////////////////////////////////////////////

tests/test-stream-manager-integration.php

@@ -17,4 +17,15 @@ function testBasicStream() {
 			$this->assertEquals($count, count($posts));
 		}
 
+		function testPostPublish() {
+			$stream = $this->buildStream();
+			$this->buildPosts(4);
+			$posts = $stream->get_posts();
+			$this->assertEquals(4, count($posts));
+			$post_id = $this->factory->post->create(array('post_status' => 'draft'));
+			wp_publish_post($post_id);
+			$posts = $stream->get_posts(array('post_type' => 'post'));
+			$this->assertEquals(5, count($posts));
+		}
+
 	}