xprint 0.5.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 990179163a84db36aa76ba3ba878bb21641efbb5720823cc635d37b61a95721b
-  data.tar.gz: 513f72918e49b0ff51aecf7181ab4b2a2e288d01d791a6c67b951abbe40fdcdc
+  metadata.gz: d8e6e0778467e8ed1efb112fc5a6fb7ee2e5463e1338dbffaf73aeeb61a75d0f
+  data.tar.gz: 43fef229c2551c8791d0b009cac768524fdb929a014701f16ed360981a014a7d
 SHA512:
-  metadata.gz: c8087e594b361566fe9375e6c77296474a40b5454d24bf7b5e139640f2c033e71d2b9555fadcdac9e1843d5436aaa14b0b928247bd0ffba343994a8a4ff2f903
-  data.tar.gz: d4435f361143d2d9c5660f634256b6eb7444261b40bfd00337699bd6a9370b3f4c93d9581167083dfab0ddd99b62d93866c5461b3ef66830fad358cd8819c56f
+  metadata.gz: 301cc656d0b4d0e62c6cf0c13486866b4249e7668700f11bcd9e58d2c4a28cac9a033b9ed3de430f64afde2ccb46f008a46e232f4ef5ca943e5371d9b17ecde9
+  data.tar.gz: 3ef89b719424f34e220ffc9aa77d4591dddb19fc695a64c257144fe3d1bf068b3569c8896b70ff85048a6fad0a4e4bcb6f722cd0af4c541259091228ff229c19

data/lib/version.rb

@@ -1,3 +1,3 @@
 module XPrint
-    VERSION = '0.5.1'
+    VERSION = '0.8.1'
 end

data/lib/xprint.rb

@@ -1,68 +1,199 @@
+require 'bigdecimal'
+require 'date'
+
 module XPrint
     @data_classes = [
         String, Integer, Float, TrueClass, FalseClass, NilClass,
-        Symbol
+        Symbol, Date, Time, DateTime, BigDecimal, Rational
     ]
     @hash_name_classes = @data_classes + [Proc]
     @tab = "\t"
-    @show_indexes = true
+    @indexes = true
+    @full_proc_path = false
+    @braces = true
+    @date_format = '%F'
+    @time_format = '%c'
+    @datetime_format = '%FT%T%:z'
+    @color = false
+    @colors = {
+        attribute:   :blue,
+        bigdecimal:  :darkcyan,
+        classname:   :darkgreen,
+        classobject: :green,
+        date:        :red,
+        datetime:    :purple,
+        false:       :darkred,
+        float:       :cyan,
+        index:       :darkgrey,
+        integer:     :cyan,
+        module:      :green,
+        nil:         :darkpurple,
+        proc:        :darkyellow,
+        rational:    :darkcyan,
+        string:      :yellow,
+        struct:      :green,
+        symbol:      :darkblue,
+        time:        :darkblue,
+        true:        :darkgreen
+    }
+    @color_codes = {
+        black:      "\e[30m",
+        blue:       "\e[94m",
+        darkblue:   "\e[34m",
+        cyan:       "\e[96m",
+        darkcyan:   "\e[36m",
+        green:      "\e[92m",
+        darkgreen:  "\e[32m",
+        grey:       "\e[37m",
+        darkgrey:   "\e[90m",
+        red:        "\e[91m",
+        darkred:    "\e[31m",
+        purple:     "\e[95m",
+        darkpurple: "\e[35m",
+        yellow:     "\e[93m",
+        darkyellow: "\e[33m",
+        reset:      "\e[0m"
+    }
 
     def self.set(**kwargs)
-        @tab = kwargs[:tab] unless kwargs[:tab].nil?
-        @show_indexes = kwargs[:show_indexes] unless kwargs[:show_indexes].nil?
+        set_vars = {
+            tab:             ->(data) { @tab             = data },
+            indexes:         ->(data) { @indexes         = data },
+            full_proc_path:  ->(data) { @full_proc_path  = data },
+            braces:          ->(data) { @braces          = data },
+            date_format:     ->(data) { @date_format     = data },
+            time_format:     ->(data) { @time_format     = data },
+            datetime_format: ->(data) { @datetime_format = data },
+            color:           ->(data) { @color           = data }
+        }
+    
+        kwargs.each do |keyword, arg|
+            if set_vars.key? keyword
+                set_vars[keyword].(arg)
+            end
+        end
+    
+        return
     end
 
-    def self.tab()
-        @tab
+    def self.set_color_for(**kwargs)
+        kwargs.each do |keyword, arg|
+            @colors[keyword] = arg
+        end
     end
 
-    def self.show_indexes()
-        @show_indexes
+    def self.set_color_code_for(**kwargs)
+        kwargs.each do |keyword, arg|
+            @color_codes[keyword] = arg
+        end
     end
 
     def self.xp(*args)
         args.each do |arg|
-            puts self.xpand(arg, tab: @tab)
+            xpanded_text = self.xpand(arg, tab: @tab)
+
+            unless @braces
+                xpanded_text = self.shift_indentation_down(xpanded_text).lstrip()
+            end
+
+            puts xpanded_text
+        end
+    end
+
+    private_class_method def self.color_for(colorname)
+        @color_codes[colorname]
+    end
+
+    private_class_method def self.reset_color()
+        @color_codes[:reset]
+    end
+
+    private_class_method def self.colorize(text, type)
+        if @color
+            item_color = color_for @colors[type]
+            "#{item_color}#{text}#{reset_color}"
+        else
+            text
+        end
+    end
+
+    private_class_method def self.shift_indentation_down(text)
+        # Only shift if no 
+        return text if text.match?(/^\S/)
+        result = ''
+
+        text.each_line do |line|
+            result += (
+                if line.start_with? @tab
+                    line[@tab.length..-1]
+                else
+                    line
+                end
+            )
         end
+
+        return result
     end
 
     def self.xpand(x, indent: '', tab: "\t")
 
         _indent = "#{tab}#{indent}"
-    
+
         # X is a "primitive" kind of data that has no subitems, so
         # we can just print it.
-        if @data_classes.include? x.class
-            return x.inspect
+        if x.class == String
+            return colorize(x.inspect, :string)
+        elsif x.class == Integer
+            return colorize(x.inspect, :integer)
+        elsif x.class == Float
+            return colorize(x.inspect, :float)
+        elsif x.class == TrueClass
+            return colorize(x.inspect, :true)
+        elsif x.class == FalseClass
+            return colorize(x.inspect, :false)
+        elsif x.class == NilClass
+            return colorize(x.inspect, :nil)
+        elsif x.class == Symbol
+            return colorize(x.inspect, :symbol)
+        
         # X is a Proc, print more compact version of standard Proc.inspect
         # text.
         elsif x.class == Proc
             type = x.lambda? ? 'Lambda' : 'Proc'
             source, line = x.source_location
-            source = source.gsub('\\', '/').split('/')[-2..-1].join('/')
+            source = source.gsub('\\', '/')
+            
+            unless @full_proc_path
+                source = source.split('/')[-2..-1].join('/')
+            end
             
-            return "<#{type} @ #{source} [Line #{line}]>"
+            return colorize("<#{type} @ #{source} [Line #{line}]>", :proc)
+        
+        elsif x.class == Class
+            return colorize("<Class #{x}>", :classobject)
+        
         # X is an Array, print list of all items.
         elsif x.class == Array
-            result = "[\n"
+            result = "#{@braces ? '[' : ''}\n"
     
             x.each_with_index do |item, index|
                 data = xpand(item, indent: _indent, tab: tab)
                 
                 result += "#{_indent}"
-                result += "[#{index}] " if @show_indexes
+                result += "#{colorize("[#{index}]", :index)} " if @indexes
                 result += "#{data}"
     
                 unless index + 1 == x.length
-                    result += ", \n"
+                    result += "#{@braces ? ', ' : ''} \n"
                 end
             end
     
-            result += "\n#{indent}]"
+            result += "\n#{indent}]" if @braces
             return result
+        
         # X is a Hash, print all keys and values.
         elsif x.class == Hash
-            result = "{\n"
+            result = "#{@braces ? '{' : ''}\n"
 
             longest_key = (
                 x.keys.filter do |k, v|
@@ -75,6 +206,13 @@ module XPrint
             )
 
             longest_key = 0 if longest_key.nil?
+
+            # Color codes throw the text length, so we need to add the
+            # length of the color code and the code to reset the color
+            # that wrap around the colored word.
+            # The color code is like "\e[99m" and the reset "\e[0m",
+            # so the total length to add when using color is 9.
+            longest_key += 9 if @color
     
             x.each_with_index do |(key, value), index|
                 data_key   = "#{xpand(key, indent: _indent, tab: tab)}"
@@ -92,36 +230,64 @@ module XPrint
                 result += "#{_indent}#{data_key} => #{data_value}"
 
                 unless index + 1 == x.length
-                    result += ", \n"
+                    result += "#{@braces ? ', ' : ''} \n"
                 end
             end
 
-            result += "\n#{indent}}"
+            result += "\n#{indent}}" if @braces
     
             return result
+
+        # X is a commonly used special kind of object.
+        elsif x.class == DateTime
+            datetime = x.strftime @datetime_format
+            return colorize("DateTime(#{datetime})", :datetime)
+        
+        elsif x.class == Date
+            date = x.strftime @date_format
+            return colorize("Date(#{date})", :date)
+        
+        elsif x.class == Time
+            time = x.strftime @time_format
+            return colorize("Time(#{time})", :time)
+        
+        elsif x.class == BigDecimal
+            return colorize("BigDecimal(#{x.to_s('f')})", :bigdecimal)
+        
+        elsif x.class == Rational
+            return colorize("Rational(#{x})", :rational)
+        
         # X is a Structure; essentially a special case of X being an object.
         elsif x.is_a? Struct
-            result = "Struct #{x.class}(\n"
+            struct_word = colorize('Struct', :struct)
+            classname = colorize(x.class, :struct)
+            result = "#{struct_word} #{classname}#{@braces ? '(' : ''}\n"
             longest_item = x.members.map { |m| m.to_s.length }.max()
 
             x.each_pair do |name, value|
-                attr_name = name.to_s.ljust(longest_item)
+                attr_name = colorize(name.to_s.ljust(longest_item), :attribute)
                 attr_data = xpand(value, indent: _indent, tab: tab)
 
                 result += "#{_indent}#{attr_name} = #{attr_data}\n"
             end
 
-            result += "#{indent})"
+            result += "#{indent})" if @braces
 
             return result
+        
         # X is any arbitrary object; print all instance variables.
         else
-            result = "#{x.class}(\n"
+            is_module = x.class == Module
+            classname = is_module ? "Module #{x}" : x.class
+            classname = colorize(classname, is_module ? :module : :classname)
+            result = "#{classname}#{@braces ? '(' : ''}"
             ivars = x.instance_variables
+            result += "\n" if ivars.length > 0
             longest_var = ivars.map { |v| v.to_s.length }.max()
     
             ivars.each_with_index do |var, index|
                 attr_name = var.to_s.ljust(longest_var)
+                attr_name = colorize(attr_name, :attribute)
                 attr_data = xpand(
                     x.instance_variable_get(var),
                     indent: _indent,
@@ -131,7 +297,7 @@ module XPrint
                 result += "#{_indent}#{attr_name} = #{attr_data}\n"
             end
     
-            result += "#{indent})"
+            result += "#{ivars.length > 0 ? indent: ''})" if @braces
     
             return result
         end
@@ -144,4 +310,4 @@ end
 
 def xpand(item, tab: "\t")
     XPrint::xpand(item, tab: tab)
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xprint
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.8.1
 platform: ruby
 authors:
 - JCabr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies: []
 description: Gem that allows for pretty printing data over multiple lines and with
   indentation, and works with objects as well as basic data types.