veritas 0.0.3 → 0.0.4

data/lib/veritas/relation/header.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
   class Relation
 
@@ -69,8 +71,9 @@ module Veritas
       #
       # @api private
       def self.duplicate_attributes(attributes)
-        duplicates = attributes.select { |attribute| attributes.count(attribute) > 1 }
-        duplicates.map! { |attribute| attribute.name.to_s }.uniq!
+        names = attributes.map { |attribute| attribute.name }
+        names.select! { |name| names.count(name) > 1 }
+        names.uniq!
       end
 
       private_class_method :coerce_attributes, :assert_unique_attributes, :duplicate_attributes
@@ -86,9 +89,8 @@ module Veritas
       #
       # @api public
       def initialize(attributes)
-        @attributes = attributes
-        @names      = {}
-        @indexes    = {}
+        @names      = attributes.map { |attribute| attribute.name }
+        @attributes = Hash[@names.zip(attributes)]
       end
 
       # Iterate over each attribute in the header
@@ -105,33 +107,12 @@ module Veritas
       # @return [self]
       #
       # @api public
-      def each(&block)
+      def each
         return to_enum unless block_given?
-        to_ary.each(&block)
+        @names.each { |name| yield @attributes.fetch(name) }
         self
       end
 
-      # Lookup the index of an attribute in the header given a name
-      #
-      # @example
-      #   index = header.index(:id)
-      #
-      # @param [Attribute, #to_ary, #to_sym] name
-      #
-      # @return [Integer]
-      #   the offset when the name is known
-      # @return [nil]
-      #   nil when the attribute is unknown
-      #
-      # @api private
-      def index(name)
-        @indexes[name] ||=
-          begin
-            attribute = self[name]
-            to_ary.index(attribute) if attribute
-          end
-      end
-
       # Lookup an attribute in the header given a name
       #
       # @example
@@ -146,11 +127,7 @@ module Veritas
       #
       # @api public
       def [](name)
-        @names[name] ||=
-          begin
-            name = Attribute.name_from(name)
-            detect { |attribute| attribute.name == name }
-          end
+        @attributes[Attribute.name_from(name)]
       end
 
       # Return a header with only the attributes specified
@@ -225,7 +202,7 @@ module Veritas
       #
       # @api private
       def to_ary
-        @attributes
+        @attributes.values_at(*@names).freeze
       end
 
       # Compare the header with other header for equivalency
@@ -268,7 +245,7 @@ module Veritas
       #
       # @api public
       def hash
-        self.class.hash ^ to_ary.hash
+        self.class.hash ^ @attributes.hash
       end
 
       # Test if there are no attributes
@@ -280,7 +257,7 @@ module Veritas
       #
       # @api public
       def empty?
-        to_ary.empty?
+        @names.empty?
       end
 
       # Return a string representing the header
@@ -321,7 +298,7 @@ module Veritas
         object.kind_of?(Header) ? object : new(object)
       end
 
-      memoize :hash
+      memoize :hash, :to_ary
 
     end # class Header
   end # class Relation

data/lib/veritas/relation/materialized.rb

@@ -1,9 +1,18 @@
+# encoding: utf-8
+
 module Veritas
   class Relation
 
     # A materialized relation
     class Materialized < Relation
 
+      # The relation sort order
+      #
+      # @return [Operation::Order::DirectionSet]
+      #
+      # @api private
+      attr_reader :directions
+
       # Initialize a materialized Relation
       #
       # @param [Header, #to_ary] header

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
   class Relation
     module Operation
@@ -29,8 +31,7 @@ module Veritas
         # @api private
         def initialize(left, right)
           super
-          @header     = left.header | right.header
-          @directions = Relation::Operation::Order::DirectionSet::EMPTY
+          @header = left.header | right.header
         end
 
         module ClassMethods

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
   class Relation
     module Operation

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
   class Relation
     module Operation
@@ -16,6 +18,13 @@ module Veritas
         # @api public
         attr_reader :limit
 
+        # The relation sort order
+        #
+        # @return [Operation::Order::DirectionSet]
+        #
+        # @api private
+        attr_reader :directions
+
         # Instantiate a new Limit
         #
         # @example
@@ -81,7 +90,8 @@ module Veritas
         # @api private
         def initialize(operand, limit)
           super(operand)
-          @limit = limit.to_int
+          @limit      = limit.to_int
+          @directions = operand.directions
         end
 
         # Iterate over each tuple in the set

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
   class Relation
     module Operation
@@ -16,6 +18,13 @@ module Veritas
         # @api public
         attr_reader :offset
 
+        # The relation sort order
+        #
+        # @return [Operation::Order::DirectionSet]
+        #
+        # @api private
+        attr_reader :directions
+
         # Instantiate a new Offset
         #
         # @example
@@ -81,7 +90,8 @@ module Veritas
         # @api private
         def initialize(operand, offset)
           super(operand)
-          @offset = offset.to_int
+          @offset     = offset.to_int
+          @directions = operand.directions
         end
 
         # Iterate over each tuple in the set

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
   class Relation
     module Operation

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
   class Relation
     module Operation
@@ -84,9 +86,9 @@ module Veritas
           # @return [self]
           #
           # @api public
-          def each(&block)
+          def each
             return to_enum unless block_given?
-            to_ary.each(&block)
+            to_ary.each { |tuple| yield tuple }
             self
           end
 
@@ -238,7 +240,7 @@ module Veritas
             object.kind_of?(DirectionSet) ? object : new(object)
           end
 
-          memoize :hash
+          memoize :hash, :reverse
 
         end # class DirectionSet
       end # class Order

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
   class Relation
     module Operation
@@ -6,6 +8,13 @@ module Veritas
       class Order < Relation
         include Unary
 
+        # The relation sort order
+        #
+        # @return [Operation::Order::DirectionSet]
+        #
+        # @api private
+        attr_reader :directions
+
         # Instantiate a new Order
         #
         # @example
@@ -77,9 +86,9 @@ module Veritas
         # @return [self]
         #
         # @api public
-        def each(&block)
+        def each
           return to_enum unless block_given?
-          directions.sort_tuples(operand).each(&block)
+          directions.sort_tuples(operand).each { |tuple| yield tuple }
           self
         end
 
@@ -117,9 +126,6 @@ module Veritas
           # @example with no directions
           #   order = relation.order  # sort by the header
           #
-          # @example with directions
-          #   order = relation.order([ relation[:a].desc, relation[:b] ])
-          #
           # @example with a block
           #   order = relation.order { |r| [ r[:a].desc, r[:b] ] }
           #
@@ -128,11 +134,13 @@ module Veritas
           #
           # @yieldparam [Relation] relation
           #
+          # @yieldreturn [Array<Direction>, Header]
+          #
           # @return [Order]
           #
           # @api public
-          def order(directions = block_given? ? Array(yield(self)) : header)
-            Order.new(self, directions)
+          def order
+            Order.new(self, block_given? ? Array(yield(self)) : header)
           end
 
         end # module Methods

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
   class Relation
     module Operation
@@ -52,9 +54,9 @@ module Veritas
         # @return [self]
         #
         # @api public
-        def each(&block)
+        def each
           return to_enum unless block_given?
-          operand.reverse_each(&block)
+          operand.reverse_each { |tuple| yield tuple }
           self
         end
 

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
   class Relation
     module Operation

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
   class Relation
     module Operation
@@ -15,8 +17,7 @@ module Veritas
         # @api private
         def initialize(operand)
           super
-          @header     = operand.header
-          @directions = operand.directions
+          @header = operand.header
         end
 
       end # module Unary

data/lib/veritas/relation.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
 
   # Abstract base class for Relation operations
@@ -16,7 +18,9 @@ module Veritas
     # @return [Operation::Order::DirectionSet]
     #
     # @api private
-    attr_reader :directions
+    def directions
+      Operation::Order::DirectionSet::EMPTY
+    end
 
     # Instantiate a new Relation
     #
@@ -59,9 +63,8 @@ module Veritas
     #
     # @api private
     def initialize(header, tuples)
-      @header     = Header.coerce(header)
-      @tuples     = tuples
-      @directions = Operation::Order::DirectionSet::EMPTY
+      @header = Header.coerce(header)
+      @tuples = tuples
     end
 
     # Lookup an Attribute in the header given an attribute name
@@ -184,14 +187,14 @@ module Veritas
 
     # Coerce an Enumerable into a Relation
     #
-    # @param [Relation, Enumerable] tuples
+    # @param [Enumerable] tuples
     #   the tuples to coerce
     #
     # @return [Relation]
     #
     # @api private
     def coerce(tuples)
-      tuples.kind_of?(Relation) ? tuples : Relation.new(header, tuples)
+      Relation.new(header, tuples)
     end
 
     memoize :hash

data/lib/veritas/support/abstract_class.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
   module AbstractClass
 

data/lib/veritas/support/aliasable.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
 
   # A mixin to allow inheritable aliases for methods to be added

data/lib/veritas/support/evaluator.rb

@@ -1,52 +1,73 @@
+# encoding: utf-8
+
 module Veritas
   module Evaluator
 
     # Provide a context to evaluate a Relation operation block
-    class Expression
+    class Context
       include Immutable
 
-      # The expressions to evaluate
+      # The functions to evaluate
       #
       # @return [Hash]
       #
       # @api private
-      attr_reader :expressions
+      attr_reader :functions
 
-      # Initialize an Expression
+      # Initialize a Context
+      #
+      # @param [Header] header
       #
       # @return [undefined]
       #
       # @api private
-      def initialize
-        @expressions = {}
+      def initialize(header)
+        @header    = header
+        @functions = {}
         yield self
-        @expressions.freeze
+        @functions.freeze
       end
 
-      # Add an expression to be evaluated by the relation operation
+      # Add a function to be evaluated by the summarization operation
       #
       # @example of a function
-      #   evaluator.add(:total, evaluator[:unit_price] * evaluator[:quantity])
+      #   context.add(:total, context[:unit_price] * context[:quantity])
       #
       # @example of a block
-      #   evaluator.add(:total) { |t| t[:unit_price] * t[:quantity] } }
+      #   context.add(:total) { |tuple| tuple[:unit_price] * tuple[:quantity] } }
       #
       # @param [Attribute, #to_ary, #to_sym] attribute
       #   the attribute to add to the header
-      # @param [#call] expression
-      #   optional function
+      # @param [Object] object
+      #   optional object
       #
       # @yield []
-      #   optional block to execute in the relation operation
+      #   optional block to execute in the summarization operation
       #
       # @return [self]
       #
       # @api public
-      def add(attribute, expression = nil, &block)
-        expressions[Attribute.coerce(attribute)] = expression || block
+      def add(attribute, object = Undefined, &block)
+        object = block if object.equal?(Undefined)
+        type   = Attribute.infer_type(object)
+        functions[type.coerce(attribute)] = object
         self
       end
 
-    end # class FunctionExpression
+      # Lookup the attribute in the header
+      #
+      # @example
+      #   attribute = context[name]
+      #
+      # @param [Symbol]
+      #
+      # @return [Attribute]
+      #
+      # @api public
+      def [](name)
+        @header[name]
+      end
+
+    end # class Context
   end # module Evaluator
 end # module Veritas

data/lib/veritas/support/immutable.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
 
   # Allows objects to be made immutable
@@ -59,7 +61,7 @@ module Veritas
     #
     # @api public
     def memoize(name, value)
-      @__memory["@#{name}"] = value
+      @__memory["@#{name}"] = Immutable.freeze_object(value)
       self
     end
 
@@ -174,7 +176,7 @@ module Veritas
         original = instance_method(method)
         ivar     = "@#{method}"
         send(:define_method, method) do |*args|
-          @__memory[ivar] ||= original.bind(self).call(*args)
+          @__memory[ivar] ||= Immutable.freeze_object(original.bind(self).call(*args))
         end
       end
 
@@ -241,9 +243,7 @@ module Veritas
       # @return [undefined]
       #
       # @api public
-      def []=(ivar, value)
-        instance_variable_set(ivar, Immutable.freeze_object(value))
-      end
+      alias []= instance_variable_set
 
     end # class Memory
   end # module Immutable

data/lib/veritas/support/operation/binary.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
   module Operation
     module Binary

data/lib/veritas/support/operation/unary.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
   module Operation
     module Unary

data/lib/veritas/support/visitable.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
 
   # A mixin to allow instances to be visited

data/lib/veritas/tuple.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
 
   # A set of objects representing a unique fact in a relation
@@ -23,7 +25,7 @@ module Veritas
     # @api private
     def initialize(header, data)
       @header = header
-      @data   = data.to_ary
+      @data   = Hash[header.zip(data.to_ary)].freeze
     end
 
     # Lookup a value in the tuple given an attribute
@@ -37,8 +39,7 @@ module Veritas
     #
     # @api public
     def [](attribute)
-      index = header.index(attribute)
-      to_ary.at(index) if index
+      @data[header[attribute]]
     end
 
     # Return a tuple with only the specified attributes
@@ -53,7 +54,7 @@ module Veritas
     #
     # @api public
     def project(header)
-      self.class.new(header, header.map { |attribute| self[attribute] })
+      self.class.new(header, @data.values_at(*header))
     end
 
     # Append values to the tuple and return a new tuple
@@ -80,14 +81,17 @@ module Veritas
     #
     # @param [Header] header
     #   the attributes to include in the tuple
-    # @param [Array<#call>] extensions
+    # @param [Array<Object>] extensions
     #   the functions to extend the tuple with
     #
     # @return [Tuple]
     #
     # @api public
     def extend(header, extensions)
-      join(header, extensions.map { |extension| extension.call(self) })
+      join(
+        header,
+        extensions.map { |extension| Function.extract_value(extension, self) }
+      )
     end
 
     # Convert the Tuple into an Array
@@ -99,7 +103,7 @@ module Veritas
     #
     # @api public
     def to_ary
-      @data
+      @data.values_at(*header).freeze
     end
 
     # Compare the tuple with other tuple for equivalency
@@ -147,7 +151,7 @@ module Veritas
     #
     # @api public
     def hash
-      self.class.hash ^ header.hash ^ to_ary.hash
+      self.class.hash ^ header.hash ^ @data.hash
     end
 
     # Return a string representing the tuple data
@@ -176,7 +180,7 @@ module Veritas
       object.kind_of?(Tuple) ? object : new(header, object)
     end
 
-    memoize :hash
+    memoize :hash, :to_ary
 
   end # class Tuple
 end # module Veritas

data/lib/veritas/version.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Veritas
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end # module Veritas