bullet 1.6.0 → 1.7.0

data/README.textile

@@ -4,7 +4,9 @@ The Bullet plugin/gem is designed to help you increase your application's perfor
 
 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.
 
-This plugin/gem uses <code>ActionController::Dispatcher.middleware</code> which is introduce by rails 2.3.
+The Bullet plugin/gem now supports rails 2.1, 2.2 and 2.3, tested in rails 2.1.2, 2.2.2 and 2.3.2.
+
+*Important: bullet gem has been moved to gemcutter.org*
 
 ****************************************************************************
 
@@ -25,10 +27,13 @@ rainux add group style console.log.
 h2. Install
 
 You can add Bullet to your Rails gem requirements:
-<pre><code>config.gem 'flyerhzm-bullet', :lib => 'bullet', :source => 'http://gems.github.com'</code></pre>
+<pre><code>config.gem 'bullet', :source => 'http://gemcutter.org'</code></pre>
 
 You can install it as a gem:
-<pre><code>sudo gem install flyerhzm-bullet --source http://gems.github.com</code></pre>
+<pre><code>
+sudo gem sources -a http://gemcutter.org
+sudo gem install bullet
+</code></pre>
 
 Or you can install it as a rails plugin:
 <pre><code>script/plugin install git://github.com/flyerhzm/bullet.git</code></pre>

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.7.0

data/bullet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bullet}
-  s.version = "1.6.0"
+  s.version = "1.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-10-08}
+  s.date = %q{2009-10-14}
   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 = [
@@ -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_counter_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/bullet_association_spec.rb"
+    "spec/bullet_association_spec.rb",
+     "spec/bullet_counter_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/bullet.rb

@@ -1,3 +1,4 @@
+require 'action_controller/dispatcher'
 require 'bulletware'
 
 module Bullet
@@ -16,7 +17,9 @@ module Bullet
       if enable? 
         Bullet::ActiveRecord.enable
         Bullet::ActionController.enable
-        ::ActionController::Dispatcher.middleware.use Bulletware
+        if ::Rails::VERSION::STRING =~ /^2.3/
+          ::ActionController::Dispatcher.middleware.use Bulletware
+        end
       end
     end
 

data/lib/bullet/action_controller.rb

@@ -1,16 +1,50 @@
 module Bullet
   class ActionController
     def self.enable
-      ::ActionController::Dispatcher.class_eval do
-        class <<self
+      case ::Rails::VERSION::STRING
+      when /^2.3/
+        ::ActionController::Dispatcher.class_eval do
+          class <<self
+            alias_method :origin_reload_application, :reload_application
+            def reload_application
+              origin_reload_application
+              Bullet.clear
+            end
+          end
+        end
+      when /^2.[2|1]/
+        ::ActionController::Dispatcher.class_eval do
           alias_method :origin_reload_application, :reload_application
-          
           def reload_application
             origin_reload_application
             Bullet.clear
           end
         end
+        
+        ::ActionController::Base.class_eval do
+          alias_method :origin_process, :process
+          def process(request, response, method = :perform_action, *arguments)
+            Bullet.start_request
+            response = origin_process(request, response, method = :perform_action, *arguments)
+            puts response.body
+            puts response.headers
+            
+            if Bullet.notification?
+              if response.headers["type"] and response.headers["type"].include? 'text/html' and response.body =~ %r{<html.*</html>}m
+                response.body <<= Bullet.javascript_notification
+                response.headers["Content-Length"] = response.body.length.to_s
+              end
+            
+              Bullet.growl_notification
+              Bullet.log_notification(request.params['PATH_INFO'])
+            end
+            Bullet.end_request
+            response
+          end
+        end
+      else
+        puts "Gem Bullet: Unsupported rails version"
       end
     end
   end
-end
+end

data/lib/bulletware.rb

@@ -31,7 +31,7 @@ class Bulletware
   end
   
   def check_html?(headers, response)
-    !headers['Content-Type'].nil? and headers['Content-Type'].include? 'text/html' and response.body =~ %r{<html.*</html>}m
+    headers['Content-Type'] and headers['Content-Type'].include? 'text/html' and response.body =~ %r{<html.*</html>}m
   end
 
   def no_browser_cache(headers)

data/spec/spec_helper.rb

@@ -3,6 +3,12 @@ require 'spec/autorun'
 require 'active_record'
 require 'action_controller'
 
+module Rails
+  module VERSION 
+    STRING = "2.3.2"
+  end
+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'))
@@ -47,4 +53,4 @@ module Bullet
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bullet
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 +08:00
+date: 2009-10-14 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -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_association_spec.rb