4.6.0 (#204)

* Update tests

* Add automatic translation upload to deploy script

* Improve test coverage

* Improve test coverage

* Changes...

- Update mEDRA API call to their newly updated client-side API.
- Remove pointless `preventDefault` call on ReferenceList.
- Update deps.

* Fix tooltip issue on Firefox and Safari

* Changes...

- Convert all CSS to BEM methodology + maintain backwards compatibility
for old CSS classes.
- Add tests for Frontend.ts
- Fix issue causing tooltips to not render on Firefox or Safari.
- Change to "click" style tooltips, rather than hover style (better user
experience).
- Minor style changes to tooltips.
- Improve / refactor Frontend.ts code.

* Changes...

- Update dependencies.
- Add stylint to test workflow.
- Lint all styl files.

* Remove unnecessary variable from stylus vars

* Remove unneeded dependencies

* Remove unnecessary dependency

* Changes...

- Convert project to yarn package manager.
- Update travis.yml for yarn
- Move "lint" into npm test script
- Add yarn.lock to source control

* Remove ".abt-url" reference from options-page

* Add inline citation style example

* Add the following styles

- Aix-Marseille Université - Département d'études asiatiques (French)
- Uppsala universitet - Historia

* Build release 4.6.0

* Update readme with donor link

* Add donation link to options page

.gitignore

@@ -10,3 +10,4 @@ typings/*
 !typings/ABT.d.ts
 NOTES.md
 TODO.md
+.env

.stylintrc

@@ -19,7 +19,7 @@
     "maxWarnings": false,
     "maxWarningsKill": false,
     "mixed": false,
-    "namingConvention": false,
+    "namingConvention": "BEM",
     "namingConventionStrict": true,
     "parenSpace": false,
     "placeholders": false,

.travis.yml

@@ -1,21 +1,25 @@
-language: nodejs
+sudo: required
+language: node_js
 node_js:
-    - "6"
-before_script:
-    - nvm install node
-    - node --version
-    - npm --version
-    - nvm --version
-    - npm install
-script:
-    - npm test
-    - npm run lint
-after_success:
-    - bash <(curl -s https://codecov.io/bash)
+    - "node"
 branches:
     only:
         - master
         - /^greenkeeper-.*$/
 cache:
     directories:
+        - $HOME/.yarn-cache
         - node_modules
+before_install:
+    # Repo for newer Node.js versions
+    - curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
+    # Repo for Yarn
+    - sudo apt-key adv --keyserver pgp.mit.edu --recv D101F7899D41F3C3
+    - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+    - sudo apt-get update -qq
+    - sudo apt-get install -y -qq yarn
+install:
+    - node --version
+    - yarn install
+after_success:
+    - bash <(curl -s https://codecov.io/bash)

ISSUE_TEMPLATE.md

@@ -4,7 +4,7 @@ Please use this template for all bug reports.
 Before submitting an issue, please try disabling all other plugins to ensure issue is isolated within ABT
 -->
 
-**ABT Version:** 4.5.0
+**ABT Version:** 4.6.0
 
 <!-- Which version of PHP are you using with your WordPress installation? -->
 **PHP Version:** 5.6

README.md

@@ -1,4 +1,5 @@
 ![ABT Banner](http://i.imgur.com/UxBG7NB.png)
+[![Donate](https://img.shields.io/badge/%E2%9D%A4-donate-brightgreen.svg)](https://donorbox.org/academic-bloggers-toolkit)
 [![DOI](https://zenodo.org/badge/37433718.svg)](https://zenodo.org/badge/latestdoi/37433718)
 [![Changelog](https://img.shields.io/badge/changelog-academic--bloggers--toolkit-blue.svg)](https://headwayapp.co/academic-bloggers-toolkit-changelog)
 [![Build Status](https://travis-ci.org/dsifford/academic-bloggers-toolkit.svg?branch=master)](https://travis-ci.org/dsifford/academic-bloggers-toolkit)

package.json

@@ -1,12 +1,12 @@
 {
   "name": "academic-bloggers-toolkit",
-  "version": "4.5.0",
+  "version": "4.6.0",
   "description": "A plugin extending the functionality of WordPress for Academic Blogging.",
   "main": "index.js",
   "scripts": {
-    "test": "jest",
+    "test": "jest && npm run lint",
     "wp": "wpcmd() { docker exec $(docker ps -lq) /bin/bash -c \"sudo -u www-data wp $(echo $@)\"; };wpcmd ",
-    "lint": "./node_modules/.bin/tslint -e \"node_modules/**/*\" \"**/*.+(ts|tsx)\" -t stylish",
+    "lint": "tslint -e \"node_modules/**/*\" \"**/*.+(ts|tsx)\" -t stylish && stylint ./src/lib",
     "start": "NODE_ENV=development node --max_old_space_size=8192 node_modules/.bin/gulp _dev",
     "build": "NODE_ENV=production node_modules/.bin/gulp _build",
     "deploy": "./scripts/deploy $npm_package_version",
@@ -37,12 +37,11 @@
     "babel-preset-es2015": "^6.16.0",
     "babel-preset-react": "^6.16.0",
     "babel-register": "^6.16.3",
-    "browser-sync": "^2.17.3",
-    "coveralls": "^2.11.14",
+    "browser-sync": "^2.17.5",
     "css-loader": "^0.25.0",
     "del": "^2.2.2",
-    "enzyme": "^2.5.0",
-    "eslint": "^3.8.0",
+    "enzyme": "^2.5.1",
+    "eslint": "^3.8.1",
     "eslint-config-airbnb-base": "^9.0.0",
     "eslint-plugin-import": "^2.0.1",
     "gulp": "github:gulpjs/gulp#4.0",
@@ -52,17 +51,16 @@
     "gulp-stylus": "^2.5.0",
     "gulp-uglify": "^2.0.0",
     "gulp-wp-pot": "^1.3.2",
-    "jest": "^16.0.1",
-    "jest-cli": "^16.0.1",
+    "jest": "^16.0.2",
     "merge-stream": "^1.0.0",
     "mobx-react-devtools": "^4.2.9",
     "poststylus": "^0.2.3",
     "react-addons-test-utils": "^15.3.2",
-    "sinon": "^1.17.6",
     "style-loader": "^0.13.1",
+    "stylint": "^1.5.7",
     "tslint": "^3.15.1",
-    "tslint-microsoft-contrib": "^2.0.12",
-    "tslint-react": "^1.0.0",
+    "tslint-microsoft-contrib": "^2.0.13",
+    "tslint-react": "^1.1.0",
     "webpack": "^2.1.0-beta.21",
     "webpack-stream": "^3.2.0"
   },
@@ -73,14 +71,13 @@
     "@types/react": "^0.14.41",
     "@types/react-addons-css-transition-group": "^0.14.17",
     "@types/react-dom": "^0.14.18",
-    "@types/sinon": "^1.16.31",
     "mobx": "^2.6.0",
     "mobx-react": "^3.5.8",
     "react": "^15.3.2",
     "react-addons-css-transition-group": "^15.3.2",
     "react-addons-shallow-compare": "^15.3.2",
     "react-dom": "^15.3.2",
-    "react-virtualized-select": "^2.0.2",
+    "react-virtualized-select": "^2.1.0",
     "typescript": "^2.1.0-dev.20160724"
   },
   "babel": {

scripts/deploy

@@ -8,6 +8,47 @@ SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ROOTDIR=$(cd "$SCRIPTDIR" && cd ../ && pwd || exit)
 SVNROOT=$(cd "$ROOTDIR" && cd ../SVN && pwd || exit)
 
+# shellcheck source=../.env
+source "$ROOTDIR/.env"
+
+# Helpers
+TERM=${TERM:-xterm}
+RED='\033[0;31m'
+ORANGE='\033[0;33m'
+CYAN='\033[0;36m'
+BOLD='\E[1m'
+NC='\033[0m'
+h2() {
+    echo -e "${ORANGE}${BOLD}==>${NC}${BOLD} $*${NC}"
+}
+h3() {
+    printf "%b \n" "${CYAN}${BOLD}  ->${NC} $*"
+}
+
+ERROR() {
+  echo -e "${RED}=> ERROR: $1.${NC}"
+  exit 1
+}
+
+PO_EDITOR_TOKEN=${PO_EDITOR_TOKEN:-}
+[[ ! $PO_EDITOR_TOKEN ]] && ERROR "'PO_EDITOR_TOKEN' must be set in your .env file"
+
+# Push updated translations to POEditor
+h2 "Updating POEditor translation strings"
+req=$(curl -X POST \
+     -F api_token="$PO_EDITOR_TOKEN" \
+     -F action="upload" \
+     -F id="68585" \
+     -F updating="terms" \
+     -F file=@"$ROOTDIR/src/academic-bloggers-toolkit.pot" \
+     https://poeditor.com/api/)
+
+h2 Status: "$(echo "$req" | jq -r '.response.status')"
+h3 Terms Parsed: "$(echo "$req" | jq -r '.details.terms.parsed')"
+h3 Terms Added: "$(echo "$req" | jq -r '.details.terms.added')"
+h3 Terms Deleted: "$(echo "$req" | jq -r '.details.terms.deleted')"
+exit
+
 # Make sure svn repo is up to date
 cd "$SVNROOT" || exit
 svn up
@@ -24,7 +65,12 @@ cp -r "$ROOTDIR"/dist/* "$SVNROOT"/tags/"$VERSION"/
 
 # Create a zipped copy of dist in ROOTDIR/tmp/bin
 rm -f "$ROOTDIR"/tmp/bin/*
-zip -r "$ROOTDIR"/tmp/bin/academic-bloggers-toolkit-"$VERSION".zip "$ROOTDIR"/dist
+mkdir -p "$ROOTDIR"/tmp/bin/academic-bloggers-toolkit
+cp -r "$ROOTDIR"/dist/* "$ROOTDIR"/tmp/bin/academic-bloggers-toolkit
+cd "$ROOTDIR"/tmp/bin || exit
+zip -r "$ROOTDIR"/tmp/bin/academic-bloggers-toolkit-"$VERSION".zip academic-bloggers-toolkit
+rm -r academic-bloggers-toolkit
+cd "$SVNROOT" || exit
 
 # Remove deleted files
 svn stat | grep -Po '^!.+' | awk '{print $2}' | xargs svn rm

scripts/fixtures.js

@@ -1581,6 +1581,14 @@ exports.ABT_i18n = {
             label: 'Patent',
             value: 'patent',
         },
+        {
+            label: 'Test not in use',
+            value: 'testing',
+        },
+        {
+            label: 'Test not in use',
+            value: 'testing2',
+        },
         {
             label: 'Report',
             value: 'report',
@@ -1601,9 +1609,5 @@ exports.ABT_i18n = {
             label: 'Web Page',
             value: 'webpage',
         },
-        {
-            label: 'Test not in use',
-            value: 'testing',
-        },
     ],
 };

src/academic-bloggers-toolkit.php

@@ -4,14 +4,14 @@
  *	Plugin Name: Academic Blogger's Toolkit
  *	Plugin URI: https://wordpress.org/plugins/academic-bloggers-toolkit/
  *	Description: A plugin extending the functionality of Wordpress for academic blogging
- *	Version: 4.5.0
+ *	Version: 4.6.0
  *	Author: Derek P Sifford
  *	Author URI: https://github.com/dsifford
  *	License: GPL3 or later
  *  Text Domain: academic-bloggers-toolkit
  */
 
-define('ABT_VERSION', '4.5.0');
+define('ABT_VERSION', '4.6.0');
 
 /**
  * Load plugin translations
@@ -103,7 +103,7 @@ function abt_add_donate_link( $plugin_meta, $plugin_file ) {
 	if (plugin_basename( __FILE__ ) == $plugin_file) {
 		$plugin_meta[] = sprintf(
 			'&hearts; <a href="%s">%s</a>',
-			'https://cash.me/$dsifford',
+			'https://donorbox.org/academic-bloggers-toolkit',
 			__( 'Donate', 'academic-bloggers-toolkit' )
 		);
 	}