Changeset 986

Timestamp:

11/12/07 22:58:17 (1 year ago)

Author:

wyca..@gmail.com

Message:

Checking in new code to speed up partials

Files:

• trunk/lib/merb/server.rb (modified) (3 diffs)
• trunk/lib/merb/template/erubis.rb (modified) (1 diff)
• trunk/lib/merb/view_context.rb (modified) (2 diffs)
• trunk/spec/fixtures/controllers/render_spec_controllers.rb (modified) (1 diff)
• trunk/spec/merb/abstract_controller_spec.rb (modified) (1 diff)
• trunk/spec/merb/mail_controller_spec.rb (modified) (1 diff)
• trunk/spec/merb/responder_spec.rb (modified) (1 diff)

trunk/lib/merb/server.rb

@@ -297 +297 @@
-      end
-      
+      def load_erubis_inline_helpers
+        partials = Merb::AbstractController._abstract_subclasses.map {|x| 
+          Dir.glob("#{Object.full_const_get(x)._template_root}/**/_*") }.flatten
+
+        partials.each do |partial|
+          eruby = Erubis::Eruby.new(File.read(partial))
+          eruby.def_method(Merb::GlobalHelper, partial.gsub("/", "__").gsub(".", "_"), partial)
+        end        
+      end
+      
-      def load_application
-        MERB_PATHS.each do |glob|
@@ -303 +313 @@
-        load_action_arguments
-        load_controller_template_path_cache
+        load_erubis_inline_helpers
-        @app_loaded = true
-        (@after_app_blocks || []).each { |b| b.call }
@@ -348 +359 @@
-              load_action_arguments(loaded_classes)
-              load_controller_template_path_cache
+              load_erubis_inline_helpers              
-            rescue Exception => e
-              puts "Error reloading file #{file}: #{e}"

trunk/lib/merb/template/erubis.rb

@@ -4 +4 @@
-    class ErubisViewContext < ViewContext
-      include ::Merb::ErubisCaptureMixin
+      
+      def partial(template, opts={})
+
+        unless @_template_format
+          @web_controller.choose_template_format(Merb.available_mime_types, {})
+        end
+
+        template = @web_controller._cached_partials["#{template}.#{@_template_format}"] ||=
+          @web_controller.send(:find_partial, template)
+
+        template_method = template.gsub(/\//, "__").gsub(/\./, "_")
+
+        if with = opts.delete(:with)
+          as = opts.delete(:as) || template.match(/(.*\/_)([^\.]*)/)[2]
+          @_merb_partial_locals = opts        
+          sent_template = [with].flatten.map do |temp|
+            @_merb_partial_locals[as.to_sym] = temp
+            send(template_method) rescue raise Merb::ControllerExceptions::TemplateNotFound, 
+              "No template matched at #{template}"
+          end.join
+        else
+          @_merb_partial_locals = opts        
+          sent_template = send(template_method) rescue nil
+        end
+
+        return sent_template if sent_template
+
+        raise Merb::ControllerExceptions::TemplateNotFound, "No template matched at #{template}"
+      end
+
+      def method_missing(sym, *args, &blk)
+        @_merb_partial_locals[sym] || @web_controller.send(sym, *args, &blk) rescue super
+      end
+      
-    end
-    

trunk/lib/merb/view_context.rb

@@ -23 +23 @@
-                       @_content_type
-                       @_merb_unmatched
-                       @_template_format
-                       @_provided_formats
-                       @template]
@@ -70 +69 @@
-    # and delegate them back to the controller.
-    def method_missing(sym, *args, &blk)
-
-
-
-
-
-
-
+
-    end
-    

trunk/spec/fixtures/controllers/render_spec_controllers.rb

@@ -114 +114 @@
-Merb::Server.load_action_arguments
-Merb::Server.load_controller_template_path_cache
+Merb::Server.load_erubis_inline_helpers

trunk/spec/merb/abstract_controller_spec.rb

@@ -15 +15 @@
-  after(:all) do
-    Merb::Server.load_controller_template_path_cache
+    Merb::Server.load_erubis_inline_helpers    
-  end
-  

trunk/spec/merb/mail_controller_spec.rb

@@ -7 +7 @@
-end
-Merb::Server.load_controller_template_path_cache
+Merb::Server.load_erubis_inline_helpers
-
-class Merb::Mailer

trunk/spec/merb/responder_spec.rb

@@ -245 +245 @@
-Merb::Server.load_action_arguments
-Merb::Server.load_controller_template_path_cache
+Merb::Server.load_erubis_inline_helpers
-
-describe "A Merb Responder's Content Negotiation" do