merge

README

@@ -1,30 +1,13 @@
-bronenate
+Some things that need doing:
 
+Rename relations:
+  post.person needs to be post.owner
+  group.people might want to be group.members
+  person.owner should probably be person.user
 
+Refactor receive:
+  user.receive is a little horrifying right now.
+  Maybe make a model.import or model.perform function which can be called on all the classes.
+  Definitely move the varied signature verification methods into a unified object.signature_valid?
+    or signatures_valid?
 
-max's airplane notes:
-
-refractor possibility:
-
-/receive should be part of the pubsubhubbub multiplexed endpoint... posts should contain some of the information in the params as they "publish". currently, we receieve a post of xml in a very genearic :xml params.  the poster could supply more of this known information to make parsing much less complex, rather than inferring information from the parser.
-
-the pubsub, public convention 
-
-(this is for a client)
-to a single, arbitrary multiplexed endpoint (PUBSUBHUBBUB spec)
-params['hub.mode'] = "subscribe" = subscription request (could be interpreted as a friend req)
-params['hub.mode'] = "unsubscribe" = unsubscribe request= could be interpreted as a unfriend. sends to user
-params['hub.mode'] = "" = this is an update from something you are subscribed to
-
-possible diaspora additions:
-
-params['seed.friend'] (or do we want to upgrade subscriptions if they contain a valid public key...?)
-params['seed.unfriend']
-
-params['hub.mode'] = update = this is an update of a current type. sends to store_posts_from_xml (this is overkill i think)
-
-
-params['seed.content_type'] = could be the data-type of the collection or message, could help to parse
-(could be in a format where it is "twitter:activitystream-update:status_message"), where the first is the most specific to the most generic to help with inference.
-
-params['seed.fingerprint'] = the key fingerprint of the friend sending the request.  could be a connivence, (or perhaps the signature) so the user can verify the post without having to invoke the parser. 

app/models/user.rb

@@ -22,6 +22,7 @@ class User
 
   ######## Making things work ########
   key :email, String
+<<<<<<< HEAD
   #validates_true_for :email, :logic => lambda {self.pivotal_email?} 
 
   
@@ -32,6 +33,9 @@ class User
   def pivotal_or_diaspora_only
     raise "pivotal only" unless allowed_email?
   end
+=======
+  ensure_index :email
+>>>>>>> bded53d51b1ca40e1c5c8f23fb28234849e14f78
 
   def method_missing(method, *args)
     self.person.send(method, *args)