appsignal 1.3.5.beta.1 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3a75a284960b4d62fbe5a44bb0d8874ea659d26
-  data.tar.gz: 9b0c5a85331cf63415a8d06d5f167fd51001e71d
+  metadata.gz: 1df981364fb99fb2a476f560e03d4daa641ed611
+  data.tar.gz: 2f0ce5ca8fbf1a6b71aba911969526bff71e25a7
 SHA512:
-  metadata.gz: 5bc51d6d2696d1c9e3187bdc0542cffe1ac5c68c3bb6739ae720a54c5021891e8ec5897d0dfe03dbdf0eb81475e1688ea9cf11a482c370bfc7171c7d788563bd
-  data.tar.gz: 21fb5d5806e5f224960991fdc402ba6ef24dc8abf76af0835960935e39c4c72e96039d9e7412482a2b1f9dee1c95e5c6c7ada5bae5944ccc83b5ca32859fa714
+  metadata.gz: 089d7016d35c1bcde5db31d0030b7d35f8961f97f776121886d1d113ce775bdb0db77afea79b70cf64000ce141bb954af5c3a39c756fe4dbe9d8df8274c837c3
+  data.tar.gz: 535b644066102b0deecd804aea5fc5bab859c59b659e51f29ffa34ffbc8d9ba5509636fd18d0f03da7637ce0c85233703d350c7d645f85a4716aaff532fa2e0b

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # 1.3.5
 
 - Fix SSL certificate config in appsignal-agent. PR #151
+- Remove mounted_at Sinatra middleware option. Now detected by default. PR #146
+- Sinatra applications with middleware loading before AppSignal's middleware
+  would crash a request. Fixed in PR #156
 
 # 1.3.4
 

data/lib/appsignal/rack/sinatra_instrumentation.rb

@@ -29,7 +29,7 @@ module Appsignal
       def initialize(app, options = {})
         Appsignal.logger.debug 'Initializing Appsignal::Rack::SinatraInstrumentation'
         @app, @options = app, options
-        @raise_errors_on = @app.settings.raise_errors
+        @raise_errors_on = raise_errors?(@app)
       end
 
       def call(env)
@@ -75,16 +75,21 @@ module Appsignal
       def action_name(env)
         return unless env['sinatra.route']
 
-        if @options.fetch(:mounted_at, nil)
-          method, route = env['sinatra.route'].split(" ")
-          "#{method} #{@options[:mounted_at]}#{route}"
-        elsif env['SCRIPT_NAME']
+        if env['SCRIPT_NAME']
           method, route = env['sinatra.route'].split(" ")
           "#{method} #{env['SCRIPT_NAME']}#{route}"
         else
           env['sinatra.route']
         end
       end
+
+      private
+
+      def raise_errors?(app)
+        app.respond_to?(:settings) &&
+          app.settings.respond_to?(:raise_errors) &&
+          app.settings.raise_errors
+      end
     end
   end
 end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.3.5.beta.1'
+  VERSION = '1.3.5'
 end

data/spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb

@@ -45,6 +45,40 @@ if defined?(::Sinatra)
     let(:options) { {} }
     let(:middleware) { Appsignal::Rack::SinatraBaseInstrumentation.new(app, options) }
 
+    describe "#initialize" do
+      context "with no settings method in the Sinatra app" do
+        let(:app) { double(:call => true) }
+
+        it "should not raise errors" do
+          expect( middleware.raise_errors_on ).to be(false)
+        end
+      end
+
+      context "with no raise_errors setting in the Sinatra app" do
+        let(:app) { double(:call => true, :settings => double) }
+
+        it "should not raise errors" do
+          expect( middleware.raise_errors_on ).to be(false)
+        end
+      end
+
+      context "with raise_errors turned off in the Sinatra app" do
+        let(:app) { double(:call => true, :settings => double(:raise_errors => false)) }
+
+        it "should raise errors" do
+          expect( middleware.raise_errors_on ).to be(false)
+        end
+      end
+
+      context "with raise_errors turned on in the Sinatra app" do
+        let(:app) { double(:call => true, :settings => double(:raise_errors => true)) }
+
+        it "should raise errors" do
+          expect( middleware.raise_errors_on ).to be(true)
+        end
+      end
+    end
+
     describe "#call" do
       before do
         middleware.stub(:raw_payload => {})
@@ -139,22 +173,6 @@ if defined?(::Sinatra)
           end
         end
 
-        context "with option to set path a mounted_at prefix" do
-          let(:options) {{ :mounted_at  => "/api/v2" }}
-
-          it "should call set_action with a prefix path" do
-            Appsignal::Transaction.any_instance.should_receive(:set_action).with("GET /api/v2/")
-          end
-
-          context "without 'sinatra.route' env" do
-            let(:env) { {:path => '/', :method => 'GET'} }
-
-            it "returns nil" do
-              Appsignal::Transaction.any_instance.should_receive(:set_action).with(nil)
-            end
-          end
-        end
-
         context "with mounted modular application" do
           before { env['SCRIPT_NAME'] = '/api' }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.3.5.beta.1
+  version: 1.3.5
 platform: ruby
 authors:
 - Robert Beekman
@@ -313,9 +313,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1