namo 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40c2256efac2663b7593bb1f7e4c3ca08fa07e6e225c75fcef3d6d8658f3794b
-  data.tar.gz: abd7bd9076d7019c245d942425232dcf0966edb076cf6d50fdedf7b74efea90f
+  metadata.gz: ad4994109308fd955b2f508afe1f07251bc4287406ed7f27eb8a484a61dfabcf
+  data.tar.gz: 04be0a1d0e8f97b86932a3e5e8953bfe3b0e51fe16bcb80b5dec9a5a73aecd36
 SHA512:
-  metadata.gz: 2b5045c4160d8812fa3f04f10dc027bf8c6cfaf937405cec0570a31af52babdc1f2dc6e25db249a9b9dea81afc9806f617203ae71dded576974fe9512bd4ec00
-  data.tar.gz: a553ef0ae27d67bf28d8d91ba9e2e71f217f8ee23ff3d177ad207dd520f30971730774a51660830d98d79a6189cee16f1227dbd168282f3a27c4316912a6f29f
+  metadata.gz: 507a77ecfc3d23fe1ad4ef14783b2e4f86ff44b58431cb93b8e4aa41c12bf4778f03c7a3bdca7f8958620b3d2e3bba3292cdfbcd5636c8286661aed100398b30
+  data.tar.gz: fa6acfcf416108a871e0697ae998cef8701263446abee9089c62e1cfb24c102d22f002e643f89890a7c40ad2ccedca3dd7d58ebf04125fb4a87d17f58a908abd

data/CHANGELOG

@@ -1,6 +1,15 @@
 CHANGELOG
 _________
 
+20260601
+0.11.1: Extract the subset Enumerable methods into a Namo::Enumerable module.
+
+1. + lib/Namo/Enumerable.rb: New module Namo::Enumerable holding each and the subset-returning Enumerable methods (select plus its filter/find_all aliases, reject, sort_by, first, last, take, drop, take_while, drop_while, uniq, partition), moved verbatim from Namo. The module does `include ::Enumerable` — the leading :: is required, because under the nested `class Namo; module Enumerable` scope a bare `Enumerable` resolves to Namo::Enumerable itself and raises a cyclic-include error.
+2. ~ lib/namo.rb: Remove the inline each and the eleven subset methods; remove `include Enumerable`; + `require_relative './Namo/Enumerable'` and `include Namo::Enumerable` (which transitively brings stdlib Enumerable into the ancestor chain below the module, so the overrides win and map/reduce/etc. still fall through). Pure reorganisation — no behaviour change.
+3. ~ test/namo_test.rb: + Namo::Enumerable module tests — it is a Module, Namo includes it and stdlib Enumerable, and it precedes ::Enumerable in Namo.ancestors so the overrides resolve first. The existing Enumerable subset tests are unchanged and remain green, evidencing the move is behaviour-preserving.
+4. ~ ROADMAP.md: + note in the 0.11.0 section that, as of 0.11.1, these methods live in the Namo::Enumerable module; bump Date to 20260601.
+5. ~ Namo::VERSION: /0.11.0/0.11.1/
+
 20260531
 0.11.0: ~ Subset Enumerable methods (select, reject, sort_by, first, last, take, drop, take_while, drop_while, uniq, partition) return Namos
 

data/lib/Namo/Enumerable.rb

@@ -0,0 +1,72 @@
+# Namo/Enumerable.rb
+# Namo::Enumerable
+
+class Namo
+  module Enumerable
+    include ::Enumerable
+
+    def each(&block)
+      return enum_for(:each) unless block_given?
+      @data.each{|row_data| block.call(Row.new(row_data, @formulae))}
+    end
+
+    def select(&block)
+      self.class.new(@data.select{|row| block.call(Row.new(row, @formulae))}, 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)
+    end
+
+    def sort_by(&block)
+      self.class.new(@data.sort_by{|row| block.call(Row.new(row, @formulae))}, 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
+      end
+    end
+
+    def last(n = nil)
+      if n
+        self.class.new(@data.last(n), formulae: @formulae.dup)
+      else
+        @data.last ? Row.new(@data.last, @formulae) : nil
+      end
+    end
+
+    def take(n)
+      self.class.new(@data.take(n), formulae: @formulae.dup)
+    end
+
+    def drop(n)
+      self.class.new(@data.drop(n), formulae: @formulae.dup)
+    end
+
+    def take_while(&block)
+      self.class.new(@data.take_while{|row| block.call(Row.new(row, @formulae))}, formulae: @formulae.dup)
+    end
+
+    def drop_while(&block)
+      self.class.new(@data.drop_while{|row| block.call(Row.new(row, @formulae))}, formulae: @formulae.dup)
+    end
+
+    def uniq(&block)
+      rows = block ? @data.uniq{|row| block.call(Row.new(row, @formulae))} : @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))}
+      [
+        self.class.new(matches, formulae: @formulae.dup),
+        self.class.new(non_matches, formulae: @formulae.dup),
+      ]
+    end
+  end
+end

data/lib/Namo/VERSION.rb

@@ -2,5 +2,5 @@
 # Namo::VERSION
 
 class Namo
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end

data/lib/namo.rb

@@ -3,11 +3,12 @@
 
 require_relative './Namo/NegatedDimension'
 require_relative './Namo/Row'
+require_relative './Namo/Enumerable'
 require_relative './Namo/VERSION'
 require_relative './Symbol'
 
 class Namo
-  include Enumerable
+  include Namo::Enumerable
 
   attr_accessor :data
   attr_accessor :formulae
@@ -76,70 +77,6 @@ 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 select(&block)
-    self.class.new(@data.select{|row| block.call(Row.new(row, @formulae))}, 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)
-  end
-
-  def sort_by(&block)
-    self.class.new(@data.sort_by{|row| block.call(Row.new(row, @formulae))}, 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
-    end
-  end
-
-  def last(n = nil)
-    if n
-      self.class.new(@data.last(n), formulae: @formulae.dup)
-    else
-      @data.last ? Row.new(@data.last, @formulae) : nil
-    end
-  end
-
-  def take(n)
-    self.class.new(@data.take(n), formulae: @formulae.dup)
-  end
-
-  def drop(n)
-    self.class.new(@data.drop(n), formulae: @formulae.dup)
-  end
-
-  def take_while(&block)
-    self.class.new(@data.take_while{|row| block.call(Row.new(row, @formulae))}, formulae: @formulae.dup)
-  end
-
-  def drop_while(&block)
-    self.class.new(@data.drop_while{|row| block.call(Row.new(row, @formulae))}, formulae: @formulae.dup)
-  end
-
-  def uniq(&block)
-    rows = block ? @data.uniq{|row| block.call(Row.new(row, @formulae))} : @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))}
-    [
-      self.class.new(matches, formulae: @formulae.dup),
-      self.class.new(non_matches, formulae: @formulae.dup),
-    ]
-  end
-
   def +(other)
     raise_unless_namo(other)
     raise_unless_matching_data_dimensions(other)

data/test/namo_test.rb

@@ -913,6 +913,22 @@ describe Namo do
     end
   end
 
+  describe "Namo::Enumerable module" do
+    it "is a Module supplying the subset methods" do
+      _(Namo::Enumerable).must_be_kind_of Module
+    end
+
+    it "is included in Namo, transitively including stdlib Enumerable" do
+      _(Namo.include?(Namo::Enumerable)).must_equal true
+      _(Namo.include?(Enumerable)).must_equal true
+    end
+
+    it "sits above stdlib Enumerable so its overrides win" do
+      ancestors = Namo.ancestors
+      _(ancestors.index(Namo::Enumerable) < ancestors.index(::Enumerable)).must_equal true
+    end
+  end
+
   describe "#+" do
     let(:more_data) do
       [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namo
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - thoran
@@ -64,6 +64,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/Namo/Enumerable.rb
 - lib/Namo/NegatedDimension.rb
 - lib/Namo/Row.rb
 - lib/Namo/VERSION.rb