1
=== modified file 'README'
2
--- README	2010-11-24 20:06:32 +0000
3
+++ README	2010-11-30 03:36:06 +0000
4
@@ -21,6 +21,15 @@
5
21
To create an event:
21
To create an event:
6
22
22
7
23
  curl -H 'Content-Type:application/json' -X POST -d '{"origin": "test origin", "interpretation": "test interpretation", "manifestation": "test manifestation", "actor": "test actor", "subject": {"interpretation": "test interpretation subject", "manifestation": "test manifestation subject", "origin": "test origin subject", "mimetype": "test mimetype", "text": "more testing"}}' http://localhost:8000/log/event
23
  curl -H 'Content-Type:application/json' -X POST -d '{"origin": "test origin", "interpretation": "test interpretation", "manifestation": "test manifestation", "actor": "test actor", "subject": {"interpretation": "test interpretation subject", "manifestation": "test manifestation subject", "origin": "test origin subject", "mimetype": "test mimetype", "text": "more testing"}}' http://localhost:8000/log/event
8
24
        'title', 
9
25
        'artist', 
10
26
        'album', 
11
27
        'year', 
12
28
        'comment', 
13
29
        'track', 
14
30
        'genre', 
15
31
  curl -H 'Content-Type:application/json' -X POST -d '{"title": "test title", "artist": "test artist", "album": "test album", "year": 2010, "comment": "test comment", "track": 1, "genre": "test genre", "event": {"origin": "test origin", "interpretation": "test interpretation", "manifestation": "test manifestation", "actor": "test actor", "subject": {"interpretation": "test interpretation subject", "manifestation": "test manifestation subject", "origin": "test origin subject", "mimetype": "test mimetype", "text": "more testing"}}}' http://localhost:8000/music/
16
32
17
24
33
18
25
To query an event:
34
To query an event:
19
26
35
20
27
36
21
=== modified file 'logger/handlers.py'
22
--- logger/handlers.py	2010-10-21 05:38:06 +0000
23
+++ logger/handlers.py	2010-11-30 03:36:06 +0000
24
@@ -31,7 +31,7 @@
25
31
31
26
32
    def read(self, request):
32
    def read(self, request):
27
33
        """
33
        """
29
34
        Query events.
34
        Query existing events by pass
30
35
        """
35
        """
31
36
        operations = ('gt', 'lt')   # Supported operations
36
        operations = ('gt', 'lt')   # Supported operations
32
37
        operation_re = re.compile('^(?P<field>[a-z]+)_(?P<operation>[a-z]{2})$')
37
        operation_re = re.compile('^(?P<field>[a-z]+)_(?P<operation>[a-z]{2})$')
33
@@ -68,3 +68,32 @@
34
68
        query = Event.objects.filter(**data)
68
        query = Event.objects.filter(**data)
35
69
69
36
70
        return query
70
        return query
37
71
38
72
    @staticmethod
39
73
    def resource_uri():
40
74
        return ('api_event_handler', fields)
41
75
42
76
doc = generate_doc(EventHandler)
43
77
44
78
print doc.name
45
79
print dir(doc)
46
80
47
81
#methods = doc.get_methods()
48
82
49
83
#for method in methods:
50
84
    #print method.name
51
85
    #print method.signature
52
86
53
87
    #sig = ''
54
88
55
89
    #for argn, argdef in method.iter_args():
56
90
        #sig += argn
57
91
58
92
        #if argdef:
59
93
            #sig += '=%s' % argdef
60
94
61
95
        #sig += ', '
62
96
63
97
    #sig = sig.rstrip(',')
64
98
65
99
    #print sig
66
71
100
67
=== added file 'music/admin.py'
68
--- music/admin.py	1970-01-01 00:00:00 +0000
69
+++ music/admin.py	2010-11-30 03:36:06 +0000
70
@@ -0,0 +1,5 @@
71
1
from affinity.music.models import Music
72
2
from django.contrib import admin
73
3
74
4
admin.site.register(Music)
75
5
76
0
6
77
=== added file 'music/handlers.py'
78
--- music/handlers.py	1970-01-01 00:00:00 +0000
79
+++ music/handlers.py	2010-11-30 03:36:06 +0000
80
@@ -0,0 +1,59 @@
81
1
import datetime
82
2
import re
83
3
84
4
from piston.doc import generate_doc
85
5
from piston.handler import BaseHandler
86
6
from piston.utils import rc, validate
87
7
88
8
from affinity.logger.models import *
89
9
from affinity.music.models import *
90
10
91
11
class MusicHandler(BaseHandler):
92
12
    """
93
13
    API endpoint for Music.
94
14
    """
95
15
    allowed_methods = ('POST','GET')
96
16
    fields = (
97
17
        'title', 
98
18
        'artist', 
99
19
        'album', 
100
20
        'year', 
101
21
        'comment', 
102
22
        'track', 
103
23
        'genre', 
104
24
105
25
        ('event', (
106
26
            'timestamp', 
107
27
            'origin', 
108
28
            'interpretation', 
109
29
            'manifestation', 
110
30
            'actor', 
111
31
112
32
            ('subject', (
113
33
                'interpretation', 
114
34
                'manifestation', 
115
35
                'origin', 
116
36
                'mimetype', 
117
37
                'text')))))
118
38
119
39
    def create(self, request):
120
40
        """
121
41
        Create a new music record.
122
42
        """
123
43
        data = request.data
124
44
125
45
        data['event']['subject'] = Subject(**data['event']['subject'])
126
46
        data['event']['subject'].save()
127
47
128
48
        data['event'] = Event(**data['event'])
129
49
        data['event'].save()
130
50
131
51
        music = Music(**data)
132
52
        music.save()
133
53
134
54
        return rc.CREATED
135
55
136
56
    @staticmethod
137
57
    def resource_uri():
138
58
        return ('api_event_handler', fields)
139
59
140
0
60
141
=== modified file 'music/urls.py'
142
--- music/urls.py	2010-11-28 20:49:35 +0000
143
+++ music/urls.py	2010-11-30 03:36:06 +0000
144
@@ -1,8 +1,9 @@
145
1
from django.conf.urls.defaults import *
1
from django.conf.urls.defaults import *
146
2
from piston.resource import Resource
2
from piston.resource import Resource
147
3
3
148
4
from affinity.music.handlers import *
149
5
150
4
urlpatterns = patterns('affinity.music.views',
6
urlpatterns = patterns('affinity.music.views',
151
5
    # Example:
7
    # Example:
154
6
    (r'^$', 'index'),
8
    (r'^$', Resource(MusicHandler)),
153
7
    #(r'^music$', Resource(EventHandler)),
155
8
)
9
)
156
9
10
157
=== modified file 'settings.py'
158
--- settings.py	2010-11-28 20:49:35 +0000
159
+++ settings.py	2010-11-30 03:36:06 +0000
160
@@ -14,7 +14,7 @@
161
14
        'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
14
        'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
162
15
        'NAME': 'affinity',                      # Or path to database file if using sqlite3.
15
        'NAME': 'affinity',                      # Or path to database file if using sqlite3.
163
16
        'USER': 'root',                      # Not used with sqlite3.
16
        'USER': 'root',                      # Not used with sqlite3.
165
17
        'PASSWORD': 'root',                  # Not used with sqlite3.
17
        'PASSWORD': '',                  # Not used with sqlite3.
166
18
        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
18
        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
167
19
        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
19
        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
168
20
    }
20
    }
Status:	Merged
Merged at revision:	11
Proposed branch:	lp:~jamalta/zeitgeist-affinity/music-handler
Merge into:	lp:zeitgeist-affinity
Diff against target:	168 lines (+107/-4) 6 files modified README (+9/-0) logger/handlers.py (+30/-1) music/admin.py (+5/-0) music/handlers.py (+59/-0) music/urls.py (+3/-2) settings.py (+1/-1)
To merge this branch:	bzr merge lp:~jamalta/zeitgeist-affinity/music-handler
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Manish Sinha (मनीष सिन्हा)		2010-11-30	Approve on 2010-11-30
Review via email: mp+42201@code.launchpad.net