namo 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1bc0f90c2517b809ed9929ffcdf2fbc1e538974bc30320a3b603d93582f5200
-  data.tar.gz: 70247c7e8fa7b48ac0192400016351c323f5abcd9ee1095653cc58d6edc524e4
+  metadata.gz: 6841b3921358ce7eefdbfbdba3a62eafd74857223d9df86038f9cc8087bbb947
+  data.tar.gz: bf05398ce78ea49683fbb7adb0b9989c6d6df86864a9bdf2373b156b14d8d5e7
 SHA512:
-  metadata.gz: b7162863da3b04b989dd6206234094b160b0f32d36fee58f948608b85a3cd1c2dc09691c6e2c2c74d598942a0c15e44760f6b498a7bddbb1cc4bb2366b2996ac
-  data.tar.gz: 5dd204de47dc6979753a0b7113765093222f5fab870bacd4034aada2f93288af6e872781f357704951b75d1e17ea9c6aefc8a625530ca2e6f253f695c5456fc2
+  metadata.gz: 2887c9dee76341b5e4ee75d50a1416475bd8c579d52117f67dcab81c9fe7c8cb1c50c08be7295db74aaf1f2d8727aa678b95d231d4c2e1d82a25b1ca050de61e
+  data.tar.gz: d5c5a35ac078d60dcd1baf43e73b5be1aa1bf02ed27a65071fd146223402a812a8b9ff9b88e6be5e4e62b5b47966460df613994d79215405439cde96c1a63278

data/CHANGELOG

@@ -1,6 +1,19 @@
 CHANGELOG
 _________
 
+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

@@ -156,6 +156,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/VERSION.rb

@@ -1,6 +1,6 @@
 # Namo/VERSION.rb
 # Namo::VERSION
 
-module Namo
-  VERSION = '0.1.0'
+class Namo
+  VERSION = '0.2.0'
 end

data/lib/namo.rb

@@ -2,6 +2,8 @@
 # Namo
 
 class Namo
+  include Enumerable
+
   class Row
     def [](name)
       if @formulae.key?(name)
@@ -11,6 +13,21 @@ class Namo
       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)
@@ -35,13 +52,16 @@ 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]}
+    rows = selections.any? ? select{|row| row.match?(selections)} : entries
+    data = (
+      if names.any?
+        rows.map do |row|
+          names.each_with_object({}){|name, hash| hash[name] = row[name]}
+        end
+      else
+        rows.map(&:to_h)
       end
-    end
+    )
     self.class.new(data, formulae: @formulae.dup)
   end
 
@@ -49,6 +69,11 @@ class Namo
     @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 +88,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/test/namo_test.rb

@@ -146,6 +146,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - thoran
@@ -86,7 +86,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: []