lib/fitting/report/combinations.rb in fitting-3.0.2 vs lib/fitting/report/combinations.rb in fitting-4.0.0

@@ -1,46 +1,26 @@
 module Fitting
   module Report
     class Combinations
+      class Empty < RuntimeError; end
+      class NotFound < RuntimeError; end
+
       def initialize(combinations)
         @combinations = combinations
       end
 
       def to_a
         @combinations
       end
 
-      def size
-        @combinations.size
-      end
-
-      def size_with_tests
-        @combinations.count { |c| c.tests.size != 0 }
-      end
-
-      def join(tests)
-        tests.to_a.map do |test|
-          if there_a_suitable_combination?(test)
-            cram_into_the_appropriate_combinations(test)
-            test.mark_combination
+      def find!(test)
+        raise Empty if @combinations.empty?
+        @combinations.map do |combination|
+          if JSON::Validator.fully_validate(combination.json_schema, test.body) == []
+            return combination
           end
         end
-      end
-
-      def there_a_suitable_combination?(test)
-        return false if @combinations.nil?
-
-        @combinations.map do |combination|
-          return true if JSON::Validator.fully_validate(combination.json_schema, test.body) == []
-        end
-
-        false
-      end
-
-      def cram_into_the_appropriate_combinations(test)
-        @combinations.map do |combination|
-          combination.add_test(test) if JSON::Validator.fully_validate(combination.json_schema, test.body) == []
-        end
+        raise NotFound
       end
     end
   end
 end