Refactoring.

Put all of the filtering logic in one place and relocated several
'include' commands so that they are in the classes that actually use
the functionality that is mixed in by the inclusion.

lib/cuke_slicer/extractors/file_extractor.rb

@@ -1,24 +1,20 @@
-require "cuke_slicer/helpers/extraction_helpers"
-require "cuke_slicer/helpers/filter_helpers"
 require "cuke_slicer/helpers/matching_helpers"
+require "cuke_slicer/helpers/filter_helpers"
+require "cuke_slicer/helpers/extraction_helpers"
 
 
 module CukeSlicer
   class FileExtractor
 
     include ExtractionHelpers
-    include FilterHelpers
-    include MatchingHelpers
 
 
     def extract(target, filters, format, &block)
       Array.new.tap do |test_cases|
         unless target.feature.nil?
           tests = target.feature.tests
 
-          runnable_elements = extract_runnable_elements(extract_runnable_block_elements(tests, filters))
-
-          apply_custom_filter(runnable_elements, &block)
+          runnable_elements = extract_runnable_elements(extract_runnable_block_elements(tests, filters, &block))
 
           runnable_elements.each do |element|
             case

lib/cuke_slicer/helpers/extraction_helpers.rb

@@ -1,7 +1,10 @@
 module CukeSlicer
   module ExtractionHelpers
 
-    def extract_runnable_block_elements(things, filters)
+    include FilterHelpers
+
+
+    def extract_runnable_block_elements(things, filters, &block)
       Array.new.tap do |elements|
         things.each do |thing|
           if thing.is_a?(CukeModeler::Outline)
@@ -15,6 +18,8 @@ def extract_runnable_block_elements(things, filters)
         filter_included_paths(elements, filters[:included_paths])
         filter_excluded_tags(elements, filters[:excluded_tags])
         filter_included_tags(elements, filters[:included_tags])
+
+        apply_custom_filter(elements, &block)
       end
     end
 

lib/cuke_slicer/helpers/filter_helpers.rb

@@ -1,6 +1,9 @@
 module CukeSlicer
   module FilterHelpers
 
+    include MatchingHelpers
+
+
     def apply_custom_filter(elements, &block)
       if block
         elements.reject! do |element|