namo 0.31.2 → 0.31.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 820a3c18db30a81cef333ad6b6bd95cd3129610d8d237a0a4f14554d23bdd2e9
-  data.tar.gz: 8b0c94985ae46c47e8b129eecd7fe7eba7d30f499aea917b2c9e80b1edf2ad7c
+  metadata.gz: 611590edfde52f5713b8fe41daf28b5986a26f4df3a5c28631dace995c31b98c
+  data.tar.gz: f098e612be772d3232598020963f6b3ed5c9a786f4827de25312e90aff23bc48
 SHA512:
-  metadata.gz: a5631205eb63c196e4ba9d6b8cf5bf54807e61a462e55645e216aeb5515d767934413c226a0cb567ae0637002e6c3a80a3490c6db7c94397ae17da2c42ae8c8f
-  data.tar.gz: 829d09221f044a4572ff7b97bc76c3a84cd7c8ce8e9e2ee8656b2ac5c82a3753d2f793223bdf3125a0e22d925bf86e19078680b78d6dcde7077248aef7488740
+  metadata.gz: a28b1d267f69eb14a9ee8d7a9cbdba9de57132be4577a39892e3f679e0ccee293a88a2d526ceda0ff6232317bdb8028ae3f04858160c7a38cbc4cb640c5fff16
+  data.tar.gz: e615d6be239ccd8a563922e3b51f5044a745733a4ef3f120b78ab5b07f84a4ff5be37373386853fb9d1484146471fc7034d58af9aee9172e4ae967e341ba0c39

data/CHANGELOG

@@ -2,6 +2,16 @@
 
 ## 20260824
 
+0.31.3: ~ Namo#to_a: derived dimensions are carried alongside the stored ones.
+
+1. ~ Namo#to_a: each row carries the derived dimensions which can be materialised without arguments, in among its stored keys, so to_a agrees with to_h and with dimensions about what the Namo holds. A formula wanting arguments is omitted, the rule values, coordinates and to_h already follow. Namo#data is unchanged and remains the stored rows; Namo::Row#to_h is unchanged, Row#==, Row#eql? and Namo#<< all reading through it.
+2. ~ README.md: the Extracting data section, and the parameterised-formula rule which now names to_a.
+3. ~ ROADMAP.md: + 0.31.3; the open question on which conversions materialise closes for to_a and stays open for Namo::Row.
+4. ~ Namo::VERSION: /0.31.2/0.31.3/
+
+Rebuilding a Namo from to_a now carries the derived dimensions in as stored data. Namo.new(other.to_a) followed by attaching the formulary which produced them raises, the 0.24.1 collision guard refusing the name twice over; []= accepts it, evicting the data. Where the stored rows are what is meant, data is the accessor for them. A formula whose inputs a projection has cut raises through to_a as it has always raised through to_h and values, which 0.16.0 settled as the caller's own choice.
+
+
 0.31.2: ~ Namo#inspect: the derived: suffix names only what the rows do not carry.
 
 1. ~ Namo#inspect: the derived: suffix names only the derived dimensions the rendered rows do not already carry, and is omitted where they all do. A formula which raises, a parameterised one which cannot be materialised without its arguments, and any formula on a Namo with no rows to render, are named as before, being nowhere else in the output. Namo::Collection renders no rows and so names every one of its own. Namo::Row is unchanged, naming its formulae in every case.

data/README.md

@@ -717,7 +717,7 @@ prices.last[:sma]            # ArgumentError: wrong number of arguments for :sma
 prices.last[:close, 20]      # ArgumentError: wrong number of arguments for :close (given 1, expected 0)
 ```
 
-A formula that requires arguments can't be materialised without them. `values(:sma)`, `coordinates(:sma)`, naming `:sma` in a projection, and selecting on it all raise the same `ArgumentError`; the no-argument `values`, `coordinates`, and `to_h` omit the dimension, returning everything that can be materialised. `dimensions` and `derived_dimensions` still list it — it is queryable, with arguments. To materialise particular values, bind the arguments in a one-arity wrapper and ask for that:
+A formula that requires arguments can't be materialised without them. `values(:sma)`, `coordinates(:sma)`, naming `:sma` in a projection, and selecting on it all raise the same `ArgumentError`; the no-argument `values`, `coordinates`, `to_h` and `to_a` omit the dimension, returning everything that can be materialised. `dimensions` and `derived_dimensions` still list it — it is queryable, with arguments. To materialise particular values, bind the arguments in a one-arity wrapper and ask for that:
 
 ```ruby
 prices[:sma_close_20] = proc{|row| row[:sma, :close, 20]}
@@ -947,7 +947,7 @@ The transforming and reducing methods are deliberately left as Enumerable's defa
 
 ### Extracting data
 
-`to_a` returns an array of hashes — the row-oriented form:
+`to_a` returns an array of hashes — the row-oriented form, carrying derived dimensions alongside the stored ones, so it agrees with `to_h` and with `dimensions` about what the Namo holds:
 
 ```ruby
 sales[:product, :quarter, :revenue].to_a
@@ -959,6 +959,8 @@ sales[:product, :quarter, :revenue].to_a
 # ]
 ```
 
+`data` is the stored rows, without derived dimensions and without copying — it is the accessor for what the Namo was built from, where `to_a` is the conversion of what it can answer. A formula whose inputs a projection has cut raises through `to_a` as it does through `to_h` and `values`, which is [the caller's own choice](#projection-of-derived-dimensions) rather than a failure of the conversion.
+
 `to_h` returns a hash of arrays — the columnar form (see [Coordinates and values](#coordinates-and-values) above):
 
 ```ruby

data/lib/Namo/VERSION.rb

@@ -2,5 +2,5 @@
 # Namo::VERSION
 
 class Namo
-  VERSION = '0.31.2'
+  VERSION = '0.31.3'
 end

data/lib/namo.rb

@@ -241,10 +241,16 @@ class Namo
     other.subset_of_rows?(self)
   end
 
+  # Each row's own keys, in their own order, and then the derived dimensions which
+  # can be materialised without arguments — the rule values, coordinates and to_h
+  # already follow.  data is the stored rows, and stays so.
   def to_a
-    @data.map do |row|
-      row.keys.each_with_object({}) do |key, hash|
-        hash[key] = row[key]
+    materialising do
+      derived = materialisable_dimensions - data_dimensions
+      @data.map do |row|
+        subject = Row.new(row, @formulae, self)
+        stored = row.keys.each_with_object({}){|key, hash| hash[key] = row[key]}
+        derived.each_with_object(stored){|dimension, hash| hash[dimension] = subject[dimension]}
       end
     end
   end

data/test/console_test.rb

@@ -33,7 +33,7 @@ describe 'script/console' do
 
   it "holds what the fixtures hold, so it cannot drift from the demo" do
     expected = eval(Fixtures.readings)
-    _(console('readings.to_a == ' + expected.inspect)).must_match(/true/)
+    _(console('readings.data == ' + expected.inspect)).must_match(/true/)
   end
 
   it "starts without echoing its own source" do

data/test/namo_test.rb

@@ -488,8 +488,8 @@ describe Namo do
         sales[:revenue] = proc{|r| r[:price] * r[:quantity]}
         result = sales[revenue: ->(v){v >= 1500.0}]
         _(result.to_a).must_equal [
-          {product: 'Widget', quarter: 'Q2', price: 10.0, quantity: 150},
-          {product: 'Gadget', quarter: 'Q2', price: 25.0, quantity: 60}
+          {product: 'Widget', quarter: 'Q2', price: 10.0, quantity: 150, revenue: 1500.0},
+          {product: 'Gadget', quarter: 'Q2', price: 25.0, quantity: 60, revenue: 1500.0}
         ]
       end
     end
@@ -571,8 +571,8 @@ describe Namo do
         sales[:revenue] = proc{|r| r[:price] * r[:quantity]}
         result = sales[revenue: 1200.0..]
         _(result.to_a).must_equal [
-          {product: 'Widget', quarter: 'Q2', price: 10.0, quantity: 150},
-          {product: 'Gadget', quarter: 'Q2', price: 25.0, quantity: 60}
+          {product: 'Widget', quarter: 'Q2', price: 10.0, quantity: 150, revenue: 1500.0},
+          {product: 'Gadget', quarter: 'Q2', price: 25.0, quantity: 60, revenue: 1500.0}
         ]
       end
     end
@@ -602,7 +602,7 @@ describe Namo do
       sales[:revenue] = proc{|r| r[:price] * r[:quantity]}
       sales[:cost] = proc{|r| r[:quantity] * 4.0}
       sales[:profit] = proc{|r| r[:revenue] - r[:cost]}
-      _(sales[:product, :quarter, :profit].to_a).must_equal [
+      _(sales[:product, :quarter, :profit].data).must_equal [
         {product: "Widget", quarter: "Q1", profit: 600.0},
         {product: "Widget", quarter: "Q2", profit: 900.0},
         {product: "Gadget", quarter: "Q1", profit: 840.0},
@@ -1657,8 +1657,8 @@ describe Namo do
       sales[:revenue] = proc{|r| r[:price] * r[:quantity]}
       result = sales.select{|row| row[:revenue] >= 1500.0}
       _(result.to_a).must_equal [
-        {product: 'Widget', quarter: 'Q2', price: 10.0, quantity: 150},
-        {product: 'Gadget', quarter: 'Q2', price: 25.0, quantity: 60}
+        {product: 'Widget', quarter: 'Q2', price: 10.0, quantity: 150, revenue: 1500.0},
+        {product: 'Gadget', quarter: 'Q2', price: 25.0, quantity: 60, revenue: 1500.0}
       ]
     end
 
@@ -2458,7 +2458,7 @@ describe Namo do
         dated[:cutoff] = proc{|r| r[:date]}
         result = dated.*(quarterly){|row, candidates| candidates[quarter_end: ->(qe){qe <= row[:cutoff]}].sort_by{|f| f[:quarter_end]}.last(1)}
         _(result.to_a).must_equal [
-          {symbol: 'BHP', date: '2025-05-20', close: 44.0, quarter_end: '2025-03-31', eps: 1.2}
+          {symbol: 'BHP', date: '2025-05-20', close: 44.0, quarter_end: '2025-03-31', eps: 1.2, cutoff: '2025-05-20'}
         ]
       end
 
@@ -2638,8 +2638,8 @@ describe Namo do
         weighted_tiers[:premium] = proc{|t| t[:max_weight] > 15}
         result = orders.**(weighted_tiers){|row, candidates| candidates[premium: ->(v){v}]}
         _(result.to_a).must_equal [
-          {order: 'A', weight: 5, tier: 'heavy', max_weight: 20},
-          {order: 'B', weight: 15, tier: 'heavy', max_weight: 20}
+          {order: 'A', weight: 5, tier: 'heavy', max_weight: 20, premium: true},
+          {order: 'B', weight: 15, tier: 'heavy', max_weight: 20, premium: true}
         ]
       end
 
@@ -3067,6 +3067,41 @@ describe Namo do
     it "returns the data as an array of hashes" do
       _(sales.to_a).must_equal sample_data
     end
+
+    it "carries a derived dimension alongside the stored ones" do
+      sales[:revenue] = proc{|row| row[:price] * row[:quantity]}
+      _(sales.to_a.first).must_equal(
+        {product: 'Widget', quarter: 'Q1', price: 10.0, quantity: 100, revenue: 1000.0})
+    end
+
+    it "agrees with to_h about which dimensions there are" do
+      sales[:revenue] = proc{|row| row[:price] * row[:quantity]}
+      _(sales.to_a.first.keys).must_equal sales.to_h.keys
+      _(sales.to_a.first.keys).must_equal sales.dimensions
+    end
+
+    it "omits a formula which cannot be materialised without its arguments" do
+      sales[:revenue] = proc{|row| row[:price] * row[:quantity]}
+      sales[:scaled] = proc{|row, namo, factor| row[:price] * factor}
+      _(sales.to_a.first.keys).wont_include :scaled
+      _(sales.to_a.first.keys).must_include :revenue
+      _(sales.derived_dimensions).must_include :scaled
+    end
+
+    it "raises where a carried formula's inputs were projected away, as 0.16.0 settled" do
+      sales[:revenue] = proc{|row| row[:price] * row[:quantity]}
+      _(->{sales[:product, :quarter].to_a}).must_raise NoMethodError
+    end
+
+    it "leaves data as the stored rows" do
+      sales[:revenue] = proc{|row| row[:price] * row[:quantity]}
+      _(sales.data).must_equal sample_data
+      _(sales.data.first.keys).wont_include :revenue
+    end
+
+    it "returns fresh rows rather than the stored ones" do
+      _(sales.to_a.first).wont_be_same_as sales.data.first
+    end
   end
 
   describe "#group_by" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namo
 version: !ruby/object:Gem::Version
-  version: 0.31.2
+  version: 0.31.3
 platform: ruby
 authors:
 - thoran