From 154eb9753fd99a2f5fa082120da1b0ef2bac2b80 Mon Sep 17 00:00:00 2001 From: Mike Bloy Date: Sun, 9 Jan 2011 12:51:12 -0600 Subject: [PATCH] adding karma 'app' --- botweb/karma/__init__.py | 0 botweb/karma/models.py | 33 +++++++++++++++++++++++++++++++++ botweb/karma/tests.py | 23 +++++++++++++++++++++++ botweb/karma/views.py | 1 + botweb/settings.py | 4 ++-- botweb/urls.py | 6 +++++- 6 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 botweb/karma/__init__.py create mode 100644 botweb/karma/models.py create mode 100644 botweb/karma/tests.py create mode 100644 botweb/karma/views.py diff --git a/botweb/karma/__init__.py b/botweb/karma/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/botweb/karma/models.py b/botweb/karma/models.py new file mode 100644 index 0000000..c0788d4 --- /dev/null +++ b/botweb/karma/models.py @@ -0,0 +1,33 @@ +from django.db import models + +class LogEntry(models.Model): + id = models.IntegerField(primary_key=True) + key = models.CharField(max_length=255) + delta = models.IntegerField(choices=((1, u'++'), (-1, u'--'))) + who = models.CharField(max_length=30) + userhost = models.CharField(max_length=512) + timestamp = models.DateTimeField(db_column='karmatime') + + class Meta: + db_table = 'karma_log' + ordering = ['timestamp'] + managed = False + +class User(models.Model): + who = models.CharField(max_length=30, primary_key=True) + pos = models.IntegerField() + neg = models.IntegerField() + + class Meta: + db_table = 'karma_users' + ordering = ['who'] + managed = False + +class Value(models.Model): + key = models.CharField(max_length=255, primary_key=True) + value = models.IntegerField() + + class Meta: + db_table = 'karma_values' + ordering = ['value'] + managed = False diff --git a/botweb/karma/tests.py b/botweb/karma/tests.py new file mode 100644 index 0000000..2247054 --- /dev/null +++ b/botweb/karma/tests.py @@ -0,0 +1,23 @@ +""" +This file demonstrates two different styles of tests (one doctest and one +unittest). These will both pass when you run "manage.py test". + +Replace these with more appropriate tests for your application. +""" + +from django.test import TestCase + +class SimpleTest(TestCase): + def test_basic_addition(self): + """ + Tests that 1 + 1 always equals 2. + """ + self.failUnlessEqual(1 + 1, 2) + +__test__ = {"doctest": """ +Another way to test that 1 + 1 is equal to 2. + +>>> 1 + 1 == 2 +True +"""} + diff --git a/botweb/karma/views.py b/botweb/karma/views.py new file mode 100644 index 0000000..60f00ef --- /dev/null +++ b/botweb/karma/views.py @@ -0,0 +1 @@ +# Create your views here. diff --git a/botweb/settings.py b/botweb/settings.py index 5f7661c..cbdd876 100644 --- a/botweb/settings.py +++ b/botweb/settings.py @@ -6,7 +6,7 @@ DEBUG = True TEMPLATE_DEBUG = DEBUG ADMINS = ( - # ('Your Name', 'your_email@domain.com'), + ('Mike Bloy', 'mike@bloy.org'), ) MANAGERS = ADMINS @@ -96,7 +96,7 @@ INSTALLED_APPS = ( #'django.contrib.sites', #'django.contrib.messages', # Uncomment the next line to enable the admin: - # 'django.contrib.admin', + #'django.contrib.admin', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', 'karma', diff --git a/botweb/urls.py b/botweb/urls.py index 91a9b96..aa9ad1b 100644 --- a/botweb/urls.py +++ b/botweb/urls.py @@ -4,7 +4,11 @@ from django.conf.urls.defaults import * # from django.contrib import admin # admin.autodiscover() -urlpatterns = patterns('', +urlpatterns = patterns( + '', + (r'^karma/$', 'karma.views.index'), + (r'^karma/givers/$', 'karma.views.givers'), + (r'^karma/stats/$', 'karma.views.stats'), # Example: # (r'^botweb/', include('botweb.foo.urls')),