diff options
Diffstat (limited to 'persistence')
-rw-r--r-- | persistence/joke.py | 9 | ||||
-rw-r--r-- | persistence/jokebook.py | 8 | ||||
-rw-r--r-- | persistence/jokemachinestate.py | 6 |
3 files changed, 9 insertions, 14 deletions
diff --git a/persistence/joke.py b/persistence/joke.py index 8523593..0af66b8 100644 --- a/persistence/joke.py +++ b/persistence/joke.py @@ -67,14 +67,6 @@ class Joke(object): '''the country of the author''' def get(self): return self.__joker_country def set(self, value): self.__joker_country = value - - @PersistentProperty - def show(): - '''should this joke be visible to others''' - def default(self): return False - def get(self): return self.__show - def set(self, value): self.__show = value - def test_data(self): #self.image = 'resources/knockknock.png' @@ -86,7 +78,6 @@ Alex who?''' self.joker = 'hummingbird' self.joker_location = 'Cape Town' self.joker_country = 'South Africa' - self.show = True return self diff --git a/persistence/jokebook.py b/persistence/jokebook.py index acadf04..48c7297 100644 --- a/persistence/jokebook.py +++ b/persistence/jokebook.py @@ -73,8 +73,14 @@ class Jokebook(object): '''jokes submitted to this jokebook pending approval''' def default(self): return [] def get(self): return self.__submissions - + @PersistentProperty + def show(): + '''should this jokebook be visible to others''' + def default(self): return False + def get(self): return self.__show + def set(self, value): self.__show = value + # TODO - this should really be transparent @property def next_joke_id(self): diff --git a/persistence/jokemachinestate.py b/persistence/jokemachinestate.py index 3d591cf..ae5d303 100644 --- a/persistence/jokemachinestate.py +++ b/persistence/jokemachinestate.py @@ -40,24 +40,23 @@ class JokeMachineState(object): def default(self): return 1 # TODO - pull from activity/activity.info def get(self): return self.__version - @property def next_jokebook_id(self): if len(self.jokebooks) == 0: return 1 return max([jokebook.id for jokebook in self.jokebooks]) + 1 - def jokebook(self, id): + '''returns the jokebook specified by id''' for jokebook in self.jokebooks: if jokebook.id == id: return jokebook logging.error('Could not find jokebook with id %d' % d) return None + def test_data(self): self.id = 1 - # add some jokebooks with jokes num_jokebooks = 0 num_jokes = 2 @@ -77,6 +76,5 @@ class JokeMachineState(object): joke.id = joke_id jokebook.submissions.append(joke) self.jokebooks.append(jokebook) - return self
\ No newline at end of file |