merb 0.3.7 → 0.4.0

data/lib/merb/{merb_server.rb → server.rb}

@@ -3,29 +3,36 @@ require 'optparse'
 require 'ostruct'
 require 'fileutils'
 require 'yaml'
-require 'erubis'
 
 module Merb
 
   class Config
-    def self.setup
-      defaults = {
-        :host => "0.0.0.0",
-        :port => "4000",
-        :allow_reloading => true,
-        :merb_root => Dir.pwd,
-        :cache_templates => false,
-        :use_mutex => true,
-        :session_id_cookie_only => true,
-        :query_string_whitelist => []
-      }
-      begin
-        options = defaults.merge(YAML.load(Erubis::Eruby.new(IO.read("#{defaults[:merb_root]}/dist/conf/merb.yml")).result))
-      rescue
-        options = defaults
+    class << self
+      def defaults
+        @defaults ||= {
+          :host                   => "0.0.0.0",
+          :port                   => "4000",
+          :reloader               => true,
+          :merb_root              => Dir.pwd,
+          :cache_templates        => false,
+          :use_mutex              => true,
+          :session_id_cookie_only => true,
+          :query_string_whitelist => []
+        }
       end
 
-      options
+      def setup
+        if FileTest.exist? "#{defaults[:merb_root]}/framework"
+          $LOAD_PATH.unshift( "#{defaults[:merb_root]}/framework" )
+        end
+        merb_yml = "#{defaults[:merb_root]}/config/merb.yml"      
+        if File.exists?(merb_yml)
+          require 'merb/erubis_ext'
+          defaults.merge(Erubis.load_yaml_file(merb_yml))
+        else
+          defaults
+        end
+      end
     end
   end
   
@@ -37,6 +44,9 @@ module Merb
         options = Merb::Config.setup
       
         opts = OptionParser.new do |opts|
+          opts.version = "0.4.0"
+          opts.release = "svn"
+          
           opts.banner = "Usage: merb [fdcepghmisluMG] [argument]"
           opts.define_head "Merb Mongrel+ Erb. Lightweight replacement for ActionPack."
           opts.separator '*'*80
@@ -66,7 +76,7 @@ module Merb
           opts.on("-p", "--port PORTNUM", "Port to run merb on, defaults to 4000.") do |port|
             options[:port] = port
           end
-      
+
           opts.on("-h", "--host HOSTNAME", "Host to bind to (default is all IP's).") do |host|
             options[:host] = host
           end
@@ -93,26 +103,39 @@ module Merb
             options[:environment] = env
           end
           
-          opts.on("-r", "--script-runner ['RUBY CODE'| FULL_SCRIPT_PATH]", "Command-line option to run scripts and/or code in the merb app.") do |stuff_to_run|
+          opts.on("-r", "--script-runner ['RUBY CODE'| FULL_SCRIPT_PATH]", 
+            "Command-line option to run scripts and/or code in the merb app.") do |stuff_to_run|
             options[:runner] = stuff_to_run
           end
-          
+
           opts.on("-g", "--generate-app PATH", "Generate a fresh merb app at PATH.") do |path|
             options[:generate] = path || Dir.pwd
           end
-          
-          opts.on("-P", "--plugin ACTION NAME", "Do ACTION with a plugin called NAME.") do |action|
-            options[:plugin] = [action, ARGV] || nil
+
+          opts.on("-P","--generate-plugin PATH", "Generate a fresh merb plugin at PATH.") do |path|
+            options[:generate_plugin] = path || Dir.pwd
           end
-          
-          opts.on("-k", "--kill PORT or all", "Kill one merb proceses by port number. use merb -k all to kill all merbs.") do |ports|
+
+          opts.on("-k", "--kill PORT or all", "Kill one merb proceses by port number.  Use merb -k all to kill all merbs.") do |ports|
             options[:kill] = ports
           end
+
+          opts.on("-K", "--graceful PORT or all", "Gracefully kill one merb proceses by port number.  Use merb -K all to gracefully kill all merbs.") do |ports|
+            options[:graceful] = ports
+          end
           
           opts.on("-M", "--merb-config FILENAME", "This flag is for explicitly declaring the merb app's config file.") do |config|
             options[:merb_config] = config
           end
-         
+          
+          opts.on("-w", "--webrick", "Run merb using Webrick Rack Adapter instead of mongrel.") do |webport|
+            options[:webrick] = true
+          end
+          
+          opts.on("-F", "--fastcgi", "Run merb using FastCGI Rack Adapter instead of mongrel.") do
+            options[:fastcgi] = true
+          end
+          
           opts.on("-X", "--mutex on/off", "This flag is for turning the mutex lock on and off.") do |mutex|
             if mutex == 'off'
               options[:use_mutex] = false
@@ -121,21 +144,29 @@ module Merb
             end   
           end
           
-          opts.on("-?", "--help", "Show this help message") do
+          opts.on("-?", "-H", "--help", "Show this help message") do
             puts opts  
             exit
-          end
-          
+          end          
+        end
+
+        # Special case of looking for help
+        if ARGV == ["-h"]
+          puts opts  
+          exit
         end
-      
         opts.parse!(@@merb_raw_opts)
+        # merb <argument> is same as merb -g <argument>
+        if ARGV.size == 1
+          options[:generate] = File.expand_path(ARGV.last)
+        end
       
         # Added by: Rogelio J. Samour 2007-01-23
         # We need to reload the options that exist in the App's merb.yml
         # This is needed when one calls merb NOT from the merb_app ROOT
-        # like so: merb --merb-config /path/to/dist/conf/merb.yml -m /path/to/merb/app
+        # like so: merb --merb-config /path/to/config/merb.yml -m /path/to/merb/app
         # or if we add :merb_root: /path/to/merb/app in the merb.yml we can now only call it 
-        # like so: merb --merb-config /path/to/dist/conf/merb.yml
+        # like so: merb --merb-config /path/to/config/merb.yml
         if options[:merb_config]
           # Check and see if an environment has been set through the CLI
           # if so, save it in a temp. In this case, if merb.yml has an :environment:
@@ -143,7 +174,7 @@ module Merb
           if options[:environment]
             temp_env = options[:environment]
           end
-          options = options.merge(YAML.load(Erubis::Eruby.new(IO.read("#{options[:merb_config]}")).result))
+          options.merge!(Erubis.load_yaml_file("#{options[:merb_config]}"))
           if temp_env
             options[:environment] = temp_env
           end
@@ -161,26 +192,175 @@ module Merb
 
         @@merb_opts = options
       end
+
+      def max_mtime( files = [] )
+        files.map{ |file| File.mtime(file) rescue @mtime }.max
+      end
+      
+      def register_session_type(name, file, description = nil)
+        @registered_session_types ||= YAML::Omap.new
+        @registered_session_types[name] = {
+          :file => file,
+          :description => (description || "Using #{name} sessions")
+        }
+      end
       
+      def add_controller_mixins
+        types = @registered_session_types
+        Merb::Controller.class_eval do
+          lib = File.join(__DIR__, 'merb')
+          session_store = Merb::Server.config[:session_store].to_s
+          if ["", "false"].include?(session_store)
+            puts "Not Using Sessions"
+          elsif reg = types[session_store]
+            require reg[:file]
+            include ::Merb::SessionMixin
+            puts reg[:description]
+          else
+            puts "Session store not found, '#{Merb::Server.config[:session_store]}'."
+            puts "Defaulting to CookieStore Sessions"
+            require types['cookie'][:file]
+            include ::Merb::SessionMixin
+            puts "(plugin not installed?)"
+          end
+          
+          if Merb::Server.config[:basic_auth]
+            require lib + "/mixins/basic_authentication"
+            include ::Merb::AuthenticationMixin
+            puts "Basic Authentication mixed in"
+          end
+        end
+      end
+
       def initialize_merb
         require 'merb'
-        require @@merb_opts[:merb_root] / 'dist/conf/router.rb'
-        require @@merb_opts[:merb_root] / 'dist/conf/merb_init.rb'
-
-      end  
+        @mtime = Time.now if @@merb_opts[:reloader] == true
+        # Register session types before merb_init.rb so that any additional
+        # session stores will be added to the end of the list and become the
+        # default.
+        register_session_type('memory',
+          __DIR__ / "merb" / "session" / "memory_session",
+          "Using in-memory sessions; sessions will be lost whenever the server stops.")
+        register_session_type('mem_cache',
+          __DIR__ / "merb" / "session" / "mem_cache_session",
+          "Using MemCache distributed memory sessions")
+        register_session_type('cookie', # Last session type becomes the default
+          __DIR__ / "merb" / "session" / "cookie_store",
+          "Using 'share-nothing' cookie sessions (4kb limit per client)")
+        require @@merb_opts[:merb_root] / 'config/merb_init.rb'
+        add_controller_mixins
+      end
+      
+      def after_app_loads(&block)
+        @after_app_blocks ||= []
+        @after_app_blocks << block
+      end
+      
+      def app_loaded?
+        @app_loaded
+      end
+      
+      def load_action_arguments(klasses = Merb::Controller._subclasses)
+        klasses.each do |controller|
+          controller = Object.full_const_get(controller)
+          controller.action_argument_list = {}
+          controller.callable_actions.each do |action, bool|
+            controller.action_argument_list[action.to_sym] = ParseTreeArray.translate(controller, action).get_args
+          end
+        end if defined?(ParseTreeArray)
+      end
+      
+      def load_application
+        MERB_PATHS.each do |glob|
+          Dir[MERB_ROOT + glob].each { |m| require m }
+        end
+        load_action_arguments
+        @app_loaded = true
+        (@after_app_blocks || []).each { |b| b.call }
+      end
       
+      def remove_constant(const)
+        parts = const.to_s.split("::")
+        base = parts.size == 1 ? Object : Object.full_const_get(parts[0..-2].join("::"))
+        object = parts[-1].intern
+        MERB_LOGGER.info("Removing constant #{object} from #{base}")
+        base.send(:remove_const, object) if object
+        Merb::Controller._subclasses.delete(const)
+      end
+
+      def reload
+        return if !@@merb_opts[:reloader] || !Object.const_defined?(:MERB_PATHS)
+        # First we collect all files in the project (this will also grab newly added files)
+        project_files = MERB_PATHS.map { |path| Dir[@@merb_opts[:merb_root] + path] }.flatten.uniq
+        project_mtime = max_mtime project_files # Latest changed time of all project files
+
+        return if @mtime.nil? || @mtime >= project_mtime   # Only continue if a file has changed
+
+        project_files.each do |file|
+          if File.mtime(file) >= @mtime
+            # If the file has changed or been added since the last project reload time
+            # remove any cannonical constants, based on what type of project file it is
+            # and then reload the file
+            begin
+              constant = case file
+                when %r[/app/(models|controllers|parts|mailers)/(.+)\.rb$]
+                  $2.to_const_string
+                when %r[/app/(helpers)/(.+)\.rb$]
+                  "Merb::" + $2.to_const_string
+                end
+                remove_constant(constant)
+            rescue NameError => e
+              MERB_LOGGER.warn "Couldn't remove constant #{constant}"
+            end
+            
+            begin
+              MERB_LOGGER.info("Reloading file #{file}")
+              old_subclasses = Merb::Controller._subclasses.dup
+              load(file)
+              loaded_classes = Merb::Controller._subclasses - old_subclasses
+              load_action_arguments(loaded_classes)
+            rescue Exception => e
+              puts "Error reloading file #{file}: #{e}"
+              MERB_LOGGER.warn "  Error: #{e}"
+            end
+            
+            # constant = file =~ /\/(controllers|models|mailers|helpers|parts)\/(.*).rb/ ? $2.to_const_string : nil
+            # remove_constant($2.to_const_string, ($1 == "helpers") ? Merb : nil)
+            # load file and puts "loaded file: #{file}"
+          end
+        end        
+        
+        @mtime = project_mtime # As the last action, update the current @mtime
+      end
+
       def run
         @@merb_raw_opts = ARGV
         merb_config
+
+        if @@merb_opts[:generate] #|| @@merb_opts.size == 1
+          require 'merb/generators/merb_app/merb_app'
+          ::Merb::AppGenerator.run @@merb_opts[:generate]
+          exit!
+        end  
+       
+        if ENV['EVENT'] || ENV['SWIFT']
+          @@merb_opts[:use_mutex] = false 
+        end
         
+        if @@merb_opts[:graceful]
+          @@merb_opts[:kill] = @@merb_opts[:graceful]
+          graceful = true
+        end
+
         if k = @@merb_opts[:kill]
           begin
             Dir[@@merb_opts[:merb_root] + "/log/merb.#{k == 'all' ? '*' : k }.pid"].each do |f|
               puts f
               pid = IO.read(f).chomp.to_i
-              Process.kill(9, pid)
+              signal = graceful ? 1 : 9
+              Process.kill(signal, pid)
               FileUtils.rm f
-              puts "killed PID: #{pid}"
+              puts "killed PID #{pid} with signal #{signal}"
             end
           rescue
             puts "Failed to kill! #{k}"
@@ -190,39 +370,36 @@ module Merb
         end  
         
         case @@merb_opts[:environment].to_s
-        when 'development'
-          @@merb_opts[:allow_reloading] ||= true
-          @@merb_opts[:show_error] ||= true
         when 'production'
-          @@merb_opts[:allow_reloading] = false
-          @@merb_opts[:show_error] ||= false
+          @@merb_opts[:reloader] = @@merb_opts.fetch(:reloader, false)
+          @@merb_opts[:exception_details] = @@merb_opts.fetch(:exception_details, false)
           @@merb_opts[:cache_templates] = true
-        when 'test'
-          @@merb_opts[:allow_reloading] ||= true
-          @@merb_opts[:show_error] ||= true
         else
-          @@merb_opts[:allow_reloading] ||= true  
-          @@merb_opts[:show_error] ||= true
-        end  
-        
-        @@merb_opts[:dist_root] = @@merb_opts[:merb_root]+'/dist' 
-        $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/app/models') )
-        $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/app/controllers') )
-        $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/lib') )
-        if File.exist? File.join(@@merb_opts[:dist_root] , '/framework')
-          $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/framework') )
+          @@merb_opts[:reloader] = @@merb_opts.fetch(:reloader, true)
+          @@merb_opts[:exception_details] = @@merb_opts.fetch(:exception_details, true)
         end
-           
-        if @@merb_opts[:generate]
-          require 'merb/generators/merb_app/merb_app'
-          ::Merb::AppGenerator.run @@merb_opts[:generate]
+        
+        @@merb_opts[:reloader_time] ||= 0.5 if @@merb_opts[:reloader] == true
+        
+        $LOAD_PATH.unshift( File.join(@@merb_opts[:merb_root] , '/app/models') )
+        $LOAD_PATH.unshift( File.join(@@merb_opts[:merb_root] , '/app/controllers') )
+        $LOAD_PATH.unshift( File.join(@@merb_opts[:merb_root] , '/lib') )
+
+        if @@merb_opts[:generate_plugin]
+          require 'merb/generators/merb_plugin'
+          ::Merb::PluginGenerator.run @@merb_opts[:generate_plugin]
           exit!
         end  
         
-        if @@merb_opts[:plugin]
-          require 'merb/merb_plugins'
-          ::Merb::PluginManager.action(@@merb_opts[:plugin].shift, @@merb_opts[:plugin][0].shift, @@merb_opts[:plugin])
-          exit!
+        if @@merb_opts[:reloader]
+          Thread.abort_on_exception = true
+          Thread.new do
+            loop do
+              sleep( @@merb_opts[:reloader_time] )
+              reload
+            end
+            Thread.exit
+          end
         end
         
         if @@merb_opts[:console]
@@ -278,6 +455,18 @@ module Merb
           exit if @@merb_opts[:only_drb]
         end  
         
+        if @@merb_opts[:webrick] 
+          puts "Starting merb webrick server on port: #{@@merb_opts[:port]}"
+          trap('TERM') { exit }
+          webrick_start(@@merb_opts[:port])
+        end
+        
+        if @@merb_opts[:fastcgi] 
+          trap('TERM') { exit }
+          fastcgi_start
+        end
+        
+        
         if @@merb_opts[:cluster]
           delete_pidfiles
           @@merb_opts[:port].to_i.upto(@@merb_opts[:port].to_i+@@merb_opts[:cluster].to_i-1) do |port|
@@ -317,6 +506,21 @@ module Merb
         end
       end
       
+      def webrick_start(port)
+        initialize_merb
+        require 'rack'
+        require 'merb/rack_adapter'
+        ::Rack::Handler::WEBrick.run Merb::Rack::Adapter.new,
+          :Port => port
+      end
+
+      def fastcgi_start
+        initialize_merb
+        require 'rack'
+        require 'merb/rack_adapter'
+        ::Rack::Handler::FastCGI.run Merb::Rack::Adapter.new
+      end
+      
       def delete_pidfiles(portor_star='*')
         Dir["#{@@merb_opts[:merb_root]}/log/merb.#{portor_star}.pid"].each do |pid|
           FileUtils.rm(pid)  rescue nil
@@ -326,7 +530,7 @@ module Merb
       def drbserver_start(port)
         puts "Starting merb drb server on port: #{port}"
         require 'merb/merb_drb_server'
-        drb_init = File.join(@@merb_opts[:merb_root], "/dist/conf/merb_drb_init")
+        drb_init = File.join(@@merb_opts[:merb_root], "/config/merb_drb_init")
         require drb_init if File.exist?(drb_init)
         DRb.start_service("druby://#{@@merb_opts[:host]}:#{port}", Merb::DrbServiceProvider)
         DRb.thread.join
@@ -346,12 +550,12 @@ module Merb
           mconf_hash[:group]  = @@merb_opts[:group]
         end
         mconfig = Mongrel::Configurator.new(mconf_hash) do
-          yconfig = YAML.load(Erubis::Eruby.new(IO.read(File.expand_path(@@merb_opts[:config]))).result) if @@merb_opts[:config]
           listener do
-            uri( "/", :handler => MerbUploadHandler.new(yconfig), :in_front => true) if @@merb_opts[:config]
-            uri "/", :handler => MerbHandler.new(@@merb_opts[:dist_root]+'/public')
+            uri( "/", :handler => MerbUploadHandler.new(@@merb_opts), :in_front => true) if @@merb_opts[:upload_path_match]
+            uri "/", :handler => MerbHandler.new(@@merb_opts[:merb_root]+'/public')
             uri "/favicon.ico", :handler => Mongrel::Error404Handler.new("") 
           end
+          MerbHandler.path_prefix = @@merb_opts[:path_prefix]
       
           trap("INT") { stop }
           run
@@ -362,8 +566,8 @@ module Merb
       def config
         @@merb_opts
       end 
-       
-    end
+      
+    end # class << self
     
   end # Server