amazing_print 1.5.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d771d603c88c997bca4379eba3dc4cd794994e5810edb0859ad5c47c3b2590c
-  data.tar.gz: 87ea8f90780f57731ad4cff0bfbce9eb2d837681829979bd23e839f62415a1b0
+  metadata.gz: 4c54bf5089bc3eb9ecb72f953d2b7972ec91f512d17d85f64e0e68bfffe963eb
+  data.tar.gz: e25109a0515688c4a3212e2dfa1a9a65a615959f67372a88f77011d8e0a531e0
 SHA512:
-  metadata.gz: d1d1d0eb8ca306adbf3af3eec93d9cbb3fa6a47f1ad0e3b836d473bc4a0595be02dcd27af60de86a3f524bb373e5e0d2b9053f6b40dfac437add803dc075a315
-  data.tar.gz: 3c74f2a0333fad6e5c34b5209124767b931d56c88423960f55945b694e27dadd41636259f7a1a395e64d4971887c2d1f095b64714acd525748dae5423d670872
+  metadata.gz: 53eb2f3a3bba9510f098ea1d550a2c4ce2080f21c4b19daea1e40e7b4fdc8df4336ef494bdb2626892e73f17ab6dc4bc2001dea1f64168d8d331baeb998ee273
+  data.tar.gz: 5cf3937b23f27e89a75c2a0adbf0353f8a2fb5f936f836b44f7e152559bdb0c7f8b1e30c95f9bca506342bf08b2da3e29b377bf1757ccf031de7e24cf7ccdc99

data/CHANGELOG.md

@@ -1,58 +1,100 @@
+# CHANGELOG
+
 ## Unreleased
 
+## v1.8.1
+
+- Fix authors list in gemspec #128
+- Use array.length.zero? to avoid issues with ActiveRecord collection proxy #129
+- grammar glowup in README.md #130
+
+## v1.8.0
+
+- Drop Ruby 3.0 and add Ruby 3.4 #125
+
+## v1.7.2
+
+- update the version string in `AmazingPrint.version`
+
+## v1.7.1
+
+- no changes, only linting
+
+## v1.7.0
+
+- Require Ruby >= 3.0
+- Add support for `::ActiveModel::Attributes`
+- Preserve user defined color defaults
+- Micro-optimization to `AmazingPrint::ActiveRecord#cast` (avoid calls to `#ancestors`)
+
+## v1.6.0
+
+- Use pager with Pry #96
+- Add Rails 7 appraisal #98
+- Allow Hash keys to be colorized #99
+- Use CI merge queue #104
+- Add support for Ruby 3.3 #105
+- Add Mongoid field aliases #106
+- Add bigdecimal gem #109
+- Add ExtLoader to help with require order issues #110
+
 ## v1.5.0
-  - Drop support for Ruby 2.3 and 2.4 as well as JRuby 9.1
-  - Add File/Dir formatters for mswin platform #48
-  - Don't monkey patch String class #91
-  - Fix ruby19 hash syntax so it can be copy-pasted #94
+
+- Drop support for Ruby 2.3 and 2.4 as well as JRuby 9.1
+- Add File/Dir formatters for mswin platform #48
+- Don't monkey patch String class #91
+- Fix ruby19 hash syntax so it can be copy-pasted #94
 
 ## v1.4.0
-  - Support loading config from `$XDG_CONFIG_HOME/aprc` - #63
-  - Remove support for Rails 5.1 #75
-  - Update AR specs for Ruby 2.6.7 #76
-  - Load .aprc configs only once. #74
-  - Add XDG config support #77
-  - Rubocop updates #79
-  - Update Irb integration for v1.2.6+ #81
+
+- Support loading config from `$XDG_CONFIG_HOME/aprc` - #63
+- Remove support for Rails 5.1 #75
+- Update AR specs for Ruby 2.6.7 #76
+- Load .aprc configs only once. #74
+- Add XDG config support #77
+- Rubocop updates #79
+- Update Irb integration for v1.2.6+ #81
 
 ## v1.3.0
-  - Fix HTML escaping problems #53
-  - Update test suite for Ruby 2.7.2 and JRuby #61
-  - Add ActionView spec for html_safe #65
-  - Add support for Rails 6.1 #68
-  - Update specs for Ruby 3.0 #69
+
+- Fix HTML escaping problems #53
+- Update test suite for Ruby 2.7.2 and JRuby #61
+- Add ActionView spec for html_safe #65
+- Add support for Rails 6.1 #68
+- Update specs for Ruby 3.0 #69
 
 ## v1.2.2
-  - Support Ruby 3.0 / IRB 1.2.6 - #57
-  - Fix FrozenError - #51
-  - Drop support for Ruby 2.3 and 2.4 as well as JRuby 9.1 - #46
-  - Add passing of `options` to `Logger#ap` - #55
+
+- Support Ruby 3.0 / IRB 1.2.6 - #57
+- Fix FrozenError - #51
+- Drop support for Ruby 2.3 and 2.4 as well as JRuby 9.1 - #46
+- Add passing of `options` to `Logger#ap` - #55
 
 ## v1.2.1
-  - Correctly print active_model_errors for models that don't have tables - #42 by sahglie
-  - Update AmazingPrint::MongoMapper for frozen strings - #44
 
-## v1.2.0
+- Correctly print active_model_errors for models that don't have tables - #42 by sahglie
+- Update AmazingPrint::MongoMapper for frozen strings - #44
 
-  - Fix frozen string literal issue with ActiveRecord
-  - Add uncolor String method to remove ANSI color codes - #30 by duffyjp
-  - Restore original copyright - #33 by amarshall
-  - Remove method core extension since it is not needed since ruby 1.9 - #37 by grosser
-  - Remove pale and black string color aliases - #38
-  - Fix formatting ActionController::Parameters - #29
+## v1.2.0
 
+- Fix frozen string literal issue with ActiveRecord
+- Add uncolor String method to remove ANSI color codes - #30 by duffyjp
+- Restore original copyright - #33 by amarshall
+- Remove method core extension since it is not needed since ruby 1.9 - #37 by grosser
+- Remove pale and black string color aliases - #38
+- Fix formatting ActionController::Parameters - #29
 
 ## v1.1.0
-  - Print out method keyword arguments
-  - Fix NoMethodError with Sequel
-  - Code cleanups
-
-Thanks for the great contributions from:
 
-  - andydna
-  - beanieboi
+- Print out method keyword arguments
+- Fix NoMethodError with Sequel
+- Code cleanups
 
+Thanks for the great contributions from:
 
+- andydna
+- beanieboi
 
 ## v1.0.0
-  - Initial Release.
+
+- Initial Release.

data/README.md

@@ -8,14 +8,14 @@
 |
 [![Gitter](https://badges.gitter.im/amazing-print/community.svg)](https://gitter.im/amazing-print/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
-AmazingPrint is a fork of [AwesomePrint](https://github.com/awesome-print/awesome_print) which became stale and should be used in its place to avoid conflicts. It is a Ruby library that pretty prints Ruby objects in full color exposing their internal structure with proper indentation. Rails ActiveRecord objects and usage within Rails templates are supported via included mixins.
+AmazingPrint is a fork of [AwesomePrint](https://github.com/awesome-print/awesome_print), which became stale, and should be used in its place to avoid conflicts. It is a Ruby library that pretty prints Ruby objects in full color, exposing their internal structure with proper indentation. Rails ActiveRecord objects and usage within Rails templates are supported via included mixins.
 
 ![GitHub API demo](github-api-demo.gif)
 
 ### Supported Versions ###
 
-- Ruby >= 2.5
-- Rails >= 5.2
+- Ruby >= 3.1
+- Rails >= 6.1
 
 ### Installation ###
     # Installing as Ruby gem
@@ -266,7 +266,7 @@ rails>
 ```
 
 ### IRB integration ###
-To use amazing_print as default formatter in irb and Rails console add the following
+To use amazing_print as the default formatter in irb and the Rails console, add the following
 code to your ~/.irbrc file:
 
 ```ruby
@@ -293,7 +293,7 @@ By default, this logs at the :debug level. You can override that globally with:
 
     :log_level => :info
 
-in the custom defaults (see below). You can also override on a per call basis with:
+in the custom defaults (see below). You can also override it on a per call basis with:
 
     logger.ap object, :warn
     # or
@@ -310,22 +310,22 @@ within Rails templates. For example:
     <%= ap @accounts.first %>   # ERB
     != ap @accounts.first       # HAML
 
-With other web frameworks (ex: in Sinatra templates) you can explicitly request HTML
+With other web frameworks (for example in Sinatra templates) you can explicitly request HTML
 formatting:
 
     <%= ap @accounts.first, :html => true %>
 
-### String Convenience Methods ###
+### Colorizing Strings ###
 Use methods such as `.red` to set string color:
 
 ```ruby
-irb> puts "red text".red
+irb> puts AmazingPrint::Colors.red("red text")
 red text # (it's red)
 ```
 
 ### Setting Custom Defaults ###
-You can set your own default options by creating ``aprc`` file in your `$XDG_CONFIG_HOME`
-directory (defaults to `~/.config` if undefined). Within that file assign your defaults
+You can set your own default options by creating an ``aprc`` file in your `$XDG_CONFIG_HOME`
+directory (which defaults to `~/.config` if undefined). Within that file assign your defaults
 to ``AmazingPrint.defaults``.
 For example:
 
@@ -340,7 +340,7 @@ AmazingPrint.defaults = {
 }
 ```
 
-The previous `~/.aprc` location is still supported as fallback.
+The previous `~/.aprc` location is still supported as a fallback.
 
 ## Versioning
 

data/lib/amazing_print/core_ext/awesome_method_array.rb

@@ -56,7 +56,7 @@ module AwesomeMethodArray # :nodoc:
     # the comment :-)
     #
     arr = if blk
-            super(pattern) do |match|
+            super do |match|
               #
               # The binding can only be used with Ruby-defined methods, therefore
               # we must rescue potential "ArgumentError: Can't create Binding from
@@ -75,10 +75,10 @@ module AwesomeMethodArray # :nodoc:
               yield match
             end
           else
-            super(pattern)
+            super
           end
     arr.instance_variable_set(:@__awesome_methods__, instance_variable_get(:@__awesome_methods__))
-    arr.select! { |item| (item.is_a?(Symbol) || item.is_a?(String)) } # grep block might return crap.
+    arr.select! { |item| item.is_a?(Symbol) || item.is_a?(String) } # grep block might return crap.
     arr
   end
 end

data/lib/amazing_print/custom_defaults.rb

@@ -44,7 +44,13 @@ module AmazingPrint
     end
 
     def pry!
-      Pry.print = proc { |output, value| output.puts value.ai } if defined?(Pry)
+      return unless defined?(Pry)
+
+      Pry.print = proc do |_output, value, pry_instance|
+        pry_instance.pager.open do |pager|
+          pager.print "#{value.ai}\n"
+        end
+      end
     end
 
     ##

data/lib/amazing_print/ext/active_record.rb

@@ -20,11 +20,15 @@ module AmazingPrint
 
       if object.is_a?(::ActiveRecord::Base)
         cast = :active_record_instance
+      elsif object.is_a?(Class) && object.include?(::ActiveModel::Attributes)
+        cast = :active_model_class
+      elsif object.is_a?(::ActiveModel::Attributes)
+        cast = :active_model_instance
       elsif object.is_a?(::ActiveModel::Errors)
         cast = :active_model_error
-      elsif object.is_a?(Class) && object.ancestors.include?(::ActiveRecord::Base)
+      elsif object.is_a?(Class) && object <= ::ActiveRecord::Base
         cast = :active_record_class
-      elsif type == :activerecord_relation || object.class.ancestors.include?(::ActiveRecord::Relation)
+      elsif type == :activerecord_relation || object.is_a?(::ActiveRecord::Relation)
         cast = :array
       end
       cast
@@ -71,6 +75,32 @@ module AmazingPrint
       [awesome_simple("class #{object} < #{object.superclass}", :class), awesome_hash(data)].join(' ')
     end
 
+    # Format ActiveModel instance object.
+    #------------------------------------------------------------------------------
+    def awesome_active_model_instance(object)
+      return object.inspect unless defined?(::ActiveSupport::OrderedHash)
+      return awesome_object(object) if @options[:raw]
+
+      data = object.attributes.each_with_object(::ActiveSupport::OrderedHash.new) do |c, hash|
+        hash[c.first.to_sym] = c.last
+      end
+
+      [awesome_simple(object.to_s, :active_model_instance), awesome_hash(data)].join(' ')
+    end
+
+    # Format ActiveModel class object.
+    #------------------------------------------------------------------------------
+    def awesome_active_model_class(object)
+      return object.inspect unless defined?(::ActiveSupport::OrderedHash)
+      return awesome_class(object) if @options[:raw]
+
+      data = object.attribute_types.each_with_object(::ActiveSupport::OrderedHash.new) do |c, hash|
+        hash[c.first.to_sym] = c.last.type
+      end
+
+      [awesome_simple("class #{object} < #{object.superclass}", :class), awesome_hash(data)].join(' ')
+    end
+
     # Format ActiveModel error object.
     #------------------------------------------------------------------------------
     def awesome_active_model_error(object)

data/lib/amazing_print/ext/mongo_mapper.rb

@@ -19,8 +19,8 @@ module AmazingPrint
       cast = cast_without_mongo_mapper(object, type)
 
       if defined?(::MongoMapper::Document)
-        if object.is_a?(Class) && !(object.ancestors & [::MongoMapper::Document,
-                                                        ::MongoMapper::EmbeddedDocument]).empty?
+        if object.is_a?(Class) && !object.ancestors.intersect?([::MongoMapper::Document,
+                                                                ::MongoMapper::EmbeddedDocument]).nil?
           cast = :mongo_mapper_class
         elsif object.is_a?(::MongoMapper::Document) || object.is_a?(::MongoMapper::EmbeddedDocument)
           cast = :mongo_mapper_instance

data/lib/amazing_print/ext/mongoid.rb

@@ -33,8 +33,14 @@ module AmazingPrint
     def awesome_mongoid_class(object)
       return object.inspect if !defined?(::ActiveSupport::OrderedHash) || !object.respond_to?(:fields)
 
+      aliases = object.aliased_fields.invert
       data = object.fields.sort.each_with_object(::ActiveSupport::OrderedHash.new) do |c, hash|
-        hash[c[1].name.to_sym] = (c[1].type || 'undefined').to_s.underscore.intern
+        name = c[1].name
+        alias_name = aliases[name] unless name == '_id'
+        printed_name = alias_name ? "#{alias_name}(#{name})" : name
+
+        hash[printed_name.to_sym] = (c[1].type || 'undefined').to_s.underscore.intern
+        hash
       end
 
       name = "class #{awesome_simple(object.to_s, :class)}"
@@ -48,8 +54,14 @@ module AmazingPrint
     def awesome_mongoid_document(object)
       return object.inspect unless defined?(::ActiveSupport::OrderedHash)
 
+      aliases = object.aliased_fields.invert
       data = (object.attributes || {}).sort.each_with_object(::ActiveSupport::OrderedHash.new) do |c, hash|
-        hash[c[0].to_sym] = c[1]
+        name = c[0]
+        alias_name = aliases[name] unless name == '_id'
+        printed_name = alias_name ? "#{alias_name}(#{name})" : name
+
+        hash[printed_name.to_sym] = c[1]
+        hash
       end
       data = { errors: object.errors, attributes: data } unless object.errors.empty?
       "#{object} #{awesome_hash(data)}"

data/lib/amazing_print/ext/nobrainer.rb

@@ -32,9 +32,9 @@ module AmazingPrint
     #------------------------------------------------------------------------------
     def awesome_nobrainer_class(object)
       name = "#{awesome_simple(object, :class)} < #{awesome_simple(object.superclass, :class)}"
-      data = object.fields.map do |field, options|
+      data = object.fields.to_h do |field, options|
         [field, (options[:type] || Object).to_s.underscore.to_sym]
-      end.to_h
+      end
 
       name = "class #{awesome_simple(object.to_s, :class)}"
       base = "< #{awesome_simple(object.superclass.to_s, :class)}"

data/lib/amazing_print/ext_loader.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module AmazingPrint
+  ##
+  # Attempt to load extensions up to 3 times since this library may be required
+  # before dependencies that we have extensions for.
+  #
+  class ExtLoader
+    EXT_LOAD_ATTEMPT_LIMIT = 3
+
+    @load_attemps = 0
+
+    def self.call
+      return if @load_attemps >= EXT_LOAD_ATTEMPT_LIMIT
+
+      require_relative 'ext/mongo_mapper'   if defined?(MongoMapper)
+      require_relative 'ext/mongoid'        if defined?(Mongoid)
+      require_relative 'ext/nobrainer'      if defined?(NoBrainer)
+      require_relative 'ext/nokogiri'       if defined?(Nokogiri)
+      require_relative 'ext/ostruct'        if defined?(OpenStruct) # rubocop:disable Style/OpenStructUse
+      require_relative 'ext/ripple'         if defined?(Ripple)
+      require_relative 'ext/sequel'         if defined?(Sequel)
+
+      @load_attemps += 1
+    end
+  end
+end

data/lib/amazing_print/formatter.rb

@@ -48,7 +48,7 @@ module AmazingPrint
       elsif (hash = convert_to_hash(object))
         awesome_hash(hash)
       else
-        awesome_simple(object.inspect.to_s, type, @inspector)
+        awesome_simple(object.inspect.to_s, type, @inspector) # rubocop:disable Lint/RedundantTypeConversion
       end
     end
 

data/lib/amazing_print/formatters/array_formatter.rb

@@ -15,7 +15,7 @@ module AmazingPrint
       end
 
       def format
-        if array.empty?
+        if array.length.zero? # rubocop:disable Style/ZeroLengthPredicate
           '[]'
         elsif methods_array?
           methods_array

data/lib/amazing_print/formatters/base_formatter.rb

@@ -110,8 +110,8 @@ module AmazingPrint
         inspector.current_indentation
       end
 
-      def indented(&blk)
-        inspector.increase_indentation(&blk)
+      def indented(&)
+        inspector.increase_indentation(&)
       end
 
       # precompute common indentations
@@ -130,17 +130,26 @@ module AmazingPrint
       def align(value, width)
         if options[:multiline]
           indent_option = options[:indent]
+          effective_width = width + value.size - colorless_size(value)
           if indent_option.positive?
-            value.rjust(width)
+            value.rjust(effective_width)
           elsif indent_option.zero?
-            "#{indent}#{value.ljust(width)}"
+            "#{indent}#{value.ljust(effective_width)}"
           else
-            "#{indent(indentation + indent_option)}#{value.ljust(width)}"
+            "#{indent(indentation + indent_option)}#{value.ljust(effective_width)}"
           end
         else
           value
         end
       end
+
+      def colorless(string)
+        string.gsub(/\e\[[\d;]+m/, '')
+      end
+
+      def colorless_size(string)
+        colorless(string).size
+      end
     end
   end
 end

data/lib/amazing_print/formatters/hash_formatter.rb

@@ -65,8 +65,18 @@ module AmazingPrint
         result
       end
 
+      def key_size(key)
+        return key.inspect.size if symbol?(key)
+
+        if options[:html]
+          single_line { inspector.awesome(key) }.size
+        else
+          plain_single_line { inspector.awesome(key) }.size
+        end
+      end
+
       def max_key_width(keys)
-        keys.map { |key, _value| key.size }.max || 0
+        keys.map { |key, _value| key_size(key) }.max || 0
       end
 
       def printable_keys
@@ -75,34 +85,41 @@ module AmazingPrint
         keys.sort! { |a, b| a.to_s <=> b.to_s } if options[:sort_keys]
 
         keys.map! do |key|
-          plain_single_line do
-            [inspector.awesome(key), hash[key]]
+          single_line do
+            [key, hash[key]]
           end
         end
       end
 
       def symbol?(key)
-        key[0] == ':'
+        key.is_a?(Symbol)
       end
 
       def ruby19_syntax(key, value, width)
-        key[0] = ''
-        key << ':'
-        "#{align(key, width)} #{inspector.awesome(value)}"
+        # Move the colon to the right side of the symbol
+        awesome_key = inspector.awesome(key).sub(/#{key.inspect}/, "#{key}:")
+
+        "#{align(awesome_key, width)} #{inspector.awesome(value)}"
       end
 
       def pre_ruby19_syntax(key, value, width)
-        "#{align(key, width)}#{colorize(' => ', :hash)}#{inspector.awesome(value)}"
+        awesome_key = single_line { inspector.awesome(key) }
+        "#{align(awesome_key, width)}#{colorize(' => ', :hash)}#{inspector.awesome(value)}"
       end
 
-      def plain_single_line
+      def plain_single_line(&)
         plain = options[:plain]
-        multiline = options[:multiline]
         options[:plain] = true
+        single_line(&)
+      ensure
+        options[:plain] = plain
+      end
+
+      def single_line
+        multiline = options[:multiline]
         options[:multiline] = false
         yield
       ensure
-        options[:plain] = plain
         options[:multiline] = multiline
       end
     end

data/lib/amazing_print/formatters/mswin_helper.rb

@@ -27,10 +27,10 @@ module AmazingPrint
       def mode
         r = ['-'] * 6
         r[0] = 'd' if @stat.directory?
-        r[1] = 'a' unless (@attrs & FILE_ATTRIBUTE_ARCHIVE).zero?
-        r[2] = 'r' unless (@attrs & FILE_ATTRIBUTE_READONLY).zero?
-        r[3] = 'h' unless (@attrs & FILE_ATTRIBUTE_HIDDEN).zero?
-        r[4] = 's' unless (@attrs & FILE_ATTRIBUTE_SYSTEM).zero?
+        r[1] = 'a' unless @attrs.nobits?(FILE_ATTRIBUTE_ARCHIVE)
+        r[2] = 'r' unless @attrs.nobits?(FILE_ATTRIBUTE_READONLY)
+        r[3] = 'h' unless @attrs.nobits?(FILE_ATTRIBUTE_HIDDEN)
+        r[4] = 's' unless @attrs.nobits?(FILE_ATTRIBUTE_SYSTEM)
         r[5] = 'l' if File.symlink? @fname
         r.join
       end

data/lib/amazing_print/formatters/object_formatter.rb

@@ -17,7 +17,7 @@ module AmazingPrint
 
       def format
         vars = variables.map do |var|
-          property = var.to_s[1..-1].to_sym # to_s because of some monkey patching done by Puppet.
+          property = var.to_s[1..].to_sym # to_s because of some monkey patching done by Puppet.
           accessor = if object.respond_to?(:"#{property}=")
                        object.respond_to?(property) ? :accessor : :writer
                      else
@@ -68,7 +68,7 @@ module AmazingPrint
         # We need to ensure that the original Kernel#format is used here instead of the one
         # defined above.
         # rubocop:disable Style/ColonMethodCall
-        str + Kernel::format(':0x%08x', (object.__id__ * 2))
+        str + Kernel::format(':0x%08x', object.__id__ * 2)
         # rubocop:enable Style/ColonMethodCall
       end
 

data/lib/amazing_print/formatters/struct_formatter.rb

@@ -17,7 +17,7 @@ module AmazingPrint
 
       def format
         vars = variables.map do |var|
-          property = var.to_s[1..-1].to_sym # to_s because of some monkey patching done by Puppet.
+          property = var.to_s[1..].to_sym # to_s because of some monkey patching done by Puppet.
           accessor = if struct.respond_to?(:"#{property}=")
                        struct.respond_to?(property) ? :accessor : :writer
                      else
@@ -61,7 +61,7 @@ module AmazingPrint
         # We need to ensure that the original Kernel#format is used here instead of the one defined
         # above.
         # rubocop:disable Style/ColonMethodCall
-        Kernel::format("#{struct.class.superclass}:#{struct.class}:0x%08x", (struct.__id__ * 2))
+        Kernel::format("#{struct.class.superclass}:#{struct.class}:0x%08x", struct.__id__ * 2)
         # rubocop:enable Style/ColonMethodCall
       end
 

data/lib/amazing_print/inspector.rb

@@ -6,9 +6,10 @@
 # See LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 
-# rubocop:disable Metrics/ClassLength
+# rubocop:disable Metrics/ClassLength, Metrics/MethodLength
 
 require_relative 'indentator'
+require_relative 'ext_loader'
 
 module AmazingPrint
   class Inspector
@@ -70,14 +71,16 @@ module AmazingPrint
       @formatter = AmazingPrint::Formatter.new(self)
       @indentator = AmazingPrint::Indentator.new(@options[:indent].abs)
       Thread.current[AP] ||= []
+
+      ExtLoader.call
     end
 
     def current_indentation
       indentator.indentation
     end
 
-    def increase_indentation(&blk)
-      indentator.indent(&blk)
+    def increase_indentation(&)
+      indentator.indent(&)
     end
 
     # Dispatcher that detects data nesting and invokes object-aware formatter.
@@ -189,11 +192,11 @@ module AmazingPrint
     #---------------------------------------------------------------------------
     def merge_custom_defaults!
       load_dotfile
-      merge_options!(AmazingPrint.defaults) if AmazingPrint.defaults.is_a?(Hash)
+      merge_options!(AmazingPrint.defaults.dup) if AmazingPrint.defaults.is_a?(Hash)
     rescue StandardError => e
       warn "Could not load '.aprc' from ENV['HOME']: #{e}"
     end
   end
 end
 
-# rubocop:enable Metrics/ClassLength
+# rubocop:enable Metrics/ClassLength, Metrics/MethodLength

data/lib/amazing_print/version.rb

@@ -7,6 +7,6 @@
 #------------------------------------------------------------------------------
 module AmazingPrint
   def self.version
-    '1.5.0'
+    '1.8.1'
   end
 end

data/lib/amazing_print.rb

@@ -33,12 +33,6 @@ unless defined?(AmazingPrint::Inspector)
       require_relative 'amazing_print/ext/action_view'
     end
   end
-  require_relative 'amazing_print/ext/mongo_mapper'   if defined?(MongoMapper)
-  require_relative 'amazing_print/ext/mongoid'        if defined?(Mongoid)
-  require_relative 'amazing_print/ext/nokogiri'       if defined?(Nokogiri)
-  require_relative 'amazing_print/ext/nobrainer'      if defined?(NoBrainer)
-  require_relative 'amazing_print/ext/ripple'         if defined?(Ripple)
-  require_relative 'amazing_print/ext/sequel'         if defined?(Sequel)
-  require_relative 'amazing_print/ext/ostruct'        if defined?(OpenStruct)
+
+  AmazingPrint::ExtLoader.call
 end
-# test