queue_classic_plus 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2401a88a47f9dcc2752db9ed026982cb6724851b
-  data.tar.gz: cecd7627f4a663a4b89a7bf6bfeed08f240cea62
+SHA256:
+  metadata.gz: 88536cc93e084fd7a3921cbd10ab31843882e42eef8979222528ed550ea18033
+  data.tar.gz: c2b1ae63963c66c44d2c86e33441edd2ca90b03800cb76528e477205afc652a4
 SHA512:
-  metadata.gz: 4da76e72bfed26e9898a1094cc6cc719caaafcb0efb4cfd59d86f4aa02e716b2ecee592f9a384149e557ca4f67ce9583b22dc4555e09befcbd2bea5586ac40ed
-  data.tar.gz: 4c6e779b8546ca3c91e925aa0236623516ea009532a14a9e53bf7f0b895a47a6168ddc243fdf17b5cedb8a1dd2f36f97cccd60629b808ea3c1ad81725df01a58
+  metadata.gz: 6cbadb6208bcb150fdf50bc6122ed99811cd7b92b0f336b337c57f03b8196a384b8e14b40ea6b67ef95d862771a266c62d2f892d8da49a6ff17b1e643281ec44
+  data.tar.gz: 3d2c44a3bb10a5a7c59cd8a22164e57074515ef221ce467a9fe6017d644ca6e14e0d23c0412b4fcb0eef52381e3bf21ecfc0fc327ed516958e051865bc7961c8

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+services:
+  - postgresql
 before_install:
   - gem update bundler
 install: bundle install --without development

data/Gemfile

@@ -15,4 +15,5 @@ group :test do
   gem 'rake'
   gem 'rspec'
   gem 'timecop'
+  gem 'newrelic_rpm'
 end

data/lib/queue_classic_plus/new_relic.rb

@@ -1,30 +1,29 @@
 require 'new_relic/agent/method_tracer'
 
-QueueClassicPlus::Base.class_eval do
-  class << self
-    include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+module QueueClassicNewRelic
+  include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
-    def new_relic_key
-      "Custom/QueueClassicPlus/#{librato_key}"
-    end
+  def new_relic_key
+    "Custom/QueueClassicPlus/#{librato_key}"
+  end
 
-    def _perform_with_new_relic(*args)
-      opts = {
-        name: 'perform',
-        class_name: self.name,
-        category: 'OtherTransaction/QueueClassicPlus',
-      }
+  def _perform(*args)
+    opts = {
+      name: 'perform',
+      class_name: self.name,
+      category: 'OtherTransaction/QueueClassicPlus',
+    }
 
-      perform_action_with_newrelic_trace(opts) do
-        if NewRelic::Agent.config[:'queue_classic_plus.capture_params']
-          NewRelic::Agent.add_custom_parameters(job_arguments: args)
-        end
-        _perform_without_new_relic *args
+    perform_action_with_newrelic_trace(opts) do
+      if NewRelic::Agent.config[:'queue_classic_plus.capture_params']
+        NewRelic::Agent.add_custom_parameters(job_arguments: args)
       end
-    end
 
-    alias_method_chain :_perform, :new_relic
+      super
+    end
   end
+
+  QueueClassicPlus::Base.singleton_class.send(:prepend, QueueClassicNewRelic)
 end
 
 QueueClassicPlus::CustomWorker.class_eval do

data/lib/queue_classic_plus/version.rb

@@ -1,3 +1,3 @@
 module QueueClassicPlus
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/queue_classic_plus.gemspec

@@ -19,6 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "queue_classic", ">= 3.1.0"
-  spec.add_development_dependency "bundler", "~> 1.6"
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
+    spec.add_development_dependency "bundler", "~> 1.6"
+  else
+    spec.add_development_dependency "bundler", "~> 2.0"
+  end
   spec.add_development_dependency "rake"
 end

data/spec/new_relic_spec.rb

@@ -0,0 +1,26 @@
+describe 'requiring queue_classic_plus/new_relic' do
+  subject do
+    Class.new(QueueClassicPlus::Base) do
+      @queue = :test
+
+      def self.perform
+      end
+
+      def self.name
+        'Funky::Name'
+      end
+    end
+  end
+
+  it 'adds NewRelic profiling support' do
+    expect(subject).to receive(:perform_action_with_newrelic_trace).once.with({
+      name: 'perform',
+      class_name: 'Funky::Name',
+      category: 'OtherTransaction/QueueClassicPlus',
+    })
+
+    subject._perform
+    require 'queue_classic_plus/new_relic'
+    subject._perform
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic_plus
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Simon Mathieu
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2019-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: queue_classic
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +91,7 @@ files:
 - spec/base_spec.rb
 - spec/helpers.rb
 - spec/inflector_spec.rb
+- spec/new_relic_spec.rb
 - spec/queue_classic/queue_spec.rb
 - spec/sample_jobs.rb
 - spec/spec_helper.rb
@@ -116,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Useful extras for Queue Classic
@@ -124,6 +125,7 @@ test_files:
 - spec/base_spec.rb
 - spec/helpers.rb
 - spec/inflector_spec.rb
+- spec/new_relic_spec.rb
 - spec/queue_classic/queue_spec.rb
 - spec/sample_jobs.rb
 - spec/spec_helper.rb