merb-core 0.9.13 → 1.0

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

@@ -11,7 +11,7 @@ module Merb
       # ==== Returns
       # <Array>:: A rack response of [status<Integer>, headers<Hash>, body<String, Stream>]
       #
-      # @api private
+      # :api: private
       def call(env) 
         begin
           rack_response = ::Merb::Dispatcher.handle(Merb::Request.new(env))
@@ -39,7 +39,7 @@ module Merb
       # Boolean::
       #   True if the request should be deferred.  
       #
-      # @api private
+      # :api: private
       def deferred?(env)
         path = env[Merb::Const::PATH_INFO] ? env[Merb::Const::PATH_INFO].chomp(Merb::Const::SLASH) : Merb::Const::EMPTY_STRING
         if path =~ Merb.deferred_actions

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

@@ -31,6 +31,8 @@ module Merb
         # :Host<String>::
         #   The hostname on which the app should run. Defaults to "0.0.0.0"
         # :Port<Fixnum>:: The port for the app. Defaults to 8080.
+        #
+        # :api: plugin
         def self.run(app, options={})
           @server = ::Mongrel::HttpServer.new(options[:Host] || '0.0.0.0',
                                              options[:Port] || 8080)
@@ -39,12 +41,15 @@ module Merb
           @server.run.join
         end
   
+        # :api: private
         def self.stop(block = true)
           @server.stop
         end
   
         # ==== Parameters
         # app<Merb::Rack::Application>:: The app that Mongrel should handle.
+        #
+        # :api: plugin
         def initialize(app)
           @app = app
         end
@@ -52,6 +57,8 @@ module Merb
         # ==== Parameters
         # request<Merb::Request>:: The HTTP request to handle.
         # response<HTTPResponse>:: The response object to write response to.
+        #
+        # :api: plugin
         def process(request, response)
           env = {}.replace(request.params)
           env.delete Merb::Const::HTTP_CONTENT_TYPE

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

@@ -15,7 +15,7 @@ module Merb
       # ==== Returns
       # <Array>:: A rack response to redirect to the specified url.  
       #
-      # @api plugin
+      # :api: plugin
       def self.redirect(url, options = {})
         # Build the rack array
         status   = options.delete(:status)

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

@@ -2,14 +2,20 @@ module Merb
   module Rack
     class Middleware
       
+      # @overridable
+      # :api: plugin
       def initialize(app)
         @app = app
       end
-      
+
+      # @overridable
+      # :api: plugin
       def deferred?(env)
         @app.deferred?(env)
       end
   
+      # @overridable
+      # :api: plugin  
       def call(env)
         @app.call(env)
       end

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

@@ -2,6 +2,8 @@ module Merb
   module Rack
 
     class ConditionalGet < Merb::Rack::Middleware
+
+      # :api: plugin
       def call(env)
         status, headers, body = @app.call(env)
 
@@ -16,6 +18,7 @@ module Merb
       end
     
     private
+      # :api: private
       def document_not_modified?(env, headers)
         if etag = headers[Merb::Const::ETAG]
           etag == env[Merb::Const::HTTP_IF_NONE_MATCH]

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

@@ -2,6 +2,8 @@ module Merb
   module Rack
 
     class ContentLength < Merb::Rack::Middleware
+
+      # :api: plugin
       def call(env)
         status, headers, body = @app.call(env)
 

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

@@ -2,21 +2,25 @@ module Merb
   module Rack
     class PathPrefix < Merb::Rack::Middleware
 
+      # :api: private
       def initialize(app, path_prefix = nil)
         super(app)
         @path_prefix = /^#{Regexp.escape(path_prefix)}/
       end
       
+      # :api: plugin
       def deferred?(env)
         strip_path_prefix(env) 
         @app.deferred?(env)
       end
       
+      # :api: plugin
       def call(env)
         strip_path_prefix(env) 
         @app.call(env)
       end
 
+      # :api: private
       def strip_path_prefix(env)
         ['PATH_INFO', 'REQUEST_URI'].each do |path_key|
           if env[path_key] =~ @path_prefix

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

@@ -2,11 +2,13 @@ module Merb
   module Rack
     class Profiler < Merb::Rack::Middleware
 
+      # :api: private
       def initialize(app, min=1, iter=1)
         super(app)
         @min, @iter = min, iter
       end
 
+      # :api: plugin
       def call(env)
         __profile__("profile_output", @min, @iter) do
           @app.call(env)
@@ -16,4 +18,4 @@ module Merb
       
     end
   end
-end
+end

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

@@ -2,11 +2,13 @@ module Merb
   module Rack
     class Static < Merb::Rack::Middleware
 
+      # :api: private
       def initialize(app,directory)
         super(app)
         @static_server = ::Rack::File.new(directory)
       end
       
+      # :api: plugin
       def call(env)        
         path = if env[Merb::Const::PATH_INFO]
                  env[Merb::Const::PATH_INFO].chomp(Merb::Const::SLASH)
@@ -27,11 +29,13 @@ module Merb
         end
       end
       
-       # ==== Parameters
+        # ==== 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.
+        #
+        # :api: private
         def file_exist?(path)
           full_path = ::File.join(@static_server.root, ::Merb::Parse.unescape(path))
           ::File.file?(full_path) && ::File.readable?(full_path)
@@ -39,6 +43,8 @@ module Merb
 
         # ==== Parameters
         # env<Hash>:: Environment variables to pass on to the server.
+        #
+        # :api: private
         def serve_static(env)
           env[Merb::Const::PATH_INFO] = ::Merb::Parse.unescape(env[Merb::Const::PATH_INFO])
           @static_server.call(env)

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

@@ -2,6 +2,7 @@ module Merb
   module Rack
     class Tracer < Merb::Rack::Middleware
 
+      # :api: plugin
       def call(env)
 
         Merb.logger.debug!("Rack environment:\n" + env.inspect + "\n\n")

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

@@ -2,38 +2,43 @@ module Merb
   module Rack
 
     class StreamWrapper
-       def initialize(body)
+      # :api: private
+      def initialize(body)
          @body = body
-       end
+      end
+      
+      # :api: private
+      def each(&callback)
+        if Proc === @body
+          @writer = lambda { |x| callback.call(x) }
+          @body.call(self)
+        elsif @body.is_a?(String)
+          @body.each_line(&callback)
+        else
+          @body.each(&callback)
+        end
+      end
+      
+      # :api: private
+      def write(str)
+        @writer.call str.to_s
+        str
+      end
+      
+      # :api: private
+      def to_s
+        @body.to_s
+      end
             
-       def each(&callback)
-         if Proc === @body
-           @writer = lambda { |x| callback.call(x) }
-           @body.call(self)
-         elsif @body.is_a?(String)
-           @body.each_line(&callback)
-         else
-           @body.each(&callback)
-         end
-       end
-    
-       def write(str)
-         @writer.call str.to_s
-         str
-       end
-       
-       def to_s
-         @body.to_s
-       end
-       
-       def ==(other)
-         @body == other
-       end
-       
-       def method_missing(sym, *args, &blk)
-         @body.send(sym, *args, &blk)
-       end
-       
+      # :api: private
+      def ==(other)
+        @body == other
+      end
+
+      # :api: private
+      def method_missing(sym, *args, &blk)
+        @body.send(sym, *args, &blk)
+      end
        
     end   
   

data/lib/merb-core/server.rb

@@ -19,7 +19,7 @@ module Merb
       # If cluster is left out, then one process will be started. This process
       # will be daemonized if Merb::Config[:daemonize] is true.
       #
-      # @api private
+      # :api: private
       def start(port, cluster=nil)
 
         @port = port
@@ -50,7 +50,7 @@ module Merb
       # Boolean::
       #   True if Merb is running on the specified port.
       #
-      # @api private
+      # :api: private
       def alive?(port)
         pidfile = pid_file(port)
         pid     = pid_in_file(pidfile)
@@ -62,6 +62,7 @@ module Merb
         Merb.fatal!("You don't have access to the PID file at #{pidfile}: #{e.message}")
       end
 
+      # :api: private
       def pid_in_file(pidfile)
         File.read(pidfile).chomp.to_i
       end
@@ -83,7 +84,7 @@ module Merb
       # ==== Alternatives
       # If you pass "all" as the port, the signal will be sent to all Merb processes.
       #
-      # @api private
+      # :api: private
       def kill(port, sig = "INT")
         if sig.is_a?(Integer)
           sig = Signal.list.invert[sig]
@@ -103,7 +104,7 @@ module Merb
       end
 
       # Sends the provided signal to the process pointed at by the provided pid file.
-      # @api private
+      # :api: private
       def kill_pid(sig, file)
         begin
           pid = pid_in_file(file)
@@ -136,7 +137,7 @@ module Merb
       # ==== Parameters
       # port<~to_s>:: The port of the Merb process to daemonize.
       #
-      # @api private
+      # :api: private
       def daemonize(port)
         Merb.logger.warn! "About to fork..." if Merb::Config[:verbose]
         fork do
@@ -163,7 +164,7 @@ module Merb
 
       # Starts up Merb by running the bootloader and starting the adapter.
       #
-      # @api private
+      # :api: private
       def bootup
         Merb.trap("TERM") { shutdown }
 
@@ -175,7 +176,7 @@ module Merb
 
       # Shut down Merb, reap any workers if necessary.
       #
-      # @api private
+      # :api: private
       def shutdown(status = 0)
         # reap_workers does exit but may not be called...
         Merb::BootLoader::LoadClasses.reap_workers(status) if Merb::Config[:fork_for_class_load]
@@ -185,7 +186,7 @@ module Merb
 
       # Change process user/group to those specified in Merb::Config.
       #
-      # @api private
+      # :api: private
       def change_privilege
         if Merb::Config[:user] && Merb::Config[:group]
           Merb.logger.verbose! "About to change privilege to group " \
@@ -212,7 +213,7 @@ module Merb
       # If Merb::Config[:pid_file] has been specified, that will be used
       # instead of the port/socket based PID file.
       #
-      # @api private
+      # :api: private
       def remove_pid_file(port)
         pidfile = pid_file(port)
         if File.exist?(pidfile)
@@ -233,14 +234,14 @@ module Merb
       # If Merb::Config[:pid_file] has been specified, that will be used
       # instead of the port/socket based PID file.
       #
-      # @api private
+      # :api: private
       def store_pid(port)
         store_details(port)
       end
 
       # Delete the pidfile for the specified port/socket.
       #
-      # @api private
+      # :api: private
       def remove_pid(port)
         FileUtils.rm(pid_file(port)) if File.file?(pid_file(port))
       end
@@ -257,7 +258,7 @@ module Merb
       # If Merb::Config[:pid_file] has been specified, that will be used
       # instead of the port/socket based PID file.
       #
-      # @api private
+      # :api: private
       def store_details(port = nil)
         file = pid_file(port)
         begin
@@ -285,7 +286,7 @@ module Merb
       #   Location of pid file for specified port. If clustered and pid_file option
       #   is specified, it adds the port/socket value to the path.
       #
-      # @api private
+      # :api: private
       def pid_file(port)
         pidfile = Merb::Config[:pid_file] || (Merb.log_path / "merb.%s.pid")
         pidfile % port
@@ -297,7 +298,7 @@ module Merb
       # Array::
       #   List of pid file paths. If not running clustered, the array contains a single path.
       #
-      # @api private
+      # :api: private
       def pid_files
         if Merb::Config[:pid_file]
           if Merb::Config[:cluster]
@@ -319,7 +320,7 @@ module Merb
       # ==== Alternatives
       # If group is left out, the user will be used as the group.
       # 
-      # @api private
+      # :api: private
       def _change_privilege(user, group=user)
         Merb.logger.warn! "Changing privileges to #{user}:#{group}"
 
@@ -353,7 +354,7 @@ module Merb
       
       # Add trap to enter IRB on SIGINT. Process exit if second SIGINT is received.
       #
-      # @api private
+      # :api: private
       def add_irb_trap
         Merb.trap("INT") do
           if @interrupted

data/lib/merb-core/tasks/gem_management.rb

@@ -361,4 +361,4 @@ TEXT
     Gem.source_index.load_gems_in(File.join(dir, 'specifications'))
   end
     
-end
+end

data/lib/merb-core/tasks/merb.rb

@@ -1,2 +1,4 @@
+local_gem_path = Gem.path if $BUNDLE
 require 'merb-core/tasks/merb_rake_helper'
-Dir[File.dirname(__FILE__) / '*.rake'].each { |ext| load ext }
+Gem.path.replace(local_gem_path) if local_gem_path
+Dir[File.dirname(__FILE__) / '*.rake'].each { |ext| load ext }

data/lib/merb-core/tasks/merb_rake_helper.rb

@@ -56,4 +56,4 @@ module Merb
     end
     
   end
-end
+end