namo 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1bc0f90c2517b809ed9929ffcdf2fbc1e538974bc30320a3b603d93582f5200
-  data.tar.gz: 70247c7e8fa7b48ac0192400016351c323f5abcd9ee1095653cc58d6edc524e4
+  metadata.gz: a0cb29939a05de5108211f0d9f89b8c6b3cd0826433199f3f4014f1201a28fee
+  data.tar.gz: d628a872b860561da5c9f02867123864508c34c3311e7d9962457146226d1071
 SHA512:
-  metadata.gz: b7162863da3b04b989dd6206234094b160b0f32d36fee58f948608b85a3cd1c2dc09691c6e2c2c74d598942a0c15e44760f6b498a7bddbb1cc4bb2366b2996ac
-  data.tar.gz: 5dd204de47dc6979753a0b7113765093222f5fab870bacd4034aada2f93288af6e872781f357704951b75d1e17ea9c6aefc8a625530ca2e6f253f695c5456fc2
+  metadata.gz: 72b7db10583b8316b0e727b4af8404c2069533049c40e83a3974841b8a1822139898922492f721e31328632b32582c8795a50fb9a53262bee04fa5bc75672713
+  data.tar.gz: b269559c27dd1999ba2c3fb638c85abc0ee22530d984ffe620b2ac9e3fa1726655ac7c7d26c96273baf1bd1396df6ff0eeaeaf7c4e71753aee588eabdb09417f

data/CHANGELOG

@@ -1,6 +1,30 @@
 CHANGELOG
 _________
 
+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.
+
+1. ~ Namo: include Enumerable
+2. + Namo#each: Yield Row objects wrapping each data row with formulae. Returns an Enumerator when no block is given.
+3. ~ Namo#[]: Refactor to use Enumerable#select and Row#match? instead of select_rows.
+4. - Namo#select_rows: Replaced by Row#match?.
+5. + Namo::Row#match?: Selection logic moved from Namo to Row.
+6. + Namo::Row#to_h: Return the underlying row hash.
+7. ~ namo_test.rb: Add tests for #each and Enumerable methods (map, reduce, min_by, flat_map).
+8. ~ README.md: + Enumerable section
+9. ~ Namo::VERSION: /0.1.0/0.2.0/; /module/class/ to match Namo's definition.
+
 20260328
 0.1.0: Add formulae via []=. Formulae are procs which receive a Row object, compose via named references, and carry through selection.
 

data/README.md

@@ -111,7 +111,47 @@ 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.
 
 ### Formulae
 
@@ -156,6 +196,35 @@ sales[product: 'Widget'][:revenue, :quarter]
 
 Formulae carry through selection — a filtered Namo instance remembers its formulae.
 
+### Enumerable
+
+Namo includes `Enumerable`, so `each`, `reduce`, `map`, `select`, `min_by`, and all the rest work out of the box. Rows are yielded as `Row` objects, so formulae are accessible during enumeration:
+
+```ruby
+sales.reduce(0){|sum, row| sum + row[:quantity]}
+# => 350
+
+sales[product: 'Widget'].reduce(0){|sum, row| sum + row[:quantity]}
+# => 250
+
+sales[:revenue] = proc{|row| row[:price] * row[:quantity]}
+
+sales.reduce(0){|sum, row| sum + row[:revenue]}
+# => 5000.0
+
+sales[product: 'Widget'].reduce(0){|sum, row| sum + row[:revenue]}
+# => 2500.0
+
+sales.map{|row| row[:product]}
+# => ['Widget', 'Widget', 'Gadget', 'Gadget']
+
+sales.min_by{|row| row[:price]}[:product]
+# => 'Widget'
+
+sales.flat_map{|row| [row[:price]]}
+# => [10.0, 10.0, 25.0, 25.0]
+```
+
 ### Extracting data
 
 `to_a` returns an array of hashes:

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

@@ -1,6 +1,6 @@
 # Namo/VERSION.rb
 # Namo::VERSION
 
-module Namo
-  VERSION = '0.1.0'
+class Namo
+  VERSION = '0.3.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,23 +1,12 @@
 # namo.rb
 # Namo
 
-class Namo
-  class Row
-    def [](name)
-      if @formulae.key?(name)
-        @formulae[name].call(self)
-      else
-        @row[name]
-      end
-    end
-
-    private
+require_relative 'Namo/NegatedDimension'
+require_relative 'Namo/Row'
+require_relative 'Symbol'
 
-    def initialize(row, formulae)
-      @row = row
-      @formulae = formulae
-    end
-  end
+class Namo
+  include Enumerable
 
   attr_accessor :data
   attr_accessor :formulae
@@ -35,20 +24,38 @@ class Namo
   end
 
   def [](*names, **selections)
-    data = selections.any? ? select_rows(selections) : @data
-    if names.any?
-      data = data.map do |row_data|
-        row = Row.new(row_data, @formulae)
-        names.each_with_object({}){|name, hash| hash[name] = row[name]}
-      end
+    rows = selections.any? ? select{|row| row.match?(selections)} : entries
+    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
-    self.class.new(data, formulae: @formulae.dup)
+    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|
+          positive.each_with_object({}){|name, hash| hash[name] = row[name]}
+        end
+      else
+        rows.map(&:to_h)
+      end
+    )
+    self.class.new(projected, formulae: @formulae.dup)
   end
 
   def []=(name, proc)
     @formulae[name] = proc
   end
 
+  def each(&block)
+    return enum_for(:each) unless block_given?
+    @data.each{|row_data| block.call(Row.new(row_data, @formulae))}
+  end
+
   def to_a
     @data.map do |row|
       row.keys.each_with_object({}) do |key, hash|
@@ -63,17 +70,4 @@ class Namo
     @data = data
     @formulae = formulae
   end
-
-  def select_rows(selections)
-    @data.select do |row|
-      selections.all? do |dimension, coordinate|
-        case coordinate
-        when Array, Range
-          coordinate.include?(row[dimension])
-        else
-          row[dimension] == coordinate
-        end
-      end
-    end
-  end
 end

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
@@ -146,6 +193,64 @@ describe Namo do
     end
   end
 
+  describe "#each" do
+    it "yields Row objects" do
+      rows = []
+      sales.each{|row| rows << row}
+      _(rows.first).must_be_kind_of Namo::Row
+      _(rows.length).must_equal 4
+    end
+
+    it "yields rows with access to data" do
+      products = sales.map{|row| row[:product]}
+      _(products).must_equal ['Widget', 'Widget', 'Gadget', 'Gadget']
+    end
+
+    it "yields rows with access to formulae" do
+      sales[:revenue] = proc{|r| r[:price] * r[:quantity]}
+      revenues = sales.map{|row| row[:revenue]}
+      _(revenues).must_equal [1000.0, 1500.0, 1000.0, 1500.0]
+    end
+
+    it "returns an enumerator without a block" do
+      _(sales.each).must_be_kind_of Enumerator
+    end
+  end
+
+  describe "Enumerable" do
+    it "supports reduce" do
+      total_quantity = sales.reduce(0){|sum, row| sum + row[:quantity]}
+      _(total_quantity).must_equal 350
+    end
+
+    it "supports reduce with selection" do
+      widget_quantity = sales[product: 'Widget'].reduce(0){|sum, row| sum + row[:quantity]}
+      _(widget_quantity).must_equal 250
+    end
+
+    it "supports reduce with formulae" do
+      sales[:revenue] = proc{|r| r[:price] * r[:quantity]}
+      total_revenue = sales.reduce(0){|sum, row| sum + row[:revenue]}
+      _(total_revenue).must_equal 5000.0
+    end
+
+    it "supports reduce with selection and formulae" do
+      sales[:revenue] = proc{|r| r[:price] * r[:quantity]}
+      widget_revenue = sales[product: 'Widget'].reduce(0){|sum, row| sum + row[:revenue]}
+      _(widget_revenue).must_equal 2500.0
+    end
+
+    it "supports min_by" do
+      cheapest = sales.min_by{|row| row[:price]}
+      _(cheapest[:product]).must_equal 'Widget'
+    end
+
+    it "supports flat_map" do
+      prices = sales.flat_map{|row| [row[:price]]}
+      _(prices).must_equal [10.0, 10.0, 25.0, 25.0]
+    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.1.0
+  version: 0.3.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
@@ -86,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.8
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Named dimensional data for Ruby.
 test_files: []