rack-olark 0.0.4 → 0.0.5

data/README.md

@@ -1,9 +1,8 @@
-# Rack Olark
+# Rack::Olark
 Rack middleware which injects the Olark JavaScript code before the end of the body of any HTML document being sent to the client. 
 
 ## Usage
 
-    require 'rack/olark'
     use Rack::Olark, :id => '1234-567-89-0123'
 
 Most of the options you give Rack::Olark are passed along to Olark in the following format:
@@ -14,13 +13,12 @@ There are three special options: :id, :format, and :paths. :id is your Olark API
 
 :format is my (possibly lame) justification for using Haml in this project - this option is passed directly to Haml::Engine, and determines the form of the script tags that are inserted into your pages. Choices are :html4, :xhtml, and :html5, with a default of :html5.
 
-:paths decides which routes in your application will display the Olark chat box. It takes an array of routes, and you need to include the leading slash (/). As of version 0.0.4, you can now describe routes in the :paths array with a Regexp as well, and any non-Regexp entries will be handled like this:
+:paths decides which routes in your application will display the Olark chat box. It takes an array of routes, and you need to include the leading slash (/). If you don't give an array for :paths, it is empty by default, and this will cause the Olark code to be inserted on every route. As of version 0.0.4, you can now describe routes in the :paths array with a Regexp as well, and any non-Regexp entries will be handled like this:
 
     /^#{Regexp.escape(your_original_path_entry)}$/
 
 Example using options:
 
-    require 'rack/olark'
     use Rack::Olark, :id => '1234-567-89-0123', :format => :xhtml, :paths => ['/', '/aboutus'], 'box.corner_position' => 'BL', 'box.start_hidden' => true
 
 ## Acknowledgements

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/rack/olark.rb

@@ -10,10 +10,15 @@ module Rack
       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
 
@@ -24,7 +29,10 @@ module Rack
     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
@@ -37,7 +45,8 @@ module Rack
     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

metadata

@@ -2,7 +2,7 @@
 name: rack-olark
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Dan Poggi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 Z
+date: 2011-05-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rack-olark
-rubygems_version: 1.8.0
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: Rack middleware for embedding Olark.