flyerhzm-bullet 1.3.0 → 1.4.0

data/README.textile

@@ -39,6 +39,15 @@ config.after_initialize do
 end
 </code></pre>
 
+It is recommended to config growl notification as follows if your collaborators are not using MacOS
+<pre><code>
+  begin
+    require 'ruby-growl'
+    Bullet::Association.growl = true
+  rescue MissingSourceFile
+  end
+</code></pre>
+
 The code above will enable all five of the Bullet notification systems:
 * <code>Bullet.enable</code>: enable Bullet plugin, otherwise do nothing
 * <code>Bullet::Association.alert</code>: pop up a JavaScript alert in the browser

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/bullet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bullet}
-  s.version = "1.3.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-08-31}
+  s.date = %q{2009-09-03}
   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 = [

data/lib/bullet/association.rb

@@ -85,18 +85,10 @@ module Bullet
         !unpreload_associations.empty?
       end
 
-      def bad_associations_alert
+      def javascript_notification
         str = ''
-        if @@alert || @@console || @@growl
-          response = []
-          if has_unused_preload_associations?
-            response.push("Unused eager loadings detected:\n")
-            response.push(*@@unused_preload_associations.to_a.collect{|klazz, associations| klazz_associations_str(klazz, associations)}.join("\n"))
-          end
-          if has_unpreload_associations?
-            response.push("#{"\n" unless response.empty?}N+1 queries detected:\n")
-            response.push(*@@unpreload_associations.to_a.collect{|klazz, associations| "  #{klazz} => [#{associations.map(&:inspect).join(', ')}]"}.join("\n"))
-          end
+        if @@alert || @@console
+          response = notification_response
         end
         if @@alert
           str << wrap_js_association("alert(#{response.join("\n").inspect});")
@@ -104,25 +96,21 @@ module Bullet
         if @@console
           str << wrap_js_association("if (typeof(console) != 'undefined' && console.log) console.log(#{response.join("\n").inspect});")
         end
+        str
+      end
+      
+      def growl_notification
         if @@growl
+          response = notification_response
           begin
             growl = Growl.new('localhost', 'ruby-growl', ['Bullet Notification'], nil, @@growl_password)
             growl.notify('Bullet Notification', 'Bullet Notification', response.join("\n"))
           rescue
           end
-          str << '<!-- Sent Growl notification -->'
         end
-        str
-      end
-
-      def wrap_js_association(message)
-        str = ''
-        str << "<script type=\"text/javascript\">/*<![CDATA[*/"
-        str << message
-        str << "/*]]>*/</script>\n"
       end
 
-      def log_bad_associations(path)
+      def log_notificatioin(path)
         if (@@bullet_logger || @@rails_logger) && (!unpreload_associations.empty? || !unused_preload_associations.empty?)
           Rails.logger.warn '' if @@rails_logger
           unused_preload_associations.each do |klazz, associations|
@@ -144,11 +132,6 @@ module Bullet
         end
       end
       
-      def bad_associations_str(bad_associations)
-        # puts bad_associations.inspect
-        bad_associations.to_a.collect{|klazz, associations| klazz_associations_str(klazz, associations)}.join("\n")
-      end
-      
       def klazz_associations_str(klazz, associations)
         "  #{klazz} => [#{associations.map(&:inspect).join(', ')}]"
       end
@@ -157,6 +140,26 @@ module Bullet
         ":include => #{associations.map{|a| a.to_sym unless a.is_a? Hash}.inspect}"
       end
 
+      def notification_response
+        response = []
+        if has_unused_preload_associations?
+          response.push("Unused eager loadings detected:\n")
+          response.push(*@@unused_preload_associations.to_a.collect{|klazz, associations| klazz_associations_str(klazz, associations)}.join("\n"))
+        end
+        if has_unpreload_associations?
+          response.push("#{"\n" unless response.empty?}N+1 queries detected:\n")
+          response.push(*@@unpreload_associations.to_a.collect{|klazz, associations| "  #{klazz} => [#{associations.map(&:inspect).join(', ')}]"}.join("\n"))
+        end
+        response
+      end
+
+      def wrap_js_association(message)
+        str = ''
+        str << "<script type=\"text/javascript\">/*<![CDATA[*/"
+        str << message
+        str << "/*]]>*/</script>\n"
+      end
+
       def has_klazz_association(klazz)
         !klazz_associations[klazz].nil? and klazz_associations.keys.include?(klazz)
       end

data/lib/bulletware.rb

@@ -11,15 +11,20 @@ class Bulletware
     return [status, headers, response] if response.empty?
 
     if Bullet::Association.has_bad_assocations?
-      if !headers['Content-Type'].nil? and headers['Content-Type'].include? 'text/html'
-        response_body = response.body << Bullet::Association.bad_associations_alert
+      if check_html?(headers, response)
+        response_body = response.body << Bullet::Association.javascript_notification
         headers['Content-Length'] = response_body.length.to_s
       end
 
-      Bullet::Association.log_bad_associations(env['PATH_INFO'])
+      Bullet::Association.growl_notification
+      Bullet::Association.log_notificatioin(env['PATH_INFO'])
     end
     response_body ||= response.body
     Bullet::Association.end_request
     [status, headers, response_body]
   end
+  
+  def check_html?(headers, response)
+    !headers['Content-Type'].nil? and headers['Content-Type'].include? 'text/html' and response.body =~ %r{<html.*</html>}m
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flyerhzm-bullet
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-31 00:00:00 -07:00
+date: 2009-09-03 00:00:00 -07:00
 default_executable: 
 dependencies: []