flex-cartesian 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a2ca7796b432b25c13982324959267a48475d5e9bce840b36309f976e05aa8f
-  data.tar.gz: c43b4a80cda5177c29cd7e07c186d6075fa2597ed3fe3e4e886e49b94b76ef49
+  metadata.gz: 20aebfbce656dcb5bbe2467cae65ad8bc510022f6a908b88f55f14101a92e1c3
+  data.tar.gz: 334d472b4cd56b2a159459c2a8f46d80c704780de7ff348fe711a63d7930c1dc
 SHA512:
-  metadata.gz: 8271368f575fdd9dc460d6acb7d37678faf8071293738c9cf421ad7fa3dbc0bcf197590d79e57216cc20ee4b028ffa0b58f84b160dddb900b71d778ba93ef8e8
-  data.tar.gz: 4e55180b78619c9ad100c0b6e7db1b19cc7c74871936939340d53af7b6e01eba82bd2bd2e739e0e33c3ef334cfb66f75284aeae1ef2ca1dcebbe00f60eb5843a
+  metadata.gz: f865d4ad80b7ff10d85ebbeaf1a0a2e0185fe9798cf45dd50c1ae4246ad1dd96cf3b01983c29606f27886312335c4aa7e540b45f38e25c37753df7ce5bfbe152
+  data.tar.gz: 9250f059eeb325d2d69732af18207561351cb8e86d3a6da878b1d66ab37e1d39f970af8385a463aa5ef89d0261f9cd7eda7eac39648c492c70e7bf841d181028

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 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.

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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flex-cartesian
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Yury Rassokhin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-28 00:00:00.000000000 Z
+date: 2025-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize