diaspora module correctly loads everything (lazy)

app/controllers/publics_controller.rb

@@ -1,6 +1,6 @@
 class PublicsController < ApplicationController
-  require 'lib/diaspora/diaspora_parser'
+  require 'lib/diaspora/parser'
-  include Diaspora::DiasporaParser
+  include Diaspora::Parser
   include Diaspora::OStatusParser
   
   def hcard

lib/diaspora.rb

@@ -0,0 +1,9 @@
+module Diaspora
+
+  autoload :Parser
+  autoload :Webhooks
+
+  autoload :OStatusParser
+  autoload :OStatusGenerator
+
+end

lib/diaspora/common.rb

@@ -1,3 +0,0 @@
-module Diaspora
-  
-end

lib/diaspora/ostatus_generator.rb

@@ -1,5 +1,5 @@
 module Diaspora
-  module OStatus
+  module OStatusGenerator
     def self.generate(opts= {})
       xml = Generate::headers(opts[:current_url])
       xml << Generate::author
@@ -67,4 +67,4 @@ module Diaspora
       end
     end
   end
-end
+end

lib/diaspora/parser.rb

@@ -1,5 +1,5 @@
 module Diaspora
-  module DiasporaParser
+  module Parser
     def parse_owner_from_xml(xml)
       doc = Nokogiri::XML(xml) { |cfg| cfg.noblanks }
       email = doc.xpath("//person/email").text.to_s

spec/lib/diaspora_ostatus_generator_spec.rb

@@ -2,17 +2,17 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 require 'lib/diaspora/ostatus_generator'
 
-describe Diaspora::OStatus do
+describe Diaspora::OStatusGenerator do
   before do
     @user = Factory.create(:user) 
-    Diaspora::OStatus::OWNER = @user
+    Diaspora::OStatusGenerator::OWNER = @user
   end
 
-  describe Diaspora::OStatus::Generate do
+  describe Diaspora::OStatusGenerator::Generate do
 
     describe "header" do
       it 'should generate an OStatus compliant header' do
-        Diaspora::OStatus::Generate::headers(:current_url => @user.url).should include @user.url
+        Diaspora::OStatusGenerator::Generate::headers(:current_url => @user.url).should include @user.url
       end
     end
 
@@ -22,7 +22,7 @@ describe Diaspora::OStatus do
       end
 
       it "should encode to activity stream xml" do
-        sm_entry = Diaspora::OStatus::generate(:objects => @status_message, :current_url => "http://diaspora.com/")
+        sm_entry = Diaspora::OStatusGenerator::generate(:objects => @status_message, :current_url => "http://diaspora.com/")
         sm_entry.should include(@status_message.message)
         sm_entry.should include('title')
       end

spec/lib/diaspora_parser_spec.rb

@@ -1,9 +1,9 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 include ApplicationHelper 
-include Diaspora::DiasporaParser
+include Diaspora::Parser
 
-describe Diaspora::DiasporaParser do
+describe Diaspora::Parser do
   before do
     @user = Factory.create(:user, :email => "bob@aol.com")
     @person = Factory.create(:person, :email => "bill@gates.com")

spec/user_encryption_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 include ApplicationHelper
-include Diaspora::DiasporaParser
+include Diaspora::Parser
 
 describe 'user encryption' do
   before :all do