namo 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78880ca991afa35b970cc09625c4ca632db3a3ff69e7b4c69fda2fa3b536bd08
-  data.tar.gz: b85bfe8ef28cf45880e8ebda997d209e7a4f6d545710bad52ec4f6e5c790e30f
+  metadata.gz: 7d2d5b27fc7c414edd9d13ac80d87bc6f99c87b2f94a42b8f192c3e5a4f08daa
+  data.tar.gz: 91ff974cb3c20802cf0afea77563211a1d29abda66bf9960ed18611fbaf09410
 SHA512:
-  metadata.gz: c61419caff79be760cc24d3cd67eb008107061a65041853bd5108e51c70bf0fb100e50c899241b2ae45de59d92c9f7bcd6173eb2af279543c9057c186c3ec4ba
-  data.tar.gz: 5b9fe7311512c5a59f6528d70a82724f35323769267a804784d14a83351da08cb62000feb6f676e396ecd45c79397413f754cb09c599e5204f28212e95caa872
+  metadata.gz: f309aa497bde5bd05083f844f8d123257917da3e74abe07e4e18a8aff3dd362ab0e2c2b4b6df0791cb3a1b55ea53f9f7914a89eda74c2d158c0d7e5cf1e6b358
+  data.tar.gz: 62040149299672f673de4216cc7123e78e0135902d5a5ad3c948e74e7d2906b184b9ac6a6e84238f000d85a63b3ccc0b6dc894c3cdb74a65fb6ec1d7df0d6e33

data/CHANGELOG

@@ -1,6 +1,41 @@
 CHANGELOG
 _________
 
+20260612
+0.15.0: + two-arity formulae — procs with arity 2 receive (row, namo) for cross-row computation.
+
+1. ~ lib/Namo/Row.rb: Row's constructor gains an optional third parameter, namo (default nil),
+   stored in @namo — the Namo that yielded the Row; the two-argument form keeps working.
+   Row#[] dispatches on formula arity: exactly 2 calls formula.call(self, @namo), raising
+   ArgumentError via the new private raise_unless_namo_context when @namo is nil; every
+   other arity (0, 1, negative) keeps the existing formula.call(self) unchanged.
+2. ~ lib/Namo/Enumerable.rb: every Row construction (each, select and its aliases, reject,
+   sort_by, first, last, take_while, drop_while, uniq's block form, partition) passes self
+   as the Row's namo, so two-arity formulae resolve during enumeration and predicate
+   evaluation, with the yielding Namo as the window.
+3. ~ lib/namo.rb: values_for's derived branch and the * and ** block paths pass self as the
+   Row's namo — values/coordinates/to_h resolve two-arity dimensions, and composition-block
+   rows can resolve self's two-arity formulae (extension of the 0.14.0 block contract; the
+   (Row, Namo) -> Namo contract and result-formulae rule are unchanged).
+4. ~ test/Namo/Row_test.rb: + constructor third-argument and backward-compatibility tests,
+   arity-dispatch tests (1, 2, 0, negative), the nil-namo ArgumentError, and match? on a
+   two-arity derived dimension.
+5. ~ test/namo_test.rb: + "#[]= two-arity formulae" describe — SMA cross-row resolution via
+   values/coordinates/to_h, selection and subset-predicate resolution, first/last Rows,
+   yielding-Namo (filtered-window) semantics, liveness, operator carry-through, composition-
+   block resolution, mixed-arity chains, and the empty-Namo case.
+6. ~ README.md: + Cross-row formulae subsection under Formulae, with the SMA example, the
+   yielding-Namo semantic, and the no-context error.
+7. ~ ROADMAP.md: Promote 0.15.0 to shipped; Current state -> 0.15.0; Summary folds in
+   two-arity formulae; the example's window.length corrected to window.count (Namo has
+   no length); "Live computation objects" phrasing updated. + upcoming 0.16.0 section,
+   Data/formula exclusivity — projection drops the formulae it materialises, * and **
+   raise on a data/formula name collision — with parameterised formulae renumbered to
+   0.17.0, Namo::Collection to 0.18.0, and group_by to 0.19.0; next phase -> 0.16.0.
+8. ~ COMPARISON.md: Two-arity formulae -> shipped (0.15.0) with the same window.count
+   correction; Parameterised formulae repointed to planned (0.17.0). Date bumped.
+9. ~ Namo::VERSION: /0.14.0/0.15.0/
+
 20260608
 0.14.0: + blocks on the composition operators (*, **) for custom match refinement.
 

data/README.md

@@ -644,6 +644,34 @@ sales[product: 'Widget'][:revenue, :quarter]
 
 Formulae carry through selection — a filtered Namo instance remembers its formulae.
 
+#### Cross-row formulae
+
+A formula's arity selects its calling convention. A proc with **one** parameter receives the row, as above. A proc with **two** parameters receives `(row, namo)`, where `namo` is the Namo the row belongs to — so the formula can reach beyond the current row to the rest of the collection. That's what cross-row computation needs: moving windows, ranks, running totals, anything whose value depends on the row's neighbours.
+
+A simple moving average reads the surrounding rows through `namo`:
+
+```ruby
+prices = Namo.new([
+  {symbol: 'AAA', date: 1, close: 10.0},
+  {symbol: 'AAA', date: 2, close: 20.0},
+  {symbol: 'AAA', date: 3, close: 30.0}
+])
+
+prices[:sma] = proc{|row, namo|
+  window = namo[symbol: row[:symbol], date: ->(d){d <= row[:date]}]
+  window.values(:close).sum / window.count.to_f
+}
+
+prices.values(:sma)
+# => [10.0, 15.0, 20.0]
+```
+
+`namo` is the Namo that yielded the row, live — so the window always reflects the current state of the object you ask through. A filtered Namo's rows window over the filtered rows; an operator result's rows window over the result. Appending a row changes every cross-row value on the next access, with no caching.
+
+One-arity formulae are unchanged, and the two forms mix freely — a one-arity formula can reference a two-arity one, and a two-arity formula can reference a one-arity one, by name.
+
+Resolving a two-arity formula needs a Namo to window over. A `Row` constructed directly, without one, raises an `ArgumentError` naming the formula rather than letting the missing context surface as an unrelated error.
+
 ### Polymorphic `[]=`
 
 `[]=` dispatches on the type of the value assigned. A proc registers a formula, as above. Anything else broadcasts the value to every row:

data/lib/Namo/Enumerable.rb

@@ -7,28 +7,28 @@ class Namo
 
     def each(&block)
       return enum_for(:each) unless block_given?
-      @data.each{|row_data| block.call(Row.new(row_data, @formulae))}
+      @data.each{|row_data| block.call(Row.new(row_data, @formulae, self))}
     end
 
     def select(&block)
-      self.class.new(@data.select{|row| block.call(Row.new(row, @formulae))}, formulae: @formulae.dup)
+      self.class.new(@data.select{|row| block.call(Row.new(row, @formulae, self))}, formulae: @formulae.dup)
     end
     alias_method :filter, :select
     alias_method :find_all, :select
 
     def reject(&block)
-      self.class.new(@data.reject{|row| block.call(Row.new(row, @formulae))}, formulae: @formulae.dup)
+      self.class.new(@data.reject{|row| block.call(Row.new(row, @formulae, self))}, formulae: @formulae.dup)
     end
 
     def sort_by(&block)
-      self.class.new(@data.sort_by{|row| block.call(Row.new(row, @formulae))}, formulae: @formulae.dup)
+      self.class.new(@data.sort_by{|row| block.call(Row.new(row, @formulae, self))}, formulae: @formulae.dup)
     end
 
     def first(n = nil)
       if n
         self.class.new(@data.first(n), formulae: @formulae.dup)
       else
-        @data.first ? Row.new(@data.first, @formulae) : nil
+        @data.first ? Row.new(@data.first, @formulae, self) : nil
       end
     end
 
@@ -36,7 +36,7 @@ class Namo
       if n
         self.class.new(@data.last(n), formulae: @formulae.dup)
       else
-        @data.last ? Row.new(@data.last, @formulae) : nil
+        @data.last ? Row.new(@data.last, @formulae, self) : nil
       end
     end
 
@@ -49,20 +49,20 @@ class Namo
     end
 
     def take_while(&block)
-      self.class.new(@data.take_while{|row| block.call(Row.new(row, @formulae))}, formulae: @formulae.dup)
+      self.class.new(@data.take_while{|row| block.call(Row.new(row, @formulae, self))}, formulae: @formulae.dup)
     end
 
     def drop_while(&block)
-      self.class.new(@data.drop_while{|row| block.call(Row.new(row, @formulae))}, formulae: @formulae.dup)
+      self.class.new(@data.drop_while{|row| block.call(Row.new(row, @formulae, self))}, formulae: @formulae.dup)
     end
 
     def uniq(&block)
-      rows = block ? @data.uniq{|row| block.call(Row.new(row, @formulae))} : @data.uniq
+      rows = block ? @data.uniq{|row| block.call(Row.new(row, @formulae, self))} : @data.uniq
       self.class.new(rows, formulae: @formulae.dup)
     end
 
     def partition(&block)
-      matches, non_matches = @data.partition{|row| block.call(Row.new(row, @formulae))}
+      matches, non_matches = @data.partition{|row| block.call(Row.new(row, @formulae, self))}
       [
         self.class.new(matches, formulae: @formulae.dup),
         self.class.new(non_matches, formulae: @formulae.dup),

data/lib/Namo/Row.rb

@@ -5,7 +5,13 @@ class Namo
   class Row
     def [](name)
       if @formulae.key?(name)
-        @formulae[name].call(self)
+        case @formulae[name].arity
+        when 2
+          raise_unless_namo_context(name)
+          @formulae[name].call(self, @namo)
+        else
+          @formulae[name].call(self)
+        end
       else
         @row[name]
       end
@@ -44,9 +50,16 @@ class Namo
 
     private
 
-    def initialize(row, formulae)
+    def initialize(row, formulae, namo = nil)
       @row = row
       @formulae = formulae
+      @namo = namo
+    end
+
+    def raise_unless_namo_context(name)
+      unless @namo
+        raise ArgumentError, "two-arity formula #{name.inspect} requires a Namo context, but this Row has none"
+      end
     end
   end
 end

data/lib/Namo/VERSION.rb

@@ -2,5 +2,5 @@
 # Namo::VERSION
 
 class Namo
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 end

data/lib/namo.rb

@@ -124,7 +124,7 @@ class Namo
       matched = other.data.select{|right_row| shared.all?{|dim| left_row[dim] == right_row[dim]}}
       if block
         candidates = other.class.new(matched, formulae: other.formulae.dup)
-        chosen = block.call(Row.new(left_row, @formulae), candidates)
+        chosen = block.call(Row.new(left_row, @formulae, self), candidates)
         chosen.data.each{|right_row| combined_data << left_row.merge(right_row)}
       else
         matched.each{|right_row| combined_data << left_row.merge(right_row)}
@@ -140,7 +140,7 @@ class Namo
     @data.each do |left_row|
       if block
         candidates = other.class.new(other.data, formulae: other.formulae.dup)
-        chosen = block.call(Row.new(left_row, @formulae), candidates)
+        chosen = block.call(Row.new(left_row, @formulae, self), candidates)
         chosen.data.each{|right_row| combined_data << left_row.merge(right_row)}
       else
         other.data.each{|right_row| combined_data << left_row.merge(right_row)}
@@ -229,11 +229,17 @@ class Namo
 
   private
 
+  def initialize(positional_data = nil, data: [], formulae: {}, name: nil)
+    @data = positional_data || data
+    @formulae = formulae
+    @name = name
+  end
+
   def values_for(dim)
     if data_dimensions.include?(dim)
       @data.map{|row_data| row_data[dim]}
     else
-      @data.map{|row_data| Row.new(row_data, @formulae)[dim]}
+      @data.map{|row_data| Row.new(row_data, @formulae, self)[dim]}
     end
   end
 
@@ -260,10 +266,4 @@ class Namo
       raise ArgumentError, "dimensions in common, need no common dimensions: #{data_dimensions} vs #{other.data_dimensions}"
     end
   end
-
-  def initialize(positional_data = nil, data: [], formulae: {}, name: nil)
-    @data = positional_data || data
-    @formulae = formulae
-    @name = name
-  end
 end

data/test/Namo/Row_test.rb

@@ -40,6 +40,60 @@ describe Namo::Row do
     end
   end
 
+  describe "constructor" do
+    it "constructs from the two-argument form (namo defaults nil)" do
+      _(Namo::Row.new(row_data, formulae)).must_be_kind_of Namo::Row
+    end
+
+    it "accepts a third namo argument" do
+      namo = Namo.new([row_data])
+      _(Namo::Row.new(row_data, formulae, namo)).must_be_kind_of Namo::Row
+    end
+  end
+
+  describe "#[] arity dispatch" do
+    it "calls an arity-1 formula with the Row only" do
+      seen = nil
+      formulae[:dim] = ->(r){seen = r; 1}
+      row[:dim]
+      _(seen).must_be_same_as row
+    end
+
+    it "calls an arity-2 formula with the Row and the yielding Namo" do
+      namo = Namo.new([row_data])
+      row = Namo::Row.new(row_data, formulae, namo)
+      seen_row = nil
+      seen_namo = nil
+      formulae[:dim] = ->(r, n){seen_row = r; seen_namo = n; 1}
+      row[:dim]
+      _(seen_row).must_be_same_as row
+      _(seen_namo.equal?(namo)).must_equal true
+    end
+
+    it "takes the one-arity path for an arity-0 proc" do
+      formulae[:dim] = proc{42}
+      _(row[:dim]).must_equal 42
+    end
+
+    it "takes the one-arity path for a negative-arity proc" do
+      seen_rest = nil
+      formulae[:dim] = proc{|r, *rest| seen_rest = rest; 1}
+      row[:dim]
+      _(seen_rest).must_equal []
+    end
+
+    it "raises ArgumentError naming the formula when an arity-2 formula has no Namo context" do
+      formulae[:sma] = ->(r, n){n.count}
+      error = _(proc{row[:sma]}).must_raise ArgumentError
+      _(error.message).must_match(/sma/)
+    end
+
+    it "resolves an arity-1 formula on a Row with no Namo context" do
+      formulae[:revenue] = ->(r){r[:price] * r[:quantity]}
+      _(row[:revenue]).must_equal 1000.0
+    end
+  end
+
   describe "#match?" do
     it "matches a single value" do
       _(row.match?(product: 'Widget')).must_equal true
@@ -61,6 +115,14 @@ describe Namo::Row do
       _(row.match?(product: 'Widget', quarter: 'Q2')).must_equal false
     end
 
+    it "resolves a two-arity derived dimension when the Row carries a Namo" do
+      namo = Namo.new([row_data])
+      formulae[:row_count] = ->(r, n){n.count}
+      row = Namo::Row.new(row_data, formulae, namo)
+      _(row.match?(row_count: 1)).must_equal true
+      _(row.match?(row_count: 2)).must_equal false
+    end
+
     describe "Proc predicates" do
       it "matches when the proc returns true" do
         _(row.match?(price: ->(v){v < 15.0})).must_equal true

data/test/namo_test.rb

@@ -647,6 +647,126 @@ describe Namo do
     end
   end
 
+  describe "#[]= two-arity formulae" do
+    let(:price_data) do
+      [
+        {symbol: 'AAA', date: 1, close: 10.0},
+        {symbol: 'AAA', date: 2, close: 20.0},
+        {symbol: 'AAA', date: 3, close: 30.0},
+      ]
+    end
+
+    let(:prices) do
+      Namo.new(price_data)
+    end
+
+    # A simple moving average: the mean close over the rows of the same symbol
+    # up to and including the current row's date, computed against the Namo the
+    # row belongs to.
+    let(:sma) do
+      ->(row, namo){
+        window = namo[symbol: row[:symbol], date: ->(d){d <= row[:date]}]
+        window.values(:close).sum / window.count.to_f
+      }
+    end
+
+    it "resolves a cross-row SMA via values" do
+      prices[:sma] = sma
+      _(prices.values(:sma)).must_equal [10.0, 15.0, 20.0]
+    end
+
+    it "resolves through coordinates" do
+      prices[:sma] = sma
+      _(prices.coordinates(:sma)).must_equal [10.0, 15.0, 20.0]
+    end
+
+    it "resolves through the no-arg to_h" do
+      prices[:sma] = sma
+      _(prices.to_h[:sma]).must_equal [10.0, 15.0, 20.0]
+    end
+
+    it "selects on the two-arity dimension" do
+      prices[:sma] = sma
+      _(prices[sma: ->(v){v > 12.0}].values(:date)).must_equal [2, 3]
+    end
+
+    it "resolves a two-arity dimension in a subset-method predicate" do
+      prices[:sma] = sma
+      result = prices.select{|row| row[:sma] > 12.0}
+      _(result).must_be_kind_of Namo
+      _(result.values(:date)).must_equal [2, 3]
+    end
+
+    it "resolves the two-arity formula on the no-arg first Row" do
+      prices[:sma] = sma
+      _(prices.first[:sma]).must_equal 10.0
+    end
+
+    it "resolves the two-arity formula on the no-arg last Row" do
+      prices[:sma] = sma
+      _(prices.last[:sma]).must_equal 20.0
+    end
+
+    it "windows over the yielding Namo — a filtered Namo computes over the filtered rows only" do
+      prices[:sma] = sma
+      filtered = prices.select{|row| row[:date] >= 2}
+      # On the full Namo the date-2 SMA averages dates 1 and 2 (15.0); on the
+      # filtered Namo it sees only date 2, so the value differs.
+      _(prices.values(:sma)).must_equal [10.0, 15.0, 20.0]
+      _(filtered.values(:sma)).must_equal [20.0, 25.0]
+    end
+
+    it "is live: appending a row changes the two-arity result on next access" do
+      prices[:sma] = sma
+      _(prices.last[:sma]).must_equal 20.0
+      prices.data << {symbol: 'AAA', date: 4, close: 40.0}
+      _(prices.last[:sma]).must_equal 25.0
+    end
+
+    it "carries a two-arity formula through a set-operator result, windowing over the combined rows" do
+      a = Namo.new([{symbol: 'AAA', date: 1}, {symbol: 'AAA', date: 2}])
+      b = Namo.new([{symbol: 'AAA', date: 3}])
+      a[:peers] = ->(row, namo){namo.count}
+      _((a + b).values(:peers)).must_equal [3, 3, 3]
+    end
+
+    it "carries a merged two-arity formula through a composition result, windowing over the joined rows" do
+      left = Namo.new([{symbol: 'AAA', date: 1}, {symbol: 'AAA', date: 2}])
+      right = Namo.new([{symbol: 'AAA', sector: 'tech'}])
+      left[:peers] = ->(row, namo){namo.count}
+      result = left * right
+      _(result.values(:peers)).must_equal [2, 2]
+    end
+
+    it "resolves a two-arity formula of self inside a composition block" do
+      left = Namo.new([{symbol: 'AAA', date: 1}, {symbol: 'AAA', date: 2}])
+      right = Namo.new([{symbol: 'AAA', sector: 'tech'}])
+      left[:peers] = ->(row, namo){namo.count}
+      seen = nil
+      left.*(right){|row, candidates| seen = row[:peers]; candidates}
+      _(seen).must_equal 2
+    end
+
+    it "lets a one-arity formula reference a two-arity formula by name" do
+      prices[:sma] = sma
+      prices[:double_sma] = ->(row){row[:sma] * 2}
+      _(prices.values(:double_sma)).must_equal [20.0, 30.0, 40.0]
+    end
+
+    it "lets a two-arity formula reference a one-arity formula by name" do
+      prices[:tenth] = ->(row){row[:close] / 10.0}
+      prices[:tenth_plus_count] = ->(row, namo){row[:tenth] + namo.count}
+      _(prices.values(:tenth_plus_count)).must_equal [4.0, 5.0, 6.0]
+    end
+
+    it "returns [] for a two-arity dimension on an empty Namo without invoking the formula" do
+      invoked = false
+      empty = Namo.new([], formulae: {sma: ->(row, namo){invoked = true; 0}})
+      _(empty.values(:sma)).must_equal []
+      _(invoked).must_equal false
+    end
+  end
+
   describe "#each" do
     it "yields Row objects" do
       rows = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namo
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - thoran
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.12
+rubygems_version: 4.0.14
 specification_version: 4
 summary: Named dimensional data for Ruby.
 test_files: []