Merge pull request #162 from Codeinwp/development

Fixed library rendering issue. 
Added git tag check for deployment. 
Added wraith for visual regression testing.

Author: selul

.distignore

@@ -15,4 +15,5 @@ phpunit.xml
 npm-debug.log
 dist
 artifact
-composer
+composer.json
+composer.lock

.travis.yml

@@ -6,6 +6,14 @@ php:
     - "5.4"
     - "5.3"
     - "5.2"
+matrix:
+  include:
+  - php: "5.6"
+    before_install: chmod +x bin/wraith.sh
+    install: true
+    before_script:
+    env: TEST_SUITE=Wraith_Visual_Regression_Testing WRAITH_FAIL=5
+    script:  ./bin/wraith.sh
 sudo: false
 branches:
   except:
@@ -49,16 +57,7 @@ deploy:
   on:
     repo: "$UPSTREAM_REPO"
     branch: "$MASTER_BRANCH"
-    condition: $TRAVIS_PHP_VERSION = "7.0"
-- provider: releases
-  api_key: "$GITHUB_TOKEN"
-  file: artifact/$THEMEISLE_REPO.zip
-  skip_cleanup: true
-  on:
-    tags: false
-    repo: "$UPSTREAM_REPO"
-    branch: "$MASTER_BRANCH"
-    condition: $TRAVIS_PHP_VERSION = "7.0"
+    condition: $TEST_SUITE = "Wraith_Visual_Regression_Testing"
 after_deploy:
 - chmod +x bin/deploy.sh
 - ". ./bin/deploy.sh"

bin/deploy.sh

@@ -11,6 +11,11 @@ if ! [ $AFTER_DEPLOY_RUN ] && [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then
 
         git config user.name "selul"
         git config user.email ${GITHUB_EMAIL}
+        git fetch
+
+     # Check if we already have a tag with this version.
+     if ! git rev-parse "v$THEMEISLE_VERSION" >/dev/null 2>&1
+        then
 
     # Send changelog changes to git.
         git checkout $MASTER_BRANCH
@@ -30,7 +35,7 @@ if ! [ $AFTER_DEPLOY_RUN ] && [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then
     # to set the body of the release.
         API_JSON='{"tag_name": "v'$THEMEISLE_VERSION'","target_commitish": "'$MASTER_BRANCH'","name": "v'$THEMEISLE_VERSION'","body": "'$CHANGES'","draft": false,"prerelease": false}';
         curl -s --data  "$API_JSON" "https://api.github.com/repos/$UPSTREAM_REPO/releases?access_token="$GITHUB_TOKEN  > /dev/null;
-
+     fi
      # Send update to the store
         STORE_JSON='{"version": "'$THEMEISLE_VERSION'","id": "'$THEMEISLE_ID'","body": "'$CHANGES'"}';
         curl -s  -H "Content-Type: application/json" -H "x-themeisle-auth: $THEMEISLE_AUTH"  --data "$STORE_JSON" "$STORE_URL/wp-json/ti-endpoint/v1/update_changelog_new/" > /dev/null

bin/wraith.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+
+    # Sending wraith request.
+
+    WRAITH_SLUG=$(node -pe "require('./package.json').wraithSlug")
+    WRAITH_FAIL=${WRAITH_FAIL:-5}
+    body="{
+      'request': {
+          'travis_event_type': '$TRAVIS_EVENT_TYPE',
+          'travis_pull_request': '$TRAVIS_PULL_REQUEST',
+          'travis_pull_request_branch': '$TRAVIS_PULL_REQUEST_BRANCH',
+          'travis_pull_request_slug': '$TRAVIS_PULL_REQUEST_SLUG',
+          'travis_repo_slug': '$TRAVIS_PULL_REQUEST_SLUG',
+          'travis_branch': '$TRAVIS_PULL_REQUEST_BRANCH',
+          'wraithSlug': $WRAITH_SLUG,
+          'wraithFail': $WRAITH_FAIL
+      }
+    }"
+
+    echo "Triggering build of $TRAVIS_REPO_SLUG branch $TRAVIS_BRANCH on Travis. Calling Wraith API ..."
+
+    output=$(curl -sw "%{http_code}" -X POST \
+        -H "Content-Type: application/json" \
+        -H "Accept: application/json" \
+        -H "Travis-API-Version: 3" \
+        -d "${body//\'/\"}" \
+        'http://wraith.themeisle.com?api&travis')
+
+    http_code="${output:${#output}-3}"
+    if [ ${#output} -eq 3 ]; then
+      body=""
+    else
+      body="${output:0:${#output}-3}"
+    fi
+
+    if [ $http_code != 200 ]; then
+      echo "$output";
+      exit 1
+    else
+     echo "$output";
+     exit 0
+    fi
+fi

classes/Visualizer/Plugin.php

@@ -28,7 +28,7 @@
 class Visualizer_Plugin {
 
 	const NAME = 'visualizer';
-	const VERSION = '2.0.3';
+	const VERSION = '2.0.4';
 
 	// custom post types
 	const CPT_VISUALIZER = 'visualizer';

classes/Visualizer/Render/Library.php

@@ -119,13 +119,6 @@ private function _renderLibrary() {
 				$this->_renderChartBox( $placeholder_id, $chart['id'] );
 			}
 			echo '</div>';
-			if ( is_array( $this->pagination ) ) {
-				echo '<ul class=" subsubsub">';
-				foreach ( $this->pagination as $page ) {
-					echo '<li class="all">', $page, '</li>';
-				}
-				echo '</ul>';
-			}
 		} else {
 			echo '<div id="visualizer-library" class="visualizer-clearfix">';
 			echo '<div class="visualizer-chart">';
@@ -146,6 +139,13 @@ private function _renderLibrary() {
 		}
 		$this->_renderSidebar();
 		echo '</div>';
+		if ( is_array( $this->pagination ) ) {
+			echo '<ul class=" subsubsub">';
+			foreach ( $this->pagination as $page ) {
+				echo '<li class="all">', $page, '</li>';
+			}
+			echo '</ul>';
+		}
 	}
 
 	/**

css/media.css

@@ -1,5 +1,5 @@
 /*
-	Version: 2.0.3
+	Version: 2.0.4
 */
 #visualizer-library-view {
 	padding: 30px 10px 10px 30px;

humans.txt

@@ -4,7 +4,7 @@
 	Plugin Name: Visualizer: Charts and Graphs Lite
 	Plugin URI: https://themeisle.com/plugins/visualizer-charts-and-graphs-lite/
 	Description: A simple, easy to use and quite powerful tool to create, manage and embed interactive charts into your WordPress posts and pages. The plugin uses Google Visualization API to render charts, which supports cross-browser compatibility (adopting VML for older IE versions) and cross-platform portability to iOS and new Android releases.
-	Version: 2.0.3
+	Version: 2.0.4
 	Author: Themeisle
 	Author URI: http://themeisle.com
 	License: GPL v2.0 or later

index.php

@@ -1,28 +1,31 @@
 {
-    "name": "visualizer",
-    "version": "2.0.3",
-    "description": "Visualizer Lite",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/Codeinwp/visualizer.git"
-    },
-    "keywords": [
-        "wordpress-plugin"
-    ],
-    "textdomain": "visualizer",
-    "category": "plugins",
-    "author": "ThemeIsle <[email protected]>",
-    "license": "GPL-2.0+",
-    "bugs": {
-        "url": "https://github.com/Codeinwp/visualizer/issues"
-    },
-    "pot": {
-        "reportmsgidbugsto": "https://github.com/Codeinwp/visualizer/issues",
-        "languageteam": "Themeisle Translate <[email protected]>",
-        "lasttranslator": "Themeisle Translate Team <[email protected]>"
-    },
-    "devDependencies": {
-        "grunt-plugin-fleet": "codeinwp/grunt-plugin-fleet",
-        "load-project-config": "~0.2.0"
-    }
+  "name": "visualizer",
+  "version": "2.0.4",
+  "description": "Visualizer Lite",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Codeinwp/visualizer.git"
+  },
+  "keywords": [
+    "wordpress-plugin"
+  ],
+  "textdomain": "visualizer",
+  "category": "plugins",
+  "author": "ThemeIsle <[email protected]>",
+  "license": "GPL-2.0+",
+  "bugs": {
+    "url": "https://github.com/Codeinwp/visualizer/issues"
+  },
+  "pot": {
+    "reportmsgidbugsto": "https://github.com/Codeinwp/visualizer/issues",
+    "languageteam": "Themeisle Translate <[email protected]>",
+    "lasttranslator": "Themeisle Translate Team <[email protected]>"
+  },
+  "devDependencies": {
+    "grunt-plugin-fleet": "codeinwp/grunt-plugin-fleet",
+    "load-project-config": "~0.2.0"
+  },
+  "wraithSlug": [
+    "visualizer"
+  ]
 }