flyerhzm-bullet 1.5.5 → 1.5.6

data/README.textile

@@ -225,9 +225,13 @@ $ script/plugin install git://github.com/flyerhzm/bullet.git
 
 <pre><code>
 config.after_initialize do
-  Bullet.enable = true 
+  Bullet.enable = true
   Bullet.alert = true
-  Bullet.bullet_logger = true  
+  Bullet.bullet_logger = true
+  Bullet.console = true
+#  Bullet.growl = true
+  Bullet.rails_logger = true
+  Bullet.disable_browser_cache = true
 end
 </code></pre>
 

data/VERSION

@@ -1 +1 @@
-1.5.5
+1.5.6

data/bullet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bullet}
-  s.version = "1.5.5"
+  s.version = "1.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-09-15}
+  s.date = %q{2009-09-21}
   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 = [
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "bullet.gemspec",
      "lib/bullet.rb",
+     "lib/bullet/action_controller.rb",
      "lib/bullet/active_record.rb",
      "lib/bullet/association.rb",
      "lib/bullet/counter.rb",

data/lib/bullet.rb

@@ -2,6 +2,7 @@ require 'bulletware'
 
 module Bullet
   autoload :ActiveRecord, 'bullet/active_record'
+  autoload :ActionController, 'bullet/action_controller'
   autoload :Association, 'bullet/association'
   autoload :Counter, 'bullet/counter'
   autoload :BulletLogger, 'bullet/logger'
@@ -14,7 +15,8 @@ module Bullet
       @enable = enable
       if enable? 
         Bullet::ActiveRecord.enable
-        ActionController::Dispatcher.middleware.use Bulletware
+        Bullet::ActionController.enable
+        ::ActionController::Dispatcher.middleware.use Bulletware
       end
     end
 
@@ -51,6 +53,10 @@ module Bullet
     def end_request
       BULLETS.each {|bullet| bullet.end_request}
     end
+    
+    def clear
+      BULLETS.each {|bullet| bullet.clear}
+    end
 
     def notification?
       BULLETS.any? {|bullet| bullet.notification?}

data/lib/bullet/action_controller.rb

@@ -0,0 +1,16 @@
+module Bullet
+  class ActionController
+    def self.enable
+      ::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
+    end
+  end
+end

data/lib/bullet/association.rb

@@ -7,6 +7,10 @@ module Bullet
       end
 
       def end_request
+        clear
+      end
+      
+      def clear
         @@object_associations = nil
         @@unpreload_associations = nil
         @@unused_preload_associations = nil

data/lib/bullet/counter.rb

@@ -7,6 +7,10 @@ module Bullet
       end
 
       def end_request
+        clear
+      end
+      
+      def clear
         @@klazz_associations = nil
         @@possible_objects = nil
         @@impossible_objects = nil

data/lib/bullet/notification.rb

@@ -20,27 +20,29 @@ module Bullet
       if Bullet.alert || Bullet.console
         response = notification_response
       end
-      if Bullet.alert
-        str << wrap_js_association("alert(#{response.join("\n").inspect});")
-      end
-      if Bullet.console
-        code = <<-CODE
-          if (typeof(console) !== 'undefined') {
+      unless response.blank?
+        if Bullet.alert
+          str << wrap_js_association("alert(#{response.join("\n").inspect});")
+        end
+        if Bullet.console
+          code = <<-CODE
+            if (typeof(console) !== 'undefined') {
 
-            if (console.groupCollapsed && console.groupEnd && console.log) {
+              if (console.groupCollapsed && console.groupEnd && console.log) {
 
-              console.groupCollapsed(#{console_title.join(', ').inspect});
-              console.log(#{response.join("\n").inspect});
-              console.log(#{call_stack_messages.join("\n").inspect});
-              console.groupEnd();
+                console.groupCollapsed(#{console_title.join(', ').inspect});
+                console.log(#{response.join("\n").inspect});
+                console.log(#{call_stack_messages.join("\n").inspect});
+                console.groupEnd();
 
-            } else if (console.log) {
+              } else if (console.log) {
 
-              console.log(#{response.join("\n").inspect});
+                console.log(#{response.join("\n").inspect});
+              }
             }
-          }
-        CODE
-        str << wrap_js_association(code)
+          CODE
+          str << wrap_js_association(code)
+        end
       end
       str
     end
@@ -48,10 +50,12 @@ module Bullet
     def growl_notification
       if Bullet.growl
         response = notification_response
-        begin
-          growl = Growl.new('localhost', 'ruby-growl', ['Bullet Notification'], nil, Bullet.growl_password)
-          growl.notify('Bullet Notification', 'Bullet Notification', response.join("\n"))
-        rescue
+        unless response.blank?
+          begin
+            growl = Growl.new('localhost', 'ruby-growl', ['Bullet Notification'], nil, Bullet.growl_password)
+            growl.notify('Bullet Notification', 'Bullet Notification', response.join("\n"))
+          rescue
+          end
         end
       end
     end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ RAILS_ROOT = File.expand_path(__FILE__).split('/')[0..-3].join('/') unless defin
 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'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flyerhzm-bullet
 version: !ruby/object:Gem::Version 
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-15 00:00:00 -07:00
+date: 2009-09-21 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +28,7 @@ files:
 - VERSION
 - bullet.gemspec
 - lib/bullet.rb
+- lib/bullet/action_controller.rb
 - lib/bullet/active_record.rb
 - lib/bullet/association.rb
 - lib/bullet/counter.rb