LICENSE TODO lib/merb_core/config.rb lib/merb_core/rack.rb @@ -63,7 +63,7 @@ spec = Gem::Specification.new do |s| s.add_dependency "ruby2ruby" s.add_dependency "json_pure" s.add_dependency "assistance" - + s.add_dependency "rspec" # Requirements s.requirements << "install the json gem to get faster json parsing" s.required_ruby_version = ">= 1.8.4" Rakefile @@ -1,4 +1,5 @@ #!/usr/bin/env ruby require 'rubygems' require 'merb' -Merb::Rack::Adapter.new + +Merb.start bin/merb @@ -4,27 +4,52 @@ require 'rubygems' require 'set' require 'fileutils' +require "assistance" $LOAD_PATH.push File.dirname(__FILE__) unless $LOAD_PATH.include?(File.dirname(__FILE__)) || $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__))) +require 'merb_core/autoload' +require 'merb_core/core_ext' require 'merb_core/gem_ext/erubis' require 'merb_core/logger' require 'merb_core/version' -require 'merb_core/core_ext' -gem "assistance" -require "assistance" module Merb class << self + def start(argv=ARGV) + Merb::Config.parse_args(argv) + BootLoader.run + case Merb::Config[:adapter] + when nil + # Guess. + if ENV.include?("PHP_FCGI_CHILDREN") + adapter = Merb::Rack::FastCGI + else + begin + adapter = Merb::Rack::Mongrel + rescue LoadError => e + adapter = Merb::Rack::WEBrick + end + end + when "mongrel" + adapter = Merb::Rack::Mongrel + when "webrick" + adapter = Merb::Rack::WEBrick + when "fastcgi" + adapter = Merb::Rack::FastCGI + else + adapter = Merb::Rack.const_get(server.capitalize) + end + adapter.start_server(Merb::Config[:host], Merb::Config[:port]) + end + attr_accessor :environment, :load_paths Merb.load_paths = Hash.new - require 'merb_core/autoload' - # This is the core mechanism for setting up your application layout # merb-core won't set a default application layout, but merb-more will # use the app/:type layout that is in use in Merb 0.5 lib/merb.rb @@ -1,12 +1,14 @@ module Merb autoload :AbstractController, "merb_core/controller/abstract_controller" autoload :BootLoader, "merb_core/boot/bootloader" + autoload :Config, "merb_core/config" autoload :Const, "merb_core/constants" autoload :Controller, "merb_core/controller/merb_controller" autoload :ControllerExceptions, "merb_core/controller/exceptions" autoload :Dispatcher, "merb_core/dispatch/dispatcher" autoload :ErubisCaptureMixin, "merb_core/controller/mixins/erubis_capture" autoload :Plugins, "merb_core/plugins" + autoload :Rack, "merb_core/rack" autoload :RenderMixin, "merb_core/controller/mixins/render" autoload :Request, "merb_core/dispatch/request" autoload :Responder, "merb_core/controller/mixins/responder" lib/merb_core/autoload.rb @@ -1,9 +1,5 @@ module Merb - def self.start - BootLoader.run - end - class BootLoader cattr_accessor :subclasses @@ -52,8 +48,8 @@ class Merb::BootLoader::BuildFramework < Merb::BootLoader %[view model controller helper mailer part].each do |component| Merb.push_path(component.to_sym, Merb.root_path("app/#{component}s")) end - Merb.push_path(:app_controller, Merb.root_path("app/controllers", "application_controller.rb")) - Merb.push_path(:config, Merb.root_path("config", "router.rb")) + Merb.push_path(:app_controller, Merb.root_path("app/controllers/application.rb")) + Merb.push_path(:config, Merb.root_path("config/router.rb")) Merb.push_path(:lib, Merb.root_path("lib")) end end @@ -133,7 +129,7 @@ class Merb::BootLoader::Templates < Merb::BootLoader end class Merb::BootLoader::Libraries < Merb::BootLoader - @@libraries = {:disable_json_gem => %[json/ext json/pure]} + @@libraries = {:disable_json_gem => %w[json/ext json/pure]} # Add other libraries to load in early in the boot process # @@ -157,6 +153,7 @@ class Merb::BootLoader::Libraries < Merb::BootLoader end def require_first_working(first, *rest) + p first, rest require first rescue LoadError raise LoadError if rest.empty? lib/merb_core/boot/bootloader.rb @@ -67,7 +67,7 @@ module Merb::Template # ]}} #--- # @public - def register_extensions(engine, extensions) enforce!(engine => Class, extensions => Array) + def register_extensions(engine, extensions) raise ArgumentError, "The class you are registering does not have a compile_template method" unless engine.respond_to?(:compile_template) extensions.each{|ext| EXTENSIONS[ext] = engine } lib/merb_core/controller/template.rb @@ -1,3 +1,3 @@ corelib = File.join(File.dirname(__FILE__), "core_ext") -Dir.glob("#{corelib}/*").each {|fn| require(File.join(fn))} \ No newline at end of file +Dir.glob("#{corelib}/*").each {|fn| require fn} \ No newline at end of file lib/merb_core/core_ext.rb @@ -1,89 +1,51 @@ # for OSX compatibility Socket.do_not_reverse_lookup = true + module Merb module Rack - class RequestWrapper - def initialize(env) - @env = env + + class Adapter + def initialize(options={}) + @static_server = ::Rack::File.new(::File.join(Merb.root, "public")) end - def params - @env - end - def body - @env['rack.input'] - end - end - - class << self + def call(env) + path = env['PATH_INFO'].chomp('/') + cached_path = (path.empty? ? 'index' : path) + '.html' - def start(host, ports) - ports.each do |port| - start_server(host, port) - trap("INT"){ Merb.stop } - end + if file_exist?(path) # Serve the file if it's there + serve_staic(env) + elsif file_exist?(cached_path) # Serve the page cache if it's there + env['PATH_INFO'] = cached_path + serve_staic(env) + else # No static file, let Merb handle it + serve_dynamic(env) + end end - def stop + # TODO refactor this in File#can_serve?(path) ?? + def file_exist?(path) + full_path = ::File.join(@static_server.root, ::Rack::Utils.unescape(path)) + ::File.file?(full_path) && ::File.readable?(full_path) end - end # class << self - - end # Rack -end # Merb - - - - -class Adapter - def initialize(options={}) - @root = options[:root] || Dir.pwd - @env = options[:environment] || 'development' - - load_application - - @static_server = Rack::File.new(::File.join(Merb.root, "public")) - end - - def load_application - ENV['RAILS_ENV'] = @env + def serve_staic(env) + @static_server.call(env) + end + + def serve_dynamic(env) + request = RequestWrapper.new(env) + response = StringIO.new + begin + controller, action = ::Merb::Dispatcher.handle(request, response) + rescue Object => e + return [500, {"Content-Type"=>"text/html"}, "Internal Server Error"] + end + [controller.status, controller.headers, controller.body] + end - require "#{@root}/config/environment" - require 'dispatcher' - end - - # TODO refactor this in File#can_serve?(path) ?? - def file_exist?(path) - full_path = ::File.join(@static_server.root, Utils.unescape(path)) - ::File.file?(full_path) && ::File.readable?(full_path) - end - - def serve_staic(env) - @static_server.call(env) - end - - def serve_dynamic(env) - request = RequestWrapper.new(env) - response = StringIO.new - begin - controller, action = ::Merb::Dispatcher.handle(request, response) - rescue Object => e - return [500, {"Content-Type"=>"text/html"}, "Internal Server Error"] - end - [controller.status, controller.headers, controller.body] - end - - def call(env) - path = env['PATH_INFO'].chomp('/') - cached_path = (path.empty? ? 'index' : path) + 'html' - - if file_exist?(path) # Serve the file if it's there - serve_staic(env) - elsif file_exist?(cached_path) # Serve the page cache if it's there - env['PATH_INFO'] = cached_path - serve_staic(env) - else # No static file, let Merb handle it - serve_dynamic(env) + end - end \ No newline at end of file + end +end \ No newline at end of file lib/merb_core/rack/adapter.rb @@ -1,10 +1,9 @@ module Merb module Rack class FastCGI < Adapter - class << self - def start_server(host=nil, port=nil) - Rack::Handler::FastCGI.run(self) - end + def self.start_server(host=nil, port=nil) + app = new + Rack::Handler::FastCGI.run(app) end end end lib/merb_core/rack/adapter/fcgi.rb @@ -4,13 +4,12 @@ require 'rack/handler/mongrel' module Merb module Rack class Mongrel < Adapter - class << self - # start server on given host and port. - def start_server(host, port) - server = ::Mongrel::HttpServer.new(host, port) - server.register('/', ::Rack::Handler::Mongrel.new(self)) - server.run.join - end + # start server on given host and port. + def self.start_server(host, port) + app = new + server = ::Mongrel::HttpServer.new(host, port) + server.register('/', ::Rack::Handler::Mongrel.new(app)) + server.run.join end end end lib/merb_core/rack/adapter/mongrel.rb @@ -3,14 +3,13 @@ require 'thin' module Merb module Rack class Mongrel < Adapter - class << self - # start server on given host and port. - def start_server(host, port) - server = ::Thin::Server.new(host, port, self) - server.silent = true - server.timeout = 3 - server.start! - end + # start a Thin server on given host and port. + def self.start_server(host, port) + app = new + server = ::Thin::Server.new(host, port, app) + server.silent = true + server.timeout = 3 + server.start! end end end lib/merb_core/rack/adapter/thin.rb @@ -4,24 +4,22 @@ require 'rack/handler/webrick' module Merb module Rack class WEBrick < Adapter - class << self - # start server on given host and port. - def start_server(host, port) - options = { - :Port => port, - :BindAddress => host, - :Logger => Merb.logger, - :AccessLog => [ - [Merb.logger, ::WEBrick::AccessLog::COMMON_LOG_FORMAT], - [Merb.logger, ::WEBrick::AccessLog::REFERER_LOG_FORMAT] - ] - }.merge(options) - - - server = ::WEBrick::HTTPServer.new(options) - server.mount("/", ::Rack::Handler::WEBrick, self) - server.start - end + # start WEBrick server on given host and port. + def self.start_server(host, port) + app = new + options = { + :Port => port, + :BindAddress => host, + :Logger => Merb.logger, + :AccessLog => [ + [Merb.logger, ::WEBrick::AccessLog::COMMON_LOG_FORMAT], + [Merb.logger, ::WEBrick::AccessLog::REFERER_LOG_FORMAT] + ] + } + + server = ::WEBrick::HTTPServer.new(options) + server.mount("/", ::Rack::Handler::WEBrick, app) + server.start end end end lib/merb_core/rack/adapter/webrick.rb 86eef63c291eb02a236ee9f966aee55c0b0c21b0 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/7dffeb416ffd4f55763551387cabf6c7aff441c4 7dffeb416ffd4f55763551387cabf6c7aff441c4 2008-01-13T17:50:05-08:00 2008-01-13T17:50:05-08:00 Updated rack adapters, added Merb::Config and made a merb binary that works 94306e7ee23b53d4a690f6c06a9823173b151c61 Ezra Zygmuntowicz ez@engineyard.com