amazing_print 1.0.0 → 1.3.0

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)
+      [awesome_simple(object.to_s, :active_record_instance), awesome_hash(data)].join(' ')
     end
 
     # Format ActiveRecord class object.
@@ -70,10 +72,7 @@ module AmazingPrint
         hash[c.name.to_sym] = c.type
       end
 
-      name = "class #{awesome_simple(object.to_s, :class)}"
-      base = "< #{awesome_simple(object.superclass.to_s, :class)}"
-
-      [name, base, awesome_hash(data)].join(' ')
+      [awesome_simple("class #{object} < #{object.superclass}", :class), awesome_hash(data)].join(' ')
     end
 
     # Format ActiveModel error object.
@@ -82,20 +81,12 @@ module AmazingPrint
       return object.inspect unless defined?(::ActiveSupport::OrderedHash)
       return awesome_object(object) if @options[:raw]
 
-      object_dump = object.marshal_dump.first
-      data = if object_dump.class.column_names != object_dump.attributes.keys
-               object_dump.attributes
-             else
-               object_dump.class.column_names.each_with_object(::ActiveSupport::OrderedHash.new) do |name, hash|
-                 if object_dump.has_attribute?(name) || object_dump.new_record?
-                   value = object_dump.respond_to?(name) ? object_dump.send(name) : object_dump.read_attribute(name)
-                   hash[name.to_sym] = value
-                 end
-               end
-             end
+      data = object.instance_variable_get('@base')
+                   .attributes
+                   .merge(details: object.details.to_h,
+                          messages: object.messages.to_h.transform_values(&:to_a))
 
-      data.merge!({ details: object.details, messages: object.messages })
-      "#{object} " << awesome_hash(data)
+      [awesome_simple(object.to_s, :active_model_error), awesome_hash(data)].join(' ')
     end
   end
 end

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
@@ -88,7 +90,7 @@ module AmazingPrint
         label = "#{colorize('embedded', :assoc)} #{label}"
       end
 
-      "#{label} " << awesome_hash(data)
+      [label, awesome_hash(data)].join(' ')
     end
 
     # Format MongoMapper association object.

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,7 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/HashTransformValues
+
 # Copyright (c) 2010-2016 Michael Dvorkin and contributors
 #
 # AmazingPrint is freely distributable under the terms of MIT license.
@@ -51,3 +55,5 @@ module AmazingPrint
 end
 
 AmazingPrint::Formatter.include AmazingPrint::NoBrainer
+
+# rubocop:enable Style/HashTransformValues

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)
+      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,9 +1,11 @@
+# frozen_string_literal: true
+
 # 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
 #------------------------------------------------------------------------------
-require 'amazing_print/formatters'
+require_relative 'formatters'
 
 module AmazingPrint
   class Formatter
@@ -26,7 +28,7 @@ module AmazingPrint
                   send(:"awesome_#{core_class}", object) # Core formatters.
                 else
                   awesome_self(object, type) # Catch all that falls back to object.inspect.
-      end
+                end
       awesome
     end
 
@@ -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,14 +1,16 @@
+# frozen_string_literal: true
+
 module AmazingPrint
   module Formatters
-    require 'amazing_print/formatters/object_formatter'
-    require 'amazing_print/formatters/struct_formatter'
-    require 'amazing_print/formatters/hash_formatter'
-    require 'amazing_print/formatters/array_formatter'
-    require 'amazing_print/formatters/simple_formatter'
-    require 'amazing_print/formatters/method_formatter'
-    require 'amazing_print/formatters/class_formatter'
-    require 'amazing_print/formatters/dir_formatter'
-    require 'amazing_print/formatters/file_formatter'
-    require 'amazing_print/colorize'
+    require_relative 'formatters/object_formatter'
+    require_relative 'formatters/struct_formatter'
+    require_relative 'formatters/hash_formatter'
+    require_relative 'formatters/array_formatter'
+    require_relative 'formatters/simple_formatter'
+    require_relative 'formatters/method_formatter'
+    require_relative 'formatters/class_formatter'
+    require_relative 'formatters/dir_formatter'
+    require_relative 'formatters/file_formatter'
+    require_relative 'colorize'
   end
 end

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
@@ -70,6 +72,8 @@ module AmazingPrint
             name ||= (type == :block ? 'block' : "arg#{arr.size + 1}")
             arr << case type
                    when :req        then name.to_s
+                   when :keyreq     then "#{name}:"
+                   when :key        then "*#{name}:"
                    when :opt, :rest then "*#{name}"
                    when :block      then "&#{name}"
                    else '?'
@@ -91,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?
@@ -123,7 +127,6 @@ module AmazingPrint
       end
 
       def outdent
-        ' ' * (indentation - options[:indent].abs)
         i = indentation - options[:indent].abs
 
         INDENT_CACHE[i] || ' ' * i

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,6 +1,9 @@
-require_relative 'base_formatter'
+# frozen_string_literal: true
+
 require 'shellwords'
 
+require_relative 'base_formatter'
+
 module AmazingPrint
   module Formatters
     class DirFormatter < BaseFormatter

data/lib/amazing_print/formatters/file_formatter.rb

@@ -1,6 +1,9 @@
-require_relative 'base_formatter'
+# frozen_string_literal: true
+
 require 'shellwords'
 
+require_relative 'base_formatter'
+
 module AmazingPrint
   module Formatters
     class FileFormatter < BaseFormatter

data/lib/amazing_print/formatters/hash_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base_formatter'
 
 module AmazingPrint
@@ -84,11 +86,11 @@ module AmazingPrint
 
       def ruby19_syntax(key, value, width)
         key[0] = ''
-        align(key, width - 1) << colorize(': ', :hash) << inspector.awesome(value)
+        "#{align(key, width - 1)}#{colorize(': ', :hash)}#{inspector.awesome(value)}"
       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
@@ -19,7 +21,7 @@ module AmazingPrint
                        object.respond_to?(property) ? :accessor : :writer
                      else
                        object.respond_to?(property) ? :reader : nil
-          end
+                     end
           if accessor
             ["attr_#{accessor} :#{property}", var]
           else
@@ -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
@@ -19,7 +21,7 @@ module AmazingPrint
                        struct.respond_to?(property) ? :accessor : :writer
                      else
                        struct.respond_to?(property) ? :reader : nil
-          end
+                     end
           if accessor
             ["attr_#{accessor} :#{property}", var]
           else
@@ -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