helium-console 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54fc81366dbb279e9171184f31ff7135a786bc4d580c87d09c2d2c7b6b2356aa
-  data.tar.gz: dc4b4b8558dd42e2bffa3e9a7d08c0219d69ab5acb8b508742552924dfe70c7e
+  metadata.gz: e6e87b40fb5846db36163081102d3a414bdecdbdc782f6f4c0da3f0001536fd7
+  data.tar.gz: 1ba3c78a6f962b1a64e883d350c35618e6bbcad4de3a2ac789058a90f0efceff
 SHA512:
-  metadata.gz: a76d12e67666b760c17c7b3688cba45e47313a29d03f6c08a7bb9e278c55b2abbb7de882eb3f258a4ae61614afb53c41dc288966945bf66ff65601f88819bac4
-  data.tar.gz: 4fec3cb33980a14cf3e9f7cbbf09a93f4707438076b1009bccfdc02f61184a002b6fb37c19a12cc993f5d4f1a1f1fe276e481bda1e1a09166251cd0532090e6b
+  metadata.gz: 9dd45ae18f91693ef71bff49a32a7fa09d0a0fa1d2eae81ed92b0d1b34f110085eea6004fcfe2241f372f3407d0aedb42d4bb521eaf40de71be43bb8e7cd265e
+  data.tar.gz: 0e7a3083dc49d4e3798ac54e0c6636a589f783b4faa41c544d9970bcc694d7ea22b82297f757c788965e9908675b6df340149521cb9dd97ab7e9200cd2bc0200

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    helium-console (0.1.1)
+    helium-console (0.1.6)
+      colorize
       pry
 
 GEM
@@ -9,6 +10,7 @@ GEM
   specs:
     byebug (11.1.3)
     coderay (1.1.3)
+    colorize (0.8.1)
     diff-lcs (1.4.4)
     ffaker (2.18.0)
     method_source (1.0.0)

data/bin/console

@@ -6,4 +6,10 @@ require "helium/console"
 require 'byebug'
 require 'ffaker'
 
+class A
+  def initialize(a)
+    @a = a
+  end
+end
+
 Pry.start

data/helium-console.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.add_dependency "pry"
+  spec.add_dependency "colorize"
 end

data/lib/helium/console.rb

@@ -39,6 +39,8 @@ module Helium
 
     def format(object, **options)
       options = default_options.merge(options)
+      return "(...)" if options[:ignore_objects].include?(object.object_id)
+
       handler = registry.handler_for(object, **options)
 
       if handler
@@ -57,16 +59,17 @@ module Helium
     end
 
     def simple?(object)
-      SIMPLE_OBJECTS.any? {|simple_obj_class| object.is_a? simple_obj_class }
+      SIMPLE_OBJECTS.any? {|simple_obj_class| object.is_a? simple_obj_class } ||
+        registry.handler_for(object).is_simple
     end
 
     def default_options
       {
         overflow: :wrap,
         indent: 0,
-        max_lines: nil,
         max_width: `tput cols`.chomp.to_i,
-        level: 1
+        level: 1,
+        ignore_objects: [],
       }
     end
 

data/lib/helium/console/registry.rb

@@ -1,3 +1,5 @@
+require 'colorized_string'
+
 module Helium
   class Console
     class Registry
@@ -9,8 +11,12 @@ module Helium
 
         attr_reader :object, :options
 
-        def format(object, **options)
-          Helium::Console.format(object, **nested_opts(options))
+        def format_nested(other_object, **options)
+          Helium::Console.format(other_object, **nested_opts(options))
+        end
+
+        def format(other_object, **options)
+          Helium::Console.format(other_object, **nested_opts(options, increase_level: false))
         end
 
         def format_string(string, **options)
@@ -21,13 +27,23 @@ module Helium
           Helium::Console.simple?(object)
         end
 
+        def is_simple
+          false
+        end
+
         def method_missing(name, *args)
           return @options[name] if @options.key?(name)
+          if ColorizedString.colors.include?(name)
+            return ColorizedString.new(*args).colorize(name)
+          end
           super
         end
 
-        def nested_opts(options)
-          { level: @options[:level] + 1 }.merge(options)
+        def nested_opts(new_options, increase_level: true)
+          new_options = options.merge(new_options)
+          new_options[:level] += 1 if increase_level
+          new_options[:ignore_objects] << object.object_id
+          new_options
         end
       end
 

data/lib/helium/console/registry/array.rb

@@ -2,21 +2,27 @@ module Helium
   class Console
     define_formatter_for Array do
       def call
+        return "[]" if object.none?
         return format_inline_with_truncation if force_inline?
+
         format_inline_with_no_truncation || format_as_table
       end
 
+      def is_simple
+        object.none?
+      end
+
     private
 
       def format_as_table
         table = Table.new(runner: '  ', format_keys: false)
         object.each.with_index do |element, index|
-          table.row("[#{index}]:", element)
+          table.row(light_black("[#{index}]:"), element)
         end
 
         [
           "[",
-          format(table, **options),
+          format(table),
           "]"
         ].join($/)
       end
@@ -27,7 +33,7 @@ module Helium
         total = object.length
 
         object.each.with_index do |element, index|
-          formatted = format(element, max_lines: 1, nesting: 1, max_width: 15)
+          formatted = format_nested(element, max_lines: 1, nesting: 1, max_width: 15)
 
           new_joined = [joined, formatted].compact.join(" | ")
           new_trunc = (" | (#{total - index - 1} #{index.zero? ? 'elements' : 'more'})" unless index == total - 1)
@@ -52,7 +58,7 @@ module Helium
         object.each do |element|
           return unless simple?(element)
 
-          formatted = format(element)
+          formatted = format_nested(element)
           joined = [joined, formatted].compact.join(" | ")
 
           return if joined.length > max_width - 4

data/lib/helium/console/registry/booleans.rb

@@ -0,0 +1,15 @@
+module Helium
+  class Console
+    define_formatter_for TrueClass do
+      def call
+        green('true')
+      end
+    end
+
+    define_formatter_for FalseClass do
+      def call
+        red('false')
+      end
+    end
+  end
+end

data/lib/helium/console/registry/hash.rb

@@ -9,9 +9,9 @@ module Helium
     private
 
       def format_as_table
-        table = Table.new(runner: '  ', after_key: all_symbol? ? ": " : " => ", format_keys: !all_symbol?)
+        table = Table.new(runner: '  ', after_key: after_key, format_keys: !all_symbol?)
         object.each do |key, value|
-          key = key.to_s if all_symbol?
+          key = light_blue(key.to_s) if all_symbol?
           table.row(key, value)
         end
 
@@ -66,12 +66,16 @@ module Helium
       end
 
       def force_inline?
-        (max_lines && max_lines < 5) || level > 2
+        level > 2
       end
 
       def all_symbol?
         object.keys.all? { |key| key.is_a? Symbol }
       end
+
+      def after_key
+        all_symbol? ? light_blue(": ") : light_black(" => ")
+      end
     end
   end
 end

data/lib/helium/console/registry/module.rb

@@ -0,0 +1,16 @@
+module Helium
+  class Console
+    define_formatter_for Module do
+      def call
+        light_yellow(object.name || anonymus_text)
+      end
+
+      private
+
+      def anonymus_text
+        closest = object.ancestors.find(&:name).name
+        "(anonymous #{closest})"
+      end
+    end
+  end
+end

data/lib/helium/console/registry/nil.rb

@@ -0,0 +1,9 @@
+module Helium
+  class Console
+    define_formatter_for NilClass do
+      def call
+        light_black('nil')
+      end
+    end
+  end
+end

data/lib/helium/console/registry/numeric.rb

@@ -0,0 +1,9 @@
+module Helium
+  class Console
+    define_formatter_for Numeric do
+      def call
+        light_cyan(object.to_s)
+      end
+    end
+  end
+end

data/lib/helium/console/registry/object.rb

@@ -1,14 +1,69 @@
 module Helium
   class Console
-    register Object do
-      formatters = [
-        Formatters::Overflow.get(overflow).new(max_width: max_width - indent),
-        Formatters::Indent.new(indent),
-        Formatters::MaxLines.new(max_lines: max_lines, max_width: max_width, ellipses: "...")
-      ]
-
-      formatters.inject(object.inspect) do |string, formatter|
-        formatter.call(string)
+    define_formatter_for Object do
+      def call
+        return format_inline_with_truncation if force_inline?
+        format_as_table
+      end
+
+    private
+
+      def format_as_table
+        table = Table.new(runner: light_black('| '), after_key: light_black(": "), format_keys: false)
+
+        object.instance_variables.each do |inst|
+          table.row(magenta(inst.to_s), object.instance_variable_get(inst))
+        end
+
+        [
+          table_header,
+          format(table),
+        ].reject(&:empty?).join($/)
+      end
+
+      def format_inline_with_truncation
+        "#{object.class.name}##{object.object_id.to_s(16)}"
+      end
+
+      def format_inline_with_no_truncation
+        joined = nil
+
+        object.each do |key, value|
+          return unless simple?(value)
+
+          formatted_key = format(key, level: 3, max_with: 15)
+          formatted_value = format(value, level: 3, max_width: 15)
+          formatted = "#{formatted_key} => #{formatted_value}"
+
+          joined = [joined, formatted].compact.join(", ")
+
+          return if joined.length > max_width - 4
+        end
+        joined = " #{joined} " if joined
+        ["{", joined, "}"].compact.join
+      end
+
+      def table_header
+        type = case object
+          when Class then :class
+          when Module then :module
+          else :instance
+        end
+        klass = type == :instance ? object.class : object
+        klass_name = klass.name
+        if !klass_name
+          named_ancestor = klass.ancestors.find(&:name)
+          klass_name = ['anonymous', named_ancestor&.name].compact.join(" ")
+        end
+        "#{light_black('#')} #{light_yellow(klass_name)} #{type}"
+      end
+
+      def force_inline?
+        level > 2
+      end
+
+      def all_symbol?
+        object.keys.all? { |key| key.is_a? Symbol }
       end
     end
   end

data/lib/helium/console/registry/string.rb

@@ -2,17 +2,20 @@ module Helium
   class Console
     define_formatter_for String do
       def call
-        Helium::Console.format_string(
+        formatted = Helium::Console.format_string(
           object.dump.gsub('\n', "\n"),
           max_width: max_width,
           max_lines: max_lines,
           overflow: overflow,
           ellipses: "...\""
         )
+
+        formatted.lines
+          .map { |line| light_green(line) }
+          .join
       end
 
       def max_lines
-        return options[:max_lines] if options[:max_lines]
         case level
         when 1 then nil
         when 2 then 3

data/lib/helium/console/registry/symbol.rb

@@ -0,0 +1,9 @@
+module Helium
+  class Console
+    define_formatter_for Symbol do
+      def call
+        light_blue(':' + object.to_s)
+      end
+    end
+  end
+end

data/lib/helium/console/registry/table.rb

@@ -2,38 +2,73 @@ module Helium
   class Console
     define_formatter_for Table do
       def call
-        formatted_values.join($/)
+        [
+          *formatted_values,
+          truncation,
+        ].compact.join($/)
       end
 
       def formatted_values
-        object.rows.flat_map do |key, value|
-          formatted_value = format(value, max_width: max_value_width)
+        rows.flat_map do |key, value|
+          formatted_value = format_nested(value, max_width: max_value_width)
 
           formatted_value.lines.map.with_index do |line, index|
             [
               object.runner,
-              index.zero? ? format_key(key).rjust(key_width) : " " * key_width,
-              index.zero? ? object.after_key : " " * object.after_key.length,
+              index.zero? ? rjust(format_key(key), key_width) : " " * key_width,
+              index.zero? ? object.after_key : " " * length_of(object.after_key),
               line.chomp,
             ].join
           end
         end
       end
 
+      def truncation
+        return unless object.rows.length > rows.length
+
+        [
+          object.runner,
+          light_black("(#{object.rows.length - rows.length} more)")
+        ].join
+      end
+
+
       def key_width
-        @key_width ||= object.rows
+        @key_width ||= rows
           .map(&:first)
           .map(&method(:format_key))
-          .map(&:length).max
+          .map(&method(:length_of))
+          .max
       end
 
       def max_value_width
-        max_width - object.runner.length - key_width - object.after_key.length
+        max_width - length_of(object.runner) - key_width - length_of(object.after_key)
       end
 
       def format_key(key)
-        return key unless object.format_keys
-        format(key, max_width: 15, level: 3)
+        object.format_keys ? format(key, max_width: 15, level: 3) : key
+      end
+
+      def rjust(string, width)
+        " " * (width - length_of(string)) + string
+      end
+
+      def length_of(string)
+        if string.respond_to?(:uncolorize)
+          string.uncolorize.length
+        else
+          string.length
+        end
+      end
+
+      def rows
+        @rows ||= case level
+        when 1 then object.rows
+        when 2
+          object.rows.count < 10 ? object.rows : object.rows.first(9)
+        else
+          object.rows.count < 3 ? object.rows : object.rows.first(2)
+        end
       end
     end
   end

data/lib/helium/console/version.rb

@@ -1,5 +1,5 @@
 module Helium
   class Console
-    VERSION = "0.1.1"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helium-console
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Stanislaw Klajn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-05 00:00:00.000000000 Z
+date: 2021-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - sklajn@gmail.com
@@ -51,9 +65,14 @@ files:
 - lib/helium/console/printer.rb
 - lib/helium/console/registry.rb
 - lib/helium/console/registry/array.rb
+- lib/helium/console/registry/booleans.rb
 - lib/helium/console/registry/hash.rb
+- lib/helium/console/registry/module.rb
+- lib/helium/console/registry/nil.rb
+- lib/helium/console/registry/numeric.rb
 - lib/helium/console/registry/object.rb
 - lib/helium/console/registry/string.rb
+- lib/helium/console/registry/symbol.rb
 - lib/helium/console/registry/table.rb
 - lib/helium/console/table.rb
 - lib/helium/console/version.rb