nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stop the file include madness. using File.join and Rails.root for includes everywhere I could

Browse source
This commit is contained in:
maxwell 2010-10-10 11:54:08 -07:00
parent b313272ff3
commit 0541833c18
12 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/publics_controller.rb
View file

@ -3,7 +3,7 @@
# the COPYRIGHT file. # the COPYRIGHT file.
class PublicsController < ApplicationController class PublicsController < ApplicationController
require File.expand_path('../../../lib/diaspora/parser', __FILE__) require File.join(Rails.root, '/lib/diaspora/parser')
include Diaspora::Parser include Diaspora::Parser
layout false layout false

7
app/controllers/users_controller.rb
View file

@ -3,9 +3,10 @@
# the COPYRIGHT file. # the COPYRIGHT file.
class UsersController < ApplicationController class UsersController < ApplicationController
require File.expand_path('../../../lib/diaspora/ostatus_builder', __FILE__) require File.join(Rails.root, 'lib/diaspora/ostatus_builder')
require File.expand_path('../../../lib/diaspora/exporter', __FILE__) require File.join(Rails.root, 'lib/diaspora/exporter')
require File.expand_path('../../../lib/collect_user_photos', __FILE__) require File.join(Rails.root, 'lib/collect_user_photos')
before_filter :authenticate_user!, :except => [:new, :create, :public] before_filter :authenticate_user!, :except => [:new, :create, :public]

2
app/models/person.rb
View file

@ -2,7 +2,7 @@
# licensed under the Affero General Public License version 3 or later. See # licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file. # the COPYRIGHT file.
require File.expand_path('../../../lib/hcard', __FILE__) require File.join(Rails.root, 'lib/hcard')
class Person class Person
include MongoMapper::Document include MongoMapper::Document

4
app/models/post.rb
View file

@ -3,8 +3,8 @@
# the COPYRIGHT file. # the COPYRIGHT file.
class Post class Post
require File.expand_path('../../../lib/encryptable', __FILE__) require File.join(Rails.root, 'lib/encryptable')
require File.expand_path('../../../lib/diaspora/websocket', __FILE__) require File.join(Rails.root, 'lib/diaspora/websocket')
include MongoMapper::Document include MongoMapper::Document
include ApplicationHelper include ApplicationHelper
include ROXML include ROXML

2
app/models/profile.rb
View file

@ -4,7 +4,7 @@
class Profile class Profile
include MongoMapper::EmbeddedDocument include MongoMapper::EmbeddedDocument
require File.expand_path('../../../lib/diaspora/webhooks', __FILE__) require File.join(Rails.root, 'lib/diaspora/webhooks')
include Diaspora::Webhooks include Diaspora::Webhooks
include ROXML include ROXML

3
app/models/request.rb
View file

@ -3,7 +3,8 @@
# the COPYRIGHT file. # the COPYRIGHT file.
class Request class Request
require File.expand_path('../../../lib/diaspora/webhooks', __FILE__) require File.join(Rails.root, 'lib/diaspora/webhooks')
include MongoMapper::Document include MongoMapper::Document
include Diaspora::Webhooks include Diaspora::Webhooks
include ROXML include ROXML

8
app/models/user.rb
View file

@ -2,10 +2,10 @@
# licensed under the Affero General Public License version 3 or later. See # licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file. # the COPYRIGHT file.
require File.expand_path('../../../lib/diaspora/user/friending', __FILE__) require File.join(Rails.root, 'lib/diaspora/user/friending')
require File.expand_path('../../../lib/diaspora/user/querying', __FILE__) require File.join(Rails.root, 'lib/diaspora/user/querying')
require File.expand_path('../../../lib/diaspora/user/receiving', __FILE__) require File.join(Rails.root, 'lib/diaspora/user/receiving')
require File.expand_path('../../../lib/salmon/salmon', __FILE__) require File.join(Rails.root, 'lib/salmon/salmon')
class User class User
include MongoMapper::Document include MongoMapper::Document

2
spec/controllers/dev_utilities_controller_spec.rb
View file

@ -2,7 +2,7 @@
# licensed under the Affero General Public License version 3 or later. See # licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file. # the COPYRIGHT file.
require File.join(File.dirname(__FILE__), "..", "spec_helper") require File.join(Rails.root, "spec", "spec_helper")
describe DevUtilitiesController do describe DevUtilitiesController do
render_views render_views

2
spec/lib/exporter_spec.rb
View file

@ -3,7 +3,7 @@
# the COPYRIGHT file. # the COPYRIGHT file.
require 'spec_helper' require 'spec_helper'
require File.dirname(__FILE__) + '/../../lib/diaspora/exporter' require File.join(Rails.root, 'lib/diaspora/exporter')
describe Diaspora::Exporter do describe Diaspora::Exporter do

3
spec/lib/hcard_spec.rb
View file

@ -3,7 +3,8 @@
# the COPYRIGHT file. # the COPYRIGHT file.
require 'spec_helper' require 'spec_helper'
require File.dirname(__FILE__) + '/../../lib/hcard' require File.join(Rails.root, 'lib/hcard')
describe HCard do describe HCard do
it 'should retreive and parse an hcard' do it 'should retreive and parse an hcard' do

3
spec/lib/ostatus_builder_spec.rb
View file

@ -3,7 +3,8 @@
# the COPYRIGHT file. # the COPYRIGHT file.
require 'spec_helper' require 'spec_helper'
require File.dirname(__FILE__) + '/../../lib/diaspora/ostatus_builder' require File.join(Rails.root, 'lib/diaspora/ostatus_builder')
describe Diaspora::OstatusBuilder do describe Diaspora::OstatusBuilder do

3
spec/models/fb_status_spec.rb
View file

@ -4,7 +4,8 @@
require File.dirname(__FILE__) + '/../spec_helper' require File.join(Rails.root,'spec/spec_helper')
describe FbStatus do describe FbStatus do