veritas 0.0.5 → 0.0.6

data/lib/veritas/algebra/summarization.rb

@@ -7,6 +7,8 @@ module Veritas
     class Summarization < Relation
       include Relation::Operation::Unary
 
+      compare :operand, :summarize_per, :summarizers
+
       # The relation to summarize with
       #
       # @return [Relation]
@@ -99,35 +101,6 @@ module Veritas
         self
       end
 
-      # Compare the Summarization with other relation for equality
-      #
-      # @example
-      #   summarization.eql?(other)  # => true or false
-      #
-      # @param [Relation] other
-      #   the other relation to compare with
-      #
-      # @return [Boolean]
-      #
-      # @api public
-      def eql?(other)
-        super                                   &&
-        summarize_per.eql?(other.summarize_per) &&
-        summarizers.eql?(other.summarizers)
-      end
-
-      # Return the hash of the summarization
-      #
-      # @example
-      #   hash = summarization.hash
-      #
-      # @return [Fixnum]
-      #
-      # @api public
-      def hash
-        super ^ summarize_per.hash ^ summarizers.hash
-      end
-
     private
 
       # Return the current summaries
@@ -209,8 +182,6 @@ module Veritas
 
       Relation.class_eval { include Methods }
 
-      memoize :hash
-
     end # class Summarization
   end # module Algebra
 end # module Veritas

data/lib/veritas/attribute/time.rb

@@ -7,7 +7,7 @@ module Veritas
     class Time < Object
       include Comparable
 
-      DEFAULT_RANGE = (::Time.at(0)..::Time.at(2**31-1)).freeze
+      DEFAULT_RANGE = (::Time.at(0)..::Time.at(2 ** 31-1)).freeze
 
       # The Time primitive
       #

data/lib/veritas/attribute.rb

@@ -4,9 +4,11 @@ module Veritas
 
   # Abstract base class representing a type of data in a relation tuple
   class Attribute
-    extend Aliasable
+    extend Aliasable, Comparator
     include AbstractClass, Immutable, ::Comparable, Visitable
 
+    compare :name, :options
+
     # The attribute name
     #
     # @return [Symbol]
@@ -91,11 +93,11 @@ module Veritas
     # @api private
     def self.infer_type(operand)
       case operand
-        when Attribute, Function, Aggregate then operand.type
-        when FalseClass                     then Boolean
-        else
-          type = operand.class
-          descendants.detect { |descendant| type <= descendant.primitive }
+      when Attribute, Function, Aggregate then operand.type
+      when FalseClass                     then Boolean
+      else
+        type = operand.class
+        descendants.detect { |descendant| type <= descendant.primitive }
       end
     end
 
@@ -227,38 +229,7 @@ module Veritas
     #
     # @api public
     def ==(other)
-      other = Attribute.coerce(other)
-      name.equal?(other.name) &&
-      options == other.options
-    end
-
-    # Compare the attribute with other attribute for equality
-    #
-    # @example
-    #   attribute.eql?(other)  # => true or false
-    #
-    # @param [Attribute] other
-    #   the other attribute to compare with
-    #
-    # @return [Boolean]
-    #
-    # @api public
-    def eql?(other)
-      instance_of?(other.class) &&
-      name.equal?(other.name)   &&
-      options.eql?(other.options)
-    end
-
-    # Return the hash of the attribute
-    #
-    # @example
-    #   hash = attribute.hash
-    #
-    # @return [Fixnum]
-    #
-    # @api public
-    def hash
-      self.class.hash ^ name.hash ^ options.hash
+      cmp?(__method__, coerce(other))
     end
 
     # Return a string representing the attribute
@@ -286,10 +257,19 @@ module Veritas
     #
     # @api private
     def valid_or_optional?(value)
-      value.nil? ? !required? : yield
+      value.nil? ? ! required? : yield
     end
 
-    memoize :hash
+    # Coerce the object into an Attribute
+    #
+    # @param [Attribute, Array] object
+    #
+    # @return [Attribute]
+    #
+    # @api private
+    def coerce(object)
+      Attribute.coerce(object)
+    end
 
   end # class Attribute
 end # module Veritas

data/lib/veritas/function/binary.rb

@@ -7,7 +7,7 @@ module Veritas
     module Binary
       include Operation::Binary
 
-      # Evaluate the binary connective using the tuple
+      # Evaluate the binary function using the tuple
       #
       # @example
       #   binary.call(tuple)  # => true or false
@@ -98,8 +98,7 @@ module Veritas
         #
         # @api public
         def inverse
-          self.class.inverse.new(left, right).
-            memoize(:inverse, self)
+          self.class.inverse.new(left, right).memoize(:inverse, self)
         end
 
       end # module Invertible

data/lib/veritas/function/connective/negation.rb

@@ -22,7 +22,7 @@ module Veritas
         #
         # @api public
         def self.call(operand)
-          !operand
+          ! operand
         end
 
         # Return the operand

data/lib/veritas/function/predicate/enumerable.rb

@@ -32,6 +32,25 @@ module Veritas
           super(left, Immutable.freeze_object(right))
         end
 
+        # Evaluate the enumerable function using the tuple
+        #
+        # @example
+        #   enumerable.call(tuple)  # => true or false
+        #
+        # @param [Tuple] tuple
+        #   the tuple to pass to #call in the left and right operands
+        #
+        # @return [Boolean]
+        #
+        # @api public
+        def call(tuple)
+          util = self.class
+          util.call(
+            util.extract_value(left, tuple),
+            right.map { |entry| util.extract_value(entry, tuple) }
+          )
+        end
+
       end # module Enumerable
     end # class Predicate
   end # class Function

data/lib/veritas/function/predicate/exclusion.rb

@@ -22,7 +22,7 @@ module Veritas
         #
         # @api public
         def self.call(left, right)
-          !right.send(Enumerable.compare_method(right), left)
+          ! right.send(Enumerable.compare_method(right), left)
         end
 
         # Return the inverse predicate class

data/lib/veritas/function/predicate/match.rb

@@ -17,7 +17,7 @@ module Veritas
         #
         # @api public
         def self.call(*)
-          !!super
+          super ? true : false
         end
 
         # Return the Match operation

data/lib/veritas/function/unary.rb

@@ -5,8 +5,11 @@ module Veritas
 
       # Mixin for unary functions
       module Unary
+        extend Comparator
         include Operation::Unary
 
+        compare :operand
+
         # Evaluate the unary connective using the tuple
         #
         # @example
@@ -64,7 +67,7 @@ module Veritas
         # @api public
         def ==(other)
           (kind_of?(other.class) || other.kind_of?(self.class)) &&
-          operand == other.operand
+          cmp?(__method__, other)
         end
 
         # Mixin for invertable unary functions
@@ -94,8 +97,7 @@ module Veritas
           #
           # @api public
           def inverse
-            self.class.inverse.new(operand).
-              memoize(:inverse, self)
+            self.class.inverse.new(operand).memoize(:inverse, self)
           end
 
         end # module Invertible

data/lib/veritas/function.rb

@@ -18,7 +18,7 @@ module Veritas
     #
     # @api private
     def self.rename_attributes(operand, aliases)
-      if operand.respond_to?(:rename) && !operand.kind_of?(Attribute)
+      if operand.respond_to?(:rename) && ! operand.kind_of?(Attribute)
         operand.rename(aliases)
       else
         aliases[operand]
@@ -75,46 +75,6 @@ module Veritas
       raise NotImplementedError, "#{self.class}#type must be implemented"
     end
 
-    # Compare the function with other function for equivalency
-    #
-    # @example
-    #   function == other  # => true or false
-    #
-    # @param [Function] other
-    #
-    # @return [Boolean]
-    #
-    # @api public
-    def ==(other)
-      raise NotImplementedError, "#{self.class}#== must be implemented"
-    end
-
-    # Compare the function with other function for equality
-    #
-    # @example
-    #   function.eql?(other)  # => true or false
-    #
-    # @param [Function] other
-    #
-    # @return [Boolean]
-    #
-    # @api public
-    def eql?(other)
-      raise NotImplementedError, "#{self.class}#eql? must be implemented"
-    end
-
-    # Return the hash of the function
-    #
-    # @example
-    #   hash = function.hash
-    #
-    # @return [Fixnum]
-    #
-    # @api public
-    def hash
-      raise NotImplementedError, "#{self.class}#hash must be implemented"
-    end
-
     # Return a string representing the function
     #
     # @example

data/lib/veritas/relation/base.rb

@@ -6,6 +6,8 @@ module Veritas
     # A class that represents a base relation
     class Base < Relation
 
+      compare :header, :to_set, :name
+
       # The base relation name
       #
       # @example
@@ -33,35 +35,6 @@ module Veritas
         @name = Immutable.freeze_object(name.to_s)
       end
 
-      # Compare the base relation with other relation for equality
-      #
-      # @example
-      #   base.eql?(other)  # => true or false
-      #
-      # @param [Relation] other
-      #   the other relation to compare with
-      #
-      # @return [Boolean]
-      #
-      # @api public
-      def eql?(other)
-        super && name.eql?(other.name)
-      end
-
-      # Return the hash of the base relation
-      #
-      # @example
-      #   hash = base.hash
-      #
-      # @return [Fixnum]
-      #
-      # @api public
-      def hash
-        super ^ name.hash
-      end
-
-      memoize :hash
-
     end # class Base
   end # class Relation
 end # module Veritas

data/lib/veritas/relation/empty.rb

@@ -11,12 +11,40 @@ module Veritas
       #
       # @param [Header] header
       #   the header for the empty relation
+      # @param [#each] tuples
+      #   optional original tuples
       #
       # @return [undefined]
       #
       # @api public
-      def initialize(header)
-        super(header, ZERO_TUPLE)
+      def initialize(header, tuples = ZERO_TUPLE)
+        super
+      end
+
+      # Noop #each method
+      #
+      # @example
+      #   empty = Empty.new(header)
+      #   empty.each { ... }
+      #
+      # @return [self]
+      #
+      # @api public
+      def each
+        return to_enum unless block_given?
+        self
+      end
+
+      # Return the number of tuples
+      #
+      # @example
+      #   empty.size  # => 0
+      #
+      # @return [0]
+      #
+      # @api public
+      def size
+        0
       end
 
     end # class Empty

data/lib/veritas/relation/header.rb

@@ -5,9 +5,11 @@ module Veritas
 
     # A set of attributes that correspond to values in each tuple
     class Header
-      extend Aliasable
+      extend Aliasable, Comparator
       include Enumerable, Immutable
 
+      compare :to_set
+
       inheritable_alias(
         :& => :intersect,
         :| => :union,
@@ -217,35 +219,7 @@ module Veritas
       #
       # @api public
       def ==(other)
-        to_set == self.class.coerce(other).to_set
-      end
-
-      # Compare the header with other header for equality
-      #
-      # @example
-      #   header.eql?(other)  # => true or false
-      #
-      # @param [Header] other
-      #   the other header to compare with
-      #
-      # @return [Boolean]
-      #
-      # @api public
-      def eql?(other)
-        instance_of?(other.class) &&
-        to_set == other.to_set
-      end
-
-      # Return the hash of the header
-      #
-      # @example
-      #   hash = header.hash
-      #
-      # @return [Fixnum]
-      #
-      # @api public
-      def hash
-        self.class.hash ^ @attributes.hash
+        cmp?(__method__, coerce(other))
       end
 
       # Test if there are no attributes
@@ -286,6 +260,18 @@ module Veritas
         self.class.new(attributes)
       end
 
+      # Coerce the object into a Header
+      #
+      # @param [Header, #to_ary]
+      #   the header or attributes
+      #
+      # @return [Header]
+      #
+      # @api private
+      def coerce(object)
+        self.class.coerce(object)
+      end
+
       # Coerce an Array-like object into a Header
       #
       # @param [Header, #to_ary]
@@ -298,7 +284,7 @@ module Veritas
         object.kind_of?(Header) ? object : new(object)
       end
 
-      memoize :hash, :to_ary
+      memoize :to_ary
 
     end # class Header
   end # class Relation

data/lib/veritas/relation/materialized.rb

@@ -54,18 +54,6 @@ module Veritas
         true
       end
 
-      # Test if there are no tuples
-      #
-      # @example
-      #   materialized.empty?  # => true or false
-      #
-      # @return [Boolean]
-      #
-      # @api public
-      def empty?
-        tuples.empty?
-      end
-
       # Return the number of tuples
       #
       # @example

data/lib/veritas/relation/operation/limit.rb

@@ -8,6 +8,8 @@ module Veritas
       class Limit < Relation
         include Unary
 
+        compare :operand, :limit
+
         # Return the limit
         #
         # @example
@@ -117,33 +119,6 @@ module Veritas
           self
         end
 
-        # Compare the Limit with other relation for equality
-        #
-        # @example
-        #   limited_relation.eql?(other)  # => true or false
-        #
-        # @param [Relation] other
-        #   the other relation to compare with
-        #
-        # @return [Boolean]
-        #
-        # @api public
-        def eql?(other)
-          super && limit.eql?(other.limit)
-        end
-
-        # Return the hash of the limit
-        #
-        # @example
-        #   hash = limit.hash
-        #
-        # @return [Fixnum]
-        #
-        # @api public
-        def hash
-          super ^ limit.hash
-        end
-
         module Methods
 
           # Return a relation with n tuples
@@ -201,8 +176,6 @@ module Veritas
 
         Relation.class_eval { include Methods }
 
-        memoize :hash
-
       end # class Limit
     end # module Operation
   end # class Relation

data/lib/veritas/relation/operation/offset.rb

@@ -8,6 +8,8 @@ module Veritas
       class Offset < Relation
         include Unary
 
+        compare :operand, :offset
+
         # Return the offset
         #
         # @example
@@ -116,33 +118,6 @@ module Veritas
           self
         end
 
-        # Compare the Offset with other relation for equality
-        #
-        # @example
-        #   offset_relation.eql?(other)  # => true or false
-        #
-        # @param [Relation] other
-        #   the other relation to compare with
-        #
-        # @return [Boolean]
-        #
-        # @api public
-        def eql?(other)
-          super && offset.eql?(other.offset)
-        end
-
-        # Return the hash of the offset
-        #
-        # @example
-        #   hash = offset.hash
-        #
-        # @return [Fixnum]
-        #
-        # @api public
-        def hash
-          super ^ offset.hash
-        end
-
         module Methods
 
           # Return a relation with n tuples
@@ -164,8 +139,6 @@ module Veritas
 
         Relation.class_eval { include Methods }
 
-        memoize :hash
-
       end # class Offset
     end # module Operation
   end # class Relation

data/lib/veritas/relation/operation/order/direction.rb

@@ -7,8 +7,11 @@ module Veritas
 
         # Abstract base class for attribute sorting
         class Direction
+          extend Comparator
           include AbstractClass, Immutable
 
+          compare :attribute
+
           # The attribute to sort on
           #
           # @return [Attribute]
@@ -97,33 +100,6 @@ module Veritas
             eql?(other)
           end
 
-          # Compare the direction with other direction for equality
-          #
-          # @example
-          #   direction.eql?(other)  # => true or false
-          #
-          # @param [Direction] other
-          #
-          # @return [Boolean]
-          #
-          # @api public
-          def eql?(other)
-            instance_of?(other.class) &&
-            attribute.eql?(other.attribute)
-          end
-
-          # Return the hash of the direction
-          #
-          # @example
-          #   hash = direction.hash
-          #
-          # @return [Fixnum]
-          #
-          # @api public
-          def hash
-            self.class.hash ^ attribute.hash
-          end
-
           # Coerce an object into a Direction
           #
           # @param [Attribute, Direction] object
@@ -136,8 +112,6 @@ module Veritas
             object.kind_of?(Direction) ? object : new(object)
           end
 
-          memoize :hash
-
         end # class Direction
 
         # Represent an attribute sorted ascending