dry-monitor 0.3.0 → 0.5.0

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

@@ -1,4 +1,6 @@
-require 'dry/monitor/notifications'
+# frozen_string_literal: true
+
+require "dry/monitor/notifications"
 
 module Dry
   module Monitor
@@ -12,15 +14,13 @@ module Dry
         Notifications.register_event(REQUEST_STOP)
         Notifications.register_event(REQUEST_ERROR)
 
-        attr_reader :app
-
-        attr_reader :notifications
+        attr_reader :app, :notifications
 
         def initialize(*args)
           @notifications, @app = *args
         end
 
-        def new(app)
+        def new(app, *_args, &_block)
           self.class.new(notifications, app)
         end
 

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,20 +1,21 @@
-require 'rouge/util'
-require 'rouge/token'
-require 'rouge/theme'
-require 'rouge/themes/gruvbox'
-require 'rouge/formatter'
-require 'rouge/formatters/terminal256'
-require 'rouge/lexer'
-require 'rouge/regex_lexer'
-require 'rouge/lexers/sql'
+# frozen_string_literal: true
+
+require "rouge/util"
+require "rouge/token"
+require "rouge/theme"
+require "rouge/themes/gruvbox"
+require "rouge/formatter"
+require "rouge/formatters/terminal256"
+require "rouge/lexer"
+require "rouge/regex_lexer"
+require "rouge/lexers/sql"
 
 module Dry
   module Monitor
     module SQL
       module Colorizers
         class Rouge
-          attr_reader :formatter
-          attr_reader :lexer
+          attr_reader :formatter, :lexer
 
           def initialize(theme)
             @formatter = ::Rouge::Formatters::Terminal256.new(theme || ::Rouge::Themes::Gruvbox.new)

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

@@ -1,6 +1,8 @@
-require 'dry-configurable'
-require 'dry/core/extensions'
-require 'dry/monitor/notifications'
+# frozen_string_literal: true
+
+require "dry-configurable"
+require "dry/core/extensions"
+require "dry/monitor/notifications"
 
 module Dry
   module Monitor
@@ -12,27 +14,33 @@ module Dry
         extend Dry::Configurable
 
         register_extension(:default_colorizer) do
-          require_relative './colorizers/default'
+          require_relative "./colorizers/default"
 
-          def colorizer
-            @colorizer ||= Colorizers::Default.new(config.theme)
+          module DefaultColorizer
+            def colorizer
+              @colorizer ||= Colorizers::Default.new(config.theme)
+            end
           end
+
+          Logger.include(DefaultColorizer)
         end
 
         register_extension(:rouge_colorizer) do
-          require_relative './colorizers/rouge'
+          require_relative "./colorizers/rouge"
 
-          def colorizer
-            @colorizer ||= Colorizers::Rouge.new(config.theme)
+          module RougeColorizer
+            def colorizer
+              @colorizer ||= Colorizers::Rouge.new(config.theme)
+            end
           end
+
+          Logger.include(RougeColorizer)
         end
 
-        setting :theme, nil
-        setting :message_template, %(  Loaded %s in %sms %s).freeze
+        setting :theme
+        setting :message_template, default: %(  Loaded %s in %sms %s)
 
-        attr_reader :config
-        attr_reader :logger
-        attr_reader :template
+        attr_reader :config, :logger, :template
 
         load_extensions(:default_colorizer)
 
@@ -43,12 +51,10 @@ module Dry
         end
 
         def subscribe(notifications)
-          notifications.subscribe(:sql) do |time:, name:, query:|
-            log_query(time, name, query)
-          end
+          notifications.subscribe(:sql) { |params| log_query(**params) }
         end
 
-        def log_query(time, name, query)
+        def log_query(time:, name:, query:)
           logger.info template % [name.inspect, time, colorizer.call(query)]
         end
       end

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.5.0"
   end
 end

data/lib/dry/monitor.rb

@@ -1,18 +1,20 @@
-require 'dry/monitor/logger'
-require 'dry/monitor/notifications'
-require 'dry/core/extensions'
+# frozen_string_literal: true
+
+require "dry/monitor/logger"
+require "dry/monitor/notifications"
+require "dry/core/extensions"
 
 module Dry
   module Monitor
     extend Dry::Core::Extensions
 
     register_extension(:rack) do
-      require 'rack/utils'
-      require 'dry/monitor/rack/logger'
+      require "rack/utils"
+      require "dry/monitor/rack/logger"
     end
 
     register_extension(:sql) do
-      require 'dry/monitor/sql/logger'
+      require "dry/monitor/sql/logger"
     end
   end
 end

data/lib/dry-monitor.rb

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

metadata

@@ -1,93 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: dry-monitor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2021-09-12 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.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
-  name: dry-configurable
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: dry-events
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !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.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.2'
 - !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 +93,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
@@ -128,27 +126,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: Monitoring and instrumentation APIs
 email:
 - piotr.solnica@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - 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
@@ -157,17 +148,14 @@ files:
 - lib/dry/monitor/sql/colorizers/rouge.rb
 - lib/dry/monitor/sql/logger.rb
 - lib/dry/monitor/version.rb
-- rakelib/rubocop.rake
-- spec/integration/instrumentation_spec.rb
-- spec/integration/logger_spec.rb
-- spec/integration/rack_middleware_spec.rb
-- spec/integration/sql_logger_spec.rb
-- spec/spec_helper.rb
-- spec/test_logs/.gitkeep
-homepage: https://github.com/dry-rb/dry-monitor
+homepage: https://dry-rb.org/gems/dry-monitor
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/dry-rb/dry-monitor/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/dry-rb/dry-monitor
+  bug_tracker_uri: https://github.com/dry-rb/dry-monitor/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -176,21 +164,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Monitoring and instrumentation APIs
-test_files:
-- spec/integration/instrumentation_spec.rb
-- spec/integration/logger_spec.rb
-- spec/integration/rack_middleware_spec.rb
-- spec/integration/sql_logger_spec.rb
-- spec/spec_helper.rb
-- spec/test_logs/.gitkeep
+test_files: []

data/.gitignore

@@ -1,9 +0,0 @@
-.DS_Store
-coverage
-/.bundle
-vendor/bundle
-bin/
-tmp/
-.idea/
-Gemfile.lock
-spec/test_logs/*.log

data/.rspec

@@ -1,3 +0,0 @@
---color
---require spec_helper
---order random

data/.rubocop.yml

@@ -1,16 +0,0 @@
-# Generated by `rubocop --auto-gen-config`
-inherit_from: .rubocop_todo.yml
-
-Metrics/LineLength:
-  Max: 100
-
-Style/Documentation:
-  Enabled: false
-
-Lint/HandleExceptions:
-  Exclude:
-    - rakelib/*.rake
-
-Style/FileName:
-  Exclude:
-    - lib/dry-logic.rb