amazing_print 1.0.0 → 1.3.0

data/spec/ext/active_support_spec.rb

@@ -1,6 +1,16 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'AmazingPrint::ActiveSupport', skip: -> { !ExtVerifier.has_rails? }.call do
+  let(:expected_ar_time_str) do
+    if activerecord_6_1?
+      '15:30:45.000000000'
+    else
+      '15:30:45'
+    end
+  end
+
   before do
     @ap = AmazingPrint::Inspector.new
   end
@@ -8,7 +18,8 @@ RSpec.describe 'AmazingPrint::ActiveSupport', skip: -> { !ExtVerifier.has_rails?
   it 'should format ActiveSupport::TimeWithZone as regular Time' do
     Time.zone = 'Eastern Time (US & Canada)'
     time = Time.utc(2007, 2, 10, 20, 30, 45).in_time_zone
-    expect(@ap.send(:awesome, time)).to eq("\e[0;32mSat, 10 Feb 2007 15:30:45 EST -05:00\e[0m")
+    expect(@ap.send(:awesome, time))
+      .to eq("\e[0;32mSat, 10 Feb 2007 #{expected_ar_time_str} EST -05:00\e[0m")
   end
 
   it 'should format HashWithIndifferentAccess as regular Hash' 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
@@ -29,8 +31,8 @@ RSpec.describe 'AmazingPrint/MongoMapper', skip: -> { !ExtVerifier.has_mongo_map
       user = MongoUser.new(first_name: 'Al', last_name: 'Capone')
 
       out = @ap.send(:awesome, user)
-      out.gsub!(/#\<Proc:.+?\>/, 'amazing_print_PROC_STUB')
-      out.gsub!(/BSON::ObjectId\('[\da-f]+?'\)/, "BSON::ObjectId('123456789')")
+               .gsub(/#\<Proc:.+?\>/, 'amazing_print_PROC_STUB')
+               .gsub(/BSON::ObjectId\('[\da-f]+?'\)/, "BSON::ObjectId('123456789')")
 
       str = if MongoMapper::Version >= '0.13'
               <<~EOS.strip
@@ -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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'sequel_helper'
+
+RSpec.describe 'AmazingPrint/Sequel', skip: -> { !ExtVerifier.has_sequel? }.call do
+  before do
+    @ap = AmazingPrint::Inspector.new plain: true, sort_keys: true
+    @user1 = SequelUser.new first_name: 'Jeremy', last_name: 'Evans'
+    @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 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')
+  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
@@ -33,6 +35,38 @@ RSpec.describe 'Single method' do
     expect(method.ai).to eq("\e[1;33mString\e[0m#\e[0;35minclude?\e[0m\e[0;37m(arg1)\e[0m")
   end
 
+  it 'plain: should handle a method with one required keyword argument' do
+    class A
+      def one(foo:); end
+    end
+    method = A.new.method(:one)
+    expect(method.ai(plain: true)).to eq('A#one(foo:)')
+  end
+
+  it 'color: should handle a method with one required keyword argument' do
+    class A
+      def one(foo:); end
+    end
+    method = A.new.method(:one)
+    expect(method.ai).to eq("\e[1;33mA\e[0m#\e[0;35mone\e[0m\e[0;37m(foo:)\e[0m")
+  end
+
+  it 'plain: should handle a method with one required and one optional keyword arguments' do
+    class A
+      def one(foo:, bar: 'baz'); end
+    end
+    method = A.new.method(:one)
+    expect(method.ai(plain: true)).to eq('A#one(foo:, *bar:)')
+  end
+
+  it 'color: should handle a method with one required and one optional keyword arguments' do
+    class A
+      def one(foo:, bar: 'baz'); end
+    end
+    method = A.new.method(:one)
+    expect(method.ai).to eq("\e[1;33mA\e[0m#\e[0;35mone\e[0m\e[0;37m(foo:, *bar:)\e[0m")
+  end
+
   it 'plain: should handle a method with two arguments' do
     method = ''.method(:tr)
     expect(method.ai(plain: true)).to eq('String#tr(arg1, arg2)')
@@ -454,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

@@ -0,0 +1,18 @@
+# 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
+
+  # Create the users table
+  DB.create_table :sequel_users do
+    primary_key :id
+    String :first_name
+    String :last_name
+    TrueClass :admin
+    DateTime :created_at
+  end
+
+  # Create models
+  class SequelUser < Sequel::Model; end
+end

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,12 +31,14 @@ ExtVerifier.require_dependencies!(
   %w[
     rails
     active_record
+    action_controller
     action_view
     active_support/all
     mongoid
     mongo_mapper
     ripple nobrainer
     ostruct
+    sequel
   ]
 )
 require 'nokogiri'

data/spec/support/active_record_data.rb

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

data/spec/support/active_record_data/6_1_diana.txt

@@ -0,0 +1,109 @@
+#<User:placeholder_id
+    @_start_transaction_state = nil,
+    @association_cache = {},
+    @destroyed = false,
+    @marked_for_destruction = false,
+    @new_record = true,
+    @previously_new_record = false,
+    @primary_key = "id",
+    @readonly = false,
+    @strict_loading = false,
+    attr_accessor :attributes = #<ActiveModel::AttributeSet:placeholder_id
+        @attributes = {
+                 "admin" => #<ActiveModel::Attribute::FromUser:placeholder_id
+                @original_attribute = #<ActiveModel::Attribute::FromDatabase:placeholder_id
+                    @original_attribute = nil,
+                    attr_reader :name = "admin",
+                    attr_reader :type = #<ActiveModel::Type::Boolean:placeholder_id
+                        attr_reader :limit = nil,
+                        attr_reader :precision = nil,
+                        attr_reader :scale = nil
+                    >,
+                    attr_reader :value_before_type_cast = nil
+                >,
+                attr_reader :name = "admin",
+                attr_reader :type = #<ActiveModel::Type::Boolean:placeholder_id
+                    attr_reader :limit = nil,
+                    attr_reader :precision = nil,
+                    attr_reader :scale = nil
+                >,
+                attr_reader :value_before_type_cast = false
+            >,
+            "created_at" => #<ActiveModel::Attribute::FromUser:placeholder_id
+                @original_attribute = #<ActiveModel::Attribute::FromDatabase:placeholder_id
+                    @original_attribute = nil,
+                    attr_reader :name = "created_at",
+                    attr_reader :type = #<ActiveRecord::Type::DateTime:placeholder_id
+                        attr_reader :limit = nil,
+                        attr_reader :precision = nil,
+                        attr_reader :scale = nil
+                    >,
+                    attr_reader :value_before_type_cast = nil
+                >,
+                attr_reader :name = "created_at",
+                attr_reader :type = #<ActiveRecord::Type::DateTime:placeholder_id
+                    attr_reader :limit = nil,
+                    attr_reader :precision = nil,
+                    attr_reader :scale = nil
+                >,
+                attr_reader :value_before_type_cast = "1992-10-10 12:30:00"
+            >,
+                    "id" => #<ActiveModel::Attribute::FromDatabase:placeholder_id
+                @original_attribute = nil,
+                attr_reader :name = "id",
+                attr_reader :type = #<ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer:placeholder_id
+                    @range = -9223372036854775808...9223372036854775808,
+                    attr_reader :limit = nil,
+                    attr_reader :precision = nil,
+                    attr_reader :scale = nil
+                >,
+                attr_reader :value_before_type_cast = nil
+            >,
+                  "name" => #<ActiveModel::Attribute::FromUser:placeholder_id
+                @original_attribute = #<ActiveModel::Attribute::FromDatabase:placeholder_id
+                    @original_attribute = nil,
+                    attr_reader :name = "name",
+                    attr_reader :type = #<ActiveModel::Type::String:placeholder_id
+                        @false = "f",
+                        @true = "t",
+                        attr_reader :limit = nil,
+                        attr_reader :precision = nil,
+                        attr_reader :scale = nil
+                    >,
+                    attr_reader :value_before_type_cast = nil
+                >,
+                attr_reader :name = "name",
+                attr_reader :type = #<ActiveModel::Type::String:placeholder_id
+                    @false = "f",
+                    @true = "t",
+                    attr_reader :limit = nil,
+                    attr_reader :precision = nil,
+                    attr_reader :scale = nil
+                >,
+                attr_reader :value_before_type_cast = "Diana"
+            >,
+                  "rank" => #<ActiveModel::Attribute::FromUser:placeholder_id
+                @original_attribute = #<ActiveModel::Attribute::FromDatabase:placeholder_id
+                    @original_attribute = nil,
+                    attr_reader :name = "rank",
+                    attr_reader :type = #<ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer:placeholder_id
+                        @range = -9223372036854775808...9223372036854775808,
+                        attr_reader :limit = nil,
+                        attr_reader :precision = nil,
+                        attr_reader :scale = nil
+                    >,
+                    attr_reader :value_before_type_cast = nil
+                >,
+                attr_reader :name = "rank",
+                attr_reader :type = #<ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer:placeholder_id
+                    @range = -9223372036854775808...9223372036854775808,
+                    attr_reader :limit = nil,
+                    attr_reader :precision = nil,
+                    attr_reader :scale = nil
+                >,
+                attr_reader :value_before_type_cast = 1
+            >
+        }
+    >,
+    attr_accessor :destroyed_by_association = nil
+>