Changeset 279

Timestamp:

06/11/07 13:01:17 (1 year ago)

Author:

e.@brainspl.at

Message:

a few session optimization, thanks for pushing me ara. session key generation used to be an orser of magnitude slower, now its fast. a few touchups elsewhere

Files:

• trunk/README (modified) (2 diffs)
• trunk/Rakefile (modified) (1 diff)
• trunk/lib/merb/merb_controller.rb (modified) (1 diff)
• trunk/lib/merb/merb_handler.rb (modified) (2 diffs)
• trunk/lib/merb/merb_view_context.rb (modified) (1 diff)
• trunk/lib/merb/mixins/controller_mixin.rb (modified) (1 diff)
• trunk/lib/merb/session/merb_ar_session.rb (modified) (5 diffs)
• trunk/tools/allison/cache/BODY (modified) (1 diff)
• trunk/tools/allison/cache/INDEX (modified) (1 diff)

trunk/README

@@ -42 +42 @@
-Note the <tt>r.resource :posts</tt> macro. That makes it possible to use a RESTful CRUD style controller for the posts resource
-
-Matche
+
-          r.resources :posts
-          r.default_routes
@@ -153 +153 @@
-            respond_to {|format|
-              format.html { render }
-'index'
+:index
-              format.xml  { render :xml => @posts.to_xml }
-            }

trunk/Rakefile

@@ -62 +62 @@
-  s.add_dependency('mime-types')
-  s.add_dependency('xml-simple')
-  s.add_dependency('archive-tar-minitar') 
-  s.required_ruby_version = '>= 1.8.4'
-

trunk/lib/merb/merb_controller.rb

@@ -36 +36 @@
-      if MULTIPART_REGEXP =~ @env[Mongrel::Const::UPCASE_CONTENT_TYPE] && @method == :post
-        querystring.update(parse_multipart(request, $1))
-
+ || @method == :put
-        if [Mongrel::Const::APPLICATION_JSON, Mongrel::Const::TEXT_JSON].include?(@env[Mongrel::Const::UPCASE_CONTENT_TYPE])
-          MERB_LOGGER.info("JSON Request")

trunk/lib/merb/merb_handler.rb

@@ -11 +11 @@
-
-
-
+
-class MerbHandler < Mongrel::HttpHandler
-  @@file_only_methods = ["GET","HEAD"]
@@ -66 +66 @@
-        controller = nil
-        controller, action = Merb::Dispatcher.handle(request, response)
-        
-        MERB_LOGGER.info("Routing to controller: #{controller.class} action: #{action}\nRoute Recognition & Parsing HTTP Input took: #{Time.now - start} seconds")
-      rescue Object => e

trunk/lib/merb/merb_view_context.rb

@@ -52 +52 @@
-      @controller
-    end
+    
+    def request
+       @controller.request  
+    end
+            
+    def params
+      @controller.params
+    end  
+    
+    def cookies
+      @controller.cookies
+    end  
+
+    def headers
+      @controller.headers
+    end
+    
+    def session
+      @controller.session
+    end
+
+    def response
+      @controller.response
+    end
-      
-    alias_method :old_respond_to?, :respond_to?

trunk/lib/merb/mixins/controller_mixin.rb

@@ -229 +229 @@
-    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)

trunk/lib/merb/session/merb_ar_session.rb

@@ -9 +9 @@
-      before = @cookies[_session_id_key]
-      @session, @cookies[_session_id_key] = Merb::Session.persist(@cookies[_session_id_key])
-_fingerprint_before = Marshal.dump(@session).hash
+session.dirty = false
-      @_new_cookie = @cookies[_session_id_key] != before
-    end
@@ -15 +15 @@
-    def finalize_session
-      MERB_LOGGER.info("Finalize session")
-
-
-
+
-      set_cookie(_session_id_key, @cookies[_session_id_key], Time.now+Merb::Const::WEEK*2) if @_new_cookie
-    end 
@@ -29 +27 @@
-    before_save :marshal_data!
-    before_save :raise_on_session_data_overflow!
-
+  attr_accessor :dirty
-    RAND_CHARS = [*'A'..'Z'] + [*'0'..'9'] + [*'a'..'z']
-  
@@ -35 +33 @@
-      # Generates a new session ID and creates a row for the new session in the database.
-      def generate
-
-
+
+
+
+
+
+
+
+
+
-        create(:session_id => sid, :data => {})
-      end
@@ -84 +89 @@
-    
-    def []=(key, val)
+      @dirty = true
-      data[key] = val  
-    end

trunk/tools/allison/cache/BODY

@@ -1 @@
-:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><meta content="text/html; charset=utf-8" http-equiv="Content-Type"/><title>%title%</title><link type="text/css" rel="stylesheet" media="screen" href="%style_url%
+ns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta content="text/html; charset=utf-8" http-equiv="Content-Type"/><title>%title%</title><link type="text/css" media="screen" href="%style_url%" rel="stylesheet
-// Javascript for Allison RDoc template
-// Copyright 2006 Cloudburst LLC

trunk/tools/allison/cache/INDEX

@@ -1 @@
-:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><meta content="text/html; charset=utf-8" http-equiv="Content-Type"/><title>%title%</title><link type="text/css" rel="stylesheet" media="screen" href="rdoc-style.css
+ns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta content="text/html; charset=utf-8" http-equiv="Content-Type"/><title>%title%</title><link type="text/css" media="screen" href="rdoc-style.css" rel="stylesheet