opbeat 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b25dbf0f098f4a69d5833ac37a9e0b2c129cf63
-  data.tar.gz: bcd17dc7a02835798595c9e9f7ff28d9b3c25a06
+  metadata.gz: 7fe06da9948bd4b055bbbd4a2cdfd9fb65ea47df
+  data.tar.gz: 03c5ef6ef57c78a97c11008a00bf2b669840448f
 SHA512:
-  metadata.gz: 6b44916b7dc99550e1ebf9c1aa01d963b23e0f031b4b21fd1a7a78dd9cc9bc508d6b0754f1cd52a72c674ef5ba28a3b687cf00ceb571361914f0e79a285bc3aa
-  data.tar.gz: cc05d5e53426cc30b91cd325bcb6914d34ba12f42b4965ae2149bada7ed7a0c560a425caee57d64d76a7693e6dfbe303be76b0d964a65870f2d625dfa2b96e38
+  metadata.gz: 3d0c1f9114d890b1cd2ffc4d901c69b0e2670eb4b49ebb7cc636bc0007cb687db67758148bef69b7c8b2793f38522ec936663bfcb01879c73576013070ea5834
+  data.tar.gz: 6bc4bcd743a8d3bcb439d2d3f3b185967f6f90b27b40c07f98e47f023491940a16359a3422674325fe1136545981c42d226f514b776a0b6c3930083790db0168

data/.travis.yml

@@ -4,7 +4,6 @@ cache: bundler
 env:
   - CI=true
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.6
   - 2.2.3
@@ -21,16 +20,6 @@ matrix:
       gemfile: gemfiles/Gemfile.rails-HEAD
 
   exclude:
-    # Rails 4.0+ requires ruby 2.0+
-    - rvm: 1.9.3
-      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.2.x
-    # Rails 5.0+ requires ruby 2.2+
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile.rails-5.0.x
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile.rails-5.0.x
     - rvm: 2.1.6

data/HISTORY.md

@@ -1,3 +1,7 @@
+# 3.0.10
+
+- Fix Sinatra with `config.disable_performance` (#44 [@skogsmaskin](https://github.com/skogsmaskin))
+
 # 3.0.9
 
 - Fix Rails 5 support

data/README.md

@@ -9,7 +9,7 @@
 Add the following to your `Gemfile`:
 
 ```ruby
-gem 'opbeat', '~> 3.0.8'
+gem 'opbeat', '~> 3.0.9'
 ```
 
 The Opbeat gem adheres to [Semantic
@@ -97,13 +97,13 @@ You may specify extra context for errors ahead of time by using `Opbeat.set_cont
 
 ```ruby
 class DashboardController < ApplicationController
-  before_filter do
+  before_action do
     Opbeat.set_context(timezone: current_user.timezone)
   end
 end
 ```
 
-or by specifying it as a block using `Opbeat.context` eg:
+or by specifying it as a block using `Opbeat.with_context` eg:
 
 ```ruby
 Opbeat.with_context(user_id: @user.id) do
@@ -198,7 +198,7 @@ $ rspec spec
 
 ## Legacy
 
-Be aware that 3.0 is a almost complete rewrite of the Opbeat ruby client. It is not api compliant with version 2 and below.
+Be aware that 3.0 is an almost complete rewrite of the Opbeat ruby client. It is not api compliant with version 2 and below.
 
 ## Resources
 

data/gemfiles/Gemfile.rails-5.0.x

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

data/gemfiles/Gemfile.rails-HEAD

@@ -1,7 +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'
+gem 'rack', git: 'https://github.com/rack/rack.git'
+gem 'arel', git: 'https://github.com/rails/arel.git'
+gem 'rails', git: 'https://github.com/rails/rails.git'
+gem 'sinatra', git: 'https://github.com/sinatra/sinatra.git'
 

data/lib/opbeat/injections/sinatra.rb

@@ -9,8 +9,9 @@ module Opbeat
 
             def dispatch!(*args, &block)
               dispatch_without_opb!(*args, &block).tap do
-                if route = env['sinatra.route']
-                  Opbeat.transaction(nil).endpoint = route
+                transaction = Opbeat.transaction(nil)
+                if route = env['sinatra.route'] and transaction
+                  transaction.endpoint = route
                 end
               end
             end
@@ -39,7 +40,7 @@ module Opbeat
             alias render_without_opb render
 
             def render(*args, &block)
-              sig = options[:__opbeat_template_sig] || 'Uknown template'.freeze
+              sig = options[:__opbeat_template_sig] || 'Unknown template'.freeze
 
               Opbeat.trace sig, KIND do
                 render_without_opb(*args, &block)

data/lib/opbeat/version.rb

@@ -1,3 +1,3 @@
 module Opbeat
-  VERSION = "3.0.9"
+  VERSION = "3.0.10"
 end

data/spec/opbeat/integration/sinatra_spec.rb

@@ -63,4 +63,45 @@ module Opbeat
     end
 
   end
+
+
+  RSpec.describe "sinatra integration without perfomance" do
+    include Rack::Test::Methods
+
+    def config
+      @config ||= Opbeat::Configuration.new do |c|
+        c.app_id = 'X'
+        c.organization_id = 'Y'
+        c.secret_token = 'Z'
+        c.disable_worker = true
+        c.disable_performance = true
+      end
+    end
+
+    around do |example|
+      Opbeat.start! config
+      example.call
+      Opbeat.stop!
+    end
+
+    class TestApp < ::Sinatra::Base
+      disable :show_exceptions
+      use Opbeat::Middleware
+
+      get '/' do
+        erb "I am an inline template!"
+      end
+    end
+
+    def app
+      TestApp
+    end
+
+    it "wraps routes in transactions" do
+      get '/'
+      expect(Opbeat::Client.inst.pending_transactions.last).to be_nil
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opbeat
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport