From 176ce40003c887135eaf19057cf63efab316602c Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Mon, 6 May 2013 09:36:15 -0400
Subject: [PATCH] a little more code shuffling to clean up the body processor
 class a bit

---
 lib/rack/livereload/body_processor.rb | 43 +++++++++++++++++----------
 skel/livereload.html.erb              |  2 +-
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/lib/rack/livereload/body_processor.rb b/lib/rack/livereload/body_processor.rb
index e62a2c5..9078c5a 100644
--- a/lib/rack/livereload/body_processor.rb
+++ b/lib/rack/livereload/body_processor.rb
@@ -61,6 +61,7 @@ module Rack
       end
 
       def process!(env)
+        @env = env
         @body.close if @body.respond_to?(:close)
 
         @new_body = [] ; @body.each { |line| @new_body << line.to_s }
@@ -70,22 +71,6 @@ module Rack
 
         @new_body.each do |line|
           if !@livereload_added && line['<head']
-            host_to_use = (@options[:host] || env['HTTP_HOST'] || 'localhost').gsub(%r{:.*}, '')
-
-            app_root = ENV['RAILS_RELATIVE_URL_ROOT'] || ''
-
-            if use_vendored?
-              src = "#{app_root}#{LIVERELOAD_JS_PATH.dup}?host=#{host_to_use}"
-            else
-              src = livereload_local_uri.dup.gsub('localhost', host_to_use) + '?'
-            end
-
-            src << "&amp;mindelay=#{@options[:min_delay]}" if @options[:min_delay]
-            src << "&amp;maxdelay=#{@options[:max_delay]}" if @options[:max_delay]
-            src << "&amp;port=#{@options[:port]}" if @options[:port]
-
-            template = ERB.new(::File.read(::File.expand_path('../../../../skel/livereload.html.erb', __FILE__)))
-
             line.gsub!(HEAD_TAG_REGEX) { |match| %{#{match}#{template.result(binding)}} }
 
             @livereload_added = true
@@ -95,6 +80,32 @@ module Rack
           @processed = true
         end
       end
+
+      def app_root
+        ENV['RAILS_RELATIVE_URL_ROOT'] || ''
+      end
+
+      def host_to_use
+        (@options[:host] || @env['HTTP_HOST'] || 'localhost').gsub(%r{:.*}, '')
+      end
+
+      def template
+        ERB.new(::File.read(::File.expand_path('../../../../skel/livereload.html.erb', __FILE__)))
+      end
+
+      def livereload_source
+        if use_vendored?
+          src = "#{app_root}#{LIVERELOAD_JS_PATH.dup}?host=#{host_to_use}"
+        else
+          src = livereload_local_uri.dup.gsub('localhost', host_to_use) + '?'
+        end
+
+        src << "&amp;mindelay=#{@options[:min_delay]}" if @options[:min_delay]
+        src << "&amp;maxdelay=#{@options[:max_delay]}" if @options[:max_delay]
+        src << "&amp;port=#{@options[:port]}" if @options[:port]
+
+        src
+      end
     end
   end
 end
diff --git a/skel/livereload.html.erb b/skel/livereload.html.erb
index 5bf8669..6721c43 100644
--- a/skel/livereload.html.erb
+++ b/skel/livereload.html.erb
@@ -11,5 +11,5 @@
 <script type="text/javascript">
   RACK_LIVERELOAD_PORT = <%= @options[:live_reload_port] %>;
 </script>
-<script type="text/javascript" src="<%= src %>"></script>
+<script type="text/javascript" src="<%= livereload_source %>"></script>