bullet 1.7.0 → 1.7.1

data/README.textile

@@ -16,11 +16,11 @@ There is a large refactor from gem 1.4 to 1.5, so if you upgrade to 1.5 gem, ple
 
 ****************************************************************************
 
-h2. Thanks
+h2. Contributors
 
-flipsasser added Growl, console.log and Rails.log support, very awesome. And he improved README.
-rainux add group style console.log.
-2collegebums add some specs to generate red bar.
+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.
 
 ****************************************************************************
 
@@ -170,6 +170,14 @@ end
 
 ****************************************************************************
 
+h2. Links
+
+* "http://weblog.rubyonrails.org/2009/10/22/community-highlights":http://weblog.rubyonrails.org/2009/10/22/community-highlights
+* "http://ruby5.envylabs.com/episodes/9-episode-8-september-8-2009":http://ruby5.envylabs.com/episodes/9-episode-8-september-8-2009
+* "http://railslab.newrelic.com/2009/10/23/episode-19-on-the-edge-part-1":http://railslab.newrelic.com/2009/10/23/episode-19-on-the-edge-part-1
+
+****************************************************************************
+
 h2. Step by step example
 
 Bullet is designed to function as you browse through your application in development. It will alert you whenever it encounters N+1 queries or unused eager loading.
@@ -382,5 +390,7 @@ In the meanwhile, there's a log appended into <code>log/bullet.log</code> file.
   Post => [:comments]
 </code></pre>
 
+****************************************************************************
+
 
 Copyright (c) 2009 Richard Huang (flyerhzm@gmail.com), released under the MIT license

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.7.1

data/bullet.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{bullet}
-  s.version = "1.7.0"
+  s.version = "1.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-10-14}
+  s.date = %q{2009-11-13}
   s.description = %q{The Bullet plugin 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) or when you're using eager loading that isn't necessary.}
   s.email = %q{flyerhzm@gmail.com}
   s.extra_rdoc_files = [
@@ -30,8 +30,8 @@ Gem::Specification.new do |s|
      "lib/bullet/notification.rb",
      "lib/bulletware.rb",
      "rails/init.rb",
-     "spec/bullet_association_spec.rb",
-     "spec/bullet_counter_spec.rb",
+     "spec/bullet/association_spec.rb",
+     "spec/bullet/counter_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "tasks/bullet_tasks.rake"
@@ -42,9 +42,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{A plugin to kill N+1 queries and unused eager loading}
   s.test_files = [
-    "spec/bullet_association_spec.rb",
-     "spec/bullet_counter_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+     "spec/bullet/counter_spec.rb",
+     "spec/bullet/association_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -57,3 +57,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/lib/bulletware.rb

@@ -11,7 +11,7 @@ class Bulletware
     return [status, headers, response] if empty?(response)
 
     if Bullet.notification?
-      if check_html?(headers, response)
+      if !response.body.frozen? and check_html?(headers, response)
         response_body = response.body << Bullet.javascript_notification
         headers['Content-Length'] = response_body.length.to_s
       end

data/spec/{bullet_association_spec.rb → bullet/association_spec.rb}

@@ -1,11 +1,9 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 
 describe Bullet::Association, 'has_many' do
 
-  include BulletTestHelper
-
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
       create_table :categories do |t|
@@ -86,7 +84,7 @@ describe Bullet::Association, 'has_many' do
   end
 
   before(:all) do
-    silence_logger { setup_db }
+    setup_db
     
     newspaper1 = Newspaper.create(:name => "First Newspaper")
     newspaper2 = Newspaper.create(:name => "Second Newspaper")
@@ -481,7 +479,6 @@ end
 
 describe Bullet::Association, 'has_and_belongs_to_many' do
 
-  include BulletTestHelper
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
       create_table :students do |t|
@@ -514,7 +511,7 @@ describe Bullet::Association, 'has_and_belongs_to_many' do
   end
 
   before(:all) do
-    silence_logger { setup_db }
+    setup_db
     student1 = Student.create(:name => 'first')
     student2 = Student.create(:name => 'second')
     teacher1 = Teacher.create(:name => 'first')
@@ -566,8 +563,6 @@ end
 
 describe Bullet::Association, 'has_many :through' do
 
-  include BulletTestHelper
-
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
       create_table :firms do |t|
@@ -607,7 +602,7 @@ describe Bullet::Association, 'has_many :through' do
   end
 
   before(:all) do
-    silence_logger { setup_db }
+    setup_db
     firm1 = Firm.create(:name => 'first')
     firm2 = Firm.create(:name => 'second')
     client1 = Client.create(:name => 'first')
@@ -659,8 +654,6 @@ end
 
 describe Bullet::Association, 'has_many :as' do
 
-  include BulletTestHelper
-
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
       create_table :votes do |t|
@@ -707,7 +700,7 @@ describe Bullet::Association, 'has_many :as' do
   end
 
   before(:all) do
-    silence_logger { setup_db }
+    setup_db
     user1 = User.create(:name => 'first')
     user2 = User.create(:name => 'second')
     user3 = User.create(:name => 'third')
@@ -813,8 +806,6 @@ end
 
 describe Bullet::Association, "has_one" do
 
-  include BulletTestHelper
-
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
       create_table :companies do |t|
@@ -843,7 +834,7 @@ describe Bullet::Association, "has_one" do
   end
 
   before(:all) do
-    silence_logger { setup_db }
+    setup_db
 
     company1 = Company.create(:name => 'first')
     company2 = Company.create(:name => 'second')
@@ -892,7 +883,7 @@ describe Bullet::Association, "has_one" do
 end
 
 describe Bullet::Association, "call one association that in possible objects" do
-  include BulletTestHelper
+
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
       create_table :contacts do |t|
@@ -921,7 +912,7 @@ describe Bullet::Association, "call one association that in possible objects" do
   end
 
   before(:all) do
-    silence_logger { setup_db }
+    setup_db
 
     contact1 = Contact.create(:name => 'first')
     contact2 = Contact.create(:name => 'second')
@@ -952,7 +943,7 @@ describe Bullet::Association, "call one association that in possible objects" do
 end
 
 describe Bullet::Association, "STI" do
-  include BulletTestHelper
+
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
       create_table :documents do |t|
@@ -991,7 +982,7 @@ describe Bullet::Association, "STI" do
   end
 
   before(:all) do
-    silence_logger { setup_db }
+    setup_db
     author1 = Author.create(:name => 'author1')
     author2 = Author.create(:name => 'author2')
     folder1 = Folder.create(:name => 'folder1', :author_id => author1.id)

data/spec/{bullet_counter_spec.rb → bullet/counter_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 

data/spec/spec_helper.rb

@@ -10,24 +10,11 @@ module Rails
 end
 
 RAILS_ROOT = File.expand_path(__FILE__).split('/')[0..-3].join('/') unless defined? RAILS_ROOT
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/bullet/notification'))
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/bullet/logger'))
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/bullet/active_record'))
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/bullet/action_controller'))
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/bullet/association'))
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/bullet/counter'))
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/bullet'))
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/bulletware'))
-Bullet.enable = true
 
-module BulletTestHelper
-  def silence_logger(&block)
-    orig_stdout = $stdout
-    $stdout = StringIO.new
-    block.call
-    $stdout = orig_stdout
-  end
-end
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+require 'bullet'
+Bullet.enable = true
+ActiveRecord::Migration.verbose = false
 
 module Bullet
   class Association

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bullet
 version: !ruby/object:Gem::Version 
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 +08:00
+date: 2009-11-13 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -36,8 +36,8 @@ files:
 - lib/bullet/notification.rb
 - lib/bulletware.rb
 - rails/init.rb
-- spec/bullet_association_spec.rb
-- spec/bullet_counter_spec.rb
+- spec/bullet/association_spec.rb
+- spec/bullet/counter_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/bullet_tasks.rake
@@ -70,6 +70,6 @@ signing_key:
 specification_version: 3
 summary: A plugin to kill N+1 queries and unused eager loading
 test_files: 
-- spec/bullet_association_spec.rb
-- spec/bullet_counter_spec.rb
 - spec/spec_helper.rb
+- spec/bullet/counter_spec.rb
+- spec/bullet/association_spec.rb