namo 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6841b3921358ce7eefdbfbdba3a62eafd74857223d9df86038f9cc8087bbb947
-  data.tar.gz: bf05398ce78ea49683fbb7adb0b9989c6d6df86864a9bdf2373b156b14d8d5e7
+  metadata.gz: 0dbfe699c8bbb334e0f72bbfd1859b0eee910be2c72eaab988da633b58b438e6
+  data.tar.gz: 40238ef4593d7820bddfb6cb708823fa9c269a51def947e89cdb43e4b69cbae0
 SHA512:
-  metadata.gz: 2887c9dee76341b5e4ee75d50a1416475bd8c579d52117f67dcab81c9fe7c8cb1c50c08be7295db74aaf1f2d8727aa678b95d231d4c2e1d82a25b1ca050de61e
-  data.tar.gz: d5c5a35ac078d60dcd1baf43e73b5be1aa1bf02ed27a65071fd146223402a812a8b9ff9b88e6be5e4e62b5b47966460df613994d79215405439cde96c1a63278
+  metadata.gz: 9e6dfd0bcf4b8d370373a43e507a4d208e4ccb4478e044eb138bf5f2bfa61612cbb4f10735be691c852d2f8bf672eca70720cc6a5c35cd5fb02fae224388e010
+  data.tar.gz: 2b147c6e7faf7b9f92e8e2457fcd657734a35946c326857e3b7c09177ceaa7f3ce4f0892bdcbb68ec251d673e1b298c1ed06416fe43918656734a58bd0c639ea

data/CHANGELOG

@@ -1,6 +1,26 @@
 CHANGELOG
 _________
 
+20260415
+0.4.0: + concatenation (+) and row removal (-)
+
+1. + Namo#+: Concatenate two Namo instances with matching dimensions. Appends rows from the second to the first. Raises ArgumentError when dimensions differ.
+2. + Namo#-: Remove rows from the first Namo that appear exactly in the second. Whole-row set difference. Raises ArgumentError when dimensions differ.
+3. ~ Namo_test.rb: Add tests for #+ and #-.
+4. ~ README.md: + Concatenation section, + Row removal section.
+5. ~ Namo::VERSION: /0.3.0/0.4.0/
+
+20260415
+0.3.0: + contraction
+
+1. + Namo::NegatedDimension: Wrapper for negated dimension names used in contraction.
+2. + Symbol#-@: Produce a NegatedDimension, enabling -:date syntax.
+3. ~ Namo#[]: Extend to recognise NegatedDimension for contraction (remove named dimensions, keep everything else). Raise ArgumentError when mixing projection and contraction.
+4. > Namo::Row: Extract to Namo/Row.rb.
+5. ~ namo_test.rb: Add tests for contraction, mixed-mode error, and contraction with selection and formulae. Split tests into one file per class: Row_test.rb, NegatedDimension_test.rb, Symbol_test.rb.
+6. ~ README.md: + Contraction section
+7. ~ Namo::VERSION: /0.2.0/0.3.0/
+
 20260414
 0.2.0: Include Enumerable.
 

data/README.md

@@ -111,7 +111,99 @@ sales[:quarter, :price, product: 'Widget']
 # ]>
 ```
 
-Selection and projection always return a new Namo instance, so everything chains.
+### Contraction
+
+Contraction is the complement of projection. Projection says "keep these dimensions"; contraction says "remove these dimensions, keep everything else":
+
+```ruby
+sales[-:price, -:quantity]
+# => #<Namo [
+#   {product: 'Widget', quarter: 'Q1'},
+#   {product: 'Widget', quarter: 'Q2'},
+#   {product: 'Gadget', quarter: 'Q1'},
+#   {product: 'Gadget', quarter: 'Q2'}
+# ]>
+```
+
+The `-:price` syntax uses unary minus on Symbol to produce a negated dimension. Mixing projection and contraction in the same call is an error — the two modes are mutually exclusive:
+
+```ruby
+sales[:product, -:price]  # => ArgumentError
+```
+
+Selection and contraction can be chained:
+
+```ruby
+sales[product: 'Widget'][-:price, -:quantity]
+# => #<Namo [
+#   {product: 'Widget', quarter: 'Q1'},
+#   {product: 'Widget', quarter: 'Q2'}
+# ]>
+```
+
+Or combined in a single call (names before selectors):
+
+```ruby
+sales[-:price, -:quantity, product: 'Widget']
+# => #<Namo [
+#   {product: 'Widget', quarter: 'Q1'},
+#   {product: 'Widget', quarter: 'Q2'}
+# ]>
+```
+
+Selection, projection, and contraction always return a new Namo instance, so everything chains.
+
+### Concatenation
+
+`+` combines two Namo objects that share the same dimensions by appending the rows of the second to the first:
+
+```ruby
+q1_sales = Namo.new([
+  {product: 'Widget', quarter: 'Q1', price: 10.0, quantity: 100},
+  {product: 'Gadget', quarter: 'Q1', price: 25.0, quantity: 40}
+])
+
+q2_sales = Namo.new([
+  {product: 'Widget', quarter: 'Q2', price: 10.0, quantity: 150},
+  {product: 'Gadget', quarter: 'Q2', price: 25.0, quantity: 60}
+])
+
+all_sales = q1_sales + q2_sales
+# => #<Namo [
+#   {product: 'Widget', quarter: 'Q1', price: 10.0, quantity: 100},
+#   {product: 'Gadget', quarter: 'Q1', price: 25.0, quantity: 40},
+#   {product: 'Widget', quarter: 'Q2', price: 10.0, quantity: 150},
+#   {product: 'Gadget', quarter: 'Q2', price: 25.0, quantity: 60}
+# ]>
+```
+
+The dimensions must match — concatenating Namo objects with different dimensions raises an `ArgumentError`. Formulae carry through from the left-hand side.
+
+### Row Removal
+
+`-` removes from the first Namo any row that appears exactly in the second:
+
+```ruby
+sales = Namo.new([
+  {product: 'Widget', quarter: 'Q1', price: 10.0, quantity: 100},
+  {product: 'Widget', quarter: 'Q2', price: 10.0, quantity: 150},
+  {product: 'Gadget', quarter: 'Q1', price: 25.0, quantity: 40},
+  {product: 'Gadget', quarter: 'Q2', price: 25.0, quantity: 60}
+])
+
+discontinued = Namo.new([
+  {product: 'Gadget', quarter: 'Q1', price: 25.0, quantity: 40},
+  {product: 'Gadget', quarter: 'Q2', price: 25.0, quantity: 60}
+])
+
+sales - discontinued
+# => #<Namo [
+#   {product: 'Widget', quarter: 'Q1', price: 10.0, quantity: 100},
+#   {product: 'Widget', quarter: 'Q2', price: 10.0, quantity: 150}
+# ]>
+```
+
+Removal is exact — every dimension, every value must match. The dimensions must match; different dimensions raise an `ArgumentError`. Formulae carry through from the left-hand side.
 
 ### Formulae
 

data/lib/Namo/NegatedDimension.rb

@@ -0,0 +1,14 @@
+# Namo/NegatedDimension.rb
+# Namo::NegatedDimension
+
+class Namo
+  class NegatedDimension
+    attr_reader :name
+
+    private
+
+    def initialize(name)
+      @name = name
+    end
+  end
+end

data/lib/Namo/Row.rb

@@ -0,0 +1,36 @@
+# Namo/Row.rb
+# Namo::Row
+
+class Namo
+  class Row
+    def [](name)
+      if @formulae.key?(name)
+        @formulae[name].call(self)
+      else
+        @row[name]
+      end
+    end
+
+    def match?(selections)
+      selections.all? do |dimension, coordinate|
+        case coordinate
+        when Array, Range
+          coordinate.include?(self[dimension])
+        else
+          self[dimension] == coordinate
+        end
+      end
+    end
+
+    def to_h
+      @row
+    end
+
+    private
+
+    def initialize(row, formulae)
+      @row = row
+      @formulae = formulae
+    end
+  end
+end

data/lib/Namo/VERSION.rb

@@ -2,5 +2,5 @@
 # Namo::VERSION
 
 class Namo
-  VERSION = '0.2.0'
+  VERSION = '0.4.0'
 end

data/lib/Symbol.rb

@@ -0,0 +1,8 @@
+# Symbol.rb
+# Symbol#-@
+
+class Symbol
+  def -@
+    Namo::NegatedDimension.new(self)
+  end
+end

data/lib/namo.rb

@@ -1,41 +1,13 @@
 # namo.rb
 # Namo
 
+require_relative 'Namo/NegatedDimension'
+require_relative 'Namo/Row'
+require_relative 'Symbol'
+
 class Namo
   include Enumerable
 
-  class Row
-    def [](name)
-      if @formulae.key?(name)
-        @formulae[name].call(self)
-      else
-        @row[name]
-      end
-    end
-
-    def match?(selections)
-      selections.all? do |dimension, coordinate|
-        case coordinate
-        when Array, Range
-          coordinate.include?(self[dimension])
-        else
-          self[dimension] == coordinate
-        end
-      end
-    end
-
-    def to_h
-      @row
-    end
-
-    private
-
-    def initialize(row, formulae)
-      @row = row
-      @formulae = formulae
-    end
-  end
-
   attr_accessor :data
   attr_accessor :formulae
 
@@ -53,16 +25,26 @@ class Namo
 
   def [](*names, **selections)
     rows = selections.any? ? select{|row| row.match?(selections)} : entries
-    data = (
-      if names.any?
+    negated, positive = names.partition{|n| n.is_a?(NegatedDimension)}
+    if negated.any? && positive.any?
+      raise ArgumentError, "cannot mix projection and contraction in a single call"
+    end
+    projected = (
+      if negated.any?
+        excluded = negated.map(&:name)
+        kept = dimensions - excluded
+        rows.map do |row|
+          kept.each_with_object({}){|name, hash| hash[name] = row[name]}
+        end
+      elsif positive.any?
         rows.map do |row|
-          names.each_with_object({}){|name, hash| hash[name] = row[name]}
+          positive.each_with_object({}){|name, hash| hash[name] = row[name]}
         end
       else
         rows.map(&:to_h)
       end
     )
-    self.class.new(data, formulae: @formulae.dup)
+    self.class.new(projected, formulae: @formulae.dup)
   end
 
   def []=(name, proc)
@@ -74,6 +56,20 @@ class Namo
     @data.each{|row_data| block.call(Row.new(row_data, @formulae))}
   end
 
+  def +(other)
+    unless dimensions == other.dimensions
+      raise ArgumentError, "dimensions do not match"
+    end
+    self.class.new(@data + other.data, formulae: other.formulae.merge(@formulae))
+  end
+
+  def -(other)
+    unless dimensions == other.dimensions
+      raise ArgumentError, "dimensions do not match"
+    end
+    self.class.new(@data - other.data, formulae: @formulae.dup)
+  end
+
   def to_a
     @data.map do |row|
       row.keys.each_with_object({}) do |key, hash|

data/namo.gemspec

@@ -1,5 +1,11 @@
 require_relative './lib/Namo/VERSION'
 
+class Gem::Specification
+  def development_dependencies=(gems)
+    gems.each{|gem| add_development_dependency(*gem)}
+  end
+end
+
 Gem::Specification.new do |spec|
   spec.name = 'namo'
   spec.version = Namo::VERSION
@@ -13,20 +19,23 @@ Gem::Specification.new do |spec|
   spec.license = 'MIT'
 
   spec.required_ruby_version = '>= 2.7'
+
   spec.require_paths = ['lib']
 
   spec.files = [
+    'namo.gemspec',
     'CHANGELOG',
     'Gemfile',
-    Dir['lib/**/*.rb'],
     'LICENSE',
-    'namo.gemspec',
     'Rakefile',
     'README.md',
+    Dir['lib/**/*.rb'],
     Dir['test/**/*.rb'],
   ].flatten
 
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'minitest-spec-context'
-  spec.add_development_dependency 'rake'
+  spec.development_dependencies = %w{
+    minitest
+    minitest-spec-context
+    rake
+  }
 end

data/test/Namo/NegatedDimension_test.rb

@@ -0,0 +1,13 @@
+require 'minitest/autorun'
+require 'minitest-spec-context'
+
+require_relative '../../lib/namo'
+
+describe Namo::NegatedDimension do
+  describe "#name" do
+    it "returns the original symbol" do
+      nd = Namo::NegatedDimension.new(:price)
+      _(nd.name).must_equal :price
+    end
+  end
+end

data/test/Namo/Row_test.rb

@@ -0,0 +1,69 @@
+require 'minitest/autorun'
+require 'minitest-spec-context'
+
+require_relative '../../lib/namo'
+
+describe Namo::Row do
+  let(:row_data) do
+    {product: 'Widget', quarter: 'Q1', price: 10.0, quantity: 100}
+  end
+
+  let(:formulae) do
+    {}
+  end
+
+  let(:row) do
+    Namo::Row.new(row_data, formulae)
+  end
+
+  describe "#[]" do
+    it "returns raw data by dimension name" do
+      _(row[:product]).must_equal 'Widget'
+      _(row[:price]).must_equal 10.0
+    end
+
+    it "returns nil for missing dimensions" do
+      _(row[:missing]).must_be_nil
+    end
+
+    it "resolves formulae over raw data" do
+      formulae[:revenue] = proc{|r| r[:price] * r[:quantity]}
+      _(row[:revenue]).must_equal 1000.0
+    end
+
+    it "composes formulae" do
+      formulae[:revenue] = proc{|r| r[:price] * r[:quantity]}
+      formulae[:cost] = proc{|r| r[:quantity] * 4.0}
+      formulae[:profit] = proc{|r| r[:revenue] - r[:cost]}
+      _(row[:profit]).must_equal 600.0
+    end
+  end
+
+  describe "#match?" do
+    it "matches a single value" do
+      _(row.match?(product: 'Widget')).must_equal true
+      _(row.match?(product: 'Gadget')).must_equal false
+    end
+
+    it "matches an array of values" do
+      _(row.match?(product: ['Widget', 'Gadget'])).must_equal true
+      _(row.match?(product: ['Gadget'])).must_equal false
+    end
+
+    it "matches a range" do
+      _(row.match?(price: 5.0..15.0)).must_equal true
+      _(row.match?(price: 20.0..30.0)).must_equal false
+    end
+
+    it "matches multiple dimensions" do
+      _(row.match?(product: 'Widget', quarter: 'Q1')).must_equal true
+      _(row.match?(product: 'Widget', quarter: 'Q2')).must_equal false
+    end
+  end
+
+  describe "#to_h" do
+    it "returns the underlying row hash" do
+      _(row.to_h).must_equal row_data
+    end
+  end
+end

data/test/{namo_test.rb → Namo_test.rb}

@@ -85,6 +85,53 @@ describe Namo do
         _(result.to_a).must_equal [{price: 10.0}, {price: 10.0}]
       end
     end
+
+    context "contraction" do
+      it "removes named dimensions" do
+        result = sales[-:price, -:quantity]
+        _(result.dimensions).must_equal [:product, :quarter]
+        _(result.to_a.count).must_equal 4
+        _(result.to_a.first).must_equal({product: 'Widget', quarter: 'Q1'})
+      end
+
+      it "removes a single dimension" do
+        result = sales[-:price]
+        _(result.dimensions).must_equal [:product, :quarter, :quantity]
+        _(result.to_a.count).must_equal 4
+      end
+
+      it "raises when mixing projection and contraction" do
+        _ { sales[:product, -:price] }.must_raise ArgumentError
+      end
+
+      it "carries formulae through contraction" do
+        sales[:label] = proc{|r| "#{r[:product]}-#{r[:quarter]}"}
+        result = sales[-:price, -:quantity]
+        _(result.map{|row| row[:label]}).must_equal [
+          'Widget-Q1', 'Widget-Q2', 'Gadget-Q1', 'Gadget-Q2'
+        ]
+      end
+    end
+
+    context "selection and contraction" do
+      it "can use them together" do
+        result = sales[-:price, -:quantity, product: 'Widget']
+        _(result.to_a.count).must_equal 2
+        _(result.to_a).must_equal [
+          {product: 'Widget', quarter: 'Q1'},
+          {product: 'Widget', quarter: 'Q2'}
+        ]
+      end
+
+      it "can chain them" do
+        result = sales[product: 'Widget'][-:price, -:quantity]
+        _(result.to_a.count).must_equal 2
+        _(result.to_a).must_equal [
+          {product: 'Widget', quarter: 'Q1'},
+          {product: 'Widget', quarter: 'Q2'}
+        ]
+      end
+    end
   end
 
   describe "#[]= formulae" do
@@ -204,6 +251,92 @@ describe Namo do
     end
   end
 
+  describe "#+" do
+    let(:more_data) do
+      [
+        {product: 'Widget', quarter: 'Q3', price: 10.0, quantity: 200},
+        {product: 'Gadget', quarter: 'Q3', price: 25.0, quantity: 80}
+      ]
+    end
+
+    let(:more_sales) do
+      Namo.new(more_data)
+    end
+
+    it "concatenates rows" do
+      result = sales + more_sales
+      _(result.to_a.count).must_equal 6
+      _(result.to_a).must_equal(sample_data + more_data)
+    end
+
+    it "preserves dimensions" do
+      result = sales + more_sales
+      _(result.dimensions).must_equal [:product, :quarter, :price, :quantity]
+    end
+
+    it "carries formulae through from self" do
+      sales[:revenue] = proc{|r| r[:price] * r[:quantity]}
+      result = sales + more_sales
+      _(result.map{|row| row[:revenue]}).must_equal [1000.0, 1500.0, 1000.0, 1500.0, 2000.0, 2000.0]
+    end
+
+    it "merges formulae from other" do
+      more_sales[:revenue] = proc{|r| r[:price] * r[:quantity]}
+      result = sales + more_sales
+      _(result.map{|row| row[:revenue]}).must_equal [1000.0, 1500.0, 1000.0, 1500.0, 2000.0, 2000.0]
+    end
+
+    it "prefers self's formulae on conflict" do
+      sales[:label] = proc{|r| "self: #{r[:product]}"}
+      more_sales[:label] = proc{|r| "other: #{r[:product]}"}
+      result = sales + more_sales
+      _(result.map{|row| row[:label]}).must_equal [
+        'self: Widget', 'self: Widget', 'self: Gadget', 'self: Gadget',
+        'self: Widget', 'self: Gadget'
+      ]
+    end
+
+    it "raises when dimensions differ" do
+      other = Namo.new([{product: 'Widget', quarter: 'Q1'}])
+      _ { sales + other }.must_raise ArgumentError
+    end
+  end
+
+  describe "#-" do
+    let(:to_remove) do
+      Namo.new([
+        {product: 'Widget', quarter: 'Q1', price: 10.0, quantity: 100},
+        {product: 'Gadget', quarter: 'Q2', price: 25.0, quantity: 60}
+      ])
+    end
+
+    it "removes matching rows" do
+      result = sales - to_remove
+      _(result.to_a.count).must_equal 2
+      _(result.to_a).must_equal [
+        {product: 'Widget', quarter: 'Q2', price: 10.0, quantity: 150},
+        {product: 'Gadget', quarter: 'Q1', price: 25.0, quantity: 40}
+      ]
+    end
+
+    it "preserves non-matching rows" do
+      other = Namo.new([{product: 'Thingo', quarter: 'Q4', price: 99.0, quantity: 1}])
+      result = sales - other
+      _(result.to_a).must_equal sample_data
+    end
+
+    it "carries formulae through from self" do
+      sales[:revenue] = proc{|r| r[:price] * r[:quantity]}
+      result = sales - to_remove
+      _(result.map{|row| row[:revenue]}).must_equal [1500.0, 1000.0]
+    end
+
+    it "raises when dimensions differ" do
+      other = Namo.new([{product: 'Widget', quarter: 'Q1'}])
+      _ { sales - other }.must_raise ArgumentError
+    end
+  end
+
   describe "#to_a" do
     it "returns the data as an array of hashes" do
       _(sales.to_a).must_equal sample_data

data/test/Symbol_test.rb

@@ -0,0 +1,16 @@
+require 'minitest/autorun'
+require 'minitest-spec-context'
+
+require_relative '../lib/namo'
+
+describe Symbol do
+  describe "#-@" do
+    it "returns a NegatedDimension" do
+      _(-:price).must_be_kind_of Namo::NegatedDimension
+    end
+
+    it "preserves the symbol name" do
+      _((-:price).name).must_equal :price
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - thoran
@@ -64,10 +64,16 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/Namo/NegatedDimension.rb
+- lib/Namo/Row.rb
 - lib/Namo/VERSION.rb
+- lib/Symbol.rb
 - lib/namo.rb
 - namo.gemspec
-- test/namo_test.rb
+- test/Namo/NegatedDimension_test.rb
+- test/Namo/Row_test.rb
+- test/Namo_test.rb
+- test/Symbol_test.rb
 homepage: https://github.com/thoran/namo
 licenses:
 - MIT