honeybadger 1.5.0 → 1.6.0

data/features/step_definitions/metal_steps.rb

@@ -1,22 +1,22 @@
 When /^I define a Metal endpoint called "([^\"]*)":$/ do |class_name, definition|
   FileUtils.mkdir_p(File.join(rails_root, 'app', 'metal'))
-  file_name = File.join(rails_root, 'app', 'metal', "#{class_name.underscore}.rb")
+  file_name = File.join(rails_root, 'app', 'metal', "#{class_name.split(/(?=[A-Z][a-z]*)/).join('_').downcase}.rb")
   File.open(file_name, "w") do |file|
     file.puts "class #{class_name}"
     file.puts definition
     file.puts "end"
   end
-  step %(the metal endpoint "#{class_name}" is mounted in the Rails 3 routes.rb) if rails3?
+  step %(the metal endpoint "#{class_name}" is mounted in the Rails 3 routes.rb) unless rails2?
 end
 
 When /^the metal endpoint "([^\"]*)" is mounted in the Rails 3 routes.rb$/ do |class_name|
   routesrb = File.join(rails_root, "config", "routes.rb")
   routes = IO.readlines(routesrb)
-  rack_route = "match '/metal(/*other)' => #{class_name}"
+  rack_route = "get '/metal(/*other)' => #{class_name}"
   routes = routes[0..-2] + [rack_route, routes[-1]]
   File.open(routesrb, "w") do |f|
     f.puts "$:<< '#{LOCAL_RAILS_ROOT}'"
-    f.puts "require 'app/metal/#{class_name.underscore}'"
+    f.puts "require 'app/metal/#{class_name.split(/(?=[A-Z][a-z]*)/).join('_').downcase}'"
     routes.each do |route_line|
       f.puts route_line
     end

data/features/step_definitions/rack_steps.rb

@@ -17,7 +17,3 @@ When /^I perform a Rack request to "([^\"]*)"$/ do |url|
   end
   step %(I run `ruby #{request_file}`)
 end
-
-Then /^I should receive a Honeybadger notification for rack$/ do
-  step %(The output should contain "You have accessed a deleted account.")
-end

data/features/step_definitions/rails_steps.rb

@@ -1,8 +1,7 @@
 require 'uri'
-require 'active_support/core_ext'
 
 When /^I generate a new Rails application$/ do
-  rails_create_command = !rails3? ? 'rails rails_root' :
+  rails_create_command = rails2? ? 'rails rails_root' :
     'rails new rails_root -O -S -G -J -T --skip-gemfile --skip-bundle'
 
   step %(I successfully run `bundle exec #{rails_create_command}`)
@@ -12,14 +11,14 @@ When /^I generate a new Rails application$/ do
 
   monkeypatch_old_version if rails_version == "2.3.14"
 
-  unless rails3?
+  if rails2?
     config_gem_dependencies
     disable_activerecord
   end
 end
 
-When /^I configure the Honeybadger shim$/ do
-  shim_file = File.join(PROJECT_ROOT, 'features', 'support', 'honeybadger_shim.rb.template')
+When /^I configure the Honeybadger (failure )?shim$/ do |failure|
+  shim_file = File.join(PROJECT_ROOT, 'features', 'support', "honeybadger#{failure ? '_failure' : nil}_shim.rb.template")
   if rails_supports_initializers?
     target = File.join(rails_root, 'config', 'initializers', 'honeybadger_shim.rb')
     FileUtils.cp(shim_file, target)
@@ -32,7 +31,7 @@ When /^I configure the Honeybadger shim$/ do
 end
 
 When /^I configure my application to require Honeybadger$/ do
-  if rails3?
+  if rails_uses_bundler?
     # Do nothing - bundler's on it
   elsif rails_manages_gems?
     config_gem('honeybadger')
@@ -50,10 +49,10 @@ When /^I configure my application to require Honeybadger$/ do
 end
 
 When /^I configure Honeybadger with:$/ do |config|
-  if rails_manages_gems?
-    requires = ''
+  requires = if rails_uses_bundler? || rails_manages_gems?
+    ''
   else
-    requires = "require 'honeybadger'"
+    %(require 'honeybadger')
   end
 
   initializer_code = <<-EOF
@@ -74,10 +73,10 @@ When /^I configure Honeybadger with:$/ do |config|
 end
 
 When /^I run the honeybadger generator with "([^\"]*)"$/ do |generator_args|
-  if rails3?
-    step %(I successfully run `./script/rails generate honeybadger #{generator_args}`)
-  else
+  if rails2?
     step %(I successfully run `./script/generate honeybadger #{generator_args}`)
+  else
+    step %(I successfully run `rails generate honeybadger #{generator_args}`)
   end
 end
 
@@ -92,7 +91,7 @@ Then /^I should receive (.+) Honeybadger notifications?$/ do |number|
 end
 
 Then /^the request\s?(url|component|action|params|session|cgi_data|context)? should( not)? contain "([^\"]*)"$/ do |key, negate, expected|
-  notice = all_output.match(/Notice: ({.+})/) ? JSON.parse(Regexp.last_match(1)) : {}
+  notice = all_output.match(/Notice: (\{.+\})/) ? JSON.parse(Regexp.last_match(1)) : {}
   hash = key ? notice['request'][key.strip] : notice['request']
   hash.to_s.send(negate ? :should_not : :should, match(/#{Regexp.escape(expected)}/))
 end
@@ -103,10 +102,10 @@ end
 
 When /^I define a( metal)? response for "([^\"]*)":$/ do |metal, controller_and_action, definition|
   controller_class_name, action = controller_and_action.split('#')
-  controller_name = controller_class_name.underscore
+  controller_name = controller_class_name.split(/(?=[A-Z][a-z]*)/).join('_').downcase
   controller_file_name = File.join(rails_root, 'app', 'controllers', "#{controller_name}.rb")
   File.open(controller_file_name, "w") do |file|
-    file.puts "class #{controller_class_name} < #{ (metal && rails3?) ? 'ActionController::Metal' : 'ApplicationController'}"
+    file.puts "class #{controller_class_name} < #{ (metal && !rails2?) ? 'ActionController::Metal' : 'ApplicationController'}"
     file.puts "def consider_all_requests_local; false; end"
     file.puts "def local_request?; false; end"
     file.puts "def #{action}"
@@ -121,11 +120,11 @@ When /^I perform a request to "([^\"]*)"$/ do |uri|
 end
 
 When /^I route "([^\"]*)" to "([^\"]*)"$/ do |path, controller_action_pair|
-  route = if rails3?
-            %(match "#{path}", :to => "#{controller_action_pair}")
-          else
+  route = if rails2?
             controller, action = controller_action_pair.split('#')
             %(map.connect "#{path}", :controller => "#{controller}", :action => "#{action}")
+          else
+            %(get "#{path}" => "#{controller_action_pair}")
           end
   routes_file = File.join(rails_root, "config", "routes.rb")
   File.open(routes_file, "r+") do |file|
@@ -182,20 +181,7 @@ Then /^my Honeybadger configuration should contain the following line:$/ do |lin
 end
 
 When /^I configure the application to filter parameter "([^\"]*)"$/ do |parameter|
-  if rails3?
-    application_filename = File.join(rails_root, 'config', 'application.rb')
-    application_lines = File.open(application_filename).readlines
-
-    application_definition_line       = application_lines.detect { |line| line =~ /Application/ }
-    application_definition_line_index = application_lines.index(application_definition_line)
-
-    application_lines.insert(application_definition_line_index + 1,
-                             "    config.filter_parameters += [#{parameter.inspect}]")
-
-   File.open(application_filename, "w") do |file|
-     file.puts application_lines.join("\n")
-   end
-  else
+  if rails2?
    controller_filename = application_controller_filename
    controller_lines = File.open(controller_filename).readlines
 
@@ -208,6 +194,19 @@ When /^I configure the application to filter parameter "([^\"]*)"$/ do |paramete
    File.open(controller_filename, "w") do |file|
      file.puts controller_lines.join("\n")
    end
+  else
+    application_filename = File.join(rails_root, 'config', 'application.rb')
+    application_lines = File.open(application_filename).readlines
+
+    application_definition_line       = application_lines.detect { |line| line =~ /Application/ }
+    application_definition_line_index = application_lines.index(application_definition_line)
+
+    application_lines.insert(application_definition_line_index + 1,
+                             "    config.filter_parameters += [#{parameter.inspect}]")
+
+   File.open(application_filename, "w") do |file|
+     file.puts application_lines.join("\n")
+   end
   end
 end
 
@@ -223,3 +222,21 @@ When /^I configure the notifier to use "([^\"]*)" as an API key$/ do |api_key|
       """
   }
 end
+
+When /^I configure Rails with:$/ do |config|
+  if rails2?
+    fail 'This step definition requires Rails 3+. Please add support for Rails 2 if you need it.'
+  else
+    application_filename = File.join(rails_root, 'config', 'application.rb')
+    application_lines = File.open(application_filename).readlines
+
+    application_definition_line       = application_lines.detect { |line| line =~ /Application/ }
+    application_definition_line_index = application_lines.index(application_definition_line)
+
+    application_lines.insert(application_definition_line_index + 1, config)
+
+    File.open(application_filename, "w") do |file|
+      file.puts application_lines.join("\n")
+    end
+  end
+end

data/features/support/honeybadger_failure_shim.rb.template

@@ -0,0 +1,5 @@
+require 'sham_rack'
+
+ShamRack.at("api.honeybadger.io", 443) do |env|
+  ["500 Internal Error", { "Content-type" => "text/html" }, ['']]
+end

data/features/support/rails.rb

@@ -3,32 +3,44 @@ module RailsHelpers
     controller_filename = File.join(rails_root, 'app', 'controllers', "application_controller.rb")
   end
 
+  def rails2?
+    rails_version =~ /^2/
+  end
+
   def rails3?
     rails_version =~ /^3/
   end
 
+  def rails4?
+    rails_version =~ /^4/
+  end
+
   def rails_root
     LOCAL_RAILS_ROOT
   end
 
   def rails_uses_rack?
-    rails3? || rails_version =~ /^2\.3/
+    rails4? || rails3? || rails_version =~ /^2\.3/
   end
 
   def rails_version
     @rails_version ||= `bundle exec rails -v`[/\d.+/]
   end
 
+  def rails_uses_bundler?
+    rails4? || rails3?
+  end
+
   def rails_manages_gems?
     rails_version =~ /^2\.[123]/
   end
 
   def rails_supports_initializers?
-    rails3? || rails_version =~ /^2\./
+    rails4? || rails3? || rails_version =~ /^2\./
   end
 
   def rails_finds_generators_in_gems?
-    rails3? || rails_version =~ /^2\./
+    rails4? || rails3? || rails_version =~ /^2\./
   end
 
   def environment_path
@@ -72,7 +84,7 @@ module RailsHelpers
   end
 
   def perform_request(uri, environment = 'production')
-    if rails3?
+    if rails4? || rails3?
       request_script = <<-SCRIPT
         require File.expand_path('../config/environment', __FILE__)
 
@@ -91,7 +103,7 @@ module RailsHelpers
         end
       SCRIPT
       File.open(File.join(rails_root, 'request.rb'), 'w') { |file| file.write(request_script) }
-      step %(I run `ruby -rthread ./script/rails runner -e #{environment} request.rb`)
+      step %(I run `rails runner -e #{environment} request.rb`)
     elsif rails_uses_rack?
       request_script = <<-SCRIPT
         require File.expand_path('../config/environment', __FILE__)

data/gemfiles/rack.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rack"
+gem "honeybadger", :path=>"../"
+
+gemspec :path=>"../"

data/gemfiles/rack.gemfile.lock

@@ -0,0 +1,92 @@
+PATH
+  remote: /Users/josh/code/honeybadger-ruby
+  specs:
+    honeybadger (1.5.0)
+      json
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (0.5.1)
+      bundler
+      rake
+    aruba (0.5.1)
+      childprocess (~> 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    bourne (1.3.0)
+      mocha (= 0.13.0)
+    builder (3.1.4)
+    capistrano (2.14.1)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    cucumber (1.2.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    fakeweb (1.3.0)
+    ffi (1.3.1)
+    ffi (1.3.1-java)
+    gherkin (2.11.5)
+      json (>= 1.4.6)
+    gherkin (2.11.5-java)
+      json (>= 1.4.6)
+    highline (1.6.15)
+    json (1.7.6)
+    json (1.7.6-java)
+    metaclass (0.0.1)
+    mocha (0.13.0)
+      metaclass (~> 0.0.1)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-sftp (2.0.5)
+      net-ssh (>= 2.0.9)
+    net-ssh (2.6.3)
+    net-ssh-gateway (1.1.0)
+      net-ssh (>= 1.99.1)
+    rack (1.4.4)
+    rack-protection (1.3.2)
+      rack
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+    sham_rack (1.3.4)
+      rack
+    shoulda (2.11.3)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  appraisal
+  aruba
+  bourne (>= 1.0)
+  capistrano
+  cucumber (~> 1.2.1)
+  fakeweb (~> 1.3.0)
+  honeybadger!
+  rack
+  rake
+  rspec (~> 2.12.0)
+  sham_rack (~> 1.3.0)
+  shoulda (~> 2.11.3)
+  sinatra

data/gemfiles/rails2.3.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "rails", "2.3.14"
 gem "rake", "0.9.5"

data/gemfiles/rails2.3.gemfile.lock

@@ -2,11 +2,10 @@ PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
     honeybadger (1.5.0)
-      activesupport
       json
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (2.3.14)
       actionpack (= 2.3.14)
@@ -44,10 +43,14 @@ GEM
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
     ffi (1.2.0)
+    ffi (1.2.0-java)
     gherkin (2.11.5)
       json (>= 1.4.6)
+    gherkin (2.11.5-java)
+      json (>= 1.4.6)
     highline (1.6.15)
     json (1.7.5)
+    json (1.7.5-java)
     metaclass (0.0.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
@@ -84,6 +87,7 @@ GEM
     tilt (1.3.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/gemfiles/rails3.0.gemfile

@@ -1,8 +1,9 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "rails", "3.0.17"
 gem "honeybadger", :path=>"../"
+gem "better_errors", :require=>false
 
 gemspec :path=>"../"

data/gemfiles/rails3.0.gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.4.0)
-      activesupport
+    honeybadger (1.5.0)
       json
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     abstract (1.0.0)
     actionmailer (3.0.17)
@@ -43,6 +42,9 @@ GEM
       childprocess (~> 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
+    better_errors (0.5.0)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (2.1.2)
@@ -54,6 +56,7 @@ GEM
       net-ssh-gateway (>= 1.1.0)
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
+    coderay (1.0.8)
     cucumber (1.2.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -64,11 +67,15 @@ GEM
       abstract (>= 1.0.0)
     fakeweb (1.3.0)
     ffi (1.2.0)
+    ffi (1.2.0-java)
     gherkin (2.11.5)
       json (>= 1.4.6)
+    gherkin (2.11.5-java)
+      json (>= 1.4.6)
     highline (1.6.15)
     i18n (0.5.0)
     json (1.7.5)
+    json (1.7.5-java)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -128,11 +135,13 @@ GEM
     tzinfo (0.3.35)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   appraisal
   aruba
+  better_errors
   bourne (>= 1.0)
   capistrano
   cucumber (~> 1.2.1)