lib/bulletware.rb in flyerhzm-bullet-1.4.1 vs lib/bulletware.rb in flyerhzm-bullet-1.5.0

@@ -4,24 +4,24 @@
   end
 
   def call(env)
     return @app.call(env) unless Bullet.enable?
 
-    Bullet::Association.start_request
+    Bullet.start_request
     status, headers, response = @app.call(env)
     return [status, headers, response] if response.empty?
 
-    if Bullet::Association.has_bad_assocations?
+    if Bullet.notification?
       if check_html?(headers, response)
-        response_body = response.body << Bullet::Association.javascript_notification
+        response_body = response.body << Bullet.javascript_notification
         headers['Content-Length'] = response_body.length.to_s
       end
 
-      Bullet::Association.growl_notification
-      Bullet::Association.log_notificatioin(env['PATH_INFO'])
+      Bullet.growl_notification
+      Bullet.log_notification(env['PATH_INFO'])
     end
     response_body ||= response.body
-    Bullet::Association.end_request
+    Bullet.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