From 0541833c1866a5fd946536b2ed584d47a57e7706 Mon Sep 17 00:00:00 2001 From: maxwell Date: Sun, 10 Oct 2010 11:54:08 -0700 Subject: [PATCH] stop the file include madness. using File.join and Rails.root for includes everywhere I could --- app/controllers/publics_controller.rb | 2 +- app/controllers/users_controller.rb | 7 ++++--- app/models/person.rb | 2 +- app/models/post.rb | 4 ++-- app/models/profile.rb | 2 +- app/models/request.rb | 5 +++-- app/models/user.rb | 8 ++++---- spec/controllers/dev_utilities_controller_spec.rb | 2 +- spec/lib/exporter_spec.rb | 2 +- spec/lib/hcard_spec.rb | 3 ++- spec/lib/ostatus_builder_spec.rb | 3 ++- spec/models/fb_status_spec.rb | 3 ++- 12 files changed, 24 insertions(+), 19 deletions(-) diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb index d2348a0d9..0e99d32ed 100644 --- a/app/controllers/publics_controller.rb +++ b/app/controllers/publics_controller.rb @@ -3,7 +3,7 @@ # the COPYRIGHT file. class PublicsController < ApplicationController - require File.expand_path('../../../lib/diaspora/parser', __FILE__) + require File.join(Rails.root, '/lib/diaspora/parser') include Diaspora::Parser layout false diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e5239129b..9ef461b20 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,9 +3,10 @@ # the COPYRIGHT file. class UsersController < ApplicationController - require File.expand_path('../../../lib/diaspora/ostatus_builder', __FILE__) - require File.expand_path('../../../lib/diaspora/exporter', __FILE__) - require File.expand_path('../../../lib/collect_user_photos', __FILE__) + require File.join(Rails.root, 'lib/diaspora/ostatus_builder') + require File.join(Rails.root, 'lib/diaspora/exporter') + require File.join(Rails.root, 'lib/collect_user_photos') + before_filter :authenticate_user!, :except => [:new, :create, :public] diff --git a/app/models/person.rb b/app/models/person.rb index 76bcd2aa3..62126c9a4 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -2,7 +2,7 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -require File.expand_path('../../../lib/hcard', __FILE__) +require File.join(Rails.root, 'lib/hcard') class Person include MongoMapper::Document diff --git a/app/models/post.rb b/app/models/post.rb index ca4a5a2c9..aa68dc897 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -3,8 +3,8 @@ # the COPYRIGHT file. class Post - require File.expand_path('../../../lib/encryptable', __FILE__) - require File.expand_path('../../../lib/diaspora/websocket', __FILE__) + require File.join(Rails.root, 'lib/encryptable') + require File.join(Rails.root, 'lib/diaspora/websocket') include MongoMapper::Document include ApplicationHelper include ROXML diff --git a/app/models/profile.rb b/app/models/profile.rb index 3bc9a18ac..ecc0fb5ef 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -4,7 +4,7 @@ class Profile include MongoMapper::EmbeddedDocument - require File.expand_path('../../../lib/diaspora/webhooks', __FILE__) + require File.join(Rails.root, 'lib/diaspora/webhooks') include Diaspora::Webhooks include ROXML diff --git a/app/models/request.rb b/app/models/request.rb index 6cf3d77ae..d57470745 100644 --- a/app/models/request.rb +++ b/app/models/request.rb @@ -2,8 +2,9 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -class Request - require File.expand_path('../../../lib/diaspora/webhooks', __FILE__) +class Request + require File.join(Rails.root, 'lib/diaspora/webhooks') + include MongoMapper::Document include Diaspora::Webhooks include ROXML diff --git a/app/models/user.rb b/app/models/user.rb index 108ab2d72..d1ead85cf 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2,10 +2,10 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -require File.expand_path('../../../lib/diaspora/user/friending', __FILE__) -require File.expand_path('../../../lib/diaspora/user/querying', __FILE__) -require File.expand_path('../../../lib/diaspora/user/receiving', __FILE__) -require File.expand_path('../../../lib/salmon/salmon', __FILE__) +require File.join(Rails.root, 'lib/diaspora/user/friending') +require File.join(Rails.root, 'lib/diaspora/user/querying') +require File.join(Rails.root, 'lib/diaspora/user/receiving') +require File.join(Rails.root, 'lib/salmon/salmon') class User include MongoMapper::Document diff --git a/spec/controllers/dev_utilities_controller_spec.rb b/spec/controllers/dev_utilities_controller_spec.rb index 128c754be..2cad39e3f 100644 --- a/spec/controllers/dev_utilities_controller_spec.rb +++ b/spec/controllers/dev_utilities_controller_spec.rb @@ -2,7 +2,7 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -require File.join(File.dirname(__FILE__), "..", "spec_helper") +require File.join(Rails.root, "spec", "spec_helper") describe DevUtilitiesController do render_views diff --git a/spec/lib/exporter_spec.rb b/spec/lib/exporter_spec.rb index aafb4b13c..fb3e6d29f 100644 --- a/spec/lib/exporter_spec.rb +++ b/spec/lib/exporter_spec.rb @@ -3,7 +3,7 @@ # the COPYRIGHT file. require 'spec_helper' -require File.dirname(__FILE__) + '/../../lib/diaspora/exporter' +require File.join(Rails.root, 'lib/diaspora/exporter') describe Diaspora::Exporter do diff --git a/spec/lib/hcard_spec.rb b/spec/lib/hcard_spec.rb index fc7bb8af5..1ac860539 100644 --- a/spec/lib/hcard_spec.rb +++ b/spec/lib/hcard_spec.rb @@ -3,7 +3,8 @@ # the COPYRIGHT file. require 'spec_helper' -require File.dirname(__FILE__) + '/../../lib/hcard' +require File.join(Rails.root, 'lib/hcard') + describe HCard do it 'should retreive and parse an hcard' do diff --git a/spec/lib/ostatus_builder_spec.rb b/spec/lib/ostatus_builder_spec.rb index 8e838a643..fd6131f6a 100644 --- a/spec/lib/ostatus_builder_spec.rb +++ b/spec/lib/ostatus_builder_spec.rb @@ -3,7 +3,8 @@ # the COPYRIGHT file. require 'spec_helper' -require File.dirname(__FILE__) + '/../../lib/diaspora/ostatus_builder' +require File.join(Rails.root, 'lib/diaspora/ostatus_builder') + describe Diaspora::OstatusBuilder do diff --git a/spec/models/fb_status_spec.rb b/spec/models/fb_status_spec.rb index a575a1873..7d46d9553 100644 --- a/spec/models/fb_status_spec.rb +++ b/spec/models/fb_status_spec.rb @@ -4,7 +4,8 @@ -require File.dirname(__FILE__) + '/../spec_helper' +require File.join(Rails.root,'spec/spec_helper') + describe FbStatus do