merb-core 0.9.3 → 0.9.4

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

@@ -0,0 +1,31 @@
+module Merb
+  module Rack
+    class PathPrefix < Merb::Rack::Middleware
+
+      def initialize(app, path_prefix = nil)
+        super(app)
+        @path_prefix = /^#{Regexp.escape(path_prefix)}/
+      end
+      
+      def deferred?(env)
+        strip_path_prefix(env) 
+        @app.deferred?(env)
+      end
+      
+      def call(env)
+        strip_path_prefix(env) 
+        @app.call(env)
+      end
+
+      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
+        end
+      end
+      
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Merb
+  module Rack
+    class Profiler < Merb::Rack::Middleware
+
+      def initialize(app, min=1, iter=1)
+        super(app)
+        @min, @iter = min, iter
+      end
+
+      def call(env)
+        __profile__("profile_output", @min, @iter) do
+          @app.call(env)
+        end
+      end
+
+      
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+module Merb
+  module Rack
+    class Static < Merb::Rack::Middleware
+
+      def initialize(app,directory)
+        super(app)
+        @static_server = ::Rack::File.new(directory)
+      end
+      
+      def call(env)        
+        path = env['PATH_INFO'] ? env['PATH_INFO'].chomp('/') : ""
+        cached_path = (path.empty? ? 'index' : path) + '.html'
+        
+        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)
+        elsif path =~ /favicon\.ico/
+          return [404, {"Content-Type"=>"text/html"}, "404 Not Found."]
+        else
+          @app.call(env)
+        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
+      
+    end
+  end
+end

data/lib/merb-core/server.rb

@@ -22,25 +22,34 @@ module Merb
         @cluster = cluster
         if @cluster
           @port.to_i.upto(@port.to_i + @cluster.to_i-1) do |port|
+            pidfile = pid_file(port)
+            pid = IO.read(pidfile).chomp.to_i if File.exist?(pidfile)
+
             unless alive?(port)
               remove_pid_file(port)
-              puts "Starting merb server on port: #{port}"
+              puts "Starting merb server on port #{port}, pid file: #{pidfile} and process id is #{pid}" if Merb::Config[:verbose]
               daemonize(port)
             else
-              raise "Merb is already running on port: #{port}"
+              raise "Merb is already running: port is #{port}, pid file: #{pidfile}, process id is #{pid}"
             end
           end
         elsif Merb::Config[:daemonize]
+          pidfile = pid_file(port)
+          pid = IO.read(pidfile).chomp.to_i if File.exist?(pidfile)
+
           unless alive?(@port)
             remove_pid_file(@port)
+            puts "Daemonizing..." if Merb::Config[:verbose]
             daemonize(@port)
           else
-            raise "Merb is already running on port: #{port}"
+            raise "Merb is already running: port is #{port}, pid file: #{pidfile}, process id is #{pid}"
           end
         else
           trap('TERM') { exit }
           trap('INT') { puts "\nExiting"; exit }
+          puts "Running bootloaders..." if Merb::Config[:verbose]
           BootLoader.run
+          puts "Starting Rack adapter..." if Merb::Config[:verbose]
           Merb.adapter.start(Merb::Config.to_hash)
         end
       end
@@ -52,8 +61,11 @@ module Merb
       # Boolean::
       #   True if Merb is running on the specified port.
       def alive?(port)
+        puts "About to check if port #{port} is alive..." if Merb::Config[:verbose]
         pidfile = pid_file(port)
+        puts "Pidfile is #{pidfile}..." if Merb::Config[:verbose]
         pid = IO.read(pidfile).chomp.to_i
+        puts "Process id is #{pid}" if Merb::Config[:verbose]
         Process.kill(0, pid)
         true
       rescue
@@ -72,8 +84,8 @@ module Merb
         begin
           pidfiles = port == "all" ?
             pid_files : [ pid_file(port) ]
-            
-          pidfiles.each do |f|          
+
+          pidfiles.each do |f|
             pid = IO.read(f).chomp.to_i
             begin
               Process.kill(sig, pid)
@@ -98,6 +110,7 @@ module Merb
       # ==== Parameters
       # port<~to_s>:: The port of the Merb process to daemonize.
       def daemonize(port)
+        puts "About to fork..." if Merb::Config[:verbose]
         fork do
           Process.setsid
           exit if fork
@@ -117,13 +130,15 @@ module Merb
       def change_privilege
         if Merb::Config[:user]
           if Merb::Config[:group]
+            puts "About to change privilege to group #{Merb::Config[:group]} and user #{Merb::Config[:user]}" if Merb::Config[:verbose]
             _change_privilege(Merb::Config[:user], Merb::Config[:group])
           else
+            puts "About to change privilege to user #{Merb::Config[:user]}" if Merb::Config[:verbose]
             _change_privilege(Merb::Config[:user])
           end
         end
       end
-      
+
       # Removes a PID file used by the server from the filesystem.
       # This uses :pid_file options from configuration when provided
       # or merb.<port>.pid in log directory by default.
@@ -137,6 +152,7 @@ module Merb
       # instead of the port based PID file.
       def remove_pid_file(port)
         pidfile = pid_file(port)
+        puts "Removing pid file #{pidfile} (port is #{port})..."
         FileUtils.rm(pidfile) if File.exist?(pidfile)
       end
 
@@ -153,10 +169,12 @@ module Merb
       # instead of the port based PID file.
       def store_pid(port)
         pidfile = pid_file(port)
+        puts "Storing pid file to #{pidfile}..."
         FileUtils.mkdir_p(File.dirname(pidfile)) unless File.directory?(File.dirname(pidfile))
+        puts "Created directory, writing process id..." if Merb::Config[:verbose]
         File.open(pidfile, 'w'){ |f| f.write("#{Process.pid}") }
       end
-          
+
       # Gets the pid file for the specified port.
       #
       # ==== Parameters
@@ -202,8 +220,8 @@ module Merb
         else
           Dir[Merb.log_path / "merb.*.pid"]
         end
-       end      
-      
+       end
+
       # Change privileges of the process to the specified user and group.
       #
       # ==== Parameters

data/lib/merb-core/tasks/audit.rake

@@ -0,0 +1,68 @@
+namespace :audit do
+
+  desc "Print out the named and anonymous routes"
+  task :routes => :merb_env do
+    seen = []
+    unless Merb::Router.named_routes.empty?
+      puts "Named Routes"
+      Merb::Router.named_routes.each do |name,route|
+        puts "  #{name}: #{route}"
+        seen << route
+      end
+    end
+    puts "Anonymous Routes"
+    (Merb::Router.routes - seen).each do |route|
+      puts "  #{route}"
+    end
+    nil
+  end
+
+  desc "Print out all controllers"
+  task :controllers => :merb_env do
+    puts "\nControllers:\n\n"
+    abstract_controller_classes.each do |klass|
+      if klass.respond_to?(:subclasses_list)
+        puts "#{klass} < #{klass.superclass}"
+        subklasses = klass.subclasses_list.sort.map { |x| Object.full_const_get(x) }
+        unless subklasses.empty?
+          subklasses.each { |subklass| puts "- #{subklass}" }
+        else
+          puts "~ no subclasses"
+        end
+        puts
+      end
+    end
+  end
+  
+  desc "Print out controllers and their actions (use CONTROLLER=Foo,Bar to be selective)"
+  task :actions => :merb_env do
+    puts "\nControllers and their actions:\n\n"
+    filter_controllers = ENV['CONTROLLER'] ? ENV['CONTROLLER'].split(',') : nil
+    abstract_controllers = abstract_controller_classes
+    classes = Merb::AbstractController.subclasses_list.sort.map { |x| Object.full_const_get(x) }
+    classes = classes.select { |k| k.name.in?(filter_controllers) } if filter_controllers
+    classes.each do |subklass|
+      next if subklass.in?(abstract_controllers) || !subklass.respond_to?(:callable_actions)
+      puts "#{subklass} < #{subklass.superclass}"
+      unless subklass.callable_actions.empty?
+        subklass.callable_actions.sort.each do |action, null|
+          if subklass.respond_to?(:action_argument_list)
+            arguments, defaults = subklass.action_argument_list[action]
+            args = arguments.map { |name, value| value ? "#{name} = #{value.inspect}" : name.to_s }.join(', ')
+            puts args.empty? ? "- #{action}" : "- #{action}(#{args})"
+          else
+            puts "- #{action}"
+          end
+        end
+      else
+        puts "~ no callable actions"
+      end
+      puts
+    end    
+  end
+  
+  def abstract_controller_classes
+    ObjectSpace.classes.select { |x| x.superclass == Merb::AbstractController }.sort_by { |x| x.name }
+  end
+  
+end

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

@@ -0,0 +1 @@
+Dir[File.dirname(__FILE__) / '*.rake'].each { |ext| load ext }

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

@@ -0,0 +1,12 @@
+def sudo
+  ENV['MERB_SUDO'] ||= "sudo"
+  sudo = windows? ? "" : ENV['MERB_SUDO']
+end
+
+def windows?
+  (PLATFORM =~ /win32|cygwin/) rescue nil
+end
+
+def install_home
+  ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
+end

data/lib/merb-core/tasks/stats.rake

@@ -0,0 +1,71 @@
+def show_line(name, stats, color = nil)
+  ce = color ? "\033[0m" : ""
+  puts  "| #{color}#{name.to_s.capitalize.ljust(20)}#{ce} " + 
+        "| #{color}#{stats[:lines].to_s.rjust(7)}#{ce} " +
+        "| #{color}#{stats[:loc].to_s.rjust(7)}#{ce} " +
+        "| #{color}#{stats[:classes].to_s.rjust(7)}#{ce} " +
+        "| #{color}#{stats[:modules].to_s.rjust(7)}#{ce} " +
+        "| #{color}#{stats[:methods].to_s.rjust(7)}#{ce} |"
+  puts separator
+end
+
+def separator
+  '+----------------------+---------+---------+---------+---------+---------+'
+end
+
+def check_dir(dir)
+  Dir.foreach(dir) do |file_name|
+    if File.stat(dir / file_name).directory? and (/^\./ !~ file_name)
+      check_dir(dir / file_name)
+    end
+
+    if file_name =~ /.*\.rb$/
+      File.open(dir / file_name).each_line do |line|
+        @stats[:lines]    += 1
+        @stats[:loc]      += 1 unless line =~ /^\s*$/ || line =~ /^\s*#/
+        @stats[:classes]  += 1 if line =~ /class [A-Z]/
+        @stats[:modules]  += 1 if line =~ /module [A-Z]/
+        @stats[:methods]  += 1 if line =~ /def [a-z]/
+      end
+    end
+  end
+end
+
+desc "Lines of code statistics"
+task :stats do
+  STATISTICS_DIRS = {
+    :controllers  => 'app/controllers',
+    :helpers      => 'app/helpers',
+    :models       => 'app/models',
+    :lib          => 'lib',
+    :spec         => 'spec'
+  }
+  EMPTY_STATS = { :lines => 0, :loc => 0, :classes => 0, :modules => 0, :methods => 0 }
+ 
+  @all = {}
+  total = EMPTY_STATS.clone
+  ce = "\033[0m"
+  cb = "\033[35m"
+  cg = "\033[4;32m"
+  cr = "\033[31m"
+ 
+  puts separator
+  puts "| #{cg}Name#{ce}                 | #{cg}Lines#{ce}   | #{cg}LOC#{ce}     | #{cg}Classes#{ce} | #{cg}Modules#{ce} | #{cg}Methods#{ce} |"
+  puts separator
+ 
+  STATISTICS_DIRS.each_pair do |name, dir| 
+    @stats = EMPTY_STATS.clone
+    check_dir(dir)
+    @all[name] = @stats
+    show_line(name, @stats)
+    @stats.each_pair { |type, count| total[type] += count }
+  end
+ 
+  show_line('Total', total, cr)
+ 
+  code_loc = [:controllers, :helpers, :models].inject(0) { |sum, e| sum += @all[e][:loc] }
+  test_loc = @all[:spec][:loc]
+ 
+  puts "   Code LOC: #{cb}#{code_loc}#{ce}     Test LOC: #{cb}#{test_loc}#{ce}     Test to code radio:  #{cb}1:%0.2f#{ce}" % (test_loc.to_f / code_loc.to_f)
+  puts
+end

data/lib/merb-core/test.rb

@@ -2,9 +2,10 @@ require "hpricot"
 
 require 'merb-core/test/test_ext/hpricot'
 require 'merb-core/test/test_ext/object'
+require 'merb-core/test/test_ext/string'
 
 module Merb; module Test; end; end
 
 require 'merb-core/test/helpers'
 
-require 'merb-core/test/matchers'
+require 'merb-core/test/matchers'

data/lib/merb-core/test/helpers/multipart_request_helper.rb

@@ -97,8 +97,8 @@ module Merb::Test::MultipartRequestHelper
   # &blk:: The block is executed in the context of the controller.
   #  
   # ==== Example
-  #   dispatch_multipart_to(MyController, :create, :my_file => @a_file ) do
-  #     self.stub!(:current_user).and_return(@user)
+  #   dispatch_multipart_to(MyController, :create, :my_file => @a_file ) do |controller|
+  #     controller.stub!(:current_user).and_return(@user)
   #   end
   #
   # ==== Notes
@@ -172,4 +172,4 @@ module Merb::Test::MultipartRequestHelper
                               :content_length => body.length), :post_body => body)
     end
   end
-end
+end

data/lib/merb-core/test/helpers/request_helper.rb

@@ -87,8 +87,8 @@ module Merb
       #   the action being dispatched.
       #
       # ==== Example
-      #   dispatch_to(MyController, :create, :name => 'Homer' ) do
-      #     self.stub!(:current_user).and_return(@user)
+      #   dispatch_to(MyController, :create, :name => 'Homer' ) do |controller|
+      #     controller.stub!(:current_user).and_return(@user)
       #   end
       #
       # ==== Notes
@@ -97,12 +97,8 @@ module Merb
       #---
       # @public
       def dispatch_to(controller_klass, action, params = {}, env = {}, &blk)
-        action = action.to_s
-        request_body = { :post_body => env[:post_body], :req => env[:req] }
-        request = fake_request(env.merge(
-          :query_string => Merb::Request.params_to_query_string(params)), request_body)
-
-        dispatch_request(request, controller_klass, action, &blk)
+        params = merge_controller_and_action(controller_klass, action, params)
+        dispatch_request(build_request(params, env), controller_klass, action.to_s, &blk)
       end
 
 
@@ -126,8 +122,8 @@ module Merb
       #   the action being dispatched.
       #
       # ==== Example
-      #   dispatch_with_basic_authentication_to(MyController, :create, 'Fred', 'secret', :name => 'Homer' ) do
-      #     self.stub!(:current_user).and_return(@user)
+      #   dispatch_with_basic_authentication_to(MyController, :create, 'Fred', 'secret', :name => 'Homer' ) do |controller|
+      #     controller.stub!(:current_user).and_return(@user)
       #   end
       #
       # ==== Notes
@@ -136,13 +132,47 @@ module Merb
       #---
       # @public
       def dispatch_with_basic_authentication_to(controller_klass, action, username, password, params = {}, env = {}, &blk)
-        action = action.to_s
-        request_body = { :post_body => env[:post_body], :req => env[:req] }
         env["X_HTTP_AUTHORIZATION"] = "Basic #{Base64.encode64("#{username}:#{password}")}"
-        request = fake_request(env.merge(
-          :query_string => Merb::Request.params_to_query_string(params)), request_body)
+        
+        params = merge_controller_and_action(controller_klass, action, params)        
+        dispatch_request(build_request(params, env), controller_klass, action.to_s, &blk)
+      end
+      
+      def merge_controller_and_action(controller_klass, action, params)
+        params[:controller] = controller_klass.name.to_const_path
+        params[:action]     = action.to_s
+        
+        params
+      end
 
-        dispatch_request(request, controller_klass, action, &blk)
+      # Prepares and returns a request suitable for dispatching with
+      # dispatch_request. If you don't need to modify the request
+      # object before dispatching (e.g. to add cookies), you probably
+      # want to use dispatch_to instead.
+      #
+      # ==== Parameters
+      # params<Hash>::
+      #   An optional hash that will end up as params in the controller instance.
+      # env<Hash>::
+      #   An optional hash that is passed to the fake request. Any request options
+      #   should go here (see +fake_request+), including :req or :post_body
+      #   for setting the request body itself.
+      #
+      # ==== Example
+      #   req = build_request(:id => 1)
+      #   req.cookies['app_cookie'] = "testing"
+      #   dispatch_request(req, MyController, :edit)
+      #
+      # ==== Notes
+      # Does not use routes.
+      #
+      #---
+      # @public      
+      def build_request(params = {}, env = {})
+        params             = Merb::Request.params_to_query_string(params)
+        env[:query_string] = env["QUERY_STRING"] ? "#{env["QUERY_STRING"]}&#{params}" : params
+        
+        fake_request(env, { :post_body => env[:post_body], :req => env[:req] })
       end
 
       # An HTTP GET request that operates through the router.
@@ -157,6 +187,8 @@ module Merb
       # &blk::
       #   The controller is yielded to the block provided for actions *prior* to
       #   the action being dispatched.
+      #---
+      # @public      
       def get(path, params = {}, env = {}, &block)
         env[:request_method] = "GET"
         request(path, params, env, &block)
@@ -174,6 +206,8 @@ module Merb
       # &blk::
       #   The controller is yielded to the block provided for actions *prior* to
       #   the action being dispatched.
+      #---
+      # @public      
       def post(path, params = {}, env = {}, &block)
         env[:request_method] = "POST"
         request(path, params, env, &block)
@@ -191,6 +225,8 @@ module Merb
       # &blk::
       #   The controller is yielded to the block provided for actions *prior* to
       #   the action being dispatched.
+      #---
+      # @public      
       def put(path, params = {}, env = {}, &block)
         env[:request_method] = "PUT"
         request(path, params, env, &block)
@@ -208,6 +244,8 @@ module Merb
       # &blk::
       #   The controller is yielded to the block provided for actions *prior* to
       #   the action being dispatched.
+      #---
+      # @public
       def delete(path, params = {}, env = {}, &block)
         env[:request_method] = "DELETE"
         request(path, params, env, &block)
@@ -228,8 +266,8 @@ module Merb
       #   the action being dispatched.
       #
       # ==== Example
-      #   request(path, { :name => 'Homer' }, { :request_method => "PUT" }) do
-      #     self.stub!(:current_user).and_return(@user)
+      #   request(path, { :name => 'Homer' }, { :request_method => "PUT" }) do |controller|
+      #     controller.stub!(:current_user).and_return(@user)
       #   end
       #
       # ==== Notes
@@ -239,7 +277,8 @@ module Merb
       # @semi-public
       def request(path, params = {}, env= {}, &block)
         env[:request_method] ||= "GET"
-        env[:request_uri] = path
+        env[:request_uri], env[:query_string] = path.split('?')
+        
         multipart = env.delete(:test_with_multipart)
 
         request = fake_request(env)
@@ -274,7 +313,7 @@ module Merb
       # Does not use routes.
       #
       #---
-      # @private
+      # @public
       def dispatch_request(request, controller_klass, action, &blk)
         controller = controller_klass.new(request)
         yield controller if block_given?
@@ -298,14 +337,17 @@ module Merb
       #
       # ==== Returns
       # Hash:: The parameters built based on the matching route.
+      #
+      #---
+      # @semi-public
       def check_request_for_route(request)
         match =  ::Merb::Router.match(request)
-        if match[0].nil?
+        if match[0].nil? && match[1].empty?
           raise ::Merb::ControllerExceptions::BadRequest, "No routes match the request"
         else
           match[1]
         end
-      end
-    end
-  end
-end
+      end # check_request_for_route
+    end # RequestHelper
+  end # Test
+end # Merb