amazing_print 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c49ac51983ec5dc57570bb8e77591c4aa837da01afec64fe9d62139f296ac42b
-  data.tar.gz: c1145227423a78c989a8d9a49f8e3ab33b8a39c33b3a197e16a3353300ed20dd
+  metadata.gz: 831dcabef8a04de7ce8342167146dc8ab32017b74d4edd59cb195a151f7da935
+  data.tar.gz: 4ee631f2582a834a7cf729cc183da2f9473fb8c3fd77ba176eaf731722b7a626
 SHA512:
-  metadata.gz: b0039aa9251d996bb7fa516b33ebfd354861caee637c3f5d48dcbd0200739a362159ecad59aa83ba90ec1b607d39ce919ea0b1cee746535b7da05fb9785acfd1
-  data.tar.gz: fc2fe38dab3c905483c1f946c6239d479bb827de954cc6504a2046d02762cdbdd3435e411837e7bfa3d319bcff99cdba502eba66c32c688c61b05733e2758c1e
+  metadata.gz: 65eccdf9af7bae3928fa0310e17e823c2c308bb21884cb70d264175fbf1d73716e5a8e2d8ff3bed7a316033fb7d61763cc70ae6411fb68566cbf599fb0fd535d
+  data.tar.gz: 138adab4d8821378740b0214553c2a8ef6ac0cb7ce96cdf0029b437fb30bc3776958f81aa00dddbc855d137114388ae7b4ef4513df41d0ab280f34563342b95d

data/CHANGELOG.md

@@ -1,2 +1,18 @@
+## unreleased
+  - Add `uncolor` method to remove ANSI color sequences. 
+
+
+## v1.1.0
+  - Print out method keyword arguments
+  - Fix NoMethodError with Sequel
+  - Code cleanups
+
+Thanks for the great contributions from:
+
+  - andydna
+  - beanieboi
+
+
+
 ## v1.0.0
   - Initial Release.

data/Gemfile

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

data/LICENSE

@@ -1,5 +1,6 @@
 MIT License
 
+Copyright (c) 2010-2019 Michael Dvorkin
 Copyright (c) 2020 AmazingPrint
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler/setup'
 

data/lib/amazing_print.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.
@@ -8,7 +10,7 @@
 # so do nothing for subsequent requires.
 #
 unless defined?(AmazingPrint::Inspector)
-  %w[awesome_method_array string method object class kernel].each do |file|
+  %w[awesome_method_array string object class kernel].each do |file|
     require_relative "amazing_print/core_ext/#{file}"
   end
 

data/lib/amazing_print/colorize.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 autoload :CGI, 'cgi'
 
 module AmazingPrint

data/lib/amazing_print/core_ext/awesome_method_array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.
@@ -76,7 +78,7 @@ module AwesomeMethodArray #:nodoc:
             super(pattern)
           end
     arr.instance_variable_set(:@__awesome_methods__, instance_variable_get(:@__awesome_methods__))
-    arr.reject! { |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/core_ext/class.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.

data/lib/amazing_print/core_ext/kernel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.

data/lib/amazing_print/core_ext/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.

data/lib/amazing_print/core_ext/object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.

data/lib/amazing_print/core_ext/string.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.
@@ -37,6 +38,8 @@ class String
     end
   end
 
-  alias black grayish
-  alias pale  whiteish
+  # Remove ANSI color codes.
+  def uncolor
+    gsub(/\e\[[0-9;]*m/, '')
+  end
 end

data/lib/amazing_print/custom_defaults.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AmazingPrint
   class << self
     attr_accessor :defaults, :force_colors

data/lib/amazing_print/ext/action_view.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.

data/lib/amazing_print/ext/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.
@@ -53,7 +55,7 @@ module AmazingPrint
                  end
                end
              end
-      "#{object} " << awesome_hash(data)
+      "#{object} " + awesome_hash(data)
     end
 
     # Format ActiveRecord class object.

data/lib/amazing_print/ext/active_support.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.

data/lib/amazing_print/ext/mongo_mapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.
@@ -17,7 +19,7 @@ module AmazingPrint
       cast = cast_without_mongo_mapper(object, type)
 
       if defined?(::MongoMapper::Document)
-        if object.is_a?(Class) && (object.ancestors & [::MongoMapper::Document, ::MongoMapper::EmbeddedDocument]).size > 0
+        if object.is_a?(Class) && !(object.ancestors & [::MongoMapper::Document, ::MongoMapper::EmbeddedDocument]).empty?
           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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.

data/lib/amazing_print/ext/nobrainer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.

data/lib/amazing_print/ext/nokogiri.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.

data/lib/amazing_print/ext/ostruct.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.

data/lib/amazing_print/ext/ripple.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.

data/lib/amazing_print/ext/sequel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.
@@ -16,7 +18,7 @@ module AmazingPrint
       cast = cast_without_sequel(object, type)
       if defined?(::Sequel::Model) && object.is_a?(::Sequel::Model)
         cast = :sequel_document
-      elsif defined?(::Sequel::Model) && object.is_a?(Class) && object.ancestors.include?(::Sequel::Model) && object&.name != "Sequel::Model"
+      elsif defined?(::Sequel::Model) && object.is_a?(Class) && object.ancestors.include?(::Sequel::Model) && object&.name != 'Sequel::Model'
         cast = :sequel_model_class
       elsif defined?(::Sequel::Mysql2::Dataset) && object.class.ancestors.include?(::Sequel::Mysql2::Dataset)
         cast = :sequel_dataset
@@ -27,7 +29,7 @@ module AmazingPrint
     # Format Sequel Document object.
     #------------------------------------------------------------------------------
     def awesome_sequel_document(object)
-      data = object.values.sort_by { |key| key.to_s }.each_with_object({}) do |c, hash|
+      data = object.values.sort_by(&:to_s).each_with_object({}) do |c, hash|
         hash[c[0].to_sym] = c[1]
       end
       data = { errors: object.errors, values: data } unless object.errors.empty?

data/lib/amazing_print/formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.
@@ -111,6 +113,11 @@ module AmazingPrint
 
       return nil if object.method(:to_hash).arity != 0
 
+      # ActionController::Parameters will raise if they are not yet permitted and
+      # we try to convert to hash.
+      # https://api.rubyonrails.org/classes/ActionController/Parameters.html
+      return nil if object.respond_to?(:permitted?) && !object.permitted?
+
       hash = object.to_hash
       return nil if !hash.respond_to?(:keys) || !hash.respond_to?(:[])
 

data/lib/amazing_print/formatters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AmazingPrint
   module Formatters
     require_relative 'formatters/object_formatter'

data/lib/amazing_print/formatters/array_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base_formatter'
 
 module AmazingPrint
@@ -31,7 +33,7 @@ module AmazingPrint
         if options[:multiline]
           multiline_array
         else
-          '[ ' << array.map { |item| inspector.awesome(item) }.join(', ') << ' ]'
+          '[ ' + array.map { |item| inspector.awesome(item) }.join(', ') + ' ]'
         end
       end
 

data/lib/amazing_print/formatters/base_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../colorize'
 
 module AmazingPrint
@@ -93,7 +95,7 @@ module AmazingPrint
         # #<UnboundMethod: Hello#world>
         # #<UnboundMethod: Hello#world() /home/hs/code/amazing_print/spec/methods_spec.rb:68>
         #
-        if method.to_s =~ /(Unbound)*Method: ((#<)?[^\/#]*)[#\.]/
+        if method.to_s =~ %r{(Unbound)*Method: ((#<)?[^/#]*)[#\.]}
           unbound = Regexp.last_match(1) && '(unbound)'
           klass = Regexp.last_match(2)
           if klass && klass =~ /(\(\w+:\s.*?\))/ # Is this ActiveRecord-style class?

data/lib/amazing_print/formatters/class_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base_formatter'
 
 module AmazingPrint

data/lib/amazing_print/formatters/dir_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shellwords'
 
 require_relative 'base_formatter'

data/lib/amazing_print/formatters/file_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shellwords'
 
 require_relative 'base_formatter'

data/lib/amazing_print/formatters/hash_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base_formatter'
 
 module AmazingPrint
@@ -88,7 +90,7 @@ module AmazingPrint
       end
 
       def pre_ruby19_syntax(key, value, width)
-        align(key, width) << colorize(' => ', :hash) << inspector.awesome(value)
+        align(key, width) + colorize(' => ', :hash) + inspector.awesome(value)
       end
 
       def plain_single_line

data/lib/amazing_print/formatters/method_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base_formatter'
 
 module AmazingPrint

data/lib/amazing_print/formatters/object_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base_formatter'
 
 module AmazingPrint
@@ -33,15 +35,15 @@ module AmazingPrint
           end
 
           unless options[:plain]
-            if key =~ /(@\w+)/
-              key.sub!(Regexp.last_match(1), colorize(Regexp.last_match(1), :variable))
-            else
-              key.sub!(/(attr_\w+)\s(\:\w+)/, "#{colorize('\\1', :keyword)} #{colorize('\\2', :method)}")
-            end
+            key = if key =~ /(@\w+)/
+                    key.sub(Regexp.last_match(1), colorize(Regexp.last_match(1), :variable))
+                  else
+                    key.sub(/(attr_\w+)\s(\:\w+)/, "#{colorize('\\1', :keyword)} #{colorize('\\2', :method)}")
+                  end
           end
 
           indented do
-            key << colorize(' = ', :hash) + inspector.awesome(object.instance_variable_get(var))
+            key + colorize(' = ', :hash) + inspector.awesome(object.instance_variable_get(var))
           end
         end
 
@@ -60,14 +62,13 @@ module AmazingPrint
 
       def awesome_instance
         str = object.send(options[:class_name]).to_s
-        # We need to ensure that the original Kernel#format is used here instead of the one defined
-        # above.
+        return str unless options[:object_id]
+
+        # We need to ensure that the original Kernel#format is used here instead of the one
+        # defined above.
         # rubocop:disable Style/ColonMethodCall
-        if options[:object_id]
-          str << Kernel::format(':0x%08x', (object.__id__ * 2))
-        end
+        str + Kernel::format(':0x%08x', (object.__id__ * 2))
         # rubocop:enable Style/ColonMethodCall
-        str
       end
 
       def left_aligned

data/lib/amazing_print/formatters/simple_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base_formatter'
 
 module AmazingPrint

data/lib/amazing_print/formatters/struct_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base_formatter'
 
 module AmazingPrint
@@ -33,15 +35,15 @@ module AmazingPrint
           end
 
           unless options[:plain]
-            if key =~ /(@\w+)/
-              key.sub!(Regexp.last_match(1), colorize(Regexp.last_match(1), :variable))
-            else
-              key.sub!(/(attr_\w+)\s(\:\w+)/, "#{colorize('\\1', :keyword)} #{colorize('\\2', :method)}")
-            end
+            key = if key =~ /(@\w+)/
+                    key.sub(Regexp.last_match(1), colorize(Regexp.last_match(1), :variable))
+                  else
+                    key.sub(/(attr_\w+)\s(\:\w+)/, "#{colorize('\\1', :keyword)} #{colorize('\\2', :method)}")
+                  end
           end
 
           indented do
-            key << colorize(' = ', :hash) + inspector.awesome(struct.send(var))
+            key + colorize(' = ', :hash) + inspector.awesome(struct.send(var))
           end
         end
 

data/lib/amazing_print/indentator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AmazingPrint
   class Indentator
     attr_reader :shift_width, :indentation

data/lib/amazing_print/inspector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.
@@ -26,7 +28,7 @@ module AmazingPrint
         class_name: :class, # Method used to get Instance class name.
         object_id: true, # Show object_id.
         color: {
-          args: :pale,
+          args: :whiteish,
           array: :white,
           bigdecimal: :blue,
           class: :yellow,
@@ -35,13 +37,13 @@ module AmazingPrint
           fixnum: :blue,
           integer: :blue,
           float: :blue,
-          hash: :pale,
+          hash: :whiteish,
           keyword: :cyan,
           method: :purpleish,
           nilclass: :red,
           rational: :blue,
           string: :yellowish,
-          struct: :pale,
+          struct: :whiteish,
           symbol: :cyanish,
           time: :greenish,
           trueclass: :green,
@@ -86,10 +88,10 @@ module AmazingPrint
     def colorize?
       AmazingPrint.force_colors ||= false
       AmazingPrint.force_colors || (
-        if defined? @colorize_STDOUT
-          @colorize_STDOUT
+        if defined? @colorize_stdout
+          @colorize_stdout
         else
-          @colorize_STDOUT = STDOUT.tty? && (
+          @colorize_stdout = STDOUT.tty? && (
             (
               ENV['TERM'] &&
               ENV['TERM'] != 'dumb'
@@ -165,9 +167,7 @@ module AmazingPrint
     #---------------------------------------------------------------------------
     def merge_custom_defaults!
       load_dotfile
-      if AmazingPrint.defaults.is_a?(Hash)
-        merge_options!(AmazingPrint.defaults)
-      end
+      merge_options!(AmazingPrint.defaults) if AmazingPrint.defaults.is_a?(Hash)
     rescue StandardError => e
       warn "Could not load '.aprc' from ENV['HOME']: #{e}"
     end

data/lib/amazing_print/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.
@@ -5,6 +7,6 @@
 #------------------------------------------------------------------------------
 module AmazingPrint
   def self.version
-    '1.1.0'
+    '1.2.0'
   end
 end

data/lib/ap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.

data/spec/active_record_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if ExtVerifier.has_rails?
   # Required to use the column support
   module Rails

data/spec/colors_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'AmazingPrint' do
@@ -18,8 +20,8 @@ RSpec.describe 'AmazingPrint' do
   end
 
   describe 'colorization' do
-    PLAIN = '[ 1, :two, "three", [ nil, [ true, false ] ] ]'.freeze
-    COLORIZED = "[ \e[1;34m1\e[0m, \e[0;36m:two\e[0m, \e[0;33m\"three\"\e[0m, [ \e[1;31mnil\e[0m, [ \e[1;32mtrue\e[0m, \e[1;31mfalse\e[0m ] ] ]".freeze
+    PLAIN = '[ 1, :two, "three", [ nil, [ true, false ] ] ]'
+    COLORIZED = "[ \e[1;34m1\e[0m, \e[0;36m:two\e[0m, \e[0;33m\"three\"\e[0m, [ \e[1;31mnil\e[0m, [ \e[1;32mtrue\e[0m, \e[1;31mfalse\e[0m ] ] ]"
 
     before do
       ENV['TERM'] = 'xterm-colors'
@@ -110,5 +112,12 @@ RSpec.describe 'AmazingPrint' do
         end
       end
     end
+
+    describe 'uncolor' do
+      it 'removes any ANSI color codes' do
+        expect('red'.red + 'blue'.blue).to eq "\e[1;31mred\e[0m\e[1;34mblue\e[0m"
+        expect(('red'.red + 'blue'.blue).uncolor).to eq 'redblue'
+      end
+    end
   end
 end

data/spec/core_ext/logger_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'logger'

data/spec/core_ext/string_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'String extensions' do
@@ -10,11 +12,4 @@ RSpec.describe 'String extensions' do
       expect(color.to_s.send(:"#{color}ish")).to eq("\e[0;#{30 + i}m#{color}\e[0m")
     end
   end
-
-  it 'should have black and pale colors' do
-    expect('black'.send(:black)).to eq('black'.send(:grayish))
-    expect('pale'.send(:pale)).to eq('pale'.send(:whiteish))
-    expect('pale'.send(:pale)).to eq("\e[0;37mpale\e[0m")
-    expect('whiteish'.send(:whiteish)).to eq("\e[0;37mwhiteish\e[0m")
-  end
 end

data/spec/ext/action_controller_spec.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'AmazingPrint::ActionController', skip: -> { !ExtVerifier.has_rails? }.call do
+  let(:inspector) { AmazingPrint::Inspector.new }
+
+  context 'with unpermitted ActionController::Parameters' do
+    let(:parameters) do
+      ActionController::Parameters.new post: { id: 1, content: 'Some' }
+    end
+
+    it 'should format as an object' do
+      expect(inspector.send(:awesome, parameters)).to eq(
+        '<ActionController::Parameters {"post"=>{"id"=>1, "content"=>"Some"}} permitted: false>'
+      )
+    end
+  end
+
+  context 'with permitted ActionController::Parameters' do
+    let(:expected_output) do
+      <<~OUTPUT
+        {
+            \"post\"\e[0;37m => \e[0m{
+                     \"id\"\e[0;37m => \e[0m\e[1;34m1\e[0m,
+                \"content\"\e[0;37m => \e[0m\e[0;33m\"Some\"\e[0m
+            }
+        }
+      OUTPUT
+        .chomp
+    end
+    let(:parameters) do
+      ActionController::Parameters.new post: { id: 1, content: 'Some' }
+    end
+
+    it 'should format as a hash' do
+      expect(inspector.send(:awesome, parameters.permit!)).to eq expected_output
+    end
+  end
+end

data/spec/ext/action_view_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'AmazingPrint ActionView extensions', skip: -> { !ExtVerifier.has_rails? }.call do

data/spec/ext/active_record_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'active_record_helper'
 
@@ -257,9 +259,9 @@ RSpec.describe 'AmazingPrint/ActiveRecord', skip: -> { !ExtVerifier.has_rails? }
           )
         elsif RUBY_VERSION >= '2.7.0'
           expect(out).to match(
-            /\s*first\(\*args,\s+&block\)\s+#<Class:ActiveRecord::Base> \(ActiveRecord::Querying\)/
+            /\s*first\(\*(\*|args),\s+&(&|block)\)\s+#<Class:ActiveRecord::Base> \(ActiveRecord::Querying\)/
           )
-        elsif RUBY_VERSION >= '2.4.4'
+        elsif RUBY_VERSION =~ /^2\.4\.([4-9]|[1-9][0-9])|^2\.[56]\./
           expect(out).to match(/\sfirst\(\*arg.*?\)\s+User/)
         elsif RUBY_VERSION >= '1.9'
           expect(out).to match(/\sfirst\(\*args,\s&block\)\s+Class \(ActiveRecord::Querying\)/)
@@ -280,7 +282,7 @@ RSpec.describe 'AmazingPrint/ActiveRecord', skip: -> { !ExtVerifier.has_rails? }
         expect(out).to match(
           /\sprimary_key\(.*?\)\s+.+Class.+\(ActiveRecord::AttributeMethods::PrimaryKey::ClassMethods\)/
         )
-      elsif RUBY_VERSION >= '2.4.4'
+      elsif RUBY_VERSION =~ /^2\.4\.([4-9]|[1-9][0-9])|^2\.[56]\./
         expect(out).to match(/\sprimary_key\(.*?\)\s+User/)
       else
         expect(out).to match(/\sprimary_key\(.*?\)\s+Class \(ActiveRecord::AttributeMethods::PrimaryKey::ClassMethods\)/)
@@ -294,11 +296,11 @@ RSpec.describe 'AmazingPrint/ActiveRecord', skip: -> { !ExtVerifier.has_rails? }
       else
         if RUBY_PLATFORM == 'java'
           expect(out).to match(/\svalidate\(\*arg.*?\)\s+#<Class:\w+> \(ActiveModel::Validations::ClassMethods\)/)
-       elsif RUBY_VERSION >= '2.7.0'
+        elsif RUBY_VERSION >= '2.7.0'
           expect(out).to match(
             /\svalidate\(\*args.*?\)\s+#<Class:ActiveRecord::Base> \(ActiveModel::Validations::ClassMethods\)/
           )
-       elsif RUBY_VERSION >= '2.4.4'
+        elsif RUBY_VERSION =~ /^2\.4\.([4-9]|[1-9][0-9])|^2\.[56]\./
           expect(out).to match(/\svalidate\(\*arg.*?\)\s+User/)
         else
           expect(out).to match(/\svalidate\(\*arg.*?\)\s+Class \(ActiveModel::Validations::ClassMethods\)/)

data/spec/ext/active_support_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'AmazingPrint::ActiveSupport', skip: -> { !ExtVerifier.has_rails? }.call do

data/spec/ext/mongo_mapper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'AmazingPrint/MongoMapper', skip: -> { !ExtVerifier.has_mongo_mapper? }.call do
@@ -232,10 +234,10 @@ RSpec.describe 'AmazingPrint/MongoMapper', skip: -> { !ExtVerifier.has_mongo_map
     describe 'with show associations turned on and inline embedded turned on' do
       before :each do
         @ap = AmazingPrint::Inspector.new plain: true,
-                                           mongo_mapper: {
-                                             show_associations: true,
-                                             inline_embedded: true
-                                           }
+                                          mongo_mapper: {
+                                            show_associations: true,
+                                            inline_embedded: true
+                                          }
       end
 
       it 'should render an instance with associations shown and embeds there' do

data/spec/ext/mongoid_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'AmazingPrint/Mongoid', skip: -> { !ExtVerifier.has_mongoid? }.call do

data/spec/ext/nobrainer_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'AmazingPrint/NoBrainer', skip: -> { !ExtVerifier.has_nobrainer? }.call do

data/spec/ext/nokogiri_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'AmazingPrint/Nokogiri' do

data/spec/ext/ostruct_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'AmazingPrint Ostruct extension' do

data/spec/ext/ripple_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'AmazingPrint/Ripple', skip: -> { !ExtVerifier.has_ripple? }.call do

data/spec/ext/sequel_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'sequel_helper'
 
@@ -8,36 +10,36 @@ RSpec.describe 'AmazingPrint/Sequel', skip: -> { !ExtVerifier.has_sequel? }.call
     @user2 = SequelUser.new first_name: 'Sequel', last_name: 'Five'
   end
 
-    it 'display single record' do
-      out = @ap.awesome(@user1)
-      str = <<~EOS.strip
-        #<SequelUser:placeholder_id> {
-            :first_name => "Jeremy",
-             :last_name => "Evans"
-        }
-      EOS
-      expect(out).to be_similar_to(str)
-    end
+  it 'display single record' do
+    out = @ap.awesome(@user1)
+    str = <<~EOS.strip
+      #<SequelUser:placeholder_id> {
+          :first_name => "Jeremy",
+           :last_name => "Evans"
+      }
+    EOS
+    expect(out).to be_similar_to(str)
+  end
 
-    it 'display multiple records' do
-      out = @ap.awesome([@user1, @user2])
-      str = <<~EOS.strip
-        [
-            [0] #<SequelUser:placeholder_id> {
-                :first_name => "Jeremy",
-                 :last_name => "Evans"
-            },
-            [1] #<SequelUser:placeholder_id> {
-                :first_name => "Sequel",
-                 :last_name => "Five"
-            }
-        ]
-      EOS
-      expect(out).to be_similar_to(str)
-    end
+  it 'display multiple records' do
+    out = @ap.awesome([@user1, @user2])
+    str = <<~EOS.strip
+      [
+          [0] #<SequelUser:placeholder_id> {
+              :first_name => "Jeremy",
+               :last_name => "Evans"
+          },
+          [1] #<SequelUser:placeholder_id> {
+              :first_name => "Sequel",
+               :last_name => "Five"
+          }
+      ]
+    EOS
+    expect(out).to be_similar_to(str)
+  end
 
   it 'does not crash if on Sequel::Model' do
     out = @ap.awesome(::Sequel::Model)
-    expect(out).to be_similar_to("Sequel::Model < Object")
+    expect(out).to be_similar_to('Sequel::Model < Object')
   end
 end

data/spec/formats_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'bigdecimal'
 require 'set'
@@ -489,7 +491,7 @@ RSpec.describe 'AmazingPrint' do
   describe 'File' do
     it 'should display a file (plain)' do
       File.open(__FILE__, 'r') do |f|
-        expect(f.ai(plain: true)).to eq("#{f.inspect}\n" << `ls -alF #{f.path}`.chop)
+        expect(f.ai(plain: true)).to eq("#{f.inspect}\n" + `ls -alF #{f.path}`.chop)
       end
     end
   end
@@ -498,7 +500,7 @@ RSpec.describe 'AmazingPrint' do
   describe 'Dir' do
     it 'should display a direcory (plain)' do
       Dir.open(File.dirname(__FILE__)) do |d|
-        expect(d.ai(plain: true)).to eq("#{d.inspect}\n" << `ls -alF #{d.path}`.chop)
+        expect(d.ai(plain: true)).to eq("#{d.inspect}\n" + `ls -alF #{d.path}`.chop)
       end
     end
   end
@@ -566,19 +568,19 @@ RSpec.describe 'AmazingPrint' do
       end
     else # Prior to Ruby 1.9 the order of set values is unpredicatble.
       it 'plain multiline' do
-        expect(@set.sort_by { |x| x.to_s }.ai(plain: true)).to eq(@arr.sort_by { |x| x.to_s }.ai(plain: true))
+        expect(@set.sort_by(&:to_s).ai(plain: true)).to eq(@arr.sort_by(&:to_s).ai(plain: true))
       end
 
       it 'plain multiline indented' do
-        expect(@set.sort_by { |x| x.to_s }.ai(plain: true, indent: 1)).to eq(@arr.sort_by { |x| x.to_s }.ai(plain: true, indent: 1))
+        expect(@set.sort_by(&:to_s).ai(plain: true, indent: 1)).to eq(@arr.sort_by(&:to_s).ai(plain: true, indent: 1))
       end
 
       it 'plain single line' do
-        expect(@set.sort_by { |x| x.to_s }.ai(plain: true, multiline: false)).to eq(@arr.sort_by { |x| x.to_s }.ai(plain: true, multiline: false))
+        expect(@set.sort_by(&:to_s).ai(plain: true, multiline: false)).to eq(@arr.sort_by(&:to_s).ai(plain: true, multiline: false))
       end
 
       it 'colored multiline (default)' do
-        expect(@set.sort_by { |x| x.to_s }.ai).to eq(@arr.sort_by { |x| x.to_s }.ai)
+        expect(@set.sort_by(&:to_s).ai).to eq(@arr.sort_by(&:to_s).ai)
       end
     end
   end
@@ -695,7 +697,7 @@ RSpec.describe 'AmazingPrint' do
            rescue StandardError
              File.new('nul')
            end
-      expect(my.ai(plain: true)).to eq("#{my.inspect}\n" << `ls -alF #{my.path}`.chop)
+      expect(my.ai(plain: true)).to eq("#{my.inspect}\n" + `ls -alF #{my.path}`.chop)
     end
 
     it 'inherited from Dir should be displayed as Dir' do
@@ -703,7 +705,7 @@ RSpec.describe 'AmazingPrint' do
 
       require 'tmpdir'
       my = My.new(Dir.tmpdir)
-      expect(my.ai(plain: true)).to eq("#{my.inspect}\n" << `ls -alF #{my.path}`.chop)
+      expect(my.ai(plain: true)).to eq("#{my.inspect}\n" + `ls -alF #{my.path}`.chop)
     end
 
     it 'should handle a class that defines its own #send method' do

data/spec/methods_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Single method' do
@@ -486,16 +488,16 @@ RSpec.describe 'Methods arrays' do
       def him; end
 
       def his
-        private_methods.grep(/^h..$/) { |n| n.to_sym }
+        private_methods.grep(/^h..$/, &:to_sym)
       end
 
       def her
-        private_methods.grep(/^.e.$/) { |n| n.to_sym }
+        private_methods.grep(/^.e.$/, &:to_sym)
       end
     end
 
     hello = Hello.new
-    expect((hello.send(:his) - hello.send(:her)).sort_by { |x| x.to_s }).to eq(%i[him his])
+    expect((hello.send(:his) - hello.send(:her)).sort_by(&:to_s)).to eq(%i[him his])
   end
 
   it 'appending garbage to methods array should not raise error' do

data/spec/misc_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'AmazingPrint' do
@@ -14,7 +16,7 @@ RSpec.describe 'AmazingPrint' do
     it 'handle frozen object.inspect' do
       weird = Class.new do
         def inspect
-          'ice'.freeze
+          'ice'
         end
       end
       expect(weird.new.ai(plain: false)).to eq('ice')

data/spec/objects_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Objects' do

data/spec/sequel_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if ExtVerifier.has_sequel?
   # Establish connection to in-memory SQLite DB
   DB = RUBY_PLATFORM == 'java' ? Sequel.connect('jdbc:sqlite::memory:') : Sequel.sqlite

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.
@@ -21,7 +23,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each do |file|
+Dir[File.dirname(__FILE__) + '/support/**/*.rb'].sort.each do |file|
   require file
 end
 
@@ -29,6 +31,7 @@ ExtVerifier.require_dependencies!(
   %w[
     rails
     active_record
+    action_controller
     action_view
     active_support/all
     mongoid

data/spec/support/active_record_data.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 class ActiveRecordData

data/spec/support/ext_verifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ExtVerifier
   def require_dependencies!(dependencies)
     dependencies.each do |dependency|

data/spec/support/mongoid_versions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MongoidVersions
   def mongoid_version
     Gem::Version.new(Mongoid::VERSION)

data/spec/support/rails_versions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsVersions
   def rails_version
     Gem::Version.new(Rails::VERSION::STRING)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: amazing_print
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Dvorkin
 - Kevin McCormackPatrik Wenger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.81.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.81.0
 description: 'Great Ruby debugging companion: pretty print Ruby objects to visualize
   their structure. Supports custom object formatting via plugins'
 email: harlemsquirrel@gmail.com
@@ -103,7 +117,6 @@ files:
 - lib/amazing_print/core_ext/class.rb
 - lib/amazing_print/core_ext/kernel.rb
 - lib/amazing_print/core_ext/logger.rb
-- lib/amazing_print/core_ext/method.rb
 - lib/amazing_print/core_ext/object.rb
 - lib/amazing_print/core_ext/string.rb
 - lib/amazing_print/custom_defaults.rb
@@ -137,6 +150,7 @@ files:
 - spec/colors_spec.rb
 - spec/core_ext/logger_spec.rb
 - spec/core_ext/string_spec.rb
+- spec/ext/action_controller_spec.rb
 - spec/ext/action_view_spec.rb
 - spec/ext/active_record_spec.rb
 - spec/ext/active_support_spec.rb
@@ -181,7 +195,7 @@ homepage: https://github.com/amazing-print/amazing_print
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -189,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -197,51 +211,52 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Pretty print Ruby objects with proper indentation and colors
 test_files:
-- spec/methods_spec.rb
-- spec/spec_helper.rb
-- spec/colors_spec.rb
-- spec/formats_spec.rb
-- spec/active_record_helper.rb
-- spec/objects_spec.rb
-- spec/ext/active_record_spec.rb
-- spec/ext/action_view_spec.rb
-- spec/ext/ostruct_spec.rb
-- spec/ext/mongoid_spec.rb
-- spec/ext/ripple_spec.rb
-- spec/ext/sequel_spec.rb
-- spec/ext/active_support_spec.rb
-- spec/ext/nokogiri_spec.rb
-- spec/ext/mongo_mapper_spec.rb
-- spec/ext/nobrainer_spec.rb
-- spec/core_ext/string_spec.rb
-- spec/core_ext/logger_spec.rb
+- spec/support/rails_versions.rb
 - spec/support/mongoid_versions.rb
-- spec/support/active_record_data/6_0_diana.txt
-- spec/support/active_record_data/4_2_diana.txt
-- spec/support/active_record_data/4_2_multi_legacy.txt
-- spec/support/active_record_data/3_2_diana.txt
-- spec/support/active_record_data/4_0_diana.txt
+- spec/support/ext_verifier.rb
 - spec/support/active_record_data/4_2_diana_legacy.txt
+- spec/support/active_record_data/4_2_multi_legacy.txt
 - spec/support/active_record_data/5_1_diana.txt
+- spec/support/active_record_data/4_2_diana.txt
+- spec/support/active_record_data/5_2_diana.txt
+- spec/support/active_record_data/4_1_diana.txt
+- spec/support/active_record_data/6_0_diana.txt
+- spec/support/active_record_data/5_0_diana.txt
+- spec/support/active_record_data/5_2_multi.txt
+- spec/support/active_record_data/4_1_multi.txt
+- spec/support/active_record_data/3_2_diana_legacy.txt
 - spec/support/active_record_data/6_0_multi.txt
-- spec/support/active_record_data/3_2_multi_legacy.txt
 - spec/support/active_record_data/5_0_multi.txt
-- spec/support/active_record_data/5_2_multi.txt
+- spec/support/active_record_data/3_2_diana.txt
+- spec/support/active_record_data/3_2_multi_legacy.txt
 - spec/support/active_record_data/4_2_multi.txt
 - spec/support/active_record_data/5_1_multi.txt
-- spec/support/active_record_data/4_0_multi.txt
-- spec/support/active_record_data/3_2_diana_legacy.txt
-- spec/support/active_record_data/4_1_multi.txt
-- spec/support/active_record_data/5_2_diana.txt
-- spec/support/active_record_data/4_1_diana.txt
 - spec/support/active_record_data/3_2_multi.txt
-- spec/support/active_record_data/5_0_diana.txt
-- spec/support/rails_versions.rb
+- spec/support/active_record_data/4_0_diana.txt
+- spec/support/active_record_data/4_0_multi.txt
 - spec/support/active_record_data.rb
-- spec/support/ext_verifier.rb
-- spec/sequel_helper.rb
+- spec/formats_spec.rb
+- spec/objects_spec.rb
 - spec/misc_spec.rb
+- spec/colors_spec.rb
+- spec/active_record_helper.rb
+- spec/core_ext/logger_spec.rb
+- spec/core_ext/string_spec.rb
+- spec/sequel_helper.rb
+- spec/methods_spec.rb
+- spec/ext/nobrainer_spec.rb
+- spec/ext/ostruct_spec.rb
+- spec/ext/nokogiri_spec.rb
+- spec/ext/active_support_spec.rb
+- spec/ext/active_record_spec.rb
+- spec/ext/action_view_spec.rb
+- spec/ext/sequel_spec.rb
+- spec/ext/ripple_spec.rb
+- spec/ext/mongo_mapper_spec.rb
+- spec/ext/mongoid_spec.rb
+- spec/ext/action_controller_spec.rb
+- spec/spec_helper.rb

data/lib/amazing_print/core_ext/method.rb

@@ -1,21 +0,0 @@
-# Copyright (c) 2010-2016 Michael Dvorkin and contributors
-#
-# AmazingPrint is freely distributable under the terms of MIT license.
-# See LICENSE file or http://www.opensource.org/licenses/mit-license.php
-#------------------------------------------------------------------------------
-#
-# Method#name was intorduced in Ruby 1.8.7 so we define it here as necessary.
-#
-unless nil.method(:class).respond_to?(:name)
-  class Method
-    def name
-      inspect.split(/[#.>]/)[-1]
-    end
-  end
-
-  class UnboundMethod
-    def name
-      inspect.split(/[#.>]/)[-1]
-    end
-  end
-end