lib/bmg.rb in bmg-0.5.0 vs lib/bmg.rb in bmg-0.6.0

@@ -1,24 +1,46 @@
 require 'path'
 require 'predicate'
 module Bmg
 
-  def csv(path, options = {})
-    Relation.new Reader::Csv.new path, options
+  def in_memory(enumerable, type = Type::ANY)
+    Relation::InMemory.new(type, enumerable).spied(main_spy)
   end
+  module_function :in_memory
+
+  def csv(path, options = {}, type = Type::ANY)
+    Reader::Csv.new(type, path, options).spied(main_spy)
+  end
   module_function :csv
 
-  def excel(path, options = {})
-    Relation.new Reader::Excel.new path, options
+  def excel(path, options = {}, type = Type::ANY)
+    Reader::Excel.new(type, path, options).spied(main_spy)
   end
   module_function :excel
 
+  def main_spy
+    @main_spy
+  end
+  module_function :main_spy
+
+  def main_spy=(spy)
+    @main_spy = spy
+  end
+  module_function :main_spy=
+
+  require_relative 'bmg/version'
+  require_relative 'bmg/error'
+  require_relative 'bmg/support'
+  require_relative 'bmg/algebra'
+  require_relative 'bmg/type'
+  require_relative 'bmg/relation'
+  require_relative 'bmg/operator'
+
+  require_relative 'bmg/reader'
+
+  require_relative 'bmg/relation/empty'
+  require_relative 'bmg/relation/in_memory'
+  require_relative 'bmg/relation/spied'
+
+  # Deprecated
+  Leaf = Relation::InMemory
 end
-require_relative 'bmg/version'
-require_relative 'bmg/error'
-require_relative 'bmg/support'
-require_relative 'bmg/algebra'
-require_relative 'bmg/type'
-require_relative 'bmg/relation'
-require_relative 'bmg/leaf'
-require_relative 'bmg/operator'
-require_relative 'bmg/reader'