veritas 0.0.6 → 0.0.7

data/.travis.yml

@@ -1,11 +1,17 @@
+language: ruby
 bundler_args: --without guard metrics
 script: "bundle exec rake spec"
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ruby-head
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
   - ree
-  - jruby
-  - rbx
-  - rbx-2.0
+  - ruby-head
+  - jruby-head
+notifications:
+  email:
+    - dan.kubb@gmail.com

data/Gemfile

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-source :rubygems
+source 'https://rubygems.org'
 
 group :development do
   gem 'backports', '~> 2.3.0'

data/TODO

@@ -1,3 +1,13 @@
+* Convert Tuple to a Struct
+  * Make Header a "Struct Class", and copy all the Header instance methods to
+    the class level. Move all the Tuple instance methods into the Header
+    instance.
+    * Rename Header as Tuple
+    * Make sure the Tuple has a class level method called #header that returns
+      the set of attributes.
+    * Use a class variable to store each "Tuple class" so that anything with a
+      similar header will be reused.
+
 * Remove Order, Reverse, Limit and Offset from the Relation inheritance chain
   * Instead make it so they are proxy classes that wrap Relations, but
     proxy method calls to the Relation methods, and then wrap the return

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 68
-total_score: 682
+total_score: 708

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 23.3
+threshold: 21.9

data/config/roodi.yml

@@ -2,7 +2,7 @@
 AbcMetricMethodCheck:            { score: 10.3 }
 AssignmentInConditionalCheck:    { }
 CaseMissingElseCheck:            { }
-ClassLineCountCheck:             { line_count: 289 }
+ClassLineCountCheck:             { line_count: 292 }
 ClassNameCheck:                  { pattern: !ruby/regexp /\A(?:[A-Z]+|[A-Z][a-z](?:[A-Z]?[a-z])+)\z/ }
 ClassVariableCheck:              { }
 CyclomaticComplexityBlockCheck:  { complexity: 2 }
@@ -12,7 +12,7 @@ ForLoopCheck:                    { }
 # TODO: decrease line_count to 5 to 10
 MethodLineCountCheck:            { line_count: 14 }
 MethodNameCheck:                 { pattern: !ruby/regexp /\A(?:[a-z\d](?:_?[a-z\d])+[?!=]?|\[\]=?|==|<=>|[+*&|-])\z/ }
-ModuleLineCountCheck:            { line_count: 291 }
+ModuleLineCountCheck:            { line_count: 294 }
 ModuleNameCheck:                 { pattern: !ruby/regexp /\A(?:[A-Z]+|[A-Z][a-z](?:[A-Z]?[a-z])+)\z/ }
 # TODO: decrease parameter_count to 2 or less
 ParameterNumberCheck:            { parameter_count: 3 }

data/config/site.reek

@@ -86,7 +86,8 @@ DataClump:
     # all of these classes have utility class methods that are
     # incorrectly identified as instance methods
     Veritas::Relation::Operation::Binary::ClassMethods,
-    Veritas::Relation::Operation::Set::ClassMethods
+    Veritas::Relation::Operation::Set::ClassMethods,
+    Veritas::Immutable
   ]
   enabled: true
   max_copies: 1

data/lib/veritas.rb

@@ -147,8 +147,8 @@ module Veritas
   # Raised when a binary operation mixes ordered and unordered relations
   class RelationMismatchError < StandardError; end
 
-  # Raised when an attribute is a duplicate of another in the header
-  class DuplicateAttributeError < StandardError; end
+  # Raised when a name is a duplicate of another name in a set
+  class DuplicateNameError < StandardError; end
 
   # Represent an undefined argument
   Undefined = Object.new.freeze

data/lib/veritas/algebra/join.rb

@@ -14,41 +14,6 @@ module Veritas
       # @api private
       attr_reader :join_header
 
-      # Instantiate a new Join
-      #
-      # @example
-      #   join = Join.new(left, right)
-      #
-      # @param [Relation] left
-      # @param [Relation] right
-      #
-      # @return [Join]
-      #
-      # @api public
-      def self.new(left, right)
-        assert_joinable_headers(left, right)
-        super
-      end
-
-      # Assert the headers have common attributes
-      #
-      # @param [Relation] left
-      # @param [Relation] right
-      #
-      # @return [undefined]
-      #
-      # @raise [InvalidHeaderError]
-      #   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'
-        end
-      end
-
-      private_class_method :assert_joinable_headers
-
       # Initialize a Join
       #
       # @param [Relation] left
@@ -59,9 +24,9 @@ module Veritas
       # @api private
       def initialize(left, right)
         super
-        right_header      = right.header
-        @join_header      = left.header  & right_header
-        @remainder_header = right_header - join_header
+        right_header     = right.header
+        @join_header     = left.header  & right_header
+        @disjoint_header = right_header - join_header
       end
 
       # Iterate over each tuple in the set
@@ -85,9 +50,7 @@ module Veritas
 
         left.each do |left_tuple|
           right_tuples = index[join_tuple(left_tuple)]
-          if right_tuples
-            util.combine_tuples(header, left_tuple, right_tuples, &block)
-          end
+          util.combine_tuples(header, left_tuple, right_tuples, &block)
         end
 
         self
@@ -101,16 +64,12 @@ module Veritas
       #
       # @api private
       def build_index
-        index = {}
-
-        right.each do |tuple|
-          (index[join_tuple(tuple)] ||= Set.new) << remainder_tuple(tuple)
-        end
-
+        index = Hash.new { |hash, tuple| hash[tuple] = Set.new }
+        right.each { |tuple| index[join_tuple(tuple)] << disjoint_tuple(tuple) }
         index
       end
 
-      # Generate a tuple with only the common attributes used for the join
+      # Generate a tuple with the join attributes between relations
       #
       # @return [Tuple]
       #
@@ -119,13 +78,13 @@ module Veritas
         tuple.project(join_header)
       end
 
-      # Generate a tuple with the disjoint attributes to use in the join
+      # Generate a tuple with the disjoint attributes between relations
       #
       # @return [Tuple]
       #
       # @api private
-      def remainder_tuple(tuple)
-        tuple.project(@remainder_header)
+      def disjoint_tuple(tuple)
+        tuple.project(@disjoint_header)
       end
 
       module Methods
@@ -157,46 +116,9 @@ module Veritas
         #
         # @api public
         def join(other)
-          if block_given?
-            theta_join(other) { |relation| yield relation }
-          else
-            natural_join(other)
-          end
-        end
-
-      private
-
-        # Return a relation that is the natural join
-        #
-        # @param [Relation] other
-        #   the other relation to join
-        #
-        # @return [Join]
-        #
-        # @api private
-        def natural_join(other)
-          Join.new(self, other)
-        end
-
-        # Return a relation that is a restricted cartesian product
-        #
-        # @param [Relation] other
-        #   the other relation to join
-        #
-        # @yield [relation]
-        #   optional block to restrict the tuples with
-        #
-        # @yieldparam [Relation] relation
-        #   the context to evaluate the restriction with
-        #
-        # @yieldreturn [Function, #call]
-        #   predicate to restrict the tuples with
-        #
-        # @return [Restriction]
-        #
-        # @api private
-        def theta_join(other)
-          product(other).restrict { |relation| yield relation }
+          relation = Join.new(self, other)
+          relation = relation.restrict { |context| yield context } if block_given?
+          relation
         end
 
       end # module Methods

data/lib/veritas/algebra/product.rb

@@ -58,10 +58,13 @@ module Veritas
       # @api public
       def each(&block)
         return to_enum unless block_given?
+        util         = Relation::Operation::Combination
         right_tuples = right.to_a
+
         left.each do |left_tuple|
-          Relation::Operation::Combination.combine_tuples(header, left_tuple, right_tuples, &block)
+          util.combine_tuples(header, left_tuple, right_tuples, &block)
         end
+
         self
       end
 

data/lib/veritas/attribute.rb

@@ -131,7 +131,7 @@ module Veritas
     #
     # @api public
     def call(tuple)
-      tuple[self]
+      tuple.call(self)
     end
 
     # Rename an attribute

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

@@ -8,6 +8,18 @@ module Veritas
       class Negation < Connective
         include Unary, Unary::Invertible
 
+        # Return the negation operation
+        #
+        # @example
+        #   Negation.operation  # => :!
+        #
+        # @return [Symbol]
+        #
+        # @api public
+        def self.operation
+          :'!'
+        end
+
         # Evaluate the operands using a logical NOT
         #
         # @example with true operand
@@ -23,7 +35,7 @@ module Veritas
         # @api public
         def self.call(operand)
           ! operand
-        end
+        end unless Object.method_defined?('!')
 
         # Return the operand
         #

data/lib/veritas/function/numeric/absolute.rb

@@ -8,30 +8,16 @@ module Veritas
       class Absolute < Numeric
         include Unary
 
-        # Return the absolute value
+        # Return the absolute operation
         #
         # @example
-        #   absolute_value = Absolute.call(value)
+        #   Absolute.operation  # => :abs
         #
-        # @param [Numeric] value
-        #
-        # @return [Numeric]
-        #
-        # @api public
-        def self.call(value)
-          value.abs
-        end
-
-        # Return a string representing the absolute function
-        #
-        # @example
-        #   absolute.inspect  # => "ABS(-1)"
-        #
-        # @return [String]
+        # @return [Symbol]
         #
         # @api public
-        def inspect
-          "ABS(#{operand.inspect})"
+        def self.operation
+          :abs
         end
 
         module Methods

data/lib/veritas/function/numeric/unary.rb

@@ -10,6 +10,9 @@ module Veritas
 
         # Return the type returned from #call
         #
+        # @example
+        #   unary.type  # => Attribute::Numeric
+        #
         # @return [Class<Attribute::Numeric>]
         #
         # @api public

data/lib/veritas/function/numeric/unary_minus.rb

@@ -8,18 +8,16 @@ module Veritas
       class UnaryMinus < Numeric
         include Unary
 
-        # Return the value subtracted from 0
+        # Return the unary minus operation
         #
         # @example
-        #   negated_value = UnaryMinus.call(value)
+        #   UnaryMinus.operation  # => :-@
         #
-        # @param [Numeric] value
-        #
-        # @return [Numeric]
+        # @return [Symbol]
         #
         # @api public
-        def self.call(value)
-          -value
+        def self.operation
+          :-@
         end
 
         # Return the inverse function class
@@ -34,18 +32,6 @@ module Veritas
           UnaryPlus
         end
 
-        # Return a string representing the unary minus function
-        #
-        # @example
-        #   unary_minus.inspect  # => "-1"
-        #
-        # @return [String]
-        #
-        # @api public
-        def inspect
-          "-(#{operand.inspect})"
-        end
-
         module Methods
           extend Aliasable
 

data/lib/veritas/function/numeric/unary_plus.rb

@@ -8,20 +8,16 @@ module Veritas
       class UnaryPlus < Numeric
         include Unary
 
-        # Return the value added to 0
-        #
-        # This is a noop.
+        # Return the unary plus operation
         #
         # @example
-        #   new_value = UnaryPlus.call(value)
-        #
-        # @param [Numeric] value
+        #   UnaryPlus.operation  # => :+@
         #
-        # @return [Numeric]
+        # @return [Symbol]
         #
         # @api public
-        def self.call(value)
-          +value
+        def self.operation
+          :+@
         end
 
         # Return the inverse function class
@@ -36,18 +32,6 @@ module Veritas
           UnaryMinus
         end
 
-        # Return a string representing the unary plus function
-        #
-        # @example
-        #   unary_plus.inspect  # => "+1"
-        #
-        # @return [String]
-        #
-        # @api public
-        def inspect
-          "+(#{operand.inspect})"
-        end
-
         module Methods
           extend Aliasable
 

data/lib/veritas/function/proposition.rb

@@ -5,12 +5,15 @@ module Veritas
 
     # Abstract base class for logical propositions
     class Proposition < Function
+      extend Comparator
       include AbstractClass,
               Singleton,
               Function::Connective::Conjunction::Methods,
               Function::Connective::Disjunction::Methods,
               Function::Connective::Negation::Methods
 
+      compare  # only compare instances with the same superclass
+
       # Instantiate a new Proposition
       #
       # @example using a true value
@@ -105,32 +108,6 @@ module Veritas
         kind_of?(other.class) || other.kind_of?(self.class)
       end
 
-      # Compare the proposition with other proposition for equality
-      #
-      # @example
-      #   proposition.eql?(other)  # => true or false
-      #
-      # @param [Proposition] other
-      #
-      # @return [Boolean]
-      #
-      # @api public
-      def eql?(other)
-        instance_of?(other.class)
-      end
-
-      # Return the hash of the proposition
-      #
-      # @example
-      #   hash = proposition.hash
-      #
-      # @return [Fixnum]
-      #
-      # @api public
-      def hash
-        self.class.hash
-      end
-
       # Return a string representing the proposition
       #
       # @example
@@ -143,8 +120,6 @@ module Veritas
         call.inspect
       end
 
-      memoize :hash
-
     end # class Proposition
   end # module Algebra
 end # module Veritas