4.4.5 (#183)

dsifford · web-flow · commit a4864685a56c · 2016-10-07T15:49:16.000-04:00
* Changes...

- Update citeproc
- Update docker-compose file
- Add a few styles

* Make issued date optional for webpage citation type

* Changes...

- Build version 4.4.5
- Add the following styles: National Institute of Technology Karnataka,
  Palaeovertebrata, Vigiliae Christianae

* Improve error messages
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!-- Please use this template for all bug reports. -->
 <!-- Before submitting an issue, please try disabling all other plugins to ensure the issue is isolated within ABT -->
 
-**ABT Version:** 4.4.4
+**ABT Version:** 4.4.5
 
 <!-- Which version of PHP are you using with your WordPress installation? -->
 **PHP Version:** 5.6
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
     wordpress:
-        image: dsifford/wordpress
+        image: dsifford/wordpress:apache-next
         links:
             - db
         ports:
@@ -14,10 +14,11 @@ services:
             DB_PASS: root
             WP_DEBUG: 'true'
             PLUGINS: >-
+                [local]academic-bloggers-toolkit,
                 co-authors-plus,
                 log-deprecated-notices,
                 piglatin,
-                query-monitor
+                query-monitor,
     db:
         image: mysql:5.7
         ports:
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "academic-bloggers-toolkit",
-  "version": "4.4.4",
+  "version": "4.4.5",
   "description": "A plugin extending the functionality of WordPress for Academic Blogging.",
   "main": "index.js",
   "scripts": {
diff --git a/scripts/fixtures.js b/scripts/fixtures.js
@@ -1487,7 +1487,7 @@ exports.ABT_i18n = {
         {
           "value": "issued",
           "label": "Date",
-          "required": true,
+          "required": false,
           "pattern": "[0-9]{4}(\\/[0-9]{2})?(\\/[0-9]{2})?(?!\\/)$",
           "placeholder": "YYYY/MM/DD or YYYY/MM or YYYY"
         },
diff --git a/src/academic-bloggers-toolkit.php b/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.4.4
+ *	Version: 4.4.5
  *	Author: Derek P Sifford
  *	Author URI: https://github.com/dsifford
  *	License: GPL3 or later
  *  Text Domain: academic-bloggers-toolkit
  */
 
-define('ABT_VERSION', '4.4.4');
+define('ABT_VERSION', '4.4.5');
 
 
 /**
diff --git a/src/academic-bloggers-toolkit.pot b/src/academic-bloggers-toolkit.pot
@@ -1,8 +1,8 @@
-# Copyright (C) 2016 Academic Blogger's Toolkit 4.4.4
-# This file is distributed under the same license as the Academic Blogger's Toolkit 4.4.4 package.
+# Copyright (C) 2016 Academic Blogger's Toolkit 4.4.5
+# This file is distributed under the same license as the Academic Blogger's Toolkit 4.4.5 package.
 msgid ""
 msgstr ""
-"Project-Id-Version: Academic Blogger's Toolkit 4.4.4\n"
+"Project-Id-Version: Academic Blogger's Toolkit 4.4.5\n"
 "Report-Msgid-Bugs-To: https://github.com/dsifford/academic-bloggers-toolkit/issues\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,6 +11,7 @@ msgstr ""
 "Last-Translator: Derek P Sifford <dereksifford@gmail.com>\n"
 "Language-Team: Derek P Sifford <dereksifford@gmail.com>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
 #: academic-bloggers-toolkit.php:83
 msgid "Plugin Settings"
 msgstr ""
diff --git a/src/lib/js/reference-list/components/ReferenceList.tsx b/src/lib/js/reference-list/components/ReferenceList.tsx
@@ -138,7 +138,11 @@ export class ReferenceList extends React.Component<{store: Store}, {}> {
         .catch(err => {
             Rollbar.error('ReferenceList.tsx -> initProcessor', err);
             console.error(err.message);
-            this.editor.windowManager.alert(err.message);
+            this.editor.windowManager.alert(
+                `An unexpected error occurred.\n\n` +
+                `Error: ${err.message}\n\n` +
+                `Please report this here:\nhttps://github.com/dsifford/academic-bloggers-toolkit/issues`
+            );
         });
     }
 
@@ -205,7 +209,11 @@ export class ReferenceList extends React.Component<{store: Store}, {}> {
         .catch(err => {
             Rollbar.error('ReferenceList.tsx -> insertStaticBibliography', err);
             console.error(err.message);
-            this.editor.windowManager.alert(err.message);
+            this.editor.windowManager.alert(
+                `An unexpected error occurred.\n\n` +
+                `Error: ${err.message}\n\n` +
+                `Please report this here:\nhttps://github.com/dsifford/academic-bloggers-toolkit/issues`
+            );
         });
     }
 
@@ -260,7 +268,11 @@ export class ReferenceList extends React.Component<{store: Store}, {}> {
         .catch(err => {
             Rollbar.error('ReferenceList.tsx -> insertInlineCitation', err);
             console.error(err.message);
-            this.editor.windowManager.alert(err.message);
+            this.editor.windowManager.alert(
+                `An unexpected error occurred.\n\n` +
+                `Error: ${err.message}\n\n` +
+                `Please report this here:\nhttps://github.com/dsifford/academic-bloggers-toolkit/issues`
+            );
         });
 
         this.clearSelection();
@@ -307,7 +319,11 @@ export class ReferenceList extends React.Component<{store: Store}, {}> {
             .catch(err => {
                 Rollbar.error('ReferenceList.tsx -> openReferenceWindow', err);
                 console.error(err.message);
-                this.editor.windowManager.alert(err.message);
+                this.editor.windowManager.alert(
+                    `An unexpected error occurred.\n\n` +
+                    `Error: ${err.message}\n\n` +
+                    `Please report this here:\nhttps://github.com/dsifford/academic-bloggers-toolkit/issues`
+                );
             });
         });
     }
@@ -319,7 +335,11 @@ export class ReferenceList extends React.Component<{store: Store}, {}> {
         }).catch(err => {
             Rollbar.error('ReferenceList.tsx -> openImportWindow', err);
             console.error(err.message);
-            this.editor.windowManager.alert(err.message);
+            this.editor.windowManager.alert(
+                `An unexpected error occurred.\n\n` +
+                `Error: ${err.message}\n\n` +
+                `Please report this here:\nhttps://github.com/dsifford/academic-bloggers-toolkit/issues`
+            );
         });
     }
 
diff --git a/src/lib/php/fieldmaps.php b/src/lib/php/fieldmaps.php
@@ -1301,7 +1301,7 @@
         [
             'value' => 'issued',
             'label' => __('Date', 'academic-bloggers-toolkit'),
-            'required' => true,
+            'required' => false,
             'pattern' => '[0-9]{4}(\/[0-9]{2})?(\/[0-9]{2})?(?!\/)$',
             'placeholder' => __('YYYY/MM/DD or YYYY/MM or YYYY', 'academic-bloggers-toolkit'),
         ],
diff --git a/src/readme.txt b/src/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://cash.me/$dsifford
 Tags: academia, academic, bibliographies, bibliography, citation, citations, cite, citing, CSL, curriculum vitae, cv, doi, endnote, footnote, footnotes, journal, mendeley, papers, pmid, publications, publish, pubmed, reference, reference list, reference manager, references, referencing, ris, scholar, scholarly, zotero
 Requires at least: 4.2.2
 Tested up to: 4.6
-Stable tag: 4.4.4
+Stable tag: 4.4.5
 License: GPL3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -48,6 +48,10 @@ Yikes! I'm sorry about that. Please report all issues on the Academic Blogger's
 
 == Changelog ==
 
+= 4.4.5 =
+
+[Click here](https://headwayapp.co/academic-bloggers-toolkit-changelog) to view changes.
+
 = 4.4.4 =
 
 [Click here](https://headwayapp.co/academic-bloggers-toolkit-changelog) to view changes.
diff --git a/src/vendor/citationstyles.php b/src/vendor/citationstyles.php
diff --git a/src/vendor/citeproc.js b/src/vendor/citeproc.js
@@ -23,7 +23,7 @@
  *     <http://www.gnu.org/licenses/> respectively.
  */
 var CSL = {
-    PROCESSOR_VERSION: "1.1.136",
+    PROCESSOR_VERSION: "1.1.137",
     CONDITION_LEVEL_TOP: 1,
     CONDITION_LEVEL_BOTTOM: 2,
     PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/,
@@ -126,7 +126,8 @@ var CSL = {
         "hearing": true,
         "gazette": true,
         "report": true,
-        "regulation": true
+        "regulation": true,
+        "standard": true
     },
     NestedBraces: [
         ["(", "["],
@@ -227,7 +228,7 @@ var CSL = {
         }
         return lst.join("-");
     },
-    parseNoteFieldHacks: function(Item, allowDateOverride) {
+    parseNoteFieldHacks: function(Item, validFieldsForType, allowDateOverride) {
         if ("string" !== typeof Item.note) return;
         var elems = [];
         var lines = Item.note.split('\n');
@@ -254,6 +255,7 @@ var CSL = {
             }
         }
         lines = lines.join('\n').split('\n');
+        var offset = 0;
         var names = {};
         for (var i=0,ilen=lines.length;i<ilen;i++) {
             var line = lines[i];
@@ -264,6 +266,7 @@ var CSL = {
                 if (i === 0) {
                     continue;
                 } else {
+                    offset = i;
                     break;
                 }
             }
@@ -275,7 +278,9 @@ var CSL = {
             } else if (CSL.DATE_VARIABLES.indexOf(key) > -1) {
                 if (allowDateOverride) {
                     Item[key] = {raw: val};
-                    lines[i] = "";
+                    if (!validFieldsForType || (validFieldsForType[key] && val.match(/^[0-9]{4}(?:-[0-9]{1,2}(?:-[0-9]{1,2})*)*$/))) {
+                        lines[i] = "";
+                    }
                 }
             } else if (!Item[key]) {
                 if (CSL.NAME_VARIABLES.indexOf(key) > -1) {
@@ -293,13 +298,25 @@ var CSL = {
                 } else {
                     Item[key] = val;
                 }
-                lines[i] = "";
+                if (!validFieldsForType || validFieldsForType[key]) {
+                    lines[i] = "";
+                }
             }
         }
         for (var key in names) {
             Item[key] = names[key];
         }
-        Item.note = lines.join("").trim();
+        if (validFieldsForType) {
+            if (lines[offset].trim()) {
+                lines[offset] = '\n' + lines[offset]
+            }
+            for (var i=offset-1;i>-1;i--) {
+                if (!lines[i].trim()) {
+                    lines = lines.slice(0, i).concat(lines.slice(i + 1));
+                }
+            }
+        }
+        Item.note = lines.join("\n").trim();
     },
     GENDERS: ["masculine", "feminine"],
     ERROR_NO_RENDERED_FORM: 1,
@@ -2840,7 +2857,7 @@ CSL.Engine.prototype.retrieveItem = function (id) {
         }
     }
     if (this.opt.development_extensions.field_hack && Item.note) {
-        CSL.parseNoteFieldHacks(Item, this.opt.development_extensions.allow_field_hack_date_override);
+        CSL.parseNoteFieldHacks(Item, false, this.opt.development_extensions.allow_field_hack_date_override);
     }
     for (var i = 1, ilen = CSL.DATE_VARIABLES.length; i < ilen; i += 1) {
         var dateobj = Item[CSL.DATE_VARIABLES[i]];
@@ -6978,9 +6995,6 @@ CSL.Node.group = {
                                     state.buildTokenLists(myNodes[i], state.juris[jurisdiction][myName]);
                                     state.configureTokenList(state.juris[jurisdiction][myName]);
                                 }
-                                if (macroCount < Object.keys(state.juris[jurisdiction].types).length) {
-                                    throw "CSL ERROR: Incomplete jurisdiction style module for: " + jurisdiction;
-                                }
                             }
                         }
                         for (var i=0,ilen=jurisdictionList.length;i<ilen;i++) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "academic-bloggers-toolkit",`
`3`		`- "version": "4.4.4",`
	`3`	`+ "version": "4.4.5",`
`4`	`4`	`"description": "A plugin extending the functionality of WordPress for Academic Blogging.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1487,7 +1487,7 @@ exports.ABT_i18n = {`
`1487`	`1487`	`{`
`1488`	`1488`	`"value": "issued",`
`1489`	`1489`	`"label": "Date",`
`1490`		`- "required": true,`
	`1490`	`+ "required": false,`
`1491`	`1491`	`"pattern": "[0-9]{4}(\\/[0-9]{2})?(\\/[0-9]{2})?(?!\\/)$",`
`1492`	`1492`	`"placeholder": "YYYY/MM/DD or YYYY/MM or YYYY"`
`1493`	`1493`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1301,7 +1301,7 @@`
`1301`	`1301`	`[`
`1302`	`1302`	`'value' => 'issued',`
`1303`	`1303`	`'label' => __('Date', 'academic-bloggers-toolkit'),`
`1304`		`- 'required' => true,`
	`1304`	`+ 'required' => false,`
`1305`	`1305`	`'pattern' => '[0-9]{4}(\/[0-9]{2})?(\/[0-9]{2})?(?!\/)$',`
`1306`	`1306`	`'placeholder' => __('YYYY/MM/DD or YYYY/MM or YYYY', 'academic-bloggers-toolkit'),`
`1307`	`1307`	`],`