join.rb in veritas-0.0.2

- old
+ new

@@ -1,11 +1,11 @@
 module Veritas
   module Algebra
 
     # The join between relations
     class Join < Relation
-      include Relation::Operation::Combine
+      include Relation::Operation::Combination
 
       # Instantiate a new Join
       #
       # @example
       #   join = Join.new(left, right)
@@ -32,11 +32,11 @@
       #   raised if there are no common attributes between the headers
       #
       # @api private
       def self.assert_joinable_headers(left, right)
         if (left.header & right.header).empty?
-          raise InvalidHeaderError, "the headers must have common attributes for #{name}.new"
+          raise InvalidHeaderError, 'the headers must have common attributes'
         end
       end
 
       private_class_method :assert_joinable_headers
 
@@ -73,10 +73,10 @@
         index = build_index
 
         left.each do |tuple|
           right_tuples = index[join_tuple(tuple)]
           if right_tuples
-            Relation::Operation::Combine.combine_tuples(header, tuple, right_tuples, &block)
+            Relation::Operation::Combination.combine_tuples(header, tuple, right_tuples, &block)
           end
         end
 
         self
       end