use require_relative instead of require

Joel AZEMAR committed Apr 01, 2014
commit 776d9b67abb7c1a718916d2a535c362f0bcade66
Showing 7 changed files with 43 additions and 39 deletions
Rakefile +1 -1
@@ @@ -9,7 +9,7 @@ require 'rspec/core/rake_task'
require_relative 'lib/steam'
RSpec::Core::RakeTask.new('spec:integration') do |spec|
- spec.pattern = 'spec/integration/**/*_spec.rb'
+ spec.pattern = 'spec/**/*_spec.rb'
end
task spec: ['spec:integration']
locomotive/steam/liquid.rb b/lib/locomotive/steam/liquid.rb +5 -4
@@ @@ -1,9 +1,10 @@
require 'solid'
require 'locomotive/mounter'
- require 'locomotive/steam/liquid/scopeable'
- require 'locomotive/steam/liquid/drops/base'
- require 'locomotive/steam/liquid/tags/hybrid'
- require 'locomotive/steam/liquid/tags/path_helper'
+
+ require_relative 'liquid/scopeable'
+ require_relative 'liquid/drops/base'
+ require_relative 'liquid/tags/hybrid'
+ require_relative 'liquid/tags/path_helper'
%w{. drops tags filters}.each do |dir|
Dir[File.join(File.dirname(__FILE__), 'liquid', dir, '*.rb')].each { |lib| require lib }
locomotive/steam/liquid/tags/editable.rb b/lib/locomotive/steam/liquid/tags/editable.rb +6 -6
@@ @@ -1,6 +1,6 @@
- require 'locomotive/steam/liquid/tags/editable/base'
- require 'locomotive/steam/liquid/tags/editable/text'
- require 'locomotive/steam/liquid/tags/editable/short_text'
- require 'locomotive/steam/liquid/tags/editable/long_text'
- require 'locomotive/steam/liquid/tags/editable/file'
- require 'locomotive/steam/liquid/tags/editable/control'
\ No newline at end of file
+ require_relative 'editable/base'
+ require_relative 'editable/text'
+ require_relative 'editable/short_text'
+ require_relative 'editable/long_text'
+ require_relative 'editable/file'
+ require_relative 'editable/control'
\ No newline at end of file
locomotive/steam/misc.rb b/lib/locomotive/steam/misc.rb +9 -9
@@ @@ -1,9 +1,9 @@
- require 'locomotive/steam/misc/core_ext.rb'
- require 'locomotive/steam/misc/will_paginate.rb'
- require 'locomotive/steam/misc/httparty.rb'
- require 'locomotive/steam/misc/dragonfly.rb'
- require 'locomotive/steam/misc/i18n.rb'
- require 'locomotive/steam/misc/mounter.rb'
- require 'locomotive/steam/misc/markdown.rb'
- require 'locomotive/steam/misc/haml.rb'
- require 'locomotive/steam/misc/better_errors.rb'
\ No newline at end of file
+ require_relative 'misc/core_ext.rb'
+ require_relative 'misc/will_paginate.rb'
+ require_relative 'misc/httparty.rb'
+ require_relative 'misc/dragonfly.rb'
+ require_relative 'misc/i18n.rb'
+ require_relative 'misc/mounter.rb'
+ require_relative 'misc/markdown.rb'
+ require_relative 'misc/haml.rb'
+ require_relative 'misc/better_errors.rb'
\ No newline at end of file
locomotive/steam/server.rb b/lib/locomotive/steam/server.rb +15 -15
@@ @@ -1,21 +1,21 @@
require 'better_errors'
require 'coffee_script'
- require 'locomotive/steam/listen'
- require 'locomotive/steam/server/middleware'
- require 'locomotive/steam/server/favicon'
- require 'locomotive/steam/server/dynamic_assets'
- require 'locomotive/steam/server/logging'
- require 'locomotive/steam/server/entry_submission'
- require 'locomotive/steam/server/path'
- require 'locomotive/steam/server/locale'
- require 'locomotive/steam/server/page'
- require 'locomotive/steam/server/timezone'
- require 'locomotive/steam/server/templatized_page'
- require 'locomotive/steam/server/renderer'
-
- require 'locomotive/steam/liquid'
- require 'locomotive/steam/misc'
+ require_relative 'listen'
+ require_relative 'server/middleware'
+ require_relative 'server/favicon'
+ require_relative 'server/dynamic_assets'
+ require_relative 'server/logging'
+ require_relative 'server/entry_submission'
+ require_relative 'server/path'
+ require_relative 'server/locale'
+ require_relative 'server/page'
+ require_relative 'server/timezone'
+ require_relative 'server/templatized_page'
+ require_relative 'server/renderer'
+
+ require_relative 'liquid'
+ require_relative 'misc'
module Locomotive::Steam
class Server
locomotive/steam/standalone_server.rb b/lib/locomotive/steam/standalone_server.rb +5 -4
@@ @@ -1,9 +1,10 @@
$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../..'))
- require 'locomotive/steam/logger'
- require 'locomotive/steam/version'
- require 'locomotive/steam/exceptions'
- require 'locomotive/steam/server'
+ require_relative 'logger'
+ require_relative 'version'
+ require_relative 'exceptions'
+ require_relative 'server'
+
require 'locomotive/mounter'
module Locomotive
spec/spec_helper.rb +2 -0
@@ @@ -3,6 +3,8 @@ require_relative '../lib/steam'
require 'rubygems'
require 'bundler/setup'
+ require 'i18n-spec'
+
require_relative 'support'
RSpec.configure do |c|