veritas 0.0.2 → 0.0.3

data/lib/veritas/relation.rb

@@ -1,19 +1,8 @@
-require 'veritas/relation/header'
-
 module Veritas
 
   # Abstract base class for Relation operations
   class Relation
-    include Immutable
-  end # class Relation
-end # module Veritas
-
-require 'veritas/relation/materialized'
-require 'veritas/relation/empty'
-
-module Veritas
-  class Relation
-    include Enumerable, Optimizable, Visitable
+    include Immutable, Enumerable, Visitable
 
     # The relation header
     #
@@ -105,6 +94,7 @@ module Veritas
     #
     # @api public
     def each
+      return to_enum unless block_given?
       seen = {}
       tuples.each do |tuple|
         tuple = Tuple.coerce(header, tuple)
@@ -208,5 +198,3 @@ module Veritas
 
   end # class Relation
 end # module Veritas
-
-require 'veritas/relation/operation'

data/lib/veritas/relation/header.rb

@@ -12,23 +12,83 @@ module Veritas
         :- => :difference
       )
 
-      # Initialize a Header
+      # Instantiate a Header
       #
       # @example
       #   header = Header.new(attributes)
       #
-      # @param [#to_ary]
+      # @param [#to_ary] attributes
       #   optional attributes
       #
       # @return [undefined]
       #
       # @api public
-      def initialize(attributes = [])
-        @attributes = attributes.to_ary.map do |attribute|
-          Attribute.coerce(attribute)
-        end.freeze
-        @names   = {}
-        @indexes = {}
+      def self.new(attributes = [])
+        attributes = coerce_attributes(attributes).freeze
+        assert_unique_attributes(attributes)
+        super
+      end
+
+      # Coerce the attributes into an Array of Attribute objects
+      #
+      # @param [Array<Attribute>] attributes
+      #
+      # @return [Array<Attribute>]
+      #
+      # @api private
+      def self.coerce_attributes(attributes)
+        attributes.to_ary.map { |attribute| Attribute.coerce(attribute) }
+      end
+
+      # Assert the attributes are unique
+      #
+      # @param [Array<Attribute>] attributes
+      #
+      # @return [undefined]
+      #
+      # @raise [DuplicateAttributeError]
+      #   raised if the attributes are not unique
+      #
+      # @api private
+      def self.assert_unique_attributes(attributes)
+        duplicates = duplicate_attributes(attributes)
+        if duplicates
+          raise DuplicateAttributeError, "duplicate attributes: #{duplicates.join(', ')}"
+        end
+      end
+
+      # Returns the duplicate attribute names, if any
+      #
+      # @param [Array<Attribute>] attributes
+      #
+      # @return [Array<Symbol>]
+      #   returns an array of duplicate attributes
+      #
+      # @return [nil]
+      #   returns nil if there are no duplicate attributes
+      #
+      # @api private
+      def self.duplicate_attributes(attributes)
+        duplicates = attributes.select { |attribute| attributes.count(attribute) > 1 }
+        duplicates.map! { |attribute| attribute.name.to_s }.uniq!
+      end
+
+      private_class_method :coerce_attributes, :assert_unique_attributes, :duplicate_attributes
+
+      # Initialize a Header
+      #
+      # @example
+      #   header = Header.new(attributes)
+      #
+      # @param [#to_ary] attributes
+      #
+      # @return [undefined]
+      #
+      # @api public
+      def initialize(attributes)
+        @attributes = attributes
+        @names      = {}
+        @indexes    = {}
       end
 
       # Iterate over each attribute in the header
@@ -46,6 +106,7 @@ module Veritas
       #
       # @api public
       def each(&block)
+        return to_enum unless block_given?
         to_ary.each(&block)
         self
       end

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

@@ -99,6 +99,7 @@ module Veritas
         #
         # @api public
         def each
+          return to_enum unless block_given?
           operand.each_with_index do |tuple, index|
             break if @limit == index
             yield tuple

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

@@ -99,6 +99,7 @@ module Veritas
         #
         # @api public
         def each
+          return to_enum unless block_given?
           operand.each_with_index do |tuple, index|
             yield tuple if index >= @offset
           end

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

@@ -78,6 +78,7 @@ module Veritas
         #
         # @api public
         def each(&block)
+          return to_enum unless block_given?
           directions.sort_tuples(operand).each(&block)
           self
         end
@@ -144,6 +145,3 @@ module Veritas
     end # module Operation
   end # class Relation
 end # module Veritas
-
-require 'veritas/relation/operation/order/direction'
-require 'veritas/relation/operation/order/direction_set'

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

@@ -85,6 +85,7 @@ module Veritas
           #
           # @api public
           def each(&block)
+            return to_enum unless block_given?
             to_ary.each(&block)
             self
           end

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

@@ -53,6 +53,7 @@ module Veritas
         #
         # @api public
         def each(&block)
+          return to_enum unless block_given?
           operand.reverse_each(&block)
           self
         end

data/lib/veritas/support/immutable.rb

@@ -17,18 +17,49 @@ module Veritas
       self
     end
 
-    # A noop when there are no memoized methods
+    # Freeze the object
     #
     # @example
-    #   object.memoize(:hash, 12345)  # => self
+    #   object.freeze  # object is now frozen
+    #
+    # @return [Object]
+    #
+    # @api public
+    def freeze
+      @__memory = Memory.new unless frozen?
+      super
+    end
+
+    # Get the memoized value for a method
+    #
+    # @example
+    #   hash = object.memoized(:hash)
     #
     # @param [#to_s] name
+    #   the method name
+    #
+    # @return [Object]
+    #
+    # @api public
+    def memoized(name)
+      @__memory["@#{name}"]
+    end
+
+    # Sets a memoized value for a method
+    #
+    # @example
+    #   object.memoize(:hash, 12345)
+    #
+    # @param [#to_s] name
+    #   the method name
     # @param [Object] value
+    #   the value to memoize
     #
     # @return [self]
     #
     # @api public
     def memoize(name, value)
+      @__memory["@#{name}"] = value
       self
     end
 
@@ -111,22 +142,12 @@ module Veritas
       #
       # @api public
       def memoize(*methods)
-        include_memoize_methods
         methods.each { |method| memoize_method(method) }
         self
       end
 
     private
 
-      # Mixin MemoizeMethods if it's not already
-      #
-      # @return [undefined]
-      #
-      # @api private
-      def include_memoize_methods
-        include MemoizeMethods unless include?(MemoizeMethods)
-      end
-
       # Memoize the named method
       #
       # @param [#to_s] method
@@ -191,57 +212,6 @@ module Veritas
 
     end # module ClassMethods
 
-    # Methods mixed in to memoizable immutable instances
-    module MemoizeMethods
-
-      # Freeze the object
-      #
-      # @example
-      #   object.freeze  # object is now frozen
-      #
-      # @return [Object]
-      #
-      # @api public
-      def freeze
-        @__memory = Memory.new unless frozen?
-        super
-      end
-
-      # Get the memoized value for a method
-      #
-      # @example
-      #   hash = object.memoized(:hash)
-      #
-      # @param [#to_s] name
-      #   the method name
-      #
-      # @return [Object]
-      #
-      # @api public
-      def memoized(name)
-        @__memory["@#{name}"]
-      end
-
-      # Sets a memoized value for a method
-      #
-      # @example
-      #   object.memoize(:hash, 12345)
-      #
-      # @param [#to_s] name
-      #   the method name
-      # @param [Object] value
-      #   the value to memoize
-      #
-      # @return [self]
-      #
-      # @api public
-      def memoize(name, value)
-        @__memory["@#{name}"] = value
-        self
-      end
-
-    end # module MemoizeMethods
-
     # Tracks the values for memoized methods
     class Memory
 

data/lib/veritas/support/visitable.rb

@@ -5,6 +5,9 @@ module Veritas
 
     # Accept a visitor and dispatch the object to the visitor
     #
+    # @example
+    #   visitable = visitable.accept(visitor)
+    #
     # @param [#visit] visitor
     #   the visitor object
     #

data/lib/veritas/version.rb

@@ -1,3 +1,3 @@
 module Veritas
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end # module Veritas

data/spec/integration/veritas/algebra/join_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Veritas::Algebra::Join' do
+describe Algebra::Join do
   context 'Commutative property' do
     subject { left.join(right) }
 

data/spec/integration/veritas/algebra/product_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Veritas::Algebra::Product' do
+describe Algebra::Product do
   context 'Commutative property' do
     subject { left.product(right) }
 

data/spec/integration/veritas/algebra/projection_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Veritas::Algebra::Projection' do
+describe Algebra::Projection do
   context 'remove attributes in predicate' do
     subject { restriction.project([ :name ]) }
 

data/spec/integration/veritas/algebra/summarization_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Veritas::Algebra::Summarization' do
+describe Algebra::Summarization do
   subject { relation.summarize(by) { |r| r.add(:count) { |accumulator, _| accumulator.to_i + 1 } } }
 
   let(:header)    { [ [ :name, String ], [ :qty, Integer ] ]                       }

data/spec/integration/veritas/relation/efficient_enumerable_spec.rb

@@ -8,19 +8,19 @@ class InfiniteList
   Infinity = 1.0/0.0
 
   def each
-    (0..Infinity).each do |index|
+    0.upto(Infinity) do |index|
       yield [ index ]
     end
     self
   end
 end
 
-describe 'Veritas::Algebra::Relation' do
+describe Relation do
   context 'Efficient Enumerable operation' do
     let(:relation) { Relation.new([ [ :id, Integer ] ], InfiniteList.new) }
 
     def sample(relation)
-      relation.enum_for.take(5)
+      relation.to_enum.take(5)
     end
 
     it '#project should be efficient' do

data/spec/shared/each_method_behaviour.rb

@@ -0,0 +1,13 @@
+shared_examples_for 'an #each method' do
+  it_should_behave_like 'a command method'
+
+  context 'with no block' do
+    subject { object.each }
+
+    it { should be_kind_of(to_enum.class) }
+
+    it 'yields the expected values' do
+      subject.to_a.should == object.to_a
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -10,5 +10,4 @@ include Veritas
 Dir[File.expand_path('../{support,shared}/**/*.rb', __FILE__)].each { |f| require f }
 
 Spec::Runner.configure do |config|
-  config.extend AddMethodMissing
 end

data/spec/unit/date/pred_spec.rb

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
-describe 'Date#pred' do
+describe Date, '#pred' do
   subject { object.pred }
 
-  let(:klass)  { Date        }
-  let(:object) { klass.today }
+  let(:object) { described_class.today }
 
-  it { should be_kind_of(klass) }
+  it { should be_kind_of(described_class) }
 
   it 'returns the date 1 day ago' do
     should == (object - 1)

data/spec/unit/range/overlaps_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 # Definitions and ascii art from ruby mailing list:
 #   http://www.ruby-forum.com/topic/98359
 
-describe 'Range#overlaps?' do
+describe Range, '#overlaps?' do
   subject { object.overlaps?(other) }
 
   # self:   |---|