Skip to content

Commit

Permalink
integrated gitstore
Browse files Browse the repository at this point in the history
while requiring Git might be a burden in some environments, that store's
layout is much nicer (files for tiddlers rather than directories) - and
of course also more efficient (deltas, metadata for binaries)

if this turns out to be an issue, we can look into making this optional
  • Loading branch information
FND committed Jan 18, 2014
1 parent 3ed1190 commit 5f37ccf
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
'include_package_data': True,
'zip_safe': False,
'install_requires': ['tiddlyweb', 'tiddlywebplugins.utils',
'tiddlywebplugins.logout', 'tiddlywebplugins.static',
'tiddlywebplugins.templates', 'tiddlywebplugins.tagdex',
'tiddlywebplugins.markdown>=1.1.0', 'markdown-checklist>=0.2.0',
'tiddlywebplugins.imaker'],
'tiddlywebplugins.gitstore', 'tiddlywebplugins.logout',
'tiddlywebplugins.static', 'tiddlywebplugins.templates',
'tiddlywebplugins.tagdex', 'tiddlywebplugins.markdown>=1.1.0',
'markdown-checklist>=0.2.0', 'tiddlywebplugins.imaker'],
'extras_require': {
'build': ['tiddlywebplugins.ibuilder'],
'testing': ['pytest', 'wsgi-intercept<0.6', 'httplib2'],
Expand Down
7 changes: 7 additions & 0 deletions test/test_plugin_integration.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import os

from tiddlyweb.model.tiddler import Tiddler
from tiddlyweb.model.bag import Bag
from tiddlyweb.manage import handle
Expand All @@ -10,6 +12,11 @@ def setup_module(module):
module.STORE = instance['store']


def test_gitstore():
gitdir = os.path.join(STORE.storage._root, '.git')
assert os.path.isdir(gitdir)


def test_tagdex():
bag = Bag('snippets')
STORE.put(bag)
Expand Down
2 changes: 1 addition & 1 deletion tiddlywebplugins/bfw/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
https://github.com/FND/tiddlywebplugins.bfw
"""

__version__ = '0.0.1'
__version__ = '0.1.0'
__author__ = 'FND'
__license__ = 'MIT'

Expand Down
1 change: 1 addition & 0 deletions tiddlywebplugins/bfw/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

config = {
'instance_pkgstores': ['tiddlywebplugins.bfw'],
'server_store': ['tiddlywebplugins.gitstore', { 'store_root': 'store' }],
'static_url_dir': 'static',
'static_file_dir': ('tiddlywebplugins.bfw', 'assets'),
'wikitext.type_render_map': {
Expand Down

0 comments on commit 5f37ccf

Please sign in to comment.