Merge branch 'master' of github.com:pykler/yajl-py

Conflicts:
	.gitignore
	examples/json_reformat.py

Author: pykler

.gitignore

@@ -16,6 +16,9 @@ dist/
 build/
 *.egg-info/
 
+# yajl build
+yajl-src
+
 # developer specifics
 .virtualenv/
 .vagrant/

.travis.yml

@@ -0,0 +1,12 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+install:
+  - "make deps"
+  - "make install"
+before_script:
+  - "pip install python-coveralls --use-mirrors"
+script: "make test"
+after_success:
+  - "coveralls"

COPYING

@@ -1,4 +1,4 @@
-Copyright © 2009, 2010
+Copyright © 2009, 2010, 2011, 2012, 2013
 
     Hatem Nassrat
 

Makefile

@@ -2,22 +2,24 @@ SHELL=/bin/bash
 HTMLDIR=doc/build/html
 HTMLSED=find ${HTMLDIR}/ -name '*.html' | xargs sed -i
 
-.PHONY: usage install test doc gh-pages build-doc
+.PHONY: usage install deps test doc gh-pages build-doc
 
 usage:
 	@echo
 	@echo Makefile for yajl-py
 	@echo
 	@echo Targets
 	@echo " install :" easy_install yajl-py
+	@echo " deps    :" install compatible yajl version
 	@echo " test    :" run yajl-py tests 
 	@echo " doc     :" install docs to gh-pages branch
 
 install:
-	easy_install .
+	pip install . --use-mirrors
 
 test:
-	nosetests -v tests/
+	pip install -r test_requirements.txt --use-mirrors
+	nosetests --with-cov --cover-erase --cov yajl -v tests/
 
 doc: gh-pages
 
@@ -31,3 +33,10 @@ build-doc:
 	${HTMLSED} 's/_sources/sources/g'
 	mv ${HTMLDIR}/{_,}static
 	${HTMLSED} 's/_static/static/g'
+
+deps:
+	rm -fr yajl-src
+	git clone https://github.com/lloyd/yajl.git yajl-src
+	(cd yajl-src; git checkout 4c539cb5b; git reset --hard; ./configure)
+	sudo make -C yajl-src install
+	sudo ldconfig

README.rst

@@ -2,25 +2,41 @@
 yajl-py
 =======
 
-`yajl-py` is a Pure Python wrapper (implemented using
+
+.. image:: https://travis-ci.org/pykler/yajl-py.png?branch=master
+   :target: https://travis-ci.org/pykler/yajl-py
+
+.. image:: https://coveralls.io/repos/pykler/yajl-py/badge.png
+   :target: https://coveralls.io/r/pykler/yajl-py
+
+.. image:: https://pypip.in/v/yajl-py/badge.png
+   :target: https://crate.io/packages/yajl-py/#info
+
+.. image:: https://pypip.in/d/yajl-py/badge.png
+   :target: https://crate.io/packages/yajl-py/#info
+
+.. image:: https://requires.io/github/pykler/yajl-py/requirements.png?branch=master
+   :target: https://requires.io/github/pykler/yajl-py/requirements/?branch=master
+
+``yajl-py`` is a Pure Python wrapper (implemented using
 ctypes) to the excellent Yajl (Yet Another JSON Library) C
 library.
 
-`yajl` and `yajl-py`, allow for fast stream parsing of JSON
+``yajl`` and ``yajl-py``, allow for fast stream parsing of JSON
 files, which enables the parsing of large files, that would
 not fit in memory.
 
 Dependencies
 ------------
 
     - python 2.6 (or compatible)
-    - yajl (from http://lloyd.github.com/yajl/)
+    - `yajl <http://lloyd.github.com/yajl/>`_
 
 To run the tests you also require:
 
-    - make (to run `make test`)
-    - nose (debian package == `python-nose`)
-    - MiniMockTest (`pip install minimocktest`)
+    - make (to run ``make test``)
+    - nose (debian package == ``python-nose``)
+    - MiniMockTest (``pip install minimocktest``)
 
 Install
 -------
@@ -31,10 +47,23 @@ From within the current directory run::
 
         - OR Alternatively -
 
-    easy_install .
+    pip install .
+
+To install from pypi::
+
+    pip install yajl-py
 
 Usage
 -----
 
 The examples directory contains full featured JSON Parsers built using
-`yajl` and `yajl-py`. See `examples/README.rst` for more info.
+``yajl`` and ``yajl-py``. See `examples/README.rst <examples/>`_ for more info.
+
+Contributions
+-------------
+
+The following people provided valuable contributions to this library:
+
+ * `Peter Dobcsanyi`
+ * `Charles Gordon <https://github.com/cgordon>`_
+ * `Christopher Reighley <https://github.com/reighley-christopher>`_

doc/source/conf.py

@@ -10,14 +10,15 @@
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
-
 import sys, os
+import sphinx_rtd_theme
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path = [os.path.abspath('../../')] + sys.path
 
+
 # -- General configuration -----------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
@@ -45,9 +46,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.0.11'
+from yajl import __version__ as version
 # The full version, including alpha/beta/rc tags.
-release = '1.0.11'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -91,19 +92,21 @@
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
+# html_theme = 'default'
 # html_theme = 'sphinxdoc'
+html_theme = "sphinx_rtd_theme"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
-html_theme_options = {
-    "stickysidebar": "true",
-}
+html_theme_options = {}
+# html_theme_options = {
+#     "stickysidebar": "true",
+# }
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
+html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".

doc/source/index.rst

@@ -1,5 +1,17 @@
-Welcome to Yajl-Py's documentation!
-===================================
+Yajl-Py documentation
+=====================
+
+.. image:: https://travis-ci.org/pykler/yajl-py.png?branch=master
+   :target: https://travis-ci.org/pykler/yajl-py
+
+.. image:: https://coveralls.io/repos/pykler/yajl-py/badge.png
+   :target: https://coveralls.io/r/pykler/yajl-py
+
+.. image:: https://pypip.in/v/yajl-py/badge.png
+   :target: https://crate.io/packages/yajl-py/#info
+
+.. image:: https://pypip.in/d/yajl-py/badge.png
+   :target: https://crate.io/packages/yajl-py/#info
 
 `yajl-py <http://github.com/pykler/yajl-py>`_ is a pure python wrapper
 to the `yajl <http://lloyd.github.com/yajl/>`_ C Library.
@@ -25,10 +37,12 @@ Installation
 
 To install the latest version of yajl-py, run::
 
-    easy_install yajl-py
+    pip install yajl-py
 
 For the development version you may visit
-`yajl-py at github <http://github.com/pykler/yajl-py>`_.
+`yajl-py at github <http://github.com/pykler/yajl-py>`_::
+
+    pip install git+https://github.com/pykler/yajl-py.git
 
 Alternatives
 ------------

doc_requirements.txt

@@ -0,0 +1 @@
+sphinx_rtd_theme

examples/json_reformat.py

@@ -112,6 +112,7 @@ def main():
     # initialize the parser
     yajl_parser = YajlParser(ch)
     yajl_parser.allow_comments = True  # let's allow comments by default
+    yajl_parser.allow_multiple_values = True
     yajl_parser.dont_validate_strings = options.dont_validate_strings
     yajl_parser.allow_multiple_values = options.stream
     yajl_parser.parse()

test_requirements.txt

@@ -0,0 +1,3 @@
+minimocktest
+nose
+nose-cov