opbeat 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf5b5eeb0ede28475a3290ad8fc105b5fbf62db3
-  data.tar.gz: c06e9dabae76fe0a072ebdb5c042339d451eab6f
+  metadata.gz: fe5eca3de7470c1ef43e2c2b30f87550aa9f4248
+  data.tar.gz: 3bcd257e092fe001230a0b424b4069ae092bf340
 SHA512:
-  metadata.gz: 9d77abf28473b178c296f39ba161514b0d90106801546dafe75a3edef8e3b4dbd7c94ccdbf2797248fea18139b4f4e42d26f733cf2353bf5a22f0e40fef28052
-  data.tar.gz: 3735cf0fc7fb86d5bcab6b590daf82b91a36a9f5f5214b4c913b6f4cb7ff5b5aaab4e8f5338a3f45da85d812fa2355bf3408f562908ecb18a03d8439071d719a
+  metadata.gz: 01d4b4e1ac7fb68dcdf8b9fdd56c994f75ddd42f8fe906157de6daf1ace792bfa0238d81f1ce46aaf9ebf6d8cfc8a8b4052adc0e7689788e0fc0d88fcb0402e4
+  data.tar.gz: 99050c7c14d10f27692ef5e1a0e8ffa32526fb804fff70451a44a396d03202077a258ee68b8c320c24f4dd94803e9ca2ec33025e0f32cf2da45545c98377fa05

data/.travis.yml

@@ -6,20 +6,33 @@ rvm:
   - 2.0.0
   - 2.1.6
   - 2.2.3
+  - 2.3.1
 gemfile:
   - gemfiles/Gemfile.rails-3.2.x
   - gemfiles/Gemfile.rails-4.0.x
   - gemfiles/Gemfile.rails-4.1.x
   - gemfiles/Gemfile.rails-4.2.x
+  - gemfiles/Gemfile.rails-5.0.x
 matrix:
+  include:
+    - rvm: 2.3.1
+      gemfile: gemfiles/Gemfile.rails-HEAD
+
   exclude:
     # Rails 4.0+ requires ruby 2.0+
     - rvm: 1.9.3
-      Gemfile: gemfiles/Gemfile.rails-4.0.x
+      gemfile: gemfiles/Gemfile.rails-4.0.x
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile.rails-4.1.x
     - rvm: 1.9.3
-      Gemfile: gemfiles/Gemfile.rails-4.1.x
+      gemfile: gemfiles/Gemfile.rails-4.2.x
+    # Rails 5.0+ requires ruby 2.2+
     - rvm: 1.9.3
-      Gemfile: gemfiles/Gemfile.rails-4.2.x
+      gemfile: gemfiles/Gemfile.rails-5.0.x
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile.rails-5.0.x
+    - rvm: 2.1.6
+      gemfile: gemfiles/Gemfile.rails-5.0.x
 
 notifications:
   email: false

data/Gemfile

@@ -1,4 +1,3 @@
-eval_gemfile 'gemfiles/Gemfile.base'
+eval_gemfile 'gemfiles/Gemfile.rails-5.0.x'
 
-gem "rails", ">= 3.0"
 gem 'pry'

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 3.0.8
+
+- Add support for Rails 5
+- Fix support for newer versions of Sequel
+
 # 3.0.7
 
 **Features**

data/gemfiles/Gemfile.base

@@ -13,7 +13,6 @@ gem 'simplecov'
 
 # external libs
 
-gem 'sinatra'
 gem 'redis'
 gem 'fakeredis'
 gem 'sqlite3'
@@ -25,4 +24,3 @@ gem 'resque', require: false
 unless RUBY_VERSION.to_i <= 1
   gem 'sidekiq', require: false
 end
-

data/gemfiles/Gemfile.rails-3.2.x

@@ -1,3 +1,4 @@
 eval_gemfile File.expand_path('../Gemfile.base', __FILE__)
 
 gem 'rails', '~> 3.2.0'
+gem 'sinatra'

data/gemfiles/Gemfile.rails-4.0.x

@@ -1,3 +1,4 @@
 eval_gemfile File.expand_path('../Gemfile.base', __FILE__)
 
 gem 'rails', '~> 4.0.0'
+gem 'sinatra'

data/gemfiles/Gemfile.rails-4.1.x

@@ -1,3 +1,4 @@
 eval_gemfile File.expand_path('../Gemfile.base', __FILE__)
 
 gem 'rails', '~> 4.1.0'
+gem 'sinatra'

data/gemfiles/Gemfile.rails-4.2.x

@@ -1,3 +1,4 @@
 eval_gemfile File.expand_path('../Gemfile.base', __FILE__)
 
 gem 'rails', '~> 4.2.0'
+gem 'sinatra'

data/gemfiles/Gemfile.rails-5.0.x

@@ -0,0 +1,4 @@
+eval_gemfile File.expand_path('../Gemfile.base', __FILE__)
+
+gem 'rails', '~> 5.0.0'
+gem 'sinatra', github: 'sinatra'

data/gemfiles/Gemfile.rails-HEAD

@@ -0,0 +1,7 @@
+eval_gemfile File.expand_path('../Gemfile.base', __FILE__)
+
+gem 'rack', github: 'rack/rack', branch: 'master'
+gem 'arel', github: 'rails/arel', branch: 'master'
+gem 'rails', github: 'rails/rails', branch: 'master'
+gem 'sinatra', github: 'sinatra'
+

data/lib/opbeat/client.rb

@@ -193,15 +193,18 @@ module Opbeat
         exception.set_backtrace caller
       end
 
-      error_message = ErrorMessage.from_exception(config, exception, opts)
-      error_message.add_extra(@context) if @context
-      data = @data_builders.error_message.build error_message
-      enqueue Worker::PostRequest.new('/errors/', data)
+      if error_message = ErrorMessage.from_exception(config, exception, opts)
+        error_message.add_extra(@context) if @context
+        data = @data_builders.error_message.build error_message
+        enqueue Worker::PostRequest.new('/errors/', data)
+      end
     end
 
     def report_message message, opts = {}
       return if config.disable_errors
 
+      ensure_worker_running
+
       error_message = ErrorMessage.new(config, message, opts)
       error_message.add_extra(@context) if @context
       data = @data_builders.error_message.build error_message

data/lib/opbeat/configuration.rb

@@ -23,6 +23,8 @@ module Opbeat
 
       debug_traces: false,
 
+      view_paths: [],
+
       # for tests
       disable_worker: false
     }.freeze

data/lib/opbeat/error_message/http.rb

@@ -26,7 +26,10 @@ module Opbeat
           {}                                           # env
         )
 
-        env.each do |k, v|
+        # In Rails < 5 ActionDispatch::Request inherits from Hash
+        headers = env.respond_to?(:headers) ? env.headers : env
+
+        headers.each do |k, v|
           next unless k.upcase == k # lower case stuff isn't relevant
 
           if k.match(HTTP_ENV_KEY)

data/lib/opbeat/filter.rb

@@ -62,7 +62,7 @@ module Opbeat
     end
 
     def rails_filters
-      if defined?(::Rails) && Rails.application
+      if defined?(::Rails) && Rails.respond_to?(:application) && Rails.application
         if filters = ::Rails.application.config.filter_parameters
           filters.any? ? filters : nil
         end

data/lib/opbeat/injections.rb

@@ -37,8 +37,8 @@ module Opbeat
     end
 
     def self.register_require_hook registration
-      registration.require_paths.each do |p|
-        require_hooks[p] = registration
+      registration.require_paths.each do |path|
+        require_hooks[path] = registration
       end
     end
 
@@ -49,8 +49,8 @@ module Opbeat
         installed[registration.const_name] = registration
         registration.install
 
-        registration.require_paths.each do |p|
-          require_hooks.delete p
+        registration.require_paths.each do |path|
+          require_hooks.delete path
         end
       end
     end

data/lib/opbeat/injections/sequel.rb

@@ -11,18 +11,21 @@ module Opbeat
         def install
           require 'sequel/database/logging'
 
-          ::Sequel::Database.class_eval do
-            alias log_yield_without_opb log_yield
+          log_method = ::Sequel::Database.method_defined?(:log_connection_yield) ?
+            'log_connection_yield' : 'log_yield'
 
-            def log_yield sql, args = nil, &block
-              log_yield_without_opb(sql, *args) do
+          ::Sequel::Database.class_eval <<-end_eval
+            alias #{log_method}_without_opb #{log_method}
+
+            def #{log_method} sql, *args, &block
+              #{log_method}_without_opb(sql, *args) do
                 sig = Opbeat::Injections::Sequel::Injector.sql_parser.signature_for(sql)
                 Opbeat.trace(sig, KIND, sql: sql) do
                   block.call
                 end
               end
             end
-          end
+          end_eval
         end
       end
     end

data/lib/opbeat/integration/delayed_job.rb

@@ -1,4 +1,5 @@
 begin
+  require 'active_support'
   require 'delayed_job'
 rescue LoadError
 end

data/lib/opbeat/integration/rails/inject_exceptions_catcher.rb

@@ -3,7 +3,8 @@ module Opbeat
     module Rails
       module InjectExceptionsCatcher
         def self.included(cls)
-          cls.send(:alias_method_chain, :render_exception, :opbeat)
+          cls.send(:alias_method, :render_exception_without_opbeat, :render_exception)
+          cls.send(:alias_method, :render_exception, :render_exception_with_opbeat)
         end
 
         def render_exception_with_opbeat(env, exception)

data/lib/opbeat/normalizers/action_view.rb

@@ -19,11 +19,11 @@ module Opbeat
         end
 
         def relative_path path
-          root = config.view_paths.find { |p| path.start_with? p }
+          root = config.view_paths.find { |vp| path.start_with? vp }
           type = :app
 
           unless root
-            root = Gem.path.find { |p| path.start_with? p }
+            root = Gem.path.find { |gp| path.start_with? gp }
             type = :gem
           end
 

data/lib/opbeat/version.rb

@@ -1,3 +1,3 @@
 module Opbeat
-  VERSION = "3.0.7"
+  VERSION = "3.0.8"
 end

data/spec/opbeat/integration/rails_spec.rb

@@ -20,7 +20,7 @@ describe 'Rails integration' do
     class TinderButForHotDogs < ::Rails::Application
       config.secret_key_base = '__secret_key_base'
 
-      config.logger = Logger.new(nil)
+      config.logger = Logger.new(STDOUT)
       config.logger.level = Logger::DEBUG
 
       config.eager_load = false

data/spec/spec_helper.rb

@@ -12,13 +12,15 @@ require 'opbeat'
 module Opbeat
   class Configuration
     # Override defaults to enable http (caught by WebMock) in test env
-    defaults = DEFAULTS.dup.merge enabled_environments: %{test}
+    defaults = DEFAULTS.dup.merge enabled_environments: %w{test}
     remove_const(:DEFAULTS)
     const_set(:DEFAULTS, defaults.freeze)
   end
 end
 
 RSpec.configure do |config|
+  config.backtrace_exclusion_patterns += [%r{/gems/}]
+
   config.before :each do
     @request_stub = stub_request(:post, /intake\.opbeat\.com/)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opbeat
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -46,6 +46,8 @@ files:
 - gemfiles/Gemfile.rails-4.0.x
 - gemfiles/Gemfile.rails-4.1.x
 - gemfiles/Gemfile.rails-4.2.x
+- gemfiles/Gemfile.rails-5.0.x
+- gemfiles/Gemfile.rails-HEAD
 - lib/opbeat.rb
 - lib/opbeat/capistrano.rb
 - lib/opbeat/client.rb