Update Countable, Enumerable, and Queryable to include their Enumerator classes inline, and remove a separate enumerator.rb to address #433.

Author: gkellogg

lib/rdf/mixin/countable.rb

@@ -2,9 +2,13 @@ module RDF
   ##
   # @since 0.2.0
   module Countable
-    autoload :Enumerator, 'rdf/mixin/enumerator'
     extend RDF::Util::Aliasing::LateBound
 
+    # Extends Enumerator with {Countable}, which is used by {Countable#enum_for}
+    class Enumerator < ::Enumerator
+      include RDF::Countable
+    end
+
     ##
     # Returns `true` if `self` contains no RDF statements.
     #

lib/rdf/mixin/enumerable.rb

@@ -57,11 +57,23 @@ module RDF
   # @see RDF::Graph
   # @see RDF::Repository
   module Enumerable
-    autoload :Enumerator, 'rdf/mixin/enumerator'
     extend  RDF::Util::Aliasing::LateBound
     include ::Enumerable
     include RDF::Countable # NOTE: must come after ::Enumerable
 
+    # Extends Enumerator with {Queryable} and {Enumerable}, which is used by {Enumerable#each_statement} and {Queryable#enum_for}
+    class Enumerator < ::Enumerator
+      include RDF::Queryable
+      include RDF::Enumerable
+
+      ##
+      # @return [Array]
+      # @note Make sure returned arrays are also queryable
+      def to_a
+        return super.to_a.extend(RDF::Queryable, RDF::Enumerable)
+      end
+    end
+
     ##
     # Returns `true` if this enumerable supports the given `feature`.
     #

lib/rdf/mixin/enumerator.rb

@@ -9,9 +9,21 @@ module RDF
   # @see RDF::Graph
   # @see RDF::Repository
   module Queryable
-    autoload :Enumerator, 'rdf/mixin/enumerator'
     include ::Enumerable
 
+    # Extends Enumerator with {Queryable} and {Enumerable}, which is used by {Enumerable#each_statement} and {Queryable#enum_for}
+    class Enumerator < ::Enumerator
+      include RDF::Queryable
+      include RDF::Enumerable
+
+      ##
+      # @return [Array]
+      # @note Make sure returned arrays are also queryable
+      def to_a
+        return super.to_a.extend(RDF::Queryable, RDF::Enumerable)
+      end
+    end
+
     ##
     # Queries `self` for RDF statements matching the given `pattern`.
     #