revert(collection): reduce scope of refactor due to flaky generic inh…

…eritance

shard.yml

@@ -1,5 +1,5 @@
 name: rethinkdb-orm
-version: 2.5.1
+version: 2.5.2
 
 authors:
   - Caspian Baska <caspianbaska@gmail.com>

src/rethinkdb-orm/utils/changefeed.cr

@@ -1,16 +1,25 @@
 require "crystal-rethinkdb"
 
-require "./collection"
-
 module RethinkORM
   # Wraps the Changefeed iterator and parses events
-  class Changefeed(T) < Collection(T)
+  class Changefeed(T)
+    include Iterator(T)
+    include Iterator::IteratorWrapper
+
     enum Event
       Created
       Updated
       Deleted
     end
 
+    def initialize(@iterator : Iterator(RethinkDB::QueryResult))
+    end
+
+    def stop
+      @iterator.stop
+      super
+    end
+
     def next
       result = wrapped_next
       if result == Iterator::Stop::INSTANCE