@@ -4,12 +4,16 @@ require 'rubygems' require 'set' require 'fileutils' require 'socket' +require 'pathname' +require "merb-extlib" -$LOAD_PATH.unshift File.dirname(__FILE__) unless - $LOAD_PATH.include?(File.dirname(__FILE__)) || - $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__))) +__DIR__ = File.dirname(__FILE__) -require 'merb-core/vendor/facets' +$LOAD_PATH.unshift __DIR__ unless + $LOAD_PATH.include?(__DIR__) || + $LOAD_PATH.include?(File.expand_path(__DIR__)) + +require 'merb-core' / 'vendor' / 'facets' module Merb module GlobalHelpers; end @@ -168,7 +172,7 @@ module Merb # "**/*.rb". def push_path(type, path, file_glob = "**/*.rb") enforce!(type => Symbol) - load_paths[type] = [path, file_glob] + load_paths[type] = [Pathname.new(path), file_glob] end # Removes given types of application components @@ -197,22 +201,32 @@ module Merb # # ==== Returns # String:: The directory for the requested type. - def dir_for(type) Merb.load_paths[type].first end + def dir_for(type) + Merb.load_paths[type].first + end # ==== Parameters # type<Symbol>:: The type of path to retrieve glob for, e.g. :view. # # ===== Returns # String:: The pattern with which to match files within the type directory. - def glob_for(type) Merb.load_paths[type][1] end + def glob_for(type) + Merb.load_paths[type][1] + end # ==== Returns # String:: The Merb root path. - def root() @root || Merb::Config[:merb_root] || Dir.pwd end + def root + app_root = @root || Merb::Config[:merb_root] || Dir.pwd + + Pathname.new(app_root) + end # ==== Parameters # value<String>:: Path to the root directory. - def root=(value) @root = value end + def root=(value) + @root = Pathname.new(value) + end # ==== Parameters # *path:: @@ -228,7 +242,9 @@ module Merb # Merb.path("views", "admin") # => "/home/merb/app/views/admin" #--- # @public - def root_path(*path) File.join(root, *path) end + def root_path(*path) + Pathname.new(File.join(root, *path)) + end # Logger settings attr_accessor :logger @@ -252,15 +268,19 @@ module Merb # ==== Returns # String:: Path to directory that contains the log file. def log_path - case Merb::Config[:log_file] + path = case Merb::Config[:log_file] when String then File.dirname(Merb::Config[:log_file]) else Merb.root_path("log") end + + Pathname.new(path) end # ==== Returns # String:: The path of root directory of the Merb framework. - def framework_root() @framework_root ||= File.dirname(__FILE__) end + def framework_root + @framework_root ||= Pathname(File.dirname(__FILE__)) + end # ==== Returns # RegExp:: @@ -536,7 +556,7 @@ module Merb # Recommended way to find out what paths Rakefiles # are loaded from. def rakefiles - @rakefiles ||= ['merb-core/test/tasks/spectasks'] + @rakefiles ||= ['merb-core' / 'test' / 'tasks' / 'spectasks'] end # === Returns @@ -555,7 +575,7 @@ module Merb # ==== Notes # Recommended way to add Rakefiles load path for plugins authors. def add_rakefiles(*rakefiles) - @rakefiles ||= ['merb-core/test/tasks/spectasks'] + @rakefiles ||= ['merb-core' / 'test' / 'tasks' / 'spectasks'] @rakefiles += rakefiles end @@ -572,12 +592,12 @@ module Merb end end -require 'merb-core/autoload' -require 'merb-core/server' -require 'merb-core/gem_ext/erubis' -require 'merb-core/logger' -require 'merb-core/version' -require 'merb-core/controller/mime' +require 'merb-core' / 'autoload' +require 'merb-core' / 'server' +require 'merb-core' / 'gem_ext/erubis' +require 'merb-core' / 'logger' +require 'merb-core' / 'version' +require 'merb-core' / 'controller/mime' # Set the environment if it hasn't already been set. Merb.environment ||= ENV['MERB_ENV'] || Merb::Config[:environment] || (Merb.testing? ? 'test' : 'development') lib/merb-core.rb @@ -96,7 +96,7 @@ module Merb %w[view model helper controller mailer part].each do |component| Merb.push_path(component.to_sym, Merb.root_path("app/#{component}s")) end - Merb.push_path(:application, Merb.root_path("app/controllers/application.rb")) + Merb.push_path(:application, Merb.root_path("app" / "controllers" / "application.rb")) Merb.push_path(:config, Merb.root_path("config"), nil) Merb.push_path(:router, Merb.dir_for(:config), (Merb::Config[:router_file] || "router.rb")) Merb.push_path(:lib, Merb.root_path("lib"), nil) lib/merb-core/bootloader.rb @@ -383,10 +383,11 @@ module Merb::RenderMixin template_location = root / self.send(template_meth, context, content_type, controller) end - break if template_method = _template_method_for(template_location) + break if template_method = _template_method_for(template_location.to_s) end - [template_method, template_location] + # template_location is a Pathname + [template_method, template_location.to_s] end # Return the template method for a location, and check to make sure the current controller lib/merb-core/controller/mixins/render.rb @@ -5,6 +5,4 @@ rescue LoadError => e exit end -corelib = File.join(File.dirname(__FILE__), "core_ext") - -require corelib/:kernel +require File.dirname(__FILE__) / "core_ext" / "kernel" lib/merb-core/core_ext.rb @@ -1,21 +1,21 @@ require 'rack' module Merb module Rack - autoload :Application, "merb-core/rack/application" - autoload :Adapter, "merb-core/rack/adapter" - autoload :Ebb, "merb-core/rack/adapter/ebb" - autoload :EventedMongrel, "merb-core/rack/adapter/evented_mongrel" - autoload :FastCGI, "merb-core/rack/adapter/fcgi" - autoload :Irb, "merb-core/rack/adapter/irb" - autoload :Middleware, "merb-core/rack/middleware" - autoload :Mongrel, "merb-core/rack/adapter/mongrel" - autoload :Runner, "merb-core/rack/adapter/runner" - autoload :SwiftipliedMongrel, "merb-core/rack/adapter/swiftiplied_mongrel" - autoload :Thin, "merb-core/rack/adapter/thin" - autoload :ThinTurbo, "merb-core/rack/adapter/thin_turbo" - autoload :WEBrick, "merb-core/rack/adapter/webrick" - autoload :PathPrefix, "merb-core/rack/middleware/path_prefix" - autoload :Static, "merb-core/rack/middleware/static" - autoload :Profiler, "merb-core/rack/middleware/profiler" + autoload :Application, 'merb-core' / 'rack' / 'application' + autoload :Adapter, 'merb-core' / 'rack' / 'adapter' + autoload :Ebb, 'merb-core' / 'rack' / 'adapter' / 'ebb' + autoload :EventedMongrel, 'merb-core' / 'rack' / 'adapter' / 'evented_mongrel' + autoload :FastCGI, 'merb-core' / 'rack' / 'adapter' / 'fcgi' + autoload :Irb, 'merb-core' / 'rack' / 'adapter' / 'irb' + autoload :Middleware, 'merb-core' / 'rack' / 'middleware' + autoload :Mongrel, 'merb-core' / 'rack' / 'adapter' / 'mongrel' + autoload :Runner, 'merb-core' / 'rack' / 'adapter' / 'runner' + autoload :SwiftipliedMongrel, 'merb-core' / 'rack' / 'adapter' / 'swiftiplied_mongrel' + autoload :Thin, 'merb-core' / 'rack' / 'adapter' / 'thin' + autoload :ThinTurbo, 'merb-core' / 'rack' / 'adapter' / 'thin_turbo' + autoload :WEBrick, 'merb-core' / 'rack' / 'adapter' / 'webrick' + autoload :PathPrefix, 'merb-core' / 'rack' / 'middleware' / 'path_prefix' + autoload :Static, 'merb-core' / 'rack' / 'middleware' / 'static' + autoload :Profiler, 'merb-core' / 'rack' / 'middleware' / 'profiler' end # Rack -end # Merb \ No newline at end of file +end # Merb lib/merb-core/rack.rb @@ -8,4 +8,4 @@ module Merb; module Test; end; end require 'merb-core/test/helpers' -require 'merb-core/test/matchers' \ No newline at end of file +require 'merb-core/test/matchers' lib/merb-core/test.rb @@ -33,12 +33,12 @@ describe "Merb.root_path" do it "should return a path relative to Merb.root" do path = Merb.root_path('/app/controllers/base.rb') - path.should == File.join(Merb.root, '/app/controllers/base.rb') + path.to_s.should == File.join(Merb.root, '/app/controllers/base.rb') end it "should accept multiple arguments like File.join" do path = Merb.root_path('app', 'controllers', 'base.rb') - path.should == File.join(Merb.root, 'app', 'controllers', 'base.rb') + path.to_s.should == File.join(Merb.root, 'app', 'controllers', 'base.rb') end end spec/public/directory_structure/directory_spec.rb 0a3d655be79657b99549a5522a13847119c95f4c Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/9e4df5e4db05fb5448c1cc39a1890ff577a3ac45 9e4df5e4db05fb5448c1cc39a1890ff577a3ac45 2008-07-22T04:06:17-07:00 2008-07-22T04:06:17-07:00 Use Pathname in some more places, fix breakages. 4f0658036a672a1871e9959f13e7b022e0b505de Michael S. Klishin michael@novemberain.com