bullet 2.1.0 → 2.2.0

data/.travis.yml

@@ -0,0 +1 @@
+rvm: 1.9.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bullet (2.1.0)
+    bullet (2.2.0)
       uniform_notifier (~> 1.0.0)
 
 GEM

data/README.textile

@@ -1,10 +1,12 @@
 h1. Bullet
 
+!https://secure.travis-ci.org/flyerhzm/rails_best_practices.png!:http://travis-ci.org/flyerhzm/rails_best_practices
+
 The Bullet plugin/gem is designed to help you increase your application's performance by reducing the number of queries it makes. It will watch your queries while you develop your application and notify you when you should add eager loading (N+1 queries), when you're using eager loading that isn't necessary and when you should use counter cache.
 
 Best practice is to use Bullet in development mode or custom mode (staging, profile, etc.). The last thing you want is your clients getting alerts about how lazy you are.
 
-The Bullet plugin/gem now supports rails 2.1, 2.2, 2.3 and 3.0.
+The Bullet plugin/gem now supports rails 2.1, 2.2, 2.3, 3.0 and 3.1.
 
 ****************************************************************************
 
@@ -18,7 +20,7 @@ gem install bullet
 or add it into a Gemfile (Bundler):
 <pre><code>
 gem "bullet", :group => "development"
-</code></code>
+</code></pre>
 
 ****************************************************************************
 
@@ -166,10 +168,7 @@ h2. Links
 
 h2. Contributors
 
-sriedel did a lot of awesome refactors, added xmpp notification support, and added Hacking.textile about how to extend to bullet plugin.
-flipsasser added Growl, console.log and Rails.log support, very awesome. And he also improved README.
-rainux added group style console.log.
-2collegebums added some great specs to generate red bar.
+"https://github.com/flyerhzm/bullet/contributors":https://github.com/flyerhzm/bullet/contributors
 
 ****************************************************************************
 
@@ -393,4 +392,4 @@ In the meanwhile, there's a log appended into <code>log/bullet.log</code> file.
 ****************************************************************************
 
 
-Copyright (c) 2009 - 2011 Richard Huang (flyerhzm@gmail.com), released under the MIT license
+Copyright (c) 2009 - 2012 Richard Huang (flyerhzm@gmail.com), released under the MIT license

data/README_for_rails2.textile

@@ -16,10 +16,7 @@ There is a large refactor from gem 1.4 to 1.5, so if you upgrade to 1.5 gem, ple
 
 h2. Contributors
 
-sriedel did a lot of awesome refactors, added xmpp notification support, and added Hacking.textile about how to extend to bullet plugin.
-flipsasser added Growl, console.log and Rails.log support, very awesome. And he also improved README.
-rainux added group style console.log.
-2collegebums added some great specs to generate red bar.
+"https://github.com/flyerhzm/bullet/contributors":https://github.com/flyerhzm/bullet/contributors
 
 ****************************************************************************
 
@@ -400,4 +397,4 @@ In the meanwhile, there's a log appended into <code>log/bullet.log</code> file.
 ****************************************************************************
 
 
-Copyright (c) 2009 - 2011 Richard Huang (flyerhzm@gmail.com), released under the MIT license
+Copyright (c) 2009 - 2012 Richard Huang (flyerhzm@gmail.com), released under the MIT license

data/lib/bullet.rb

@@ -4,7 +4,7 @@ require 'uniform_notifier'
 module Bullet
   if Rails.version =~ /^3\.0/
     autoload :ActiveRecord, 'bullet/active_record3'
-  elsif Rails.version =~ /^3\.1/
+  elsif Rails.version =~ /^3\.[12]/
     autoload :ActiveRecord, 'bullet/active_record31'
   else
     autoload :ActiveRecord, 'bullet/active_record2'

data/lib/bullet/rack.rb

@@ -11,6 +11,7 @@ module Bullet
       status, headers, response = @app.call(env)
       return [status, headers, response] if empty?(response)
 
+      response_body = nil
       if Bullet.notification?
         if status == 200 and !response.body.frozen? and check_html?(headers, response)
           response_body = response.body << Bullet.gather_inline_notifications
@@ -18,10 +19,9 @@ module Bullet
         end
         Bullet.perform_out_of_channel_notifications(env)
       end
-      response_body ||= response.body
       Bullet.end_request
       no_browser_cache(headers) if Bullet.disable_browser_cache
-      [status, headers, [response_body]]
+      [status, headers, response_body ? [response_body] : response]
     end
 
     # fix issue if response's body is a Proc

data/lib/bullet/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 module Bullet
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end
 

data/spec/bullet/rack_spec.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+
+describe Bullet::Rack do
+  let(:middleware) { Bullet::Rack.new app }
+  let(:app) { AppDouble.new }
+
+  describe "#call" do
+    context "when Bullet is enabled" do
+      before(:each) { Bullet.enable = true }
+
+      it "should invoke Bullet.start_request" do
+        Bullet.should_receive(:start_request)
+        middleware.call([])
+      end
+
+      it "should invoke Bullet.end_request" do
+        Bullet.should_receive(:end_request)
+        middleware.call([])
+      end
+
+      it "should return original response body" do
+        expected_response = ResponseDouble.new "Actual body"
+        app.response = expected_response
+        status, headers, response = middleware.call([])
+        response.should eq expected_response
+      end
+    end
+
+    context "when Bullet is disabled" do
+      before(:each) { Bullet.enable = false }
+      after(:each) { Bullet.enable = true }
+
+      it "should not call Bullet.start_request" do
+        Bullet.should_not_receive(:start_request)
+        middleware.call([])
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'pry'
 require 'rubygems'
 require 'rspec'
 require 'rspec/autorun'
@@ -77,3 +78,57 @@ module Bullet
     end
   end
 end
+
+class AppDouble
+  def call env
+    env = @env
+    [ status, headers, response ]
+  end
+
+  def status= status
+    @status = status
+  end
+
+  def headers= headers
+    @headers = headers
+  end
+
+  def headers
+    @headers ||= {}
+    @headers
+  end
+
+  def response= response
+    @response = response
+  end
+
+  private
+  def status
+    @status || 200
+  end
+
+  def response
+    @response || ResponseDouble.new
+  end
+end
+
+class ResponseDouble
+  def initialize actual_body = nil
+    @actual_body = actual_body
+  end
+
+  def body
+    @body ||= "Hello world!"
+  end
+
+  def body= body
+    @body = body
+  end
+
+  def each
+    yield body
+  end
+
+  def close
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-11 00:00:00.000000000 Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uniform_notifier
-  requirement: &2156581180 !ruby/object:Gem::Requirement
+  requirement: &70142210251740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156581180
+  version_requirements: *70142210251740
 description: A rails plugin to kill N+1 queries and unused eager loading.
 email:
 - flyerhzm@gmail.com
@@ -33,6 +33,7 @@ files:
 - .rspec
 - .rvmrc
 - .rvmrc.example
+- .travis.yml
 - .watchr
 - Gemfile
 - Gemfile.lock
@@ -71,6 +72,7 @@ files:
 - spec/bullet/association_for_peschkaj_spec.rb
 - spec/bullet/association_spec.rb
 - spec/bullet/counter_spec.rb
+- spec/bullet/rack_spec.rb
 - spec/spec_helper.rb
 - tasks/bullet_tasks.rake
 homepage: http://github.com/flyerhzm/bullet
@@ -87,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1237939251235315374
+      hash: -891202166897363067
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -96,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A rails plugin to kill N+1 queries and unused eager loading.
@@ -105,4 +107,5 @@ test_files:
 - spec/bullet/association_for_peschkaj_spec.rb
 - spec/bullet/association_spec.rb
 - spec/bullet/counter_spec.rb
+- spec/bullet/rack_spec.rb
 - spec/spec_helper.rb