flex-cartesian 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 365e591e60a0c174cbfec4f2b80cf1e6f2cd6e2c57b27be341fc16bf10a6ac98
-  data.tar.gz: 86030f2e3c14e8bb2e9042bcf6b639211ab65a24095d158c15f002047d7d3c99
+  metadata.gz: '09eb5e5463d14e3ef3b2aca14d76a0ee5e4587cdfd56dcccbdb69f9b773d74ae'
+  data.tar.gz: d3d786db1474627718f501879509f4e3b09a3f3da11579333eee31ac6585fde3
 SHA512:
-  metadata.gz: 69e18d211995c7f5f5325fe0146bcf580bcbee923444aa524ec8ac13e773264d8b3fe66f8dcaed84f2b29409c9b089b00d5f4a19f7f0b74fbf25f8ed3936ba16
-  data.tar.gz: 2395bf3d93663c0d39ea8126498b68c8e02f805ee2183387071f278f1bf8bddf44822ac80ff41bce33e88732959ff9c79017ceeea69f19609b1818e2fdf86d3f
+  metadata.gz: 814eeb82c514a96016a17be9d07a6daf105e98898c1512926fd31b2dccc47dca95efbe681a1968ecd5b30bba1c8ab5d312a268dbcfacb0f75c0259075e669e8e
+  data.tar.gz: 51532619fa94674d70f1edf8a19083e43d951297e26203e3fc92553184cb8bec9165d41c33aa90e17c14828ed51c58e76684cc88f7b07696aa90032643ac275a

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+## 0.1.7 - 2025-07-07
+### Added
+- Support for calculated functions on dimensiona via `add_function(name, &block)`
+- Calculated functions now show up in `.output`
+

data/lib/flex-cartesian.rb

@@ -10,7 +10,6 @@ module FlexOutput
 
     values_list = members.zip(values.map { |v| v.inspect })
 
-    # calculate widths, if align required
     widths = align ? values_list.map { |k, v| [k.to_s.size, v.size].max } : []
 
     line = values_list.each_with_index.map do |(_, val), i|
@@ -28,27 +27,39 @@ class FlexCartesian
 
   def initialize(dimensions = nil)
     @dimensions = dimensions
+    @derived = {}
+  end
+
+  def add_function(name, &block)
+    raise ArgumentError, "Block required" unless block_given?
+    @derived[name.to_sym] = block
   end
 
   def cartesian(dims = nil, lazy: false)
-    dimensions = dims || @dimensions
-    return nil unless dimensions.is_a?(Hash)
+  dimensions = dims || @dimensions
+  return nil unless dimensions.is_a?(Hash)
 
-    names = dimensions.keys
-    values = dimensions.values.map { |dim| dim.is_a?(Enumerable) ? dim.to_a : [dim] }
+  names = dimensions.keys
+  values = dimensions.values.map { |dim| dim.is_a?(Enumerable) ? dim.to_a : [dim] }
+
+  return to_enum(:cartesian, dims, lazy: lazy) unless block_given?
+  return if values.any?(&:empty?)
 
-    return to_enum(:cartesian, dims, lazy: lazy) unless block_given?
-    return if values.any?(&:empty?)
+  struct_class = Struct.new(*names).tap { |sc| sc.include(FlexOutput) }
 
-    struct_class = Struct.new(*names).tap { |sc| sc.include(FlexOutput) }
+  base = values.first.product(*values[1..])
+  enum = lazy ? base.lazy : base
 
-    base = values.first.product(*values[1..])
-    enum = lazy ? base.lazy : base
+  enum.each do |combo|
+    struct_instance = struct_class.new(*combo)
 
-    enum.each do |combo|
-      yield struct_class.new(*combo)
+    @derived&.each do |name, block|
+      struct_instance.define_singleton_method(name) { block.call(struct_instance) }
     end
+
+    yield struct_instance
   end
+end
 
   def size(dims = nil)
     dimensions = dims || @dimensions
@@ -79,7 +90,7 @@ class FlexCartesian
     end
   end
 
-def output(separator: " | ", colorize: false, align: false, format: :plain, limit: nil)
+  def output(separator: " | ", colorize: false, align: false, format: :plain, limit: nil)
   rows = []
   cartesian do |v|
     rows << v
@@ -87,14 +98,15 @@ def output(separator: " | ", colorize: false, align: false, format: :plain, limi
   end
   return if rows.empty?
 
-  headers = rows.first.members.map(&:to_s)
+  headers = (
+    rows.first.members +
+    rows.first.singleton_methods(false).reject { |m| m.to_s.start_with?('__') }
+  ).map(&:to_s)
 
-  # Get widths
   widths = align ? headers.to_h { |h|
-    [h, [h.size, *rows.map { |r| fmt_cell(r[h], false).size }].max]
+    [h, [h.size, *rows.map { |r| fmt_cell(r.send(h), false).size }].max]
   } : {}
 
-  # Title
   case format
   when :markdown
     puts "| " + headers.map { |h| h.ljust(widths[h] || h.size) }.join(" | ") + " |"
@@ -105,9 +117,8 @@ def output(separator: " | ", colorize: false, align: false, format: :plain, limi
     puts headers.map { |h| fmt_cell(h, colorize, widths[h]) }.join(separator)
   end
 
-  # Rows
   rows.each do |row|
-    line = headers.map { |h| fmt_cell(row[h], colorize, widths[h]) }
+    line = headers.map { |h| fmt_cell(row.send(h), colorize, widths[h]) }
     puts format == :csv ? line.join(",") : line.join(separator)
   end
 end
@@ -124,14 +135,13 @@ end
 
 private
 
-def fmt_cell(value, colorize, width = nil)
-  str = case value
-        when String then value  # rows - without inspect
-        else value.inspect      # the rest is good to inspect
-        end
-  str = str.ljust(width) if width
-  colorize ? str.colorize(:cyan) : str
-end
-
+  def fmt_cell(value, colorize, width = nil)
+    str = case value
+          when String then value
+          else value.inspect
+          end
+    str = str.ljust(width) if width
+    colorize ? str.colorize(:cyan) : str
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flex-cartesian
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Yury Rassokhin
@@ -52,14 +52,16 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: Supports dimension-agnostic iterators, named dimensions, tabular output,
-  lazy/eager evaluation, progress bar, JSON/YAML loading, and export to Markdown/CSV.
+description: Supports calculated functions, dimension-agnostic iterators, named dimensions,
+  tabular output, lazy/eager evaluation, progress bar, JSON/YAML loading, and export
+  to Markdown/CSV.
 email:
 - yuri.rassokhin@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md