dry-monitor 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79d679b29fb37de532a1855d9d9225bb1337f9675c93ec509b6ea2f70f2123d7
-  data.tar.gz: 3308df70e50a3d4bf2c95a772846e3c6229ef764d6ec679e5a3760249f48afb6
+  metadata.gz: 34309d32f94041d825568804c30507d69178437c5b433f6aa9628338dd09ad3a
+  data.tar.gz: efbf86392a682aaf4685631c407f8dd92adea9cc151522fa88de139362d7372a
 SHA512:
-  metadata.gz: 2bb851503a4caa35361e751bb68367d71b04d3c005f08d47090cb5646b7756be257ecc7bbaff5b22aff18e7cf34770af3b39b196886bb35d221002c4b6996d31
-  data.tar.gz: e2247a4b41a7430b1a609556aab0dbfca7c0bf7fe115ef19a91c772e3f47707d57aa80bb024ad9bfc222d73d50ddba5904ab08c08ef66505208bcaaf20e43316
+  metadata.gz: cf0da9d876fb8fa59b324f0f9c268860e089f2b630af6e4d4ba4e59da732404fa298832f50a9f61a1052c32562748834ebd8526e97bf8eb68a7e6016caf27446
+  data.tar.gz: 05a53f3834257a284e598027bc653a38cfc09bb421fce97c639a74210b19f2d966f170778e47e0990b3b6632743b927e9b1a768baa03a73a950d080ee62c4574

data/.codeclimate.yml

@@ -0,0 +1,15 @@
+version: "2"
+
+prepare:
+  fetch:
+  - url: "https://raw.githubusercontent.com/dry-rb/devtools/master/.rubocop.yml"
+    path: ".rubocop.yml"
+
+exclude_patterns:
+  - "benchmarks/"
+  - "examples/"
+  - "spec/"
+
+plugins:
+  rubocop:
+    enabled: true

data/.gitignore

@@ -7,3 +7,4 @@ tmp/
 .idea/
 Gemfile.lock
 spec/test_logs/*.log
+.rubocop.yml

data/.rubocop.yml

@@ -1,16 +1,76 @@
-# Generated by `rubocop --auto-gen-config`
-inherit_from: .rubocop_todo.yml
+AllCops:
+  TargetRubyVersion: 2.4
+
+Style/EachWithObject:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: single_quotes
+
+Style/Alias:
+  Enabled: false
+
+Style/LambdaCall:
+  Enabled: false
+
+Style/StabbyLambdaParentheses:
+  Enabled: false
+
+Style/FormatString:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Layout/SpaceInLambdaLiteral:
+  Enabled: false
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
 
 Metrics/LineLength:
   Max: 100
 
-Style/Documentation:
+Metrics/MethodLength:
+  Max: 22
+
+Metrics/ClassLength:
+  Max: 150
+
+Metrics/AbcSize:
+  Max: 20
+
+Metrics/BlockLength:
+  Enabled: true
+  Exclude:
+    - 'spec/**/*_spec.rb'
+
+Metrics/CyclomaticComplexity:
+  Enabled: true
+  Max: 10
+
+Lint/BooleanSymbol:
   Enabled: false
 
+Style/AccessModifierDeclarations:
+  Enabled: false
+
+Style/BlockDelimiters:
+  Enabled: false
+
+Layout/IndentFirstArrayElement:
+  EnforcedStyle: consistent
+
+Style/ClassAndModuleChildren:
+  Exclude:
+    - 'spec/**/*_spec.rb'
+
 Lint/HandleExceptions:
   Exclude:
-    - rakelib/*.rake
+    - 'spec/spec_helper.rb'
 
-Style/FileName:
+Naming/FileName:
   Exclude:
-    - lib/dry-logic.rb
+    - 'lib/dry-*.rb'

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 cache: bundler
-sudo: false
 bundler_args: --without benchmarks tools
 before_install: gem update --system
 before_script:
@@ -12,11 +11,10 @@ after_script:
 script:
   - bundle exec rake ci
 rvm:
-  - 2.6.0
-  - 2.5.3
-  - 2.4.5
-  - 2.3.8
-  - jruby-9.2.5.0
+  - 2.6.3
+  - 2.5.5
+  - 2.4.6
+  - jruby-9.2.7.0
 env:
   global:
     - COVERAGE=true

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.3.1 2019-06-18
+
+### Fixed
+
+* Uninitialized constant `Dry::Monitor::Notifications::EMPTY_HASH` when no payload given (@mensfeld)
+
 # v0.3.0 2019-01-29
 
 ### Fixed

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -1,6 +1,5 @@
 [gem]: https://rubygems.org/gems/dry-monitor
 [travis]: https://travis-ci.org/dry-rb/dry-monitor
-[gemnasium]: https://gemnasium.com/dry-rb/dry-monitor
 [codeclimate]: https://codeclimate.com/github/dry-rb/dry-monitor
 [coveralls]: https://coveralls.io/r/dry-rb/dry-monitor
 [inchpages]: http://inch-ci.org/github/dry-rb/dry-monitor
@@ -9,7 +8,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/dry-monitor.svg)][gem]
 [![Build Status](https://travis-ci.org/dry-rb/dry-monitor.svg?branch=master)][travis]
-[![Dependency Status](https://gemnasium.com/dry-rb/dry-monitor.svg)][gemnasium]
 [![Code Climate](https://codeclimate.com/github/dry-rb/dry-monitor/badges/gpa.svg)][codeclimate]
 [![Test Coverage](https://codeclimate.com/github/dry-rb/dry-monitor/badges/coverage.svg)][codeclimate]
 [![Inline docs](http://inch-ci.org/github/dry-rb/dry-monitor.svg?branch=master)][inchpages]

data/Rakefile

@@ -1,4 +1,6 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))

data/dry-monitor.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-require File.expand_path('../lib/dry/monitor/version', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('lib/dry/monitor/version', __dir__)
 
 Gem::Specification.new do |spec|
   spec.name          = 'dry-monitor'
@@ -15,13 +16,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
   spec.add_runtime_dependency 'dry-configurable', '~> 0.5'
-  spec.add_runtime_dependency 'dry-events', '~> 0.1'
   spec.add_runtime_dependency 'dry-core', '~> 0.4'
+  spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
+  spec.add_runtime_dependency 'dry-events', '~> 0.1'
 
-  spec.add_development_dependency 'rouge', '~> 2.0', '>= 2.2.1'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rouge', '~> 2.0', '>= 2.2.1'
   spec.add_development_dependency 'rspec'
 end

data/lib/dry-monitor.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'dry/monitor'

data/lib/dry/monitor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/monitor/logger'
 require 'dry/monitor/notifications'
 require 'dry/core/extensions'

data/lib/dry/monitor/constants.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'dry/core/constants'
+
+module Dry
+  module Monitor
+    include Dry::Core::Constants
+  end
+end

data/lib/dry/monitor/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logger'
 
 module Dry
@@ -5,7 +7,7 @@ module Dry
     class Logger < ::Logger
       def initialize(*args)
         super
-        self.formatter = proc do |severity, datetime, progname, msg|
+        self.formatter = proc do |_severity, _datetime, _progname, msg|
           "#{msg}\n"
         end
       end

data/lib/dry/monitor/notifications.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'dry/events/publisher'
+require 'dry/monitor/constants'
 
 module Dry
   module Monitor
@@ -37,9 +40,7 @@ module Dry
       end
 
       def instrument(event_id, payload = EMPTY_HASH)
-        if block_given?
-          result, time = @clock.measure { yield }
-        end
+        result, time = @clock.measure { yield } if block_given?
 
         process(event_id, payload) do |event, listener|
           if time

data/lib/dry/monitor/rack/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/configurable'
 require 'dry/monitor/rack/middleware'
 
@@ -9,15 +11,15 @@ module Dry
 
         setting :filtered_params, %w[_csrf password]
 
-        REQUEST_METHOD = 'REQUEST_METHOD'.freeze
-        PATH_INFO = 'PATH_INFO'.freeze
-        REMOTE_ADDR = 'REMOTE_ADDR'.freeze
-        QUERY_STRING = 'QUERY_STRING'.freeze
+        REQUEST_METHOD = 'REQUEST_METHOD'
+        PATH_INFO = 'PATH_INFO'
+        REMOTE_ADDR = 'REMOTE_ADDR'
+        QUERY_STRING = 'QUERY_STRING'
 
-        START_MSG = %(Started %s "%s" for %s at %s).freeze
-        STOP_MSG = %(Finished %s "%s" for %s in %sms [Status: %s]\n).freeze
-        QUERY_MSG = %(  Query parameters %s).freeze
-        FILTERED = '[FILTERED]'.freeze
+        START_MSG = %(Started %s "%s" for %s at %s)
+        STOP_MSG = %(Finished %s "%s" for %s in %sms [Status: %s]\n)
+        QUERY_MSG = %(  Query parameters %s)
+        FILTERED = '[FILTERED]'
 
         attr_reader :logger
 
@@ -42,29 +44,29 @@ module Dry
           end
         end
 
-        def log_exception(e)
-          logger.error e.message
-          logger.error filter_backtrace(e.backtrace).join("\n")
+        def log_exception(err)
+          logger.error err.message
+          logger.error filter_backtrace(err.backtrace).join("\n")
         end
 
         def log_start_request(request)
           info START_MSG % [
-                 request[REQUEST_METHOD],
-                 request[PATH_INFO],
-                 request[REMOTE_ADDR],
-                 Time.now
-               ]
+            request[REQUEST_METHOD],
+            request[PATH_INFO],
+            request[REMOTE_ADDR],
+            Time.now
+          ]
           log_request_params(request)
         end
 
         def log_stop_request(request, status, time)
           info STOP_MSG % [
-                 request[REQUEST_METHOD],
-                 request[PATH_INFO],
-                 request[REMOTE_ADDR],
-                 time,
-                 status
-               ]
+            request[REQUEST_METHOD],
+            request[PATH_INFO],
+            request[REMOTE_ADDR],
+            time,
+            status
+          ]
         end
 
         def log_request_params(request)
@@ -80,9 +82,7 @@ module Dry
         def with_http_params(params)
           params = ::Rack::Utils.parse_nested_query(params)
 
-          if params.size > 0
-            yield(filter_params(params))
-          end
+          yield(filter_params(params)) unless params.empty?
         end
 
         def filter_backtrace(backtrace)

data/lib/dry/monitor/rack/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/monitor/notifications'
 
 module Dry

data/lib/dry/monitor/sql/colorizers/default.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 module Dry
   module Monitor
     module SQL
       module Colorizers
         class Default
-          def initialize(_theme)
-          end
+          def initialize(_theme); end
 
           def call(string)
             string

data/lib/dry/monitor/sql/colorizers/rouge.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rouge/util'
 require 'rouge/token'
 require 'rouge/theme'

data/lib/dry/monitor/sql/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry-configurable'
 require 'dry/core/extensions'
 require 'dry/monitor/notifications'
@@ -28,7 +30,7 @@ module Dry
         end
 
         setting :theme, nil
-        setting :message_template, %(  Loaded %s in %sms %s).freeze
+        setting :message_template, %(  Loaded %s in %sms %s)
 
         attr_reader :config
         attr_reader :logger

data/lib/dry/monitor/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Dry
   module Monitor
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.3.1'
   end
 end

data/rakelib/rubocop.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'rubocop/rake_task'
 

data/spec/integration/instrumentation_spec.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 RSpec.describe 'Subscribing to instrumentation events' do
   subject(:notifications) { Dry::Monitor::Notifications.new(:app) }
 
   before do
-    Dry::Monitor::Notifications.register_event(:sql, { name: 'rom[sql]' })
+    Dry::Monitor::Notifications.register_event(:sql, name: 'rom[sql]')
   end
 
   describe '#instrument' do
@@ -33,5 +35,17 @@ RSpec.describe 'Subscribing to instrumentation events' do
 
       expect(captured).to eql([[:sql, 'SELECT 1 FROM users']])
     end
+
+    it 'allows instrumenting via block when no payload given' do
+      captured = []
+
+      notifications.subscribe(:sql) do |event|
+        captured << [event.id]
+      end
+
+      notifications.instrument(:sql) {}
+
+      expect(captured).to eql([[:sql]])
+    end
   end
 end

data/spec/integration/logger_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Dry::Monitor::Logger do
   subject(:logger) do
     Dry::Monitor::Logger.new($stdout)

data/spec/integration/rack_middleware_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Dry::Monitor::Rack::Middleware do
   subject(:middleware) { Dry::Monitor::Rack::Middleware.new(notifications).new(rack_app) }
 
@@ -26,16 +28,16 @@ RSpec.describe Dry::Monitor::Rack::Middleware do
 
   let(:query_params) do
     %w[
-        _csrf=123456
-        password=secret
-        user[password]=secret
-        others[][password]=secret1
-        others[][password]=secret2
-        foo=bar
-        one=1
-        ids[]=1
-        ids[]=2
-      ].join('&')
+      _csrf=123456
+      password=secret
+      user[password]=secret
+      others[][password]=secret1
+      others[][password]=secret2
+      foo=bar
+      one=1
+      ids[]=1
+      ids[]=2
+    ].join('&')
   end
 
   describe '#call' do

data/spec/integration/sql_logger_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Dry::Monitor::SQL::Logger do
   subject(:logger) { sql_logger.new(Dry::Monitor::Logger.new(log_file_path)) }
 

data/spec/spec_helper.rb

@@ -1,14 +1,21 @@
-if RUBY_ENGINE == 'ruby' && ENV['CI'] == 'true'
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter '/spec/'
+# frozen_string_literal: true
+
+if RUBY_ENGINE == 'ruby' && ENV['COVERAGE'] == 'true'
+  require 'yaml'
+  rubies = YAML.safe_load(File.read(File.join(__dir__, '..', '.travis.yml')))['rvm']
+  latest_mri = rubies.select { |v| v =~ /\A\d+\.\d+.\d+\z/ }.max
+
+  if RUBY_VERSION == latest_mri
+    require 'simplecov'
+    SimpleCov.start do
+      add_filter '/spec/'
+    end
   end
 end
 
 begin
   require 'byebug'
 rescue LoadError; end
-
 require 'dry-monitor'
 Dry::Monitor.load_extensions(:sql, :rack)
 
@@ -17,6 +24,4 @@ SPEC_ROOT = Pathname(__dir__)
 Dir[SPEC_ROOT.join('shared/**/*.rb')].each(&method(:require))
 Dir[SPEC_ROOT.join('support/**/*.rb')].each(&method(:require))
 
-RSpec.configure do |config|
-  config.disable_monkey_patching!
-end
+RSpec.configure(&:disable_monkey_patching!)

metadata

@@ -1,93 +1,87 @@
 --- !ruby/object:Gem::Specification
 name: dry-monitor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-equalizer
+  name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: dry-configurable
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: dry-events
+  name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: dry-core
+  name: dry-events
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rouge
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,19 +95,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -135,10 +135,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -149,6 +149,7 @@ files:
 - dry-monitor.gemspec
 - lib/dry-monitor.rb
 - lib/dry/monitor.rb
+- lib/dry/monitor/constants.rb
 - lib/dry/monitor/logger.rb
 - lib/dry/monitor/notifications.rb
 - lib/dry/monitor/rack/logger.rb
@@ -183,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Monitoring and instrumentation APIs

data/.rubocop_todo.yml

@@ -1,7 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2015-10-30 01:32:46 +0000 using RuboCop version 0.34.2.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.