merb-core 0.9.13 → 1.0

data/lib/merb-core/plugins.rb

@@ -10,7 +10,7 @@ module Merb
     #   The configuration loaded from Merb.root / "config/plugins.yml" or, if
     #   the load fails, an empty hash whose default value is another Hash.
     #
-    # @api plugin
+    # :api: plugin
     def self.config
       @config ||= begin
         # this is so you can do Merb.plugins.config[:helpers][:awesome] = "bar"
@@ -31,7 +31,7 @@ module Merb
     # ==== Returns
     # Array(String):: All Rakefile load paths Merb uses for plugins.
     #
-    # @api plugin
+    # :api: plugin
     def self.rakefiles
       Merb.rakefiles
     end
@@ -39,7 +39,7 @@ module Merb
     # ==== Returns
     # Array(String):: All Generator load paths Merb uses for plugins.
     #
-    # @api plugin
+    # :api: plugin
     def self.generators
       Merb.generators
     end
@@ -59,7 +59,7 @@ module Merb
     #   Merb::Plugins.add_rakefiles "merb_sequel" / "merbtasks"
     # end
     #
-    # @api plugin
+    # :api: plugin
     def self.add_rakefiles(*rakefiles)
       Merb.add_rakefiles(*rakefiles)
     end
@@ -72,7 +72,7 @@ module Merb
     # This is the recommended way to register your plugin's generators
     # in Merb.
     #
-    # @api plugin
+    # :api: plugin
     def self.add_generators(*generators)
       Merb.add_generators(*generators)
     end

data/lib/merb-core/rack.rb

@@ -24,4 +24,4 @@ module Merb
     autoload :StreamWrapper,       'merb-core/rack/stream_wrapper'
     autoload :Helpers,             'merb-core/rack/helpers'
   end # Rack
-end # Merb
+end # Merb

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

@@ -11,6 +11,8 @@ module Merb
         #
         # ==== Returns.
         # Class:: The adapter class.
+        #
+        # :api: private
         def get(id)
           if @adapters[id.to_s]
             Object.full_const_get(@adapters[id.to_s])
@@ -24,6 +26,8 @@ module Merb
         # ==== Parameters
         # ids<Array>:: Identifiers by which this adapter is recognized by.
         # adapter_class<Class>:: The Rack adapter class.
+        #
+        # :api: plugin
         def register(ids, adapter_class)
           @adapters ||= Hash.new
           ids.each { |id| @adapters[id] = "Merb::Rack::#{adapter_class}" }
@@ -45,4 +49,4 @@ module Merb
     Adapter.register %w{webrick},        :WEBrick
     
   end # Rack
-end # Merb
+end # Merb

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

@@ -6,7 +6,7 @@ module Merb
       # will be called to start a server created with the new_server method.
       # This is called from the AbstractAdapter start method.
       #
-      # @api plugin
+      # :api: plugin
       # @overridable
       def self.start_server
         raise NotImplemented
@@ -20,12 +20,12 @@ module Merb
       # ==== Parameters
       # port<Integer>:: The port the server should listen on
       #
-      # @api plugin
+      # :api: plugin
       # @overridable
       def self.new_server(port)
         raise NotImplemented
       end
-      
+            
       # This method is designed to be overridden in a rack adapter.  It will
       # be called to stop the adapter server.  
       #
@@ -35,7 +35,7 @@ module Merb
       # ==== Returns
       # Boolean:: True if the server was properly stopped.  
       #
-      # @api plugin
+      # :api: plugin
       # @overridable
       def self.stop(status)
         raise NotImplemented
@@ -46,7 +46,7 @@ module Merb
       # ==== Parameters
       # port<Integer>:: The port to start the worker process on. 
       #
-      # @api private
+      # :api: private
       def self.spawn_worker(port)
         worker_pid = Kernel.fork
         start_at_port(port, @opts) unless worker_pid
@@ -69,7 +69,7 @@ module Merb
       #   port: the port to bind to
       #   cluster: the number 
       #
-      # @api private
+      # :api: private
       def self.start(opts={})
         @opts = opts
         $WORKERS ||= []
@@ -148,7 +148,7 @@ module Merb
       # opts<Hash>:: The hash of options, defaults to the @opts 
       #   instance variable.  
       #
-      # @api private
+      # :api: private
       def self.start_at_port(port, opts = @opts)
         at_exit do
           Merb::Server.remove_pid(port)
@@ -161,6 +161,7 @@ module Merb
         # of workers.
         if Merb::Config[:daemonize]
           Merb.trap('INT') do
+            Merb.exiting = true
             stop
             Merb.logger.warn! "Exiting port #{port}\n"
             exit_process
@@ -209,7 +210,11 @@ module Merb
             # Call the adapter's new_server method, which should attempt
             # to bind to a port.
             new_server(port)
-          rescue Errno::EADDRINUSE
+          rescue Errno::EADDRINUSE => e
+            if Merb::Config[:bind_fail_fatal]
+              Merb.fatal! "Could not bind to #{port}. It was already in use", e
+            end
+            
             unless printed_warning
               Merb.logger.warn! "Port #{port} is in use, " \
                 "Waiting for it to become available."
@@ -235,7 +240,7 @@ module Merb
       # ==== Parameters
       # status<Integer>:: The exit code of the process.
       # 
-      # @api private
+      # :api: private
       def self.exit_process(status = 0)
         exit(status)
       end
@@ -247,7 +252,7 @@ module Merb
       #   processes. 
       # port<Integer>:: The base port that the app is running on. 
       #
-      # @api private
+      # :api: private
       def self.process_title(whoami, port)
         name = Merb::Config[:name]
         app  = "merb#{" : #{name}" if (name && name != "merb")}"

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

@@ -5,20 +5,22 @@ module Merb
 
     class Ebb < Merb::Rack::AbstractAdapter
       # start an Ebb server on given host and port.
-      
+      # :api: plugin
       def self.new_server(port)
         Merb::Dispatcher.use_mutex = false
         opts = @opts.merge(:port => port)
         @th = Thread.new { Thread.current[:server] = ::Ebb.start_server(opts[:app], opts) }
       end
       
+      # :api: plugin
       def self.start_server
         @th.join
       end
       
+      # :api: plugin
       def self.stop(status = 0)
         ::Ebb.stop_server
       end
     end
   end
-end
+end

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

@@ -4,10 +4,11 @@ module Merb
   module Rack
 
     class EventedMongrel < Mongrel
+      # :api: plugin
       def self.new_server(port)
         Merb::Dispatcher.use_mutex = false
         super
       end
     end
   end
-end
+end

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

@@ -7,6 +7,8 @@ module Merb
       #
       # ==== Options (opts)
       # :app<String>>:: The application name.
+      #
+      # :api: plugin
       def self.start(opts={})
         Merb.logger.warn!("Using FastCGI adapter")
         Merb::Server.change_privilege
@@ -14,4 +16,4 @@ module Merb
       end
     end
   end
-end
+end

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

@@ -54,18 +54,20 @@ module Merb
       #
       # url(:articles, 2008, 10, "test_article")
       #
-      # @api public
+      # :api: public
       def url(name, *args)
         args << {}
         Merb::Router.url(name, *args)
       end
 
       # Reloads classes using Merb::BootLoader::ReloadClasses.
+      # :api: public
       def reload!
         Merb::BootLoader::ReloadClasses.reload
       end
 
       # Prints all routes for the application.
+      # :api: public
       def show_routes
         seen = []
         unless Merb::Router.named_routes.empty?
@@ -96,6 +98,7 @@ module Merb
       #
       # An ORM should implement Merb::Orms::MyOrm#open_sandbox! to support this.
       # Usually this involves starting a transaction.
+      # :api: public
       def open_sandbox!
         puts "Loading #{Merb.environment} environment in sandbox (Merb #{Merb::VERSION})"
         puts "Any modifications you make will be rolled back on exit"
@@ -106,12 +109,14 @@ module Merb
       #
       # An ORM should implement Merb::Orms::MyOrm#close_sandbox! to support this.
       # Usually this involves rolling back a transaction.
+      # :api: public
       def close_sandbox!
         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
+      # :api: public
       def trace_log!
         Merb.logger.auto_flush = true
       end
@@ -120,6 +125,7 @@ module Merb
 
       # ==== Returns
       # Array:: All Merb::Orms::* modules.
+      # :api: private
       def orm_modules
         if Merb.const_defined?('Orms')
           Merb::Orms.constants.map { |c| Merb::Orms::const_get(c) }
@@ -138,6 +144,8 @@ module Merb
       # ==== Notes
       # If the +.irbrc+ file exists, it will be loaded into the IRBRC
       # environment variable.
+      #
+      # :api: plugin
       def self.start(opts={})
         m = Merb::Rack::Console.new
         m.extend Merb::Test::RequestHelper
@@ -156,6 +164,7 @@ module Merb
 
       private
 
+      # :api: private
       def self.sandboxed?
         Merb::Config[:sandbox]
       end

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

@@ -14,6 +14,7 @@ module Merb
 
     class Mongrel < Merb::Rack::AbstractAdapter
 
+      # :api: plugin
       def self.stop(status = 0)
         if @server
           begin
@@ -25,11 +26,13 @@ module Merb
           true
         end
       end
-      
+
+      # :api: plugin
       def self.new_server(port)
         @server = ::Mongrel::HttpServer.new(@opts[:host], port)
       end
       
+      # :api: plugin
       def self.start_server
         @server.register('/', ::Merb::Rack::Handler::Mongrel.new(@opts[:app]))
         @server.run.join
@@ -38,4 +41,4 @@ module Merb
     end
     
   end
-end
+end

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

@@ -12,6 +12,8 @@ module Merb
       # ==== Notes
       # If opts[:runner_code] matches a filename, that file will be read and
       # the contents executed. Otherwise the code will be executed directly.
+      #
+      # :api: plugin
       def self.start(opts={})
         Merb::Server.change_privilege
         if opts[:runner_code]
@@ -25,4 +27,4 @@ module Merb
       end
     end
   end
-end
+end

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

@@ -4,6 +4,7 @@ module Merb
   module Rack
 
     class SwiftipliedMongrel < Mongrel
+      # :api: plugin
       def self.new_server(port)
         Merb::Dispatcher.use_mutex = false
         super
@@ -11,4 +12,4 @@ module Merb
     end
     
   end
-end
+end

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

@@ -7,6 +7,7 @@ module Merb
     class Thin < Merb::Rack::AbstractAdapter
       # start a Thin server on given host and port.
 
+      # :api: plugin
       def self.new_server(port)
         Merb::Dispatcher.use_mutex = false
         
@@ -22,11 +23,13 @@ module Merb
         end
       end
 
+      # :api: plugin
       def self.start_server
         ::Thin::Logging.silent = true
         @server.start
       end
       
+      # :api: plugin
       def self.stop(status = 0)
         if @server
           @server.stop
@@ -35,4 +38,4 @@ module Merb
       end
     end
   end
-end
+end

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

@@ -7,6 +7,7 @@ module Merb
     class ThinTurbo < Thin
       # start a Thin Turbo server on given host and port.
 
+      # :api: plugin
       def self.new_server(port)
         @opts.merge!(:backend => ::Thin::Backends::Turbo)
         super

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

@@ -7,9 +7,11 @@ module Merb
     class WEBrick < Merb::Rack::AbstractAdapter
       
       class << self
+        # :api: private
         attr_accessor :server
       end
-      
+
+      # :api: plugin
       def self.new_server(port)
         options = {
           :Port        => port,
@@ -25,48 +27,20 @@ module Merb
         @server = ::WEBrick::HTTPServer.new(options.merge(:DoNotListen => true))
         @server.listeners.replace sockets
       end
-      
+
+      # :api: plugin
       def self.start_server
         @server.mount("/", ::Rack::Handler::WEBrick, @opts[:app])
         @server.start
         exit(@status)
       end
       
+      # :api: plugin
       def self.stop(status = 0)
         @status = status
         @server.shutdown
       end
-      
-      def self.exit_process(status = 0)
-      end      
-      
-      # start WEBrick server on given host and port.
-      
-      # ==== Parameters
-      # opts<Hash>:: Options for WEBrick (see below).
-      #
-      # ==== Options (opts)
-      # :host<String>:: The hostname that WEBrick should serve.
-      # :port<Fixnum>:: The port WEBrick should bind to.
-      # :app<String>>:: The application name.
-      # def self.start(opts={})
-      #   Merb.logger.warn!("Using Webrick adapter")
-      # 
-      #   options = {
-      #     :Port        => opts[:port],
-      #     :BindAddress => opts[:host],
-      #     :Logger      => Merb.logger,
-      #     :AccessLog   => [
-      #       [Merb.logger, ::WEBrick::AccessLog::COMMON_LOG_FORMAT],
-      #       [Merb.logger, ::WEBrick::AccessLog::REFERER_LOG_FORMAT]
-      #     ]
-      #   }
-      #      
-      #   server = ::WEBrick::HTTPServer.new(options)
-      #   Merb::Server.change_privilege
-      #   server.mount("/", ::Rack::Handler::WEBrick, opts[:app])
-      #   server.start
-      # end
+
     end
   end
-end
+end