rack_clicky 1.0.2 → 1.0.3

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in rack_clicky.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,18 @@
+PATH
+  remote: .
+  specs:
+    rack_clicky (0.0.1)
+      rack
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    rack (1.3.3)
+    thoughtbot-shoulda (2.11.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rack_clicky!
+  thoughtbot-shoulda

data/Rakefile

@@ -1,52 +1,12 @@
-require 'rubygems'
-require 'rake'
+require "bundler/gem_tasks"
+require 'rake/testtask'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "rack_clicky"
-    gem.summary = "Clicky Analytics for your Rack Apps"
-    gem.description = "Embeds the Clicky tracking code at the end of your HTML"
-    gem.email = "mark@amerine.net"
-    gem.homepage = "http://github.com/amerine/rack_clicky"
-    gem.authors = ["Mark Turner"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
 
-require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
 
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "rack_clicky #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/rack_clicky.rb

@@ -1,43 +1,55 @@
-module Rack 
+require "rack_clicky/version"
+
+module Rack
   class Clicky
-    
+
     TRACKING_CODE = <<-EOTC 
     <script src="http://static.getclicky.com/js" type="text/javascript"></script>
     <script type="text/javascript">clicky.init({{CODE}});</script>
     <noscript><p><img alt="Clicky" width="1" height="1" src="http://in.getclicky.com/{{CODE}}ns.gif" /></p></noscript>
     EOTC
-    
-    def initialize(app, site_id, options = {})
+
+    def initialize app, site_id, options={}
       @app = app
       @site_id = site_id
     end
-    
-    def call(env)
+
+    def call env
       dup._call(env)
     end
-    
-    def _call(env)
-      
-      @status, @headers, @response = @app.call(env)
-      return [@status, @headers, @response] unless @headers['Content-Type'] =~ /html/
-
-      @headers.delete('Content-Length')
-      response = Rack::Response.new([], @status, @headers)
-      @response.each do |fragment|
-        response.write(inject_tracking(fragment))
+
+    def _call env
+      status, headers, response = @app.call(env)
+
+      if should_inject_clicky? status, headers, response
+        response = inject_tracking(response)
+        fix_content_length(headers, response)
+      end
+
+      [status, headers, response]
+    end
+
+    def should_inject_clicky? status, headers, response
+      status == 200 &&
+      headers["Content-Type"] &&
+      (headers["Content-Type"].include?("text/html") || headers["Content-Type"].include?("application/xhtml"))
+    end
+
+    def fix_content_length headers, response
+      if headers["Content-Length"]
+        length = response.to_ary.inject(0) { |len, part| len + Rack::Utils.bytesize(part) }
+        headers['Content-Length'] = length.to_s
       end
-      response.finish
     end
-    
-    def inject_tracking(response)
-        response.sub!(/<\/body>/, "#{track_code}\n</body>")
+
+    def inject_tracking response, body=""
+      response.each { |s| body << s.to_s }
+      [body.gsub(/<\/body>/, "#{track_code}\n</body>")]
     end
-    
-    private
-    
+
     def track_code
       TRACKING_CODE.gsub(/\{\{CODE\}\}/, @site_id)
     end
-    
+    private :track_code
   end
 end

data/lib/rack_clicky/version.rb

@@ -0,0 +1,3 @@
+module RackClicky
+  VERSION = "1.0.3"
+end

data/rack_clicky.gemspec

@@ -1,54 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "rack_clicky/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{rack_clicky}
-  s.version = "1.0.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Mark Turner"]
-  s.date = %q{2010-10-27}
+  s.name        = "rack_clicky"
+  s.version     = RackClicky::VERSION
+  s.authors     = ["Mark Turner"]
+  s.email       = ["mark@amerine.net"]
+  s.homepage    = "http://github.com/amerine/rack_clicky"
+  s.summary     = %q{Clicky Analytics for your Rack Apps}
   s.description = %q{Embeds the Clicky tracking code at the end of your HTML}
-  s.email = %q{mark@amerine.net}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/rack_clicky.rb",
-     "rack_clicky.gemspec",
-     "test/helper.rb",
-     "test/test_rack_clicky.rb"
-  ]
-  s.homepage = %q{http://github.com/amerine/rack_clicky}
-  s.rdoc_options = ["--charset=UTF-8"]
+
+  s.rubyforge_project = "rack_clicky"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Clicky Analytics for your Rack Apps}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_rack_clicky.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_development_dependency "thoughtbot-shoulda"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-  end
+  s.add_dependency "rack"
 end
-

data/test/helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'rack/mock'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_rack_clicky.rb

@@ -1,33 +1,31 @@
 require 'helper'
-require 'rack/mock'
 
 class TestRackClicky < Test::Unit::TestCase
   context "Embedding clicky" do
     should "place the tracking code at the end of an HTML request" do
       assert_match EXPECTED_CODE, request.body
     end
-    
+
     should "place the tracking code at the end of an XHTML request" do
       assert_match EXPECTED_CODE, request(:content_type => 'application/xhtml+xml').body
     end
-    
+
     should "not place the tracking code in a non HTML request" do
       assert_no_match EXPECTED_CODE, request(:content_type => 'application/xml', :body => [XML]).body
     end
-    
+
     should "insert the site id" do
       assert_match /clicky\.init\(000000\)/, request.body
     end
-    
+
   end
-  
-  
+
   private
-  
+
   EXPECTED_CODE = /<script.*clicky\.init.*<\/script>.*<\/body>/m
-  
+
   SITE_ID = "000000"
-  
+
   HTML = <<-EOHTML
   <html>
     <head>
@@ -39,7 +37,7 @@ class TestRackClicky < Test::Unit::TestCase
     </body>
   </html>
   EOHTML
-  
+
   XML = <<-EOXML
   <?xml version="1.0" encoding="ISO-8859-1"?>
   <user>
@@ -47,14 +45,14 @@ class TestRackClicky < Test::Unit::TestCase
     <age>Unknown</age>
   </user>
   EOXML
-  
+
   def request(options={})
     @app = app(options)
     request = Rack::MockRequest.new(@app).get('/')
     yield(@app, request) if block_given?
     request
   end
-  
+
   def app(options={})
     options = options.clone
     options[:content_type] ||= "text/html"
@@ -62,5 +60,4 @@ class TestRackClicky < Test::Unit::TestCase
     rack_app = lambda { |env| [200, { 'Content-Type' => options.delete(:content_type) }, options.delete(:body)] }
     Rack::Clicky.new(rack_app, SITE_ID)
   end
-  
 end

metadata

@@ -1,91 +1,81 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack_clicky
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+version: !ruby/object:Gem::Version
+  version: 1.0.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Mark Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-27 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70139124813360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70139124813360
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &70139124842620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70139124842620
 description: Embeds the Clicky tracking code at the end of your HTML
-email: mark@amerine.net
+email:
+- mark@amerine.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
 - .document
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/rack_clicky.rb
+- lib/rack_clicky/version.rb
 - rack_clicky.gemspec
 - test/helper.rb
 - test/test_rack_clicky.rb
-has_rdoc: true
 homepage: http://github.com/amerine/rack_clicky
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: rack_clicky
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Clicky Analytics for your Rack Apps
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_rack_clicky.rb

data/VERSION

@@ -1 +0,0 @@
-1.0.2