merb-core 0.9.2 → 0.9.3

data/lib/merb-core/dispatch/exceptions.html.erb

@@ -169,7 +169,7 @@
 	<div class="internalError">
 		
 		<div class="header">
-			<h1><%= @exception_name %> <sup class="error_<%= @exception.class::STATUS %>"><%= @exception.class::STATUS %></sup></h1>
+			<h1><%= @exception_name %> <sup class="error_<%= @exception.class.status %>"><%= @exception.class.status %></sup></h1>
 			<% if show_details = ::Merb::Config[:exception_details] -%>
 				<h2><%= html_escape(@exception.message) %></h2>
 			<% else -%>

data/lib/merb-core/dispatch/request.rb

@@ -549,6 +549,9 @@ module Merb
           parms[key] = val
         elsif after == "[]"
           (parms[key] ||= []) << val
+        elsif after =~ %r(^\[\])
+          parms[key] ||= []
+          parms[key] << normalize_params({}, after, val)
         else
           parms[key] ||= {}
           parms[key] = normalize_params(parms[key], after, val)

data/lib/merb-core/dispatch/router.rb

@@ -11,6 +11,7 @@ module Merb
     
     @@named_routes = {}
     @@routes = []
+    @@compiler_mutex = Mutex.new
     cattr_accessor :routes, :named_routes
     
     class << self
@@ -52,13 +53,15 @@ module Merb
       # ==== Returns
       # String:: A routing lambda statement generated from the routes.
       def compiled_statement
-        @@compiled_statement = "def match(request)\n"
-        @@compiled_statement << "  params = request.params\n"
-        @@compiled_statement << "  cached_path = request.path\n  cached_method = request.method.to_s\n  "
-        @@routes.each_with_index { |route, i| @@compiled_statement << route.compile(i == 0) }
-        @@compiled_statement << "  else\n    [nil, {}]\n"
-        @@compiled_statement << "  end\n"
-        @@compiled_statement << "end"
+        @@compiler_mutex.synchronize do
+          @@compiled_statement = "def match(request)\n"
+          @@compiled_statement << "  params = request.params\n"
+          @@compiled_statement << "  cached_path = request.path\n  cached_method = request.method.to_s\n  "
+          @@routes.each_with_index { |route, i| @@compiled_statement << route.compile(i == 0) }
+          @@compiled_statement << "  else\n    [nil, {}]\n"
+          @@compiled_statement << "  end\n"
+          @@compiled_statement << "end"
+        end
       end
 
       # Defines the match function for this class based on the

data/lib/merb-core/dispatch/router/behavior.rb

@@ -318,6 +318,8 @@ module Merb
       # :member<Hash>:
       #   Special settings and resources related to a specific member of this
       #   resource.
+      # :keys<Array>:
+      #   A list of the keys to be used instead of :id with the resource in the order of the url.
       #
       # ==== Block parameters
       # next_level<Behavior>:: The child behavior.
@@ -336,6 +338,7 @@ module Merb
       #    # GET     /posts/:id(\.:format)?    :action => "show"
       #    # GET     /posts/:id[;/]edit        :action => "edit"
       #    # PUT     /posts/:id(\.:format)?    :action => "update"
+      #    # GET     /posts/:id[;/]delete      :action => "delete"
       #    # DELETE  /posts/:id(\.:format)?    :action => "destroy"
       #
       #  # Nesting resources
@@ -350,15 +353,16 @@ module Merb
         next_level = match "/#{name}"
 
         name_prefix = options.delete :name_prefix
+        matched_keys =  options[:keys] ? options.delete(:keys).map{|k| ":#{k}"}.join("/")  : ":id"
 
         if name_prefix.nil? && !namespace.nil?
           name_prefix = namespace_to_name_prefix namespace
         end
-        
+
         unless @@parent_resource.empty?
           parent_resource = namespace_to_name_prefix @@parent_resource.join('_')
         end
-        
+
         options[:controller] ||= merged_params[:controller] || name.to_s
 
         singular = name.to_s.singularize
@@ -371,41 +375,45 @@ module Merb
         if member = options.delete(:member)
           member.each_pair do |action, methods|
             behaviors << Behavior.new(
-              { :path => %r{^/:id[/;]#{action}(\.:format)?$}, :method => /^(#{[methods].flatten * '|'})$/ },
-              { :action => action.to_s }, next_level
+            { :path => %r{^/#{matched_keys}[/;]#{action}(\.:format)?$}, :method => /^(#{[methods].flatten * '|'})$/ },
+            { :action => action.to_s }, next_level
             )
-            next_level.match("/:id/#{action}").to_route.name(:"#{action}_#{route_singular_name}")
+            next_level.match("/#{matched_keys}/#{action}").to_route.name(:"#{action}_#{route_singular_name}")
           end
         end
 
         if collection = options.delete(:collection)
           collection.each_pair do |action, methods|
             behaviors << Behavior.new(
-              { :path => %r{^[/;]#{action}(\.:format)?$}, :method => /^(#{[methods].flatten * '|'})$/ },
-              { :action => action.to_s }, next_level
+            { :path => %r{^[/;]#{action}(\.:format)?$}, :method => /^(#{[methods].flatten * '|'})$/ },
+            { :action => action.to_s }, next_level
             )
             next_level.match("/#{action}").to_route.name(:"#{action}_#{route_plural_name}")
           end
         end
 
-        routes = many_behaviors_to(behaviors + next_level.send(:resources_behaviors), options)
+        routes = many_behaviors_to(behaviors + next_level.send(:resources_behaviors, matched_keys), options)
+
+
 
         # Add names to some routes
         [['', :"#{route_plural_name}"],
-         ['/:id', :"#{route_singular_name}"],
-         ['/new', :"new_#{route_singular_name}"],
-         ['/:id/edit', :"edit_#{route_singular_name}"],
-         ['/:id/delete', :"delete_#{route_singular_name}"]
+        ["/#{matched_keys}", :"#{route_singular_name}"],
+        ['/new', :"new_#{route_singular_name}"],
+        ["/#{matched_keys}/edit", :"edit_#{route_singular_name}"],
+        ["/#{matched_keys}/delete", :"delete_#{route_singular_name}"]
         ].each do |path,name|
           next_level.match(path).to_route.name(name)
         end
-        
+
+
+        parent_keys = (matched_keys == ":id") ? ":#{singular}_id" : matched_keys
         if block_given?
           @@parent_resource.push(singular)
-          yield next_level.match("/:#{singular}_id")
+          yield next_level.match("/#{parent_keys}")
           @@parent_resource.pop
         end
-        
+
         routes
       end
 
@@ -438,6 +446,7 @@ module Merb
       #    # GET     /account/(\.:format)?       :action => "show"
       #    # GET     /account/[;/]edit           :action => "edit"
       #    # PUT     /account/(\.:format)?       :action => "update"
+      #    # GET     /account/[;/]delete         :action => "delete"
       #    # DELETE  /account/(\.:format)?       :action => "destroy"
       #
       # You can optionally pass :namespace and :controller to refine the routing
@@ -590,22 +599,22 @@ module Merb
       end
 
       # ==== Parameters
-      # parent<Merb::Router::Behavior>::
-      #   The parent behavior for the generated resource behaviors.
+      # matched_keys<String>::
+      #   The keys to match
       #
       # ==== Returns
       # Array:: Behaviors for a RESTful resource.
-      def resources_behaviors(parent = self)
+      def resources_behaviors(matched_keys = ":id")
         [
-          Behavior.new({ :path => %r[^/?(\.:format)?$],     :method => :get },    { :action => "index" },   parent),
-          Behavior.new({ :path => %r[^/index(\.:format)?$], :method => :get },    { :action => "index" },   parent),
-          Behavior.new({ :path => %r[^/new$],               :method => :get },    { :action => "new" },     parent),
-          Behavior.new({ :path => %r[^/?(\.:format)?$],     :method => :post },   { :action => "create" },  parent),
-          Behavior.new({ :path => %r[^/:id(\.:format)?$],   :method => :get },    { :action => "show" },    parent),
-          Behavior.new({ :path => %r[^/:id[;/]edit$],       :method => :get },    { :action => "edit" },    parent),
-          Behavior.new({ :path => %r[^/:id[;/]delete$],     :method => :get },    { :action => "delete" },  parent),
-          Behavior.new({ :path => %r[^/:id(\.:format)?$],   :method => :put },    { :action => "update" },  parent),
-          Behavior.new({ :path => %r[^/:id(\.:format)?$],   :method => :delete }, { :action => "destroy" }, parent)
+          Behavior.new({ :path => %r[^/?(\.:format)?$],     :method => :get },    { :action => "index" },   self),
+          Behavior.new({ :path => %r[^/index(\.:format)?$], :method => :get },    { :action => "index" },   self),
+          Behavior.new({ :path => %r[^/new$],               :method => :get },    { :action => "new" },     self),
+          Behavior.new({ :path => %r[^/?(\.:format)?$],     :method => :post },   { :action => "create" },  self),
+          Behavior.new({ :path => %r[^/#{matched_keys}(\.:format)?$],   :method => :get },    { :action => "show" },    self),
+          Behavior.new({ :path => %r[^/#{matched_keys}[;/]edit$],       :method => :get },    { :action => "edit" },    self),
+          Behavior.new({ :path => %r[^/#{matched_keys}[;/]delete$],     :method => :get },    { :action => "delete" },  self),
+          Behavior.new({ :path => %r[^/#{matched_keys}(\.:format)?$],   :method => :put },    { :action => "update" },  self),
+          Behavior.new({ :path => %r[^/#{matched_keys}(\.:format)?$],   :method => :delete }, { :action => "destroy" }, self)
         ]
       end
 

data/lib/merb-core/dispatch/router/route.rb

@@ -17,6 +17,7 @@ module Merb
       def initialize(conditions, params, behavior = nil, &conditional_block)
         @conditions, @params, @behavior = conditions, params, behavior
         @conditional_block = conditional_block
+        @fixation=false
         if @behavior && (path = @behavior.merged_original_conditions[:path])
           @segments = segments_from_path(path)
         end
@@ -92,7 +93,7 @@ module Merb
       # ==== Returns
       # Boolean::
       #   True if this route is a regexp, i.e. its behavior or one of the
-      #   behaviors ancestors is a regexp.
+      #   behavior's ancestors is a regexp.
       def regexp?
         behavior.regexp? || behavior.send(:ancestors).any? { |a| a.regexp? }
       end
@@ -130,8 +131,12 @@ module Merb
             else
               raise "Segment type '#{segment.class}' can't be converted to a string"
             end
-          (value.respond_to?(:to_param) ? value.to_param : value).to_s
+          (value.respond_to?(:to_param) ? value.to_param : value).to_s.unescape_regexp
         end.join
+        if query_params && format = query_params.delete(:format)
+          format = fallback[:format] if format == :current
+          url += ".#{format}"
+        end
         if query_params && !query_params.empty?
           url += "?" + Merb::Request.params_to_query_string(query_params)
         end

data/lib/merb-core/dispatch/session/cookie.rb

@@ -19,9 +19,8 @@ module Merb
     # has changed.
     def finalize_session
       new_session = request.session.read_cookie
-      
       if @original_session != new_session
-        set_cookie(_session_id_key, new_session, Time.now + _session_expiry) 
+        cookies.set_cookie(_session_id_key, new_session, :expires => (Time.now + _session_expiry))
       end
     end
 
@@ -82,7 +81,7 @@ module Merb
     # ==== Raises
     # CookieOverflow:: Session contains too much information.
     def read_cookie
-      unless @data.nil? or @data.empty? 
+      unless @data.nil?
         updated = marshal(@data)
         raise CookieOverflow if updated.size > MAX
         updated
@@ -154,9 +153,10 @@ module Merb
     # Hash:: The stored session data.
     def unmarshal(cookie)
       if cookie
-        data, digest = Merb::Request.unescape(cookie).split('--')
+        data, digest = cookie.split('--')
         return {} if data.blank?
         unless digest == generate_digest(data)
+          delete
           raise TamperedWithCookie, "Maybe the site's session_secret_key has changed?"
         end
         Marshal.load(Base64.decode64(data))

data/lib/merb-core/dispatch/session/memcached.rb

@@ -1,4 +1,3 @@
-require 'memcache_util'
 module Merb
 
   module SessionMixin #:nodoc:
@@ -19,7 +18,11 @@ module Merb
     # session has changed.
     def finalize_session 
       if @_fingerprint != Marshal.dump(request.session.data).hash
-        ::Cache.put("session:#{request.session.session_id}", request.session.data)
+        begin
+          CACHE.set("session:#{request.session.session_id}", request.session.data)
+        rescue => err
+          Merb.logger.debug("MemCache Error: #{err.message}")
+        end
       end
       set_cookie(_session_id_key, request.session.session_id, Time.now + _session_expiry) if (@_new_cookie || request.session.needs_new_cookie)
     end
@@ -34,7 +37,7 @@ module Merb
   ##
   # Sessions stored in memcached.
   #
-  # Requires setup in your +init.rb+:
+  # Requires setup in your +init.rb+.
   #
   #   require 'memcache'
   #   CACHE = MemCache.new('127.0.0.1:11211', { :namespace => 'my_app' })
@@ -42,6 +45,12 @@ module Merb
   # And a setting in +init.rb+:
   #
   #   c[:session_store] = 'memcache'
+  #
+  # If you are using the memcached gem instead of memcache-client, you must setup like this:
+  #
+  #   require 'memcached'
+  #   CACHE = Memcached.new('127.0.0.1:11211', { :namespace => 'my_app' })
+  #
   class MemCacheSession
 
     attr_accessor :session_id
@@ -75,7 +84,11 @@ module Merb
       #   sessions matched session_id, a new MemCacheSession will be generated.
       def persist(session_id)
         unless session_id.blank?
-          session = ::Cache.get("session:#{session_id}")
+          begin
+            session = CACHE.get("session:#{session_id}")
+          rescue => err
+            Merb.logger.debug("MemCache Error: #{err.message}")
+          end
           if session.nil?
             # Not in memcached, but assume that cookie exists
             session = new(session_id)
@@ -92,7 +105,6 @@ module Merb
           session_object.data = session
           [session_object, session_object.session_id]
         end
-
       end
 
       # Don't try to reload in dev mode.

data/lib/merb-core/logger.rb

@@ -161,7 +161,7 @@ module Merb
     # Close and remove the current log object.
     def close
       flush
-      @log.close if @log.respond_to?(:close)
+      @log.close if @log.respond_to?(:close) && !@log.tty?
       @log = nil
     end
 
@@ -227,4 +227,4 @@ module Merb
 
   end
   
-end
+end

data/lib/merb-core/plugins.rb

@@ -1,5 +1,5 @@
 module Merb
-  
+
   module Plugins
 
     # ==== Returns
@@ -9,17 +9,29 @@ module Merb
     def self.config
       @config ||= File.exists?(Merb.root / "config" / "plugins.yml") ? YAML.load(File.read(Merb.root / "config" / "plugins.yml")) || {} : {}
     end
-    
+
     # ==== Returns
-    # Array:: All Rakefiles for plugins.
+    # Array(String):: All Rakefile load paths Merb uses for plugins.
     def self.rakefiles
       Merb.rakefiles
     end
 
     # ==== Parameters
     # *rakefiles:: Rakefiles to add to the list of plugin Rakefiles.
+    #
+    # ==== Notes
+    #
+    # This is a recommended way to register your plugin's Raketasks
+    # in Merb.
+    #
+    # ==== Examples
+    # From merb_sequel plugin:
+    #
+    # if defined(Merb::Plugins)
+    #   Merb::Plugins.add_rakefiles "merb_sequel" / "merbtasks"
+    # end
     def self.add_rakefiles(*rakefiles)
       Merb.add_rakefiles *rakefiles
     end
   end
-end
+end

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

@@ -15,7 +15,10 @@ module Merb
       # :app:: The application
       def self.start(opts={})
         Merb.logger.warn!("Using Ebb adapter")
-        ::Ebb.start_server(opts[:app], opts)
+        Merb::Dispatcher.use_mutex = false
+        th = Thread.new { ::Ebb.start_server(opts[:app], opts) }
+        Merb::Server.change_privilege
+        th.join
       end
     end
   end

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

@@ -15,7 +15,9 @@ module Merb
       # :app<String>>:: The application name.
       def self.start(opts={})
         Merb.logger.warn!("Using EventedMongrel adapter")
+        Merb::Dispatcher.use_mutex = false
         server = ::Mongrel::HttpServer.new(opts[:host], opts[:port].to_i)
+        Merb::Server.change_privilege
         server.register('/', ::Merb::Rack::Handler::Mongrel.new(opts[:app]))
         server.run.join
       end

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

@@ -9,6 +9,7 @@ module Merb
       # :app<String>>:: The application name.
       def self.start(opts={})
         Merb.logger.warn!("Using FastCGI adapter")
+        Merb::Server.change_privilege
         ::Rack::Handler::FastCGI.run(opts[:app], opts)
       end
     end

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

@@ -17,6 +17,7 @@ module Merb
       def self.start(opts={})
         Merb.logger.warn!("Using Mongrel adapter")
         server = ::Mongrel::HttpServer.new(opts[:host], opts[:port].to_i)
+        Merb::Server.change_privilege
         server.register('/', ::Merb::Rack::Handler::Mongrel.new(opts[:app]))
         server.run.join
       end

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

@@ -13,6 +13,7 @@ module Merb
       # If opts[:runner_code] matches a filename, that file will be read and
       # the contents executed. Otherwise the code will be executed directly.
       def self.start(opts={})
+        Merb::Server.change_privilege
         if opts[:runner_code]
           if File.exists?(opts[:runner_code])
             eval(File.read(opts[:runner_code]), TOPLEVEL_BINDING, __FILE__, __LINE__)

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

@@ -15,10 +15,12 @@ module Merb
       # :app<String>>:: The application name.
       def self.start(opts={})
         Merb.logger.warn!("Using Thin adapter")
+        Merb::Dispatcher.use_mutex = false
         if opts[:host].include?('/')
           opts[:host] =  "#{opts[:host]}-#{opts[:port]}"
         end  
-        server = ::Thin::Server.new(opts[:host], opts[:port], opts[:app])
+        server = ::Thin::Server.start(opts[:host], opts[:port].to_i, opts[:app])
+        Merb::Server.change_privilege
         ::Thin::Logging.silent = true
         server.start!
       end

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

@@ -27,6 +27,7 @@ module Merb
         }
      
         server = ::WEBrick::HTTPServer.new(options)
+        Merb::Server.change_privilege
         server.mount("/", ::Rack::Handler::WEBrick, opts[:app])
         server.start
       end

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

@@ -12,7 +12,23 @@ module Merb
           @path_prefix = /^#{Regexp.escape(prefix)}/
         end
       end
-
+      
+      # ==== Parameters
+      # env<Hash>:: Environment variables to pass on to the application.
+      #
+      # ==== Returns
+      # true or false::
+      def deferred?(env)
+        strip_path_prefix(env) if @path_prefix  # Strip out the path_prefix if one was set 
+        path = env['PATH_INFO'] ? env['PATH_INFO'].chomp('/') : ""
+        if path =~ Merb.deferred_actions
+          Merb.logger.info! "Deferring Request: #{path}"
+          true
+        else
+          false
+        end    
+      end
+      
       # ==== Parameters
       # env<Hash>:: Environment variables to pass on to the application.
       #