veritas 0.0.1 → 0.0.2

data/.autotest

@@ -1,7 +1,9 @@
-begin
-  require 'autotest/fsevent'
-rescue LoadError
-  # do nothing
+%w[ fsevent growl ].each do |autotest_ext|
+  begin
+    require "autotest/#{autotest_ext}"
+  rescue LoadError
+    # do nothing
+  end
 end
 
 MATCH_ALL_SPECS = %r{\Aspec/.+_spec\.rb\z}.freeze

data/Gemfile

@@ -1,25 +1,36 @@
 source :rubygems
 
-gemspec
+group :development do
+  gem 'backports', '~> 2.0.2'
+  gem 'jeweler',   '~> 1.5.2'
+  gem 'rake',      '~> 0.8.7'
+  gem 'rspec',     '~> 1.3.1'
+end
+
+group :jruby do
+  platform :jruby do
+    gem 'jruby-openssl', '~> 0.7.3'
+  end
+end
+
+group :benchmarks do
+  gem 'rbench', '~> 0.2.3'
+end
 
 platforms :mri_18 do
   group :quality do
-    gem 'activesupport', '~> 2.3.10'
-    gem 'flay',          '~> 1.4.1'
-    gem 'flog',          '~> 2.4.0', :git => 'git://github.com/dkubb/flog.git'
+    gem 'activesupport', '~> 2.3.11'
+    gem 'flay',          '~> 1.4.2'
+    gem 'flog',          '~> 2.5.1'
     gem 'heckle',        '~> 1.4.3'
-    gem 'json',          '~> 1.4.6'
-    gem 'metric_fu',     '~> 2.0.1'
+    gem 'json',          '~> 1.5.1'
+    gem 'metric_fu',     '~> 2.1.1'
     gem 'mspec',         '~> 1.5.17'
     gem 'rcov',          '~> 0.9.9'
-    gem 'reek',          '~> 1.2.8'
+    gem 'reek',          '~> 1.2.8', :git => 'git://github.com/dkubb/reek.git'
     gem 'roodi',         '~> 2.1.0'
     gem 'ruby2ruby',     '=  1.2.2'
-    gem 'yard',          '~> 0.6.1'
+    gem 'yard',          '~> 0.6.4'
     gem 'yardstick',     '~> 0.2.0'
   end
 end
-
-group :benchmarks do
-  gem 'rbench', '~> 0.2.3'
-end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Dan Kubb
+Copyright (c) 2009-2011 Dan Kubb
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -2,32 +2,6 @@
 
 Simplifies querying of structured data using relational algebra
 
-== Goals
-
-The purpose of this project is to expand my knowledge of relational algebra by attempting to implement a simple query system using the primitive operations defined in relational algebra.
-
-Most of the design is heavily inspired from koios[http://github.com/carllerche/koios] and arel[http://github.com/rails/arel]. The reason I decided to write my own and not just build on top of those systems was not so much because I don't like the code/API in those projects, it's more because I wanted to gain a depth of understanding that can only be earned by trying to solve the problem myself.
-
-I should note though that I don't plan to just re-implement those systems with a different API, or different internals, I plan to make something that surpasses them in several areas. For example, I want to be able to join information from multiple datastores and represent it as a single relation. I want to be able to insert, update or delete from that relation and have those changes propagated back to the right datastore. This is not an easy feat, since it is basically the writable view problem that RDBMS' struggle with. While I do think there are some cases where relations will become read-only, I think it will be possible to propagate writes properly in this manner. I certainly think for the current use cases in DataMapper this should work quite well.
-
-The ability to join data from multiple datastores and have it presented in a consistent manner will solve one of the longest standing problems in DataMapper, namely how do we do cross repository joins. It should be possible to construct one query for one datastore, and then another query for another datastore and then join them. Since they are using different engines veritas will know to perform each query *natively* and then join the results in-memory seamlessly. It should also be possible to reorganize the queries so that as much work as possible is done natively as opposed to in-memory, which is considered the last resort.
-
-Not only does this work nicely with associations, but it will allow DataMapper to perform mapping in a more powerful way. You'll be able to construct a join from multiple datastores, and set that as the base for your model. Each DM Resource would work as normal, but again writes could be propagated back to the appropriate datastore. You'd be able to split your data up between different datastores, but assemble it into one coherent view.
-
-=== Phase 1: In-Memory Operations
-
-The first phase of this project will be to implement all the operations listed below using in-memory data structures. I'm focusing on the API, and making sure the specs ensure the desired results are obtained from each operation.
-
-This has been marked as 90% complete for some time. In actuality most of the features below are completed besides the first examples for #extend and #summarize. Those will require a system to define functions as objects that can be introspected and walked to "visit" and generate SQL or other query languages from them. The Proc based functions are opaque and will probably never be possible to generate native queries from them. For this reason they will only be recommended when they depends on functionality not available in the datastore.
-
-=== Phase 2: RDBMS Engines
-
-The second phase of this project will be to add an RDBMS based engine, and move the in-memory matching to it's own engine. I'll also be working on a system where if the primary engine cannot carry out some operation, that it first look at alternate forms (eg. using a join instead of an intersection), and then fall-back to in-memory matching. I also want to look at re-arranging queries so that all the operations that can be performed natively are "pushed down" the hierarchy and then the in-memory matching is performed last.
-
-=== Phase 3: DataMapper Integration
-
-The third phase of this project will be to add a few NoSQL engines (like MongoDB[http://www.mongodb.org/] and CouchDB[http://couchdb.org/]) and then look at writing a DataMapper adapter that translates Query objects into Veritas relations. I want to make sure all the DM specs pass with this adapter and each engine, and if everything goes well I will look at updating DM to work directly on top of Veritas.
-
 == Usage
 
   relation = Veritas::Relation.new([ [ :id, Integer ] ], [ [ 1 ] ])
@@ -93,12 +67,15 @@ The third phase of this project will be to add a few NoSQL engines (like MongoDB
   new_relation = relation.order([ relation[:a].desc, relation[:b] ])
   new_relation = relation.order { |r| [ r[:a].desc, r[:b] ] }
 
-  # limiting (only allowed if ordered)
-  new_relation = relation.take(10)
+  # reverse the relation (only allowed if ordered)
+  new_relation = relation.reverse
 
   # offset (only allowed if ordered)
   new_relation = relation.drop(5)
 
+  # limiting (only allowed if ordered)
+  new_relation = relation.take(10)
+
   # get the first n tuples (only allowed if ordered)
   new_relation = relation.first     # default is 1
   new_relation = relation.first(5)
@@ -107,9 +84,6 @@ The third phase of this project will be to add a few NoSQL engines (like MongoDB
   new_relation = relation.last      # default is 1
   new_relation = relation.last(5)
 
-  # reverse the relation (only allowed if ordered)
-  new_relation = relation.reverse
-
   # CRUD Operators
   # --------------
 
@@ -118,6 +92,34 @@ The third phase of this project will be to add a few NoSQL engines (like MongoDB
   new_relation = relation.update(:a => 'test', :b => 'other', :c => 'yet another')
   new_relation = relation.delete
 
+== Goals
+
+The purpose of this project is to expand my knowledge of relational algebra by attempting to implement a simple query system using the primitive operations defined in relational algebra.
+
+Most of the design is heavily inspired from koios[https://github.com/carllerche/koios] and arel[https://github.com/rails/arel]. The reason I decided to write my own and not just build on top of those systems was not so much because I don't like the code/API in those projects, it's more because I wanted to gain a depth of understanding that can only be earned by trying to solve the problem myself.
+
+I should note though that I don't plan to just re-implement those systems with a different API, or different internals, I plan to make something that surpasses them in several areas. For example, I want to be able to join information from multiple datastores and represent it as a single relation. I want to be able to insert, update or delete from that relation and have those changes propagated back to the right datastore. This is not an easy feat, since it is basically the writable view problem that RDBMS' struggle with. While I do think there are some cases where relations will become read-only, I think it will be possible to propagate writes properly in this manner. I certainly think for the current use cases in DataMapper this should work quite well.
+
+The ability to join data from multiple datastores and have it presented in a consistent manner will solve one of the longest standing problems in DataMapper, namely how do we do cross repository joins. It should be possible to construct one query for one datastore, and then another query for another datastore and then join them. Since they are using different engines veritas will know to perform each query *natively* and then join the results in-memory seamlessly. It should also be possible to reorganize the queries so that as much work as possible is done natively as opposed to in-memory, which is considered the last resort.
+
+Not only does this work nicely with associations, but it will allow DataMapper to perform mapping in a more powerful way. You'll be able to construct a join from multiple datastores, and set that as the base for your model. Each DM Resource would work as normal, but again writes could be propagated back to the appropriate datastore. You'd be able to split your data up between different datastores, but assemble it into one coherent view.
+
+=== Phase 1: In-Memory Operations
+
+The first phase of this project will be to implement all the operations listed below using in-memory data structures. I'm focusing on the API, and making sure the specs ensure the desired results are obtained from each operation.
+
+This is 100% complete now.
+
+=== Phase 2: RDBMS Engines
+
+The second phase of this project will be to add an RDBMS based engine, and move the in-memory matching to it's own engine. I'll also be working on a system where if the primary engine cannot carry out some operation, that it first look at alternate forms (eg. using a join instead of an intersection), and then fall-back to in-memory matching. I also want to look at re-arranging queries so that all the operations that can be performed natively are "pushed down" the hierarchy and then the in-memory matching is performed last.
+
+This is 30% complete. I am currently working on the veritas-sql-compiler[https://github.com/dkubb/veritas-sql-compiler] which is a visitor that walks the AST and produces SQL. Most of the Unary options work, and I am about to begin work on the binary options. Further refactoring will need to be performed to keep the Visitor class from growing huge (it has one method for each "node type").
+
+=== Phase 3: DataMapper Integration
+
+The third phase of this project will be to add a few NoSQL engines (like MongoDB[http://www.mongodb.org/] and CouchDB[http://couchdb.org/]) and then look at writing a DataMapper adapter that translates Query objects into Veritas relations. I want to make sure all the DM specs pass with this adapter and each engine, and if everything goes well I will look at updating DM to work directly on top of Veritas.
+
 == Note on Patches/Pull Requests
 
 * If you want your code merged into the mainline, please discuss
@@ -128,7 +130,7 @@ The third phase of this project will be to add a few NoSQL engines (like MongoDB
   them is laid, or may be more applicable in a plugin.
 * Fork the project.
 * Make your feature addition or bug fix.
-  * Follow this styleguide: http://github.com/dkubb/styleguide
+  * Follow this {style guide}[https://github.com/dkubb/styleguide].
 * Add specs for it. This is important so I don't break it in a
   future version unintentionally. Tests must cover all branches
   within the code, and code must be fully covered.
@@ -140,4 +142,4 @@ The third phase of this project will be to add a few NoSQL engines (like MongoDB
 
 == Copyright
 
-Copyright (c) 2010 Dan Kubb. See LICENSE for details.
+Copyright (c) 2009-2011 Dan Kubb. See LICENSE for details.

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake'
 require File.expand_path('../lib/veritas/version', __FILE__)
 
 begin
-  gem('jeweler', '~> 1.4.0') if respond_to?(:gem, true)
+  gem('jeweler', '~> 1.5.2') if respond_to?(:gem, true)
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -11,21 +11,16 @@ begin
     gem.summary     = 'Ruby Relational Algebra'
     gem.description = 'Simplifies querying of structured data using relational algebra'
     gem.email       = 'dan.kubb@gmail.com'
-    gem.homepage    = 'http://github.com/dkubb/veritas'
+    gem.homepage    = 'https://github.com/dkubb/veritas'
     gem.authors     = [ 'Dan Kubb' ]
     gem.has_rdoc    = 'yard'
 
     gem.version = Veritas::VERSION
-
-    gem.add_development_dependency 'rake',      '~> 0.8.7'
-    gem.add_development_dependency 'rspec',     '~> 1.3.1'
-    gem.add_development_dependency 'jeweler',   '~> 1.4.0'
-    gem.add_development_dependency 'backports', '~> 1.18.2'
   end
 
   Jeweler::GemcutterTasks.new
 
   FileList['tasks/**/*.rake'].each { |task| import task }
 rescue LoadError
-  puts 'Jeweler ~> 1.4.0 (or a dependency) not available. Install it with: gem install jeweler'
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.5.2'
 end

data/TODO

@@ -1,5 +1,14 @@
+* Raise an exception if a rename is going to duplicate and existing
+  header attribute.
+
+* Raise an exception if a rename has aliases with duplicate names.
+
+* Rename usage of "range" for attributes to "domain"
+  * Functions will have both a range and domain, but attributes
+    only have a domain.
+
 * Add Extension and Summarization Functions
-  * Overview: http://gist.github.com/584588
+  * Overview: https://gist.github.com/584588
 
 * Remove Order, Reverse, Limit and Offset from the Relation inheritance chain
   * Instead make it so they are proxy classes that wrap Relations, but
@@ -22,7 +31,12 @@
     if any.
 
 * Add further optimizations:
+  * Projection
+    * When it contains a Rename, if the renamed attributes are projected
+      away, then the rename can be removed.
   * Operation Order:
+    * Projection containing an Order
+      * Should remove the Order, since it is a noop
     * Projection should follow Rename
       * When a Projection contains a Restriction, wrap the Projection
         in the Restriction, projecting away any attributes not used in
@@ -86,6 +100,11 @@
       with the remaining relation.
     * Make sure the smallest relation (with a known size) is always the
       right-most operation.
+  * When a restriction uses a unique index:
+    * Order can be factored out
+    * Limit with a limit >= 1 can be factored out
+    * Offset with an offset > 0 can be transformed into an empty
+      relation, since at most there can be only one match.
 
 * Allow Inclusion match to accept a Relation
   * Ensure that Inclusion can have the left/right be an Array of

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 131
-total_score: 1471
+total_score: 1579

data/config/roodi.yml

@@ -2,7 +2,7 @@
 AbcMetricMethodCheck:            { score: 11 }
 AssignmentInConditionalCheck:    { }
 CaseMissingElseCheck:            { }
-ClassLineCountCheck:             { line_count: 366 }
+ClassLineCountCheck:             { line_count: 390 }
 ClassNameCheck:                  { pattern: !ruby/regexp /\A[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](?:_?[a-z])+[?!=]?|\[\]=?|==|<=>|[+*&|-])\z/ }
-ModuleLineCountCheck:            { line_count: 368 }
+ModuleLineCountCheck:            { line_count: 392 }
 ModuleNameCheck:                 { pattern: !ruby/regexp /\A[A-Z][a-z](?:[A-Z]?[a-z])+\z/ }
 # TODO: decrease parameter_count to 2 or less
 ParameterNumberCheck:            { parameter_count: 3 }

data/lib/veritas/algebra/extension.rb

@@ -89,6 +89,33 @@ module Veritas
         self
       end
 
+      # Compare the Extension with other relation for equality
+      #
+      # @example
+      #   extension.eql?(other)  # => true or false
+      #
+      # @param [Relation] other
+      #   the other relation to compare with
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def eql?(other)
+        super && extensions.eql?(other.extensions)
+      end
+
+      # Return the hash of the projection
+      #
+      # @example
+      #   hash = extension.hash
+      #
+      # @return [Fixnum]
+      #
+      # @api public
+      def hash
+        super ^ extensions.hash
+      end
+
       module Methods
 
         # Return an extended relation
@@ -116,6 +143,8 @@ module Veritas
 
       Relation.class_eval { include Methods }
 
+      memoize :hash
+
     end # class Extension
   end # module Algebra
 end # module Veritas

data/lib/veritas/algebra/join.rb

@@ -3,7 +3,7 @@ module Veritas
 
     # The join between relations
     class Join < Relation
-      include Relation::Operation::Combine
+      include Relation::Operation::Combination
 
       # Instantiate a new Join
       #
@@ -34,7 +34,7 @@ module Veritas
       # @api private
       def self.assert_joinable_headers(left, right)
         if (left.header & right.header).empty?
-          raise InvalidHeaderError, "the headers must have common attributes for #{name}.new"
+          raise InvalidHeaderError, 'the headers must have common attributes'
         end
       end
 
@@ -75,7 +75,7 @@ module Veritas
         left.each do |tuple|
           right_tuples = index[join_tuple(tuple)]
           if right_tuples
-            Relation::Operation::Combine.combine_tuples(header, tuple, right_tuples, &block)
+            Relation::Operation::Combination.combine_tuples(header, tuple, right_tuples, &block)
           end
         end
 

data/lib/veritas/algebra/product.rb

@@ -3,7 +3,7 @@ module Veritas
 
     # The cartesian product between relations
     class Product < Relation
-      include Relation::Operation::Combine
+      include Relation::Operation::Combination
 
       # Instantiate a new Product
       #
@@ -34,7 +34,7 @@ module Veritas
       # @api private
       def self.assert_disjointed_headers(left, right)
         if (left.header & right.header).any?
-          raise InvalidHeaderError, "the headers must be disjointed for #{name}.new"
+          raise InvalidHeaderError, 'the headers must be disjointed'
         end
       end
 
@@ -56,7 +56,7 @@ module Veritas
       # @api public
       def each(&block)
         left.each do |tuple|
-          Relation::Operation::Combine.combine_tuples(header, tuple, right, &block)
+          Relation::Operation::Combination.combine_tuples(header, tuple, right, &block)
         end
         self
       end

data/lib/veritas/algebra/projection.rb

@@ -18,7 +18,7 @@ module Veritas
       def initialize(operand, attributes)
         super(operand)
         @header     = @header.project(attributes.to_ary)
-        @directions = @directions.project(@header)
+        @directions = Relation::Operation::Order::DirectionSet::EMPTY
       end
 
       # Iterate over each tuple in the set
@@ -44,6 +44,33 @@ module Veritas
         self
       end
 
+      # Compare the Projection with other relation for equality
+      #
+      # @example
+      #   projection.eql?(other)  # => true or false
+      #
+      # @param [Relation] other
+      #   the other relation to compare with
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def eql?(other)
+        super && header.eql?(other.header)
+      end
+
+      # Return the hash of the projection
+      #
+      # @example
+      #   hash = projection.hash
+      #
+      # @return [Fixnum]
+      #
+      # @api public
+      def hash
+        super ^ header.hash
+      end
+
       module Methods
 
         # Return a relation with only the attributes specified
@@ -90,7 +117,7 @@ module Veritas
           header.project(attributes)
         end
 
-        # Return a relation with only the attribtues specified
+        # Return a relation with only the attributes specified
         #
         # @param [Relation] operand
         #   the relation to project
@@ -108,6 +135,8 @@ module Veritas
 
       Relation.class_eval { include Methods }
 
+      memoize :hash
+
     end # class Projection
   end # module Algebra
 end # module Veritas

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

@@ -109,7 +109,6 @@ module Veritas
         #
         # @api public
         def ==(other)
-          (kind_of?(other.class) || other.kind_of?(self.class)) &&
           to_hash == other.to_hash
         end
 
@@ -132,13 +131,13 @@ module Veritas
         # Return the hash of the aliases
         #
         # @example
-        #   numeric_hash = aliases.hash
+        #   hash = aliases.hash
         #
-        # @return [Integer]
+        # @return [Fixnum]
         #
         # @api public
         def hash
-          @aliases.hash
+          self.class.hash ^ @aliases.hash
         end
 
         # Convert the aliases to a Hash

data/lib/veritas/algebra/rename.rb

@@ -63,6 +63,18 @@ module Veritas
         super && aliases.eql?(other.aliases)
       end
 
+      # Return the hash of the rename
+      #
+      # @example
+      #   hash = rename.hash
+      #
+      # @return [Fixnum]
+      #
+      # @api public
+      def hash
+        super ^ aliases.hash
+      end
+
       module Methods
 
         # Return a relation with the header renamed
@@ -84,6 +96,8 @@ module Veritas
 
       Relation.class_eval { include Methods }
 
+      memoize :hash
+
     end # class Rename
   end # module Algebra
 end # module Veritas

data/lib/veritas/algebra/restriction.rb

@@ -61,6 +61,18 @@ module Veritas
         super && predicate.eql?(other.predicate)
       end
 
+      # Return the hash of the restriction
+      #
+      # @example
+      #   hash = restriction.hash
+      #
+      # @return [Fixnum]
+      #
+      # @api public
+      def hash
+        super ^ predicate.hash
+      end
+
       module Methods
 
         # Return a relation with restricted tuples
@@ -91,6 +103,8 @@ module Veritas
 
       Relation.class_eval { include Methods }
 
+      memoize :hash
+
     end # class Restriction
   end # module Algebra
 end # module Veritas

data/lib/veritas/algebra/summarization.rb

@@ -64,6 +64,35 @@ 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_by.eql?(other.summarize_by) &&
+        summarizers.eql?(other.summarizers)
+      end
+
+      # Return the hash of the summarization
+      #
+      # @example
+      #   hash = summarization.hash
+      #
+      # @return [Fixnum]
+      #
+      # @api public
+      def hash
+        super ^ summarize_by.hash ^ summarizers.hash
+      end
+
     private
 
       # Return the summaries for each tuple, grouped by the summarize_by header
@@ -161,6 +190,8 @@ module Veritas
 
       Relation.class_eval { include Methods }
 
+      memoize :hash
+
     end # class Summarization
   end # module Algebra
 end # module Veritas

data/lib/veritas/attribute/numeric.rb

@@ -63,7 +63,7 @@ module Veritas
       #
       # @api public
       def valid_value?(value)
-        valid_or_optional?(value) { super && size.include?(value) }
+        valid_or_optional?(value) { super && size.cover?(value) }
       end
 
       # Test if the attribute can be joined with the other attribute

data/lib/veritas/attribute/string.rb

@@ -65,7 +65,7 @@ module Veritas
       #
       # @api public
       def valid_value?(value)
-        valid_or_optional?(value) { super && length.include?(value.length) }
+        valid_or_optional?(value) { super && length.cover?(value.length) }
       end
 
       # Test if the attribute can be joined with the other attribute

data/lib/veritas/attribute.rb

@@ -19,7 +19,7 @@ module Veritas
 
   # Abstract base class representing a type of data in a relation tuple
   class Attribute
-    include AbstractClass, Immutable, ::Comparable
+    include AbstractClass, Immutable, ::Comparable, Visitable
 
     # The attribute name
     #
@@ -177,13 +177,13 @@ module Veritas
     # Return the hash of the attribute
     #
     # @example
-    #   numeric_hash = attribute.hash
+    #   hash = attribute.hash
     #
-    # @return [Integer]
+    # @return [Fixnum]
     #
     # @api public
     def hash
-      name.hash ^ options.hash
+      self.class.hash ^ name.hash ^ options.hash
     end
 
     # Return a string representing the attribute

data/lib/veritas/core_ext/range.rb

@@ -29,7 +29,7 @@ class Range
   #
   # @api public
   def overlaps?(other)
-    include?(other.first) || other.include?(first)
+    cover?(other.first) || other.cover?(first)
   end unless method_defined? :overlaps?
 
 end # class Range

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
+      include AbstractClass, Optimizable, Immutable, Visitable
 
       # Evaluate the expression using the operands
       #
@@ -73,9 +73,9 @@ module Veritas
       # Return the hash of the expression
       #
       # @example
-      #   numeric_hash = expression.hash
+      #   hash = expression.hash
       #
-      # @return [Integer]
+      # @return [Fixnum]
       #
       # @api public
       def hash

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

@@ -5,6 +5,17 @@ module Veritas
       # A mixin for predicates matching an enumerable
       module Enumerable
 
+        # Return the method to test the enumerable with
+        #
+        # @param [#cover?, #include?] enumerable
+        #
+        # @return [Symbol]
+        #
+        # @api private
+        def self.compare_method(enumerable)
+          enumerable.respond_to?(:cover?) ? :cover? : :include?
+        end
+
         # Initialize an Enumerable predicate
         #
         # @param [Object] left