Merge pull request #81 from INN/63-filter-data

63 filter data; rearrange plugin includes

Author: benlk

dfw-init.php

@@ -31,7 +31,7 @@ function dfw_option_page_html() {
 	}
 
 	echo '<div class="wrap">';
-	echo '<h2>Super Cool Ad ManagerOptions</h2>';
+	echo '<h2>Super Cool Ad Manager Options</h2>';
 	echo '<form method="post" action="options.php">';
 
 	settings_fields( 'doubleclick-for-wordpress' );

dfw-options.php

@@ -12,5 +12,18 @@
 
 define( 'DFP_VERSION', '0.2.0' );
 
-include( 'dfw-init.php' );
-include( 'inc/block.php' );
+$includes = array(
+	'/inc/class-doubleclick.php',
+	'/inc/class-doubleclickadslot.php',
+	'/inc/class-doubleclickbreakpoint.php',
+	'/dfw-init.php',
+	'/inc/block.php',
+	'/inc/class-doubleclick-widget.php',
+	'/dfw-options.php',
+);
+
+foreach ( $includes as $include ) {
+	if ( 0 === validate_file( dirname( __FILE__ ) . $include ) ) {
+		require_once( dirname( __FILE__ ) . $include );
+	}
+}

dfw.php

@@ -1,18 +1,18 @@
 # Developer API
 
-A `global $DoubleClick` variable is defined on plugin init, making it possible to define breakpoints
+A `global $doubleclick` variable is defined on plugin init, making it possible to define breakpoints
 and place ads directly within your theme.
 
 __Quick Function Links:__
 
- * [$DoubleClick->register_breakpoint($identifer,$args)](#doubleclick-register_breakpointidentiferargs)
- * [$DoubleClick->place_ad($identifer,$size,$breakpoints)](#doubleclick-place_adidentifersizebreakpoints)
+ * [$doubleclick->register_breakpoint($identifier,$args)](#doubleclick-register_breakpointidentifierargs)
+ * [$doubleclick->place_ad($identifier,$size,$breakpoints)](#doubleclick-place_adidentifiersizebreakpoints)
 
 * * *
 
 ## 1. Define Breakpoints
 
-##### $DoubleClick->register_breakpoint($identifer,$args)
+##### $doubleclick->register_breakpoint($identifier,$args)
 
 You can make it easier for users to target breakpoints by defining them in `functions.php`
 
@@ -21,24 +21,24 @@ You can make it easier for users to target breakpoints by defining them in `func
 ```php
 function ad_setup() {
 
-	global $DoubleClick;
+	global $doubleclick;
 
 	// Optionally define the network code directly in functions.php.
-	// $DoubleClick->networkCode = "xxxxxxx";
+	// $doubleclick->network_code = "xxxxxxx";
 
 	/* Define Breakpoints */
-	$DoubleClick->register_breakpoint('phone', array('minWidth'=> 0,'maxWidth'=>720));
-	$DoubleClick->register_breakpoint('tablet', array('minWidth'=>760,'maxWidth'=>1040));
-	$DoubleClick->register_breakpoint('desktop', array('minWidth'=>1040,'maxWidth'=>1220));
-	$DoubleClick->register_breakpoint('xl', array('minWidth'=>1220,'maxWidth'=>9999));
+	$doubleclick->register_breakpoint('phone', array('min_width'=> 0,'max_width'=>720));
+	$doubleclick->register_breakpoint('tablet', array('min_width'=>760,'max_width'=>1040));
+	$doubleclick->register_breakpoint('desktop', array('min_width'=>1040,'max_width'=>1220));
+	$doubleclick->register_breakpoint('xl', array('min_width'=>1220,'max_width'=>9999));
 
 }
 add_action('dfw_setup','ad_setup');
 ```
 
 ##### Paramaters:
 
-__$identifer__
+__$identifier__
 
 `String` A unique identifier for this breakpoint
 
@@ -50,18 +50,18 @@ __$args__
 
 ## 2. Place Ads
 
-### $DoubleClick->place_ad($identifer,$sizes,$args)
+### $doubleclick->place_ad($identifier,$sizes,$args)
 
 Prints DOM to display an ad at the given breakpoint.
 
 ##### Example:
 
 ```php
 
-global $DoubleClick;
+global $doubleclick;
 
 // simple call:
-$DoubleClick->place_ad('my-identifer','300x250');
+$doubleclick->place_ad('my-identifier','300x250');
 
 // more options:
 $sizes = array(
@@ -73,13 +73,13 @@ $args = array(
 		'lazyLoad' => false 	// if set to true, the ad will load only once its within view on screen.
 	);
 
-$DoubleClick->place_ad('my-identifier',$sizes,$args);
+$doubleclick->place_ad('my-identifier',$sizes,$args);
 ```
 
 
 ##### Paramaters:
 
-__$identifer__
+__$identifier__
 
 `String` The Google Ad Manager identifier for an ad unit (GAM does not require you to create an identifier. If this does not match a value defined in GAM, a network-wide ad will still be requested).
 

docs/Developer-API.md

@@ -16,13 +16,15 @@ function dfw_block_init() {
 		return false;
 	}
 
+	$plugin_file = dirname( __DIR__ ) . '/dfw.php';
+
 	// double dirname to get the plugin dir because this file is in `/inc/`.
 	$dir = dirname( dirname( __FILE__ ) );
 
 	$block_js = 'js/block.js';
 	wp_register_script(
 		'dfw-block-editor',
-		plugins_url( $block_js, dirname( __FILE__ ) ),
+		plugins_url( $block_js, $plugin_file ),
 		array(
 			'wp-blocks',
 			'wp-i18n',
@@ -53,7 +55,7 @@ function dfw_block_init() {
 	$editor_css = 'css/editor.css';
 	wp_register_style(
 		'dfw-block-editor',
-		plugins_url( $editor_css, dirname( __FILE__ ) ),
+		plugins_url( $editor_css, $plugin_file ),
 		array(
 		),
 		filemtime( "$dir/$block_js" )