merb 0.4.1 → 0.4.2

data/lib/merb/server.rb

@@ -4,7 +4,13 @@ require 'ostruct'
 require 'fileutils'
 require 'yaml'
 
+require File.join(File.dirname(__FILE__), 'erubis_ext')
+require File.join(File.dirname(__FILE__), 'version')
+
 module Merb
+  
+  module GlobalHelper
+  end
 
   class Config
     class << self
@@ -13,24 +19,28 @@ module Merb
           :host                   => "0.0.0.0",
           :port                   => "4000",
           :reloader               => true,
-          :merb_root              => Dir.pwd,
           :cache_templates        => false,
+          :merb_root              => Dir.pwd,
           :use_mutex              => true,
           :session_id_cookie_only => true,
-          :query_string_whitelist => []
+          :query_string_whitelist => [],
+          :mongrel_x_sendfile     => true
         }
       end
 
-      def setup
+      def setup(global_merb_yml = nil)
         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))
+        global_merb_yml ||= "#{defaults[:merb_root]}/config/merb.yml"
+        apply_configuration_from_file defaults, global_merb_yml
+      end
+
+      def apply_configuration_from_file(configuration, file)
+        if File.exists?(file)
+          configuration.merge(Erubis.load_yaml_file(file))
         else
-          defaults
+          configuration
         end
       end
     end
@@ -40,12 +50,17 @@ module Merb
     
     class << self
       
-      def merb_config
-        options = Merb::Config.setup
-      
+      def merb_config(argv = ARGV)
+        # Our primary configuration hash for the length of this method
+        options = {}
+        
+        # Environment variables always win
+        options[:environment] = ENV['MERB_ENV']
+
+        # Build a parser for the command line arguements
         opts = OptionParser.new do |opts|
-          opts.version = "0.4.0"
-          opts.release = "svn"
+          opts.version = Merb::VERSION
+          opts.release = Merb::RELEASE
           
           opts.banner = "Usage: merb [fdcepghmisluMG] [argument]"
           opts.define_head "Merb Mongrel+ Erb. Lightweight replacement for ActionPack."
@@ -78,7 +93,13 @@ module Merb
           end
 
           opts.on("-h", "--host HOSTNAME", "Host to bind to (default is all IP's).") do |host|
-            options[:host] = host
+            if host
+              options[:host] = host
+            else
+              # If no host was given, assume they meant they wanted help.
+              puts opts  
+              exit
+            end
           end
       
           opts.on("-m", "--merb-root MERB_ROOT", "The path to the MERB_ROOT for the app you want to run (default is current working dir).") do |merb_root|
@@ -100,7 +121,7 @@ module Merb
           end
           
           opts.on("-e", "--environment STRING", "Run merb in the correct mode(development, production, testing)") do |env|
-            options[:environment] = env
+            options[:environment] ||= env
           end
           
           opts.on("-r", "--script-runner ['RUBY CODE'| FULL_SCRIPT_PATH]", 
@@ -147,48 +168,34 @@ module Merb
           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)
+        # Parse what we have on the command line
+        opts.parse!(argv)
+
         # 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/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/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:
-          # set... it will be overwritten by the CLI. [Rogelio J. Samour] 2007-06-07
-          if options[:environment]
-            temp_env = options[:environment]
-          end
-          options.merge!(Erubis.load_yaml_file("#{options[:merb_config]}"))
-          if temp_env
-            options[:environment] = temp_env
-          end
-        end
-      
-        if ENV['MERB_ENV']
-          # ENV['MERB_ENV'] has precedence over all
-          options[:environment] = ENV['MERB_ENV']
+        if argv.size == 1
+          options[:generate] = File.expand_path(argv.last)
         end
+       	
+       	# If we run merb with no arguments and we are not inside a merb root
+       	# show the help message
+       	if (argv.size == 0) && !File.exists?("#{options[:merb_root] || Merb::Config.defaults[:merb_root]}/config/merb_init.rb") && !$TESTING
+       	  puts "You are not in the root of a merb application...\n"
+       	  puts opts 
+       	  exit 
+       	end
+        # Load up the configuration from file, but keep the command line
+        # options that may have been chosen. Also, pass-through if we have
+        # a new merb_config path.
+        options = Merb::Config.setup(options[:merb_config]).merge(options)
 
         # Finally, if all else fails... set the environment to 'development'
-        if options[:environment].nil?
-          options[:environment] = 'development'
-        end
+        options[:environment] ||= 'development'
+        
+        environment_merb_yml = "#{options[:merb_root]}/config/environments/#{options[:environment]}.yml"        
+        options = Merb::Config.apply_configuration_from_file options, environment_merb_yml
 
         @@merb_opts = options
       end
@@ -213,12 +220,24 @@ module Merb
           if ["", "false"].include?(session_store)
             puts "Not Using Sessions"
           elsif reg = types[session_store]
+            if session_store == "cookie" 
+              unless @@merb_opts[:session_secret_key] && (@@merb_opts[:session_secret_key].length >= 16)
+                puts("You must specify a session_secret_key in your merb.yml, and it must be at least 16 characters\nbailing out...")
+                exit! 
+              end
+              Merb::Controller.session_secret_key = @@merb_opts[:session_secret_key]
+            end
             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"
+            unless @@merb_opts[:session_secret_key] && (@@merb_opts[:session_secret_key].length >= 16)
+              puts("You must specify a session_secret_key in your merb.yml, and it must be at least 16 characters\nbailing out...")
+              exit! 
+            end            
+            Merb::Controller.session_secret_key = @@merb_opts[:session_secret_key]
             require types['cookie'][:file]
             include ::Merb::SessionMixin
             puts "(plugin not installed?)"
@@ -274,21 +293,22 @@ module Merb
         end if defined?(ParseTreeArray)
       end
       
-      def load_controller_template_path_cache
-        
-        # This gets all templates set in the controllers template roots
+      def template_paths(type = "*")
+        # This gets all templates set in the controllers template roots        
         template_paths = Merb::AbstractController._abstract_subclasses.map do |klass| 
           Object.full_const_get(klass)._template_root
         end.uniq.map do |path| 
-          Dir["#{path}/**/*"] 
+          Dir["#{path}/**/#{type}"] 
         end
         
         # This gets the templates that might be created outside controllers
         # template roots.  eg app/views/shared/*
-        template_paths << Dir["#{MERB_ROOT}/app/views/**/*"]
-        
-        template_paths = template_paths.flatten.compact.uniq
+        template_paths << Dir["#{MERB_ROOT}/app/views/**/*"] if type == "*"
         
+        template_paths.flatten.compact.uniq || []
+      end
+      
+      def load_controller_template_path_cache
         Merb::AbstractController.reset_template_path_cache!
 
         template_paths.each do |template|
@@ -296,12 +316,22 @@ module Merb
         end
       end
       
+      def load_erubis_inline_helpers
+        partials = template_paths("_*.erb")
+
+        partials.each do |partial|
+          eruby = Erubis::Eruby.new(File.read(partial))
+          eruby.def_method(Merb::GlobalHelper, partial.gsub(/[^\.a-zA-Z0-9]/, "__").gsub(/\./, "_"), partial)
+        end        
+      end
+      
       def load_application
         MERB_PATHS.each do |glob|
           Dir[MERB_ROOT + glob].each { |m| require m }
         end
         load_action_arguments
         load_controller_template_path_cache
+        load_erubis_inline_helpers
         @app_loaded = true
         (@after_app_blocks || []).each { |b| b.call }
       end
@@ -317,9 +347,11 @@ module Merb
 
       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
+        erb_partials = template_paths("_*.erb").map { |path| Dir[path] }.flatten.uniq
+        project_mtime = max_mtime(project_files + erb_partials) # Latest changed time of all project files
 
         return if @mtime.nil? || @mtime >= project_mtime   # Only continue if a file has changed
 
@@ -346,7 +378,6 @@ module Merb
               load(file)
               loaded_classes = Merb::Controller._subclasses - old_subclasses
               load_action_arguments(loaded_classes)
-              load_controller_template_path_cache
             rescue Exception => e
               puts "Error reloading file #{file}: #{e}"
               MERB_LOGGER.warn "  Error: #{e}"
@@ -357,13 +388,16 @@ module Merb
             # load file and puts "loaded file: #{file}"
           end
         end        
-        
+
+        # Rebuild the glob cache and erubis inline helpers
+        load_controller_template_path_cache
+        load_erubis_inline_helpers
+
         @mtime = project_mtime # As the last action, update the current @mtime
       end
 
       def run
-        @@merb_raw_opts = ARGV
-        merb_config
+        load_config
 
         if @@merb_opts[:generate] #|| @@merb_opts.size == 1
           require 'merb/generators/merb_app/merb_app'
@@ -424,7 +458,7 @@ module Merb
           Thread.new do
             loop do
               sleep( @@merb_opts[:reloader_time] )
-              reload
+              reload if app_loaded?
             end
             Thread.exit
           end
@@ -434,13 +468,18 @@ module Merb
           initialize_merb
           _merb = Class.new do
             def self.show_routes(all_opts = false)
-              puts "== show_routes(all_opts = #{all_opts}) =="
-              puts "RouteMatcher:"
-              Merb::Router.matcher.routes.each {|route,opts| puts "  #{route}" + (all_opts ? " " + opts.inspect : "") }
-              puts
-              puts "RouteGenerator:"
-              # Sort alphabetically by the url part of the route for easier reading.
-              Merb::Router.generator.paths.sort {|a,b| a.last <=> b.last }.each {|p| puts "  " + p.inspect}
+              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
             
@@ -580,7 +619,7 @@ module Merb
         mconfig = Mongrel::Configurator.new(mconf_hash) do
           listener do
             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 "/", :handler => MerbHandler.new(@@merb_opts[:merb_root]+'/public', @@merb_opts[:mongrel_x_sendfile])
             uri "/favicon.ico", :handler => Mongrel::Error404Handler.new("") 
           end
           MerbHandler.path_prefix = @@merb_opts[:path_prefix]
@@ -593,6 +632,11 @@ module Merb
       
       def config
         @@merb_opts
+      end
+      
+      def load_config
+        @@merb_raw_opts = ARGV
+        merb_config
       end 
       
     end # class << self

data/lib/merb/session/cookie_store.rb

@@ -5,19 +5,19 @@ require 'openssl'       # to generate the HMAC message digest
 
 module Merb
   
-  module SessionMixin
+  module SessionMixin #:nodoc:
     def setup_session
-      MERB_LOGGER.info("Setting Cookie Store Sessions")
-      unless secret = Merb::Server.config[:session_secret_key]
-        raise 'You must set :session_secret_key in config/merb.yml for cookie sessions'
-      end
-      request.session = Merb::CookieStore.new(cookies[_session_id_key], secret)
+      MERB_LOGGER.info("Setting Up Cookie Store Sessions")
+      request.session = Merb::CookieStore.new(cookies[_session_id_key], session_secret_key)
+      @original_session = request.session.read_cookie
     end
     
-    def finalize_session      
+    def finalize_session
       MERB_LOGGER.info("Finalize Cookie Store Session")
-      if request.session.modified?
-        set_cookie(_session_id_key, request.session.read_cookie, _session_expiry) 
+      new_session = request.session.read_cookie
+
+      if @original_session != new_session
+        set_cookie(_session_id_key, new_session, _session_expiry) 
       end
     end
     
@@ -33,12 +33,12 @@ module Merb
   # TamperedWithCookie is raised if the data integrity check fails.
   #
   # A message digest is included with the cookie to ensure data integrity:
-  # a user cannot alter his user_id without knowing the secret key included in
-  # the hash. 
+  # a user cannot alter session data without knowing the secret key included
+  # in the hash. 
   # 
   # To use Cookie Sessions, set in config/merb.yml
   #  :session_secret_key - your secret digest key
-  #  :cookie_store_session - to true
+  #  :session_store: cookie
   class CookieStore
     # TODO (maybe):
     # include request ip address
@@ -62,7 +62,6 @@ module Merb
       end
       @secret = secret
       @data = unmarshal(cookie) || Hash.new
-      @modified = false
     end
     
     # return a cookie value. raises CookieOverflow if session contains too
@@ -75,15 +74,9 @@ module Merb
       end
     end
     
-    # returns true if the session has been modified since initialization
-    def modified?; @modified; end
-    
     # assigns a key value pair
     def []=(k, v)
-      unless @data[k]==v
-        @modified = true
-        @data[k] = v
-      end
+      @data[k] = v
     end
     
     def [](k)
@@ -92,8 +85,7 @@ module Merb
     
     # delete a key
     def delete(key)
-      if @data.has_key(key)
-        @modified = true
+      if @data.has_key?(key)
         @data.delete(key)
       end
     end

data/lib/merb/session/mem_cache_session.rb

@@ -2,7 +2,7 @@ require 'memcache_util'
 
 module Merb
 
-  module SessionMixin
+  module SessionMixin #:nodoc:
 
     def setup_session
       MERB_LOGGER.info("Setting up session")
@@ -68,7 +68,7 @@ module Merb
           # No cookie...make a new session_id
           session = generate
         end
-        if session.is_a?( MemCacheSession )
+        if session.is_a?(MemCacheSession)
           [session, session.session_id]
         else
           # recreate using the rails session as the data

data/lib/merb/session/memory_session.rb

@@ -1,6 +1,6 @@
 module Merb
   
-  module SessionMixin
+  module SessionMixin #:nodoc:
 
     def setup_session
       MERB_LOGGER.info("Setting up session")
@@ -19,6 +19,17 @@ module Merb
     end
   end
   
+  ##
+  # Sessions stored in memory.
+  #
+  # And a setting in +merb.yml+:
+  #
+  #   :session_store: mem_cache
+  #   :memory_session_ttl: 3600 (in seconds, one hour)
+  #
+  # Sessions will remain in memory until the server is stopped or the time
+  # as set in :memory_session_ttl expires.
+  
   class MemorySession
 
     attr_accessor :session_id