datadog-notifications 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22dc145596f1b9ff7ce13aa1d288721b1b91b2b7de2a3ca79eefcc0d9608735b
-  data.tar.gz: 0470ffefc29242921d54223a46459f9324c55cc4d8ccf970deb7989dcc0576d8
+  metadata.gz: 299177adeebc9ed3fd6984f9725fb88ae46ab24b1582548976e8d4aa1a48f55a
+  data.tar.gz: bdea7f81d306dbb4f45d77b1870475596a3b9e04ef4675ca7ef117c03066be9a
 SHA512:
-  metadata.gz: 3f4692ee83c9af8255074edf39e3957bc98bc0ff514d595f83a52e0c704488088b81c0f51e72c10a40c2ca66f59e9776b5d134fc79cb1f4e70cb7eb4079da2e2
-  data.tar.gz: 75624cd42572dd722293c4432f6b456b1a5ad42e977e5d98cf1932c804d9d95b1316779019ffedab6383fd2d8ee3930771715d22bd73cffad3201236ac7dc2e2
+  metadata.gz: 4c7a6359a6b6abc80be605d04dd8934d7460de1a16ec1f2c7d6018c7f37c5b036658b8fa022f459117ea2367157cdc1e601c6482b72ff5ecf85e6965835e4d4e
+  data.tar.gz: f72472a2cfee96d1cb79f6ceddccdc8103ba8dffdd86465866dc17236ac95b59822558bad85cb40e848f4372a2ef588ba1bcd2fc7e3834a8e0415a2f23f0cbc7

data/.github/workflows/ruby.yml

@@ -0,0 +1,21 @@
+name: Ruby
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.6", "2.7", "3.0"]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - run: bundle exec rake

data/.rubocop.yml

@@ -1,8 +1,12 @@
-inherit_from:
-  - https://gitlab.com/bsm/misc/raw/master/rubocop/default.yml
+inherit_gem:
+  rubocop-bsm:
+    - default.yml
+inherit_mode:
+  merge:
+    - Exclude
 
 AllCops:
-  TargetRubyVersion: "2.5"
+  TargetRubyVersion: "2.6"
 
 Naming/FileName:
   Exclude:

data/Gemfile.lock

@@ -1,109 +1,122 @@
 PATH
   remote: .
   specs:
-    datadog-notifications (0.6.5)
+    datadog-notifications (0.6.6)
       activesupport
-      dogstatsd-ruby (>= 4.2, < 5.0)
+      dogstatsd-ruby (>= 4.8, < 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activerecord (6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activesupport (6.0.3.1)
+    activemodel (6.1.3)
+      activesupport (= 6.1.3)
+    activerecord (6.1.3)
+      activemodel (= 6.1.3)
+      activesupport (= 6.1.3)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    dogstatsd-ruby (4.8.1)
-    dry-configurable (0.11.5)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
+    dogstatsd-ruby (4.8.3)
+    dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
+    dry-core (0.5.0)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
-    dry-logic (1.0.6)
+    dry-logic (1.1.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
-    dry-types (1.4.0)
+      dry-core (~> 0.5, >= 0.5)
+    dry-types (1.5.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    grape (1.3.3)
+    grape (1.5.2)
       activesupport
       builder
       dry-types (>= 1.1)
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-    i18n (1.8.3)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.1)
+    minitest (5.14.4)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     mustermann-grape (1.0.1)
       mustermann (>= 1.0.0)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
-    rack (2.2.2)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    rack (2.2.3)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.7.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.85.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.11.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-bsm (0.5.4)
+      rubocop (~> 1.0)
+      rubocop-performance
+      rubocop-rails
+      rubocop-rake
+      rubocop-rspec
+    rubocop-performance (1.10.1)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
     sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -116,7 +129,7 @@ DEPENDENCIES
   rack-test
   rake
   rspec
-  rubocop
+  rubocop-bsm
   sqlite3
 
 BUNDLED WITH

data/datadog-notifications.gemspec

@@ -14,10 +14,10 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.test_files    = s.files.grep(%r{^(spec)/})
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.5'
+  s.required_ruby_version = '>= 2.6'
 
   s.add_runtime_dependency 'activesupport'
-  s.add_runtime_dependency 'dogstatsd-ruby', '>= 4.2', '< 5.0'
+  s.add_runtime_dependency 'dogstatsd-ruby', '>= 4.8', '< 5.0'
 
   s.add_development_dependency 'activerecord'
   s.add_development_dependency 'bundler'
@@ -25,6 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop-bsm'
   s.add_development_dependency 'sqlite3'
 end

data/lib/datadog/notifications/plugins/grape.rb

@@ -49,16 +49,16 @@ module Datadog::Notifications::Plugins
 
     def extract_path(endpoint)
       route = begin
-                endpoint.route
-              rescue NoMethodError
-                nil
-              end
+        endpoint.route
+      rescue NoMethodError
+        nil
+      end
       return endpoint.request.path unless route
 
       path = endpoint.route.path.dup
       path.sub!(/\(\.:format\)$/, '')
       path.sub!(':version/', '') if endpoint.version
-      path.gsub!(/:(\w+)/) {|m| m[1..-1].upcase }
+      path.gsub!(/:(\w+)/) {|m| m[1..].upcase }
       path
     end
   end

data/lib/datadog/notifications/version.rb

@@ -1,5 +1,5 @@
 module Datadog
   class Notifications
-    VERSION = '0.6.5'.freeze
+    VERSION = '0.6.6'.freeze
   end
 end

data/spec/datadog/notifications/config_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Datadog::Notifications::Config do
-  it 'should be connect!' do
+  it 'is connect!' do
     subject.reporter = Mock::Reporter
     subject.hostname = 'test.host'
     subject.tags = ['custom:tag']
@@ -12,7 +12,7 @@ describe Datadog::Notifications::Config do
   end
 
   RSpec.shared_examples 'host tag is not picked up' do |hostname|
-    it 'should not pick up the host tag' do
+    it 'does not pick up the host tag' do
       subject.reporter = Mock::Reporter
       subject.hostname = hostname
       subject.tags = ['custom:tag']
@@ -26,7 +26,7 @@ describe Datadog::Notifications::Config do
   include_examples 'host tag is not picked up', false
   include_examples 'host tag is not picked up', 'false'
 
-  it 'should instantiate plugins on use' do
+  it 'instantiates plugins on use' do
     subject.use Datadog::Notifications::Plugins::ActionController
     expect(subject.plugins.size).to eq(1)
     expect(subject.plugins.first).to be_instance_of(Datadog::Notifications::Plugins::ActionController)

data/spec/datadog/notifications/plugins/active_record_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Datadog::Notifications::Plugins::ActiveRecord do
-  it 'should send an increment and timing event for each query' do
+  it 'sends an increment and timing event for each query' do
     Post.all.to_a
     expect(buffered).to eq [
       'activerecord.sql:1|c|#custom:tag,env:test,host:test.host,query:post.load',
@@ -9,7 +9,7 @@ describe Datadog::Notifications::Plugins::ActiveRecord do
     ]
   end
 
-  it 'should support custom queries' do
+  it 'supports custom queries' do
     Post.find_by_sql('SELECT * FROM posts LIMIT 1').to_a
     expect(buffered).to eq [
       'activerecord.sql:1|c|#custom:tag,env:test,host:test.host,query:post.load',

data/spec/datadog/notifications/plugins/grape_spec.rb

@@ -36,7 +36,7 @@ describe Datadog::Notifications::Plugins::Grape do
     end
   end
 
-  it 'should send an increment and timing event for each request' do
+  it 'sends an increment and timing event for each request' do
     get '/echo/1/1234'
     expect(last_response.status).to eq(200)
     expect(last_response.body).to eq('1 1234')
@@ -47,7 +47,7 @@ describe Datadog::Notifications::Plugins::Grape do
     ])
   end
 
-  it 'should support namespaces and versioning' do
+  it 'supports namespaces and versioning' do
     get '/api/v1/sub/versioned.txt'
     expect(last_response.status).to eq(200)
     expect(last_response.body).to eq('OK')
@@ -58,7 +58,7 @@ describe Datadog::Notifications::Plugins::Grape do
     ])
   end
 
-  it 'should support deep nesting' do
+  it 'supports deep nesting' do
     get '/sub/secure/resource'
     expect(last_response.status).to eq(403)
     expect(last_response.body).to eq('forbidden')
@@ -69,7 +69,7 @@ describe Datadog::Notifications::Plugins::Grape do
     ])
   end
 
-  it 'should handle rescued errors' do
+  it 'handles rescued errors' do
     get '/rescued'
     expect(last_response.status).to eq(401)
 
@@ -79,7 +79,7 @@ describe Datadog::Notifications::Plugins::Grape do
     ])
   end
 
-  it 'should handle invalid method' do
+  it 'handles invalid method' do
     post '/rescued'
 
     expect(last_response.status).to eq(405)
@@ -89,7 +89,7 @@ describe Datadog::Notifications::Plugins::Grape do
     ])
   end
 
-  it 'should not report paths on 404s' do
+  it 'does not report paths on 404s' do
     get '/sub/missing'
     expect(last_response.status).to eq(404)
 

data/spec/datadog/notifications_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Datadog::Notifications do
   subject { described_class.instance }
+
   after   { ActiveSupport::Notifications.unsubscribe(subscription) }
 
   let!(:subscription) do
@@ -17,11 +18,11 @@ describe Datadog::Notifications do
     end
   end
 
-  it 'should have a reporter' do
+  it 'has a reporter' do
     expect(subject.send(:reporter)).to be_instance_of(Mock::Reporter)
   end
 
-  it 'should subscribe and report' do
+  it 'subscribes and report' do
     Mock::Instrumentable.new(method: 'GET').perform
     expect(buffered).to eq([
       'web.render:1|c|#custom:tag,env:test,host:test.host,status:200,method:GET',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-notifications
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -129,7 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-bsm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,10 +164,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".rake_tasks~"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - MIT-LICENCE
@@ -202,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.rake_tasks~

@@ -1,9 +0,0 @@
-build
-clean
-clobber
-install
-install:local
-release[remote]
-rubocop
-rubocop:auto_correct
-spec

data/.travis.yml

@@ -1,8 +0,0 @@
-cache: bundler
-language: ruby
-before_install:
-  - gem install bundler
-rvm:
-  - 2.7
-  - 2.6
-  - 2.5