bullet 4.3.0 → 4.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5e3527225d3f424d77fe6d66b89d79051ef971dd
+  data.tar.gz: 253640c4c6ef128c0f6959b31fae2bb202d9fc3e
+SHA512:
+  metadata.gz: 253164c19bb419669f1623eb724e33573a807c5a1998f78fefbdbaf5e5c69903dd3d296a17b4a1e99628b8ed1a83b635b612b46fb62ed735950e317bf6d1b93e
+  data.tar.gz: 419bb1cabd21aff3faf417718b7d48f01b55cab86d8c2fd974fd52e471074dd3062d2bc4c2a4530ffd250e35e716b6592c61187556ec184f1999937d680e4cfe

data/Gemfile

@@ -4,14 +4,12 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'rails', '3.2.5'
+gem 'rails', '3.2.11'
 gem 'sqlite3'
-gem 'mysql'
+gem 'mysql2'
 gem 'activerecord-import'
-gem 'mongoid', '3.0.0.rc'
+gem 'mongoid', '3.0.9'
 
 gem "rspec"
 gem "guard"
 gem "guard-rspec"
-
-gem "perftools.rb"

data/{Gemfile.rails-2.3.14 → Gemfile.rails-2.3.17}

@@ -4,13 +4,11 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'rails', '2.3.14'
+gem 'rails', '2.3.17'
 gem 'sqlite3'
-gem 'mysql'
+gem 'mysql2'
 gem 'bson_ext'
 
 gem "rspec"
 gem "guard"
 gem "guard-rspec"
-
-gem "perftools.rb"

data/{Gemfile.rails-3.0.17 → Gemfile.rails-3.0.20}

@@ -4,14 +4,12 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'rails', '3.0.17'
+gem 'rails', '3.0.20'
 gem 'sqlite3'
-gem 'mysql'
+gem 'mysql2'
 gem 'activerecord-import'
 gem 'bson_ext'
 
 gem "rspec"
 gem "guard"
 gem "guard-rspec"
-
-gem "perftools.rb"

data/{Gemfile.rails-3.1.8 → Gemfile.rails-3.1.11}

@@ -4,9 +4,9 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'rails', '3.1.8'
+gem 'rails', '3.1.11'
 gem 'sqlite3'
-gem 'mysql'
+gem 'mysql2'
 gem 'activerecord-import'
 gem 'mongoid', '2.4.12'
 gem 'bson_ext'
@@ -14,5 +14,3 @@ gem 'bson_ext'
 gem "rspec"
 gem "guard"
 gem "guard-rspec"
-
-gem "perftools.rb"

data/{Gemfile.rails-3.2.9 → Gemfile.rails-3.2.12}

@@ -4,9 +4,9 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'rails', '3.2.9'
+gem 'rails', '3.2.12'
 gem 'sqlite3'
-gem 'mysql'
+gem 'mysql2'
 gem 'activerecord-import'
 gem 'mongoid', '2.5.1'
 gem 'bson_ext'
@@ -14,5 +14,3 @@ gem 'bson_ext'
 gem "rspec"
 gem "guard"
 gem "guard-rspec"
-
-gem "perftools.rb"

data/Gemfile.rails-4-beta

@@ -4,15 +4,11 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'rails', github: 'rails/rails'
-gem 'journey', github: 'rails/journey'
-gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders'
+gem 'rails', '4.0.0.beta1'
 gem 'sqlite3'
-gem 'mysql'
+gem 'mysql2'
 gem 'activerecord-import'
 
 gem "rspec"
 gem "guard"
 gem "guard-rspec"
-
-gem "perftools.rb"

data/README.textile

@@ -51,7 +51,6 @@ config.after_initialize do
                   :show_online_status => true }
   Bullet.rails_logger = true
   Bullet.airbrake = true
-  Bullet.disable_browser_cache = true
 end
 </code></pre>
 
@@ -66,7 +65,6 @@ The code above will enable all seven of the Bullet notification systems:
 * <code>Bullet.console</code>: log warnings to your browser's console.log (Safari/Webkit browsers or Firefox w/Firebug installed)
 * <code>Bullet.growl</code>: pop up Growl warnings if your system has Growl installed. Requires a little bit of configuration
 * <code>Bullet.xmpp</code>: send XMPP/Jabber notifications to the receiver indicated. Note that the code will currently not handle the adding of contacts, so you will need to make both accounts indicated know each other manually before you will receive any notifications. If you restart the development server frequently, the 'coming online' sound for the bullet account may start to annoy - in this case set :show_online_status to false; you will still get notifications, but the bullet account won't announce it's online status anymore.
-* <code>Bullet.disable_browser_cache</code>: disable browser cache which usually causes unexpected problems
 
 ****************************************************************************
 
@@ -122,11 +120,10 @@ The bullet gem use rack middleware for http request. If you want to bullet for w
 <pre><code>
 Bullet.start_request if Bullet.enable?
 # run job
-if Bullet.enable?
-  Bullet.growl_notification
-  Bullet.log_notification('JobServer: ')
-  Bullet.end_request
+if Bullet.enable? && Bullet.notification?
+  Bullet.perform_out_of_channel_notifications
 end
+Bullet.end_request if Bullet.enable?
 </code></pre>
 
 Or you want to use it in test mode
@@ -137,10 +134,10 @@ before(:each)
 end
 
 after(:each)
-  if Bullet.enable?
+  if Bullet.enable? && Bullet.notification?
     Bullet.perform_out_of_channel_notifications
-    Bullet.end_request
   end
+  Bullet.end_request if Bullet.enable?
 end
 </code></pre>
 
@@ -225,7 +222,6 @@ config.after_initialize do
   Bullet.console = true
 #  Bullet.growl = true
   Bullet.rails_logger = true
-  Bullet.disable_browser_cache = true
 end
 </code></pre>
 
@@ -374,4 +370,4 @@ In the meanwhile, there's a log appended into <code>log/bullet.log</code> file.
 ****************************************************************************
 
 
-Copyright (c) 2009 - 2012 Richard Huang (flyerhzm@gmail.com), released under the MIT license
+Copyright (c) 2009 - 2013 Richard Huang (flyerhzm@gmail.com), released under the MIT license

data/README_for_rails2.textile

@@ -44,7 +44,6 @@ config.after_initialize do
   Bullet.console = true
   Bullet.growl = true
   Bullet.rails_logger = true
-  Bullet.disable_browser_cache = true
   Bullet.xmpp = { :account => 'bullets_account@jabber.org',
                   :password => 'bullets_password_for_jabber',
                   :receiver => 'your_account@jabber.org',
@@ -61,7 +60,6 @@ The code above will enable all five of the Bullet notification systems:
 * <code>Bullet.rails_logger</code>: add warnings directly to the Rails log
 * <code>Bullet.console</code>: log warnings to your browser's console.log (Safari/Webkit browsers or Firefox w/Firebug installed)
 * <code>Bullet.growl</code>: pop up Growl warnings if your system has Growl installed. Requires a little bit of configuration
-* <code>Bullet.disable_browser_cache</code>: disable browser cache which usually causes unexpected problems
 
 ****************************************************************************
 
@@ -152,11 +150,10 @@ The bullet plugin/gem use rack middleware for http request. If you want to bulle
 <pre><code>
 Bullet.start_request if Bullet.enable?
 # run job
-if Bullet.enable?
-  Bullet.growl_notification
-  Bullet.log_notification('JobServer: ')
-  Bullet.end_request
+if Bullet.enable? && Bullet.notification?
+  Bullet.perform_out_of_channel_notifications
 end
+Bullet.end_request if Bullet.enable?
 </code></pre>
 
 Or you want to use it in test mode
@@ -167,10 +164,10 @@ before(:each)
 end
 
 after(:each)
-  if Bullet.enable?
+  if Bullet.enable? && Bullet.notification?
     Bullet.perform_out_of_channel_notifications
-    Bullet.end_request
   end
+  Bullet.end_request if Bullet.enable?
 end
 </code></pre>
 
@@ -253,7 +250,6 @@ config.after_initialize do
   Bullet.console = true
 #  Bullet.growl = true
   Bullet.rails_logger = true
-  Bullet.disable_browser_cache = true
 end
 </code></pre>
 
@@ -401,4 +397,4 @@ In the meanwhile, there's a log appended into <code>log/bullet.log</code> file.
 ****************************************************************************
 
 
-Copyright (c) 2009 - 2012 Richard Huang (flyerhzm@gmail.com), released under the MIT license
+Copyright (c) 2009 - 2013 Richard Huang (flyerhzm@gmail.com), released under the MIT license

data/lib/bullet.rb

@@ -30,7 +30,7 @@ module Bullet
   end
 
   class <<self
-    attr_accessor :enable, :disable_browser_cache
+    attr_accessor :enable
     attr_reader :notification_collector
 
     delegate :alert=, :console=, :growl=, :rails_logger=, :xmpp=, :airbrake=, :to => UniformNotifier

data/lib/bullet/rack.rb

@@ -20,7 +20,6 @@ module Bullet
         Bullet.perform_out_of_channel_notifications(env)
       end
       Bullet.end_request
-      no_browser_cache(headers) if Bullet.disable_browser_cache
       [status, headers, response_body ? [response_body] : response]
     end
 
@@ -28,7 +27,9 @@ module Bullet
     def empty?(response)
       # response may be ["Not Found"], ["Move Permanently"], etc.
       (response.is_a?(Array) && response.size <= 1) ||
-        !response.respond_to?(:body) || response.body.empty?
+        !response.respond_to?(:body) ||
+        !response.body.respond_to?(:empty?) ||
+        response.body.empty?
     end
 
     # if send file?
@@ -39,11 +40,5 @@ module Bullet
     def html_request?(headers, response)
       headers['Content-Type'] && headers['Content-Type'].include?('text/html') && response.body.include?("<html")
     end
-
-    def no_browser_cache(headers)
-      headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
-      headers["Pragma"] = "no-cache"
-      headers["Expires"] = "Wed, 09 Sep 2009 09:09:09 GMT"
-    end
   end
 end

data/lib/bullet/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Bullet
-  VERSION = "4.3.0"
+  VERSION = "4.3.1"
 end

data/perf/benchmark.rb

@@ -27,7 +27,7 @@ class User < ActiveRecord::Base
 end
 
 # create database bullet_benchmark;
-ActiveRecord::Base.establish_connection(:adapter => 'mysql', :database => 'bullet_benchmark', :server => '/tmp/mysql.socket', :username => 'root')
+ActiveRecord::Base.establish_connection(:adapter => 'mysql2', :database => 'bullet_benchmark', :server => '/tmp/mysql.socket', :username => 'root')
 
 ActiveRecord::Base.connection.tables.each do |table|
   ActiveRecord::Base.connection.drop_table(table)
@@ -79,8 +79,6 @@ puts "Start benchmarking..."
 
 Bullet.enable = true
 
-PerfTools::CpuProfiler.start(ARGV[0]|| "benchmark_profile") if defined? PerfTools
-
 Benchmark.bm(70) do |bm|
   bm.report("Querying & Iterating #{posts_size} Posts with #{comments_size} Comments and #{users_size} Users") do
     10.times do
@@ -98,7 +96,6 @@ Benchmark.bm(70) do |bm|
   end
 end
 
-PerfTools::CpuProfiler.stop if defined? PerfTools
 puts "End benchmarking..."
 
 

data/spec/bullet/rack_spec.rb

@@ -6,16 +6,6 @@ module Bullet
     let(:middleware) { Bullet::Rack.new app }
     let(:app) { Support::AppDouble.new }
 
-    context "#no_browser_cache" do
-      it "should add no cache meta in http headers" do
-        headers = {}
-        middleware.no_browser_cache(headers)
-        headers["Cache-Control"].should == "no-cache, no-store, max-age=0, must-revalidate"
-        headers["Pragma"].should == "no-cache"
-        headers["Expires"].should == "Wed, 09 Sep 2009 09:09:09 GMT"
-      end
-    end
-
     context "#html_request?" do
       it "should be true if Content-Type is text/html and http body contains html tag" do
         headers = {"Content-Type" => "text/html"}

data/test.sh

@@ -1,6 +1,6 @@
 bundle && bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.rails-3.2.9 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.2.9 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.rails-3.1.8 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.1.8 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.rails-3.0.17 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.0.17 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.rails-2.3.14 bundle && BUNDLE_GEMFILE=Gemfile.rails-2.3.14 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-3.2.12 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.2.12 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-3.1.11 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.1.11 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-3.0.20 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.0.20 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-2.3.17 bundle && BUNDLE_GEMFILE=Gemfile.rails-2.3.17 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-4-beta bundle && BUNDLE_GEMFILE=Gemfile.rails-4-beta bundle exec rspec spec

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.3.0
-  prerelease: 
+  version: 4.3.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uniform_notifier
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A rails plugin to kill N+1 queries and unused eager loading.
@@ -40,10 +37,10 @@ files:
 - .rvmrc.example
 - .travis.yml
 - Gemfile
-- Gemfile.rails-2.3.14
-- Gemfile.rails-3.0.17
-- Gemfile.rails-3.1.8
-- Gemfile.rails-3.2.9
+- Gemfile.rails-2.3.17
+- Gemfile.rails-3.0.20
+- Gemfile.rails-3.1.11
+- Gemfile.rails-3.2.12
 - Gemfile.rails-4-beta
 - Guardfile
 - Hacking.textile
@@ -143,30 +140,26 @@ files:
 - test.sh
 homepage: http://github.com/flyerhzm/bullet
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 197998252985008423
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A rails plugin to kill N+1 queries and unused eager loading.
 test_files:
 - spec/bullet/detector/association_spec.rb