RubyGems - merb - Versions diffs - 0.0.6 → 0.0.7 - Mend

merb 0.0.6 → 0.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (88) hide show

data/README +22 -4
data/Rakefile +15 -3
data/TODO +2 -3
data/bin/merb +61 -36
data/examples/sample_app/dist/app/controllers/files.rb +31 -0
data/examples/sample_app/dist/app/controllers/posts.rb +26 -2
data/examples/sample_app/dist/app/controllers/test.rb +7 -1
data/examples/sample_app/dist/app/views/files/progress.jerb +3 -0
data/examples/sample_app/dist/app/views/files/start.herb +62 -0
data/examples/sample_app/dist/app/views/files/upload.herb +6 -0
data/examples/sample_app/dist/app/views/layout/{application.rhtml → application.herb} +2 -3
data/examples/sample_app/dist/app/views/layout/{foo.rhtml → foo.herb} +0 -0
data/examples/sample_app/dist/app/views/posts/{_comments.rhtml → _comments.herb} +0 -0
data/examples/sample_app/dist/app/views/posts/comment.jerb +1 -0
data/examples/sample_app/dist/app/views/posts/{list.rhtml → list.herb} +0 -0
data/examples/sample_app/dist/app/views/posts/{new.rhtml → new.herb} +0 -0
data/examples/sample_app/dist/app/views/posts/{show.rhtml → show.herb} +0 -0
data/examples/sample_app/dist/app/views/posts/xml_test.xerb +3 -0
data/examples/sample_app/dist/app/views/test/{foo.rhtml → foo.herb} +0 -0
data/examples/sample_app/dist/app/views/test/{hello.rhtml → hello.herb} +0 -0
data/examples/sample_app/dist/app/views/test/json.jerb +1 -0
data/examples/sample_app/dist/conf/merb.yml +11 -0
data/examples/sample_app/dist/conf/merb_init.rb +1 -1
data/examples/sample_app/dist/conf/mup.conf +11 -0
data/examples/sample_app/dist/public/javascripts/mup.js +113 -0
data/examples/sample_app/script/merb_stop +7 -3
data/examples/sample_app/script/startdrb +8 -0
data/lib/merb.rb +37 -2
data/lib/merb/merb_class_extensions.rb +21 -22
data/lib/merb/merb_controller.rb +101 -33
data/lib/merb/merb_handler.rb +26 -25
data/lib/merb/merb_router.rb +1 -1
data/lib/merb/merb_utils.rb +35 -37
data/lib/merb/mixins/basic_authentication_mixin.rb +39 -0
data/lib/merb/mixins/controller_mixin.rb +119 -115
data/lib/merb/mixins/javascript_mixin.rb +63 -0
data/lib/merb/mixins/render_mixin.rb +85 -69
data/lib/merb/mixins/responder_mixin.rb +38 -0
data/lib/merb/session/merb_drb_server.rb +107 -0
data/lib/merb/session/merb_drb_session.rb +71 -0
data/lib/merb/session/merb_session.rb +1 -0
data/lib/merb/vendor/paginator/README.txt +84 -0
data/lib/merb/vendor/paginator/paginator.rb +121 -0
data/lib/mutex_hotfix.rb +34 -0
metadata +41 -63
data/doc/rdoc/classes/ControllerMixin.html +0 -676
data/doc/rdoc/classes/Hash.html +0 -148
data/doc/rdoc/classes/Merb.html +0 -140
data/doc/rdoc/classes/Merb/Controller.html +0 -338
data/doc/rdoc/classes/Merb/RouteMatcher.html +0 -388
data/doc/rdoc/classes/Merb/Server.html +0 -148
data/doc/rdoc/classes/Merb/Session.html +0 -201
data/doc/rdoc/classes/Merb/SessionMixin.html +0 -199
data/doc/rdoc/classes/MerbControllerError.html +0 -111
data/doc/rdoc/classes/MerbHandler.html +0 -430
data/doc/rdoc/classes/MerbHash.html +0 -469
data/doc/rdoc/classes/MerbHash/Mutex.html +0 -198
data/doc/rdoc/classes/Noroutefound.html +0 -153
data/doc/rdoc/classes/Object.html +0 -149
data/doc/rdoc/classes/RenderMixin.html +0 -362
data/doc/rdoc/classes/String.html +0 -212
data/doc/rdoc/classes/Symbol.html +0 -179
data/doc/rdoc/created.rid +0 -1
data/doc/rdoc/files/LICENSE.html +0 -129
data/doc/rdoc/files/README.html +0 -417
data/doc/rdoc/files/TODO.html +0 -151
data/doc/rdoc/files/lib/merb/merb_class_extensions_rb.html +0 -101
data/doc/rdoc/files/lib/merb/merb_controller_rb.html +0 -101
data/doc/rdoc/files/lib/merb/merb_handler_rb.html +0 -101
data/doc/rdoc/files/lib/merb/merb_router_rb.html +0 -101
data/doc/rdoc/files/lib/merb/merb_utils_rb.html +0 -108
data/doc/rdoc/files/lib/merb/mixins/controller_mixin_rb.html +0 -101
data/doc/rdoc/files/lib/merb/mixins/render_mixin_rb.html +0 -101
data/doc/rdoc/files/lib/merb/session/merb_session_rb.html +0 -101
data/doc/rdoc/files/lib/merb_rb.html +0 -140
data/doc/rdoc/files/lib/merb_tasks_rb.html +0 -101
data/doc/rdoc/fr_class_index.html +0 -43
data/doc/rdoc/fr_file_index.html +0 -40
data/doc/rdoc/fr_method_index.html +0 -104
data/doc/rdoc/index.html +0 -24
data/doc/rdoc/rdoc-style.css +0 -208
data/examples/sample_app/dist/app/controllers/upload.rb +0 -29
data/examples/sample_app/dist/app/views/posts/comment.merbjs +0 -1
data/examples/sample_app/dist/app/views/upload/start.rhtml +0 -15
data/examples/sample_app/dist/app/views/upload/upload.rhtml +0 -4
data/examples/sample_app/dist/public/files/README +0 -35
data/examples/sample_app/dist/public/files/setup.rb +0 -1346
data/examples/sample_app/log/merb.log +0 -778

data/lib/merb/merb_handler.rb CHANGED Viewed

@@ -25,6 +25,8 @@ class MerbHandler < Mongrel::HttpHandler
   # and your controller can go on processing other requests.
   def process(request, response)
+    start = Time.now
     if response.socket.closed?
       return
     end
@@ -41,11 +43,10 @@ class MerbHandler < Mongrel::HttpHandler
     if get_or_head and @files.can_serve(path_info)
       # File exists as-is so serve it up
       MERB_LOGGER.info("Serving static file: #{path_info}")
       @files.process(request,response)
     elsif get_or_head and @files.can_serve(page_cached)
       # Possible cached page, serve it up
-      MERB_LOGGER.info("Serving static file: #{path_info}")
+      MERB_LOGGER.info("Serving static file: #{page_cached}")
       request.params[Mongrel::Const::PATH_INFO] = page_cached
       @files.process(request,response)
     else
@@ -53,14 +54,22 @@ class MerbHandler < Mongrel::HttpHandler
         # This handles parsing the query string and post/file upload
         # params and is outside of the synchronize call so that
         # multiple file uploads can be done at once.
+        controller = nil
         controller, action = handle(request)
-        MERB_LOGGER.info("Routing to controller: #{controller.class} action: #{action}")
-        output = nil
-        # synchronize here because this is where ActiveRecord or your db
-        # calls will be run in your controller methods.
-        @guard.synchronize {
-          output = controller.dispatch(action)
-        }
+        MERB_LOGGER.info("Routing to controller: #{controller.class} action: #{action}\nParsing HTTP Input took: #{Time.now - start} seconds")
+        # special case allows the progress action of a Files controller
+        # to be handled without locking since no db access is required.
+        # but we do need to synchronize whenever you use ActiveRecord
+        # in your controllers.
+        if (action == 'progress') && (Files === controller)
+          puts 'skip mutex'
+          controller.dispatch(action)
+        else
+          @guard.synchronize {
+            controller.dispatch(action)
+          }
+        end
       rescue Exception => e
         response.start(500) do |head,out|
           head["Content-Type"] = "text/html"
@@ -87,20 +96,18 @@ class MerbHandler < Mongrel::HttpHandler
         end
       end
-      controller = nil
       if sendfile
-        MERB_LOGGER.info("X-SENDFILE: #{sendfile}")
+        MERB_LOGGER.info("X-SENDFILE: #{sendfile}\nComplete Request took: #{Time.now - start} seconds")
         # send X-SENDFILE header to mongrel
         response.send_status(File.size(sendfile))
         response.send_header
         response.send_file(sendfile)
       else
-        MERB_LOGGER.info("Response status: #{response.status}\n\n")
+        MERB_LOGGER.info("Response status: #{response.status}\nComplete Request took: #{Time.now - start} seconds\n\n")
         # render response from successful controller
-        response.send_status((output||'').length)
+        response.send_status((controller.body||='').length)
         response.send_header
-        response.write(output)
+        response.write(controller.body)
       end
     end
   end
@@ -114,14 +121,8 @@ class MerbHandler < Mongrel::HttpHandler
     path = request.params[Mongrel::Const::PATH_INFO].sub(/\/+/, '/')
     path = path[0..-2] if (path[-1] == ?/)
     route = Merb::RouteMatcher.new.route_request(path)
-    if route
-      MERB_LOGGER.info("No Matching Route!") if route[:controller] == 'Noroutefound'
-      [ instantiate_controller(route[:controller], request.body, request.params, route),
-        route[:action] ]
-    else
-      MERB_LOGGER.info("No Matching Route!")
-      ["<html><body>Error: no route matches!</body></html>", nil]
-    end
+    [ instantiate_controller(route[:controller], request.body, request.params, route),
+      route[:action] ]
   end
   # take a controller class name string and reload or require
@@ -143,8 +144,8 @@ class MerbHandler < Mongrel::HttpHandler
   # format exception message for browser display
   def html_exception(e)
-    "<html><h2>Merb Error!</h2><p>#{ e.message } - (#{ e.class })\n" <<
-    "#{(e.backtrace or []).join('<br />')}</p></html>"
+    "<html><body><h2>Merb Error!</h2><p>#{ e.message } - (#{ e.class })\n" <<
+    "#{(e.backtrace or []).join('<br />')}</p></body></html>"
   end
   def exception(e)

data/lib/merb/merb_router.rb CHANGED Viewed

@@ -59,7 +59,7 @@ module Merb
     # compile each individual route into a when /.../
     # component of the case statement. Takes /:sections
-    # if the route def that start with : and turns them
+    # 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.

data/lib/merb/merb_utils.rb CHANGED Viewed

@@ -4,7 +4,12 @@ class String
   # :allow_reloading is set to true in the config
   # file or command line options.
   def import
-    Merb::Server.config[:allow_reloading] ? load(  self.snake_case  + '.rb' ) : require(  self.snake_case )
+    if Merb::Server.config[:allow_reloading]
+      Object.send(:remove_const, self.camel_case.intern) rescue nil
+      load(self.snake_case  + '.rb')
+    else
+      require(self.snake_case)
+    end
   end
   # "FooBar".snake_case #=> "foo_bar"
@@ -20,14 +25,40 @@ class String
     words.map!{|w| w.downcase.sub(%r/^./){|c| c.upcase}}
     words.join
   end
+  # Concatenates a path
+  def /(o)
+    File.join(self, o.to_s)
+  end
 end
+module Enumerable
+  def injecting(s)
+    inject(s) do |k, i|
+      yield(k, i); k
+    end
+  end
+end
+class Numeric
+  def to_currency( pre_symbol='$', thousands=',', decimal='.',
+post_symbol=nil )
+    "#{pre_symbol}#{
+      ( "%.2f" % self ).gsub(
+        /(\d)(?=(?:\d{3})+(?:$|\.))/,
+        "\\1#{thousands}"
+      )
+    }#{post_symbol}"
+  end
+end
 class Symbol
   # faster Symbol#to_s to speed up routing.
   def to_s
-    @str_rep || (@str_rep = id2name.freeze)
+    @str_rep ||= id2name.freeze
   end
   # ["foo", "bar"].map &:reverse #=> ['oof', 'rab']
@@ -107,8 +138,9 @@ class MerbHash < Hash
     super(convert_key(key))
   end
+  # allow merbhash.key to work the same as merbhash[key]
   def method_missing(m,*a)
-    m.to_s=~/=$/?self[$`]=a[0]:a==[]?self[m]:raise(NoMethodError,"#{m}")
+    m.to_s =~ /=$/?self[$`]=a[0]:a==[]?self[m]:raise(NoMethodError,"#{m}")
   end
   protected
@@ -120,37 +152,3 @@ class MerbHash < Hash
     end
 end
-require 'thread'
-# monkey patch Mutex so it does not leak memory.
-class Mutex
-  def lock
-    while (Thread.critical = true; @locked)
-      @waiting.unshift Thread.current
-      Thread.stop
-    end
-    @locked = true
-    Thread.critical = false
-    self
-  end
-  def unlock
-    return unless @locked
-    Thread.critical = true
-    @locked = false
-    begin
-      t = @waiting.pop
-      t.wakeup if t
-    rescue ThreadError
-      retry
-    end
-    Thread.critical = false
-    begin
-      t.run if t
-    rescue ThreadError
-    end
-    self
-  end
-end

data/lib/merb/mixins/basic_authentication_mixin.rb ADDED Viewed

@@ -0,0 +1,39 @@
+module Merb
+  module Authentication
+    require 'base64'
+    def credentials
+      if d = %w{REDIRECT_X_HTTP_AUTHORIZATION
+             X-HTTP_AUTHORIZATION HTTP_AUTHORIZATION}.
+             inject([]) { |d,h| @env.has_key?(h) ? @env[h].to_s.split : d }
+        return Base64.decode64(d[1]).split(':')[0..1] if d[0] == 'Basic'
+      end
+    end
+    def authenticated?
+      username, password = *credentials
+      username == Merb::Server.config[:basic_auth][:username] and password == Merb::Server.config[:basic_auth][:password]
+    end
+    def authenticate
+      if !authenticated?
+        throw :halt
+      end
+    end
+    def self.included(base)
+      base.class_eval do
+        def filters_halted
+          @status = 401
+          @headers['Content-type'] = 'text/plain'
+          @headers['Status'] = 'Unauthorized'
+          @headers['WWW-Authenticate'] = "Basic realm=\"#{Merb::Server.config[:basic_auth][:domain]}\""
+          return 'Unauthorized'
+        end
+      end
+    end
+  end
+end

data/lib/merb/mixins/controller_mixin.rb CHANGED Viewed

@@ -1,129 +1,133 @@
-module ControllerMixin
-  # 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.
-  def redirect(url)
-    MERB_LOGGER.info("Redirecting to: #{url}")
-    @status = 302
-    @headers.merge!({'Location'=> url})
-    return ''
-  end
-  # pass in a path to a file and this will set the
-  # right headers and let mongrel do its thang and
-  # serve the static file directly.
-  def send_file(file)
-    headers['X-SENDFILE'] = file
-    return
-  end
+module Merb
+  module ControllerMixin
-  # This uses nginx X-Accel-Redirect header to send
-  # a file directly from nginx. See the nginx wiki:
-  # http://wiki.codemongers.com/NginxXSendfile
-  def nginx_send_file(file)
-    headers['X-Accel-Redirect'] = file
-    return
-  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
-  # does url escaping
-  def escape(s)
-    Mongrel::HttpRequest.escape(s)
-  end
-  # does url unescaping
-  def unescape(s)
-    Mongrel::HttpRequest.unescape(s)
-  end
-  # escape text for javascript.
-  def escape_js(javascript)
-    (javascript || '').gsub('\\','\0\0').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
-  end
-  alias js :escape_js
-  def xml_http_request?
-    not /XMLHttpRequest/i.match(@headers['HTTP_X_REQUESTED_WITH']).nil?
-  end
-  alias xhr? :xml_http_request?
-  alias ajax? :xml_http_request?
-  def remote_ip
-    return @headers['HTTP_CLIENT_IP'] if @headers.include?('HTTP_CLIENT_IP')
-    if @headers.include?('HTTP_X_FORWARDED_FOR') then
-      remote_ips = @headers['HTTP_X_FORWARDED_FOR'].split(',').reject do |ip|
-        ip =~ /^unknown$|^(127|10|172\.16|192\.168)\./i
-      end
-      return remote_ips.first.strip unless remote_ips.empty?
+    # 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.
+    def redirect(url)
+      MERB_LOGGER.info("Redirecting to: #{url}")
+      @status = 302
+      headers.merge!({'Location'=> url})
+      return ''
     end
-    return @headers['REMOTE_ADDR']
-  end
-  def protocol
-    @headers['HTTPS'] == 'on' ? 'https://' : 'http://'
-  end
+    # pass in a path to a file and this will set the
+    # right headers and let mongrel do its thang and
+    # serve the static file directly.
+    def send_file(file)
+      headers['X-SENDFILE'] = file
+      return
+    end
+    # This uses nginx X-Accel-Redirect header to send
+    # a file directly from nginx. See the nginx wiki:
+    # http://wiki.codemongers.com/NginxXSendfile
+    def nginx_send_file(file)
+      headers['X-Accel-Redirect'] = file
+      return
+    end
-  def ssl?
-    @headers['HTTPS'] == 'on'
-  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
-  # The request uri.
+    def make_token
+      require 'digest/md5'
+      Digest::MD5.hexdigest("#{inspect}#{Time.now}#{rand}")
+    end
-  def uri
-    @headers['REQUEST_URI']
-  end
+    # does url escaping
+    def escape(s)
+      Mongrel::HttpRequest.escape(s)
+    end
-  # The path is the uri without the query string.
+    # does url unescaping
+    def unescape(s)
+      Mongrel::HttpRequest.unescape(s)
+    end
-  def path
-    uri ? uri.split('?').first : ''
-  end
+    # returns true if the request is an ajax request.
+    def xml_http_request?
+      not /XMLHttpRequest/i.match(@env['HTTP_X_REQUESTED_WITH']).nil?
+    end
+    alias xhr? :xml_http_request?
+    alias ajax? :xml_http_request?
-  def path_info
-    @headers['PATH_INFO']
-  end
+    # returns the remote IP address if it can find it.
+    def remote_ip
+      return @env['HTTP_CLIENT_IP'] if @env.include?('HTTP_CLIENT_IP')
-  def port
-    @headers['SERVER_PORT'].to_i
-  end
-  def host
-    @headers['HTTP_X_FORWARDED_HOST'] || @headers['HTTP_HOST']
-  end
+      if @env.include?(Mongrel::Const::HTTP_X_FORWARDED_FOR) then
+        remote_ips = @env[Mongrel::Const::HTTP_X_FORWARDED_FOR].split(',').reject do |ip|
+          ip =~ /^unknown$|^(127|10|172\.16|192\.168)\./i
+        end
-  def subdomains(tld_length = 1)
-    parts = host.split('.')
-    parts[0..-(tld_length+2)]
-  end
+        return remote_ips.first.strip unless remote_ips.empty?
+      end
-  def domain(tld_length = 1)
-    host.split('.').last(1 + tld_length).join('.')
-  end
+      return @env[Mongrel::Const::REMOTE_ADDR]
+    end
+    # returns either 'https://' or 'http://' depending on
+    # the HTTPS header
+    def protocol
+      @env['HTTPS'] == 'on' ? 'https://' : 'http://'
+    end
+    # returns true if the request is an SSL request
+    def ssl?
+      @env['HTTPS'] == 'on'
+    end
+    # The request uri.
+    def uri
+      @env['REQUEST_URI']
+    end
+    # The path is the uri without the query string.
+    def path
+      uri ? uri.split('?').first : ''
+    end
-  def method
-    @headers['REQUEST_METHOD'].downcase.to_sym
-  end
+    def path_info
+      @env['PATH_INFO']
+    end
+    def port
+      @env['SERVER_PORT'].to_i
+    end
-  [:get, :post, :put, :delete, :head].each do |m|
-    eval %{
-      def #{m}?; method == :#{m}; end
-    }
+    def host
+      @env['HTTP_X_FORWARDED_HOST'] || @env['HTTP_HOST']
+    end
+    def subdomains(tld_length = 1)
+      parts = host.split('.')
+      parts[0..-(tld_length+2)]
+    end
+    def domain(tld_length = 1)
+      host.split('.').last(1 + tld_length).join('.')
+    end
+    def method
+      @method ||= @env['REQUEST_METHOD']
+    end
+    [:get, :post, :put, :delete, :head].each do |m|
+      eval %{
+        def #{m}?; method == :#{m}; end
+      }
+    end
   end
-end
+end