hanami-utils 1.3.8 → 2.0.0.alpha1

data/lib/hanami/logger/filter.rb

@@ -9,19 +9,21 @@ module Hanami
     # @since 1.1.0
     # @api private
     class Filter
-      # @since 1.3.7
+      # @since 1.1.0
       # @api private
-      FILTERED_VALUE = "[FILTERED]"
-
-      def initialize(filters = [], mask: FILTERED_VALUE)
+      def initialize(filters = [])
         @filters = filters
-        @mask = mask
       end
 
       # @since 1.1.0
       # @api private
-      def call(params)
-        _filter(_copy_params(params))
+      def call(hash)
+        _filtered_keys(hash).each do |key|
+          *keys, last = _actual_keys(hash, key.split("."))
+          keys.inject(hash, :fetch)[last] = "[FILTERED]"
+        end
+
+        hash
       end
 
       private
@@ -30,29 +32,6 @@ module Hanami
       # @api private
       attr_reader :filters
 
-      # @since 1.3.7
-      # @api private
-      attr_reader :mask
-
-      # This is a simple deep merge to merge the original input
-      # with the filtered hash which contains '[FILTERED]' string.
-      #
-      # It only deep-merges if the conflict values are both hashes.
-      #
-      # @since 1.3.7
-      # @api private
-      def _deep_merge(original_hash, filtered_hash)
-        original_hash.merge(filtered_hash) do |_key, original_item, filtered_item|
-          if original_item.is_a?(Hash) && filtered_item.is_a?(Hash)
-            _deep_merge(original_item, filtered_item)
-          elsif filtered_item == FILTERED_VALUE
-            filtered_item
-          else
-            original_item
-          end
-        end
-      end
-
       # @since 1.1.0
       # @api private
       def _filtered_keys(hash)
@@ -63,7 +42,7 @@ module Hanami
       # @api private
       def _key_paths(hash, base = nil)
         hash.inject([]) do |results, (k, v)|
-          results + (_key_paths?(v) ? _key_paths(v, _build_path(base, k)) : [_build_path(base, k)])
+          results + (v.respond_to?(:each) ? _key_paths(v, _build_path(base, k)) : [_build_path(base, k)])
         end
       end
 
@@ -84,64 +63,6 @@ module Hanami
           res + [correct_key]
         end
       end
-
-      # Check if the given value can be iterated (`Enumerable`) and that isn't a `File`.
-      # This is useful to detect closed `Tempfiles`.
-      #
-      # @since 1.3.5
-      # @api private
-      #
-      # @see https://github.com/hanami/utils/pull/342
-      def _key_paths?(value)
-        value.is_a?(Enumerable) && !value.is_a?(File)
-      end
-
-      # @since 1.3.7
-      # @api private
-      def _deep_dup(hash)
-        hash.map do |key, value|
-          [
-            key,
-            if value.is_a?(Hash)
-              _deep_dup(value)
-            else
-              _key_paths?(value) ? value.dup : value
-            end
-          ]
-        end.to_h
-      end
-
-      # @since 1.3.7
-      # @api private
-      def _copy_params(params)
-        case params
-        when Hash
-          _deep_dup(params)
-        when Array
-          params.map { |hash| _deep_dup(hash) }
-        end
-      end
-
-      # @since 1.3.7
-      # @api private
-      def _filter_hash(hash)
-        _filtered_keys(hash).each do |key|
-          *keys, last = _actual_keys(hash, key.split("."))
-          keys.inject(hash, :fetch)[last] = mask
-        end
-        hash
-      end
-
-      # @since 1.3.7
-      # @api private
-      def _filter(params)
-        case params
-        when Hash
-          _filter_hash(params)
-        when Array
-          params.map { |hash| _filter_hash(hash) }
-        end
-      end
     end
   end
 end

data/lib/hanami/logger/formatter.rb

@@ -103,25 +103,25 @@ module Hanami
 
       # @since 0.8.0
       # @api private
-      def _message_hash(message)
+      def _message_hash(message) # rubocop:disable Metrics/MethodLength
         case message
-        when Hash
+        when ::Hash
           @filter.call(message)
         when Exception
-          Hash[
-            message: message.message,
+          ::Hash[
+            message:   message.message,
             backtrace: message.backtrace || [],
-            error: message.class
+            error:     message.class
           ]
         else
-          Hash[message: message]
+          ::Hash[message: message]
         end
       end
 
       # @since 0.8.0
       # @api private
       def _format(hash)
-        "#{_line_front_matter(hash.delete(:app), hash.delete(:severity), hash.delete(:time))}#{SEPARATOR}#{_format_message(hash)}" # rubocop:disable Layout/LineLength
+        "#{_line_front_matter(hash.delete(:app), hash.delete(:severity), hash.delete(:time))}#{SEPARATOR}#{_format_message(hash)}"
       end
 
       # @since 1.2.0

data/lib/hanami/middleware.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Hanami
+  module Middleware
+    # Hanami middleware utils
+
+    # @since 2.0.0
+    class Error < ::StandardError
+    end
+  end
+end

data/lib/hanami/utils.rb

@@ -23,7 +23,7 @@ module Hanami
 
     # Checks if the current VM is JRuby
     #
-    # @return [TrueClass,FalseClass] info whether the VM is JRuby or not
+    # @return [TrueClass,FalseClass] return if the VM is JRuby or not
     #
     # @since 0.3.1
     # @api private
@@ -33,7 +33,7 @@ module Hanami
 
     # Checks if the current VM is Rubinius
     #
-    # @return [TrueClass,FalseClass] info whether the VM is Rubinius or not
+    # @return [TrueClass,FalseClass] return if the VM is Rubinius or not
     #
     # @since 0.3.1
     # @api private
@@ -41,7 +41,7 @@ module Hanami
       RUBY_ENGINE == HANAMI_RUBINIUS
     end
 
-    # Recursively requires Ruby files under the given directory.
+    # Recursively require Ruby files under the given directory.
     #
     # If the directory is relative, it implies it's the path from current directory.
     # If the directory is absolute, it uses as it is.
@@ -56,22 +56,6 @@ module Hanami
       for_each_file_in(directory) { |file| require_relative(file) }
     end
 
-    # Recursively reloads Ruby files under the given directory.
-    #
-    # If the directory is relative, it implies it's the path from current directory.
-    # If the directory is absolute, it uses as it is.
-    #
-    # It respects file separator of the current operating system.
-    # A pattern like <tt>"path/to/files"</tt> will work both on *NIX and Windows machines.
-    #
-    # @param directory [String, Pathname] the directory
-    #
-    # @since 1.0.0
-    # @api private
-    def self.reload!(directory)
-      for_each_file_in(directory) { |file| load(file) }
-    end
-
     # Recursively scans through the given directory and yields the given block
     # for each Ruby source file.
     #

data/lib/hanami/utils/basic_object.rb

@@ -6,24 +6,7 @@ module Hanami
     #
     # @since 0.3.5
     class BasicObject < ::BasicObject
-      # Lookups constants at the top-level namespace, if they are missing in the
-      # current context.
-      #
-      # @param name [Symbol] the constant name
-      #
-      # @return [Object, Module] the constant
-      #
-      # @raise [NameError] if the constant cannot be found
-      #
-      # @since 1.3.4
-      # @api private
-      #
-      # @see https://ruby-doc.org/core/Module.html#method-i-const_missing
-      def self.const_missing(name)
-        ::Object.const_get(name)
-      end
-
-      # Returns the class for debugging purposes.
+      # Return the class for debugging purposes.
       #
       # @since 0.3.5
       #
@@ -40,56 +23,13 @@ module Hanami
       #
       # @see http://ruby-doc.org/core/Object.html#method-i-inspect
       #
+      # rubocop:disable Style/FormatString
       # rubocop:disable Style/FormatStringToken
       def inspect
         "#<#{self.class}:#{'0x0000%x' % (__id__ << 1)}#{__inspect}>"
       end
       # rubocop:enable Style/FormatStringToken
-
-      # @!macro [attach] instance_of?(class)
-      #
-      # Determines if self is an instance of given class or module
-      #
-      # @param class [Class,Module] the class of module to verify
-      #
-      # @return [TrueClass,FalseClass] the result of the check
-      #
-      # @raise [TypeError] if the given argument is not of the expected types
-      #
-      # @since 1.3.2
-      #
-      # @see http://ruby-doc.org/core/Object.html#method-i-instance_of-3F
-      define_method :instance_of?, ::Object.instance_method(:instance_of?)
-
-      # @!macro [attach] is_a?(class)
-      #
-      # Determines if self is of the type of the object class or module
-      #
-      # @param class [Class,Module] the class of module to verify
-      #
-      # @return [TrueClass,FalseClass] the result of the check
-      #
-      # @raise [TypeError] if the given argument is not of the expected types
-      #
-      # @since 1.3.2
-      #
-      # @see http://ruby-doc.org/core/Object.html#method-i-is_a-3F
-      define_method :is_a?, ::Object.instance_method(:is_a?)
-
-      # @!macro [attach] kind_of?(class)
-      #
-      # Determines if self is of the kind of the object class or module
-      #
-      # @param class [Class,Module] the class of module to verify
-      #
-      # @return [TrueClass,FalseClass] the result of the check
-      #
-      # @raise [TypeError] if the given argument is not of the expected types
-      #
-      # @since 1.3.2
-      #
-      # @see http://ruby-doc.org/core/Object.html#method-i-kind_of-3F
-      define_method :kind_of?, ::Object.instance_method(:kind_of?)
+      # rubocop:enable Style/FormatString
 
       # Alias for __id__
       #

data/lib/hanami/utils/blank.rb

@@ -13,7 +13,7 @@ module Hanami
       # @api private
       STRING_MATCHER = /\A[[:space:]]*\z/.freeze
 
-      # Checks if object is blank
+      # Checks object is blank
       #
       # @example Basic Usage
       #   require 'hanami/utils/blank'
@@ -21,21 +21,20 @@ module Hanami
       #   Hanami::Utils::Blank.blank?(Hanami::Utils::String.new('')) # => true
       #   Hanami::Utils::Blank.blank?('  ')                          # => true
       #   Hanami::Utils::Blank.blank?(nil)                           # => true
-      #   Hanami::Utils::Blank.blank?(Hanami::Utils::Hash.new({}))   # => true
       #   Hanami::Utils::Blank.blank?(true)                          # => false
       #   Hanami::Utils::Blank.blank?(1)                             # => false
       #
       # @param object the argument
       #
-      # @return [TrueClass,FalseClass] info, whether object is blank
+      # @return [TrueClass,FalseClass]
       #
       # @since 0.8.0
       # @api private
-      def self.blank?(object)
+      def self.blank?(object) # rubocop:disable Metrics/MethodLength
         case object
         when String, ::String
           STRING_MATCHER === object # rubocop:disable Style/CaseEquality
-        when Hash, ::Hash, ::Array
+        when ::Hash, ::Array
           object.empty?
         when TrueClass, Numeric
           false
@@ -46,7 +45,7 @@ module Hanami
         end
       end
 
-      # Checks if object is filled
+      # Checks object is filled
       #
       # @example Basic Usage
       #   require 'hanami/utils/blank'
@@ -56,11 +55,10 @@ module Hanami
       #   Hanami::Utils::Blank.filled?(Hanami::Utils::String.new('')) # => false
       #   Hanami::Utils::Blank.filled?('  ')                          # => false
       #   Hanami::Utils::Blank.filled?(nil)                           # => false
-      #   Hanami::Utils::Blank.filled?(Hanami::Utils::Hash.new({}))   # => false
       #
       # @param object the argument
       #
-      # @return [TrueClass,FalseClass] whether the object is filled
+      # @return [TrueClass,FalseClass]
       #
       # @since 1.0.0
       # @api private

data/lib/hanami/utils/callbacks.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "concurrent/array"
+
 module Hanami
   module Utils
     # Before and After callbacks
@@ -12,13 +14,13 @@ module Hanami
       # @since 0.1.0
       # @private
       class Chain
-        # Returns a new chain
+        # Return a new chain
         #
         # @return [Hanami::Utils::Callbacks::Chain]
         #
         # @since 0.2.0
         def initialize
-          @chain = []
+          @chain = Concurrent::Array.new
         end
 
         # Appends the given callbacks to the end of the chain.
@@ -150,6 +152,17 @@ module Hanami
           end
         end
 
+        # Return a duplicate callbacks chain
+        #
+        # @return [Hanami::Utils::Callbacks] the duplicated chain
+        #
+        # @since 2.0.0
+        def dup
+          super.tap do |instance|
+            instance.instance_variable_set(:@chain, instance.chain.dup)
+          end
+        end
+
         # It freezes the object by preventing further modifications.
         #
         # @since 0.2.0
@@ -170,6 +183,10 @@ module Hanami
           @chain.freeze
         end
 
+        protected
+
+        attr_reader :chain
+
         private
 
         # @api private
@@ -250,9 +267,7 @@ module Hanami
       end
 
       # Method callback
-      #
-      # It wraps a symbol or a string representing a method name that is
-      # implemented by the context within it will be called.
+      # It wraps a symbol or a string representing a method name that is implemented by the context within it will be called.
       #
       # @since 0.1.0
       # @api private

data/lib/hanami/utils/class.rb

@@ -74,59 +74,9 @@ module Hanami
         load!(name, namespace) if namespace.const_defined?(name.to_s, false)
       end
 
-      # Loads a class from the given pattern name and namespace
-      #
-      # @param pattern [String] the class name pattern
-      # @param namespace [Class, Module] the Ruby namespace where we want to perform the lookup.
-      # @return [Class, Module] the found Ruby constant.
-      #
-      # @raise [NameError] if no constant can be found.
-      #
-      # @since 0.3.1
-      #
-      # @see Hanami::Utils::String#tokenize
-      #
-      # @example
-      #   require 'hanami/utils/class'
-      #
-      #   module App
-      #     module Service
-      #       class Endpoint
-      #       end
-      #     end
-      #
-      #     class ServiceEndpoint
-      #     end
-      #   end
-      #
-      #   # basic usage
-      #   Hanami::Utils::Class.load_from_pattern!('App::Service') # => App::Service
-      #
-      #   # with explicit namespace
-      #   Hanami::Utils::Class.load_from_pattern!('Service', App) # => App::Service
-      #
-      #   # with pattern
-      #   Hanami::Utils::Class.load_from_pattern!('App::Service(::Endpoint|Endpoint)') # => App::Service::Endpoint
-      #   Hanami::Utils::Class.load_from_pattern!('App::Service(Endpoint|::Endpoint)') # => App::ServiceEndpoint
-      #
-      #   # with missing constant
-      #   Hanami::Utils::Class.load_from_pattern!('Unknown') # => raises NameError
-      def self.load_from_pattern!(pattern, namespace = Object)
-        Deprecation.new("Hanami::Utils::Class.load_from_pattern! is deprecated, please use Hanami::Utils::Class.load! instead") # rubocop:disable Layout/LineLength
-
-        tokenize(pattern) do |token|
-          begin
-            return namespace.const_get(token, false)
-          rescue NameError # rubocop:disable Lint/SuppressedException
-          end
-        end
-
-        full_name = [(namespace == Object ? nil : namespace), pattern].compact.join("::")
-        raise NameError.new("uninitialized constant #{full_name}")
-      end
-
+      # rubocop:disable Metrics/MethodLength
       def self.tokenize(pattern)
-        if match = TOKENIZE_REGEXP.match(pattern)
+        if match = TOKENIZE_REGEXP.match(pattern) # rubocop:disable Lint/AssignmentInCondition
           pre  = match.pre_match
           post = match.post_match
           tokens = match[1].split(TOKENIZE_SEPARATOR)
@@ -139,6 +89,7 @@ module Hanami
 
         nil
       end
+      # rubocop:enable Metrics/MethodLength
 
       # Regexp for .tokenize
       #