merb-core 0.9.3 → 0.9.4

data/lib/merb-core/plugins.rb

@@ -5,9 +5,14 @@ module Merb
     # ==== Returns
     # Hash::
     #   The configuration loaded from Merb.root / "config/plugins.yml" or, if
-    #   the load fails, an empty hash.
+    #   the load fails, an empty hash whose default value is another Hash.
     def self.config
-      @config ||= File.exists?(Merb.root / "config" / "plugins.yml") ? YAML.load(File.read(Merb.root / "config" / "plugins.yml")) || {} : {}
+      @config ||= begin
+        # this is so you can do Merb.plugins.config[:helpers][:awesome] = "bar"
+        config_hash = Hash.new {|h,k| h[k] = {}}
+        file = Merb.root / "config" / "plugins.yml"
+        config_hash.merge((File.exists?(file) && YAML.load_file(file)) || {})
+      end
     end
 
     # ==== Returns
@@ -15,6 +20,12 @@ module Merb
     def self.rakefiles
       Merb.rakefiles
     end
+    
+    # ==== Returns
+    # Array(String):: All Generator load paths Merb uses for plugins.
+    def self.generators
+      Merb.generators
+    end
 
     # ==== Parameters
     # *rakefiles:: Rakefiles to add to the list of plugin Rakefiles.
@@ -31,7 +42,18 @@ module Merb
     #   Merb::Plugins.add_rakefiles "merb_sequel" / "merbtasks"
     # end
     def self.add_rakefiles(*rakefiles)
-      Merb.add_rakefiles *rakefiles
+      Merb.add_rakefiles(*rakefiles)
+    end
+    
+    # ==== Parameters
+    # *generators:: Generator paths to add to the list of plugin generators.
+    #
+    # ==== Notes
+    #
+    # This is the recommended way to register your plugin's generators
+    # in Merb.
+    def self.add_generators(*generators)
+      Merb.add_generators(*generators)
     end
   end
 end

data/lib/merb-core/rack.rb

@@ -1,15 +1,21 @@
 require 'rack'
-module Merb  
+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 :Mongrel,        "merb-core/rack/adapter/mongrel"
-    autoload :Runner,         "merb-core/rack/adapter/runner"    
-    autoload :Thin,           "merb-core/rack/adapter/thin"
-    autoload :WEBrick,        "merb-core/rack/adapter/webrick"
+    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
+end # Merb

data/lib/merb-core/rack/adapter.rb

@@ -28,14 +28,16 @@ module Merb
     end # Adapter
     
     # Register some Rack adapters
-    Adapter.register %w{ebb},          :Ebb
-    Adapter.register %w{emongrel},     :EventedMongrel
-    Adapter.register %w{fastcgi fcgi}, :FastCGI
-    Adapter.register %w{irb},          :Irb
-    Adapter.register %w{mongrel},      :Mongrel  
-    Adapter.register %w{runner},       :Runner
-    Adapter.register %w{thin},         :Thin
-    Adapter.register %w{webrick},      :WEBrick
+    Adapter.register %w{ebb},            :Ebb
+    Adapter.register %w{emongrel},       :EventedMongrel
+    Adapter.register %w{fastcgi fcgi},   :FastCGI
+    Adapter.register %w{irb},            :Irb
+    Adapter.register %w{mongrel},        :Mongrel  
+    Adapter.register %w{runner},         :Runner
+    Adapter.register %w{smongrel swift}, :SwiftipliedMongrel
+    Adapter.register %w{thin},           :Thin
+    Adapter.register %w{thin-turbo},     :ThinTurbo
+    Adapter.register %w{webrick},        :WEBrick
     
   end # Rack
 end # Merb

data/lib/merb-core/rack/adapter/ebb.rb

@@ -7,10 +7,10 @@ module Merb
       # start an Ebb server on given host and port.
       
       # ==== Parameters
-      # opts<Hash>:: Options for Thin (see below).
+      # opts<Hash>:: Options for Ebb (see below).
       #
       # ==== Options (opts)
-      # :host<String>:: The hostname that Thin should serve.
+      # :host<String>:: The hostname that Ebb should serve.
       # :port<Fixnum>:: The port Ebb should bind to.
       # :app:: The application
       def self.start(opts={})

data/lib/merb-core/rack/adapter/irb.rb

@@ -9,33 +9,43 @@ module Merb
       # String:: The generated URL.
       #
       # ==== Alternatives
-      # If name is a hash, it will be merged with params.      
+      # If name is a hash, it will be merged with params.
       def url(name, params={})
         Merb::Router.generate(name, params)
       end
-      
+
       # Reloads classes using Merb::BootLoader::ReloadClasses.
       def reload!
         Merb::BootLoader::ReloadClasses.reload
       end
-      
+
       # Prints all routes for the application.
       def show_routes
         seen = []
         unless Merb::Router.named_routes.empty?
-          puts "Named Routes"
+          puts "==== Named routes"
           Merb::Router.named_routes.each do |name,route|
-            puts "  #{name}: #{route}"
+            # something weird happens when you combine sprintf and irb
+            puts "Helper     : #{name}"
+            meth = $1.upcase if route.conditions[:method].to_s =~ /(get|post|put|delete)/
+            puts "HTTP method: #{meth || 'GET'}"
+            puts "Route      : #{route}"
+            puts "Params     : #{route.params.inspect}"
+            puts
             seen << route
           end
         end
-        puts "Anonymous Routes"
+        puts "==== Anonymous routes"
         (Merb::Router.routes - seen).each do |route|
-          puts "  #{route}"
+          meth = $1.upcase if route.conditions[:method].to_s =~ /(get|post|put|delete)/
+          puts "HTTP method: #{meth || 'GET'}"
+          puts "Route      : #{route}"
+          puts "Params     : #{route.params.inspect}"
+          puts
         end
         nil
       end
-      
+
       # Starts a sandboxed session (delegates to any Merb::Orms::* modules).
       #
       # An ORM should implement Merb::Orms::MyOrm#open_sandbox! to support this.
@@ -45,7 +55,7 @@ module Merb
         puts "Any modifications you make will be rolled back on exit"
         orm_modules.each { |orm| orm.open_sandbox! if orm.respond_to?(:open_sandbox!) }
       end
-      
+
       # Ends a sandboxed session (delegates to any Merb::Orms::* modules).
       #
       # An ORM should implement Merb::Orms::MyOrm#close_sandbox! to support this.
@@ -54,14 +64,14 @@ module Merb
         orm_modules.each { |orm| orm.close_sandbox! if orm.respond_to?(:close_sandbox!) }
         puts "Modifications have been rolled back"
       end
-      
+
       # Explictly show logger output during IRB session
       def trace_log!
         Merb.logger.auto_flush = true
       end
-      
+
       private
-      
+
       # ==== Returns
       # Array:: All Merb::Orms::* modules.
       def orm_modules
@@ -71,7 +81,7 @@ module Merb
           []
         end
       end
-      
+
     end
 
     class Irb
@@ -85,11 +95,11 @@ module Merb
       def self.start(opts={})
         m = Merb::Rack::Console.new
         m.extend Merb::Test::RequestHelper
-        Object.send(:define_method, :merb) { m }  
-        ARGV.clear # Avoid passing args to IRB 
+        Object.send(:define_method, :merb) { m }
+        ARGV.clear # Avoid passing args to IRB
         m.open_sandbox! if sandboxed?
-        require 'irb' 
-        require 'irb/completion' 
+        require 'irb'
+        require 'irb/completion'
         if File.exists? ".irbrc"
           ENV['IRBRC'] = ".irbrc"
         end
@@ -97,12 +107,12 @@ module Merb
         at_exit do merb.close_sandbox! if sandboxed? end
         exit
       end
-      
+
       private
-      
+
       def self.sandboxed?
         Merb::Config[:sandbox]
-      end      
+      end
     end
   end
-end
+end

data/lib/merb-core/rack/adapter/swiftiplied_mongrel.rb

@@ -0,0 +1,26 @@
+require 'swiftcore/swiftiplied_mongrel'
+require 'merb-core/rack/handler/mongrel'
+module Merb
+  module Rack
+
+    class SwiftipliedMongrel < Mongrel
+      # Starts Mongrel as swift.
+      #
+      # ==== Parameters
+      # opts<Hash>:: Options for Mongrel (see below).
+      #
+      # ==== Options (opts)
+      # :host<String>:: The hostname that Mongrel should serve.
+      # :port<Fixnum>:: The port Mongrel should bind to.
+      # :app<String>>:: The application name.
+      def self.start(opts={})
+        Merb.logger.warn!("Using SwiftipliedMongrel adapter")
+        Merb::Dispatcher.use_mutex = false
+        server = ::Mongrel::HttpServer.new(opts[:host], opts[:port].to_i)
+        Merb::Server.change_privilege
+        server.register('/', ::Merb::Rack::Handler::Mongrel.new(opts[:app]))
+        server.run.join
+      end
+    end
+  end
+end

data/lib/merb-core/rack/adapter/thin.rb

@@ -1,28 +1,38 @@
-require 'thin'
+require "thin"
+
 module Merb
-  
+
   module Rack
 
     class Thin
       # start a Thin server on given host and port.
-      
+
       # ==== Parameters
       # opts<Hash>:: Options for Thin (see below).
       #
       # ==== Options (opts)
       # :host<String>:: The hostname that Thin should serve.
       # :port<Fixnum>:: The port Thin should bind to.
+      # :socket<Fixnum>>:: The socket number that thin should bind to.
+      # :socket_file<String>>:: The socket file that thin should attach to.
       # :app<String>>:: The application name.
       def self.start(opts={})
-        Merb.logger.warn!("Using Thin adapter")
         Merb::Dispatcher.use_mutex = false
-        if opts[:host].include?('/')
-          opts[:host] =  "#{opts[:host]}-#{opts[:port]}"
-        end  
-        server = ::Thin::Server.start(opts[:host], opts[:port].to_i, opts[:app])
+        if opts[:socket] || opts[:socket_file]
+          socket = opts[:socket] || "0"
+          socket_file = opts[:socket_file] || "#{Merb.root}/log/merb.#{socket}.sock"
+          Merb.logger.warn!("Using Thin adapter with socket file #{socket_file}.")
+          server = ::Thin::Server.new(socket_file, opts[:app], opts)
+        else
+          Merb.logger.warn!("Using Thin adapter on host #{opts[:host]} and port #{opts[:port]}.")
+          if opts[:host].include?('/')
+            opts[:host] = "#{opts[:host]}-#{opts[:port]}"
+          end
+          server = ::Thin::Server.new(opts[:host], opts[:port].to_i, opts[:app], opts)
+        end
         Merb::Server.change_privilege
         ::Thin::Logging.silent = true
-        server.start!
+        server.start
       end
     end
   end

data/lib/merb-core/rack/adapter/thin_turbo.rb

@@ -0,0 +1,24 @@
+require "thin-turbo"
+
+module Merb
+
+  module Rack
+
+    class ThinTurbo < Thin
+      # start a Thin Turbo server on given host and port.
+
+      # ==== Parameters
+      # opts<Hash>:: Options for Thin Turbo (see below).
+      #
+      # ==== Options (opts)
+      # :host<String>:: The hostname that Thin Turbo should serve.
+      # :port<Fixnum>:: The port Thin Turbo should bind to.
+      # :socket<Fixnum>>:: The socket number that thin should bind to.
+      # :socket_file<String>>:: The socket file that thin should attach to.
+      # :app<String>>:: The application name.
+      def self.start(opts={})
+        super(opts.merge(:backend => ::Thin::Backends::Turbo))
+      end
+    end
+  end
+end

data/lib/merb-core/rack/application.rb

@@ -1,93 +1,18 @@
-module Merb
-  
+module Merb  
   module Rack
-
     class Application
-      # ==== Parameters
-      # options<Hash>::
-      #   Options for creating a new application. Currently ignored.
-      def initialize(options={})
-        @static_server = ::Rack::File.new Merb.dir_for(:public)
-        if prefix = ::Merb::Config[:path_prefix]
-          @path_prefix = /^#{Regexp.escape(prefix)}/
-        end
-      end
       
-      # ==== Parameters
-      # env<Hash>:: Environment variables to pass on to the application.
-      #
-      # ==== Returns
-      # true or false::
-      def deferred?(env)
-        strip_path_prefix(env) if @path_prefix  # Strip out the path_prefix if one was set 
-        path = env['PATH_INFO'] ? env['PATH_INFO'].chomp('/') : ""
-        if path =~ Merb.deferred_actions
-          Merb.logger.info! "Deferring Request: #{path}"
-          true
-        else
-          false
-        end    
-      end
-      
-      # ==== Parameters
-      # env<Hash>:: Environment variables to pass on to the application.
-      #
-      # ==== Returns
-      # Array[Array]::
-      #   A 3 element tuple consisting of response status, headers and body.
       def call(env) 
-        strip_path_prefix(env) if @path_prefix  # Strip out the path_prefix if one was set 
-        path = env['PATH_INFO'] ? env['PATH_INFO'].chomp('/') : ""
-        cached_path = (path.empty? ? 'index' : path) + '.html'
-        Merb.logger.info "Request: #{path}"
-        if file_exist?(path) && env['REQUEST_METHOD'] =~ /GET|HEAD/ # Serve the file if it's there and the request method is GET or HEAD
-          serve_static(env)
-        elsif file_exist?(cached_path) && env['REQUEST_METHOD'] =~ /GET|HEAD/ # Serve the page cache if it's there and the request method is GET or HEAD
-          env['PATH_INFO'] = cached_path
-          serve_static(env)
-        else                              # No static file, let Merb handle it
-          if path =~ /favicon\.ico/
-            return [404, {"Content-Type"=>"text/html"}, "404 Not Found."]
-          end  
-          begin
-            controller = ::Merb::Dispatcher.handle(env)
-          rescue Object => e
-            return [500, {"Content-Type"=>"text/html"}, e.message + "<br/>" + e.backtrace.join("<br/>")]
-          end
-          Merb.logger.info "\n\n"
-          Merb.logger.flush
-          [controller.status, controller.headers, controller.body]
-        end
-      end
-
-      # ==== Parameters
-      # path<String>:: The path to the file relative to the server root.
-      #
-      # ==== Returns
-      # Boolean:: True if file exists under the server root and is readable.
-      def file_exist?(path)
-        full_path = ::File.join(@static_server.root, ::Merb::Request.unescape(path))
-        ::File.file?(full_path) && ::File.readable?(full_path)
-      end
-
-      # ==== Parameters
-      # env<Hash>:: Environment variables to pass on to the server.
-      def serve_static(env)
-        env["PATH_INFO"] = ::Merb::Request.unescape(env["PATH_INFO"])        
-        @static_server.call(env)
-      end
-      
-      # ==== Parameters
-      # env<Hash>:: Environment variables to pass on to the server.
-      def strip_path_prefix(env)
-        ['PATH_INFO', 'REQUEST_URI'].each do |path_key|
-          if env[path_key] =~ @path_prefix
-            env[path_key].sub!(@path_prefix, '')
-            env[path_key] = '/' if env[path_key].empty?
-          end
+        begin
+          controller = ::Merb::Dispatcher.handle(Merb::Request.new(env))
+        rescue Object => e
+          return [500, {"Content-Type"=>"text/html"}, e.message + "<br/>" + e.backtrace.join("<br/>")]
         end
+        Merb.logger.info "\n\n"
+        Merb.logger.flush
+        controller.rack_response
       end
       
     end
   end  
-end    
+end

data/lib/merb-core/rack/middleware.rb

@@ -0,0 +1,26 @@
+module Merb
+  module Rack
+    class Middleware
+      
+      def initialize(app)
+        @app = app
+      end
+      
+      def deferred?(env)
+        path = env['PATH_INFO'] ? env['PATH_INFO'].chomp('/') : ""
+        if path =~ Merb.deferred_actions
+          Merb.logger.info! "Deferring Request: #{path}"
+          true
+        else
+          false
+        end
+      end
+  
+      def call(env)
+        @app.call(env)
+      end
+      
+    end
+  end
+end
+