sapience 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 242e44a2d89e27ec8aa394c77164599aaea34da7
-  data.tar.gz: dc875d0fd20dc77d838e67e7d7e1052efae3102f
+  metadata.gz: 9c4aff2ff662827ad5cab7dce5d905985bcf2e05
+  data.tar.gz: 16955d4a9f3b194b9ec59a10f854657a6433f014
 SHA512:
-  metadata.gz: ae00691b82ab10345121193832cb0a2f9616d7a78ac86abfae1b1982c8a3d7474f44960b8e5d114b61c4fe3d48df18112c3ab6dd7bf02f642161023862f19b84
-  data.tar.gz: bb38d039a741e6f92371735fafa2f29cdade79aa43c755c8137c0b2d08d60f3db51fc9fb5eee5acd2c30380f9a01ef629b555cea54285192afa67f92be99ce9d
+  metadata.gz: 4d1218d578d34186e838e7ae36e482a215d27086e9e069399805c718ce9bc76314d79ed2d1da16bcc462fccb9aeb4647a090443de30263570bc1f04f08adca5f
+  data.tar.gz: 2b874e89fe7cc09ed5e7b632d695b34b4cd590aa46714cb4561bb973d8e66a5ae70e21ac861faf6ad8651845438a8e4bad5a490f6d9799e3e95bf8303643118e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v2.5.0
+
+- Bump Ruby to version 2.3.4
+- Add fronzen_string_literal: true to be compatible with coming Ruby 3
+- Reevoocop changes
+
 ## v2.4.0
 
 - Add shortcut metrics

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in sapience.gemspec

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 load "lib/tasks/coverage.rake"

data/lib/sapience/ansi_colors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   # Formatting & colors used by optional color formatter
   module AnsiColors
@@ -21,7 +22,7 @@ module Sapience
       warn:  BOLD,
       error: RED,
       fatal: RED,
-    }
+    }.freeze
   end
 
 end

data/lib/sapience/appender/stream.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Stream appender
 #
 #   Writes log messages to a file or open IO stream
@@ -5,7 +6,7 @@
 module Sapience
   module Appender
     class Stream < Sapience::Subscriber
-      VALIDATION_MESSAGE = "stream is not writable".freeze
+      VALIDATION_MESSAGE = "stream is not writable"
       # Create a Stream Logger appender instance.
       #
       # Parameters
@@ -58,7 +59,6 @@ module Sapience
       #
       #    logger =  Sapience['test']
       #    logger.info 'Hello World'
-      # rubocop:disable AbcSize, CyclomaticComplexity, PerceivedComplexity
       def initialize(options = {}, &block)
         unless options[:io] || options[:file_name]
           fail ArgumentError, "missing mandatory argument :file_name or :io"
@@ -115,7 +115,7 @@ module Sapience
         # Since only one appender thread will be writing to the file at a time
         # it is not necessary to protect access to the file with a semaphore
         # Allow this logger to filter out log levels lower than it's own
-        @log.write(formatter.call(log, self) << "\n")
+        @log.write(+formatter.call(log, self) << "\n")
         true
       end
 

data/lib/sapience/appender/wrapper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Send log messages to any standard Ruby logging class.
 #
 #  Forwards logging call to loggers such as Logger, log4r, etc.

data/lib/sapience/appender.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   module Appender
 

data/lib/sapience/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   # rubocop:disable ClassLength
   class Base
@@ -75,7 +76,7 @@ module Sapience
     end
 
     # :nodoc:
-    alias_method :with_tags, :tagged
+    alias with_tags tagged
 
     # :nodoc:
     def tags
@@ -86,7 +87,7 @@ module Sapience
     def push_tags(*tags)
       Sapience.push_tags(*tags)
     end
-    alias_method :tags=, :push_tags
+    alias tags= push_tags
 
     # :nodoc:
     def pop_tags(quantity = 1)
@@ -268,7 +269,7 @@ module Sapience
           return false if duration <= min_duration
           log.duration = duration
         end
-        log.payload = payload if payload.size > 0
+        log.payload = payload unless payload.empty?
       end
       self.log(log) if include_message?(log)
     end
@@ -280,7 +281,7 @@ module Sapience
       merged_tags = tags.dup
       if payload.is_a?(Hash)
         payload_tags = payload.delete(:tags) || []
-        merged_tags.concat(payload_tags) if payload_tags.size > 0
+        merged_tags.concat(payload_tags) unless payload_tags.empty?
       end
       merged_tags.uniq
     end
@@ -297,6 +298,7 @@ module Sapience
     # Measure the supplied block and log the message
     # rubocop:disable AbcSize, PerceivedComplexity, CyclomaticComplexity, LineLength
     def measure_internal(level, index, message, params)
+      params.dup
       start     = Time.now
       exception = nil
       begin

data/lib/sapience/concerns/compatibility.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # :nodoc:
 module Sapience
   # :nodoc:
@@ -29,12 +30,10 @@ module Sapience
       end
 
       # :nodoc:
-      def close
-      end
+      def close; end
 
       # :nodoc:
-      def reopen(_logdev = nil)
-      end
+      def reopen(_logdev = nil); end
 
       # :nodoc:
       def add(severity, message = nil, progname = nil, &block)

data/lib/sapience/config_loader.rb

@@ -12,7 +12,7 @@ module Sapience
   # during a run of the sapience program, if files in several
   # directories are inspected.
   module ConfigLoader
-    SAPIENCE_FILE = "sapience.yml".freeze
+    SAPIENCE_FILE = "sapience.yml"
     SAPIENCE_HOME = File.realpath(File.join(File.dirname(__FILE__), "..", ".."))
     DEFAULT_FILE  = File.join(SAPIENCE_HOME, "config", "default.yml")
 
@@ -24,7 +24,7 @@ module Sapience
 
     def self.merge_configs(left_config = {}, right_config = {})
       left_config.each do |key, config = {}|
-        right = right_config.fetch(key) { Hash.new }
+        right = right_config.fetch(key) { {} }
         config.merge!(right)
       end
 
@@ -78,7 +78,7 @@ module Sapience
             YAML.safe_load(yaml_code, [Regexp], [], false, filename)
           end
         else
-          YAML.load(yaml_code, filename)
+          YAML.safe_load(yaml_code, filename)
         end
       end
     end

data/lib/sapience/configuration.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "ostruct"
 
 module Sapience
@@ -23,10 +24,10 @@ module Sapience
     # Initial default Level for all new instances of Sapience::Logger
     def initialize(options = {}) # rubocop:disable AbcSize
       fail ArgumentError, "options need to be a hash #{options.inspect}" unless options.is_a?(Hash)
-      @options             = DEFAULT.merge(options.dup.deep_symbolize_keyz!)
+      @options = DEFAULT.merge(options.dup.deep_symbolize_keyz!)
       @options[:log_executor] &&= @options[:log_executor].to_sym
       validate_log_executor!(@options[:log_executor])
-      self.default_level           = @options[:log_level].to_sym
+      self.default_level = @options[:log_level].to_sym
       self.backtrace_level   = @options[:log_level].to_sym
       self.host              = @options[:host]
       self.app_name          = @options[:app_name]
@@ -52,7 +53,7 @@ module Sapience
 
     # Internal method to return the log level as an internal index
     # Also supports mapping the ::Logger levels to Sapience levels
-    def level_to_index(level) # rubocop:disable AbcSize, PerceivedComplexity, CyclomaticComplexity
+    def level_to_index(level)
       return if level.nil?
 
       case level
@@ -90,7 +91,6 @@ module Sapience
       Thread.current[:sapience_silence] || @default_level_index
     end
 
-
     # Sets the level at which backtraces should be captured
     # for every log message.
     #

data/lib/sapience/core_ext/hash.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
 class Hash
   # Returns a Hash with all keys symbolized
   def deep_symbolize_keyz!
     deep_transform_keyz! { |key| key.to_sym rescue key } # rubocop:disable RescueModifier
   end
-  alias_method :deep_symbolize_keys!, :deep_symbolize_keyz!
+  alias deep_symbolize_keys! deep_symbolize_keyz!
 
   def deep_transform_keyz!(&block)
     _deep_transform_keyz_in_object!(self, &block)
   end
-  alias_method :deep_transform_keys!, :deep_transform_keyz!
+  alias deep_transform_keys! deep_transform_keyz!
 
   def _deep_transform_keyz_in_object!(object, &block)
     case object
@@ -24,5 +25,5 @@ class Hash
       object
     end
   end
-  alias_method :_deep_transform_keys_in_object!, :_deep_transform_keyz_in_object!
+  alias _deep_transform_keys_in_object! _deep_transform_keyz_in_object!
 end

data/lib/sapience/core_ext/symbol.rb

@@ -1,15 +1,18 @@
+# frozen_string_literal: true
 class Symbol
-  def camelize(uppercase_first_letter = true)
-    string = to_s
-    string = if uppercase_first_letter
-               string.sub(/^[a-z\d]*/) { $&.capitalize }
-             else
-               string.sub(/^(?:(?=\b|[A-Z_])|\w)/) { $&.downcase }
-             end
-    string.gsub!(/(?:_|(\/))([a-z\d]*)/i) do
-      "#{Regexp.last_match(1)}#{Regexp.last_match(2).capitalize}"
+  unless :sym.respond_to?(:camelize)
+    def camelize(uppercase_first_letter = true)
+      string = to_s
+      string = if uppercase_first_letter
+                 string.sub(/^[a-z\d]*/) { $&.capitalize }
+               else
+                 string.sub(/^(?:(?=\b|[A-Z_])|\w)/) { $&.downcase }
+               end
+      string.gsub!(/(?:_|(\/))([a-z\d]*)/i) do
+        "#{Regexp.last_match(1)}#{Regexp.last_match(2).capitalize}"
+      end
+      string.gsub!(/\//, "::")
+      string
     end
-    string.gsub!(/\//, "::")
-    string
-  end unless :sym.respond_to?(:camelize)
+  end
 end

data/lib/sapience/core_ext/thread.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "thread"
 
 class Thread

data/lib/sapience/descendants.rb

@@ -1,5 +1,5 @@
+# frozen_string_literal: true
 module Sapience
-  # rubocop:disable ClassVars
   module Descendants
     def descendants # :nodoc:
       descendants = []

data/lib/sapience/error_handler/sentry.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require "sentry-raven"
 rescue LoadError
@@ -9,11 +10,10 @@ end
 # Example:
 #   Sapience.add_appender(:stream, {io: STDOUT, formatter: :color})
 #
-# rubocop:disable Style/ClassAndModuleChildren
 module Sapience
   class ErrorHandler
     class Sentry < Sapience::ErrorHandler
-      VALIDATION_MESSAGE = "DSN is not valid, please add appender with :dsn key or set SENTRY_DSN".freeze
+      VALIDATION_MESSAGE = "DSN is not valid, please add appender with :dsn key or set SENTRY_DSN"
       URI_REGEXP = URI::DEFAULT_PARSER.regexp[:ABS_URI]
       #
       #   level: [:trace | :debug | :info | :warn | :error | :fatal]
@@ -52,7 +52,7 @@ module Sapience
       def tags_context(options = {})
         Raven.tags_context(options)
       end
-      alias_method :tags=, :tags_context
+      alias tags= tags_context
 
       def configured?
         @configured == true
@@ -119,7 +119,6 @@ module Sapience
         (@sentry_dsn || ENV["SENTRY_DSN"]).to_s
       end
 
-
       # Sapience logger
       def sentry_logger
         @sentry_logger ||= begin

data/lib/sapience/error_handler/silent.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   class ErrorHandler
     class Silent < Sapience::ErrorHandler
@@ -24,7 +25,7 @@ module Sapience
       def capture(_options: {})
         nil
       end
-      alias_method :capture!, :capture
+      alias capture! capture
 
       def user_context(_options = {})
         nil

data/lib/sapience/error_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   class ErrorHandler
     extend Sapience::Descendants

data/lib/sapience/extensions/action_cable/tagged_logger_proxy.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 class ActionCable::Connection::TaggedLoggerProxy # rubocop:disable ClassAndModuleChildren
-  alias_method :orig_tag, :tag
+  alias orig_tag tag
 
   def tag(logger, &block)
     current_tags = tags - logger.tags

data/lib/sapience/extensions/action_controller/live.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Log actual exceptions, not a string representation
 
 module ActionController::Live # rubocop:disable ClassAndModuleChildren

data/lib/sapience/extensions/action_controller/log_subscriber.rb

@@ -1,20 +1,21 @@
+# frozen_string_literal: true
 require "action_controller/log_subscriber"
 
 module Sapience
   module Extensions
     module ActionController
-      class LogSubscriber < ::ActionController::LogSubscriber # rubocop:disable ClassLength
-        alias_method :orig_start_processing, :start_processing
-        alias_method :orig_process_action, :process_action
+      class LogSubscriber < ::ActionController::LogSubscriber
+        alias orig_start_processing start_processing
+        alias orig_process_action process_action
 
         # Log as debug to hide Processing messages in production
         def start_processing(event)
           debug { "Processing ##{event.payload[:action]}" }
         end
 
-        def process_action(event) # rubocop:disable AbcSize, CyclomaticComplexity, PerceivedComplexity
+        def process_action(event)
           return unless logger.info?
-          data      = request(event.payload)
+          data = request(event.payload)
           data.merge! request_id(event)
           data.merge! runtimes(event)
           data.merge! exception(event.payload)

data/lib/sapience/extensions/action_controller/notifications.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   module Extensions
     module ActionController

data/lib/sapience/extensions/action_dispatch/debug_exceptions.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 # Log actual exceptions, not a string representation
 
 class ActionDispatch::DebugExceptions # rubocop:disable ClassAndModuleChildren
   private
 
-  alias_method :orig_log_error, :log_error
+  alias orig_log_error log_error
 
   def log_error(_request, wrapper)
     ActiveSupport::Deprecation.silence do

data/lib/sapience/extensions/action_view/log_subscriber.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "action_view/log_subscriber"
 
 module Sapience

data/lib/sapience/extensions/action_view/streaming_template_renderer.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 # Log actual exceptions, not a string representation
 
 class ActionView::StreamingTemplateRenderer # rubocop:disable ClassAndModuleChildren
   class Body
     private
 
-    alias_method :log_error_original, :log_error
+    alias log_error_original log_error
 
     def log_error(exception) #:nodoc:
       ActionView::Base.logger.fatal(exception)

data/lib/sapience/extensions/active_job/logging.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Patch ActiveJob logger
 require "active_job/logging"
 
@@ -6,7 +7,7 @@ module ActiveJob::Logging # rubocop:disable ClassAndModuleChildren
 
   private
 
-  alias_method :orig_tag_logger, :tag_logger
+  alias orig_tag_logger tag_logger
 
   def tag_logger(*tags, &block)
     logger.tagged(*tags, &block)

data/lib/sapience/extensions/active_job/notifications.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   module Extensions
     module ActiveJob

data/lib/sapience/extensions/active_model_serializers/logging.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Patch ActiveModelSerializers logger
 
 require "active_model_serializers/logging"
@@ -9,7 +10,7 @@ module ActiveModelSerializers::Logging # rubocop:disable ClassAndModuleChildren
 
   private
 
-  alias_method :orig_tag_logger, :tag_logger
+  alias orig_tag_logger tag_logger
 
   def tag_logger(*tags, &block)
     logger.tagged(*tags, &block)

data/lib/sapience/extensions/active_record/log_subscriber.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_support/notifications"
 require "active_record/log_subscriber"
 
@@ -11,14 +12,14 @@ module Sapience
           event = normalize(event)
           debug(event) if logger && event
         end
-        alias_method :sql, :identity
+        alias sql identity
 
         private
 
         def normalize(event)
           data = event.payload
 
-          return if "SCHEMA" == data[:name]
+          return if data[:name] == "SCHEMA"
 
           data.merge! runtimes(event)
           data.merge! extract_sql(data)

data/lib/sapience/extensions/active_record/model_metrics.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   module Extensions
     module ActiveRecord
@@ -9,23 +10,29 @@ module Sapience
             const_set(:SAPIENCE_MODEL_UPDATE_METRICS_KEY,  "model.#{tableized_name}.update")
             const_set(:SAPIENCE_MODEL_DESTROY_METRICS_KEY, "model.#{tableized_name}.destroy")
 
-            before_create do
-              Sapience.metrics.increment(self.class.const_get(:SAPIENCE_MODEL_CREATE_METRICS_KEY))
-            end if respond_to?(:before_create)
+            if respond_to?(:before_create)
+              before_create do
+                Sapience.metrics.increment(self.class.const_get(:SAPIENCE_MODEL_CREATE_METRICS_KEY))
+              end
+            end
 
-            before_update do
-              Sapience.metrics.increment(self.class.const_get(:SAPIENCE_MODEL_UPDATE_METRICS_KEY))
-            end if respond_to?(:before_update)
+            if respond_to?(:before_update)
+              before_update do
+                Sapience.metrics.increment(self.class.const_get(:SAPIENCE_MODEL_UPDATE_METRICS_KEY))
+              end
+            end
 
-            before_destroy do
-              Sapience.metrics.increment(self.class.const_get(:SAPIENCE_MODEL_DESTROY_METRICS_KEY))
-            end if respond_to?(:before_destroy)
+            if respond_to?(:before_destroy)
+              before_destroy do
+                Sapience.metrics.increment(self.class.const_get(:SAPIENCE_MODEL_DESTROY_METRICS_KEY))
+              end
+            end
           end
         end
 
         module ClassMethods
           def tableized_name
-            @tableized_name ||= name.tableize.singularize.gsub("/", ".")
+            @tableized_name ||= name.tableize.singularize.tr("/", ".")
           end
         end
 

data/lib/sapience/extensions/active_record/notifications.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   module Extensions
     module ActiveRecord

data/lib/sapience/extensions/grape/middleware/logging.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "grape/middleware/base"
 require_relative "../request_format_helper"
 
@@ -8,10 +9,12 @@ module Sapience
         class Logging < ::Grape::Middleware::Base
           include RequestFormatHelper
 
-          ActiveSupport::Notifications.subscribe("sql.active_record") do |*args|
-            event = ActiveSupport::Notifications::Event.new(*args)
-            Grape::Timings.append_db_runtime(event)
-          end if defined?(ActiveRecord)
+          if defined?(ActiveRecord)
+            ActiveSupport::Notifications.subscribe("sql.active_record") do |*args|
+              event = ActiveSupport::Notifications::Event.new(*args)
+              Grape::Timings.append_db_runtime(event)
+            end
+          end
 
           def initialize(app, options = {})
             super
@@ -36,7 +39,7 @@ module Sapience
               after_failure(error)
               throw(:error, error)
             else
-              @status, _, _ = *@app_response
+              @status, = *@app_response
               after
             end
             @app_response

data/lib/sapience/extensions/grape/notifications.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "request_format_helper"
 
 module Sapience

data/lib/sapience/extensions/grape/request_format_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   module Extensions
     module Grape

data/lib/sapience/extensions/grape/timings.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   module Extensions
     module Grape

data/lib/sapience/extensions/notifications.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require "active_support"
   require "active_support/notifications"

data/lib/sapience/extensions/rails/rack/logger.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 # Replace rack started message with a semantic equivalent
 class Rails::Rack::Logger # rubocop:disable ClassAndModuleChildren
-  alias_method :started_request_message_original, :started_request_message
+  alias started_request_message_original started_request_message
   def started_request_message(request)
     {
       message: "Started",

data/lib/sapience/extensions/rails/rack/logger_info_as_debug.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Drop rack Started message to debug level message
 class Rails::Rack::Logger # rubocop:disable ClassAndModuleChildren
 
@@ -13,7 +14,7 @@ class Rails::Rack::Logger # rubocop:disable ClassAndModuleChildren
     end
   end
 
-  alias_method :orig_logger, :logger
+  alias orig_logger logger
 
   def logger
     @logger ||= begin

data/lib/sapience/formatters/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   module Formatters
     class Base
@@ -16,7 +17,7 @@ module Sapience
         @time_format     = options.key?(:time_format) ? options.delete(:time_format) : default_format
         @log_host        = options.key?(:log_host) ? options.delete(:log_host) : true
         @log_application = options.key?(:log_application) ? options.delete(:log_application) : true
-        fail(ArgumentError, "Unknown options: #{options.inspect}") if options.size > 0
+        fail(ArgumentError, "Unknown options: #{options.inspect}") unless options.empty?
       end
 
       # Return the Time as a formatted string

data/lib/sapience/formatters/color.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Load AwesomePrint if available
 begin
   require "awesome_print"
@@ -27,13 +28,13 @@ module Sapience
         colors      = Sapience::AnsiColors
         level_color = colors::LEVEL_MAP[log.level]
 
-        message = time_format.nil? ? "" : "#{format_time(log.time)} "
+        message = time_format.nil? ? +"" : +"#{format_time(log.time)} "
 
         # Header with date, time, log level and process info
         message << "#{level_color}#{log.level_to_s}#{colors::CLEAR} [#{log.process_info}]"
 
         # Tags
-        message << " " << log.tags.collect { |tag| "[#{level_color}#{tag}#{colors::CLEAR}]" }.join(" ") if log.tags && (log.tags.size > 0) # rubocop:disable LineLength
+        message << " " << log.tags.collect { |tag| "[#{level_color}#{tag}#{colors::CLEAR}]" }.join(" ") if log.tags && !log.tags.empty? # rubocop:disable LineLength
 
         # Duration
         message << " (#{colors::BOLD}#{log.duration_human}#{colors::CLEAR})" if log.duration

data/lib/sapience/formatters/default.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   module Formatters
     class Default < Base
@@ -6,13 +7,13 @@ module Sapience
       #    2011-07-19 14:36:15.660235 D [1149:ScriptThreadProcess] Rails -- Hello World
       def call(log, _logger) # rubocop:disable AbcSize, PerceivedComplexity, CyclomaticComplexity
         # Date & time
-        message = time_format.nil? ? "" : "#{format_time(log.time)} "
+        message = time_format.nil? ? +"" : +"#{format_time(log.time)} "
 
         # Log level and process info
         message << "#{log.level_to_s} [#{log.process_info}]"
 
         # Tags
-        message << " " << log.tags.collect { |tag| "[#{tag}]" }.join(" ") if log.tags && (log.tags.size > 0)
+        message << " " << log.tags.collect { |tag| "[#{tag}]" }.join(" ") if log.tags && !log.tags.empty?
 
         # Duration
         message << " (#{log.duration_human})" if log.duration

data/lib/sapience/formatters/json.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "json"
 module Sapience
   module Formatters

data/lib/sapience/formatters/raw.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "json"
 module Sapience
   module Formatters

data/lib/sapience/grape.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "sapience"
 require "sapience/extensions/grape/timings"
 require "sapience/extensions/grape/middleware/logging"

data/lib/sapience/log.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   # Log Struct
   #
@@ -48,13 +49,13 @@ module Sapience
   Log = Struct.new(:level, :thread_name, :name, :message, :payload, :time, :duration, :tags, :level_index, :exception, :metric, :backtrace, :metric_amount) do
     MAX_EXCEPTIONS_TO_UNWRAP = 5
     MILLISECONDS_IN_SECOND =   1_000
-    MILLISECONDS_IN_MINUTE =  60_000
+    MILLISECONDS_IN_MINUTE = 60_000
     MILLISECONDS_IN_HOUR = 3_600_000
     MILLISECONDS_IN_DAY = 86_400_000
 
     # Returns [String] the exception backtrace including all of the child / caused by exceptions
     def backtrace_to_s
-      trace = ""
+      trace = +""
       each_exception do |exception, i|
         if i == 0
           trace << (exception.backtrace || []).join("\n")
@@ -80,7 +81,7 @@ module Sapience
       minutes, ms = ms.divmod(MILLISECONDS_IN_MINUTE)
       seconds, ms = ms.divmod(MILLISECONDS_IN_SECOND)
 
-      str = ""
+      str = +""
       str << "#{days}d" if days > 0
       str << " #{hours}h" if hours > 0
       str << " #{minutes}m" if minutes > 0
@@ -126,7 +127,7 @@ module Sapience
     def file_name_and_line(short_name = false) # rubocop:disable CyclomaticComplexity
       return unless backtrace || (exception && exception.backtrace)
       stack = backtrace || exception.backtrace
-      extract_file_and_line(stack, short_name) if stack && stack.size > 0
+      extract_file_and_line(stack, short_name) if stack && !stack.empty?
     end
 
     # Strip the standard Rails colorizing from the logged message
@@ -173,7 +174,7 @@ module Sapience
     # Returns [Hash] representation of this log entry
     def to_h(host = Sapience.config.host, app_name = Sapience.app_name) # rubocop:disable AbcSize, CyclomaticComplexity, PerceivedComplexity, LineLength
       # Header
-      h               = {
+      h = {
         name:        name,
         pid:         $PROCESS_ID,
         thread:      thread_name,
@@ -190,7 +191,7 @@ module Sapience
       end
 
       # Tags
-      h[:tags] = tags if tags && (tags.size > 0)
+      h[:tags] = tags if tags && !tags.empty?
 
       # Duration
       if duration

data/lib/sapience/log_methods.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   module LogMethods
     def trace(message = nil, payload = nil, exception = nil, &block)
@@ -77,32 +78,32 @@ module Sapience
     def measure_trace(message, params = {}, &block)
       measure(:trace, message, params, &block)
     end
-    alias_method :benchmark_trace, :measure_trace
+    alias benchmark_trace measure_trace
 
     def measure_debug(message, params = {}, &block)
       measure(:debug, message, params, &block)
     end
-    alias_method :benchmark_debug, :measure_debug
+    alias benchmark_debug measure_debug
 
     def measure_info(message, params = {}, &block)
       measure(:info, message, params, &block)
     end
-    alias_method :benchmark_info, :measure_info
+    alias benchmark_info measure_info
 
     def measure_warn(message, params = {}, &block)
       measure(:warn, message, params, &block)
     end
-    alias_method :benchmark_warn, :measure_warn
+    alias benchmark_warn measure_warn
 
     def measure_error(message, params = {}, &block)
       measure(:error, message, params, &block)
     end
-    alias_method :benchmark_error, :measure_error
+    alias benchmark_error measure_error
 
     def measure_fatal(message, params = {}, &block)
       measure(:fatal, message, params, &block)
     end
-    alias_method :benchmark_fatal, :measure_fatal
+    alias benchmark_fatal measure_fatal
 
     # Dynamically supply the log level with every measurement call
     def measure(level, message, params = {}, &block)
@@ -110,11 +111,11 @@ module Sapience
       if level_index <= index
         measure_internal(level, index, message, params, &block)
       else
-        block.call(params) if block
+        block&.call(params)
       end
     end
 
-    alias_method :benchmark, :measure
+    alias benchmark measure
 
     def level_to_index(level)
       Sapience.config.level_to_index(level)

data/lib/sapience/loggable.rb

@@ -1,5 +1,5 @@
+# frozen_string_literal: true
 module Sapience
-  # rubocop:disable TrivialAccessors
   module Loggable
     def self.included(base)
       base.send(:extend, Extensions)

data/lib/sapience/logger.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 require "concurrent"
 
 # rubocop:disable ClassVars
 module Sapience
   # Logger stores the class name to be used for all log messages so that every
   # log message written by this instance will include the class name
-  class Logger < Base # rubocop:disable ClassLength, ClassVars
+  class Logger < Base
     include Sapience::Concerns::Compatibility
 
     # Flush all queued log entries disk, database, etc.
@@ -85,7 +86,7 @@ module Sapience
 
     # Separate appender thread responsible for reading log messages and
     # calling the appenders in it's thread
-    # rubocop:disable BlockNesting, AssignmentInCondition, PerceivedComplexity, CyclomaticComplexity, AbcSize, LineLength, RescueException
+    # rubocop:disable LineLength
     def self.appender_thread
       @@appender_thread
     end
@@ -132,16 +133,18 @@ module Sapience
     def log(log, message = nil, progname = nil, &block)
       # Compatibility with ::Logger
       return add(log, message, progname, &block) unless log.is_a?(Sapience::Log)
-      @@appender_thread << lambda do
-        Sapience.appenders.each do |appender|
-          next unless appender.valid?
-          begin
-            appender.log(log)
-          rescue StandardError => exc
-            $stderr.write("Appender thread: Failed to log to appender: #{appender.inspect}\n #{exc.inspect}")
+      if @@appender_thread
+        @@appender_thread << lambda do
+          Sapience.appenders.each do |appender|
+            next unless appender.valid?
+            begin
+              appender.log(log)
+            rescue StandardError => exc
+              $stderr.write("Appender thread: Failed to log to appender: #{appender.inspect}\n #{exc.inspect}")
+            end
           end
         end
-      end if @@appender_thread
+      end
     end
     # rubocop:enable BlockNesting, AssignmentInCondition, PerceivedComplexity, CyclomaticComplexity, AbcSize, LineLength, RescueException
 

data/lib/sapience/metrics/datadog.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "uri"
 begin
   require "datadog/statsd"
@@ -11,7 +12,7 @@ end
 module Sapience
   class Metrics
     class Datadog < Sapience::Metrics
-      VALIDATION_MESSAGE = "Statsd only supports udp. Example: '#{Sapience::DEFAULT_STATSD_URL}'".freeze
+      VALIDATION_MESSAGE = "Statsd only supports udp. Example: '#{Sapience::DEFAULT_STATSD_URL}'"
 
       # Create Appender
       #
@@ -27,7 +28,7 @@ module Sapience
       #   tags: [String]
       #     Example:
       #       tag1:true
-      # rubocop:disable AbcSize, CyclomaticComplexity, PerceivedComplexity
+      # rubocop:disable CyclomaticComplexity, PerceivedComplexity
 
       def initialize(opts = {})
         options = opts.dup

data/lib/sapience/metrics.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
   class Metrics
     extend Sapience::Descendants

data/lib/sapience/rails/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "sapience"
 require "sapience/extensions/action_controller/live" if defined?(ActionController::Live)
 require "sapience/extensions/action_controller/log_subscriber"
@@ -22,7 +23,7 @@ module Sapience
       initializer :initialize_logger, group: :all, before: :bootstrap_hook do
         Sapience.configure
 
-        [:active_record, :action_controller, :action_mailer, :action_view].each do |name|
+        %i[active_record action_controller action_mailer action_view].each do |name|
           ActiveSupport.on_load(name) { include Sapience::Loggable }
         end
         ActiveSupport.on_load(:action_cable) { self.logger = Sapience["ActionCable"] }
@@ -48,7 +49,7 @@ module Sapience
 
         # Replace the Raven logger
         # Raven::Configuration.logger = Sapience[Raven::Configuration] if defined?(Raven::Configuration)
-        Raven.send(:include) { Sapience::Loggable }
+        Raven.send(:include, Sapience::Loggable)
 
         # Replace the Sneakers logger
         Sneakers.configure(log: Sapience[Sneakers]) if defined?(Sneakers)

data/lib/sapience/rails/railtie.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "sapience"
 
 module Sapience

data/lib/sapience/rails.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "sapience/rails/railtie"
 require "sapience/rails/engine"
 

data/lib/sapience/sapience.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "concurrent"
 require "socket"
 require "sapience/descendants"
@@ -27,19 +28,19 @@ module Sapience
   UnkownLogLevel = Class.new(StandardError)
   InvalidLogExecutor = Class.new(StandardError)
   MissingConfiguration = Class.new(StandardError)
-  @@configured   = false
+  @@configured = false
 
   # Logging levels in order of most detailed to most severe
-  LEVELS                  = [:trace, :debug, :info, :warn, :error, :fatal].freeze
-  APP_NAME                = "APP_NAME".freeze
-  DEFAULT_ENV             = "default".freeze
-  RACK_ENV                = "RACK_ENV".freeze
-  RAILS_ENV               = "RAILS_ENV".freeze
-  SAPIENCE_ENV            = "SAPIENCE_ENV".freeze
+  APP_NAME                = "APP_NAME"
+  DEFAULT_ENV             = "default"
+  RACK_ENV                = "RACK_ENV"
+  RAILS_ENV               = "RAILS_ENV"
+  SAPIENCE_ENV            = "SAPIENCE_ENV"
+  LEVELS                  = %i[trace debug info warn error fatal].freeze
   APPENDER_NAMESPACE      = Sapience::Appender
   METRICS_NAMESPACE       = Sapience::Metrics
   ERROR_HANDLER_NAMESPACE = Sapience::ErrorHandler
-  DEFAULT_STATSD_URL      = "udp://localhost:8125".freeze
+  DEFAULT_STATSD_URL      = "udp://localhost:8125"
 
   def self.configure(force: false)
     yield config if block_given?
@@ -115,7 +116,7 @@ module Sapience
 
   def self.namify(appname, sep = "_")
     return unless appname.is_a?(String)
-    return unless appname.length > 0
+    return if appname.empty?
 
     # Turn unwanted chars into the separator
     appname = appname.dup
@@ -213,7 +214,7 @@ module Sapience
   #   logger = Sapience['Example']
   #   logger.info "Hello World"
   #   logger.debug("Login time", user: 'Joe', duration: 100, ip_address: '127.0.0.1')
-  def self.add_appender(appender_class_name, options = {}, _deprecated_level = nil, &_block) # rubocop:disable AbcSize
+  def self.add_appender(appender_class_name, options = {}, _deprecated_level = nil, &_block)
     fail ArgumentError, "options should be a hash" unless options.is_a?(Hash)
     options        = options.dup.deep_symbolize_keyz!
     appender_class = constantize_symbol(appender_class_name)
@@ -395,7 +396,7 @@ module Sapience
   # Remove specified number of tags from the current tag list
   def self.pop_tags(quantity = 1)
     t = Thread.current[:sapience_tags]
-    t.pop(quantity) unless t.nil?
+    t&.pop(quantity)
   end
 
   # Silence noisy log levels by changing the default_level within the block
@@ -458,7 +459,7 @@ module Sapience
     if RUBY_VERSION.to_i >= 2
       Object.const_get(class_name)
     else
-      class_name.split("::").inject(Object) { |o, name| o.const_get(name) } # rubocop:disable SingleLineBlockParams
+      class_name.split("::").inject(Object) { |o, name| o.const_get(name) }
     end
   rescue NameError
     raise UnknownClass, "Could not find class: #{class_name}."

data/lib/sapience/sneakers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "sapience"
 
 module Sneakers

data/lib/sapience/subscriber.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Abstract Subscriber
 #
 #   Abstract base class for appender and metrics subscribers.
@@ -97,7 +98,7 @@ module Sapience
       @formatter  = extract_formatter(options.delete(:formatter), &block)
       @app_name   = options.delete(:app_name)
       @host       = options.delete(:host)
-      fail(ArgumentError, "Unknown options: #{options.inspect}") if options.size > 0
+      fail(ArgumentError, "Unknown options: #{options.inspect}") unless options.empty?
 
       # Subscribers don't take a class name, so use this class name if an subscriber
       # is logged to directly
@@ -122,17 +123,16 @@ module Sapience
     # - Otherwise an instance of the default formatter is returned.
     # rubocop:disable CyclomaticComplexity, AbcSize, PerceivedComplexity
     def extract_formatter(formatter, &block)
-      case
-      when formatter.is_a?(Symbol) || formatter.is_a?(String)
+      if formatter.is_a?(Symbol) || formatter.is_a?(String)
         Sapience.constantize_symbol(formatter, "Sapience::Formatters").new
-      when formatter.is_a?(Hash) && formatter.size > 0
+      elsif formatter.is_a?(Hash) && !formatter.empty?
         fmt, options = formatter.first
         Sapience.constantize_symbol(fmt.to_sym, "Sapience::Formatters").new(options)
-      when formatter.respond_to?(:call)
+      elsif formatter.respond_to?(:call)
         formatter
-      when block
+      elsif block
         block
-      when respond_to?(:call)
+      elsif respond_to?(:call)
         self
       else
         default_formatter

data/lib/sapience/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sapience
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

data/lib/sapience.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "sapience/version"
 require "sapience/ansi_colors"
 require "sapience/core_ext/hash"

data/lib/tasks/coverage.rake

@@ -1,5 +1,6 @@
-COVERAGE_FILE = ".simplecov".freeze
-COVERAGE_BKP_FILE = ".simplecov.bkp".freeze
+# frozen_string_literal: true
+COVERAGE_FILE = ".simplecov"
+COVERAGE_BKP_FILE = ".simplecov.bkp"
 
 def coverage_dir
   p File.join(Dir.pwd, "coverage")

data/sapience.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "sapience/version"
@@ -44,4 +45,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "gem-release"
   spec.add_development_dependency "memory_profiler"
   spec.add_development_dependency "rspec-prof"
+  spec.add_development_dependency "appraisal"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapience
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Mikael Henriksson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -277,6 +277,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Hasslefree autoconfiguration for logging, metrics and exception collection.
 email:
 - mika@reevoo.com