RubyGems - template_streaming - Versions diffs - 0.0.9 → 0.0.10 - Mend

template_streaming 0.0.9 → 0.0.10

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 (5) hide show

data/CHANGELOG +4 -0
data/lib/template_streaming.rb +5 -4
data/lib/template_streaming/error_recovery.rb +119 -0
data/lib/template_streaming/version.rb +1 -1
metadata +4 -3

data/CHANGELOG CHANGED

@@ -1,3 +1,7 @@
+== 0.0.10 2010-05-05
+ * Fix padding comment.
 == 0.0.9 2010-04-29
  * Add support for Thin on Ruby 1.8.6.

data/lib/template_streaming.rb CHANGED

@@ -232,7 +232,7 @@ module TemplateStreaming
     def push(data)
       if @bytes_to_threshold > 0
-        @push.call(data + padding)
+        @push.call(data + padding(@bytes_to_threshold - data.length))
         @bytes_to_threshold = 0
       else
         @push.call(data)
@@ -241,9 +241,10 @@ module TemplateStreaming
     private  # -------------------------------------------------------
-    def padding
-      content_length = [@bytes_to_threshold - 7, 0].max
-      "<!--#{'-'*content_length}-->"
+    def padding(length)
+      return '' if length <= 0
+      content_length = [length - 7, 0].max
+      "<!--#{'+'*content_length}-->"
     end
   end

data/lib/template_streaming/error_recovery.rb ADDED

@@ -0,0 +1,119 @@
+module TemplateStreaming
+  module ErrorRecovery
+    ENV_EXCEPTIONS   = 'template_streaming.error_recovery.exceptions'.freeze
+    ENV_SHOW_DETAILS = 'template_streaming.error_recovery.exceptions'.freeze
+    module Rendering
+      def uncaught_errors_html(errors)
+        content = errors.map do |error|
+          "<pre>#{uncaught_error_string(error)}</pre>"
+        end.join
+        <<-EOS.gsub(/^ *\|/, '')
+        |<div style='position: absolute; left: 0px; top: 0px; background-color: #fff; z-index: 999'>
+        |  <h2 style="margin: 20px; font-weight: bold; border-bottom: 1px solid red">Rails Application Error</h2>
+        |  #{content}
+        |</div>
+      EOS
+      end
+      def uncaught_error_string(error)
+        details = "#{error.class}: #{error.message}"
+        backtrace = error.backtrace.join("\n").gsub(/^/, '  ')
+        "<span style='font-weight: bold; margin: 20px'>#{h details}</span>\n#{h backtrace}"
+      end
+    end
+    module Controller
+      def self.included(base)
+        base.when_streaming_template :recover_from_errors
+        base.helper Helper
+        base.helper_method :recover_from_errors?
+      end
+      def recover_from_errors
+        @recover_from_errors = true
+      end
+      def recover_from_errors?
+        @recover_from_errors
+      end
+    end
+    module Helper
+      def render(*)
+        begin
+          super
+        rescue ActionView::MissingTemplate => e
+          # ActionView uses this as a signal to try another template engine.
+          raise e
+        rescue Exception => e
+          raise e if !recover_from_errors?
+          if HoptoadNotifier.configuration[:api_key]
+            Rails.logger.error("#{e.class}: #{e.message}")
+            Rails.logger.error(e.backtrace.join("\n").gsub(/^/, '  '))
+            HoptoadNotifier.notify(e)
+          end
+          request.env[ENV_SHOW_DETAILS] = consider_all_requests_local || local_request?
+          # TODO: Find a way to make this suck less.
+          is_template_error = e.is_a?(ActionView::TemplateError)
+          if is_template_error && e.file_name =~ %r'\Aapp/views/prelayouts/'
+            # Error in prelayout - no head or body rendered yet.
+            head = "<head><title>Rails Application Error</title></head>"
+            body = "<body>#{uncaught_errors_html([e])}</body>"
+            "<!DOCTYPE html><html>#{head}#{body}</html>"
+          elsif is_template_error && e.file_name =~ %r'\Aapp/views/layouts/'
+            # Error in layout - unclosed head tag has been rendered.
+            head = "<title>Rails Application Error</title></head>"
+            body = "<body>#{uncaught_errors_html([e])}</body>"
+            "#{head}#{body}</html>"
+          else
+            # Body is being rendered - return nothing for this render
+            # call, and render the exception in the middleware.
+            request.env[ENV_EXCEPTIONS] << e
+            ''
+          end
+        end
+      end
+      include Rendering
+    end
+    class Middleware
+      def initialize(app)
+        @app = app
+      end
+      def call(env)
+        @env = env
+        env[ENV_EXCEPTIONS] = []
+        status, headers, @body = *@app.call(env)
+        [status, headers, self]
+      end
+      def each
+        # Assume there are no faux occurrences of </body>.
+        @body.each do |chunk|
+          if render_errors? && (chunk =~ %r'</body\b')
+            errors = @env[ENV_EXCEPTIONS]
+            chunk.insert($~.begin(0), uncaught_errors_html(errors))
+          end
+          yield chunk
+        end
+      end
+      private
+      def render_errors?
+        !Rails.env.production? && !@env[ENV_EXCEPTIONS].empty?
+      end
+      include Rendering
+    end
+    ActionController::Base.send(:include, Controller)
+    ActionView::Base.send(:include, Helper)
+    ActionController::Dispatcher.middleware.insert_after('ActionController::Failsafe', Middleware)
+  end
+end

data/lib/template_streaming/version.rb CHANGED

@@ -1,5 +1,5 @@
 module TemplateStreaming
-  VERSION = [0, 0, 9]
+  VERSION = [0, 0, 10]
   class << VERSION
     include Comparable

metadata CHANGED

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments:
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors:
 - George Ogata
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-04-29 00:00:00 -04:00
+date: 2010-05-05 00:00:00 -04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -45,6 +45,7 @@ extra_rdoc_files:
 files:
 - doc/fast-profile.png
 - doc/slow-profile.png
+- lib/template_streaming/error_recovery.rb
 - lib/template_streaming/version.rb
 - lib/template_streaming.rb
 - LICENSE