Merge 78f4f1a into e8b344b

lib/Loader.php

@@ -68,15 +68,15 @@ public function render( $file, $data = null, $expires = false, $cache_mode = sel
 				do_action('timber_loader_render_file', $result);
 			}
 			$data = apply_filters('timber_loader_render_data', $data);
-			$data = apply_filters('timber/loader/render_data', $data);
+			$data = apply_filters( 'timber/loader/render_data', $data, $file );
 			$output = $twig->render($file, $data);
 		}
 
 		if ( false !== $output && false !== $expires && null !== $key ) {
 			$this->set_cache($key, $output, self::CACHEGROUP, $expires, $cache_mode);
 		}
 		$output = apply_filters('timber_output', $output);
-		return apply_filters('timber/output', $output);
+		return apply_filters( 'timber/output', $output, $data, $file );
 	}
 
 	/**

tests/assets/output.twig

@@ -0,0 +1 @@
+output.twig {{output}}

tests/test-timber-filters.php

@@ -65,4 +65,25 @@ function filter_timber_term_get_meta_field( $value, $tid, $field_name, $timber_t
 		return $value;
 	}
 
+	function testRenderDataFilter() {
+		add_filter('timber/loader/render_data', array($this, 'filter_timber_render_data'), 10, 2);
+		$output = Timber::compile('assets/output.twig', array('output' => 14) );
+		$this->assertEquals('output.twig assets/output.twig', $output);
+	}
+
+	function filter_timber_render_data($data, $file) {
+		$data['output'] = $file;
+		return $data;
+	}
+
+	function testOutputFilter() {
+		add_filter('timber/output', array($this, 'filter_timber_output'), 10, 3);
+		$output = Timber::compile('assets/single.twig', array('number' => 14) );
+		$this->assertEquals('assets/single.twig14', $output);
+	}
+
+	function filter_timber_output( $output, $data, $file ) {
+		return $file . $data['number'];
+	}
+
 }