merb 0.2.0 → 0.3.0

data/lib/merb/merb_controller.rb

@@ -12,10 +12,18 @@ module Merb
   # to your controller via params. It also parses the ?query=string and
   # puts that into params as well.
   class Controller
-        
-    trait :layout => :application
-    trait :session_id_key => :_session_id
-        
+    
+    class_inheritable_accessor :_layout, 
+                               :_session_id_key, 
+                               :_template_extensions,
+                               :_template_root,
+                               :_layout_root
+    self._layout = :application
+    self._session_id_key = :_session_id
+    self._template_extensions = { }
+    self._template_root = File.expand_path(MERB_ROOT / "dist/app/views")
+    self._layout_root   = File.expand_path(MERB_ROOT / "dist/app/views/layout")
+    
     include Merb::ControllerMixin
     include Merb::RenderMixin
     include Merb::ResponderMixin
@@ -23,22 +31,22 @@ module Merb
     attr_accessor :status, :body, :request
 
     MULTIPART_REGEXP = /\Amultipart\/form-data.*boundary=\"?([^\";,]+)/n.freeze
-        
+    
     # parses the http request into params, headers and cookies
     # that you can use in your controller classes. Also handles
     # file uploads by writing a tempfile and passing a reference 
     # in params.
     def initialize(request, env, args, response)
       @env = MerbHash[env.to_hash]
-      @status, @method, @response, @headers = 200, (env['REQUEST_METHOD']||'GET').downcase.to_sym, response,
-          {'Content-Type' =>'text/html'}
-      cookies = query_parse(@env['HTTP_COOKIE'], ';,')
-      querystring = query_parse(@env['QUERY_STRING'])
+      @status, @method, @response, @headers = 200, (env[Mongrel::Const::REQUEST_METHOD]||Mongrel::Const::GET).downcase.to_sym, response,
+          Mongrel::Const::CONTENT_TYPE_TEXT_HTML_HASH
+      cookies = query_parse(@env[Mongrel::Const::HTTP_COOKIE], ';,')
+      querystring = query_parse(@env[Mongrel::Const::QUERY_STRING])
       
-      if MULTIPART_REGEXP =~ @env['CONTENT_TYPE'] && @method == :post
+      if MULTIPART_REGEXP =~ @env[Mongrel::Const::UPCASE_CONTENT_TYPE] && @method == :post
         querystring.update(parse_multipart(request, $1))
       elsif @method == :post
-        if ['application/json', 'text/x-json'].include?(@env['CONTENT_TYPE'])
+        if [Mongrel::Const::APPLICATION_JSON, Mongrel::Const::TEXT_JSON].include?(@env[Mongrel::Const::UPCASE_CONTENT_TYPE])
           MERB_LOGGER.info("JSON Request")
           json = JSON.parse(request.read || "") || {}
           json = MerbHash.new(json) if json.is_a? Hash
@@ -49,7 +57,7 @@ module Merb
       end
       
       @cookies, @params = cookies, querystring.update(args)
-      @cookies[ancestral_trait[:session_id_key]] = @params[ancestral_trait[:session_id_key]] if @params.key?(ancestral_trait[:session_id_key])
+      @cookies[_session_id_key] = @params[_session_id_key] if @params.key?(_session_id_key)
       
       allow = [:post, :put, :delete]
       allow << :get if MERB_ENV == 'development'
@@ -81,7 +89,7 @@ module Merb
       end
       call_filters(after_filters) 
       finalize_session if respond_to?:finalize_session
-      MERB_LOGGER.info("Time spent in #{action} action: #{Time.now - start} seconds")
+      MERB_LOGGER.info("Time spent in #{self.class}##{action} action: #{Time.now - start} seconds")
     end
     
     # override this method on your controller classes to specialize
@@ -126,15 +134,13 @@ module Merb
       @response
     end
     
-    trait :template_extensions => { }
-    trait :template_root => File.expand_path(MERB_ROOT / "dist/app/views")
-    trait :layout_root   => File.expand_path(MERB_ROOT / "dist/app/views/layout")
+
     # lookup the trait[:template_extensions] for the extname of the filename
     # you pass. Answers with the engine that matches the extension, Template::Erubis
     # is used if none matches.
     def engine_for(file)
       extension = File.extname(file)[1..-1]
-      ancestral_trait[:template_extensions][extension]
+      _template_extensions[extension]
     rescue
       ::Merb::Template::Erubis
     end
@@ -143,7 +149,7 @@ module Merb
     # a list of extensions that will be looked up on #render of an action.
     def self.register_engine(engine, *extensions)
       [extensions].flatten.uniq.each do |ext|
-        trait[:template_extensions][ext] = engine
+        _template_extensions[ext] = engine
       end  
     end
 
@@ -154,8 +160,8 @@ module Merb
     # from its superclasses. Since @@class variables are almost
     # global vars within an inheritance tree, we use 
     # @class_instance_variables instead
-    shared_accessor :before_filters
-    shared_accessor :after_filters
+    class_inheritable_accessor :before_filters
+    class_inheritable_accessor :after_filters
     
     # calls a filter chain according to rules.
     def call_filters(filter_set)

data/lib/merb/merb_dispatcher.rb

@@ -5,6 +5,10 @@ module Merb
       
       attr_accessor :path_prefix
       
+      def use_mutex=(val)
+        @@use_mutex = val
+      end
+      
       @@mutex = Mutex.new
       @@use_mutex = ::Merb::Server.use_mutex
       # This is where we grab the incoming request PATH_INFO
@@ -45,7 +49,7 @@ module Merb
       def route_path(path)
         path = path.sub(/\/+/, '/').sub(/\?.*$/, '')
         path = path[0..-2] if (path[-1] == ?/) && path.size > 1
-        Merb::RouteMatcher.new.route_request(path)
+        Merb::RouteMatcher.route_request(path)
       end
       
       # take a controller class name string and reload or require
@@ -57,14 +61,17 @@ module Merb
           raise "Bad controller! #{controller_name.snake_case}"
         end unless $TESTING
         begin
-          controller_name.import
+          unless MERB_ENV == 'production'
+            Object.send(:remove_const, controller_name.camel_case.intern) rescue nil
+            load(controller_name.snake_case + '.rb')
+          end
           return Object.const_get( controller_name.camel_case ).new(req, env, params, res)
         rescue RuntimeError
           warn "Error getting instance of '#{controller_name.camel_case}': #{$!}"
           raise $!
         end
       end
-    
+
     end # end class << self
       
   end

data/lib/merb/merb_exceptions.rb

@@ -43,7 +43,12 @@ module Merb
     
       backtrace.map! do |line|
         file, lineno, meth = line.scan(/(.*?):(\d+)(?::in `(.*?)')?/).first
-        lines = __caller_lines__(file, lineno, 5)
+        
+        # When a backtrace entry doesn't have a filepath as the first field 
+        # (e.g., "(haml):12" or "(eval):41:in `_haml_render'"), it'll cause 
+        # a second exception to be raised, masking the first.  This traps it.  
+        lines = (__caller_lines__(file, lineno, 5) rescue [])
+        
         [ lines, lines.object_id.abs, file, lineno, meth ]
       end
     

data/lib/merb/merb_handler.rb

@@ -62,7 +62,7 @@ class MerbHandler < Mongrel::HttpHandler
       @files.process(request,response)
     else
       begin
-        # dLet Merb:Dispatcher find the route and call the filter chain and action
+        # Let Merb:Dispatcher find the route and call the filter chain and action
         controller = nil
         controller, action = Merb::Dispatcher.handle(request, response)
         

data/lib/merb/merb_mailer.rb

@@ -1,7 +1,8 @@
-require 'net/smtp'
+
 
 begin
   require 'mailfactory'
+  require 'net/smtp'
 rescue LoadError
   puts "You need to install the mailfactory gem to use Merb::Mailer"
   MERB_LOGGER.warn "You need to install the mailfactory gem to use Merb::Mailer"
@@ -10,7 +11,7 @@ end
 module Merb
   class Mailer
     
-    shared_accessor :config
+    class_inheritable_accessor :config
     
     def sendmail
       sendmail = IO.popen("sendmail #{@mail.to}", 'w+')

data/lib/merb/merb_request.rb

@@ -50,6 +50,62 @@ module Merb
       @env['REQUEST_URI']
     end
     
+    def user_agent
+      @env['HTTP_USER_AGENT']
+    end
+
+    def server_name
+      @env['SERVER_NAME']
+    end
+
+    def accept_encoding
+      @env['HTTP_ACCEPT_ENCODING']
+    end
+
+    def script_name
+      @env['SCRIPT_NAME']
+    end
+
+    def cache_control
+      @env['HTTP_CACHE_CONTROL']
+    end
+
+    def accept_language
+      @env['HTTP_ACCEPT_LANGUAGE']
+    end
+
+    def host
+      @env['HTTP_HOST']
+    end
+
+    def server_software
+      @env['SERVER_SOFTWARE']
+    end
+
+    def keep_alive
+      @env['HTTP_KEEP_ALIVE']
+    end
+
+    def accept_charset
+      @env['HTTP_ACCEPT_CHARSET']
+    end
+
+    def version
+      @env['HTTP_VERSION']
+    end
+
+    def gateway
+      @env['GATEWAY_INTERFACE']
+    end
+
+    def accept
+      @env['HTTP_ACCEPT']
+    end
+
+    def connection
+      @env['HTTP_CONNECTION']
+    end
+
     def query_string
       @env['QUERY_STRING']  
     end

data/lib/merb/merb_router.rb

@@ -1,9 +1,5 @@
 module Merb
-  begin
-    require 'active_support'
-  rescue 
-    MERB_LOGGER.warn "You must have ActiveSupport installed to use merb restful routing\nNormal routing works fine without"
-  end
+
   # Merb::RouteMatcher is the request routing mapper for the merb framework.
   # You can define placeholder parts of the url with the :symbol notation.
   # so r.add '/foo/:bar/baz/:id', :class => 'Bar', :method => 'foo'
@@ -28,17 +24,7 @@ module Merb
       yield self
       compile_router
     end  
-    
-    # init @sections for route segment recognition
-    def initialize
-      @sections = Hash.new
-    end  
-    
-    # all defined routes in their raw form.
-    def routes
-      @@routes
-    end  
-    
+
     # the final compiled lambda that gets used
     # as the body of the route_request method.
     def self.compiled_statement
@@ -63,28 +49,20 @@ module Merb
     # against each of the compiled routes in turn.
     # first route that matches wins.
     def self.compile_router
-      router_lambda = @@routes.inject("lambda{|path| \n  case path\n") { |m,r|
+      router_lambda = @@routes.inject("lambda{|path| \n  sections={}\n  case path\n") { |m,r|
         m << compile(r)
       } <<"  else\n    return {:controller=>'Noroutefound', :action=>'noroute'}\n  end\n}"
       @@compiled_statement = router_lambda
-      define_method(:route_request, &eval(router_lambda))
+      meta_def(:route_request, &eval(router_lambda))
     end  
     
     # compile each individual route into a when /.../
     # component of the case statement. Takes /:sections
     # of the route def that start with : and turns them
     # into placeholders for whatever urls match against
-    # the route in question. Special case for the default
-    # /:controller/:action/:id route.
+    # the route in question.
     def self.compile(route)
       raise ArgumentError unless String === route[0]
-      if route[0] == '/:controller/:action/:id'
-        return '  when /\A\/([^\/;.,?]+)(?:\/?\Z|\/([^\/;.,?]+)\/?)(?:\/?\Z|\/([^\/;.,?]+)\/?)\Z/
-      @sections[:controller] = $1
-      @sections[:action] = $2 || \'index\'
-      @sections[:id] = $3 if $3
-      return @sections'<<"\n"
-      end
       code, count = '', 0
       while route[0] =~ @@section_regexp
         route[0] = route[0].dup
@@ -96,13 +74,13 @@ module Merb
         else  
           route[0].sub!(@@section_regexp, "([^\/,?]+)")
         end
-        code << "    @sections[:#{name}] = $#{count}\n"
+        code << "    sections[:#{name}] = $#{count}\n"
       end
       @@compiled_regexen << Regexp.new(route[0])
       index = @@compiled_regexen.size - 1
       condition = "  when @@compiled_regexen[#{index}] "
       statement = "#{condition}\n#{code}"
-      statement << "    return #{route[1].inspect}.update(@sections)\n"
+      statement << "    return #{route[1].inspect}.update(sections)\n"
       statement
     end
     
@@ -145,7 +123,7 @@ module Merb
       if block_given?
         procs = []
         yield Resource.new(res, procs, opts)
-        procs.reverse.each {|p| p.call}
+        procs.reverse.each &:call
       else
         generate_resources_routes(res,opts)
       end
@@ -157,7 +135,7 @@ module Merb
       if block_given?
         procs = []
         yield Resource.new(res, procs, opts)
-        procs.reverse.each {|p| p.call}
+        procs.reverse.each &:call
       else
         generate_singleton_routes(res,opts)
       end
@@ -165,19 +143,19 @@ module Merb
     
     def self.generate_resources_routes(res,opt)
       with_options :controller => res.to_s, :rest => true do |r|
-        r.add "#{opt[:prefix]}/#{res}/:id[;]edit", :allowed => {:get => 'edit'}
-        r.add "#{opt[:prefix]}/#{res}/new[;]:action", :allowed => {:get => 'new', :post => 'new', :put => 'new', :delete => 'new'}
+        r.add "#{opt[:prefix]}/#{res}/:id[;/]+edit", :allowed => {:get => 'edit'}
+        r.add "#{opt[:prefix]}/#{res}/new[;/]+:action", :allowed => {:get => 'new', :post => 'new', :put => 'new', :delete => 'new'}
         r.add "#{opt[:prefix]}/#{res}/new" , :allowed => {:get => 'new'}
         if mem = opt[:member]
           mem.keys.sort_by{|x| "#{x}"}.each {|action|
-            allowed = mem[action].inject({}) {|h, verb| h[verb] = "#{action}" ; h}
-            r.add "#{opt[:prefix]}/#{res}/:id[;]#{action}", :allowed => allowed
+            allowed = mem[action].injecting({}) {|h, verb| h[verb] = "#{action}"}
+            r.add "#{opt[:prefix]}/#{res}/:id[;/]+#{action}", :allowed => allowed
           }
         end
         if coll = opt[:collection]
           coll.keys.sort_by{|x| "#{x}"}.each {|action|
-            allowed = coll[action].inject({}) {|h, verb| h[verb] = "#{action}" ; h}
-            r.add "#{opt[:prefix]}/#{res}[;]#{action}", :allowed => allowed
+            allowed = coll[action].injecting({}) {|h, verb| h[verb] = "#{action}"}
+            r.add "#{opt[:prefix]}/#{res}[;/]+#{action}", :allowed => allowed
           }
         end  
         r.add "#{opt[:prefix]}/#{res}/:id\\.:format", :allowed => {:get => 'show', :put => 'update', :delete => 'destroy'}
@@ -189,13 +167,21 @@ module Merb
     
     def self.generate_singleton_routes(res,opt)
       with_options :controller => res.to_s, :rest => true do |r|
-        r.add "#{opt[:prefix]}/#{res}[;]edit", :allowed => {:get => 'edit'}
+        r.add "#{opt[:prefix]}/#{res}[;/]+edit", :allowed => {:get => 'edit'}
         r.add "#{opt[:prefix]}/#{res}\\.:format", :allowed => {:get => 'show'}
         r.add "#{opt[:prefix]}/#{res}/new" , :allowed => {:get => 'new'}
         r.add "#{opt[:prefix]}/#{res}/?", :allowed => {:get => 'show', :post => 'create', :put => 'update', :delete => 'destroy'}
       end
     end
     
+    def self.default_routes
+      add "/:controller/:action/:id\\.:format"
+      add "/:controller/:action/:id"
+      add "/:controller/:action\\.:format"
+      add "/:controller/:action"
+      add "/:controller\\.:format", :action => 'index'
+      add "/:controller", :action => 'index'
+    end
   end
 
 end

data/lib/merb/mixins/controller_mixin.rb

@@ -11,12 +11,13 @@ module Merb
       buf = ""
       content_length = @env['CONTENT_LENGTH'].to_i
       input = request
+      input.binmode if defined? input.binmode
       boundary_size = boundary.size + EOL.size
       bufsize = 16384
       content_length -= boundary_size
       status = input.read(boundary_size)
       raise EOFError, "bad content body"  unless status == boundary + EOL
-      rx = /(?:#{EOL})?#{Regexp.quote(boundary)}(#{EOL}|--)/
+      rx = /(?:#{EOL})?#{Regexp.quote(boundary,'n')}(#{EOL}|--)/
       
       loop {
         head = nil
@@ -32,7 +33,7 @@ module Merb
             content_type = head[CONTENT_TYPE_REGEX, 1]
             name = head[NAME_REGEX, 1]
             
-            if filename      
+            if filename && !filename.empty?      
               body = Tempfile.new(:Merb)
               body.binmode if defined? body.binmode
             end
@@ -58,9 +59,14 @@ module Merb
           content_length = -1  if $1 == "--"
         end
       
-        if filename
+        if filename && !filename.empty?   
           body.rewind
-          data = {:filename => filename, :type => content_type, :tempfile => body}
+          data = { 
+         	  :filename => File.basename(filename),  
+         	  :content_type => content_type,  
+         	  :tempfile => body, 
+         	  :size => File.size(body) 
+         	}
         else
           data = body
         end
@@ -90,7 +96,7 @@ module Merb
     # request into the params hash. So for example:
     # /foo?bar=nik&post[title]=heya&post[body]=whatever
     # parses into:
-    # {:bar => 'nik', :post => {:title => 'heya', :body => 'whatever}}
+    # {:bar => 'nik', :post => {:title => 'heya', :body => 'whatever'}}
     def query_parse(qs, d = '&;')
       m = proc {|_,o,n|o.u(n,&m)rescue([*o]<<n)}
       (qs||'').split(/[#{d}] */n).inject(MerbHash[]) { |h,p| 
@@ -161,6 +167,29 @@ module Merb
       return
     end
     
+    # stream_file( { :filename => file_name, 
+    #                :type => content_type,
+    #                :content_length => content_length }) do
+    #   @response.send_status(opts[:content_length])
+    #   @response.send_header
+    #   AWS::S3::S3Object.stream(user.folder_name + "-" + user_file.unique_id, bucket_name) do |chunk|
+    #       @response.write chunk
+    #   end
+    # end
+    def stream_file(opts={}, &stream)
+      opts.update(Merb::Const::DEFAULT_SEND_FILE_OPTIONS.merge(opts))
+      disposition = opts[:disposition].dup || 'attachment'
+      disposition << %(; filename="#{opts[:filename]}")
+      @response.headers.update(
+        'Content-Type'              => opts[:type].strip,  # fixes a problem with extra '\r' with some browsers
+        'Content-Disposition'       => disposition,
+        'Content-Transfer-Encoding' => 'binary',
+        'CONTENT-LENGTH'            => opts[:content_length]
+      )
+      stream
+    end
+    
+
     # This uses nginx X-Accel-Redirect header to send
     # a file directly from nginx. See the nginx wiki:
     # http://wiki.codemongers.com/NginxXSendfile