appsignal 0.12.rc.13 → 0.12.rc.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e677ddb14f503c22d8a2f3f3019ef8ae6d6a4b5d
-  data.tar.gz: 5110ca959cf967f1d72c79a7fc3a3697f2d98f67
+  metadata.gz: d5d48a39d924257facf894b4a9c2e636936db173
+  data.tar.gz: 959db33de85929f774e51c1ac25120a5cfef3d12
 SHA512:
-  metadata.gz: 76d9f7df0f21d98a33040c4c11e4c8295f8677ff720ba6dec322514917ba342a3ce69c07cbc94f08d0a2e84cf425fb85d2cf128fd30a045a850cedb2076a552d
-  data.tar.gz: f5c1ff186860f7035d0c5127d9dd544fce3170dc17e047f2f7939df1d1bad60bac6abd59aa227561136a64ff97d63d0ab048343e1bae29ddba8e3227911e55aa
+  metadata.gz: 8908e5a4de9c5edb13d923e57c32358dca86e7582ce976dc046ccb62e6183c237a8d4c0469d66afd0852d08be1e162a633bc21af787c1b9783e8e965c6846655
+  data.tar.gz: 9c2b984abd3d0734885560f9bb8a94dfa8a5fc6bdd6edb7756bace964efff1265f6f6f17d494cff61a586ecd87713a2dab25cf51075fd2a0db578e8c598a2d3c

data/lib/appsignal/config.rb

@@ -61,7 +61,7 @@ module Appsignal
       load_from_environment
 
       # Load the config file if it exists
-      if File.exists?(config_file)
+      if config_file && File.exists?(config_file)
         load_from_disk
       end
 
@@ -108,7 +108,8 @@ module Appsignal
     protected
 
     def config_file
-      @config_file ||= File.join(root_path, 'config', 'appsignal.yml')
+      @config_file ||=
+        root_path.nil? ? nil : File.join(root_path, 'config', 'appsignal.yml')
     end
 
     def load_from_disk

data/lib/appsignal/hooks.rb

@@ -45,44 +45,6 @@ module Appsignal
         raise NotImplementedError
       end
     end
-
-    module Helpers
-
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods
-        def truncate(text)
-          Appsignal::Hooks::Helpers.truncate(text)
-        end
-
-        def string_or_inspect(string_or_other)
-          Appsignal::Hooks::Helpers.string_or_inspect(string_or_other)
-        end
-      end
-
-      def string_or_inspect(string_or_other)
-        Appsignal::Hooks::Helpers.string_or_inspect(string_or_other)
-      end
-
-      def truncate(text)
-        Appsignal::Hooks::Helpers.truncate(text)
-      end
-
-      def self.string_or_inspect(string_or_other)
-        if string_or_other.is_a?(String)
-          string_or_other
-        else
-          string_or_other.inspect
-        end
-      end
-
-      def self.truncate(text)
-        text.size > 200 ? "#{text[0...197]}..." : text
-      end
-    end
-
   end
 end
 

data/lib/appsignal/hooks/sidekiq.rb

@@ -1,8 +1,6 @@
 module Appsignal
   class Hooks
     class SidekiqPlugin
-      include Appsignal::Hooks::Helpers
-
       def job_keys
         @job_keys ||= Set.new(%w(
             class args retried_at failed_at
@@ -32,11 +30,23 @@ module Appsignal
         end
       end
 
+      def string_or_inspect(string_or_other)
+        if string_or_other.is_a?(String)
+          string_or_other
+        else
+          string_or_other.inspect
+        end
+      end
+
       def format_args(args)
         args.map do |arg|
           truncate(string_or_inspect(arg))
         end
       end
+
+      def truncate(text)
+        text.size > 200 ? "#{text[0...197]}..." : text
+      end
     end
 
     class SidekiqHook < Appsignal::Hooks::Hook

data/lib/appsignal/integrations/delayed_job_plugin.rb

@@ -1,8 +1,6 @@
 module Appsignal
   class Hooks
     class DelayedJobPlugin < ::Delayed::Plugin
-      include Appsignal::Hooks::Helpers
-
       callbacks do |lifecycle|
         lifecycle.around(:invoke_job) do |job, &block|
           invoke_with_instrumentation(job, block)
@@ -31,18 +29,11 @@ module Appsignal
             :priority => job.priority || 0,
             :attempts => job.attempts || 0
           },
-          :params      => format_args(job.payload_object.args),
           :queue_start => job.created_at
         ) do
           block.call(job)
         end
       end
-
-      def self.format_args(args)
-        args.map do |arg|
-          self.truncate(self.string_or_inspect(arg))
-        end
-      end
     end
   end
 end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '0.12.rc.13'
+  VERSION = '0.12.rc.14'
 end

data/spec/lib/appsignal/config_spec.rb

@@ -201,4 +201,12 @@ describe Appsignal::Config do
       its([:ignore_actions]) { should == ['action1', 'action2'] }
     end
   end
+
+  context "when a nil root path is passed" do
+    let(:initial_config) { {} }
+    let(:config) { Appsignal::Config.new(nil, 'production', initial_config) }
+
+    its(:valid?)  { should be_false }
+    its(:active?) { should be_false }
+  end
 end

data/spec/lib/appsignal/hooks/delayed_job_spec.rb

@@ -36,7 +36,7 @@ describe Appsignal::Hooks::DelayedJobHook do
           :attempts       => 1,
           :queue          => 'default',
           :created_at     => time - 60_000,
-          :payload_object => double(:args => ['argument']),
+          :payload_object => double
         )
       end
       let(:invoked_block) { Proc.new { } }
@@ -54,7 +54,6 @@ describe Appsignal::Hooks::DelayedJobHook do
               :queue    => 'default',
               :id       => 123
             },
-            :params      => ['argument'],
             :queue_start => time - 60_000,
           )
 
@@ -67,15 +66,14 @@ describe Appsignal::Hooks::DelayedJobHook do
           let(:job) do
             double(
               :payload_object => double(
-                :appsignal_name => 'CustomClass#perform',
-                :args           => ['argument']
+                :appsignal_name => 'CustomClass#perform'
               ),
-              :id             => 123,
-              :name           => 'TestClass#perform',
-              :priority       => 1,
-              :attempts       => 1,
-              :queue          => 'default',
-              :created_at     => time - 60_000
+              :id         => 123,
+              :name       => 'TestClass#perform',
+              :priority   => 1,
+              :attempts   => 1,
+              :queue      => 'default',
+              :created_at => time - 60_000
             )
           end
           it "should wrap in a transaction with the correct params" do
@@ -89,7 +87,6 @@ describe Appsignal::Hooks::DelayedJobHook do
                 :queue    => 'default',
                 :id       => 123
               },
-              :params      => ['argument'],
               :queue_start => time - 60_000
             )
 

data/spec/lib/appsignal/hooks/sidekiq_spec.rb

@@ -107,6 +107,38 @@ describe Appsignal::Hooks::SidekiqPlugin do
       plugin.format_args(args).should == ['Model', '1', object.inspect]
     end
   end
+
+  describe "#truncate" do
+    let(:very_long_text) do
+      "a" * 400
+    end
+
+    it "should truncate the text to 200 chars max" do
+      plugin.truncate(very_long_text).should == "#{'a' * 197}..."
+    end
+  end
+
+  describe "#string_or_inspect" do
+    context "when string" do
+      it "should return the string" do
+        plugin.string_or_inspect('foo').should == 'foo'
+      end
+    end
+
+    context "when integer" do
+      it "should return the string" do
+        plugin.string_or_inspect(1).should == '1'
+      end
+    end
+
+    context "when object" do
+      let(:object) { Object.new }
+
+      it "should return the string" do
+        plugin.string_or_inspect(object).should == object.inspect
+      end
+    end
+  end
 end
 
 describe Appsignal::Hooks::SidekiqHook do

data/spec/lib/appsignal/hooks_spec.rb

@@ -74,79 +74,3 @@ describe Appsignal::Hooks do
     Appsignal::Hooks.hooks[:mock_error_hook].installed?.should be_false
   end
 end
-
-describe Appsignal::Hooks::Helpers do
-  class ClassWithHelpers
-    include Appsignal::Hooks::Helpers
-  end
-
-  let(:class_with_helpers) { ClassWithHelpers.new }
-
-  describe "#truncate" do
-    it "should call the class method helper" do
-      expect( Appsignal::Hooks::Helpers ).to receive(:truncate).with('text')
-
-      class_with_helpers.truncate('text')
-    end
-  end
-
-  describe "#string_or_inspect" do
-    it "should call the class method helper" do
-      expect( Appsignal::Hooks::Helpers ).to receive(:string_or_inspect)
-                                              .with('string')
-
-      class_with_helpers.string_or_inspect('string')
-    end
-  end
-
-  describe Appsignal::Hooks::Helpers::ClassMethods do
-    describe "#truncate" do
-      it "should call the class method helper" do
-        expect( Appsignal::Hooks::Helpers ).to receive(:truncate).with('text')
-
-        ClassWithHelpers.truncate('text')
-      end
-    end
-
-    describe "#string_or_inspect" do
-      it "should call the class method helper" do
-        expect( Appsignal::Hooks::Helpers ).to receive(:string_or_inspect)
-                                                .with('string')
-
-        ClassWithHelpers.string_or_inspect('string')
-      end
-    end
-  end
-
-  describe ".truncate" do
-    let(:very_long_text) do
-      "a" * 400
-    end
-
-    it "should truncate the text to 200 chars max" do
-      Appsignal::Hooks::Helpers.truncate(very_long_text).should == "#{'a' * 197}..."
-    end
-  end
-
-  describe ".string_or_inspect" do
-    context "when string" do
-      it "should return the string" do
-        Appsignal::Hooks::Helpers.string_or_inspect('foo').should == 'foo'
-      end
-    end
-
-    context "when integer" do
-      it "should return the string" do
-        Appsignal::Hooks::Helpers.string_or_inspect(1).should == '1'
-      end
-    end
-
-    context "when object" do
-      let(:object) { Object.new }
-
-      it "should return the string" do
-        Appsignal::Hooks::Helpers.string_or_inspect(object).should == object.inspect
-      end
-    end
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.rc.13
+  version: 0.12.rc.14
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack