dry-monitor 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ca2399eb8989f99e9840024b317599e731b2e357
-  data.tar.gz: 01e127fab50b60edcc4ac61846907341fd826e23
+SHA256:
+  metadata.gz: b939a7f5ab22ce4c3eccccbcd71346e42facb0f70f2cc047281721fdf681e234
+  data.tar.gz: 965e06b530acc58bf26b94595a345a04cc8a36c7b06851543e59b387da6ad06e
 SHA512:
-  metadata.gz: 5175053c85e8ae01f9892a3e17fe3e2c54820379cfabde8624893ff35833d7aa9c34bc3c1bf741cab7be77fd519fd6c8bc825997934b58506a3769e63d3bc669
-  data.tar.gz: f01dc548ac3b1f02f72d6b5c7ed875b3100e86af9d6168be33b6910c1170979675cd4634e393dc41c53bc404ec947d2e3c38a11b3ae6d0e132b91298d62900fb
+  metadata.gz: '09640a52032db43d45f511c7ddeab320d36174427c4414e013377d5c5091c569f195b187ea8db2228f5a27050ad6f553bdce7da2f8b43cf572f9adb80fdadf01'
+  data.tar.gz: d0074aa61334f545f291e99dcb7a1b9c311e8b3e25f49fa3e0f3bb230f0a8c2653660ab60a5f894e4e7a45c00c1c68644bf196062733cb08690b83a4ebf1da20

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.2.0 2018-01-21
+
+### Changed
+
+* Make `rouge` an optional dependency (davydovanton & mensfeld)
+
 # v0.1.2 2018-01-04
 
 ### Fixed

data/dry-monitor.gemspec

@@ -15,11 +15,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rouge', '~> 2.0', '>= 2.2.1'
   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_development_dependency 'rouge', '~> 2.0', '>= 2.2.1'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

data/lib/dry/monitor/notifications.rb

@@ -3,15 +3,14 @@ require 'dry/events/publisher'
 module Dry
   module Monitor
     class Clock
-      def measure(&block)
+      def measure
         start = current
-        result = block.()
-        stop = current
-        [result, ((stop - start) * 1000).round(2)]
+        result = yield
+        [result, current - start]
       end
 
       def current
-        Time.now
+        Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
       end
     end
 
@@ -37,9 +36,9 @@ module Dry
         instrument(event_id, payload)
       end
 
-      def instrument(event_id, payload = EMPTY_HASH, &block)
-        if block
-          result, time = clock.measure(&block)
+      def instrument(event_id, payload = EMPTY_HASH)
+        if block_given?
+          result, time = @clock.measure { yield }
         end
 
         process(event_id, payload) do |event, listener|

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

@@ -0,0 +1,16 @@
+module Dry
+  module Monitor
+    module SQL
+      module Colorizers
+        class Default
+          def initialize(_theme)
+          end
+
+          def call(string)
+            string
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+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
+
+          def initialize(theme)
+            @formatter = ::Rouge::Formatters::Terminal256.new(theme || ::Rouge::Themes::Gruvbox.new)
+            @lexer = ::Rouge::Lexers::SQL.new
+          end
+
+          def call(string)
+            formatter.format(lexer.lex(string))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 require 'dry-configurable'
-require 'rouge'
+require 'dry/core/extensions'
 require 'dry/monitor/notifications'
 
 module Dry
@@ -8,23 +8,37 @@ module Dry
 
     module SQL
       class Logger
+        extend Dry::Core::Extensions
         extend Dry::Configurable
 
-        setting :theme, Rouge::Themes::Gruvbox.new
-        setting :colorize, true
+        register_extension(:default_colorizer) do
+          require_relative './colorizers/default'
+
+          def colorizer
+            @colorizer ||= Colorizers::Default.new(config.theme)
+          end
+        end
+
+        register_extension(:rouge_colorizer) do
+          require_relative './colorizers/rouge'
+
+          def colorizer
+            @colorizer ||= Colorizers::Rouge.new(config.theme)
+          end
+        end
+
+        setting :theme, nil
         setting :message_template, %(  Loaded %s in %sms %s).freeze
 
         attr_reader :config
         attr_reader :logger
-        attr_reader :formatter
-        attr_reader :lexer
         attr_reader :template
 
+        load_extensions(:default_colorizer)
+
         def initialize(logger, config = self.class.config)
           @logger = logger
           @config = config
-          @formatter = Rouge::Formatters::Terminal256.new(config.theme)
-          @lexer = Rouge::Lexers::SQL.new
           @template = config.message_template
         end
 
@@ -35,13 +49,7 @@ module Dry
         end
 
         def log_query(time, name, query)
-          logger.info template % [name.inspect, time, colorize(query)]
-        end
-
-        private
-
-        def colorize(string)
-          config.colorize ? formatter.format(lexer.lex(string)) : string
+          logger.info template % [name.inspect, time, colorizer.call(query)]
         end
       end
     end

data/lib/dry/monitor/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Monitor
-    VERSION = '0.1.2'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/spec/integration/sql_logger_spec.rb

@@ -33,16 +33,17 @@ RSpec.describe Dry::Monitor::SQL::Logger do
 
   context 'without colors' do
     let(:sql_logger) do
-      Class.new(Dry::Monitor::SQL::Logger) do
-        configure do |config|
-          config.colorize = false
-        end
-      end
+      Dry::Monitor::SQL::Logger.load_extensions(:rouge_colorizer)
+      Dry::Monitor::SQL::Logger
     end
 
     include_context '#subscribe' do
+      let(:colored_query) do
+        "\e[38;5;203mSELECT\e[39m\e[38;5;230m"
+      end
+
       it 'writes sql query in logs' do
-        expect(log_file_content).to include(query)
+        expect(log_file_content).to include(colored_query)
       end
     end
   end

metadata

@@ -1,77 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: dry-monitor
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rouge
+  name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0.2'
   type: :runtime
   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.2'
 - !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-events
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: dry-events
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        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: 2.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +153,8 @@ files:
 - lib/dry/monitor/notifications.rb
 - lib/dry/monitor/rack/logger.rb
 - lib/dry/monitor/rack/middleware.rb
+- lib/dry/monitor/sql/colorizers/default.rb
+- lib/dry/monitor/sql/colorizers/rouge.rb
 - lib/dry/monitor/sql/logger.rb
 - lib/dry/monitor/version.rb
 - rakelib/rubocop.rake
@@ -168,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Monitoring and instrumentation APIs