xprint 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12a4f14b974b337adf700aefab2e12d0d49464715c07d9fcf4968043a4e1dc94
-  data.tar.gz: d7c45cd128a2b48d930ce4b0f3c0991351e858d2bcc9fa1aa08ad0d3c62ad9d1
+  metadata.gz: 2f22ce4523589e6cbeb06e54a7a1977a75ec1756ab30f089732bcc8c3b45dff1
+  data.tar.gz: fb2846b5666efd1edcc52724f9abfbb1800d519c2a38677e7307fc819e935555
 SHA512:
-  metadata.gz: 846e1a5db4a0754d459eb0fa0a5036def3ff3e501046fd67617db49b8ec44837c0120e49b6ecd7c3ed07696359db302a81a0b3cecb5e4a7663922ca3229bde84
-  data.tar.gz: fef4e604bc0cd065117a9d08862b6ba2196f9dd20ee6393a0f956263fcbea81f4f27d658aefa184fa79bde9d6b1643defb2099b60692c88b0a27ea7afc617239
+  metadata.gz: 9b92e59c74c96172d0f8a30922588d0cfae72eb7eff4ad7c3ca0eaa97c6884b93a06866d70559fac46ce76818dfeb978e94f044b1a4ceccaffea7c9ecbb20304
+  data.tar.gz: 38a4585448847ffebc5c873dafa351f16a4ef082f2d41c121161b7d6e405f4b660d648197600f332549da5d835e346c5684a21f5365ac046c5e4c223b983cfbb

data/lib/version.rb

@@ -1,3 +1,3 @@
 module XPrint
-    VERSION = '0.5.3'
+    VERSION = '0.6.0'
 end

data/lib/xprint.rb

@@ -7,14 +7,23 @@ module XPrint
     @tab = "\t"
     @show_indexes = true
     @full_proc_path = false
+    @braces = true
 
     def self.set(**kwargs)
-        @tab = kwargs[:tab] unless kwargs[:tab].nil?
-        @show_indexes = kwargs[:show_indexes] unless kwargs[:show_indexes].nil?
-
-        unless @full_proc_path.nil?
-            @full_proc_path = kwargs[:full_proc_path]
+        set_vars = {
+            tab:            ->(data) { @tab            = data },
+            show_indexes:   ->(data) { @show_indexes   = data },
+            full_proc_path: ->(data) { @full_proc_path = data },
+            braces:         ->(data) { @braces         = data }
+        }
+    
+        kwargs.each do |keyword, arg|
+            if set_vars.key? keyword
+                set_vars[keyword].(arg)
+            end
         end
+    
+        return
     end
 
     def self.tab()
@@ -27,8 +36,33 @@ module XPrint
 
     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.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")
@@ -52,8 +86,10 @@ module XPrint
             
             return "<#{type} @ #{source} [Line #{line}]>"
         # X is an Array, print list of all items.
+        elsif x.class == Class
+            return "<Class #{x}>"
         elsif x.class == Array
-            result = "[\n"
+            result = "#{@braces ? '[' : ''}\n"
     
             x.each_with_index do |item, index|
                 data = xpand(item, indent: _indent, tab: tab)
@@ -63,15 +99,15 @@ module XPrint
                 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|
@@ -105,12 +141,12 @@ module XPrint
                 end
             end
 
-            result += "\n#{indent}}"
+            result += "\n#{indent}}" if @braces
     
             return result
         # X is a Structure; essentially a special case of X being an object.
         elsif x.is_a? Struct
-            result = "Struct #{x.class}(\n"
+            result = "Struct #{x.class}#{@braces ? '(' : ''}\n"
             longest_item = x.members.map { |m| m.to_s.length }.max()
 
             x.each_pair do |name, value|
@@ -120,13 +156,15 @@ module XPrint
                 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"
+            classname = x.class == Module ? "Module #{x}" : x.class
+            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|
@@ -140,7 +178,7 @@ module XPrint
                 result += "#{_indent}#{attr_name} = #{attr_data}\n"
             end
     
-            result += "#{indent})"
+            result += "#{ivars.length > 0 ? indent: ''})" if @braces
     
             return result
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xprint
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 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.