From: Mike Taylor <mike@indexdata.com>
Date: Tue, 9 Sep 2014 12:44:03 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~324^2~26^2~8
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=4898fb8bfe605439a94a7663c98c663d49c24c79;hp=a1111c8ce338118b92c52daf22f8a18d091ceb06;p=mkws-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
---

diff --git a/doc/Makefile b/doc/Makefile
index 2a6b99b..d87c1f8 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -45,9 +45,16 @@ all: $(DOCS)
 
 clean:
 	rm -f $(DOCS)
+	rm -f *.drupal.html
 
 distclean: clean uninstall
 
+push:
+	pandoc --toc README.markdown > README.drupal.html
+	pandoc --toc mkws-manual.markdown > mkws-manual.drupal.html
+	cat README.drupal.html | ./drupaljson.pl | curl --upload-file - http://www.indexdata.com/script/node/332?services_token=cda1e26e5733ce3f604773e94f0721df5c31a948 -v --header "Content-Type:application/json"
+	cat mkws-manual.drupal.html | ./drupaljson.pl | curl --upload-file - http://www.indexdata.com/script/node/323?services_token=cda1e26e5733ce3f604773e94f0721df5c31a948 -v --header "Content-Type:application/json"
+
 help:
-	@echo "make [ all | install | clean | distclean ]"
+	@echo "make [ all | install | clean | distclean | push ]"
 
diff --git a/doc/drupaljson.pl b/doc/drupaljson.pl
new file mode 100755
index 0000000..0135867
--- /dev/null
+++ b/doc/drupaljson.pl
@@ -0,0 +1,9 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+use JSON;
+
+local $/; # enable localized slurp mode
+my %rec_hash = ('body' => {'und' => [{'value' => <STDIN>}]});
+my $json = encode_json \%rec_hash;
+print $json;
diff --git a/test/package.json b/test/package.json
index 1416efa..5450176 100644
--- a/test/package.json
+++ b/test/package.json
@@ -12,7 +12,7 @@
     "devDependencies": {
         "jQuery": "*",
         "xmlhttprequest": "*",
-        "jsdom": "*",
+        "jsdom": "<= 0.11.1",
         "request": "*",
         "jasmine-reporters": "<= 0.4.1",
         "jasmine-node": "*",