Merge 5077bd8 into 6d8bba3

lib/rambling/trie/enumerable.rb

@@ -23,6 +23,8 @@ def each
             yield word
           end
         end
+
+        self
       end
     end
   end

lib/rambling/trie/readers/plain_text.rb

@@ -10,7 +10,11 @@ class PlainText
         #   from.
         # @yield [String] Each line read from the file.
         def each_word filepath
-          File.foreach(filepath) { |line| yield line.chomp! }
+          return enum_for :each_word unless block_given?
+
+          ::File.foreach(filepath) { |line| yield line.chomp! }
+
+          self
         end
       end
     end

spec/lib/rambling/trie/enumerable_spec.rb

@@ -11,8 +11,8 @@ module Trie
       before { add_words node, words }
 
       describe '#each' do
-        it 'returns an enumerator' do
-          expect(node.each).to be_a Enumerator
+        it 'returns an enumerator when no block is given' do
+          expect(node.each).to be_an Enumerator
         end
 
         it 'has the same word count as the trie' do
@@ -22,6 +22,10 @@ module Trie
         it 'includes every word contained in the trie' do
           node.each { |word| expect(words).to include word }
         end
+
+        it 'returns the enumerable when a block is given' do
+          expect(node.each { |_| }).to eq node
+        end
       end
 
       describe '#size' do

spec/lib/rambling/trie/readers/plain_text_spec.rb

@@ -14,5 +14,13 @@
       reader.each_word(filepath) { |word| yielded << word }
       expect(yielded).to eq words
     end
+
+    it 'returns an enumerator when no block is given' do
+      expect(reader.each_word filepath).to be_an Enumerator
+    end
+
+    it 'returns the enumerable when a block is given' do
+      expect(reader.each_word(filepath) { |_| }).to eq reader
+    end
   end
 end