Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
This comparison is big! We’re only showing the most recent 250 commits
Commits on Jun 19, 2010
@sriedel sriedel Add ObjectRegistry cec3361
@sriedel sriedel Use ObjectRegistry in Detector::Counter d8d42b5
@sriedel sriedel Use ObjectRegistry in Detector::Association 06e19b0
@sriedel sriedel Add AssociationRegistry 5e1501e
@sriedel sriedel Use AssociationRegistry for eager_loadings 9d79ebf
@sriedel sriedel AssociationRegistry#similarly_associated 775e547
@sriedel sriedel Remove one nesting level 8980bc6
@sriedel sriedel Move registries into their own namespace f467eb8
@sriedel sriedel Registry::Base 0eaafc1
@sriedel sriedel Use Registry for object_associations and call_object_associations 5a9e692
@sriedel sriedel Move BulletLogger setup code to Presenter class 3987ce2
@sriedel sriedel Remove Bullet.logger and Bullet.logger_file accessors 4bd044e
@sriedel sriedel Move LOG_FILE constant to presenter cdc973e
@sriedel sriedel Move rest of BulletLogger code to presenter 687552a
@sriedel sriedel Remove now unused bullet/logger.rb bf16b64
@sriedel sriedel Remove bullet_logger instance variable assignment in Bullet 075c85d
Commits on Jun 20, 2010
@sriedel sriedel Add initial xmpp presenter 2bb4cb1
@sriedel sriedel Optionally show online status fda3f95
@sriedel sriedel Document XMPP notification presenter setup 6fdac4a
@sriedel sriedel Re-Add NotificationError that got lost somewhere 24018fe
@sriedel sriedel Ignore ctags file 4e43e01
Commits on Jun 26, 2010
@flyerhzm Merge remote branch 'sriedel/topic/normalize_detectors' into normaliz…
…e_detectors
2dcb5ea
@flyerhzm Merge remote branch 'sriedel/topic/xmpp_presenter' into xmpp_presenter
Conflicts:
	lib/bullet.rb
dcf43e2
@sriedel sriedel require ActiveSupport::Dependencies for Rails3 beta4 compat 6ce2704
@sriedel sriedel Extract NotificationCollector 1708bdc
@sriedel sriedel A quick introduction for developers 347e339
@flyerhzm introduce sriedel's awesome job 997a017
@flyerhzm Merge remote branch 'sriedel/topic/notification_registry' into notifi…
…cation_registry
87455f4
Commits on Jun 27, 2010
@flyerhzm update readme 567b87b
Commits on Jul 14, 2010
@flyerhzm use Rails::Railtie to include Bullet::Rack 8d0178a
@flyerhzm explicitly require 'file' in bullet logger class e5b91ee
@flyerhzm compatible with rails 3.0.0.beta4 6d2f8f5
@flyerhzm add global :: namespace to growl ea74ed1
@flyerhzm use klazz_associations_str as hash key to stop duplicate notification 0af32ab
@flyerhzm do not display caller in alert, growl, xmpp notification 7420d15
@flyerhzm upgrade to 2.0.0.beta.3 036be82
@flyerhzm Regenerated gemspec for version 2.0.0.beta.3 dc6267c
Commits on Aug 10, 2010
@flyerhzm Hmmm...skip ["Not Found"] as response 7120e88
@flyerhzm upgrade to 2.0.0.beta.4 6366ef7
@flyerhzm Regenerated gemspec for version 2.0.0.beta.4 3ca593b
@flyerhzm ["Move Permanently"], ["Not Found"] and other cases are need to be tr…
…eated as empty response
de830f7
@flyerhzm upgrade to 2.0.0.rc1 2aa6d87
@flyerhzm Regenerated gemspec for version 2.0.0.rc1 b8a15a3
Commits on Oct 07, 2010
@flyerhzm use notification_collector method instead of instance variable 634d8c2
@flyerhzm use rvm and bundler 55d558e
@flyerhzm Bumping version to 2.0.0.rc2 e2fbf39
Commits on Nov 01, 2010
@flyerhzm update README for using bullet in test environment 7591f67
Commits on Nov 02, 2010
@flyerhzm change method name inline and out_of_channel to inline_notify and out…
…_of_channel_notify to avoid confliction with RubyInline
3d3db72
@flyerhzm Bumping version to 2.0.0.rc3 716f033
Commits on Nov 19, 2010
@flyerhzm extract presenter to https://github.com/flyerhzm/uniform_notifier ae7b8d7
@flyerhzm Bumping version to 2.0.0 2da8408
@flyerhzm explicitly require uniform_notifier 08fe2fc
@flyerhzm Bumping version to 2.0.1 3360553
@flyerhzm update documents 8335fac
@flyerhzm NotificationError is no use ad47b2f
@flyerhzm remove unused comment d869170
Commits on Mar 22, 2011
@flyerhzm recover context in association_spec c4865d7
@flyerhzm update bullet.gemspec 8ddbd9d
@flyerhzm add benchmark script 3de2549
Commits on Mar 24, 2011
@lou lou flatten boy 12d89ff
Commits on Apr 06, 2011
@flyerhzm fix typo 9bc850e
Commits on Apr 11, 2011
@bwlang bwlang removes ! from flatten, was causing this procedure to return nil inst…
…ead of [] - which caused a nil deref downstream.
16762cd
Commits on May 18, 2011
@riffraff riffraff redefined load_target is allocating a massive string multiple times p…
…er page, which causes the GC to happen a lot. change to perform the check without creating such string (though caller is still slow)
14c8ae1
@riffraff riffraff Merge remote-tracking branch 'origin/performance' into features/reduc…
…e_gc_pressure
f493c0c
Commits on May 19, 2011
@riffraff riffraff add profiling, enable bullet aa24129
@riffraff riffraff fix typo that cause NoMethodError a7d207f
@riffraff riffraff reduce load on flatten by flattening only new values ada9fca
@riffraff riffraff kill useless code ea0c368
@riffraff riffraff use a set, avoid calling #unique 89b24fe
@riffraff riffraff bundler sometimes does strange things on my box, move load path to th…
…e earliest line of rakefile
293e878
@riffraff riffraff remove spurious loop 56ca0b3
@riffraff riffraff remove call to #unique f029b6e
@riffraff riffraff make benchmark profile dump depend on argument d4dbc44
@riffraff riffraff use variables instead of hardcoding numbers twice b2ef233
@riffraff riffraff import updated benchmark script 9f5cacb
@riffraff riffraff Merge branch 'master' of https://github.com/lou/bullet into performan…
…ce-profiled
77439ef
@riffraff riffraff Merge branch 'master' of https://github.com/lou/bullet into tmp 4006565
@riffraff riffraff Merge branch 'delete' into features/reduce_gc_pressure 28968f9
@riffraff riffraff handle missing perftools 4dfcb1e
@riffraff riffraff handle missing perftools 3fc895c
@riffraff riffraff Merge branch 'performance-profiled' into features/reduce_gc_pressure 3895155
Commits on May 28, 2011
@flyerhzm Merge pull request #42 from riffraff/features/reduce_gc_pressure
Features/reduce gc pressure, massive speed improvements in benchmark (if Bullet.enable)
46b0af4
@flyerhzm Bumping version 3.0.0 7d79cd0
@flyerhzm Revert "Bumping version 3.0.0"
This reverts commit 7d79cd0.
bc9f5e1
@flyerhzm add perftools.rb dependency 19a9e51
@flyerhzm move perftools.rb dependency to Gemfile 82f3614
Commits on Jun 22, 2011
@riffraff riffraff avoid modifying hash while iterating 7b6cd07
Commits on Jul 07, 2011
@ssoroka ssoroka add user and url to the notifications 59cfe48
Commits on Jul 10, 2011
@flyerhzm Merge pull request #45 from ssoroka/master
better feedback
1bada40
Commits on Aug 30, 2011
@flyerhzm Merge pull request #46 from riffraff/features/reduce_gc_pressure
avoid modifying hash while iterating
1b281b2
Commits on Oct 20, 2011
@DanielWright DanielWright Fixes the Rails version detector regex to load the AR3 Bullet module …
…on Rails 3.1, rather than the AR2 Bullet module.
165d055
@flyerhzm Merge pull request #48 from DanielWright/patch-1
Fixes the Rails version detector regex for Rails 3.1
78c8c05
Commits on Oct 24, 2011
@flyerhzm fix typo 87a4d6c
@flyerhzm Bumping version to 2.0.2 662e266
Commits on Nov 01, 2011
@gvalmon gvalmon [#49] fix error for active record 3.1 25efbba
@gvalmon gvalmon fix active record version matcher 99ac17f
@flyerhzm Merge pull request #50 from 23ninja/master
Rails 3.1.1 fail on start with bullet master
1614b9a
Commits on Nov 03, 2011
@gvalmon gvalmon fix Association Preloader for Rails 3.1 9972433
@flyerhzm Merge pull request #51 from 23ninja/master
fix Association Preloader for Rails 3.1
a7ddd69
Commits on Dec 11, 2011
@flyerhzm update README 8ffd4b6
@flyerhzm Bumping version to 2.1.0 d618181
@flyerhzm update gems, add Gemfile.lock and .rvmrc 3b75276
@flyerhzm update Rakefile 457d77e
@flyerhzm update README 1eaa692
@flyerhzm update README c880a5b
Commits on Dec 12, 2011
@laserlemon laserlemon Add dependency status to README 43d4819
Commits on Dec 13, 2011
@flyerhzm add travis-ci support 7250d00
@flyerhzm update README 882d834
Commits on Dec 30, 2011
@flyerhzm update README for contributors 5e81f1b
Commits on Jan 15, 2012
@dmitry-ilyashevich dmitry-ilyashevich Fix error for active record 3.2 d0fb93c
Commits on Feb 19, 2012
@duncanbeevers duncanbeevers Preserve initial response object if possible 017b437
Commits on Feb 25, 2012
@flyerhzm Merge pull request #54 from dmitry-ilyashevich/master
Rude fix for work with active record 3.2
a17b710
@flyerhzm Merge pull request #56 from duncanbeevers/preserve_response
Preserve initial response object if possible
519a421
Commits on Mar 02, 2012
@flyerhzm fix typo in README 7839293
Commits on Mar 05, 2012
@flyerhzm update README c66c114
@flyerhzm Bumping version to 1.2.0 8926462
@flyerhzm update bullet in Gemfile.lock ddd9e06
@flyerhzm update README be1129d
@flyerhzm remove unused/incorrect require file in spec_helper 9a1dc66
Commits on Mar 09, 2012
@flyerhzm abstract table schema, model definitions, test db seed from counter_s…
…pec to spec_helper
621dc2f
@flyerhzm abstract table schema, model definitions, test db seed from associati…
…on_spec to spec_helper
ae12751
@flyerhzm abstract table schema, model definitions, test db seed from associati…
…on_for_peschkaj_spec to spec_helper
4a09a6e
@flyerhzm abstract table schema, model definitions, test db seed from associati…
…on_for_chris_spec to spec_helper
1d5884d
@flyerhzm use require 'spec_helper' directly in spec files 962e502
@flyerhzm update travis.yml 883c63c
@flyerhzm fix travis build result in README f67503c
@flyerhzm move db test seed to support/seed 0556ee7
Commits on Mar 10, 2012
@flyerhzm add support/rack_doulbe fecb2f3
@flyerhzm call Bullet.start_request and Bullet.end_request in each spec b43332d
@flyerhzm move association and counter spec under spec/integration e6497b3
@flyerhzm more tests for rack_spec d3f5d38
@flyerhzm rename Bullet::Registry::Object#contains? to include? 0558828
@flyerhzm move Bullet::Detector::Association's possible?, impossible? and assoc…
…iation? methods to Bullet::Detector::NPlusOneQuery
192b04b
@flyerhzm add Bullet::Registry::Base.include? 1488b1a
Commits on Mar 11, 2012
@flyerhzm more tests for bullet/detector 8f9ef6d
@flyerhzm has_cached_counter? in rails 3.1 has a parameter reflection 30fc7de
@flyerhzm Bumping version to 2.2.1 ca54a28
Commits on Mar 14, 2012
@flyerhzm update bullet in Gemfile.lock f218c14
@flyerhzm more tests for bullet/notification 7b79db3
@flyerhzm more tests on bullet/registry 5b17a80
@flyerhzm test for bullet/notifications_collector b8f7207
Commits on Mar 15, 2012
@flyerhzm clear detector in tests 30ad4fe
@flyerhzm create table only once fa557b6
@flyerhzm do not enable Bullet multiple times, stub Bullet @enable 4c898d3
@flyerhzm Merge branch 'refactor_tests' 9b635fc
Commits on Mar 24, 2012
@flyerhzm use guard instead watchr 567eb02
@flyerhzm update benchmark script ac6a949
@flyerhzm update perftools.rb 464026e
@flyerhzm fix Guardfile rspec 185577e
@flyerhzm ignore perftools.rb result files 6454514
@flyerhzm use Enumerable#include? instead of =~ da56b8c
@flyerhzm remove @@callers from detector/association and simplify caller_in_pro…
…ject
8c44a0c
@flyerhzm remove space after ( and before ), add space after { and before } eb9f317
@flyerhzm update rails to 3.2.2 3e8b948
Commits on Mar 25, 2012
@flyerhzm use ar_key instead of AR object, move Bullet ext to spec/support/bull…
…et_ext, fix activerecord 3.1 extension
d8cdcf5
@flyerhzm do not use Array(), which hurt performance a lot d220ba4
@flyerhzm update benchmark result 471babe
@flyerhzm convert Rails.root to string d89ea0a
@flyerhzm Bumping version to 2.3.0 5954904
@flyerhzm Merge pull request #52 from laserlemon/patch-1
Add dependency status to README
f689e0d
Commits on Mar 30, 2012
@flyerhzm check object.id before adding object.ar_key 3003a51
@flyerhzm objects is already an array in add_eager_loadings 8824168
@flyerhzm must pass array to add_eager_loadings 92a75b9
@flyerhzm should not try to get id is object is not an instance of ActiveRecord…
…::Base
65aed6a
Commits on Apr 02, 2012
@flyerhzm bullet 2.3.0 in Gemfile.lock 9dd8afc
@flyerhzm Bumping version to 2.3.1 3891756
Commits on Apr 03, 2012
@0xCCD 0xCCD fix issue (receiving 0 byte files) if response is a ActionDispatch::R…
…esponse

in my case response was invoked with the send_file command:
send_file "/tmp/myfile.zip", :type => 'application/zip', :filename=>'myfile.zip'
looks that it's bad to call response.body if response is ActionDispatch::Response
dd374fa
Commits on May 03, 2012
@flyerhzm update Gemfile.lock c7c37da
Commits on May 05, 2012
@flyerhzm add mongoid to development dependencies 0cd4654
@flyerhzm add mongoid seed and models for mongoid tests d3c367b
Commits on May 06, 2012
@flyerhzm accurate test assertions for association spec fd4e7cd
@flyerhzm extend mongoid to detect N+1 queries and preload queries f29bef1
@flyerhzm rename Object#ar_key to Object#bullet_ar_key, add String#bullet_class…
…_name
3eed79c
@flyerhzm monogid does not support nested eager loads f86a35a
@flyerhzm test eager load 2 associations for mongoid 0a57b09
@flyerhzm test reading only one object from many associations for mongoid 633be7f
@flyerhzm add to impossible objects for only 1 record returned from mongoid 7db9657
@flyerhzm test has_one for mongoid association 6e5e8b7
@flyerhzm remove unused spec model contact and email 40b6a16
@flyerhzm call one association that in possible objects for mongoid ba9f15c
@flyerhzm clean up AR association integration test 85f186a
@flyerhzm merge association_for_chris to association test 9147330
@flyerhzm merge association_for_peschkaj_spec to association_spec 1a17b0b
@flyerhzm move belongs_to test to proper place c9023a3
@flyerhzm add bson_ext to development dependencies d2ab287
Commits on May 07, 2012
@flyerhzm enable Bullet::Mongoid only for project depends on mongoid 11eeec4
@flyerhzm allow to enable Bullet::ActiveRecord and Bullet::Mongoid at same time 79a2877
@flyerhzm associations instead of association 2f30627
@flyerhzm update dependent rails to 3.2.3 e998b28
@flyerhzm test multiple active_record on travis f013b62
@flyerhzm move Gemfile.rails-* to top level 383a208
@flyerhzm rename diff_object_association to diff_object_associations in spec 1bfaa55
Commits on May 08, 2012
@flyerhzm remove unused require rspec/autorun 1cb47e9
Commits on May 09, 2012
@flyerhzm test for activerecord 2 9b8ac7a
@flyerhzm test integration/mongoid/association_spec only when mongoid available 1038414
@flyerhzm need to hack first and last method in active_record 2 and 3 Associati…
…onCollection
ae8aee6
@flyerhzm mongoid for rails 3.0.12 does not support bullet 94492a6
@flyerhzm mongoid and activerecord-import does not support rails 2 e62a934
@flyerhzm use Mongoid::Post only when mongoid available d86544b
@flyerhzm test integration/assoication_spec and integration/counter_spec for ra…
…ils 3
9720180
@flyerhzm test all test stacks in travis 6fa6796
@flyerhzm update README to tell that bullet already support mongoid d1e0543
@flyerhzm Bumping version to 3.0.0 b61638c
@flyerhzm Bumping version to 4.0.0, 3.0.0 is yanked before, sorry for that 9137850
Commits on May 26, 2012
@flyerhzm update mongoid to 2.4.10 in Gemfile.rails-3.1.4 75d47a4
@flyerhzm use mongoid git c5983c2
@flyerhzm different mongid 2.4 and mongid 3 6eba55f
@flyerhzm use map instead of collect d3ad824
@flyerhzm connect to mongodb by mongoid3 way 8b12bdf
Commits on May 29, 2012
@flyerhzm update mongoid to 3.0.0.rc 9c20d46
@flyerhzm clear IdentifyMap after each test 7037d16
@flyerhzm remove bson_ext dependency db61b0c
@flyerhzm update mongoid to 2.4.10 in Gemfile.rails-3.1.4 3e8e698
Commits on May 30, 2012
@flyerhzm update mongoid setup_db and teardown_db e01eb23
@flyerhzm require mongoid only when it is available 46c0026
@flyerhzm uninstall json before install in travis ab1e20d
@flyerhzm Bumping version to 4.1.0 b17c7dc
@flyerhzm update bullet in all gemfile lock 1c29b6f
@flyerhzm add test.sh to test all stuff 6b4b368
Commits on Jun 05, 2012
@flyerhzm Merge pull request #60 from 0xCCD/master
fix issue (receiving 0 byte files) if response is a ActionDispatch::Response
c9f9349
@flyerhzm checking headers for send file response 5b2762d
@flyerhzm add Bullet::Dependency to figure out mongoid and active_record existence 2602914
Commits on Jun 06, 2012
@flyerhzm move active_record and mongoid version checking to bullet/dependency 6368686
@flyerhzm it is enough to test <html> without </html> aa778ce
@flyerhzm autoload spec models 128e612
@flyerhzm Bullet::ActionController should extend Bullet::Dependency 6879688
@flyerhzm no where in rails2 af55312
@flyerhzm update rails 0a93f81
@flyerhzm update .travis.ymml cdcc35b
@flyerhzm Bumping version to 4.1.1 3ea6d3d
@flyerhzm update test.sh 1cda8d5
@flyerhzm update gemfiles 116c603
Commits on Jun 07, 2012
@flyerhzm check response body only when it is available 604b6d3
@flyerhzm Bumping version to 4.1.2 67ce1db
Commits on Jun 09, 2012
@flyerhzm response.body may be an instance of Rack::Response bc64732
@flyerhzm Bumping version to 4.1.3 ffcbfca
Commits on Jun 18, 2012
@flyerhzm remove test.result 6713e5b
Commits on Jun 20, 2012
@flyerhzm add impossible object only when object exists for mongoid 8511b59
Commits on Jun 21, 2012
@flyerhzm update README d2895d1
Commits on Jun 23, 2012
@flyerhzm Bumping version to 4.1.4 d28cd3d
Commits on Jul 14, 2012
@flyerhzm add test , do not detect for embed in mongoid 258028a
@flyerhzm skip call_association in relation is embed instead of reference 3b4f466
Commits on Jul 16, 2012
@aaronjensen aaronjensen Allow for attributes in the html tag.
Obviously not the best way to test for this, but I didn't want to
involve a regexp or a dom parser. The old way didn't work for our app or
any app that puts attributes on html (like facebook open graph
attributes)
a6e0a59
@flyerhzm Merge pull request #70 from aaronjensen/html_attributes
Allow for attributes in the html tag.
516f959
Commits on Aug 10, 2012
@flyerhzm update README 93e8aba
Commits on Aug 17, 2012
@flyerhzm set bullet_log_file sync to true af61510
@flyerhzm update README for Growl Support 50949e9
@flyerhzm update README d953ac2
@flyerhzm Bumping version to 4.1.5 19ea381
@flyerhzm Bumping version to 4.1.6 6f497bf