Merge pull request #107 from Codeinwp/development

Release 1.7.0

Author: selul

.distignore

@@ -0,0 +1,12 @@
+.git
+.distignore
+.gitignore
+.travis.yml
+.jshintrc
+Gruntfile.js
+grunt
+phpcs.xml
+node_modules
+logs
+package.json
+npm-debug.log

.gitignore

@@ -0,0 +1,4 @@
+.idea
+node_modules
+logs
+

.jshintrc

@@ -0,0 +1,23 @@
+{
+  "boss": true,
+  "curly": true,
+  "eqeqeq": true,
+  "eqnull": true,
+  "expr": true,
+  "immed": true,
+  "noarg": true,
+  "nonbsp": true,
+  "onevar": true,
+  "trailing": true,
+  "undef": true,
+  "sub":true,
+  "unused": false,
+  "browser": true,
+  "globals": {
+    "_": false,
+    "Backbone": false,
+    "jQuery": false,
+    "JSON": false,
+    "wp": false
+  }
+}

.travis.yml

@@ -0,0 +1,45 @@
+language: php
+
+##  PHP versions to test  against
+php:
+    - "7.0"
+    - "5.6"
+    - "5.5"
+    - "5.4"
+    - "5.3"
+    - "5.2"
+sudo: false
+env:
+    - WP_VERSION=master WP_MULTISITE=0
+install:
+  - . $HOME/.nvm/nvm.sh
+  - nvm install stable
+  - nvm use stable
+  - npm install
+  - npm install grunt-cli -g
+before_script:
+    ## Install the wordpress latest version
+    - export WP_DEVELOP_DIR=/tmp/wordpress/
+    - mkdir -p $WP_DEVELOP_DIR
+    - git clone --depth=1 --branch="$WP_VERSION" git://develop.git.wordpress.org/ $WP_DEVELOP_DIR
+    - plugin_slug=$(basename $(pwd))
+    - plugin_dir=$WP_DEVELOP_DIR/src/wp-content/plugins/$plugin_slug
+    - cd ..
+    - mv $plugin_slug $plugin_dir
+    - cd $WP_DEVELOP_DIR
+    - cp wp-tests-config-sample.php wp-tests-config.php
+    - sed -i "s/youremptytestdbnamehere/wordpress_test/" wp-tests-config.php
+    - sed -i "s/yourusernamehere/root/" wp-tests-config.php
+    - sed -i "s/yourpasswordhere//" wp-tests-config.php
+    - mysql -e 'CREATE DATABASE wordpress_test;' -uroot
+
+     ## install PHPCS and Wordpress standards
+    - pear install pear/PHP_CodeSniffer
+    - mkdir wordpress-coding-standards && curl -L https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/archive/master.tar.gz | tar xz --strip-components=1 -C wordpress-coding-standards
+    - phpenv rehash
+    - phpcs --config-set installed_paths $WP_DEVELOP_DIR/wordpress-coding-standards
+    - phpenv rehash
+    - cd $plugin_dir
+
+script:
+     grunt travis

Gruntfile.js

@@ -0,0 +1,10 @@
+/* jshint node:true */
+/* global require */
+
+module.exports = function (grunt) {
+	'use strict';
+
+	var loader = require( 'load-project-config' ),
+		config = require( 'grunt-plugin-fleet' );
+	loader( grunt, config ).init();
+};

classes/Visualizer/Module.php

@@ -19,7 +19,6 @@
 // +----------------------------------------------------------------------+
 // | Author: Eugene Manuilov <[email protected]>                        |
 // +----------------------------------------------------------------------+
-
 /**
  * Base class for all modules. Implements routine methods required by all modules.
  *
@@ -75,11 +74,12 @@ public function __construct( Visualizer_Plugin $plugin ) {
 	 * @access protected
 	 * @param string $tag The name of the action to which the $method is hooked.
 	 * @param string $method The name of the method to be called.
-	 * @param int $priority optional. Used to specify the order in which the functions associated with a particular action are executed (default: 10). Lower numbers correspond with earlier execution, and functions with the same priority are executed in the order in which they were added to the action.
-	 * @param int $accepted_args optional. The number of arguments the function accept (default 1).
+	 * @param bool   $methodClass The root of the method.
+	 * @param int    $priority optional. Used to specify the order in which the functions associated with a particular action are executed (default: 10). Lower numbers correspond with earlier execution, and functions with the same priority are executed in the order in which they were added to the action.
+	 * @param int    $accepted_args optional. The number of arguments the function accept (default 1).
 	 * @return Visualizer_Module
 	 */
-	protected function _addAction( $tag, $method, $methodClass=NULL, $priority = 10, $accepted_args = 1 ) {
+	protected function _addAction( $tag, $method, $methodClass = null, $priority = 10, $accepted_args = 1 ) {
 		add_action( $tag, array( $methodClass ? $methodClass : $this, $method ), $priority, $accepted_args );
 		return $this;
 	}
@@ -90,13 +90,14 @@ protected function _addAction( $tag, $method, $methodClass=NULL, $priority = 10,
 	 * @since 1.0.0
 	 *
 	 * @access public
-	 * @param string $tag The name of the AJAX action to which the $method is hooked.
-	 * @param string $method Optional. The name of the method to be called. If the name of the method is not provided, tag name will be used as method name.
+	 * @param string  $tag The name of the AJAX action to which the $method is hooked.
+	 * @param string  $method Optional. The name of the method to be called. If the name of the method is not provided, tag name will be used as method name.
+	 * @param bool    $methodClass The root of the method.
 	 * @param boolean $private Optional. Determines if we should register hook for logged in users.
 	 * @param boolean $public Optional. Determines if we should register hook for not logged in users.
 	 * @return Visualizer_Module
 	 */
-	protected function _addAjaxAction( $tag, $method = '', $methodClass=NULL, $private = true, $public = false ) {
+	protected function _addAjaxAction( $tag, $method = '', $methodClass = null, $private = true, $public = false ) {
 		if ( $private ) {
 			$this->_addAction( 'wp_ajax_' . $tag, $method, $methodClass );
 		}
@@ -116,9 +117,9 @@ protected function _addAjaxAction( $tag, $method = '', $methodClass=NULL, $priva
 	 *
 	 * @access protected
 	 * @param string $tag The name of the filter to hook the $method to.
-	 * @param type $method The name of the method to be called when the filter is applied.
-	 * @param int $priority optional. Used to specify the order in which the functions associated with a particular action are executed (default: 10). Lower numbers correspond with earlier execution, and functions with the same priority are executed in the order in which they were added to the action.
-	 * @param int $accepted_args optional. The number of arguments the function accept (default 1).
+	 * @param type   $method The name of the method to be called when the filter is applied.
+	 * @param int    $priority optional. Used to specify the order in which the functions associated with a particular action are executed (default: 10). Lower numbers correspond with earlier execution, and functions with the same priority are executed in the order in which they were added to the action.
+	 * @param int    $accepted_args optional. The number of arguments the function accept (default 1).
 	 * @return Visualizer_Module
 	 */
 	protected function _addFilter( $tag, $method, $priority = 10, $accepted_args = 1 ) {
@@ -142,4 +143,4 @@ protected function _addShortcode( $tag, $method ) {
 		return $this;
 	}
 
-}
+}

classes/Visualizer/Module/Admin.php

@@ -19,7 +19,6 @@
 // +----------------------------------------------------------------------+
 // | Author: Eugene Manuilov <[email protected]>                        |
 // +----------------------------------------------------------------------+
-
 /**
  * The module for all admin stuff.
  *
@@ -75,21 +74,21 @@ public function __construct( Visualizer_Plugin $plugin ) {
 	 */
 	public static function _getChartTypesLocalized() {
 		$types  = array(
-			'all'         => esc_html__( 'All', Visualizer_Plugin::NAME ),
-			'pie'         => esc_html__( 'Pie', Visualizer_Plugin::NAME ),
-			'line'        => esc_html__( 'Line', Visualizer_Plugin::NAME ),
-			'area'        => esc_html__( 'Area', Visualizer_Plugin::NAME ),
-			'geo'         => esc_html__( 'Geo', Visualizer_Plugin::NAME ),
-			'bar'         => esc_html__( 'Bar', Visualizer_Plugin::NAME ),
-			'column'      => esc_html__( 'Column', Visualizer_Plugin::NAME ),
-			'gauge'       => esc_html__( 'Gauge', Visualizer_Plugin::NAME ),
-			'scatter'     => esc_html__( 'Scatter', Visualizer_Plugin::NAME ),
-			'candlestick' => esc_html__( 'Candlestick', Visualizer_Plugin::NAME ),
+			'all'         => esc_html__( 'All', 'visualizer' ),
+			'pie'         => esc_html__( 'Pie', 'visualizer' ),
+			'line'        => esc_html__( 'Line', 'visualizer' ),
+			'area'        => esc_html__( 'Area', 'visualizer' ),
+			'geo'         => esc_html__( 'Geo', 'visualizer' ),
+			'bar'         => esc_html__( 'Bar', 'visualizer' ),
+			'column'      => esc_html__( 'Column', 'visualizer' ),
+			'gauge'       => esc_html__( 'Gauge', 'visualizer' ),
+			'scatter'     => esc_html__( 'Scatter', 'visualizer' ),
+			'candlestick' => esc_html__( 'Candlestick', 'visualizer' ),
 		);
 
-        $types  = apply_filters("visualizer_pro_chart_types", $types);
+		$types  = apply_filters( 'visualizer_pro_chart_types', $types );
 
-        return $types;
+		return $types;
 	}
 
 	/**
@@ -134,11 +133,11 @@ public function setupMediaViewStrings( $strings ) {
 				'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART,
 			),
 			'controller' => array(
-				'title' => esc_html__( 'Visualizations', Visualizer_Plugin::NAME ),
+				'title' => esc_html__( 'Visualizations', 'visualizer' ),
 			),
 			'routers' => array(
-				'library' => esc_html__( 'From Library', Visualizer_Plugin::NAME ),
-				'create'  => esc_html__( 'Create New', Visualizer_Plugin::NAME ),
+				'library' => esc_html__( 'From Library', 'visualizer' ),
+				'create'  => esc_html__( 'Create New', 'visualizer' ),
 			),
 			'library' => array(
 				'filters' => self::_getChartTypesLocalized(),
@@ -189,7 +188,7 @@ public function enqueueLibraryScripts( $suffix ) {
 			wp_enqueue_media();
 			wp_enqueue_script( 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array( 'jquery', 'media-views' ), Visualizer_Plugin::VERSION, true );
 			wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
-			wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array('google-jsapi-new'), null, true );
+			wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
 			wp_enqueue_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'google-jsapi-old', 'visualizer-library' ), Visualizer_Plugin::VERSION, true );
 		}
 	}
@@ -216,7 +215,7 @@ public function setupVisualizerTab( $tabs ) {
 	 * @access public
 	 */
 	public function registerAdminMenu() {
-		$title = esc_html__( 'Visualizer Library', Visualizer_Plugin::NAME );
+		$title = esc_html__( 'Visualizer Library', 'visualizer' );
 		$callback = array( $this, 'renderLibraryPage' );
 		$this->_libraryPage = add_submenu_page( 'upload.php', $title, $title, 'edit_posts', Visualizer_Plugin::NAME, $callback );
 	}
@@ -234,7 +233,7 @@ public function renderLibraryPage() {
 			'options' => array(
 				'min_range' => 1,
 				'default'   => 1,
-			)
+			),
 		) );
 
 		// the initial query arguments to fetch charts
@@ -258,24 +257,23 @@ public function renderLibraryPage() {
 			$filter = 'all';
 		}
 
-        // Added by Ash/Upwork
-        $filterByMeta   = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
-        if($filterByMeta){
-            $query      = array(
+		// Added by Ash/Upwork
+		$filterByMeta   = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
+		if ( $filterByMeta ) {
+			$query      = array(
 					'key'     => Visualizer_Plugin::CF_SETTINGS,
 					'value'   => $filterByMeta,
 					'compare' => 'LIKE',
-            );
-            $meta       = isset($query_args['meta_query']) ? $query_args['meta_query'] : array();
-            $meta[]     = $query;
-            $query_args['meta_query']   = $meta;
-        }
-        // Added by Ash/Upwork
-
+			);
+			$meta       = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
+			$meta[]     = $query;
+			$query_args['meta_query']   = $meta;
+		}
+		// Added by Ash/Upwork
 		// fetch charts
 		$charts = array();
 		$query = new WP_Query( $query_args );
-		while( $query->have_posts() ) {
+		while ( $query->have_posts() ) {
 			$chart = $query->next_post();
 
 			// fetch and update settings
@@ -287,7 +285,7 @@ public function renderLibraryPage() {
 			$data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
 
 			// add chart to the array
-			$charts['visualizer-' . $chart->ID] = array(
+			$charts[ 'visualizer-' . $chart->ID ] = array(
 				'id'       => $chart->ID,
 				'type'     => $type,
 				'series'   => $series,
@@ -303,7 +301,7 @@ public function renderLibraryPage() {
 			'urls'   => array(
 				'base'   => add_query_arg( 'vpage', false ),
 				'create' => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_CREATE_CHART, 'library' => 'yes' ), $ajaxurl ),
-				'edit'   => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_EDIT_CHART,   'library' => 'yes' ), $ajaxurl ),
+				'edit'   => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, 'library' => 'yes' ), $ajaxurl ),
 			),
 		) );
 
@@ -330,7 +328,7 @@ public function renderLibraryPage() {
 	 * @since 1.0.0
 	 *
 	 * @access public
-	 * @param array $links The array of original action links.
+	 * @param array  $links The array of original action links.
 	 * @param string $file The plugin basename.
 	 * @return array Updated array of action links.
 	 */
@@ -341,7 +339,7 @@ public function getPluginActionLinks( $links, $file ) {
 				sprintf(
 					'<a href="%s">%s</a>',
 					admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ),
-					esc_html__( 'Library', Visualizer_Plugin::NAME )
+					esc_html__( 'Library', 'visualizer' )
 				)
 			);
 		}
@@ -355,7 +353,7 @@ public function getPluginActionLinks( $links, $file ) {
 	 * @since 1.0.0
 	 *
 	 * @access public
-	 * @param array $plugin_meta The array of a plugin meta links.
+	 * @param array  $plugin_meta The array of a plugin meta links.
 	 * @param string $plugin_file The plugin's basename.
 	 * @return array Updated array of plugin meta links.
 	 */
@@ -364,16 +362,16 @@ public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
 			// knowledge base link
 			$plugin_meta[] = sprintf(
 				'<a href="https://github.com/codeinwp/visualizer/wiki" target="_blank">%s</a>',
-				esc_html__( 'Knowledge Base', Visualizer_Plugin::NAME )
+				esc_html__( 'Knowledge Base', 'visualizer' )
 			);
 			// flattr link
 			$plugin_meta[] = sprintf(
 				'<a style="color:red" href="https://themeisle.com/plugins/visualizer-charts-and-graphs-pro-addon/" target="_blank">%s</a>',
-				esc_html__( 'Pro Addon', Visualizer_Plugin::NAME )
+				esc_html__( 'Pro Addon', 'visualizer' )
 			);
 		}
 
 		return $plugin_meta;
 	}
 
-}
+}