Refactored the achievement schema, un-nesting definitions and bringing the query operator into force.

app/schemas/models/achievement.coffee

@@ -2,8 +2,7 @@ c = require './../schemas'
 
 # TODO add these: http://docs.mongodb.org/manual/reference/operator/query/
 MongoQueryOperatorSchema =
-  title: 'MongoDB Query operator'
+  title: 'Query Operator'
-  id: 'mongoQueryOperator'
   type: 'object'
   properties:
     '$gt': type: 'number'
@@ -13,26 +12,23 @@ MongoQueryOperatorSchema =
     '$lte': type: 'number'
     '$ne': type: ['number', 'string']
     '$nin': type: 'array'
-  additionalProperties: true # TODO set to false when the schema's done
+    '$exists': type: 'boolean'
+  additionalProperties: false
 
 MongoFindQuerySchema =
-  title: 'MongoDB Query'
+  title: 'Query'
-  id: 'mongoFindQuery'
   type: 'object'
   patternProperties:
-    #'^[-a-zA-Z0-9_]*$':
+    '^[-a-zA-Z0-9.]*$':
-    '^[-a-zA-Z0-9\.]*$':
+      anyOf: [
-      oneOf: [
+        {$ref: '#/definitions/mongoQueryOperator'},
-        #{$ref: '#/definitions/' + MongoQueryOperatorSchema.id},
         {type: 'string'}
         {type: 'object'}
         {type: 'boolean'}
       ]
-  additionalProperties: true # TODO make Treema accept new pattern matched keys
+  additionalProperties: false
   definitions: {}
 
-MongoFindQuerySchema.definitions[MongoQueryOperatorSchema.id] = MongoQueryOperatorSchema
-
 AchievementSchema = c.object()
 c.extendNamedProperties AchievementSchema
 c.extendBasicProperties AchievementSchema, 'achievement'
@@ -48,7 +44,7 @@ AchievementSchema.default =
 _.extend AchievementSchema.properties,
   query:
     #type:'object'
-    $ref: '#/definitions/' + MongoFindQuerySchema.id
+    $ref: '#/definitions/mongoFindQuery'
   worth: c.float
   collection: {type: 'string'}
   description: c.shortString()
@@ -93,6 +89,7 @@ _.extend AchievementSchema, # Let's have these on the bottom
   additionalProperties: false
 
 AchievementSchema.definitions = {}
-AchievementSchema.definitions[MongoFindQuerySchema.id] = MongoFindQuerySchema
+AchievementSchema.definitions['mongoQueryOperator'] = MongoQueryOperatorSchema
+AchievementSchema.definitions['mongoFindQuery'] = MongoFindQuerySchema
 
 module.exports = AchievementSchema