appsignal 0.11.8.beta.2 → 0.11.8.beta.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 41eb79c820f9d67a1344387af4fc6397d11dcfaa
+  data.tar.gz: 26ea28e40d99d4f8a33eb9604620fcbc1caada42
+SHA512:
+  metadata.gz: 112b6cf13f7ac013141d1d3e351c373c727d6826d82d339f98904db17183bcb4fa6e5dc6b19f54b08de774a49b1db590bb515b15716fefba75f1916bcd1dc609
+  data.tar.gz: 480404bb50bbbdc7fbc9ad8cc76bf3487a90f8eef1cfe28e1e425d4986d7744c3262b58f6fdc73fa51ce40b41221e7b76327f379276fa96b6c520db59e3b1bb3

data/lib/appsignal/integrations/rails.rb

@@ -5,17 +5,10 @@ if defined?(::Rails)
     module Integrations
       class Railtie < ::Rails::Railtie
         initializer 'appsignal.configure_rails_initialization' do |app|
-          app.middleware.insert_before(
-            ActionDispatch::RemoteIp,
-            Appsignal::Rack::JSExceptionCatcher
-          )
-          app.middleware.insert_after(
-            Appsignal::Rack::JSExceptionCatcher,
-            Appsignal::Rack::Listener
-          )
+          Appsignal::Integrations::Railtie.initialize_appsignal(app)
         end
 
-        config.after_initialize do
+        def self.initialize_appsignal(app)
           # Start logger
           Appsignal.start_logger(Rails.root.join('log'))
 
@@ -26,6 +19,19 @@ if defined?(::Rails)
             :name => Rails.application.class.parent_name
           )
 
+          app.middleware.insert_before(
+            ActionDispatch::RemoteIp,
+            Appsignal::Rack::Listener
+          )
+
+          if Appsignal.config.active? &&
+            Appsignal.config[:enable_frontend_error_catching] == true
+            app.middleware.insert_before(
+              Appsignal::Rack::Listener,
+              Appsignal::Rack::JSExceptionCatcher,
+            )
+          end
+
           Appsignal.start
         end
       end

data/lib/appsignal/rack/js_exception_catcher.rb

@@ -8,13 +8,9 @@ module Appsignal
 
       def call(env)
         if env['PATH_INFO'] == Appsignal.config[:frontend_error_catching_path]
-          if Appsignal.config.active? &&
-             Appsignal.config[:enable_frontend_error_catching] == true
-
-            body        = JSON.parse(env['rack.input'].read)
-            transaction = JSExceptionTransaction.new(body)
-            transaction.complete!
-          end
+          body        = JSON.parse(env['rack.input'].read)
+          transaction = JSExceptionTransaction.new(body)
+          transaction.complete!
           return [ 200, {}, []]
         else
           @app.call(env)

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.11.8.beta.2'
+  VERSION = '0.11.8.beta.3'
 end

data/spec/lib/appsignal/integrations/rails_spec.rb

@@ -3,18 +3,27 @@ require 'spec_helper'
 if rails_present?
   describe Appsignal::Integrations::Railtie do
     context "after initializing the app" do
-      before :all do
+      it "should call initialize_appsignal" do
+        expect( Appsignal::Integrations::Railtie ).to receive(:initialize_appsignal)
+
         MyApp::Application.config.root = project_fixture_path
         MyApp::Application.initialize!
       end
+    end
+
+    describe "#initialize_appsignal" do
+      let(:app) { MyApp::Application }
+      before { app.middleware.stub(:insert_before => true) }
 
       context "logger" do
+        before  { Appsignal::Integrations::Railtie.initialize_appsignal(app) }
         subject { Appsignal.logger }
 
         it { should be_a Logger }
       end
 
       context "config" do
+        before  { Appsignal::Integrations::Railtie.initialize_appsignal(app) }
         subject { Appsignal.config }
 
         it { should be_a(Appsignal::Config) }
@@ -24,45 +33,68 @@ if rails_present?
         its([:name])    { should == 'TestApp' }
 
         context "initial config" do
+          before  { Appsignal::Integrations::Railtie.initialize_appsignal(app) }
           subject { Appsignal.config.initial_config }
 
           its([:name]) { should == 'MyApp' }
         end
-      end
 
-      context "agent" do
-        subject { Appsignal.agent }
+        context "with APPSIGNAL_APP_ENV ENV var set" do
+          around do |sample|
+            ENV['APPSIGNAL_APP_ENV'] = 'env_test'
+            sample.run
+            ENV.delete('APPSIGNAL_APP_ENV')
+          end
 
-        it { should be_a(Appsignal::Agent) }
-      end
 
-      it "should have added the listener middleware" do
-        MyApp::Application.middleware.to_a.should include Appsignal::Rack::Listener
+          its(:env) { should == 'env_test' }
+        end
       end
 
-      it "should have added the js exception catcher middleware" do
-        MyApp::Application.middleware.to_a.should include Appsignal::Rack::JSExceptionCatcher
-      end
+      context "agent" do
+        before  { Appsignal::Integrations::Railtie.initialize_appsignal(app) }
+        subject { Appsignal.agent }
 
-      it "should not have added the instrumentation middleware" do
-        MyApp::Application.middleware.to_a.should_not include Appsignal::Rack::Instrumentation
+        it { should be_a(Appsignal::Agent) }
       end
-    end
 
-    context "with APPSIGNAL_APP_ENV ENV var set" do
-      around do |sample|
-        ENV['APPSIGNAL_APP_ENV'] = 'env_test'
-
-        MyEnvApp::Application.config.root = project_fixture_path
-        MyEnvApp::Application.initialize!
+      context "listener middleware" do
+        it "should have added the listener middleware" do
+          expect( app.middleware ).to receive(:insert_before).with(
+            ActionDispatch::RemoteIp,
+            Appsignal::Rack::Listener
+          )
+        end
 
-        sample.run
+        context "when frontend_error_catching is enabled" do
+          let(:config) do
+            Appsignal::Config.new(
+              project_fixture_path,
+              'test',
+              :name => 'MyApp',
+              :enable_frontend_error_catching => true
+            )
+          end
+
+          before do
+            Appsignal.stub(:config => config)
+          end
+
+          it "should have added the listener and JSExceptionCatcher middleware" do
+            expect( app.middleware ).to receive(:insert_before).with(
+              ActionDispatch::RemoteIp,
+              Appsignal::Rack::Listener
+            )
+
+            expect( app.middleware ).to receive(:insert_before).with(
+              Appsignal::Rack::Listener,
+              Appsignal::Rack::JSExceptionCatcher
+            )
+          end
+        end
 
-        ENV.delete('APPSIGNAL_APP_ENV')
+        after { Appsignal::Integrations::Railtie.initialize_appsignal(app) }
       end
-      subject { Appsignal.config }
-
-      its(:env) { should == 'env_test' }
     end
   end
 end

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

@@ -49,26 +49,9 @@ describe Appsignal::Rack::JSExceptionCatcher do
         expect( transaction ).to receive(:complete!)
       end
 
-      context "when appsignal is not active" do
-        let(:active)  { false }
-
-        it "should not create a transaction" do
-          expect( Appsignal::JSExceptionTransaction ).to_not receive(:new)
-        end
-      end
-
-      context "when `enable_frontend_error_catching` is disabled" do
-        let(:config_options) { {:enable_frontend_error_catching => false} }
-
-        it "should not create a transaction" do
-          expect( Appsignal::JSExceptionTransaction ).to_not receive(:new)
-        end
-      end
-
       context "when `frontend_error_catching_path` is different" do
         let(:config_options) do
           {
-            :enable_frontend_error_catching => true,
             :frontend_error_catching_path   => '/foo'
           }
         end

data/spec/support/rails/my_app.rb

@@ -4,10 +4,3 @@ module MyApp
     config.eager_load = false
   end
 end
-
-module MyEnvApp
-  class Application < Rails::Application
-    config.active_support.deprecation = proc { |message, stack| }
-    config.eager_load = false
-  end
-end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.11.8.beta.2
-  prerelease: 7
+  version: 0.11.8.beta.3
 platform: ruby
 authors:
 - Robert Beekman
@@ -13,118 +12,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: The official appsignal.com gem
@@ -135,9 +120,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -257,27 +242,26 @@ files:
 homepage: https://github.com/appsignal/appsignal
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
 test_files:
 - spec/lib/appsignal/agent_spec.rb