output_mode 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4492bb6d42dfd55f9f83ba7a3fd7fa9b21a2712760272cbd1d3500dafc11dd4
-  data.tar.gz: 71068e9161e4219ab85508a6692046f2de51d19a83c685b40fa9212ac0d40c46
+  metadata.gz: a4518dd66cf4b3d2a7ea9ea255c3a5835a6075eea24f62620b39f62b405a625b
+  data.tar.gz: bdcd16455d48e576ce18ea2793613b99bef8424ce9c504aff210f1f7a62e7f2e
 SHA512:
-  metadata.gz: 05d68669d5abbb2ac911531c8709d4d44898fcaae4fced442d5bf8ffc2d935d5c2ef8319bc2b28cb5e33fb7b033b236c57992d449b1de4c69f667b3248c8d08f
-  data.tar.gz: c6aae6fc8496bb491b4213173c4fc7bd57499efd9f2ec1e4367f3ec46b849c6be41453f17065c44a0b687aa40c1b6d1c677fe9578ad3dea11f8a92e31722f78a
+  metadata.gz: d622a5d10d8e93d2787fa7fa7916e43d984af483181c52158ab747d3556196d97fa2425da9d99538bb1d4b193d14c75d1a77763a3ba2de336312666af8350409
+  data.tar.gz: 56f15aa86585eb8c6c7ba598d8780b597649305453162574e14b0116257a62ad2689e68daadb29328eb4c58f51a15e7737cf62650ea7f326bcf18c04c1bf2687

data/lib/output_mode/callable.rb

@@ -56,13 +56,19 @@ module OutputMode
       @callables.each(&block)
     end
 
-    def pad_each(key = :header, *ctx)
+    def pad_each(*ctx, **input_opts)
       fields = self.map do |callables|
-        field = callables.config[key]
-        if field.respond_to?(:call) && ctx.empty?
-          raise Error, 'Can not pad dynamic fields without a context'
-        elsif field.respond_to?(:call)
-          field.call(*ctx).to_s
+        field = callables.config[:header]
+        if field.respond_to?(:call)
+          opts =  if field.parameters.include?(:keyrest)
+                    input_opts.dup
+                  else
+                    keys = field.parameters
+                                 .select { |type, _| [:key, :keyreq].include?(type) }
+                                 .map { |_, k| k }
+                    input_opts.slice(*keys)
+                  end
+          opts.empty? ? field.call(*ctx) : field.call(*ctx, **opts)
         else
           field.to_s
         end
@@ -76,7 +82,7 @@ module OutputMode
       end
 
       if block_given?
-        pads.each { |*args|  yield(*args) }
+        pads.each { |c, opts|  yield(c, **opts) }
       else
         pads.each
       end

data/lib/output_mode/outputs/templated.rb

@@ -49,10 +49,9 @@ module OutputMode
                       end
 
           # Yield each selected attribute
-          objs = callables.pad_each.map do |callable, padding:|
+          objs = callables.pad_each(model, **output.context).map do |callable, padding:, field:|
             value = callable.generator(output).call(model)
-            field = callable.config[:header]
-            [value, {field: field, padding: padding }]
+            [value, { field: field, padding: padding }]
           end
 
           # Runs the provided block

data/lib/output_mode/tldr/show.rb

@@ -39,7 +39,7 @@ module OutputMode
       #   @param section: Define the grouping a callable belongs to. Ignored by default
       #   @param modes: Additional modes flags for the callable
       #   @yieldparam model The subject the column is describing, some sort of data model
-      def register_callable(modes: {}, header:, verbose: nil, interactive: nil, section: :other, &b)
+      def register_callable(modes: {}, header:, verbose: nil, interactive: nil, section: :default, &b)
         modes = modes.map { |m| [m, true] }.to_h if modes.is_a? Array
         super(modes: modes.merge(verbose: verbose, interactive: interactive),
               header: header,

data/lib/output_mode/version.rb

@@ -25,5 +25,5 @@
 #==============================================================================
 
 module OutputMode
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

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