template_streaming 0.0.2 → 0.0.3

data/CHANGELOG

@@ -1,3 +1,11 @@
+== 0.0.3 2010-04-23
+
+ * Fix #render calls which don't render templates (e.g. :text => '').
+
+== 0.0.2 2010-04-21
+
+ * Thin support.
+
 == 0.0.1 2010-04-13
 
  * Hi.

data/lib/template_streaming.rb

@@ -6,11 +6,8 @@ module TemplateStreaming
     end
 
     def render_with_template_streaming(*args, &block)
-      # Only install our StreamingBody in the toplevel #render call.
-      @render_stack_height ||= 0
-      @render_stack_height += 1
-      begin
-        if @render_stack_height == 1
+      with_template_streaming_condition(*args) do |condition|
+        if condition
           @performed_render = true
           check_thin_support
           @streaming_body = StreamingBody.new(progressive_rendering_threshold) do
@@ -25,8 +22,6 @@ module TemplateStreaming
         else
           render_without_template_streaming(*args, &block)
         end
-      ensure
-        @render_stack_height -= 1
       end
     end
 
@@ -50,6 +45,30 @@ module TemplateStreaming
 
     private # --------------------------------------------------------
 
+    #
+    # Yield true if we should intercept this render call, false
+    # otherwise.
+    #
+    def with_template_streaming_condition(*args)
+      @render_stack_height ||= 0
+      @render_stack_height += 1
+      begin
+        # Only install our StreamingBody in the toplevel #render call.
+        @render_stack_height == 1 or
+          return yield(false)
+
+        if (options = args.last).is_a?(Hash)
+          yield((UNSTREAMABLE_KEYS & options.keys).empty?)
+        else
+          yield(args.first != :update)
+        end
+      ensure
+        @render_stack_height -= 1
+      end
+    end
+
+    UNSTREAMABLE_KEYS = [:text, :xml, :json, :js, :update, :nothing]
+
     #
     # The number of bytes that must be received by the client before
     # anything will be rendered.

data/lib/template_streaming/version.rb

@@ -1,3 +1,3 @@
 module TemplateStreaming
-  VERSION = [0, 0, 2]
+  VERSION = [0, 0, 3]
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - George Ogata
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 -04:00
+date: 2010-04-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency