merb 0.1.0 → 0.2.0

data/lib/merb/merb_mailer.rb

@@ -4,7 +4,7 @@ begin
   require 'mailfactory'
 rescue LoadError
   puts "You need to install the mailfactory gem to use Merb::Mailer"
-  MERB_LOGGER.fatal "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"
 end  
 
 module Merb

data/lib/merb/merb_request.rb

@@ -1,7 +1,7 @@
 module Merb
 
   class Request
-    
+    attr_accessor :env
     def initialize(env, method)
       @env = env
       @method = method
@@ -40,11 +40,20 @@ module Merb
       @env['HTTPS'] == 'on' || @env['HTTP_X_FORWARDED_PROTO'] == 'https'
     end
     
+    # returns the request HTTP_REFERER.
+    def referer
+      @env['HTTP_REFERER']
+    end
+    
     # returns he request uri.
     def uri
       @env['REQUEST_URI']
     end
     
+    def query_string
+      @env['QUERY_STRING']  
+    end
+    
     # returns the uri without the query string.
     def path
       uri ? uri.split('?').first : ''
@@ -78,7 +87,7 @@ module Merb
     
     # returns the REQUEST_METHOD
     def method
-      @method ||= @env['REQUEST_METHOD']
+      @method ||= @env['REQUEST_METHOD'].downcase.intern
     end  
     
     # create predicate methods for querying the REQUEST_METHOD
@@ -92,4 +101,3 @@ module Merb
   
 end    
     
-    

data/lib/merb/merb_router.rb

@@ -1,5 +1,9 @@
 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'
@@ -20,6 +24,7 @@ module Merb
     def self.prepare
       @@routes = Array.new
       @@compiled_statement = String.new
+      @@compiled_regexen = Array.new
       yield self
       compile_router
     end  
@@ -36,6 +41,14 @@ module Merb
     
     # the final compiled lambda that gets used
     # as the body of the route_request method.
+    def self.compiled_statement
+      @@compiled_statement
+    end
+    
+    def self.compiled_regexen
+      @@compiled_regexen
+    end
+    
     def compiled_statement
       @@compiled_statement
     end
@@ -79,18 +92,110 @@ module Merb
         (name =~ /(\*+)(\w+)/) ? (flag = true; name = $2) : (flag = false)
         count += 1
         if flag
-          route[0].sub!(@@section_regexp, "([^;.,?]+)")
+          route[0].sub!(@@section_regexp, "([^,?]+)")
         else  
-          route[0].sub!(@@section_regexp, "([^\/;.,?]+)")
+          route[0].sub!(@@section_regexp, "([^\/,?]+)")
         end
         code << "    @sections[:#{name}] = $#{count}\n"
-      end  
-      condition = "  when Regexp.new('#{route[0]}')"
+      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}.merge(@sections)\n"
+      statement << "    return #{route[1].inspect}.update(@sections)\n"
       statement
     end
-          
+    
+    class Resource
+      # TODO : come up with naming convention and generate helper 
+      # methods for route generation. Route generation 
+      # framework needed but needs to be simple and light
+      
+      def initialize(resource, procs=[], opts={})
+        @resource, @procs, @opts = resource, procs, opts
+        @procs << proc { ::Merb::RouteMatcher.generate_resources_routes(@resource, @opts) }
+      end
+
+      def resources(res, opts={})
+        (opts[:prefix]||='') << "/#{@resource}/:#{@resource.to_s.singularize}_id"
+
+        opts[:prefix] = @opts[:prefix] + opts[:prefix]
+        if block_given?
+          yield self.class.new(res, @procs, opts)
+        else
+          @procs << proc { ::Merb::RouteMatcher.generate_resources_routes(res, opts) }
+        end
+      end
+      
+      def resource(res, opts={})
+        (opts[:prefix]||='') << "/#{@resource}/:#{@resource.to_s.singularize}_id"
+
+        opts[:prefix] = @opts[:prefix] + opts[:prefix]
+        if block_given?
+          yield self.class.new(res, @procs, opts)
+        else
+          @procs << proc { ::Merb::RouteMatcher.generate_singleton_routes(res, opts) }
+        end
+      end
+    end
+      
+    # add a resource to be compiled for rest style dispatch
+    def self.resources(res, opts={})
+      opts[:prefix] ||= ""
+      if block_given?
+        procs = []
+        yield Resource.new(res, procs, opts)
+        procs.reverse.each {|p| p.call}
+      else
+        generate_resources_routes(res,opts)
+      end
+    end
+    
+    # add a resource to be compiled for rest style dispatch
+    def self.resource(res, opts={})
+      opts[:prefix] ||= ""
+      if block_given?
+        procs = []
+        yield Resource.new(res, procs, opts)
+        procs.reverse.each {|p| p.call}
+      else
+        generate_singleton_routes(res,opts)
+      end
+    end
+    
+    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}/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
+          }
+        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
+          }
+        end  
+        r.add "#{opt[:prefix]}/#{res}/:id\\.:format", :allowed => {:get => 'show', :put => 'update', :delete => 'destroy'}
+        r.add "#{opt[:prefix]}/#{res}\\.:format", :allowed => {:get => 'index', :post => 'create'}
+        r.add "#{opt[:prefix]}/#{res}/:id", :allowed => {:get => 'show', :put => 'update', :delete => 'destroy'}
+        r.add "#{opt[:prefix]}/#{res}/?", :allowed => {:get => 'index', :post => 'create'}
+      end
+    end
+    
+    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}\\.: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
+    
   end
 
-end 
+end

data/lib/merb/merb_server.rb

@@ -14,8 +14,8 @@ module Merb
         :port => "4000",
         :allow_reloading => true,
         :merb_root => Dir.pwd,
-        :template_ext => {:html => :herb, :js => :jerb, :xml => :xerb},
-        :cache_templates => false
+        :cache_templates => false,
+        :use_mutex => true
       }
       begin
         options = defaults.merge(YAML.load(Erubis::Eruby.new(IO.read("#{defaults[:merb_root]}/dist/conf/merb.yml")).result))
@@ -35,12 +35,20 @@ module Merb
         options = Merb::Config.setup
       
         opts = OptionParser.new do |opts|
-          opts.banner = "Usage: merb [fdcphmisl] [argument]"
+          opts.banner = "Usage: merb [fdcepghmisluMG] [argument]"
           opts.define_head "Merb Mongrel+ Erb. Lightweight replacement for ActionPack"
           opts.separator '*'*80
           opts.separator 'If no flags are given, Merb starts in the foreground on port 4000'
           opts.separator '*'*80
-          
+
+          opts.on("-u", "--user USER", "This flag is for having merb run as a user other than the one currently logged in. Note: if you set this you must also provide a --group option for it to take effect.") do |config|
+            options[:user] = config
+          end
+
+          opts.on("-G", "--group GROUP", "This flag is for having merb run as a group other than the one currently logged in. Note: if you set this you must also provide a --user option for it to take effect.") do |config|
+            options[:group] = config
+          end
+                    
           opts.on("-f", "--config-file FILENAME", "This flag is for adding extra config files for things like the upload progress module") do |config|
             options[:config] = config
           end
@@ -69,7 +77,9 @@ module Merb
             options[:console] = true
           end
           
-          opts.on("-s", "--drb-server-port PORTNUM", "This is the port number to run the drb daemon on for sessions and uplod progress monitoring.") do |drb_port|
+          opts.on("-s", "--start-drb PORTNUM", "This is the port number to run the drb daemon on for sessions and uplod progress monitoring.") do |drb_port|
+            options[:start_drb] = true
+            options[:only_drb] = true
             options[:drb_server_port] = drb_port
           end
           
@@ -85,6 +95,22 @@ module Merb
             options[:generate] = 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|
+            options[:kill] = 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("-X", "--mutex on/off", "This flag is for turnhing on and off the mutex lock.") do |mutex|
+            if mutex == 'off'
+              options[:use_mutex] = false
+            else
+              options[:use_mutex] = true
+            end   
+          end
+          
           opts.on("-?", "--help", "Show this help message") do
             puts opts  
             exit
@@ -94,12 +120,17 @@ module Merb
       
         opts.parse!(@@merb_raw_opts)
       
+        # 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
+        # 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
+        if options[:merb_config]
+          options = options.merge(YAML.load(Erubis::Eruby.new(IO.read("#{options[:merb_config]}")).result))
+        end
       
         @@merb_opts = options
-        unless options[:generate] || options[:console] 
-          puts %{Merb started with these options:}
-          puts @@merb_opts.to_yaml; puts
-        end
       end
       
       def initialize_merb
@@ -112,6 +143,22 @@ module Merb
         @@merb_raw_opts = ARGV
         merb_config
         
+        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)
+              FileUtils.rm f
+              puts "killed PID: #{pid}"
+            end
+          rescue
+            puts "Failed to kill! #{k}"
+          ensure  
+            exit
+          end
+        end  
+        
         case @@merb_opts[:environment].to_s
         when 'development'
           @@merb_opts[:allow_reloading] ||= true
@@ -157,9 +204,10 @@ module Merb
           exit!
         end
         
-        if @@merb_opts[:drb_server_port]
+        if @@merb_opts[:start_drb] 
           puts "Starting merb drb server on port: #{@@merb_opts[:drb_server_port]}"
           start(@@merb_opts[:drb_server_port], :drbserver_start)
+          exit if @@merb_opts[:only_drb]
         end  
         
         if @@merb_opts[:cluster]
@@ -211,15 +259,26 @@ 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")
+        require drb_init if File.exist?(drb_init)
         DRb.start_service("druby://#{@@merb_opts[:host]}:#{port}", Merb::DrbServiceProvider)
         DRb.thread.join
       end  
       
       def mongrel_start(port)
         @@merb_opts[:port] = port
+        unless  @@merb_opts[:generate] ||  @@merb_opts[:console] ||  @@merb_opts[:only_drb] ||  @@merb_opts[:kill]
+          puts %{Merb started with these options:}
+          puts @@merb_opts.to_yaml; puts
+        end
         initialize_merb
       
-        mconfig = Mongrel::Configurator.new :host => (@@merb_opts[:host]||"0.0.0.0"), :port => (port ||4000) do
+        mconf_hash = {:host => (@@merb_opts[:host]||"0.0.0.0"), :port => (port ||4000)}
+        if @@merb_opts[:user] and @@merb_opts[:group]
+          mconf_hash[:user]   = @@merb_opts[:user]
+          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]
@@ -241,4 +300,4 @@ module Merb
     
   end # Server
 
-end # Merb
+end # Merb

data/lib/merb/merb_upload_handler.rb

@@ -52,18 +52,14 @@ class MerbUploadHandler < Mongrel::HttpHandler
   end
   
   def request_aborted(params)
-    return unless params[Mongrel::Const::PATH_INFO] == @path_info &&
-      params[Mongrel::Const::REQUEST_METHOD] == Mongrel::Const::POST &&
-      upload_id = Mongrel::HttpRequest.query_parse(params[Mongrel::Const::QUERY_STRING])[Mongrel::Const::UPLOAD_ID]
+    return unless upload_id = valid_upload?(params)
     Mongrel::Uploads.finish(upload_id)
     puts "request aborted!"
   end
 
   private
     def upload_notify(action, params, *args)
-      return unless @path_info.include?(params['PATH_INFO']) &&
-        params[Mongrel::Const::REQUEST_METHOD] == 'POST' &&
-        upload_id = Mongrel::HttpRequest.query_parse(params['QUERY_STRING'])['upload_id']
+      return unless upload_id = valid_upload?(params)
       if action == :mark
         last_checked_time = Mongrel::Uploads.last_checked(upload_id)
         return unless last_checked_time && Time.now - last_checked_time > @frequency
@@ -71,5 +67,11 @@ class MerbUploadHandler < Mongrel::HttpHandler
       Mongrel::Uploads.send(action, upload_id, *args) 
       Mongrel::Uploads.update_checked_time(upload_id) unless action == :finish
     end
+    
+    def valid_upload?(params)
+      @path_info.any? { |p| params[Mongrel::Const::PATH_INFO].include?(p) } &&
+        params[Mongrel::Const::REQUEST_METHOD] == Mongrel::Const::POST &&
+        Mongrel::HttpRequest.query_parse(params[Mongrel::Const::QUERY_STRING])[Mongrel::Const::UPLOAD_ID]
+    end
 end
 

data/lib/merb/merb_upload_progress.rb

@@ -45,4 +45,4 @@ module Merb
     end
   end
   
-end  
+end

data/lib/merb/merb_view_context.rb

@@ -14,7 +14,6 @@ module Merb
   # and then use as the context object passed to Erubis
   # when evaluating the templates.
   class ViewContext
-    include Merb::ErubisCaptureMixin
     include Merb::ViewContextMixin
     include Merb::FormControls
     include Merb::GlobalHelper
@@ -31,10 +30,21 @@ module Merb
       end  
     end
     
+    # hack so markaby doesn't dup us and lose ivars.
+    def dup
+      self
+    end
+      
     # accessor for the view. refers to the current @controller object
     def controller
       @controller
-    end  
+    end
+      
+    alias_method :old_respond_to?, :respond_to?
+    
+    def respond_to?(sym, include_private=false)
+      old_respond_to?(sym, include_private) || @controller.respond_to?(sym, include_private)  
+    end
     
     # catch any method calls that the controller responds to
     # and delegate them back to the controller.
@@ -48,4 +58,4 @@ module Merb
     
   end
   
-end  
+end

data/lib/merb/mixins/basic_authentication_mixin.rb

@@ -29,9 +29,7 @@ module Merb
       @headers['WWW-Authenticate'] = "Basic realm=\"#{Merb::Server.basic_auth[:domain]}\""
       return 'Unauthorized'
     end  
-
-    end
       
   end
   
-end  
+end

data/lib/merb/mixins/controller_mixin.rb

@@ -1,6 +1,140 @@
 module Merb
   module ControllerMixin
-  
+    NAME_REGEX = /Content-Disposition:.* name="?([^\";]*)"?/ni.freeze
+    CONTENT_TYPE_REGEX = /Content-Type: (.*)\r\n/ni.freeze
+    FILENAME_REGEX = /Content-Disposition:.* filename="?([^\";]*)"?/ni.freeze
+    CRLF = "\r\n".freeze
+    EOL = CRLF
+    def parse_multipart(request,boundary)
+      boundary = "--#{boundary}"
+      paramhsh = MerbHash.new
+      buf = ""
+      content_length = @env['CONTENT_LENGTH'].to_i
+      input = request
+      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}|--)/
+      
+      loop {
+        head = nil
+        body = ''
+        filename = content_type = name = nil
+      
+        until head && buf =~ rx
+          if !head && i = buf.index("\r\n\r\n")
+            head = buf.slice!(0, i+2) # First \r\n
+            buf.slice!(0, 2)          # Second \r\n
+      
+            filename = head[FILENAME_REGEX, 1]
+            content_type = head[CONTENT_TYPE_REGEX, 1]
+            name = head[NAME_REGEX, 1]
+            
+            if filename      
+              body = Tempfile.new(:Merb)
+              body.binmode if defined? body.binmode
+            end
+            next
+          end
+      
+          # Save the read body part.
+          if head && (boundary_size+4 < buf.size)
+            body << buf.slice!(0, buf.size - (boundary_size+4))
+          end
+      
+          c = input.read(bufsize < content_length ? bufsize : content_length)
+          raise EOFError, "bad content body"  if c.nil? || c.empty?
+          buf << c
+          content_length -= c.size
+        end
+      
+        # Save the rest.
+        if i = buf.index(rx)
+          body << buf.slice!(0, i)
+          buf.slice!(0, boundary_size+2)
+      
+          content_length = -1  if $1 == "--"
+        end
+      
+        if filename
+          body.rewind
+          data = {:filename => filename, :type => content_type, :tempfile => body}
+        else
+          data = body
+        end
+        paramhsh = normalize_params(paramhsh,name,data)
+        break  if buf.empty? || content_length == -1
+      }
+      paramhsh
+    end
+    
+    def normalize_params(parms, key, val)
+      case key
+      when /(.+)\[(.+)\]\[\]$/
+        parms[$1] ||= MerbHash.new
+        parms[$1] = normalize_params(parms[$1], "#{$2}[]", val)
+      when /(.+)\[(.+)\]$/
+        parms[$1] ||= MerbHash.new
+        parms[$1] = normalize_params(parms[$1], $2, val)
+      when /(.+)\[\]$/
+        (parms[$1] ||= []) << val
+      else
+        parms[key] = val if val
+      end
+      parms
+    end
+    
+    # parses a query string or the payload of a POST
+    # 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}}
+    def query_parse(qs, d = '&;')
+      m = proc {|_,o,n|o.u(n,&m)rescue([*o]<<n)}
+      (qs||'').split(/[#{d}] */n).inject(MerbHash[]) { |h,p| 
+              k, v=unescape(p).split('=',2)
+              h.u(k.split(/[\]\[]+/).reverse.
+                inject(v) { |x,i| MerbHash[i,x] },&m)
+          }
+    end
+    
+    # render using chunked encoding
+    # def stream
+    #   prefix = '<p>'
+    #   suffix = "</p>\r\n"
+    #   render_chunked do
+    #     IO.popen("cat /tmp/test.log") do |io|
+    #       done = false
+    #       until done == true do
+    #         sleep 0.3
+    #         line = io.gets.chomp
+    #         if line == 'EOF'
+    #           done = true
+    #         else
+    #           send_chunk(prefix + line + suffix)
+    #         end
+    #       end
+    #     end
+    #   end
+    # end
+    def render_chunked(&blk)
+      headers['Transfer-Encoding'] = 'chunked'
+      Proc.new {
+        response.send_status_no_connection_close(0)
+        response.send_header
+        blk.call
+        response.write("0\r\n\r\n")
+      }
+    end
+    
+    # for use within a render_chunked response
+    def send_chunk(data)
+      response.write('%x' % data.size + "\r\n")
+      response.write(data + "\r\n")
+    end
+    
     # redirect to another url It can be like /foo/bar
     # for redirecting within your same app. Or it can
     # be a fully qualified url to another site.
@@ -31,7 +165,7 @@ module Merb
     # a file directly from nginx. See the nginx wiki:
     # http://wiki.codemongers.com/NginxXSendfile
     def nginx_send_file(file)
-      headers['X-Accel-Redirect'] = file
+      headers['X-Accel-Redirect'] = File.expand_path(file)
       return
     end  
   
@@ -47,26 +181,24 @@ module Merb
       set_cookie(name, nil, Merb::Const::COOKIE_EXPIRED_TIME)
     end
   
-    # parses a query string or the payload of a POST
-    # 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}}
-    def query_parse(qs, d = '&;')
-      m = proc {|_,o,n|o.u(n,&m)rescue([*o]<<n)}
-      (qs||'').split(/[#{d}] */n).inject(MerbHash[]) { |h,p| 
-              k, v=unescape(p).split('=',2)
-              h.u(k.split(/[\]\[]+/).reverse.
-                inject(v) { |x,i| MerbHash[i,x] },&m)
-          }
-    end
-  
     # creates a random token like:
     # "b9a82e011694cc13a4249731b9e83cea" 
     def make_token
       require 'digest/md5'
       Digest::MD5.hexdigest("#{inspect}#{Time.now}#{rand}")
     end  
+    
+    def rand_uuid
+      "%04x%04x-%04x-%04x-%04x-%06x%06x" % [
+                                            rand(0x0010000),
+                                            rand(0x0010000),
+                                            rand(0x0010000),
+                                            rand(0x0010000),
+                                            rand(0x0010000),
+                                            rand(0x1000000),
+                                            rand(0x1000000),
+                                           ]
+    end
 
     def escape_xml(obj)
       obj.to_s.gsub(/[&<>"']/) { |s| Merb::Const::ESCAPE_TABLE[s] }
@@ -85,4 +217,4 @@ module Merb
     end
   
   end
-end  
+end