flex-cartesian 1.2.2 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a2ca7796b432b25c13982324959267a48475d5e9bce840b36309f976e05aa8f
-  data.tar.gz: c43b4a80cda5177c29cd7e07c186d6075fa2597ed3fe3e4e886e49b94b76ef49
+  metadata.gz: 879d7780851f01bc807133456d82734f8f2d064e8d258b566d310557f98dd705
+  data.tar.gz: df91fa942cf22252273cbc0b65b145a005c7071b415a99f3b485fecf3b813e64
 SHA512:
-  metadata.gz: 8271368f575fdd9dc460d6acb7d37678faf8071293738c9cf421ad7fa3dbc0bcf197590d79e57216cc20ee4b028ffa0b58f84b160dddb900b71d778ba93ef8e8
-  data.tar.gz: 4e55180b78619c9ad100c0b6e7db1b19cc7c74871936939340d53af7b6e01eba82bd2bd2e739e0e33c3ef334cfb66f75284aeae1ef2ca1dcebbe00f60eb5843a
+  metadata.gz: 46a20d5b4ff80f8980170a160786164cfab11557d592f089b04a1fb9a24b51203db5e41c9b6bccc48968244d5190a08e8ed5befce453f71dff58583c93ffa8e5
+  data.tar.gz: 17e76c180e6c3c38cb89e3d73771ad9271bff04fcf740ba3910f472f262e6d8630f9d2e36e6d52eadd740f7a13552642c83ec39504cdc6f7e89b99f9a844beb0

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.3.1 - 2025-09-03
+## Fixed
+- CSV format expects separator to be one of ";" or "," otherwise enforces ";"
+
+## 1.3.0 - 2025-08-19
+### Added
+- .func accepts flag order:
+
 ## 1.2.2 - 2025-07-28
 ### Added
 - .dimensions functionality extended to more granular formatting

data/README.md

@@ -179,7 +179,16 @@ puts "\Add and then remove function 'test'"
 s.func(:add, :test) { |v| v.dim3.to_i }
 s.func(:del, :test)
 
+puts "\nThis function will calculate first, always"
+s.func(:add, :test_first, order: :first) { puts "HERE" }
 
+puts "\nThis function will calculate last, always"
+s.func(:add, :test_last, order: :last) { puts "HERE" }
+
+puts "\nNew functions respect first and last ones"
+s.func(:add, :test_more) { puts "HERE" }
+
+puts "\nFirst and last functions are handy for pre- and post-processing for each combination"
 
 # CONDITIONS ON CARTESIAN SPACE
 
@@ -377,7 +386,7 @@ s.cartesian { |v| puts "#{v.dim1} - #{v.dim2}" }
 
 ### Handling Functions
 ```ruby
-func(command = :print, name = nil, hide: false, progress: false, title: "calculating functions", &block)
+func(command = :print, name = nil, hide: false, progress: false, title: "calculating functions", order: nil, &block)
 ```
 - `command`: symbol, one of the following
   - `:add` to add function as a virtual dimension to Cartesian space
@@ -388,6 +397,7 @@ func(command = :print, name = nil, hide: false, progress: false, title: "calcula
 - `hide`: flag that hides or shows the function in .output; it is useful to hide intermediate calculations
 - `progress`: show progress bar during `:run`, useful for large Cartesian space
 - `title`: title of the progress bar
+- `order`: can be `:first` or `:last` to make the function calculate before or after all other functions
 - `block`: a function that receives each vector and returns a computed value
 
 Functions show up in `.output` like additional (virtual) dimensions.
@@ -442,7 +452,7 @@ Displays a progress bar using `ruby-progressbar`.
 ```ruby
 output(separator: " | ", colorize: false, align: true, format: :plain, limit: nil, file: nil)
 ```
-- `separator`: how to visually separate columns in the output
+- `separator`: how to visually separate columns in the output. For :csv, it defaults to ";" unless it's one of ";" or ","
 - `colorize`: whether to colorize output or not
 - `align`: whether to align output by column or not
 - `format`: one of `:plain`, `:markdown`, or `:csv`

data/lib/flex-cartesian.rb

@@ -34,6 +34,7 @@ class FlexCartesian
     @dimensions = dimensions
     @conditions = []
     @derived = {}
+    @order = { first: nil, last: nil }
     @function_results = {}  # key: Struct instance.object_id => { fname => value }
     @function_hidden = Set.new
     import(path, format: format) if path
@@ -71,11 +72,11 @@ class FlexCartesian
     end
   end
 
-def func(command = :print, name = nil, hide: false, progress: false, title: "calculating functions", &block)
+def func(command = :print, name = nil, hide: false, progress: false, title: "calculating functions", order: nil, &block)
   case command
   when :add
     raise ArgumentError, "Function name and block required for :add" unless name && block_given?
-    add_function(name, &block)
+    add_function(name, order: order, &block)
     @function_hidden.delete(name.to_sym)
     @function_hidden << name.to_sym if hide
 
@@ -89,10 +90,17 @@ def func(command = :print, name = nil, hide: false, progress: false, title: "cal
     else
       @derived.each do |fname, fblock|
         source = fblock.source rescue '(source unavailable)'
-
         body = source.sub(/^.*?\s(?=(\{|\bdo\b))/, '').strip
-
-        puts "  #{fname.inspect.ljust(12)}| #{body}#{@function_hidden.include?(fname) ? ' [HIDDEN]' : ''}"
+        order = ""
+        if @order.value?(fname.to_sym)
+          case @order.key(fname.to_sym)
+          when :first
+            order = " [FIRST]"
+          when :last
+            order = " [LAST]"
+          end
+        end
+        puts "  #{fname.inspect.ljust(12)}| #{body}#{@function_hidden.include?(fname) ? ' [HIDDEN]' : ''}#{order}"
       end
     end
 
@@ -124,18 +132,38 @@ def func(command = :print, name = nil, hide: false, progress: false, title: "cal
   end
 end
 
-  def add_function(name, &block)
+  def add_function(name, order: nil , &block)
     raise ArgumentError, "Block required" unless block_given?
     if reserved_function_names.include?(name.to_sym)
       raise ArgumentError, "Function name '#{name}' has been already added"
     elsif reserved_struct_names.include?(name.to_sym)
       raise ArgumentError, "Name '#{name}' has been reserved for internal method, you can't use it for a function"
     end
-    @derived[name.to_sym] = block
+    if order == :last
+      @derived[name.to_sym] = block # add to the tail of the hash
+      @order[:last] = name.to_sym
+    elsif order == :first
+      @derived = { name.to_sym => block }.merge(@derived) # add to the head of the hash
+      @order[:first] = name.to_sym
+    elsif order == nil
+      if @order[:last] != nil
+        last_name = @order[:last]
+        last_body = @derived[last_name]
+        @derived.delete(@order[:last]) # remove the tail of the hash
+        @derived[name.to_sym] = block # add new function to the tail of the hash
+        @derived[last_name] = last_body # restore :last function in the tail of the hash
+      else
+        @derived[name.to_sym] = block
+      end
+    else
+      raise ArgumentError, "unknown function order '#{order}'"
+    end
   end
 
   def remove_function(name)
     @derived.delete(name.to_sym)
+    @order[:last] = nil if @order[:last] == name.to_sym
+    @order[:first] = nil if @order[:first] == name.to_sym
   end
 
   def cartesian(dims = nil, lazy: false)
@@ -201,6 +229,11 @@ end
   end
 
 def output(separator: " | ", colorize: false, align: true, format: :plain, limit: nil, file: nil)
+  sep = if format == :csv
+          [";", ","].include?(separator) ? separator : ";"
+        else
+          separator
+        end
   rows = if @function_results && !@function_results.empty?
            @function_results.keys
          else
@@ -237,9 +270,9 @@ def output(separator: " | ", colorize: false, align: true, format: :plain, limit
     lines << "| " + headers.map { |h| h.ljust(widths[h] || h.size) }.join(" | ") + " |"
     lines << "|-" + headers.map { |h| "-" * (widths[h] || h.size) }.join("-|-") + "-|"
   when :csv
-    lines << headers.join(",")
+    lines << headers.join(sep)
   else
-    lines << headers.map { |h| fmt_cell(h, colorize, widths[h]) }.join(separator)
+    lines << headers.map { |h| fmt_cell(h, colorize, widths[h]) }.join(sep)
   end
 
   # Rows
@@ -248,7 +281,7 @@ def output(separator: " | ", colorize: false, align: true, format: :plain, limit
              visible_func_names.map { |fname| @function_results&.dig(row, fname) }
 
     line = headers.zip(values).map { |(_, val)| fmt_cell(val, colorize, widths[_]) }
-    lines << (format == :csv ? line.join(",") : line.join(separator))
+    lines << line.join(sep)
   end
 
   # Output to console or file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flex-cartesian
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.1
 platform: ruby
 authors:
 - Yury Rassokhin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-28 00:00:00.000000000 Z
+date: 2025-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Flexible and human-friendly Cartesian product enumerator for Ruby