veritas 0.0.2 → 0.0.3

data/lib/veritas/algebra/intersection.rb

@@ -20,6 +20,7 @@ module Veritas
       #
       # @api public
       def each
+        return to_enum unless block_given?
         right_set = right.to_set
         left.each { |tuple| yield(tuple) if right_set.include?(tuple) }
         self

data/lib/veritas/algebra/join.rb

@@ -70,6 +70,7 @@ module Veritas
       #
       # @api public
       def each(&block)
+        return to_enum unless block_given?
         index = build_index
 
         left.each do |tuple|

data/lib/veritas/algebra/product.rb

@@ -55,6 +55,7 @@ module Veritas
       #
       # @api public
       def each(&block)
+        return to_enum unless block_given?
         left.each do |tuple|
           Relation::Operation::Combination.combine_tuples(header, tuple, right, &block)
         end

data/lib/veritas/algebra/projection.rb

@@ -36,6 +36,7 @@ module Veritas
       #
       # @api public
       def each
+        return to_enum unless block_given?
         seen = {}
         operand.each do |tuple|
           tuple = tuple.project(header)

data/lib/veritas/algebra/rename.rb

@@ -44,6 +44,7 @@ module Veritas
       #
       # @api public
       def each(&block)
+        return to_enum unless block_given?
         operand.each { |tuple| yield Tuple.new(header, tuple.to_ary) }
         self
       end
@@ -80,7 +81,7 @@ module Veritas
         # Return a relation with the header renamed
         #
         # @example
-        #   rename = relation.rename(:a => :b, :c => :d)
+        #   rename = relation.rename(a: :b, c: :d)
         #
         # @param [Hash, Aliases] aliases
         #   the old and new attribute names
@@ -101,5 +102,3 @@ module Veritas
     end # class Rename
   end # module Algebra
 end # module Veritas
-
-require 'veritas/algebra/rename/aliases'

data/lib/veritas/algebra/rename/aliases.rb

@@ -9,6 +9,39 @@ module Veritas
 
         inheritable_alias(:| => :union)
 
+        # Instantiate new set of Aliases
+        #
+        # @example
+        #   aliases = Aliases.new(aliases)
+        #
+        # @param [Hash{Attribute => Attribute}] aliases
+        #
+        # @return [Aliases]
+        #
+        # @api public
+        def self.new(aliases)
+          assert_unique_aliases(aliases)
+          super
+        end
+
+        # Asset the aliases are unique
+        #
+        # @param [Hash{Attribute => Attribute}] aliases
+        #
+        # @return [undefined]
+        #
+        # @raise [DuplicateAliasError]
+        #   raised when the aliases are duplicates
+        #
+        # @api private
+        def self.assert_unique_aliases(aliases)
+          if aliases.values.uniq!
+            raise DuplicateAliasError, 'the aliases must be unique'
+          end
+        end
+
+        private_class_method :assert_unique_aliases
+
         # Initialize rename aliases
         #
         # @param [#to_hash] aliases
@@ -81,6 +114,7 @@ module Veritas
         #
         # @api public
         def each(&block)
+          return to_enum unless block_given?
           @aliases.each(&block)
           self
         end

data/lib/veritas/algebra/restriction.rb

@@ -42,6 +42,7 @@ module Veritas
       #
       # @api public
       def each
+        return to_enum unless block_given?
         operand.each { |tuple| yield(tuple) if predicate.call(tuple) }
         self
       end

data/lib/veritas/algebra/summarization.rb

@@ -53,6 +53,7 @@ module Veritas
       #
       # @api public
       def each
+        return to_enum unless block_given?
         header      = self.header
         summaries   = summarize_relation
         summarizers = self.summarizers.values

data/lib/veritas/algebra/union.rb

@@ -20,6 +20,7 @@ module Veritas
       #
       # @api public
       def each
+        return to_enum unless block_given?
         seen = {}
         left.each  { |tuple| yield(seen[tuple] = tuple)           }
         right.each { |tuple| yield(tuple) unless seen.key?(tuple) }

data/lib/veritas/attribute.rb

@@ -1,20 +1,3 @@
-require 'veritas/attribute/orderable'
-
-require 'veritas/attribute/comparable'
-
-require 'veritas/attribute/object'
-require 'veritas/attribute/numeric'
-
-require 'veritas/attribute/boolean'
-require 'veritas/attribute/class'
-require 'veritas/attribute/date'
-require 'veritas/attribute/date_time'
-require 'veritas/attribute/decimal'
-require 'veritas/attribute/float'
-require 'veritas/attribute/integer'
-require 'veritas/attribute/time'
-require 'veritas/attribute/string'
-
 module Veritas
 
   # Abstract base class representing a type of data in a relation tuple

data/lib/veritas/logic/connective.rb

@@ -22,10 +22,3 @@ module Veritas
     end # class Connective
   end # module Logic
 end # module Veritas
-
-require 'veritas/logic/connective/binary'
-require 'veritas/logic/connective/unary'
-
-require 'veritas/logic/connective/conjunction'
-require 'veritas/logic/connective/disjunction'
-require 'veritas/logic/connective/negation'

data/lib/veritas/logic/connective/binary.rb

@@ -48,6 +48,22 @@ module Veritas
           end
         end
 
+        # Compare the operation with the other operation for equivalency
+        #
+        # @example
+        #   binary == other  # => true or false
+        #
+        # @param [Object] other
+        #
+        # @return [Boolean]
+        #
+        # @api public
+        def ==(other)
+          (kind_of?(other.class) || other.kind_of?(self.class)) &&
+          left  == other.left                                   &&
+          right == other.right
+        end
+
       end # class Binary
     end # class Connective
   end # module Logic

data/lib/veritas/logic/connective/unary.rb

@@ -46,6 +46,21 @@ module Veritas
           end
         end
 
+        # Compare the operation with the other operation for equivalency
+        #
+        # @example
+        #   binary == other  # => true or false
+        #
+        # @param [Object] other
+        #
+        # @return [Boolean]
+        #
+        # @api public
+        def ==(other)
+          (kind_of?(other.class) || other.kind_of?(self.class)) &&
+          operand == other.operand
+        end
+
       end # class Unary
     end # class Connective
   end # module Logic

data/lib/veritas/logic/expression.rb

@@ -4,7 +4,7 @@ module Veritas
     # Abstract base class for logical expressions
     class Expression
       extend Aliasable
-      include AbstractClass, Optimizable, Immutable, Visitable
+      include AbstractClass, Immutable, Visitable
 
       # Evaluate the expression using the operands
       #
@@ -53,7 +53,7 @@ module Veritas
       #
       # @api public
       def ==(other)
-        optimize.eql?(other.optimize)
+        raise NotImplementedError, "#{self.class}#== must be implemented"
       end
 
       # Compare the expression with other expression for equality

data/lib/veritas/logic/predicate.rb

@@ -62,6 +62,22 @@ module Veritas
           memoize(:inverse, self)
       end
 
+      # Compare the operation with the other operation for equivalency
+      #
+      # @example
+      #   binary == other  # => true or false
+      #
+      # @param [Predicate] other
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def ==(other)
+        (kind_of?(other.class) || other.kind_of?(self.class)) &&
+        left  == other.left                                   &&
+        right == other.right
+      end
+
       # Extract the value from the operand or tuple
       #
       # @param [Object, #call] operand
@@ -81,17 +97,3 @@ module Veritas
     end # class Predicate
   end # module Logic
 end # module Veritas
-
-require 'veritas/logic/predicate/comparable'
-require 'veritas/logic/predicate/enumerable'
-
-require 'veritas/logic/predicate/equality'
-require 'veritas/logic/predicate/exclusion'
-require 'veritas/logic/predicate/greater_than'
-require 'veritas/logic/predicate/greater_than_or_equal_to'
-require 'veritas/logic/predicate/inclusion'
-require 'veritas/logic/predicate/inequality'
-require 'veritas/logic/predicate/less_than'
-require 'veritas/logic/predicate/less_than_or_equal_to'
-require 'veritas/logic/predicate/no_match'
-require 'veritas/logic/predicate/match'

data/lib/veritas/logic/proposition.rb

@@ -8,33 +8,33 @@ module Veritas
       # Instantiate a new Proposition
       #
       # @example using a true value
-      #   true_proposition = Proposition.new(true)
+      #   tautology = Proposition.new(true)
       #
       # @example using a false value
-      #   false_proposition = Proposition.new(false)
+      #   contradiction = Proposition.new(false)
       #
       # @return [Proposition]
       #
       # @overload self.new(true)
-      #   Return the True singleton instance
+      #   Return the Tautology singleton instance
       #
       #   @param [Array(true)] *args
       #
-      #   @return [True]
+      #   @return [Tautology]
       #
       # @overload self.new(false)
-      #   Return the False singleton instance
+      #   Return the Contradiction singleton instance
       #
       #   @param [Array(false)] *args
       #
-      #   @return [False]
+      #   @return [Contradiction]
       #
       # @api public
       def self.new(*args)
         if args.empty?
           super
         else
-          (args.first ? True : False).instance
+          (args.first ? Tautology : Contradiction).instance
         end
       end
 
@@ -62,6 +62,20 @@ module Veritas
         self.class.inverse.instance
       end
 
+      # Compare the proposition with other proposition for equivalency
+      #
+      # @example
+      #   proposition == other  # => true or false
+      #
+      # @param [Proposition] other
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def ==(other)
+        kind_of?(other.class) || other.kind_of?(self.class)
+      end
+
       # Compare the proposition with other proposition for equality
       #
       # @example
@@ -105,6 +119,3 @@ module Veritas
     end # class Proposition
   end # module Algebra
 end # module Veritas
-
-require 'veritas/logic/proposition/false'
-require 'veritas/logic/proposition/true'

data/lib/veritas/logic/proposition/{false.rb → contradiction.rb}

@@ -3,24 +3,24 @@ module Veritas
     class Proposition
 
       # A class representing a contradiction
-      class False < Proposition
+      class Contradiction < Proposition
 
         # Return the inverse proposition class
         #
         # @example
-        #   False.inverse  # => True
+        #   Contradiction.inverse  # => Tautology
         #
-        # @return [Class<True>]
+        # @return [Class<Tautology>]
         #
         # @api public
         def self.inverse
-          True
+          Tautology
         end
 
         # Evaluate the proposition
         #
         # @example
-        #   False.call  # => false
+        #   Contradiction.call  # => false
         #
         # @return [false]
         #
@@ -32,7 +32,7 @@ module Veritas
         # Logically AND the proposition with another expression
         #
         # @example
-        #   false_proposition.and(other)  # => false_proposition
+        #   contradiction.and(other)  # => contradiction
         #
         # @param [Expression] other
         #
@@ -46,7 +46,7 @@ module Veritas
         # Logically OR the proposition with another expression
         #
         # @example
-        #   false_proposition.or(other)  # => other
+        #   contradiction.or(other)  # => other
         #
         # @param [Expression] other
         #
@@ -57,7 +57,7 @@ module Veritas
           other
         end
 
-      end # class False
+      end # class Contradiction
     end # class Proposition
   end # module Algebra
 end # module Veritas

data/lib/veritas/logic/proposition/{true.rb → tautology.rb}

@@ -3,24 +3,24 @@ module Veritas
     class Proposition
 
       # A class representing a tautology
-      class True < Proposition
+      class Tautology < Proposition
 
         # Return the inverse proposition class
         #
         # @example
-        #   True.inverse  # => False
+        #   Tautology.inverse  # => Contradiction
         #
-        # @return [Class<False>]
+        # @return [Class<Contradiction>]
         #
         # @api public
         def self.inverse
-          False
+          Contradiction
         end
 
         # Evaluate the proposition
         #
         # @example
-        #   True.call  # => true
+        #   Tautology.call  # => true
         #
         # @return [true]
         #
@@ -32,7 +32,7 @@ module Veritas
         # Logically AND the proposition with another expression
         #
         # @example
-        #   true_proposition.and(other)  # => other
+        #   tautology.and(other)  # => other
         #
         # @param [Expression] other
         #
@@ -46,7 +46,7 @@ module Veritas
         # Logically OR the proposition with another expression
         #
         # @example
-        #   true_proposition.or(other)  # => true_proposition
+        #   tautology.or(other)  # => tautology
         #
         # @param [Expression] other
         #
@@ -57,7 +57,7 @@ module Veritas
           self
         end
 
-      end # class True
+      end # class Tautology
     end # class Proposition
   end # module Algebra
 end # module Veritas