Permalink
Browse files

Merge remote branch 'github/master' into upgrade-to-2-4-5

* github/master: (82 commits)
  Bumping to version 2.4.5
  Add the UserNotifier to the head of the stack, don't require Rack::Lock's presence
  Bumping to version 2.4.4
  Unit test showing escape_javascript is being called on request.url
  Don't misspell don't
  first pass at changing JS html insertion into helper instead
  Bumping to version 2.4.3
  Make the text presented to the user customizable
  Insert the Hoptoad Error Number into the response if possible.
  Fixes the 'has_content?' mission problem.
  thank all contributors
  remove the old rdoc readme
  iconvert readme to markdown and add credit and license info
  some shells dont know about [[
  allow the value sent in to have whitespace around it
  Bumping to version 2.4.2
  fix issue where the gsub to replace the html head with javascript was removing the head element entirely
  Bumping to version 2.4.1
  restore method which may have been accidentally removed?
  Bumping to version 2.4.0
  ...
  • Loading branch information...
2 parents 0a6a042 + 6ac4404 commit acb589fe9ee2b9f138b1dfbb8006fa7290f99867 Tyler Kovacs committed Feb 11, 2011
Showing with 1,228 additions and 372 deletions.
  1. +221 −0 CHANGELOG
  2. +182 −141 README.rdoc → README.md
  3. +93 −0 README_FOR_HEROKU_ADDON.md
  4. +21 −11 Rakefile
  5. +6 −6 SUPPORTED_RAILS_VERSIONS
  6. +2 −2 features/metal.feature
  7. +44 −41 features/rails.feature
  8. +78 −0 features/rails_with_js_notifier.feature
  9. +1 −1 features/sinatra.feature
  10. +13 −0 features/step_definitions/metal_steps.rb
  11. +54 −68 features/step_definitions/rails_application_steps.rb
  12. +9 −1 features/support/hoptoad_shim.rb.template
  13. +3 −1 features/support/matchers.rb
  14. +70 −0 features/support/rails.rb
  15. +13 −1 features/support/terminal.rb
  16. +42 −0 features/user_informer.feature
  17. +26 −1 generators/hoptoad/hoptoad_generator.rb
  18. +7 −2 lib/hoptoad_notifier.rb
  19. +12 −6 lib/hoptoad_notifier/configuration.rb
  20. +9 −1 lib/hoptoad_notifier/notice.rb
  21. +4 −2 lib/hoptoad_notifier/rack.rb
  22. +2 −0 lib/hoptoad_notifier/rails.rb
  23. +2 −1 lib/hoptoad_notifier/rails/action_controller_catcher.rb
  24. +9 −1 lib/hoptoad_notifier/rails/controller_methods.rb
  25. +19 −18 lib/hoptoad_notifier/rails/javascript_notifier.rb
  26. +2 −11 lib/hoptoad_notifier/rails3_tasks.rb
  27. +7 −4 lib/hoptoad_notifier/railtie.rb
  28. +14 −1 lib/hoptoad_notifier/sender.rb
  29. +29 −0 lib/hoptoad_notifier/shared_tasks.rb
  30. +2 −16 lib/hoptoad_notifier/tasks.rb
  31. +29 −0 lib/hoptoad_notifier/user_informer.rb
  32. +1 −1 lib/hoptoad_notifier/version.rb
  33. +25 −0 lib/rails/generators/hoptoad/hoptoad_generator.rb
  34. +13 −6 lib/templates/javascript_notifier.erb
  35. +2 −0 test/catcher_test.rb
  36. +9 −2 test/configuration_test.rb
  37. +10 −1 test/helper.rb
  38. +52 −0 test/javascript_notifier_test.rb
  39. +23 −22 test/notice_test.rb
  40. +39 −3 test/sender_test.rb
  41. +29 −0 test/user_informer_test.rb
View
221 CHANGELOG
@@ -1,3 +1,209 @@
+Version 2.4.5 - Wed Feb 02 13:24:29 -0500 2011
+===============================================================================
+
+Jonathan Yurek (1):
+ Don't require Rack::Lock's presence in the middleware for UserInformer
+
+
+Version 2.4.4 - Fri Jan 28 13:50:10 -0500 2011
+===============================================================================
+
+Matt Jankowski (1):
+ Change the javascript notifier from a config option to a helper method
+
+Jonathan Yurek (1):
+ Show the javascript notifier prevents XSS attempts from request.url
+
+Version 2.4.3 - Wed Jan 26 11:35:15 -0500 2011
+===============================================================================
+
+Jon Yurek (1):
+ Allow the application to present the Hoptoad error number to the user
+
+
+Version 2.4.2 - Sun Jan 09 09:37:31 -0500 2011
+===============================================================================
+
+Matt Jankowski (1):
+ fix issue where the gsub to replace the html head with javascript was removing the head element entirely
+
+
+Version 2.4.1 - Sat Jan 08 12:17:15 -0500 2011
+===============================================================================
+
+Matt Jankowski (1):
+ restore method which may have been accidentally removed?
+
+
+Version 2.4.0 - Thu Jan 06 15:03:58 -0500 2011
+===============================================================================
+
+Jason Morrison (1):
+ Remove official support for very old Rails version going forward
+
+Version 2.3.14 - Wed Jan 05 14:06:12 -0500 2011
+===============================================================================
+
+Jason Morrison (1):
+ Fix 'require' path
+
+Version 2.3.13 - Mon Jan 03 15:56:20 -0500 2011
+===============================================================================
+
+Dan Croak (1):
+ including twiddle wakka in install instructions
+
+Emma Lindsay (5):
+ Sends more javascript information back to hoptaod
+ Merge branch 'js_notifier_default_fields'
+ Bumping to version 2.3.10
+ Updated jferris-mocha to bourne
+ Update readme to show quotes around error names in ignores
+
+Jason Morrison (8):
+ wip: Supply default url, component, action for JS notifier
+ gracefully fall back to require 'activesupport' if require 'active_support' fails
+ Add non-capistrano deploy instructions
+ Add instructions for heroku gem to Heroku addon README
+ Add AbstractController::ActionNotFound to default ignore list
+ Bumping to version 2.3.12
+ Bugfix: JS Notifier will now insert itself even when <head> tag has attributes
+ Add Heroku deploy notification
+
+Jon Yurek (11):
+ Require bourne, run right cucumber task
+ Get the API key from Heroku
+ Bumped version: 2.3.11
+ Getting green cucumber stories
+ Fakes out the heroku command for cucumber.
+ Mount the metal endpoint in Rails 3 tests.
+ Metal test mounts at /metal
+ Supported versions: 2.3.9, 2.3.10, and 3.0.1
+ Return non-zero on cucumber failure.
+ Controller info for older Rails-es is different.
+ Remove Rails 2.0.2 from official support. Added 3.0.2+3
+
+Trevor Turk (1):
+ Fix default ignores in the README
+
+
+Version 2.3.12 - Wed Nov 03 13:53:18 -0400 2010
+===============================================================================
+
+In general: Update gems, improve testing, improve documentation, improve
+javascript notifier.
+
+Emma Lindsay (4):
+ Sends more javascript information back to hoptaod
+ Merge branch 'js_notifier_default_fields'
+ Bumping to version 2.3.10
+ Updated jferris-mocha to bourne
+
+Jason Morrison (5):
+ wip: Supply default url, component, action for JS notifier
+ gracefully fall back to require 'activesupport' if require 'active_support' fails
+ Add non-capistrano deploy instructions
+ Add instructions for heroku gem to Heroku addon README
+ Add AbstractController::ActionNotFound to default ignore list
+
+Jon Yurek (9):
+ Require bourne, run right cucumber task
+ Get the API key from Heroku
+ Bumped version: 2.3.11
+ Getting green cucumber stories
+ Fakes out the heroku command for cucumber.
+ Mount the metal endpoint in Rails 3 tests.
+ Metal test mounts at /metal
+ Supported versions: 2.3.9, 2.3.10, and 3.0.1
+ Return non-zero on cucumber failure.
+
+
+Version 2.3.10 - Mon Oct 18 17:07:56 -0400 2010
+===============================================================================
+
+Emma Lindsay (2):
+ Sends more javascript information back to hoptaod
+ Merge branch 'js_notifier_default_fields'
+
+Jason Morrison (2):
+ wip: Supply default url, component, action for JS notifier
+ gracefully fall back to require 'activesupport' if require 'active_support' fails
+
+
+Version 2.3.9 - 2010-10-18
+===============================================================================
+
+This patch release contains a handful of bugfixes, and ensures:
+ If hoptoadapp.com is completely unreachable by HTTP, your app is not affected.
+ Controller method #notify_hoptoad is available in Rails 3. Thanks contributor Kyle Crum!
+
+Chad Pytel (1):
+ also handle Errno::ECONNREFUSED and other http errors
+
+Jason Morrison (4):
+ Add gem versions to test suite
+ Revert "Revert "attempt to debug mail sending on staging""
+ Adding Heroku notifier readme
+ gracefully fall back to require 'activesupport' if require 'active_support' fails
+
+Jon Yurek (2):
+ Bumping version to 2.3.8
+ Adds builder to the gemspec
+
+Kyle Crum (3):
+ notify_hoptoad now works in rails 3 controllers
+ more sane way of testing for rails 3 controller methods
+ added a scenario for using the notify_hoptoad method within a controller
+
+
+Version 2.3.7 - 2010-09-15
+===============================================================================
+
+Jason Morrison (5):
+ Add ./ prefix to require for 1.9.2
+ More helpful message for testing without ENV['RAILS_VERSION']
+ Support Rails 3.0.0, not 3.0.0.rc
+ This wasn't actually a fix (it regressed tests): Revert "Fix modifying params_filters"
+ Correct the #also_use_rack_params_filters method
+
+Joshua Clayton (1):
+ Fix modifying params_filters
+
+Nick Quaranto (2):
+ s/RSpec/Spec for matchers
+ use Sinatra::Default instead of Sinatra::Base
+
+
+Version 2.3.6 - 2010-08-30
+===============================================================================
+
+Daniel Barron (1):
+ Initializer configuration overrides Railtie configuration if set
+
+Joshua Clayton (1):
+ Remove rack.request.form_vars
+
+Tristan Dunn (1):
+ Move Rails JS scenarios into separate feature and correctly support HTTPS when secure is enabled on the notifier.
+
+
+Version 2.3.5 - 2010-08-13
+===============================================================================
+
+Alexey Palazhchenko (1):
+ Actually call #to_hash.
+
+Joshua Clayton (1):
+ Trace hoptoad:test task when running generator for anything before Rails3
+
+
+Version 2.3.4 - 2010-08-10
+===============================================================================
+
+Tristan Dunn (1):
+ Only include the JS notifier in public environments.
+
+
Version 2.3.3 - 2010-08-04
===============================================================================
@@ -183,3 +389,18 @@ Nick Quaranto (3):
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Oops, something went wrong.

0 comments on commit acb589f

Please sign in to comment.