lib/rack/olark.rb in rack-olark-0.0.4 vs lib/rack/olark.rb in rack-olark-0.0.5

@@ -8,25 +8,33 @@
 
     def initialize(app, options = {})
       raise ArgumentError, "Need a valid Olark ID!" unless options[:id] and options[:id].length.eql? 16
       @app, @options = app, Defaults.merge(options)
       @id, @format, @paths = [@options.delete(:id), @options.delete(:format), @options.delete(:paths)]
-      @paths = @paths.class.eql?(Array) ? @paths.map {|path| path.class.eql?(Regexp) ? path : /^#{Regexp.escape(path.to_s)}$/} : []
+
+      @paths = @paths.class.eql?(Array) ? @paths.map do |path|
+        path.class.eql?(Regexp) ? path : /^#{Regexp.escape(path.to_s)}$/
+      end : []
+
       @option_js = "olark.identify('#{@id}');"
       @options.each do |key, val|
-        @option_js << "olark.configure('#{key.to_s}', #{[String, Symbol].include? val.class ? "'#{val.to_s}'" : val.to_s});"
+        val = [String, Symbol].include? val.class ? "'#{val.to_s}'" : val.to_s
+        @option_js << "olark.configure('#{key.to_s}', #{val});"
       end
     end
 
     def call(env)
       dup._call(env)
     end
 
     def _call(env)
       @status, @headers, @response = @app.call env
       @request = Rack::Request.new env
-      return [@status, @headers, @response] unless html? and (@paths.empty? or @paths.select {|path| @request.path_info =~ path}.length > 0)
+
+      valid_path = @paths.select {|path| @request.path_info =~ path}.length > 0
+      return [@status, @headers, @response] unless html? and (@paths.empty? or valid_path)
+
       response = Rack::Response.new [], @status, @headers
       @response.each {|fragment| response.write inject(fragment)}
       response.finish
     end
 
@@ -35,10 +43,11 @@
     def html?
       @headers['Content-Type'] =~ /html/
     end
 
     def inject(response)
-      @template = Haml::Engine.new(::File.read(::File.expand_path('../templates/olark.haml', __FILE__)), {:format => @format}).render self
+      template_contents = ::File.read ::File.expand_path('../templates/olark.haml', __FILE__)
+      @template = Haml::Engine.new(template_contents, {:format => @format}).render self
       response.gsub '</body>', @template
     end
   end
 end