lib/picky.rb in picky-4.0.0pre1 vs lib/picky.rb in picky-4.0.0pre2

@@ -1,30 +1,32 @@
 module Picky
 
   # External libraries.
   #
-  require 'active_support/core_ext'
-  require 'text'
-  require 'yajl' # THINK Maybe replace by multi_json?
-  require 'rack' # TODO Remove.
-  require 'rack_fast_escape' # TODO Remove.
+  require 'active_support/core_ext/module/delegation'
+  require 'active_support/core_ext/logger'
+  require 'active_support/core_ext/object/blank'
+  require 'active_support/core_ext/enumerable'
+  require 'active_support/multibyte'
+  require 'yajl'
   require 'procrastinate'
+  require 'rack_fast_escape' if defined? Rack
 
   # Require the constants.
   #
-  require ::File.expand_path '../picky/constants', __FILE__
+  require_relative 'picky/constants'
 
   # Loader which handles framework and app loading.
   #
-  require ::File.expand_path '../picky/loader', __FILE__
+  require_relative 'picky/loader'
 
   # Load the framework
   #
   Loader.load_framework
 
   # Check if delegators need to be installed.
   #
-  require ::File.expand_path '../picky/sinatra', __FILE__
+  require_relative 'picky/sinatra'
 
   # This is only used in the classic project style.
   #
   class << self
     attr_accessor :logger
\ No newline at end of file