awesome_print 1.8.0 → 1.9.2

data/lib/awesome_print/formatter.rb

@@ -11,7 +11,7 @@ module AwesomePrint
 
     attr_reader :inspector, :options
 
-    CORE = [:array, :bigdecimal, :class, :dir, :file, :hash, :method, :rational, :set, :struct, :unboundmethod]
+    CORE_FORMATTERS = [:array, :bigdecimal, :class, :dir, :file, :hash, :method, :rational, :set, :struct, :unboundmethod]
 
     def initialize(inspector)
       @inspector   = inspector
@@ -34,7 +34,7 @@ module AwesomePrint
     # directory for custom formatters that ship with awesome_print.
     #------------------------------------------------------------------------------
     def cast(object, type)
-      CORE.grep(type)[0] || :self
+      CORE_FORMATTERS.include?(type) ? type : :self
     end
 
     private
@@ -106,21 +106,29 @@ module AwesomePrint
 
     # Utility methods.
     #------------------------------------------------------------------------------
+
+    # A class (ex. `Net::HTTP.Get`) might have `attr_reader :method` accessor
+    # which causes `object.method(:to_hash)` throw `ArgumentError (wrong number
+    # of arguments (given 1, expected 0))`. The following tries to avoid that.
+    def has_method_accessor?(object)
+      !object.method(:method)
+    rescue ArgumentError
+      true
+    end
+
     def convert_to_hash(object)
-      if !object.respond_to?(:to_hash)
-        return nil
-      end
+      return nil if has_method_accessor?(object)
+      return nil if !object.respond_to?(:to_hash) || object.method(:to_hash).arity != 0
 
-      if object.method(:to_hash).arity != 0
-        return nil
-      end
+      # 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
-      if !hash.respond_to?(:keys) || !hash.respond_to?('[]')
-        return nil
-      end
+      return nil if !hash.respond_to?(:keys) || !hash.respond_to?(:[])
 
-      return hash
+      hash
     end
   end
 end

data/lib/awesome_print/formatters/array_formatter.rb

@@ -12,7 +12,7 @@ module AwesomePrint
       end
 
       def format
-        if array.empty?
+        if array.length.zero?
           '[]'
         elsif methods_array?
           methods_array
@@ -31,7 +31,7 @@ module AwesomePrint
         if options[:multiline]
           multiline_array
         else
-          '[ ' << array.map { |item| inspector.awesome(item) }.join(', ') << ' ]'
+          "[ #{array.map { |item| inspector.awesome(item) }.join(', ')} ]"
         end
       end
 

data/lib/awesome_print/formatters/base_formatter.rb

@@ -90,7 +90,7 @@ module AwesomePrint
         # #<Method: User(id: integer, username: string)(ActiveRecord::Base).current>
         # #<UnboundMethod: Hello#world>
         #
-        if method.to_s =~ /(Unbound)*Method: (.*)[#\.]/
+        if method.to_s =~ /(Unbound)*Method: (.*?)[#\.]/
           unbound = $1 && '(unbound)'
           klass = $2
           if klass && klass =~ /(\(\w+:\s.*?\))/  # Is this ActiveRecord-style class?
@@ -109,8 +109,8 @@ module AwesomePrint
         inspector.current_indentation
       end
 
-      def indented
-        inspector.increase_indentation(&Proc.new)
+      def indented(&block)
+        inspector.increase_indentation(&block)
       end
 
       def indent

data/lib/awesome_print/formatters/hash_formatter.rb

@@ -32,7 +32,7 @@ module AwesomePrint
       end
 
       def multiline_hash
-        "{\n" << printable_hash.join(",\n") << "\n#{outdent}}"
+        ["{\n", printable_hash.join(",\n"), "\n#{outdent}}"].join
       end
 
       def simple_hash
@@ -73,7 +73,7 @@ module AwesomePrint
 
         keys.map! do |key|
           plain_single_line do
-            [inspector.awesome(key), hash[key]]
+            [String.new(inspector.awesome(key)), hash[key]]
           end
         end
       end

data/lib/awesome_print/formatters/object_formatter.rb

@@ -22,7 +22,7 @@ module AwesomePrint
             object.respond_to?(property) ? :reader : nil
           end
           if accessor
-            ["attr_#{accessor} :#{property}", var]
+            [String.new("attr_#{accessor} :#{property}"), var]
           else
             [var.to_s, var]
           end
@@ -60,7 +60,10 @@ module AwesomePrint
       end
 
       def awesome_instance
-        "#{object.class}:0x%08x" % (object.__id__ * 2)
+        str = String.new
+        str << object.send(options[:class_name]).to_s
+        str << ":0x%08x" % (object.__id__ * 2) if options[:object_id]
+        str
       end
 
       def left_aligned

data/lib/awesome_print/inspector.rb

@@ -23,6 +23,8 @@ module AwesomePrint
         sort_vars:     true,   # Sort instance variables.
         limit:         false,  # Limit arrays & hashes. Accepts bool or int.
         ruby19_syntax: false,  # Use Ruby 1.9 hash syntax in output.
+        class_name:    :class, # Method used to get Instance class name.
+        object_id:     true,   # Show object_id.
         color: {
           args:       :pale,
           array:      :white,
@@ -31,6 +33,7 @@ module AwesomePrint
           date:       :greenish,
           falseclass: :red,
           fixnum:     :blue,
+          integer:    :blue,
           float:      :blue,
           hash:       :pale,
           keyword:    :cyan,
@@ -59,8 +62,8 @@ module AwesomePrint
       indentator.indentation
     end
 
-    def increase_indentation
-      indentator.indent(&Proc.new)
+    def increase_indentation(&block)
+      indentator.indent(&block)
     end
 
     # Dispatcher that detects data nesting and invokes object-aware formatter.
@@ -160,7 +163,7 @@ module AwesomePrint
       load_dotfile
       merge_options!(AwesomePrint.defaults) if AwesomePrint.defaults.is_a?(Hash)
     rescue => e
-      $stderr.puts "Could not load #{dotfile}: #{e}"
+      $stderr.puts "Could not load '.aprc' from ENV['HOME']: #{e}"
     end
   end
 end

data/lib/awesome_print/version.rb

@@ -5,6 +5,6 @@
 #------------------------------------------------------------------------------
 module AwesomePrint
   def self.version
-    '1.8.0'
+    '1.9.2'
   end
 end

data/spec/ext/action_view_spec.rb

@@ -1,9 +1,12 @@
 require 'spec_helper'
 
 RSpec.describe 'AwesomePrint ActionView extensions', skip: -> { !ExtVerifier.has_rails? }.call do
-
   before do
-    @view = ActionView::Base.new
+    @view = if rails_6_1?
+              ActionView::Base.new(ActionView::LookupContext.new([]), {}, {})
+            else
+              ActionView::Base.new
+            end
   end
 
   it "uses HTML and adds 'debug_dump' class to plain <pre> tag" do

data/spec/ext/active_record_spec.rb

@@ -21,11 +21,11 @@ RSpec.describe 'AwesomePrint/ActiveRecord', skip: -> { !ExtVerifier.has_rails? }
           :rank => 1
 }
       EOS
-      if RUBY_VERSION < '1.9'
-        str.sub!('?', 'Sat Oct 10 12:30:00 UTC 1992')
-      else
-        str.sub!('?', '1992-10-10 12:30:00 UTC')
-      end
+
+			expect(RUBY_VERSION).to be >= '2.5'
+
+      str.sub!('?', '1992-10-10 12:30:00 UTC')
+
       expect(out).to be_similar_to(str)
     end
 
@@ -49,13 +49,10 @@ RSpec.describe 'AwesomePrint/ActiveRecord', skip: -> { !ExtVerifier.has_rails? }
     }
 ]
       EOS
-      if RUBY_VERSION < '1.9'
-        str.sub!('??', 'Sat Oct 10 12:30:00 UTC 1992')
-        str.sub!('?!', 'Mon May 26 14:15:00 UTC 2003')
-      else
-        str.sub!('??', '1992-10-10 12:30:00 UTC')
-        str.sub!('?!', '2003-05-26 14:15:00 UTC')
-      end
+
+      str.sub!('??', '1992-10-10 12:30:00 UTC')
+      str.sub!('?!', '2003-05-26 14:15:00 UTC')
+
       expect(out).to be_similar_to(str)
     end
 
@@ -81,13 +78,10 @@ RSpec.describe 'AwesomePrint/ActiveRecord', skip: -> { !ExtVerifier.has_rails? }
     }
 ]
       EOS
-      if RUBY_VERSION < '1.9'
-        str.sub!('??', 'Sat Oct 10 12:30:00 UTC 1992')
-        str.sub!('?!', 'Mon May 26 14:15:00 UTC 2003')
-      else
-        str.sub!('??', '1992-10-10 12:30:00 UTC')
-        str.sub!('?!', '2003-05-26 14:15:00 UTC')
-      end
+
+      str.sub!('??', '1992-10-10 12:30:00 UTC')
+      str.sub!('?!', '2003-05-26 14:15:00 UTC')
+
       expect(out).to be_similar_to(str)
     end
   end
@@ -126,24 +120,24 @@ EOS
       out = @ap.awesome(@diana)
 
       raw_object_string =
-        if activerecord_5_0?
+        if activerecord_6_1?
+          ActiveRecordData.raw_6_1_diana
+        elsif activerecord_6_0?
+          ActiveRecordData.raw_6_0_diana
+        elsif activerecord_5_2?
+          ActiveRecordData.raw_5_2_diana
+        elsif activerecord_5_1?
+          ActiveRecordData.raw_5_1_diana
+        elsif activerecord_5_0?
           ActiveRecordData.raw_5_0_diana
         elsif activerecord_4_2?
-          if RUBY_VERSION > '1.9.3'
-            ActiveRecordData.raw_4_2_diana
-          else
-            ActiveRecordData.raw_4_2_diana_legacy
-          end
+          ActiveRecordData.raw_4_2_diana
         elsif activerecord_4_1?
           ActiveRecordData.raw_4_1_diana
         elsif activerecord_4_0?
           ActiveRecordData.raw_4_0_diana
         elsif activerecord_3_2?
-          if RUBY_VERSION > '1.9.3'
-            ActiveRecordData.raw_3_2_diana
-          else
-            ActiveRecordData.raw_3_2_diana_legacy
-          end
+          ActiveRecordData.raw_3_2_diana
         end
       raw_object_string.sub!('?', '1992-10-10 12:30:00')
       expect(out).to be_similar_to(raw_object_string)
@@ -153,24 +147,24 @@ EOS
       out = @ap.awesome([@diana, @laura])
 
       raw_object_string =
-        if activerecord_5_0?
+        if activerecord_6_1?
+          ActiveRecordData.raw_6_1_multi
+        elsif activerecord_6_0?
+          ActiveRecordData.raw_6_0_multi
+        elsif activerecord_5_2?
+          ActiveRecordData.raw_5_2_multi
+        elsif activerecord_5_1?
+          ActiveRecordData.raw_5_1_multi
+        elsif activerecord_5_0?
           ActiveRecordData.raw_5_0_multi
         elsif activerecord_4_2?
-          if RUBY_VERSION > '1.9.3'
-            ActiveRecordData.raw_4_2_multi
-          else
-            ActiveRecordData.raw_4_2_multi_legacy
-          end
+          ActiveRecordData.raw_4_2_multi
         elsif activerecord_4_1?
           ActiveRecordData.raw_4_1_multi
         elsif activerecord_4_0?
           ActiveRecordData.raw_4_0_multi
         elsif activerecord_3_2?
-          if RUBY_VERSION > '1.9.3'
-            ActiveRecordData.raw_3_2_multi
-          else
-            ActiveRecordData.raw_3_2_multi_legacy
-          end
+          ActiveRecordData.raw_3_2_multi
         end
       raw_object_string.sub!('?', '1992-10-10 12:30:00')
       raw_object_string.sub!('?', '2003-05-26 14:15:00')
@@ -224,29 +218,43 @@ class SubUser < User {
       # spec 1
       out = @ap.awesome(User.methods.grep(/first/))
 
-      if ActiveRecord::VERSION::STRING >= '3.2'
-        if RUBY_VERSION >= '1.9'
-          expect(out).to match(/\sfirst\(\*args,\s&block\)\s+Class \(ActiveRecord::Querying\)/)
+      if RUBY_VERSION >= '3.0.0'
+        expect(out).to match(/\sfirst\(\*\*,\s&&\)/)
+      elsif RUBY_VERSION >= '2.7.0'
+        if ActiveRecord::VERSION::STRING >= '3.2'
+          expect(out).to match(/\sfirst\(\*\*,\s&&\)\s+User/)
         else
-          expect(out).to match(/\sfirst\(\*arg1\)\s+Class \(ActiveRecord::Querying\)/)
+          expect(out).to match(/\sfirst\(\*\*,\s&&\)\s+User \(ActiveRecord::Base\)/)
         end
       else
-        expect(out).to match(/\sfirst\(\*arg.*?\)\s+User \(ActiveRecord::Base\)/)
+        if ActiveRecord::VERSION::STRING >= '3.2'
+          expect(out).to match(/\sfirst\(\*arg.*?\)\s+User/)
+        else
+          expect(out).to match(/\sfirst\(\*arg.*?\)\s+User \(ActiveRecord::Base\)/)
+        end
       end
 
       # spec 2
       out = @ap.awesome(User.methods.grep(/primary_key/))
-      expect(out).to match(/\sprimary_key\(.*?\)\s+Class \(ActiveRecord::AttributeMethods::PrimaryKey::ClassMethods\)/)
+      if RUBY_VERSION >= '3.0.0'
+        expect(out).to match(/\sprimary_key\(.*?\)/)
+      else
+        expect(out).to match(/\sprimary_key\(.*?\)\s+User/)
+      end
 
       # spec 3
       out = @ap.awesome(User.methods.grep(/validate/))
-
       if ActiveRecord::VERSION::MAJOR < 3
         expect(out).to match(/\svalidate\(\*arg.*?\)\s+User \(ActiveRecord::Base\)/)
       else
-        expect(out).to match(/\svalidate\(\*arg.*?\)\s+Class \(ActiveModel::Validations::ClassMethods\)/)
+        if RUBY_VERSION >= '3.0.0'
+          expect(out).to match(/\svalidate\(\*arg.*?\)/)
+        else
+          expect(out).to match(/\svalidate\(\*arg.*?\)\s+User/)
+        end
       end
 
     end
   end
 end
+

data/spec/ext/active_support_spec.rb

@@ -8,7 +8,11 @@ RSpec.describe 'AwesomePrint::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")
+    if activerecord_6_1?
+      expect(@ap.send(:awesome, time)).to eq("\e[0;32mSat, 10 Feb 2007 15:30:45.000000000 EST -05:00\e[0m")
+    else
+      expect(@ap.send(:awesome, time)).to eq("\e[0;32mSat, 10 Feb 2007 15:30:45 EST -05:00\e[0m")
+    end
   end
 
   it 'should format HashWithIndifferentAccess as regular Hash' do

data/spec/ext/mongoid_spec.rb

@@ -38,32 +38,13 @@ RSpec.describe 'AwesomePrint/Mongoid', skip: -> { !ExtVerifier.has_mongoid? }.ca
   end
 
   it 'should print the class' do
-    class_spec = if mongoid_3_0?
-                   <<-EOS.strip
-class MongoUser < Object {
-           :_id => :"moped/bson/object_id",
-         :_type => :string,
-    :first_name => :string,
-     :last_name => :string
-}
-                   EOS
-                 elsif mongoid_3_1?
-                   <<-EOS.strip
-class MongoUser < Object {
-           :_id => :"moped/bson/object_id",
-    :first_name => :string,
-     :last_name => :string
-}
-                   EOS
-                 elsif mongoid_4_0?
-                   <<-EOS.strip
+    class_spec = <<-EOS.strip
 class MongoUser < Object {
            :_id => :"bson/object_id",
     :first_name => :string,
      :last_name => :string
 }
                    EOS
-                 end
 
     expect(@ap.send(:awesome, MongoUser)).to eq class_spec
   end
@@ -74,30 +55,12 @@ class MongoUser < Object {
       field :last_attribute
     end
 
-    class_spec = if mongoid_3_0?
-                   <<-EOS.strip
-class Chamelion < Object {
-               :_id => :"moped/bson/object_id",
-             :_type => :string,
-    :last_attribute => :object
-}
-                   EOS
-                 elsif mongoid_3_1?
-                   <<-EOS.strip
-class Chamelion < Object {
-               :_id => :"moped/bson/object_id",
-    :last_attribute => :object
-}
-                   EOS
-                 elsif mongoid_4_0?
-                   <<-EOS.strip
+    class_spec = <<-EOS.strip
 class Chamelion < Object {
                :_id => :"bson/object_id",
     :last_attribute => :object
 }
                    EOS
-                 end
-
 
     expect(@ap.send(:awesome, Chamelion)).to eq class_spec
   end