Skip to content

Blocks: Propose a server side rendering implementation #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowriad merged 17 commits into from
May 10, 2017
Merged

Blocks: Propose a server side rendering implementation #586

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6f26133
Blocks: Propose a server side rendering implementation
youknowriad May 1, 2017
6e816dd
Blocks: Registering a block server side takes an array
youknowriad May 2, 2017
f7ac9f3
Blocks: Validate the registred block server side
youknowriad May 3, 2017
e706f6e
SSR: Simplify the block server side rendering algorithm
youknowriad May 3, 2017
96d6b3b
Setup server side unit tests (#617)
youknowriad May 5, 2017
47e81bd
Apply Travis CI improvements from #676:
nylen May 5, 2017
db2b558
SSR: add missing doing it wrong
youknowriad May 8, 2017
fc7fabe
Testing: Add more registration unit tests
youknowriad May 8, 2017
33f0961
Prefix global name with `wp_`
nylen May 9, 2017
eb176ba
Use `tearDown` functions rather than unregistering blocks in each test
nylen May 9, 2017
d2e0c30
Test that $wp_registered_blocks global is modified as expected
nylen May 9, 2017
44c4f5a
Add a missing test for `register_block`
nylen May 9, 2017
a2d6fee
Explicitly return false for errors and test this condition
nylen May 9, 2017
bea95aa
Add test with (ignored) content inside block delimiters
nylen May 9, 2017
b396229
Make it possible to run `phpunit` from within an existing WP dev install
nylen May 9, 2017
9e6b1ef
Fix a logic error
nylen May 9, 2017
138eb69
Fix style in PHP comments
nylen May 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Prefix global name with wp_
  • Loading branch information
@nylen
nylen committed May 9, 2017
commit 33f09612b215fefbce6ef14f5c583a8bc96d6f68
22 changes: 11 additions & 11 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function gutenberg_menu() {
add_action( 'admin_menu', 'gutenberg_menu' );


$registered_blocks = array();
$wp_registered_blocks = array();

/**
* Registers a block.
Expand All @@ -39,7 +39,7 @@ function gutenberg_menu() {
* @return array The block, if it has been successfully registered.
*/
function register_block( $slug, $settings ) {
global $registered_blocks;
global $wp_registered_blocks;

if ( ! is_string( $slug ) ) {
$message = __( 'Block slugs must be strings.' );
Expand All @@ -54,15 +54,15 @@ function register_block( $slug, $settings ) {
return;
}

if ( isset( $registered_blocks[ $slug ] ) ) {
if ( isset( $wp_registered_blocks[ $slug ] ) ) {
/* translators: 1: block slug */
$message = sprintf( __( 'Block "%s" is already registered.' ), $slug );
_doing_it_wrong( __FUNCTION__, $message, '0.1.0' );
return;
}

$settings['slug'] = $slug;
$registered_blocks[ $slug ] = $settings;
$wp_registered_blocks[ $slug ] = $settings;

return $settings;
}
Expand All @@ -75,15 +75,15 @@ function register_block( $slug, $settings ) {
* successfully unregistered; otherwise `null`.
*/
function unregister_block( $slug ) {
global $registered_blocks;
if ( ! isset( $registered_blocks[ $slug ] ) ) {
global $wp_registered_blocks;
if ( ! isset( $wp_registered_blocks[ $slug ] ) ) {
/* translators: 1: block slug */
$message = sprintf( __( 'Block "%s" is not registered.' ), $slug );
_doing_it_wrong( __FUNCTION__, $message, '0.1.0' );
return;
}
$unregistered_block = $registered_blocks[ $slug ];
unset( $registered_blocks[ $slug ] );
$unregistered_block = $wp_registered_blocks[ $slug ];
unset( $wp_registered_blocks[ $slug ] );

return $unregistered_block;
}
Expand Down Expand Up @@ -118,7 +118,7 @@ function parse_block_attributes( $attr_string ) {
* @return string Updated post content.
*/
function do_blocks( $content ) {
global $registered_blocks;
global $wp_registered_blocks;

// Extract the blocks from the post content.
$open_matcher = '/<!--\s*wp:([a-z](?:[a-z0-9\/]+)*)\s+((?:(?!-->).)*)-->.*?<!--\s*\/wp:\g1\s+-->/';
Expand All @@ -128,7 +128,7 @@ function do_blocks( $content ) {
foreach ( $matches[0] as $index => $block_match ) {
$block_name = $matches[1][ $index ][0];
// do nothing if the block is not registered.
if ( ! isset( $registered_blocks[ $block_name ] ) ) {
if ( ! isset( $wp_registered_blocks[ $block_name ] ) ) {
continue;
}

Expand All @@ -138,7 +138,7 @@ function do_blocks( $content ) {
$block_attributes = parse_block_attributes( $block_attributes_string );

// Call the block's render function to generate the dynamic output.
$output = call_user_func( $registered_blocks[ $block_name ]['render'], $block_attributes );
$output = call_user_func( $wp_registered_blocks[ $block_name ]['render'], $block_attributes );

// Replace the matched block with the dynamic output.
$new_content = str_replace( $block_markup, $output, $new_content );
Expand Down