Revert "Defining an author method on feed in an attempt to not get ni…

…l and fix issue hotsh#421"

This reverts commit 7631d9e.

Gemfile.lock

@@ -132,7 +132,7 @@ GEM
     faraday (0.7.4)
       addressable (~> 2.2.6)
       multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
+      rack (< 2, >= 1.1.0)
     faraday_middleware (0.7.0)
       faraday (~> 0.7.3)
     ffi (1.0.9)
@@ -174,7 +174,7 @@ GEM
     nokogiri (1.5.0)
     oauth (0.4.5)
     oauth2 (0.5.0)
-      faraday (>= 0.6.1, < 0.8)
+      faraday (< 0.8, >= 0.6.1)
       multi_json (~> 1.0.0)
     opub (0.0.1)
     ostatus (0.0.10)
@@ -255,7 +255,7 @@ GEM
     simplecov-html (0.4.5)
     sinatra (1.2.6)
       rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
+      tilt (< 2.0, >= 1.2.2)
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -282,7 +282,7 @@ GEM
       raindrops (~> 0.6)
     vcr (1.10.3)
     webmock (1.6.4)
-      addressable (~> 2.2, > 2.2.5)
+      addressable (> 2.2.5, ~> 2.2)
       crack (>= 0.1.7)
     whenever (0.6.8)
       aaronh-chronic (>= 0.3.9)

README.md

@@ -10,19 +10,11 @@
 rstat.us is a microblogging site built on top of the [ostatus
 protocol](http://status.net/wiki/OStatus).
 
-(reason for existing)
-
 [![Build Status](https://secure.travis-ci.org/hotsh/rstat.us.png)](http://travis-ci.org/hotsh/rstat.us)
 
 Helping out with rstat.us
 -------------------------
 
-We would love your help!
-- For questions, join the mailing list or IRC
-- Issue filing instructions
-- Documentation addition instructions
-- How to get started
-
 If you'd like to contribute, here are some details:
 
 - The stack: ruby/rails 3.1/mongodb
@@ -32,14 +24,15 @@ If you'd like to contribute, here are some details:
 - We follow [GitHub flow][flow], as a workflow. Basically:
   - Please fork the project and make a pull request
     - Pull requests will not be merged without tests/documentation
-      - We use [minitest][minitest]/[capybara][capybara] for tests
+      - We use [minitest][minitest]/[capybara][capy] for tests
       - We use [docco][docco] (rocco) for documentation
+      - If you think it doesn't need a test, make your case, I'm just saying.
 
 [code]: http://github.com/hotsh/rstat.us
 [docs]: http://hotsh.github.com/rstat.us/
 [issues]: http://github.com/hotsh/rstat.us/issues
 [minitest]: https://github.com/seattlerb/minitest
-[capybara]: https://github.com/jnicklas/capybara
+[capy]: https://github.com/jnicklas/capybara
 [docco]: https://github.com/jashkenas/docco
 [flow]: http://scottchacon.com/2011/08/31/github-flow.html
 
@@ -50,8 +43,8 @@ We have documentation that explains all of our source code, using rocco.
 You can view it [here](http://hotsh.github.com/rstat.us/rstatus.html).
 
 
-Setting up a development environment
-------------------------------------
+Setting up a dev environment
+----------------------------
 
 First off: you will need MongoDB (www.mongodb.org).  They have a [quickstart
 guide][mongo-quickstart] for getting it installed and running.
@@ -69,16 +62,22 @@ And start the server:
 
     $ rails server
 
-Bam! Visit <http://localhost:3000/> in your browser, and you should see your development version of rstat.us!
+Bam! Visit <http://localhost:9292/> in your browser, and you'll be good.
+
+To run the tests you may want to make use of `bundle exec` so you don't get
+mixed up with different versions of gems that might or might not work with
+the current rstat.us branch.
 
-To run the tests:
+Run the tests:
 
-    $ bundle exec rake test
+    $ bundle exec rake test:all
 
 [mongo-quickstart]: http://www.mongodb.org/display/DOCS/Quickstart
 
 Running your own node
 ---------------------
 
-We're working on making this super easy, but right now we're not quite there.
+If you need help with this, then you're not ready to run one. We're working
+on making this super easy, but right now, we're not quite there.
 
+If you do run your own node, please keep current with upstream.

app/models/feed.rb

@@ -32,12 +32,6 @@ class Feed
 
   after_create :default_hubs
 
-  # This is because sometimes the mongomapper association returns nil
-  # even though there is an author_id and the Author exists; see Issue #421
-  def author
-    Author.find(author_id)
-  end
-
   def populate(xrd = nil)
     # TODO: More entropy would be nice
     self.verify_token = Digest::MD5.hexdigest(rand.to_s)