Merge next

.gitignore

@@ -50,3 +50,6 @@ vendor
 # For rubinius:
 #*.rbc
 bin
+
+# For Bugsnag-Maze-Runner:
+maze_output

.rubocop_todo.yml

@@ -301,7 +301,9 @@ Metrics/MethodLength:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 111
+  Max: 125
+  Exclude:
+    - 'lib/bugsnag/helpers.rb'
 
 # Offense count: 11
 Metrics/PerceivedComplexity:

.travis.yml

@@ -56,6 +56,46 @@ jobs:
     - GEMSETS="test rubocop"
     rvm: 2.4.1
     script: bundle exec ./bin/rubocop lib/
+  # - stage: test
+  #   addons:
+  #     apt:
+  #       packages:
+  #       - docker-ce
+  #   sudo: required
+  #   sevices:
+  #   - docker
+  #   env:
+  #   - BUNDLE_VERSION=1.12.0
+  #   - GEMSETS="test maze"
+  #   rmv: 2.4.1
+  #   script: bundle exec bugsnag-maze-runner -c features/plain_features
+  # - stage: test
+  #   addons:
+  #     apt:
+  #       packages:
+  #       - docker-ce
+  #   sudo: required
+  #   sevices:
+  #   - docker
+  #   env:
+  #   - BUNDLE_VERSION=1.12.0
+  #   - GEMSETS="test maze"
+  #   rmv: 2.4.1
+  #   script: bundle exec bugsnag-maze-runner -c features/sidekiq.feature
+  # - stage: test
+  #   addons:
+  #     apt:
+  #       packages:
+  #       - docker-ce
+  #   sudo: required
+  #   sevices:
+  #   - docker
+  #   env:
+  #   - BUNDLE_VERSION=1.12.0
+  #   - GEMSETS="test maze"
+  #   - MAX_MAZE_CONNECT_ATTEMPTS=20
+  #   rmv: 2.4.1
+  #   script: bundle exec bugsnag-maze-runner -c features/rails_features
   - stage: deploy
     env:
     - BUNDLE_VERSION=1.12.0

CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+## 6.7.3 (18 May 2018)
+
+### Fixes
+
+* Apply metadata filters to HTTP referer fields
+  | [#460](https://github.com/bugsnag/bugsnag-ruby/pull/460)
+  | [Renee Balmert](https://github.com/tremlab)
+
 ## 6.7.2 (24 Apr 2018)
 
 ### Fixes

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 group :test, optional: true do
-    gem 'rake', '~> 10.1.1'
+    gem 'rake', RUBY_VERSION <= '1.9.3' ? '~> 11.3.0' : '~> 12.3.0'
     gem 'rspec'
     gem 'rspec-mocks'
     gem 'rdoc', '~> 5.1.0'
@@ -12,20 +12,24 @@ group :test, optional: true do
 end
 
 group :coverage, optional: true do
-    gem 'simplecov'
-    gem 'coveralls'
+  gem 'simplecov'
+  gem 'coveralls'
 end
 
 group :rubocop, optional: true do
-    gem 'rubocop', '~> 0.52.1'
+  gem 'rubocop', '~> 0.52.1'
 end
 
 group :sidekiq, optional: true do
-    gem 'sidekiq', '~> 5.0.4'
+  gem 'sidekiq', '~> 5.0.4'
 end
 
 group :doc, optional: true do
   gem 'hanna-nouveau'
 end
 
+group :maze, optional: true do
+  gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner' if RUBY_VERSION >= '2.0.0'
+end
+
 gemspec

VERSION

@@ -1 +1 @@
-6.7.2
+6.7.3

example/rails-51/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

example/rails-51/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../config/application', __dir__)
+require_relative '../config/boot'
+require 'rails/commands'

example/rails-51/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

example/rails-51/bin/setup

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
+  # end
+
+  puts "\n== Preparing database =="
+  system! 'bin/rails db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

example/rails-51/bin/update

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

example/rails-51/bin/yarn

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+VENDOR_PATH = File.expand_path('..', __dir__)
+Dir.chdir(VENDOR_PATH) do
+  begin
+    exec "yarnpkg #{ARGV.join(" ")}"
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end

example/rails-51/config/initializers/bugsnag.rb

@@ -1,5 +1,3 @@
 Bugsnag.configure do |config|
-  config.api_key = "12312312312312312312312312312312"
-  config.auto_capture_sessions = false
-  config.endpoint = "http://localhost:62000"
+  config.api_key = "YOUR_API_KEY_HERE"
 end

features/fixtures/delayed_job/.dockerignore

@@ -0,0 +1 @@
+Gemfile.lock

features/fixtures/delayed_job/Dockerfile

@@ -0,0 +1,12 @@
+ARG ruby_version
+FROM ruby:$ruby_version
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY Gemfile /usr/src/app/
+RUN bundle install
+
+COPY . /usr/src/app
+
+CMD ["bundle", "exec", "rails", "s", "-b", "0.0.0.0"]

features/fixtures/delayed_job/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'bugsnag'
+gem 'delayed_job'