appsignal 0.11.17 → 0.11.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9134a3a7b0864bbdbf6c23ee90d43537adc7faa9
-  data.tar.gz: 3c86992c153bcfceed5fae3db112d7e066b51c30
+  metadata.gz: 4204e0aa127219cae272542349aa109cfb4445df
+  data.tar.gz: c9100565b00cadfee94feeec9ddc8cc5bbce0c19
 SHA512:
-  metadata.gz: 87aa26b8f6412505484af7adc3250f8339936cd71c09aeb3772c414f79813dcda1fbcafd9d02b7742fcc675d90abc81c5b39cd8b55d49735a6ec251b26185406
-  data.tar.gz: acf5e0a21d3a5a163bb40da40d5083f9a644050d21dbab767dd7b237df39b7adfdeca8e5af7b98f966bb4fb4827905bd602423de1cdb0a544181ba6d6482842a
+  metadata.gz: 710507253fcf8873605f60638d2806ff4f08fcd59adc45a0b879eef9c2c63b87f7aad63b6abcaafb2f974f3370bafe9ccefe914c97cee68d6e6428c81e50933a
+  data.tar.gz: 75ab971b694c0cd2630e5fb4b5615b13b522d7c01b8859f4136391af4bdeed576af41c84628e1e6f65cbc98ede4aea1187360228c88b911e877a3f9207410835

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.11.18
+* Fix in Rake integration
+* Refactor of Resque integration
+
 # 0.11.17
 * Fix for bug using rack request in `send_exception`
 

data/Rakefile

@@ -10,6 +10,7 @@ GEMFILES = %w(
   rails-4.2
   sequel
   sinatra
+  resque
 )
 
 RUBY_VERSIONS = %w(

data/gemfiles/resque.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'resque'
+
+gemspec :path => '../'

data/lib/appsignal/integrations/rake.rb

@@ -3,11 +3,7 @@ module Rake
     alias_method :invoke_without_appsignal, :invoke
 
     def invoke(*args)
-      if Appsignal.active?
-        invoke_with_appsignal(*args)
-      else
-        invoke_without_appsignal(*args)
-      end
+      invoke_with_appsignal(*args)
     end
 
     def invoke_with_appsignal(*args)

data/lib/appsignal/integrations/resque.rb

@@ -27,7 +27,4 @@ if defined?(::Resque)
   Resque.after_fork do |job|
     Appsignal::IPC.forked! if Appsignal.active?
   end
-
-  # Extend the default job class with AppSignal instrumentation
-  Resque::Job.send(:extend, Appsignal::Integrations::ResquePlugin)
 end

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.11.17'
+  VERSION = '0.11.18'
 end

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

@@ -13,22 +13,13 @@ describe "Rack integration" do
   end
 
   describe "#invoke" do
-    before { Appsignal.stub(:active? => true) }
 
     it "should call with appsignal monitoring" do
       expect( task ).to receive(:invoke_with_appsignal).with(['foo'])
     end
 
-    context "when not active" do
-      before { Appsignal.stub(:active? => false) }
-
-      it "should NOT call with appsignal monitoring" do
-        expect( task ).to_not receive(:invoke_with_appsignal).with(['foo'])
-      end
-
-      it "should call the original task" do
-        expect( task ).to receive(:invoke_without_appsignal).with(['foo'])
-      end
+    it "should call the original task" do
+      expect( task ).to receive(:invoke_without_appsignal).with(['foo'])
     end
 
     after { task.invoke(['foo']) }

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

@@ -1,78 +1,82 @@
 require 'spec_helper'
 
-describe "Resque integration" do
-  let(:file) { File.expand_path('lib/appsignal/integrations/resque.rb') }
+if resque_present?
+  describe "Resque integration" do
+    let(:file) { File.expand_path('lib/appsignal/integrations/resque.rb') }
 
-  context "with resque" do
-    before do
-      module Resque
+    context "with resque" do
+      before do
+        load file
+        start_agent
 
-        def self.before_first_fork
-        end
+        class TestJob
+          extend Appsignal::Integrations::ResquePlugin
 
-        def self.after_fork
+          def self.perform
+          end
         end
 
-        class Job
-        end
+        class BrokenTestJob
+          extend Appsignal::Integrations::ResquePlugin
 
-        class TestError < StandardError
+          def self.perform
+            raise VerySpecificError.new('broken')
+          end
         end
-      end
-
-      load file
-      start_agent
-    end
 
-    describe :around_perform_resque_plugin do
-      let(:transaction) { Appsignal::Transaction.new(1, {}) }
-      let(:job) { Resque::Job }
-      let(:invoked_job) { nil }
-      before do
-        transaction.stub(:complete! => true)
-        Appsignal::Transaction.stub(:current => transaction)
       end
 
-      context "without exception" do
-        it "should create a new transaction" do
-          Appsignal::Transaction.should_receive(:create).and_return(transaction)
+      describe :around_perform_resque_plugin do
+        let(:transaction) { Appsignal::Transaction.new(1, {}) }
+        let(:job) { Resque::Job.new('default', {'class' => 'TestJob'}) }
+        before do
+          transaction.stub(:complete! => true)
+          Appsignal::Transaction.stub(:current => transaction)
         end
 
-        it "should wrap in a transaction with the correct params" do
-          Appsignal.should_receive(:monitor_transaction).with(
-            'perform_job.resque',
-            :class => 'Resque::Job',
-            :method => 'perform'
-          )
-        end
+        context "without exception" do
+          it "should create a new transaction" do
+            Appsignal::Transaction.should_receive(:create).and_return(transaction)
+          end
 
-        it "should close the transaction" do
-          transaction.should_receive(:complete!)
-        end
+          it "should wrap in a transaction with the correct params" do
+            Appsignal.should_receive(:monitor_transaction).with(
+              'perform_job.resque',
+              :class => 'TestJob',
+              :method => 'perform'
+            )
+          end
 
-        after { job.around_perform_resque_plugin { invoked_job }  }
-      end
+          it "should close the transaction" do
+            transaction.should_receive(:complete!)
+          end
 
-      context "with exception" do
-        it "should set the exception" do
-          transaction.should_receive(:add_exception)
+          after { job.perform  }
         end
 
-        after do
-          begin
-            job.around_perform_resque_plugin { raise(Resque::TestError.new('the roof')) }
-          rescue Resque::TestError
-            # Do nothing
+        context "with exception" do
+          let(:job) { Resque::Job.new('default', {'class' => 'BrokenTestJob'}) }
+
+          it "should set the exception" do
+            transaction.should_receive(:add_exception)
+          end
+
+          after do
+            begin
+              job.perform
+            rescue VerySpecificError
+              # Do nothing
+            end
           end
         end
       end
     end
-  end
 
-  context "without resque" do
-    before(:all) { Object.send(:remove_const, :Resque) }
+    context "without resque" do
+      before(:all) { Object.send(:remove_const, :Resque) }
 
-    specify { expect { ::Resque }.to raise_error(NameError) }
-    specify { expect { load file }.to_not raise_error }
+      specify { expect { ::Resque }.to raise_error(NameError) }
+      specify { expect { load file }.to_not raise_error }
+    end
   end
 end

data/spec/spec_helper.rb

@@ -52,6 +52,13 @@ rescue LoadError
   false
 end
 
+def resque_present?
+  require 'resque'
+  true
+rescue LoadError
+  false
+end
+
 def padrino_present?
   require 'padrino'
   true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.11.17
+  version: 0.11.18
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -141,6 +141,7 @@ files:
 - gemfiles/rails-4.0.gemfile
 - gemfiles/rails-4.1.gemfile
 - gemfiles/rails-4.2.gemfile
+- gemfiles/resque.gemfile
 - gemfiles/sequel.gemfile
 - gemfiles/sinatra.gemfile
 - lib/appsignal.rb