Merge branch 'release/0.9.3'

PD? Really?

HISTORY.rst

@@ -1,10 +1,27 @@
 History
 -------
 
+0.9.3 (2011-01-31)
+++++++++++++++++++
+
+* Databook duplication leak fix.
+* HTML Table output.
+* Added column sorting.
+
+
+0.9.2 (2010-11-17)
+++++++++++++++++++
+
+* Tanspose method added to Datasets.
+* New frozen top row in Excel output.
+* Pickling support for Datasets and Rows.
+* Support for row/column stacking.
+
+
 0.9.1 (2010-11-04)
 ++++++++++++++++++
 
-* Minor reference shadowing bugfix 
+* Minor reference shadowing bugfix.
 
 
 0.9.0 (2010-11-04)

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Kenneth Reitz.
+Copyright (c) 2011 Kenneth Reitz.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

NOTICE

@@ -1,4 +1,37 @@
-Tablib includes some vendorized python libraries: pyyaml, simplejson, and xlwt.
+Tablib includes some vendorized python libraries: ordereddict, pyyaml,
+simplejson, and xlwt.
+
+Markup License
+==============
+
+Markup is in the public domain.
+
+
+
+OrderedDict License
+===================
+
+Copyright (c) 2009 Raymond Hettinger
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation files
+(the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+    OTHER DEALINGS IN THE SOFTWARE.
 
 
 

README.rst

@@ -18,6 +18,7 @@ Output formats supported:
 - Excel (Sets + Books)
 - JSON (Sets + Books)
 - YAML (Sets + Books)
+- HTML (Sets)
 - TSV (Sets)
 - CSV (Sets)
 
@@ -61,7 +62,7 @@ Intelligently add new rows: ::
 
 Intelligently add new columns: ::
 
-    >>> data.append(col=('age', 90, 67, 83))
+    >>> data.append(col=(90, 67, 83), header='age')
     
 Slice rows:  ::
 
@@ -171,8 +172,7 @@ To install tablib, simply: ::
 Or, if you absolutely must: ::
 
 	$ easy_install tablib
-    
-
+   
 Contribute
 ----------
 

TODO.rst

@@ -1,9 +1,13 @@
-* Polish *&* announce http://tablib.org.
+* Add seperator support to HTML out
+* Hooks System
+  - pre/post-append
+  - pre/post-import
+  - pre/post-export
+* Big Data
+* Backwards-compatible OrderedDict support
 * Write more exhausive unit-tests.
 * Write stress tests.
 * Make CSV write customizable.
-* HTML Table exports. 
-* ``Dataset.traspose()`` support?
-
-
-
+* Integrate django-tablib
+* Mention django-tablib in Documention
+* Dataset title usage in documentation (#17)

docs/_themes/LICENSE

@@ -1,6 +1,6 @@
 Modifications: 
 
-Copyright (c) 2010 Kenneth Reitz.
+Copyright (c) 2011 Kenneth Reitz.
 
 
 Original Project: 

docs/conf.py

@@ -42,7 +42,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Tablib'
-copyright = u'2010, Kenneth Reitz. Styles (modified) © Armin Ronacher'
+copyright = u'2011, Kenneth Reitz. Styles (modified) © Armin Ronacher'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

docs/tutorial.rst

@@ -87,7 +87,7 @@ Adding Columns
 
 Now that we have a basic :class:`Dataset` in place, let's add a column of **ages** to it. ::
 
-    data.append(col=['Age', 22, 20])
+    data.append(col=[22, 20], header='Age')
     
 Let's view the data now. ::
 
@@ -243,7 +243,7 @@ Filtering Datasets with Tags
 .. versionadded:: 0.9.0
 
 
-When constructing a :class:`Dataset` object, you can add tags to rows by speficying the ``tags`` parameter. 
+When constructing a :class:`Dataset` object, you can add tags to rows by specifying the ``tags`` parameter. 
 This allows you to filter your :class:`Dataset` later. This can be useful so seperate rows of data based on 
 arbitrary criteria (*e.g.* origin) that you don't want to include in your :class:`Dataset`.
 
@@ -350,4 +350,4 @@ The resulting **tests.xls** will have the following layout:
     
 ----
 
-Now, go check out the :ref:`API Documentation <api>` or begin :ref:`Tablib Development <development>`.
+Now, go check out the :ref:`API Documentation <api>` or begin :ref:`Tablib Development <development>`.

setup.py

@@ -19,7 +19,7 @@ required = []
 
 setup(
 	name='tablib',
-	version='0.9.1',
+	version='0.9.3',
 	description='Format agnostic tabular data library (XLS, JSON, YAML, CSV)',
 	long_description=open('README.rst').read() + '\n\n' +
 	                 open('HISTORY.rst').read(),

tablib/core.py

@@ -5,21 +5,23 @@
 
     This module implements the central tablib objects.
 
-    :copyright: (c) 2010 by Kenneth Reitz.
+    :copyright: (c) 2011 by Kenneth Reitz.
     :license: MIT, see LICENSE for more details.
 """
 
 from copy import copy
+from operator import itemgetter
 
 from tablib import formats
 
 
 __title__ = 'tablib'
-__version__ = '0.9.1'
-__build__ = 0x000901
+__version__ = '0.9.3'
+__build__ = 0x000903
 __author__ = 'Kenneth Reitz'
 __license__ = 'MIT'
-__copyright__ = 'Copyright 2010 Kenneth Reitz'
+__copyright__ = 'Copyright 2011 Kenneth Reitz'
+
 
 class Row(object):
 	"""Internal Row object. Mainly used for filtering."""
@@ -51,6 +53,17 @@ class Row(object):
 	def __delitem__(self, i):
 		del self._row[i]
 
+	def __getstate__(self):
+		result = dict()
+		result['_row'] = self._row
+		result['tags'] = self.tags
+
+		return result
+
+	def __setstate__(self, state):
+		self._row = state['_row']
+		self.tags = state['tags']
+
 	def append(self, value):
 		self._row.append(value)
 
@@ -76,44 +89,41 @@ class Row(object):
 		if tag == None:
 			return False
 		elif isinstance(tag, basestring):
-			return tag in self.tags
+			return (tag in self.tags)
 		else:
-			for t in tag:
-				if t in self.tags:
-					return True
-			return False
+			return True if len(set(tag) & set(self.tags)) else False
 
 
 class Dataset(object):
-	"""The :class:`Dataset` object is the heart of Tablib. It provides all core 
+	"""The :class:`Dataset` object is the heart of Tablib. It provides all core
     functionality.
-    
+
     Usually you create a :class:`Dataset` instance in your main module, and append
     rows and columns as you collect data. ::
-    
+
         data = tablib.Dataset()
         data.headers = ('name', 'age')
-        
+
         for (name, age) in some_collector():
             data.append((name, age))
-    
+
     You can also set rows and headers upon instantiation. This is useful if dealing
     with dozens or hundres of :class:`Dataset` objects. ::
-            
+
         headers = ('first_name', 'last_name')
         data = [('John', 'Adams'), ('George', 'Washington')]
-        
+
         data = tablib.Dataset(*data, headers=headers)
-                
-    
+
+
     :param \*args: (optional) list of rows to populate Dataset
     :param headers: (optional) list strings for Dataset header row
 
 
     .. admonition:: Format Attributes Definition
 
-     If you look at the code, the various output/import formats are not 
-     defined within the :class:`Dataset` object. To add support for a new format, see 
+     If you look at the code, the various output/import formats are not
+     defined within the :class:`Dataset` object. To add support for a new format, see
      :ref:`Adding New Formats <newformats>`.
 
 	"""
@@ -121,7 +131,7 @@ class Dataset(object):
 	def __init__(self, *args, **kwargs):
 		self._data = list(Row(arg) for arg in args)
 		self.__headers = None
-		
+
 		# ('title', index) tuples
 		self._separators = []
 
@@ -137,7 +147,7 @@ class Dataset(object):
 
 		self._register_formats()
 
-		
+
 	def __len__(self):
 		return self.height
 
@@ -156,7 +166,7 @@ class Dataset(object):
 			else:
 				return [result.tuple for result in _results]
 
-			
+
 	def __setitem__(self, key, value):
 		self._validate(value)
 		self._data[key] = Row(value)
@@ -166,10 +176,10 @@ class Dataset(object):
 		if isinstance(key, basestring):
 
 			if key in self.headers:
-				
+
 				pos = self.headers.index(key)
 				del self.headers[pos]
-				
+
 				for i, row in enumerate(self._data):
 
 					del row[pos]
@@ -186,7 +196,7 @@ class Dataset(object):
 		except AttributeError:
 			return '<dataset object>'
 
-	
+
 	@classmethod
 	def _register_formats(cls):
 		"""Adds format properties."""
@@ -196,7 +206,7 @@ class Dataset(object):
 					setattr(cls, fmt.title, property(fmt.export_set, fmt.import_set))
 				except AttributeError:
 					setattr(cls, fmt.title, property(fmt.export_set))
-					
+
 			except AttributeError:
 				pass
 
@@ -237,21 +247,21 @@ class Dataset(object):
 
 	def _clean_col(self, col):
 		"""Prepares the given column for insert/append."""
-		
+
 		col = list(col)
-		
+
 		if self.headers:
 			header = [col.pop(0)]
 		else:
 			header = []
-		
+
 		if len(col) == 1 and callable(col[0]):
 			col = map(col[0], self._data)
 		col = tuple(header + col)
-		
+
 		return col
 
-	
+
 	@property
 	def height(self):
 		"""The number of rows currently in the :class:`Dataset`.
@@ -265,7 +275,7 @@ class Dataset(object):
 		"""The number of columns currently in the :class:`Dataset`.
 		   Cannot be directly modified.
 		"""
-		
+
 		try:
 			return len(self._data[0])
 		except IndexError:
@@ -278,7 +288,7 @@ class Dataset(object):
 	@property
 	def headers(self):
 		"""An *optional* list of strings to be used for header rows and attribute names.
-        
+
         This must be set manually. The given list length must equal :class:`Dataset.width`.
 
 		"""
@@ -300,9 +310,9 @@ class Dataset(object):
 
 	@property
 	def dict(self):
-		"""A JSON representation of the :class:`Dataset` object. If headers have been 
-        set, a JSON list of objects will be returned. If no headers have 
-        been set, a JSON list of lists (rows) will be returned instead.  
+		"""A JSON representation of the :class:`Dataset` object. If headers have been
+        set, a JSON list of objects will be returned. If no headers have
+        been set, a JSON list of lists (rows) will be returned instead.
 
         A dataset object can also be imported by setting the `Dataset.json` attribute: ::
 
@@ -312,10 +322,10 @@ class Dataset(object):
 		"""
 		return self._package()
 
-	
+
 	@dict.setter
 	def dict(self, pickle):
-		"""A native Python representation of the Dataset object. If headers have been 
+		"""A native Python representation of the Dataset object. If headers have been
 	    set, a list of Python dictionaries will be returned. If no headers have been
 	    set, a list of tuples (rows) will be returned instead.
 
@@ -323,7 +333,7 @@ class Dataset(object):
 
 	        data = tablib.Dataset()
 	        data.dict = [{'age': 90, 'first_name': 'Kenneth', 'last_name': 'Reitz'}]
-	
+
 		"""
 		if not len(pickle):
 			return
@@ -333,7 +343,7 @@ class Dataset(object):
 			self.wipe()
 			for row in pickle:
 				self.append(Row(row))
-		
+
 		# if list of objects
 		elif isinstance(pickle[0], dict):
 			self.wipe()
@@ -356,11 +366,11 @@ class Dataset(object):
 		"""
 		pass
 
-	
+
 	@property
 	def csv():
-		"""A CSV representation of the :class:`Dataset` object. The top row will contain 
-	    headers, if they have been set. Otherwise, the top row will contain 
+		"""A CSV representation of the :class:`Dataset` object. The top row will contain
+	    headers, if they have been set. Otherwise, the top row will contain
 	    the first row of the dataset.
 
 	    A dataset object can also be imported by setting the :class:`Dataset.csv` attribute. ::
@@ -374,8 +384,8 @@ class Dataset(object):
 
 	@property
 	def tsv():
-		"""A TSV representation of the :class:`Dataset` object. The top row will contain 
-	    headers, if they have been set. Otherwise, the top row will contain 
+		"""A TSV representation of the :class:`Dataset` object. The top row will contain
+	    headers, if they have been set. Otherwise, the top row will contain
 	    the first row of the dataset.
 
 	    A dataset object can also be imported by setting the :class:`Dataset.tsv` attribute. ::
@@ -388,9 +398,9 @@ class Dataset(object):
 
 	@property
 	def yaml():
-		"""A YAML representation of the :class:`Dataset` object. If headers have been 
-	    set, a YAML list of objects will be returned. If no headers have 
-	    been set, a YAML list of lists (rows) will be returned instead.  
+		"""A YAML representation of the :class:`Dataset` object. If headers have been
+	    set, a YAML list of objects will be returned. If no headers have
+	    been set, a YAML list of lists (rows) will be returned instead.
 
 	    A dataset object can also be imported by setting the :class:`Dataset.json` attribute: ::
 
@@ -401,12 +411,12 @@ class Dataset(object):
 		"""
 		pass
 
-	
+
 	@property
 	def json():
-		"""A JSON representation of the :class:`Dataset` object. If headers have been 
-	    set, a JSON list of objects will be returned. If no headers have 
-	    been set, a JSON list of lists (rows) will be returned instead.  
+		"""A JSON representation of the :class:`Dataset` object. If headers have been
+	    set, a JSON list of objects will be returned. If no headers have
+	    been set, a JSON list of lists (rows) will be returned instead.
 
 	    A dataset object can also be imported by setting the :class:`Dataset.json` attribute: ::
 
@@ -416,6 +426,14 @@ class Dataset(object):
 	    Import assumes (for now) that headers exist.
 		"""
 
+	@property
+	def html():
+		"""A HTML table representation of the :class:`Dataset` object. If
+		headers have been set, they will be used as table headers.
+
+		..notice:: This method can be used for export only.
+		"""
+		pass
 
 	def append(self, row=None, col=None, header=None, tags=list()):
 		"""Adds a row or column to the :class:`Dataset`.
@@ -447,18 +465,18 @@ class Dataset(object):
 
 
 	def insert(self, index, row=None, col=None, header=None, tags=list()):
-		"""Inserts a row or column to the :class:`Dataset` at the given index. 
-        
-        Rows and columns inserted must be the correct size (height or width). 
-        
+		"""Inserts a row or column to the :class:`Dataset` at the given index.
+
+        Rows and columns inserted must be the correct size (height or width).
+
         The default behaviour is to insert the given row to the :class:`Dataset`
         object at the given index. If the ``col`` parameter is given, however,
         a new column will be insert to the :class:`Dataset` object instead.
 
         You can also insert a column of a single callable object, which will
-        add a new column with the return values of the callable each as an 
+        add a new column with the return values of the callable each as an
         item in the column. ::
-        
+
             data.append(col=random.randint)
 
         See :ref:`dyncols` for an in-depth example.
@@ -472,7 +490,7 @@ class Dataset(object):
            If inserting a row, you can add :ref:`tags <tags>` to the row you are inserting.
            This gives you the ability to :class:`filter <Dataset.filter>` your
            :class:`Dataset` later.
-    	
+
 		"""
 		if row:
 			self._validate(row)
@@ -480,7 +498,7 @@ class Dataset(object):
 		elif col:
 			col = list(col)
 
-			# Callable Columns... 
+			# Callable Columns...
 			if len(col) == 1 and callable(col[0]):
 				col = map(col[0], self._data)
 
@@ -492,7 +510,7 @@ class Dataset(object):
 				if not header:
 					raise HeadersNeeded()
 				self.headers.insert(index, header)
-		
+
 			if self.height and self.width:
 
 				for i, row in enumerate(self._data):
@@ -502,15 +520,138 @@ class Dataset(object):
 			else:
 				self._data = [Row([row]) for row in col]
 
+
 	def filter(self, tag):
 		"""Returns a new instance of the :class:`Dataset`, excluding any rows
-		that do not contain the given :ref:`tags <tags>`. 
+		that do not contain the given :ref:`tags <tags>`.
 		"""
 		_dset = copy(self)
 		_dset._data = [row for row in _dset._data if row.has_tag(tag)]
-		
+
 		return _dset
-	
+
+
+	def sort(self, col, reverse=False):
+		"""Sort a :class:`Dataset` by a specific column, given string (for
+		header) or integer (for column index). The order can be reversed by
+		setting ``reverse`` to ``True``. 
+		Returns a new :class:`Dataset` instance where columns have been
+		sorted."""
+		
+		if isinstance(col, basestring):
+
+			if not self.headers:
+				raise HeadersNeeded
+
+			_sorted = sorted(self.dict, key=itemgetter(col), reverse=reverse)
+			_dset = Dataset(headers=self.headers)
+
+			for item in _sorted:
+				row = [item[key] for key in self.headers]
+				_dset.append(row=row)
+
+		else:
+			if self.headers:
+				col = self.headers[col]
+
+			_sorted = sorted(self.dict, key=itemgetter(col), reverse=reverse)
+			_dset = Dataset(headers=self.headers)
+
+			for item in _sorted:
+				if self.headers:
+					row = [item[key] for key in self.headers]
+				else:
+					row = item
+				_dset.append(row=row)
+
+
+		return _dset
+
+	def transpose(self):
+		"""Transpose a :class:`Dataset`, turning rows into columns and vice
+		versa, returning a new ``Dataset`` instance. The first row of the
+		original instance becomes the new header row."""
+
+		# Don't transpose if there is no data
+		if not self:
+			return
+
+		_dset = Dataset()
+		# The first element of the headers stays in the headers,
+		# it is our "hinge" on which we rotate the data
+		new_headers = [self.headers[0]] + self[self.headers[0]]
+
+		_dset.headers = new_headers
+		for column in self.headers:
+
+			if column == self.headers[0]:
+				# It's in the headers, so skip it
+				continue
+
+			# Adding the column name as now they're a regular column
+			row_data = [column] + self[column]
+			row_data = Row(row_data)
+			_dset.append(row=row_data)
+
+		return _dset
+
+
+	def stack_rows(self, other):
+		"""Stack two :class:`Dataset` instances together by
+		joining at the row level, and return new combined
+		``Dataset`` instance."""
+
+		if not isinstance(other, Dataset):
+			return
+
+		if self.width != other.width:
+			raise InvalidDimensions
+
+		# Copy the source data
+		_dset = copy(self)
+
+		rows_to_stack = [row for row in _dset._data]
+		other_rows = [row for row in other._data]
+
+		rows_to_stack.extend(other_rows)
+		_dset._data = rows_to_stack
+
+		return _dset
+
+
+	def stack_columns(self, other):
+		"""Stack two :class:`Dataset` instances together by
+		joining at the column level, and return a new
+		combined ``Dataset`` instance. If either ``Dataset``
+		has headers set, than the other must as well."""
+
+		if not isinstance(other, Dataset):
+			return
+
+		if self.headers or other.headers:
+			if not self.headers or not other.headers:
+				raise HeadersNeeded
+
+		if self.height != other.height:
+			raise InvalidDimensions
+
+		try:
+			new_headers = self.headers + other.headers
+		except TypeError:
+			new_headers = None
+
+		_dset = Dataset()
+
+		for column in self.headers:
+			_dset.append(col=self[column])
+
+		for column in other.headers:
+			_dset.append(col=other[column])
+
+		_dset.headers = new_headers
+
+		return _dset
+
 	def wipe(self):
 		"""Removes all content and headers from the :class:`Dataset` object."""
 		self._data = list()
@@ -521,10 +662,14 @@ class Databook(object):
 	"""A book of :class:`Dataset` objects.
 	"""
 
-	def __init__(self, sets=[]):
-		self._datasets = sets
-		self._register_formats()
+	def __init__(self, sets=None):
 
+		if sets is None:
+			self._datasets = list()
+		else:
+			self._datasets = sets
+
+		self._register_formats()
 
 	def __repr__(self):
 		try:
@@ -537,7 +682,7 @@ class Databook(object):
 		"""Removes all :class:`Dataset` objects from the :class:`Databook`."""
 		self._datasets = []
 
-		
+
 	@classmethod
 	def _register_formats(cls):
 		"""Adds format properties."""
@@ -547,7 +692,7 @@ class Databook(object):
 					setattr(cls, fmt.title, property(fmt.export_book, fmt.import_book))
 				except AttributeError:
 					setattr(cls, fmt.title, property(fmt.export_book))
-					
+
 			except AttributeError:
 				pass
 
@@ -558,7 +703,7 @@ class Databook(object):
 			self._datasets.append(dataset)
 		else:
 			raise InvalidDatasetType
-		
+
 
 	def _package(self):
 		"""Packages :class:`Databook` for delivery."""
@@ -582,12 +727,12 @@ def detect(stream):
 	for fmt in formats.available:
 		try:
 			if fmt.detect(stream):
-				return (fmt, stream) 
+				return (fmt, stream)
 		except AttributeError:
-			pass 
+			pass
 	return (None, stream)
-	
-	
+
+
 def import_set(stream):
 	"""Return dataset of given stream."""
 	(format, stream) = detect(stream)
@@ -596,7 +741,7 @@ def import_set(stream):
 		data = Dataset()
 		format.import_set(data, stream)
 		return data
-		
+
 	except AttributeError, e:
 		return None
 

tablib/formats/__init__.py

@@ -8,5 +8,6 @@ import _json as json
 import _xls as xls
 import _yaml as yaml
 import _tsv as tsv
+import _html as html
 
-available = (json, xls, yaml, csv, tsv)
+available = (json, xls, yaml, csv, tsv, html)

tablib/formats/_html.py

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+
+""" Tablib - HTML export support.
+"""
+
+from StringIO import StringIO
+
+from tablib.packages import markup
+import tablib
+
+BOOK_ENDINGS = 'h3'
+
+title = 'html'
+extentions = ('html', )
+
+
+def export_set(dataset):
+	"""HTML representation of a Dataset."""
+
+	stream = StringIO()
+
+	page = markup.page()
+	page.table.open()
+
+	if dataset.headers is not None:
+		page.thead.open()
+		headers = markup.oneliner.th(dataset.headers)
+		page.tr(headers)
+		page.thead.close()
+
+	for row in dataset:
+		html_row = markup.oneliner.td(row)
+		page.tr(html_row)
+
+	page.table.close()
+
+	stream.writelines(str(page))
+
+	return stream.getvalue()
+
+
+def export_book(databook):
+	"""HTML representation of a Databook."""
+
+	stream = StringIO()
+
+	for i, dset in enumerate(databook._datasets):
+		title = (dset.title if dset.title else 'Set %s' % (i))
+		stream.write('<%s>%s</%s>\n' % (BOOK_ENDINGS, title, BOOK_ENDINGS))
+		stream.write(dset.html)
+		stream.write('\n')
+
+	return stream.getvalue()

tablib/formats/_json.py

@@ -26,11 +26,11 @@ def export_set(dataset):
 def export_book(databook):
 	"""Returns JSON representation of Databook."""
 	return json.dumps(databook._package())
-	
+
 
 def import_set(dset, in_stream):
 	"""Returns dataset from JSON stream."""
-	
+
 	dset.wipe()
 	dset.dict = json.loads(in_stream)
 
@@ -52,4 +52,4 @@ def detect(stream):
 		json.loads(stream)
 		return True
 	except ValueError:
-		return False
+		return False

tablib/formats/_xls.py

@@ -26,7 +26,7 @@ def export_set(dataset):
 	ws = wb.add_sheet(dataset.title if dataset.title else 'Tabbed Dataset')
 
 	dset_sheet(dataset, ws)
-	
+
 	stream = cStringIO.StringIO()
 	wb.save(stream)
 	return stream.getvalue()
@@ -63,6 +63,11 @@ def dset_sheet(dataset, ws):
 			if (i == 0) and dataset.headers:
 				ws.write(i, j, col, bold)
 
+				# frozen header row
+				ws.panes_frozen = True
+				ws.horz_split_pos = 1
+
+
 			# bold separators
 			elif len(row) < dataset.width:
 				ws.write(i, j, col, bold)
@@ -77,4 +82,4 @@ def dset_sheet(dataset, ws):
 				except TypeError:
 					ws.write(i, j, col)
 
-	
+

tablib/packages/markup.py

@@ -0,0 +1,484 @@
+# This code is in the public domain, it comes
+# with absolutely no warranty and you can do
+# absolutely whatever you want with it.
+
+__date__ = '17 May 2007'
+__version__ = '1.7'
+__doc__= """
+This is markup.py - a Python module that attempts to
+make it easier to generate HTML/XML from a Python program
+in an intuitive, lightweight, customizable and pythonic way.
+
+The code is in the public domain.
+
+Version: %s as of %s.
+
+Documentation and further info is at http://markup.sourceforge.net/
+
+Please send bug reports, feature requests, enhancement
+ideas or questions to nogradi at gmail dot com.
+
+Installation: drop markup.py somewhere into your Python path.
+""" % ( __version__, __date__ )
+
+import string
+
+class element:
+    """This class handles the addition of a new element."""
+
+    def __init__( self, tag, case='lower', parent=None ):
+        self.parent = parent
+
+	if case == 'lower':
+	    self.tag = tag.lower( )
+	else:
+	    self.tag = tag.upper( )
+    
+    def __call__( self, *args, **kwargs ):
+        if len( args ) > 1:
+            raise ArgumentError( self.tag )
+
+        # if class_ was defined in parent it should be added to every element
+        if self.parent is not None and self.parent.class_ is not None:
+            if 'class_' not in kwargs:
+                kwargs['class_'] = self.parent.class_
+            
+        if self.parent is None and len( args ) == 1:
+            x = [ self.render( self.tag, False, myarg, mydict ) for myarg, mydict in _argsdicts( args, kwargs ) ]
+            return '\n'.join( x )
+        elif self.parent is None and len( args ) == 0:
+            x = [ self.render( self.tag, True, myarg, mydict ) for myarg, mydict in _argsdicts( args, kwargs ) ]
+            return '\n'.join( x )
+            
+        if self.tag in self.parent.twotags:
+            for myarg, mydict in _argsdicts( args, kwargs ):
+                self.render( self.tag, False, myarg, mydict )
+        elif self.tag in self.parent.onetags:
+            if len( args ) == 0:
+                for myarg, mydict in _argsdicts( args, kwargs ):
+                    self.render( self.tag, True, myarg, mydict )    # here myarg is always None, because len( args ) = 0
+            else:
+                raise ClosingError( self.tag )
+        elif self.parent.mode == 'strict_html' and self.tag in self.parent.deptags:
+            raise DeprecationError( self.tag )
+        else:
+            raise InvalidElementError( self.tag, self.parent.mode )
+    
+    def render( self, tag, single, between, kwargs ):
+        """Append the actual tags to content."""
+
+	out = "<%s" % tag
+	for key, value in kwargs.iteritems( ):
+            if value is not None:               # when value is None that means stuff like <... checked>
+                key = key.strip('_')            # strip this so class_ will mean class, etc.
+                if key == 'http_equiv':         # special cases, maybe change _ to - overall?
+                    key = 'http-equiv'
+                elif key == 'accept_charset':
+                    key = 'accept-charset'
+                out = "%s %s=\"%s\"" % ( out, key, escape( value ) )
+            else:
+                out = "%s %s" % ( out, key )
+	if between is not None:
+	    out = "%s>%s</%s>" % ( out, between, tag )
+	else:
+	    if single:
+		out = "%s />" % out
+	    else:
+		out = "%s>" % out
+        if self.parent is not None:
+            self.parent.content.append( out )
+        else:
+            return out
+    
+    def close( self ):
+        """Append a closing tag unless element has only opening tag."""
+
+        if self.tag in self.parent.twotags:
+            self.parent.content.append( "</%s>" % self.tag )
+        elif self.tag in self.parent.onetags:
+            raise ClosingError( self.tag )
+        elif self.parent.mode == 'strict_html' and self.tag in self.parent.deptags:
+            raise DeprecationError( self.tag )
+
+    def open( self, **kwargs ):
+        """Append an opening tag."""
+
+        if self.tag in self.parent.twotags or self.tag in self.parent.onetags:
+            self.render( self.tag, False, None, kwargs )
+        elif self.mode == 'strict_html' and self.tag in self.parent.deptags:
+            raise DeprecationError( self.tag )
+
+class page:
+    """This is our main class representing a document. Elements are added
+    as attributes of an instance of this class."""
+
+    def __init__( self, mode='strict_html', case='lower', onetags=None, twotags=None, separator='\n', class_=None ):
+        """Stuff that effects the whole document.
+
+        mode -- 'strict_html'   for HTML 4.01 (default)
+                'html'          alias for 'strict_html'
+                'loose_html'    to allow some deprecated elements
+                'xml'           to allow arbitrary elements
+
+        case -- 'lower'         element names will be printed in lower case (default)
+                'upper'         they will be printed in upper case
+
+        onetags --              list or tuple of valid elements with opening tags only
+        twotags --              list or tuple of valid elements with both opening and closing tags
+                                these two keyword arguments may be used to select
+                                the set of valid elements in 'xml' mode
+                                invalid elements will raise appropriate exceptions
+        
+        separator --            string to place between added elements, defaults to newline
+        
+        class_ --               a class that will be added to every element if defined"""
+        
+        valid_onetags = [ "AREA", "BASE", "BR", "COL", "FRAME", "HR", "IMG", "INPUT", "LINK", "META", "PARAM" ]
+        valid_twotags = [ "A", "ABBR", "ACRONYM", "ADDRESS", "B", "BDO", "BIG", "BLOCKQUOTE", "BODY", "BUTTON",
+                "CAPTION", "CITE", "CODE", "COLGROUP", "DD", "DEL", "DFN", "DIV", "DL", "DT", "EM", "FIELDSET",
+                "FORM", "FRAMESET", "H1", "H2", "H3", "H4", "H5", "H6", "HEAD", "HTML", "I", "IFRAME", "INS",
+                "KBD", "LABEL", "LEGEND", "LI", "MAP", "NOFRAMES", "NOSCRIPT", "OBJECT", "OL", "OPTGROUP",
+                "OPTION", "P", "PRE", "Q", "SAMP", "SCRIPT", "SELECT", "SMALL", "SPAN", "STRONG", "STYLE",
+                "SUB", "SUP", "TABLE", "TBODY", "TD", "TEXTAREA", "TFOOT", "TH", "THEAD", "TITLE", "TR",
+                "TT", "UL", "VAR" ]
+        deprecated_onetags = [ "BASEFONT", "ISINDEX" ]
+        deprecated_twotags = [ "APPLET", "CENTER", "DIR", "FONT", "MENU", "S", "STRIKE", "U" ]
+
+        self.header = [ ]
+	self.content = [ ]
+        self.footer = [ ]
+	self.case = case
+        self.separator = separator
+
+        # init( ) sets it to True so we know that </body></html> has to be printed at the end
+        self._full = False
+        self.class_= class_
+
+	if mode == 'strict_html' or mode == 'html':
+	    self.onetags = valid_onetags
+	    self.onetags += map( string.lower, self.onetags )
+	    self.twotags = valid_twotags
+	    self.twotags += map( string.lower, self.twotags )
+	    self.deptags = deprecated_onetags + deprecated_twotags
+	    self.deptags += map( string.lower, self.deptags )
+	    self.mode = 'strict_html'
+	elif mode == 'loose_html':
+	    self.onetags = valid_onetags + deprecated_onetags 
+	    self.onetags += map( string.lower, self.onetags )
+	    self.twotags = valid_twotags + deprecated_twotags
+	    self.twotags += map( string.lower, self.twotags )
+	    self.mode = mode
+	elif mode == 'xml':
+            if onetags and twotags:
+                self.onetags = onetags
+                self.twotags = twotags
+            elif ( onetags and not twotags ) or ( twotags and not onetags ):
+                raise CustomizationError( )
+            else:
+                self.onetags = russell( )
+                self.twotags = russell( )
+            self.mode = mode
+	else:
+	    raise ModeError( mode )
+
+    def __getattr__( self, attr ):
+        if attr.startswith("__") and attr.endswith("__"):
+            raise AttributeError, attr
+        return element( attr, case=self.case, parent=self )
+
+    def __str__( self ):
+        
+        if self._full and ( self.mode == 'strict_html' or self.mode == 'loose_html' ):
+            end = [ '</body>', '</html>' ]
+        else:
+            end = [ ]
+	
+        return self.separator.join( self.header + self.content + self.footer + end )
+
+    def __call__( self, escape=False ):
+        """Return the document as a string.
+
+        escape --   False   print normally
+                    True    replace < and > by &lt; and &gt;
+                            the default escape sequences in most browsers"""
+
+        if escape:
+            return _escape( self.__str__( ) )
+        else:
+            return self.__str__( )
+
+    def add( self, text ):
+        """This is an alias to addcontent."""
+        self.addcontent( text )
+
+    def addfooter( self, text ):
+        """Add some text to the bottom of the document"""
+        self.footer.append( text )
+
+    def addheader( self, text ):
+        """Add some text to the top of the document"""
+        self.header.append( text )
+
+    def addcontent( self, text ):
+        """Add some text to the main part of the document"""
+        self.content.append( text )
+
+
+    def init( self, lang='en', css=None, metainfo=None, title=None, header=None,
+              footer=None, charset=None, encoding=None, doctype=None, bodyattrs=None, script=None ):
+        """This method is used for complete documents with appropriate
+        doctype, encoding, title, etc information. For an HTML/XML snippet
+        omit this method.
+
+        lang --     language, usually a two character string, will appear
+                    as <html lang='en'> in html mode (ignored in xml mode)
+        
+        css --      Cascading Style Sheet filename as a string or a list of
+                    strings for multiple css files (ignored in xml mode)
+
+        metainfo -- a dictionary in the form { 'name':'content' } to be inserted
+                    into meta element(s) as <meta name='name' content='content'>
+                    (ignored in xml mode)
+
+        bodyattrs --a dictionary in the form { 'key':'value', ... } which will be added
+                    as attributes of the <body> element as <body key='value' ... >
+                    (ignored in xml mode)
+
+        script --   dictionary containing src:type pairs, <script type='text/type' src=src></script>
+
+        title --    the title of the document as a string to be inserted into
+                    a title element as <title>my title</title> (ignored in xml mode)
+
+        header --   some text to be inserted right after the <body> element
+                    (ignored in xml mode)
+
+        footer --   some text to be inserted right before the </body> element
+                    (ignored in xml mode)
+
+        charset --  a string defining the character set, will be inserted into a
+                    <meta http-equiv='Content-Type' content='text/html; charset=myset'>
+                    element (ignored in xml mode)
+
+        encoding -- a string defining the encoding, will be put into to first line of
+                    the document as <?xml version='1.0' encoding='myencoding' ?> in
+                    xml mode (ignored in html mode)
+
+        doctype --  the document type string, defaults to
+                    <!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>
+                    in html mode (ignored in xml mode)"""
+
+        self._full = True
+
+        if self.mode == 'strict_html' or self.mode == 'loose_html':
+            if doctype is None:
+                doctype = "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>"
+            self.header.append( doctype )
+            self.html( lang=lang )
+            self.head( )
+            if charset is not None:
+                self.meta( http_equiv='Content-Type', content="text/html; charset=%s" % charset )
+            if metainfo is not None:
+                self.metainfo( metainfo )
+            if css is not None:
+                self.css( css )
+            if title is not None:
+                self.title( title )
+            if script is not None:
+                self.scripts( script )
+            self.head.close()
+            if bodyattrs is not None:
+                self.body( **bodyattrs )
+            else:
+                self.body( )
+            if header is not None:
+                self.content.append( header )
+            if footer is not None:
+                self.footer.append( footer )
+
+        elif self.mode == 'xml':
+            if doctype is None:
+                if encoding is not None:
+                    doctype = "<?xml version='1.0' encoding='%s' ?>" % encoding
+                else:
+                    doctype = "<?xml version='1.0' ?>"
+            self.header.append( doctype )
+
+    def css( self, filelist ):
+        """This convenience function is only useful for html.
+        It adds css stylesheet(s) to the document via the <link> element."""
+      
+        if isinstance( filelist, basestring ):
+            self.link( href=filelist, rel='stylesheet', type='text/css', media='all' )
+        else:
+            for file in filelist:
+                self.link( href=file, rel='stylesheet', type='text/css', media='all' )
+
+    def metainfo( self, mydict ):
+        """This convenience function is only useful for html.
+        It adds meta information via the <meta> element, the argument is
+        a dictionary of the form { 'name':'content' }."""
+
+        if isinstance( mydict, dict ):
+            for name, content in mydict.iteritems( ):
+                self.meta( name=name, content=content )
+        else:
+            raise TypeError, "Metainfo should be called with a dictionary argument of name:content pairs."
+
+    def scripts( self, mydict ):
+        """Only useful in html, mydict is dictionary of src:type pairs will
+        be rendered as <script type='text/type' src=src></script>"""
+
+        if isinstance( mydict, dict ):
+            for src, type in mydict.iteritems( ):
+                self.script( '', src=src, type='text/%s' % type )
+        else:
+            raise TypeError, "Script should be given a dictionary of src:type pairs."
+
+
+class _oneliner:
+    """An instance of oneliner returns a string corresponding to one element.
+    This class can be used to write 'oneliners' that return a string
+    immediately so there is no need to instantiate the page class."""
+    
+    def __init__( self, case='lower' ):
+        self.case = case
+    
+    def __getattr__( self, attr ):
+        if attr.startswith("__") and attr.endswith("__"):
+            raise AttributeError, attr
+        return element( attr, case=self.case, parent=None )
+
+oneliner = _oneliner( case='lower' )
+upper_oneliner = _oneliner( case='upper' )
+
+def _argsdicts( args, mydict ):
+    """A utility generator that pads argument list and dictionary values, will only be called with len( args ) = 0, 1."""
+    
+    if len( args ) == 0:
+        args = None, 
+    elif len( args ) == 1:
+        args = _totuple( args[0] )
+    else:
+        raise Exception, "We should have never gotten here."
+
+    mykeys = mydict.keys( )
+    myvalues = map( _totuple, mydict.values( ) )
+
+    maxlength = max( map( len, [ args ] + myvalues ) )
+
+    for i in xrange( maxlength ):
+        thisdict = { }
+        for key, value in zip( mykeys, myvalues ):
+            try:
+                thisdict[ key ] = value[i]
+            except IndexError:
+                thisdict[ key ] = value[-1]
+        try:
+            thisarg = args[i]
+        except IndexError:
+            thisarg = args[-1]
+
+        yield thisarg, thisdict
+
+def _totuple( x ):
+    """Utility stuff to convert string, int, float, None or anything to a usable tuple."""
+
+    if isinstance( x, basestring ):
+        out = x,
+    elif isinstance( x, ( int, float ) ):
+        out = str( x ),
+    elif x is None:
+        out = None,
+    else:
+        out = tuple( x )
+
+    return out
+
+def escape( text, newline=False ):
+    """Escape special html characters."""
+
+    if isinstance( text, basestring ):
+        if '&' in text:
+            text = text.replace( '&', '&amp;' )
+        if '>' in text:
+            text = text.replace( '>', '&gt;' )
+        if '<' in text:
+            text = text.replace( '<', '&lt;' )
+        if '\"' in text:
+            text = text.replace( '\"', '&quot;' )
+        if '\'' in text:
+            text = text.replace( '\'', '&quot;' )
+        if newline:
+            if '\n' in text:
+                text = text.replace( '\n', '<br>' )
+
+    return text
+
+_escape = escape
+
+def unescape( text ):
+    """Inverse of escape."""
+    
+    if isinstance( text, basestring ):
+        if '&amp;' in text:
+            text = text.replace( '&amp;', '&' )
+        if '&gt;' in text:
+            text = text.replace( '&gt;', '>' )
+        if '&lt;' in text:
+            text = text.replace( '&lt;', '<' )
+        if '&quot;' in text:
+            text = text.replace( '&quot;', '\"' )
+
+    return text
+
+class dummy:
+    """A dummy class for attaching attributes."""
+    pass
+
+doctype = dummy( )
+doctype.frameset = "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Frameset//EN' 'http://www.w3.org/TR/html4/frameset.dtd'>"
+doctype.strict = "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01//EN' 'http://www.w3.org/TR/html4/strict.dtd'>"
+doctype.loose = "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>"
+
+class russell:
+    """A dummy class that contains anything."""
+
+    def __contains__( self, item ):
+	return True
+
+
+class MarkupError( Exception ):
+    """All our exceptions subclass this."""
+    def __str__( self ):
+	return self.message
+
+class ClosingError( MarkupError ):
+    def __init__( self, tag ):
+	self.message = "The element '%s' does not accept non-keyword arguments (has no closing tag)." % tag
+
+class OpeningError( MarkupError ):
+    def __init__( self, tag ):
+	self.message = "The element '%s' can not be opened." % tag
+
+class ArgumentError( MarkupError ):
+    def __init__( self, tag ):
+	self.message = "The element '%s' was called with more than one non-keyword argument." % tag
+
+class InvalidElementError( MarkupError ):
+    def __init__( self, tag, mode ):
+	self.message = "The element '%s' is not valid for your mode '%s'." % ( tag, mode )
+
+class DeprecationError( MarkupError ):
+    def __init__( self, tag ):
+	self.message = "The element '%s' is deprecated, instantiate markup.page with mode='loose_html' to allow it." % tag
+
+class ModeError( MarkupError ):
+    def __init__( self, mode ):
+	self.message = "Mode '%s' is invalid, possible values: strict_html, loose_html, xml." % mode
+
+class CustomizationError( MarkupError ):
+    def __init__( self ):
+        self.message = "If you customize the allowed elements, you must define both types 'onetags' and 'twotags'."
+
+if __name__ == '__main__':
+    print __doc__

tablib/packages/ordereddict.py

@@ -0,0 +1,127 @@
+# Copyright (c) 2009 Raymond Hettinger
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+#     The above copyright notice and this permission notice shall be
+#     included in all copies or substantial portions of the Software.
+#
+#     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+#     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+#     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+#     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+#     OTHER DEALINGS IN THE SOFTWARE.
+
+from UserDict import DictMixin
+
+class OrderedDict(dict, DictMixin):
+
+    def __init__(self, *args, **kwds):
+        if len(args) > 1:
+            raise TypeError('expected at most 1 arguments, got %d' % len(args))
+        try:
+            self.__end
+        except AttributeError:
+            self.clear()
+        self.update(*args, **kwds)
+
+    def clear(self):
+        self.__end = end = []
+        end += [None, end, end]         # sentinel node for doubly linked list
+        self.__map = {}                 # key --> [key, prev, next]
+        dict.clear(self)
+
+    def __setitem__(self, key, value):
+        if key not in self:
+            end = self.__end
+            curr = end[1]
+            curr[2] = end[1] = self.__map[key] = [key, curr, end]
+        dict.__setitem__(self, key, value)
+
+    def __delitem__(self, key):
+        dict.__delitem__(self, key)
+        key, prev, next = self.__map.pop(key)
+        prev[2] = next
+        next[1] = prev
+
+    def __iter__(self):
+        end = self.__end
+        curr = end[2]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[2]
+
+    def __reversed__(self):
+        end = self.__end
+        curr = end[1]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[1]
+
+    def popitem(self, last=True):
+        if not self:
+            raise KeyError('dictionary is empty')
+        if last:
+            key = reversed(self).next()
+        else:
+            key = iter(self).next()
+        value = self.pop(key)
+        return key, value
+
+    def __reduce__(self):
+        items = [[k, self[k]] for k in self]
+        tmp = self.__map, self.__end
+        del self.__map, self.__end
+        inst_dict = vars(self).copy()
+        self.__map, self.__end = tmp
+        if inst_dict:
+            return (self.__class__, (items,), inst_dict)
+        return self.__class__, (items,)
+
+    def keys(self):
+        return list(self)
+
+    setdefault = DictMixin.setdefault
+    update = DictMixin.update
+    pop = DictMixin.pop
+    values = DictMixin.values
+    items = DictMixin.items
+    iterkeys = DictMixin.iterkeys
+    itervalues = DictMixin.itervalues
+    iteritems = DictMixin.iteritems
+
+    def __repr__(self):
+        if not self:
+            return '%s()' % (self.__class__.__name__,)
+        return '%s(%r)' % (self.__class__.__name__, self.items())
+
+    def copy(self):
+        return self.__class__(self)
+
+    @classmethod
+    def fromkeys(cls, iterable, value=None):
+        d = cls()
+        for key in iterable:
+            d[key] = value
+        return d
+
+    def __eq__(self, other):
+        if isinstance(other, OrderedDict):
+            if len(self) != len(other):
+                return False
+            for p, q in  zip(self.items(), other.items()):
+                if p != q:
+                    return False
+            return True
+        return dict.__eq__(self, other)
+
+    def __ne__(self, other):
+        return not self == other

test_tablib.py

@@ -5,9 +5,12 @@
 
 import unittest
 
+from tablib.packages import markup
+
 import tablib
 
 
+
 class TablibTestCase(unittest.TestCase):
 	"""Tablib test cases."""
 
@@ -15,6 +18,7 @@ class TablibTestCase(unittest.TestCase):
 		"""Create simple data set with headers."""
 
 		global data, book
+
 		data = tablib.Dataset()
 		book = tablib.Databook()
 
@@ -180,6 +184,27 @@ class TablibTestCase(unittest.TestCase):
 
 		self.assertEqual(tsv, self.founders.tsv)
 
+	def test_html_export(self):
+
+		"""HTML export"""
+
+		html = markup.page()
+		html.table.open()
+		html.thead.open()
+
+		html.tr(markup.oneliner.th(self.founders.headers))
+		html.thead.close()
+
+		for founder in self.founders:
+
+			html.tr(markup.oneliner.td(founder))
+
+		html.table.close()
+		html = str(html)
+
+		self.assertEqual(html, self.founders.html)
+
+
 	def test_unicode_append(self):
 		"""Passes in a single unicode charecter and exports."""
 
@@ -192,7 +217,7 @@ class TablibTestCase(unittest.TestCase):
 		data.tsv
 		data.xls
 
- 
+
 	def test_book_export_no_exceptions(self):
 		"""Test that varoius exports don't error out."""
 
@@ -243,7 +268,7 @@ class TablibTestCase(unittest.TestCase):
 
 		self.assertEqual(_yaml, data.yaml)
 
-		
+
 	def test_yaml_import_book(self):
 		"""Generate and import YAML book serialization."""
 		data.append(self.john)
@@ -256,7 +281,7 @@ class TablibTestCase(unittest.TestCase):
 		book.yaml = _yaml
 
 		self.assertEqual(_yaml, book.yaml)
-		
+
 
 	def test_csv_import_set(self):
 		"""Generate and import CSV set serialization."""
@@ -284,7 +309,7 @@ class TablibTestCase(unittest.TestCase):
 
 	def test_csv_format_detect(self):
 		"""Test CSV format detection."""
-		
+
 		_csv = (
 			'1,2,3\n'
 			'4,5,6\n'
@@ -293,13 +318,13 @@ class TablibTestCase(unittest.TestCase):
 		_bunk = (
 			'¡¡¡¡¡¡¡¡£™∞¢£§∞§¶•¶ª∞¶•ªº••ª–º§•†•§º¶•†¥ª–º•§ƒø¥¨©πƒø†ˆ¥ç©¨√øˆ¥≈†ƒ¥ç©ø¨çˆ¥ƒçø¶'
 		)
-		
+
 		self.assertTrue(tablib.formats.csv.detect(_csv))
 		self.assertFalse(tablib.formats.csv.detect(_bunk))
 
 	def test_tsv_format_detect(self):
 		"""Test TSV format detection."""
-		
+
 		_tsv = (
 			'1\t2\t3\n'
 			'4\t5\t6\n'
@@ -308,7 +333,7 @@ class TablibTestCase(unittest.TestCase):
 		_bunk = (
 			'¡¡¡¡¡¡¡¡£™∞¢£§∞§¶•¶ª∞¶•ªº••ª–º§•†•§º¶•†¥ª–º•§ƒø¥¨©πƒø†ˆ¥ç©¨√øˆ¥≈†ƒ¥ç©ø¨çˆ¥ƒçø¶'
 		)
-		
+
 		self.assertTrue(tablib.formats.tsv.detect(_tsv))
 		self.assertFalse(tablib.formats.tsv.detect(_bunk))
 
@@ -349,23 +374,90 @@ class TablibTestCase(unittest.TestCase):
 		self.assertEqual(tablib.detect(_json)[0], tablib.formats.json)
 		self.assertEqual(tablib.detect(_bunk)[0], None)
 
+	def test_transpose(self):
+		"""Transpose a dataset."""
+
+		transposed_founders = self.founders.transpose()
+		first_row = transposed_founders[0]
+		second_row = transposed_founders[1]
+
+		self.assertEqual(transposed_founders.headers,
+				  ["first_name","John", "George", "Thomas"])
+		self.assertEqual(first_row,
+				   ("last_name","Adams", "Washington", "Jefferson"))
+		self.assertEqual(second_row,
+				   ("gpa",90, 67, 50))
+
+	def test_row_stacking(self):
+
+		"""Row stacking."""
+
+		to_join = tablib.Dataset(headers=self.founders.headers)
+
+		for row in self.founders:
+			to_join.append(row=row)
+
+		row_stacked = self.founders.stack_rows(to_join)
+
+		for column in row_stacked.headers:
+
+			original_data = self.founders[column]
+			expected_data = original_data + original_data
+			self.assertEqual(row_stacked[column], expected_data)
+
+	def test_column_stacking(self):
+
+		"""Column stacking"""
+
+		to_join = tablib.Dataset(headers=self.founders.headers)
+
+		for row in self.founders:
+			to_join.append(row=row)
+
+		column_stacked = self.founders.stack_columns(to_join)
+
+		for index, row in enumerate(column_stacked):
+
+			original_data = self.founders[index]
+			expected_data = original_data + original_data
+			self.assertEqual(row, expected_data)
+
+		self.assertEqual(column_stacked[0],
+				   ("John", "Adams", 90, "John", "Adams", 90))
+
+	def test_sorting(self):
+
+		"""Sort columns."""
+
+		sorted_data = self.founders.sort(col="first_name")
+
+		first_row = sorted_data[0]
+		second_row = sorted_data[2]
+		third_row = sorted_data[1]
+		expected_first = self.founders[1]
+		expected_second = self.founders[2]
+		expected_third = self.founders[0]
+
+		self.assertEqual(first_row, expected_first)
+		self.assertEqual(second_row, expected_second)
+		self.assertEqual(third_row, expected_third)
 
 	def test_wipe(self):
 		"""Purge a dataset."""
-		
+
 		new_row = (1, 2, 3)
 		data.append(new_row)
 
 		# Verify width/data
 		self.assertTrue(data.width == len(new_row))
 		self.assertTrue(data[0] == new_row)
-		
+
 		data.wipe()
 		new_row = (1, 2, 3, 4)
 		data.append(new_row)
 		self.assertTrue(data.width == len(new_row))
 		self.assertTrue(data[0] == new_row)
-	
-		
+
+
 if __name__ == '__main__':
 	unittest.main()