merb 0.4.1 → 0.4.2

data/lib/merb/mixins/view_context.rb

@@ -48,7 +48,16 @@ module Merb
     #   image_tag('http://test.com/foo.gif')
     #   # => <img src="http://test.com/foo.gif">
     def image_tag(img, opts={})
-      opts[:path] ||= (img =~ %r{^https?://}) ? '' : '/images/'
+      opts[:path] ||= 
+        if img =~ %r{^https?://}
+          ''
+        else
+          if Merb::Server.config[:path_prefix]
+            Merb::Server.config[:path_prefix] + '/images/'
+          else
+            '/images/'
+          end
+        end
       opts[:src] ||= opts.delete(:path) + img
       %{<img #{ opts.to_xml_attributes } />}    
     end
@@ -258,7 +267,9 @@ module Merb
       include_tag = ""
       scripts.each do |script|
         script = script.to_s
-        include_tag << %Q|<script src="/javascripts/#{script=~/\.js$/ ? script : script+'.js' }" type="text/javascript">//</script>\n|
+        url = "/javascripts/#{script =~ /\.js$/ ? script : script + '.js'}"
+        url = Merb::Server.config[:path_prefix] + url if Merb::Server.config[:path_prefix]
+        include_tag << %Q|<script src="#{url}" type="text/javascript">//</script>\n|
       end
       include_tag
     end
@@ -287,7 +298,9 @@ module Merb
       include_tag = ""
       scripts.each do |script|
         script = script.to_s
-        include_tag << %Q|<link href="/stylesheets/#{script=~/\.css$/ ? script : script+'.css' }" media="all" rel="Stylesheet" type="text/css"/>\n|
+        url = "/stylesheets/#{script =~ /\.css$/ ? script : script + '.css'}"
+        url = Merb::Server.config[:path_prefix] + url if Merb::Server.config[:path_prefix]
+        include_tag << %Q|<link href="#{url}" media="all" rel="Stylesheet" type="text/css"/>\n|
       end
       include_tag
     end
@@ -339,8 +352,22 @@ module Merb
     # You can use catch_content :header anywhere in your templates.
     #
     #   <%= catch_content :header %>
-    def throw_content(name, content = nil, &block)
-      controller.thrown_content[name] << ( content || "" ) << capture( &block )
+    #
+    # You may find that you have trouble using thrown content inside a helper method
+    # There are a couple of mechanisms to get around this.
+    # 
+    # 1. Pass the content in as a string instead of a block
+    # 
+    # Example: 
+    #  
+    #   throw_content(:header, "Hello World")
+    #
+    # In Haml Templates, use the 
+    #
+    #
+    def throw_content(name, content = "", &block)
+      content << capture(&block) if block_given?
+      controller.thrown_content[name] << content
     end
     
     # Concat will concatenate text directly to the buffer of the template.

data/lib/merb/mixins/web_controller.rb

@@ -1,5 +1,8 @@
+# Used by secondary actions (a PartsController or the view)
+# to provide the standard objects associated with each request.
+
 module Merb
-  module WebControllerMixin
+  module WebControllerMixin #:nodoc:
     
     def request
        @web_controller.request  
@@ -24,6 +27,10 @@ module Merb
     def response
       @web_controller.response
     end    
+    
+    def route
+      request.route
+    end
      
   end
 end

data/lib/merb/mongrel_handler.rb

@@ -26,8 +26,9 @@ class MerbHandler < Mongrel::HttpHandler
   # Take the name of a directory and use that as the doc root or public
   # directory of your site. This is set to the root of your merb app + '/public'
   # by default.
-  def initialize(dir, opts = {})
+  def initialize(dir, mongrel_x_sendfile=true, opts = {})
     @files = Mongrel::DirHandler.new(dir,false)
+    @mongrel_x_sendfile = mongrel_x_sendfile
   end
   
   # process incoming http requests and do a number of things
@@ -42,12 +43,12 @@ class MerbHandler < Mongrel::HttpHandler
   # header. if you set this header to the path of a file in your controller
   # then mongrel will serve the file directly and your controller can go on
   # processing other requests.
-  def process(request, response)    
+  def process(request, response) 
+    return if response.socket.closed?
+       
     start      = Time.now
     benchmarks = {}
     
-    return if response.socket.closed?
-    
     MERB_LOGGER.info("\nRequest: REQUEST_URI: #{
       request.params[Mongrel::Const::REQUEST_URI]}  (#{Time.now.strftime("%Y-%m-%d %H:%M:%S")})")
     
@@ -107,19 +108,28 @@ class MerbHandler < Mongrel::HttpHandler
       end
       
       if sendfile
-        benchmarks[:sendfile_time] = Time.now - start        
-        MERB_LOGGER.info("X-SENDFILE: #{sendfile}\nComplete Request took: #{
-          benchmarks[:sendfile_time]} seconds")
-        file_status     = File.stat(sendfile)
-        response.status = 200
-        # Set the last modified times as well and etag for all files
-        response.header[Mongrel::Const::LAST_MODIFIED] = file_status.mtime.httpdate
-        # Calculated the same as apache, not sure how well the works on win32
-        response.header[Mongrel::Const::ETAG] = Mongrel::Const::ETAG_FORMAT % [file_status.mtime.to_i, file_status.size, file_status.ino]
-        # Send a status with out content length
-        response.send_status(file_status.size)
-        response.send_header
-        response.send_file(sendfile)
+        if @mongrel_x_sendfile
+          # we want to emulate X-Sendfile header internally in mongrel
+          benchmarks[:sendfile_time] = Time.now - start        
+          MERB_LOGGER.info("X-SENDFILE: #{sendfile}\nComplete Request took: #{
+            benchmarks[:sendfile_time]} seconds")
+          file_status     = File.stat(sendfile)
+          response.status = 200
+          # Set the last modified times as well and etag for all files
+          response.header[Mongrel::Const::LAST_MODIFIED] = file_status.mtime.httpdate
+          # Calculated the same as apache, not sure how well the works on win32
+          response.header[Mongrel::Const::ETAG] = Mongrel::Const::ETAG_FORMAT % [file_status.mtime.to_i, file_status.size, file_status.ino]
+          # Send a status with out content length
+          response.send_status(file_status.size)
+          response.send_header
+          response.send_file(sendfile)  
+        else
+          # we want to pass thru the X-Sendfile header so apache or whatever 
+          # front server can handle it
+          response.header['X-Sendfile'] = sendfile
+          response.header['Content-length'] = clength || File.size(sendfile)
+          response.finished
+        end    
       elsif controller.body.respond_to? :read
         response.send_status(clength)
         response.send_header

data/lib/merb/part_controller.rb

@@ -15,5 +15,15 @@ module Merb
       params[:action] = old_action
       @_body
     end    
+    
+    private 
+    
+    # This method is here to overwrite the one in the general_controller mixin
+    # The method ensures that when a url is generated with a hash, it contains a controller
+    def get_controller_for_url_generation(opts)
+       controller = opts[:controller] || @web_controller.params[:controller]
+       raise "No Controller Specified for url()" unless controller
+       controller
+    end
   end
 end    

data/lib/merb/request.rb

@@ -22,7 +22,11 @@ module Merb
         when :get, :head, :put, :delete
           request_method
         when :post
-          m = body_and_query_params['_method'] 
+          if self.class.parse_multipart_params
+            m = body_and_query_params.merge(multipart_params)['_method']
+          else  
+            m = body_and_query_params['_method']
+          end  
           m.downcase! if m
           METHODS.include?(m) ? m.to_sym : :post
         else
@@ -65,21 +69,31 @@ module Merb
       @body_and_query_params ||= begin
         h = query_params
         h.merge!(body_params) if body_params
-        h
+        h.to_mash
       end
     end
     
     def multipart_params
-      @multipart_params ||= begin
-        if Merb::Const::MULTIPART_REGEXP =~ content_type
-          self.class.parse_multipart(@body, $1, content_length)
+      @multipart_params ||= 
+        begin
+          if Merb::Const::MULTIPART_REGEXP =~ content_type
+            if  @body.size <= 0
+              {}
+            else  
+              self.class.parse_multipart(@body, $1, content_length)
+            end
+          else
+            {}
+          end
+        rescue ControllerExceptions::MultiPartParseError => e
+          @multipart_params = {}
+          raise e
         end
-      end
     end
     
     def json_params
       @json_params ||= begin
-        if [Merb::Const::APPLICATION_JSON, Merb::Const::TEXT_JSON].include?(content_type)
+        if Merb::Const::JSON_MIME_TYPE_REGEXP.match(content_type)
           JSON.parse(raw_post)
         end
       end
@@ -87,7 +101,7 @@ module Merb
     
     def xml_params
       @xml_params ||= begin
-        if [Merb::Const::APPLICATION_XML, Merb::Const::TEXT_XML].include?(content_type)
+        if Merb::Const::XML_MIME_TYPE_REGEXP.match(content_type)
           Hash.from_xml(raw_post) rescue Mash.new
         end
       end
@@ -97,7 +111,7 @@ module Merb
     
     def params
       @params ||= begin
-        h = route_params.to_mash.merge(body_and_query_params)        
+        h = body_and_query_params.merge(route_params)      
         h.merge!(multipart_params) if self.class.parse_multipart_params && multipart_params
         h.merge!(json_params) if self.class.parse_json_params && json_params
         h.merge!(xml_params) if self.class.parse_xml_params && xml_params
@@ -128,7 +142,11 @@ module Merb
     end
     
     def controller_name
-      route_params[:controller]
+      if route_params[:namespace]
+        route_params[:namespace] + '/' + route_params[:controller]
+      else
+        route_params[:controller]
+      end
     end
     
     def controller_class
@@ -157,7 +175,9 @@ module Merb
     
     def raw_post
       @body.rewind
-      @body.read
+      res = @body.read
+      @body.rewind
+      res
     end
     
     # Returns true if the request is an Ajax request.
@@ -334,7 +354,7 @@ module Merb
         bufsize = 16384
         content_length -= boundary_size
         status = input.read(boundary_size)
-        raise EOFError, "bad content body"  unless status == boundary + EOL
+        raise ControllerExceptions::MultiPartParseError, "bad content body:\n'#{status}' should == '#{boundary + EOL}'"  unless status == boundary + EOL
         rx = /(?:#{EOL})?#{Regexp.quote(boundary,'n')}(#{EOL}|--)/
         loop {
           head = nil
@@ -369,7 +389,7 @@ module Merb
             read_size = bufsize < content_length ? bufsize : content_length
             if( read_size > 0 )
               c = input.read(read_size)
-              raise EOFError, "bad content body"  if c.nil? || c.empty?
+              raise ControllerExceptions::MultiPartParseError, "bad content body"  if c.nil? || c.empty?
               buf << c
               content_length -= c.size
             end
@@ -389,7 +409,7 @@ module Merb
               :filename => File.basename(filename),  
               :content_type => content_type,  
               :tempfile => body, 
-              :size => File.size(body) 
+              :size => File.size(body.path) 
             }
           else
             data = body

data/lib/merb/router.rb

@@ -14,18 +14,18 @@ module Merb
       def append(&block)
         prepare(@@routes, [], &block)
       end
-      
+
       def prepend(&block)
         prepare([], @@routes, &block)
       end
-      
+
       def prepare(first = [], last = [], &block)
         @@routes = []
         yield Behavior.new({}, {:action => 'index'}) # defaults
         @@routes = first + @@routes + last
         compile
       end
-      
+
       def compiled_statement
         @@compiled_statement = "lambda { |request, params|\n"
         @@compiled_statement << "  cached_path = request.path\n  cached_method = request.method.to_s\n  "
@@ -35,17 +35,17 @@ module Merb
         @@compiled_statement << "  end\n"
         @@compiled_statement << "}"
       end
-      
+
       def compile
         meta_def(:match, &eval(compiled_statement))
       end
-      
+
       def generate(name, params = {}, fallback = {})
         raise "Named route not found: #{name}" unless @@named_routes.has_key? name
-        @@named_routes[name].generate(params, fallback)
+        @@named_routes[name].generate(params, fallback).sub(/\/$/, '').squeeze("/")
       end
     end # self
-    
+
     # Cache procs for future reference in eval statement
     class CachedProc
       @@index = 0
@@ -70,7 +70,7 @@ module Merb
         def [](index) @@list[index] end
       end
     end # CachedProc
-    
+
     class Route
       attr_reader :conditions, :conditional_block
       attr_reader :params, :behavior, :segments, :index, :symbol
@@ -82,19 +82,31 @@ module Merb
           @segments = segments_from_path(path)
         end
       end
-      
+
+      def to_s
+        r = ""
+        segments.each {|s|
+          if s.is_a?(Symbol)
+            r << ":#{s}"
+          else
+            r << s
+          end
+        }
+        r
+      end
+
       # Registers itself in the Router.routes array
       def register
         @index = Router.routes.size
         Router.routes << self
         self
       end
-      
+
       # Get the symbols out of the segments array
       def symbol_segments
         segments.select{ |s| s.is_a?(Symbol) }
       end
-      
+
       # Turn a path into string and symbol segments so it can be reconstructed, as in the
       # case of a named route.
       def segments_from_path(path)
@@ -109,17 +121,17 @@ module Merb
         segments << strip[path] unless path.empty?
         segments
       end
-      
+
       # Name this route
       def name(symbol = nil)
         @symbol = symbol
         Router.named_routes[@symbol] = self
       end
-      
+
       def regexp?
         behavior.regexp? || behavior.send(:ancestors).any?{ |a| a.regexp? }
       end
-      
+
       # Given a hash of +params+, returns a string using the stored route segments
       # for reconstruction of the URL.
       def generate(params = {}, fallback = {})
@@ -143,7 +155,7 @@ module Merb
           (value.respond_to?(:to_param) ? value.to_param : value).to_s
         end.join
       end
-      
+
       def if_conditions(params_as_string)
         cond = []
         condition_string = proc do |key, value, regexp_string|
@@ -157,7 +169,7 @@ module Merb
           "    (#{value.inspect} =~ #{regexp_string}" + captures + ")"
         end
         @conditions.each_pair do |key, value|
-          
+
           # Note: =~ is slightly faster than .match
           cond << case key
           when :path then condition_string[key, value, "cached_path"]
@@ -194,7 +206,7 @@ module Merb
           code << "    [#{@index.inspect}, {#{params_as_string}}]\n"
         end
       end
-      
+
       def behavior_trace
         if @behavior
           puts @behavior.send(:ancestors).reverse.map{|a| a.inspect}.join("\n"); puts @behavior.inspect; puts
@@ -203,7 +215,7 @@ module Merb
         end
       end
     end # Route
-    
+
     # The Behavior class is an interim route-building class that ties pattern-matching +conditions+ to
     # output parameters, +params+.
     class Behavior
@@ -223,7 +235,7 @@ module Merb
       def add(path, params = {})
         match(path).to(params)
       end
-      
+
       # Matches a +path+ and any number of optional request methods as conditions of a route.
       # Alternatively, +path+ can be a hash of conditions, in which case +conditions+ is ignored.
       # Yields 'self' so that sub-matching may occur.
@@ -235,7 +247,7 @@ module Merb
         end
         match_without_path(conditions, &block)
       end
-      
+
       def match_without_path(conditions = {})
         new_behavior = self.class.new(conditions, {}, self)
         conditions.delete :path if ['', '^$'].include?(conditions[:path])
@@ -247,7 +259,7 @@ module Merb
         @params.merge!(params)
         Route.new(compiled_conditions, compiled_params, self, &conditional_block)
       end
-      
+
       # Creates a Route from one or more Behavior objects, unless a +block+ is passed in.
       # If a block is passed in, a Behavior object is yielded and further .to operations
       # may be called in the block.  For example:
@@ -266,7 +278,7 @@ module Merb
           to_route(params).register
         end
       end
-      
+
       # Takes a block and stores it for defered conditional routes.  The block takes the
       # +request+ object and the +params+ hash as parameters and should return a hash of params.
       # For example:
@@ -281,7 +293,7 @@ module Merb
       def default_routes(params = {}, &block)
         match(%r[/:controller(/:action(/:id)?)?(\.:format)?]).to(params, &block)
       end
-      
+
       def to_resources(params = {}, &block)
         many_behaviors_to(resources_behaviors, params, &block)
       end
@@ -293,34 +305,47 @@ module Merb
 
         singular = name.to_s.singularize
         
-        route_plural_name = (options[:name_prefix] || "") + name.to_s
-        route_singular_name = (options[:name_prefix] || "") + singular
+        namespace = options[:namespace] || merged_params[:namespace]
+        
+        if options[:name_prefix].nil? && namespace != nil
+          options[:name_prefix] = "#{namespace}_"
+        end
         
+        name_prefix = options.delete(:name_prefix)
+
+
+        route_plural_name = "#{name_prefix}#{name}"
+        route_singular_name = "#{name_prefix}#{singular}"
+
+        member = options.delete(:member)
+        collection = options.delete(:collection)
+
         # Add optional member actions
-        options[:member].each_pair do |action, methods|
+
+        member.each_pair do |action, methods|
           conditions = {:path => %r[^/:id[/;]#{action}$], :method => /^(#{[methods].flatten.join("|")})$/}
           behaviors << Behavior.new(conditions, {:action => action.to_s}, next_level)
           next_level.match("/:id/#{action}").
             to_route.name(:"#{action}_#{route_singular_name}")
-        end if options[:member]
-        
+        end if member
+
         # Add optional collection actions
-        options[:collection].each_pair do |action, methods|
+        collection.each_pair do |action, methods|
           conditions = {:path => %r[^[/;]#{action}$], :method => /^(#{[methods].flatten.join("|")})$/}
           behaviors << Behavior.new(conditions, {:action => action.to_s}, next_level)
           next_level.match("/#{action}").to_route.name(:"#{action}_#{route_plural_name}")
-        end if options[:collection]
+        end if collection
+
+        options[:controller] ||= merged_params[:controller] || name.to_s
+        routes = many_behaviors_to(behaviors + next_level.send(:resources_behaviors), options)
 
-        controller = options[:controller] || merged_params[:controller] || name.to_s
-        routes = many_behaviors_to(behaviors + next_level.send(:resources_behaviors), :controller => controller)
-        
         # Add names to some routes
         next_level.match("").to_route.name(:"#{route_plural_name}")
         next_level.match("/:id").to_route.name(:"#{route_singular_name}")
         next_level.match("/new").to_route.name(:"new_#{route_singular_name}")
         next_level.match("/:id/edit").to_route.name(:"edit_#{route_singular_name}")
         next_level.match("/:action/:id").to_route.name(:"custom_#{route_singular_name}")
-        
+
         yield next_level.match("/:#{singular}_id") if block_given?
         routes
       end
@@ -332,10 +357,17 @@ module Merb
       def resource(name, options = {})
         next_level = match("/#{name}")
 
-        controller = options[:controller] || merged_params[:controller] || name.to_s
-        routes = next_level.to_resource(:controller => controller)
+        options[:controller] ||= merged_params[:controller] || name.to_s
+        name_prefix = options.delete(:name_prefix)
+        routes = next_level.to_resource(options)
+
+        namespace = options[:namespace] || merged_params[:namespace] 
+        
+        if options[:name_prefix].nil? && namespace != nil
+          options[:name_prefix] = "#{namespace}_"
+        end
         
-        route_name = (options[:name_prefix] || "") + name.to_s
+        route_name = "#{name_prefix}#{name}"
 
         next_level.match("").to_route.name(:"#{route_name}")
         next_level.match("/new").to_route.name(:"new_#{route_name}")
@@ -356,7 +388,7 @@ module Merb
             merged_so_far.merge(@original_conditions)
         end
       end
-      
+
       def merged_conditions
         if parent.nil?
           @conditions
@@ -387,11 +419,11 @@ module Merb
         end
         placeholders
       end
-      
+
       def inspect
         "[captures: #{path_captures}, conditions: #{@original_conditions.inspect}, params: #{@params.inspect}, placeholders: #{@placeholders.inspect}]"
       end
-      
+
       def regexp?
         @conditions_have_regexp
       end
@@ -409,7 +441,7 @@ module Merb
           Behavior.new({:path => %r[^/:id(\.:format)?$],   :method => :delete}, {:action => "destroy"}, parent)
         ]
       end
-      
+
       def resource_behaviors(parent = self)
         [
           Behavior.new({:path => %r{^[;/]new$},        :method => :get},    {:action => "new"},       parent),
@@ -452,7 +484,7 @@ module Merb
         end
         @original_conditions
       end
-      
+
       def deduce_placeholders
         @conditions.each_pair do |match_key, source|
           while match = SEGMENT_REGEXP.match(source)
@@ -475,13 +507,13 @@ module Merb
           list
         end
       end
-      
+
       # Count the number of regexp captures in the :path condition
       def path_captures
         return 0 unless conditions[:path]
         Behavior.count_parens_up_to(conditions[:path], conditions[:path].size)
       end
-      
+
       def total_previous_captures
         ancestors.map{|a| a.path_captures}.inject(0){|sum, n| sum + n}
       end
@@ -571,6 +603,6 @@ module Merb
         code
       end
     end # Behavior
-    
+
   end
 end