output_mode 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4beed6d9f51548ef131e475bb68aa9c6d6fe079e39672b4691566ff80ffb65c2
-  data.tar.gz: df648ec5ee82875c189123dca55bfaabfa3bf4d5ba24e160be1d0f15bb1a624b
+  metadata.gz: 0e8e7233d045c7642d64d90ac04d0af8561ce06f1fb24125f4a849ce5cbf40c6
+  data.tar.gz: acba4cceeb3626e5350f637fa6d3422115622e1e5ef2cde3dbb5186b6df20173
 SHA512:
-  metadata.gz: 4e19a13c9e5b0b6e3fa497aadd4d1ed59bb6297fd8063f88d7f6a01bd4dd84f801baae9be8efe46a0e42e63024824d227fa51c0f7b84ad283baec7f5960fb2f6
-  data.tar.gz: b9ea560f3b42886ca8baaa04452cc5e4557c82ddf23068b095b544f2649b425b5b30a30212d6ef7955cd1fde41c624b4f9fbe73cfc32a3a2ddb1092f6d16fd54
+  metadata.gz: 8faf122204eb774c31e5feefdd68cab98f12817b04a904e5c1270dc9cd95496ef0585494a48f7a4ff93050ed41607dc0bb50aab9ba2c3513e8335bd426165df9
+  data.tar.gz: a460316ed1272d74ba1b8a398c9d8b197cdfa9d1682304648ad04534cb52437b0bbbe48d9eb308412e143898ff58ed4530201cac19bdba56a5dbbd9299bfb790

data/bin/demo

@@ -30,7 +30,7 @@ require "output_mode"
 require 'erb'
 
 class DemoIndex < OutputMode::Formatters::Index
-  constructor do
+  def register_all
     register(header: 'Integer', row_color: [:yellow, :bold]) { |i| i }
     register(header: 'Standard', header_color: [:strikethrough] ) { 'always visible' }
     if verbose?
@@ -38,10 +38,10 @@ class DemoIndex < OutputMode::Formatters::Index
     else
       register(header: 'Simplified') { 'simplified visible' }
     end
-    if interactive?
-      register(header: 'Interactive') { 'interactive visible' }
+    if humanize?
+      register(header: 'humanize') { 'humanize visible' }
     else
-      register(header: 'Non Interactive') { 'non-interactive visible' }
+      register(header: 'Non humanize') { 'non-humanize visible' }
     end
     register(header: 'Yes/True') { true }
     register(header: 'No/False', row_color: [:clear]) { false }
@@ -50,7 +50,7 @@ class DemoIndex < OutputMode::Formatters::Index
 end
 
 class DemoShow < OutputMode::Formatters::Show
-  constructor do
+  def register_all
     register(header: 'Integer') { |i| i }
     register(header: 'Standard') { 'always visible' }
     if verbose?
@@ -58,10 +58,10 @@ class DemoShow < OutputMode::Formatters::Show
     else
       register(header: 'Simplified') { 'simplified visible' }
     end
-    if interactive?
-      register(header: 'Interactive') { 'interactive visible' }
+    if humanize?
+      register(header: 'humanize') { 'humanize visible' }
     else
-      register(header: 'Non Interactive') { 'non-interactive visible' }
+      register(header: 'Non humanize') { 'non-humanize visible' }
     end
     register(header: 'Yes/True', section: :boolean) { true }
     register(header: 'No/False', section: :boolean) { false }
@@ -82,7 +82,7 @@ puts <<~EOF
 
 #==============================================================================
 # Default Demo Index
-# Simplified in interactive shells, verbose in non-interactive
+# Simplified in humanize shells, verbose in non-humanize
 #==============================================================================
 #{DemoIndex.render(*data)}
 
@@ -97,16 +97,16 @@ puts <<~EOF
 #{DemoIndex.render(*data, verbose: false)}
 
 #==============================================================================
-# Force Interactive
-# Always print as if the shell is interactive
+# Force humanize
+# Always print as if the shell is humanize
 #==============================================================================
-#{DemoIndex.render(*data, interactive: true)}
+#{DemoIndex.render(*data, humanize: true)}
 
 #==============================================================================
-# Force Non-Interactive
-# Always print as if the shell is non-interactive
+# Force Non-humanize
+# Always print as if the shell is non-humanize
 #==============================================================================
-#{DemoIndex.render(*data, interactive: false)}
+#{DemoIndex.render(*data, humanize: false)}
 
 #==============================================================================
 # Demo ASCII Index
@@ -121,7 +121,7 @@ puts <<~EOF
 
 #==============================================================================
 # Default Settings
-# Simplified in interactive shells, verbose in non-interactive
+# Simplified in humanize shells, verbose in non-humanize
 #==============================================================================
 #{DemoShow.render(data.first)}
 
@@ -136,16 +136,16 @@ puts <<~EOF
 #{DemoShow.render(data.first, verbose: false)}
 
 #==============================================================================
-# Force Interactive
-# Always print as if the shell is interactive
+# Force humanize
+# Always print as if the shell is humanize
 #==============================================================================
-#{DemoShow.render(data.first, interactive: true)}
+#{DemoShow.render(data.first, humanize: true)}
 
 #==============================================================================
-# Force Non-Interactive
-# Always print as if the shell is non-interactive
+# Force Non-humanize
+# Always print as if the shell is non-humanize
 #==============================================================================
-#{DemoShow.render(data.first, interactive: false)}
+#{DemoShow.render(data.first, humanize: false)}
 
 #==============================================================================
 # Demo ASCII Index

data/lib/output_mode/formatter.rb

@@ -28,25 +28,18 @@ require 'tty-color'
 
 module OutputMode
   class Formatter
-    def self.constructor(&block)
-      @constructor ||= block
-    end
-
     def self.build(*objects, **opts)
-      new(*objects, **opts).tap do |policy|
-        next unless constructor
-        policy.instance_exec(&constructor)
-      end
+      new(*objects, **opts).tap(&:register_all)
     end
 
     def self.render(*objects, **opts)
       build(*objects, **opts).render
     end
 
-    def initialize(*objects, verbose: nil, ascii: nil, interactive: nil, color: nil)
+    def initialize(*objects, verbose: nil, ascii: nil, humanize: nil, color: nil)
       @verbose = verbose
       @ascii = ascii
-      @interactive = interactive
+      @humanize = humanize
       @color = color
 
       # NOTE: This is intentionally not exposed on the base class
@@ -54,6 +47,10 @@ module OutputMode
       @objects = objects
     end
 
+    # Override in sub-classes to define the attributes
+    def register_all
+    end
+
     def callables
       @callables ||= Callables.new
     end
@@ -89,16 +86,16 @@ module OutputMode
       build_output.render(*@objects)
     end
 
-    def interactive?
-      if @interactive.nil?
+    def humanize?
+      if @humanize.nil?
         $stdout.tty?
       else
-        @interactive
+        @humanize
       end
     end
 
     def color?
-      if @color.nil? && (ascii? || !interactive?)
+      if @color.nil? && (ascii? || !humanize?)
         false
       elsif @color.nil?
         TTY::Color.color?
@@ -109,7 +106,7 @@ module OutputMode
 
     def ascii?
       if @ascii.nil?
-        !interactive?
+        !humanize?
       else
         @ascii
       end
@@ -117,7 +114,7 @@ module OutputMode
 
     def verbose?
       if @verbose.nil?
-        !interactive?
+        !humanize?
       else
         @verbose
       end
@@ -135,7 +132,7 @@ module OutputMode
 
     def default(value = nil)
       @default = value unless value.nil?
-      @default ? @default : (interactive? ? '(none)' : '')
+      @default ? @default : (humanize? ? '(none)' : '')
     end
 
     def time(value = nil)

data/lib/output_mode/formatters/index.rb

@@ -40,7 +40,7 @@ module OutputMode
       end
 
       def build_output
-        if interactive?
+        if humanize?
           opts = {
             renderer: ascii? ? :ascii : :unicode,
             header_color: header_color,

data/lib/output_mode/formatters/show.rb

@@ -43,7 +43,7 @@ module OutputMode
 
       def template(value = nil)
         @template = value unless value.nil?
-        @template ? @template : (interactive? ? DEFAULT_ERB : NON_INTERACTIVE_ERB)
+        @template ? @template : (humanize? ? DEFAULT_ERB : NON_INTERACTIVE_ERB)
       end
 
       def scope(value = nil)

data/lib/output_mode/version.rb

@@ -25,5 +25,5 @@
 #==============================================================================
 
 module OutputMode
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: output_mode
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - William McCumsite
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-table