Merge pull request #45 from luzfcb/update-wkhtmltopdf

Update wkhtmltopdf binary and update README.rst

6 files changed, 30 insertions, 9 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf6a6c3..24f7223 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
 Changelog for django-wkhtmltopdf
 ================================
 
+
+1.2.3
+-----
+
+* update wkhtmltopdf binary to 0.12.0 version on before_script.sh
+* update docs to reference a wkhtmltopdf on github ( https://github.com/wkhtmltopdf/wkhtmltopdf )
+* add link to official site http://wkhtmltopdf.org/
+* move tests from Makefile to run_tests.sh
+
+
 1.2.2
 -----
 
diff --git a/Makefile b/Makefile
index f7ad668..059771c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,4 +4,4 @@ release:
 	python setup.py register sdist upload
 
 test:
-	PYTHONPATH=.:$$PYTHONPATH; django-admin.py test tests --settings=wkhtmltopdf.test_settings
+	./run_tests.sh
diff --git a/README.rst b/README.rst
index 65193d5..553a5da 100644
--- a/README.rst
+++ b/README.rst
@@ -8,7 +8,8 @@ django-wkhtmltopdf
 Converts html to PDF
 --------------------
 
-Provides a thin wrapper to the wkhtmltopdf binary from http://code.google.com/p/wkhtmltopdf/
+Provides a thin wrapper to the wkhtmltopdf binary from https://github.com/wkhtmltopdf/wkhtmltopdf
+Get the wkhtmltopdf binaries from http://wkhtmltopdf.org/
 
 
 Requirements
@@ -17,7 +18,7 @@ Requirements
 Install the `wkhtmltopdf`_ binary.
 This requires libfontconfig (on Ubuntu: ``sudo aptitude install libfontconfig``).
 
-.. _wkhtmltopdf: http://code.google.com/p/wkhtmltopdf/downloads/list
+.. _wkhtmltopdf: http://wkhtmltopdf.org/
 
 Python 2.6
 
diff --git a/before_script.sh b/before_script.sh
index bde2c4e..5c2cce8 100755
--- a/before_script.sh
+++ b/before_script.sh
@@ -1,8 +1,12 @@
 #!/usr/bin/env bash
+WKHTMLTOX_FOLDER="`pwd`/wkhtmltox_folder"
 
+echo '## Installing dependencies'
 sudo apt-get install -y openssl build-essential xorg libssl-dev
-wget http://wkhtmltopdf.googlecode.com/files/wkhtmltopdf-0.11.0_rc1-static-amd64.tar.bz2
-tar xvjf wkhtmltopdf-0.11.0_rc1-static-amd64.tar.bz2
-sudo chown root:root wkhtmltopdf-amd64
-sudo mv wkhtmltopdf-amd64 /usr/bin/wkhtmltopdf
-export WKHTMLTOPDF_CMD=/usr/bin/wkhtmltopdf
+echo '## Downloading wkhtmltopdf 0.12.0'
+wget http://downloads.sourceforge.net/project/wkhtmltopdf/0.12.0/wkhtmltox-linux-amd64_0.12.0-03c001d.tar.xz
+mkdir -p $WKHTMLTOX_FOLDER
+echo "## Extracting wkhtmltox into $WKHTMLTOX_FOLDER"
+tar xvJf wkhtmltox-linux-amd64_0.12.0-03c001d.tar.xz -C $WKHTMLTOX_FOLDER
+export WKHTMLTOPDF_CMD=$WKHTMLTOX_FOLDER/wkhtmltox/bin/wkhtmltopdf
+
diff --git a/run_tests.sh b/run_tests.sh
new file mode 100755
index 0000000..1cb1dd5
--- /dev/null
+++ b/run_tests.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+export WKHTMLTOPDF_CMD=`pwd`/wkhtmltox_folder/wkhtmltox/bin/wkhtmltopdf;
+export PYTHONPATH=.:$$PYTHONPATH;
+
+django-admin.py test tests --settings=wkhtmltopdf.test_settings
diff --git a/wkhtmltopdf/__init__.py b/wkhtmltopdf/__init__.py
index 2e2ef0b..a1663c7 100644
--- a/wkhtmltopdf/__init__.py
+++ b/wkhtmltopdf/__init__.py
@@ -3,4 +3,4 @@ if 'DJANGO_SETTINGS_MODULE' in os.environ:
     from .utils import *
 
 __author__ = 'Incuna Ltd'
-__version__ = '1.2.2'
+__version__ = '1.2.3'