rack-track 0.1.3 → 0.1.4

data/Rakefile

@@ -15,7 +15,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "rack-track"
-  gem.version = "0.1.3"
+  gem.version = "0.1.4"
   gem.homepage = "http://github.com/michaelbaldry/rack-track"
   gem.license = "MIT"
   gem.summary = %Q{Taking all the pain away from managing Tracking Pixels}

data/lib/rack/track.rb

@@ -13,9 +13,8 @@ module Rack
         response_body = ""
         response.each { |p| response_body += p }
         response = [@rules.apply(request, response_body)] if response_body.include? "</body>"
-        headers["Content-Length"] = response.inject(0){|sum,x| sum + x.length }.to_s
+        headers["Content-Length"] = get_length(response)
       end
-      p headers
       [status, headers, response]
     end
   
@@ -24,8 +23,14 @@ module Rack
   
     private
   
+    def get_length(response)
+      sum_length = 0
+      response.each {|x| sum_length += x.length }
+      sum_length.to_s
+    end
+  
     class PixelSet
-      Pixel = Struct.new(:name, :area, :content)
+      Pixel = Struct.new(:name, :area, :except, :content)
     
       def initialize(&block)
         @pixels = []
@@ -39,14 +44,19 @@ module Rack
       end
     
       def pixel(name, opts = {}, &block)
-        @pixels << Pixel.new(name, opts[:on], block[])
+        @pixels << Pixel.new(name, opts[:on], opts[:except] ? [opts[:except]].flatten : [], block[])
       end
     
       def apply(request, response)
         url = URI::parse(request.url)
+        p "applying to #{url.path.downcase}"
+        matching_areas = @areas.find_all { |k, a| a.include? url.path.downcase }.collect { |k, v| k }
+        p matching_areas
         @pixels.each do |p|
           paths = @areas[p.area]
-          response.insert(response.rindex("</body>"), p.content) if [:all_pages, :all].include?(p.area) || paths.include?(url.path.downcase)
+          response.insert(response.rindex("</body>"), p.content) if ([:all_pages, :all].include?(p.area) || 
+                                                                    paths.include?(url.path.downcase)) &&
+                                                                    p.except.find_all { |ea| matching_areas.include? ea }.empty?
         end
         response
       end

data/rack-track.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-track}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Baldry"]
-  s.date = %q{2011-08-24}
+  s.date = %q{2011-09-01}
   s.description = %q{A rack middleware that allows you to define and document tracking pixels in one location}
   s.email = %q{clockwize@gmail.com}
   s.extra_rdoc_files = [

data/test/test_rack-track.rb

@@ -35,7 +35,7 @@ class TestRackTrack < Test::Unit::TestCase
     end
 
     assert tp.instance_variable_get(:@areas) == {:confirmation => ["business-energy/confirmation", "business-communications/confirmation"]}
-    assert tp.instance_variable_get(:@pixels) == [Rack::Track::PixelSet::Pixel.new("Confirmation (GA)", :confirmation, "THIS IS A GA CONFIRMATION TEST")]
+    assert tp.instance_variable_get(:@pixels) == [Rack::Track::PixelSet::Pixel.new("Confirmation (GA)", :confirmation, [], "THIS IS A GA CONFIRMATION TEST")]
   end
   
   def test_psudo_area_all
@@ -46,6 +46,31 @@ class TestRackTrack < Test::Unit::TestCase
     assert last_response.body.include? "THIS-IS-A-TEST</body>"
   end
   
+  def test_area_exclusion
+    @rules = Proc.new do 
+      area :an_area, "/blah", "/blah/test"
+      
+      pixel "Test pixel", :on => :an_area do
+        "THIS-IS-A-TEST"
+      end
+      
+      pixel "All except an_area", :on => :all, :except => :an_area do
+        "ALL-EXCEPT-AN-AREA"
+      end
+    end
+    get '/'
+    assert !last_response.body.include?("THIS-IS-A-TEST")
+    assert last_response.body.include?("ALL-EXCEPT-AN-AREA")
+    
+    get '/blah'
+    assert last_response.body.include?("THIS-IS-A-TEST")
+    assert !last_response.body.include?("ALL-EXCEPT-AN-AREA")
+    
+    get '/blah/test'
+    assert last_response.body.include?("THIS-IS-A-TEST")
+    assert !last_response.body.include?("ALL-EXCEPT-AN-AREA")
+  end
+  
   def test_area_inclusion
     @rules = Proc.new do 
       area :an_area, "/blah", "/blah/test"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-track
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Michael Baldry
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 +01:00
+date: 2011-09-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency