alf 0.9.2 → 0.9.3

data/spec/unit/test_reader.rb

@@ -25,6 +25,11 @@ module Alf
         Reader.reader($stdin).should be_a(Reader::Rash)
       end
       
+      specify "with options" do
+        r = Reader.reader('suppliers.rash', {:hello => "world"})
+        r.options.should == {:hello => "world"}
+      end
+      
     end
 
   end

data/spec/unit/test_relation.rb

@@ -12,10 +12,15 @@ module Alf
     let(:rel1){ Relation.new(tuples.to_set) }
     let(:rel2){ Relation.new(tuples2.to_set) }
     let(:rel3){ Relation.new(tuples[0..1].to_set) }
-    
+  
     it "should have a cardinality method" do
       rel1.cardinality.should == 3
     end
+    
+    it "should have an empty? method" do
+      Alf::Relation[].should be_empty
+      rel1.should_not be_empty
+    end
       
     it "should define == correctly" do
       rel1.should == rel2
@@ -35,6 +40,31 @@ module Alf
     it "should be enumerable" do
       rel1.to_a.sort{|t1,t2| t1[:sid] <=> t2[:sid]}.should == tuples
     end
+
+    describe "rel1" do
+      subject{ rel1 }
+      it_should_behave_like "A value"  
+    end
+    
+    describe "DUM" do
+      subject{ Relation::DUM }
+      it_should_behave_like "A value"
+      specify{
+        subject.cardinality.should == 0
+        subject.to_a.should == []
+        subject.should be_empty
+      }
+    end
+    
+    describe "DEE" do
+      subject{ Relation::DEE }
+      it_should_behave_like "A value"  
+      specify{
+        subject.cardinality.should == 1
+        subject.to_a.should == [{}]
+        subject.should_not be_empty
+      }
+    end
     
   end
 end

data/spec/unit/test_renderer.rb

@@ -15,7 +15,7 @@ module Alf
       subject{ Renderer.rash(input) } 
       let(:input){ [{:a => 1}] }
       let(:output){ "" }
-      let(:expected){ "{:a=>1}\n" }
+      let(:expected){ "{:a => 1}\n" }
       specify{ 
         subject.should be_a(Renderer)
         subject.execute(output).should == expected

data/spec/unit/{renderer/text → text}/test_cell.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 module Alf
-  class Renderer::Text
+  class Text::Renderer
     describe Cell do
      
       let(:f){ Cell.new }

data/spec/unit/{renderer/text → text}/test_row.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 module Alf
-  class Renderer::Text
+  class Text::Renderer
     describe Row do
      
       let(:row){ Row.new(values) }

data/spec/unit/{renderer/text → text}/test_table.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 module Alf
-  class Renderer::Text
+  class Text::Renderer
     describe Table do
      
       let(:columns){ [ :method, :total ] }

data/spec/unit/tools/test_ordering_key.rb

@@ -19,6 +19,19 @@ module Alf
           key.order_of(:b).should == :asc
         end
   
+        specify "when passed a single array with asc and desc (1)" do
+          key = OrderingKey.coerce [:a, :asc]
+          key.attributes.should == [:a]
+          key.order_of(:a).should == :asc
+        end
+  
+        specify "when passed a single array with asc and desc (1)" do
+          key = OrderingKey.coerce [:a, :asc, :b, :desc]
+          key.attributes.should == [:a, :b]
+          key.order_of(:a).should == :asc
+          key.order_of(:b).should == :desc
+        end
+  
         specify "when passed an ordering key" do
           key  = OrderingKey.coerce [:a, :b]
           key2 = OrderingKey.coerce key

data/spec/unit/tools/test_parse_commandline_args.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+module Alf
+  describe "Tools#parse_commandline_args" do
+    
+    subject{ Tools.parse_commandline_args(args) }
+    
+    describe "on empty string" do
+      let(:args){ "" }
+      it { should eq([]) }
+    end
+
+    describe "on pseudo empty string" do
+      let(:args){ "   " }
+      it { should eq([]) }
+    end
+
+    describe "on a single arg" do
+      let(:args){ "--text" }
+      it { should eq(["--text"]) }
+    end
+
+    describe "on a multiple args" do
+      let(:args){ "--text --size=10" }
+      it { should eq(["--text", "--size=10"]) }
+    end
+
+    describe "on single quoted arg" do
+      let(:args){ "'hello'" }
+      it { should eq(["hello"]) }
+    end
+
+    describe "on single quoted arg with spacing" do
+      let(:args){ "'hello the world'" }
+      it { should eq(["hello the world"]) }
+    end
+    
+    describe "on double quoted arg" do
+      let(:args){ '"hello"' }
+      it { should eq(["hello"]) }
+    end
+
+    describe "on double quoted arg with spacing" do
+      let(:args){ "'hello the world'" }
+      it { should eq(['hello the world']) }
+    end
+  end
+end

data/spec/unit/tools/test_tuple_handle.rb

@@ -11,7 +11,7 @@ module Alf
         handle.should respond_to(:world)
       end
   
-      it "installed methods should behave correctly" do
+      it "should behave correctly" do
         handle.set(:hello => "a", :world => "b")
         handle.hello.should == "a"
         handle.world.should == "b"
@@ -20,11 +20,16 @@ module Alf
         handle.world.should == "d"
       end
   
-      it "should allow instance evaluatin on exprs" do
+      it "should allow instance evaluating on exprs" do
         handle.set(:tested => 1)
         handle.instance_eval{ tested < 1 }.should be_false
       end
   
+      it "should support an attribute called :path" do
+        handle.set(:path => 1)
+        handle.instance_eval{ path < 1 }.should be_false
+      end
+  
       describe "compile" do
         
         it "should return a Proc when passed a string" do
@@ -35,6 +40,33 @@ module Alf
           x = lambda{ true }
           TupleHandle.compile(x).should == x
         end
+        
+        it "should support an empty Hash" do
+          pred = TupleHandle.compile({})
+          pred.call.should be_true
+        end
+        
+        it "should support a Hash" do
+          pred = TupleHandle.compile({:status => 10})
+          handle = TupleHandle.new
+          handle.set({:status => 20}).evaluate(pred).should be_false
+          handle.set({:status => 10}).evaluate(pred).should be_true
+        end
+        
+        it "should support a Hash using keywords as attribute names" do
+          pred = TupleHandle.compile({:when => 10})
+          handle = TupleHandle.new
+          handle.set({:when => 20}).evaluate(pred).should be_false
+          handle.set({:when => 10}).evaluate(pred).should be_true
+        end
+  
+        it "should support a Hash containing a Date" do
+          today = Date.today
+          pred = TupleHandle.compile({:at => today})
+          handle = TupleHandle.new
+          handle.set({:at => today}).evaluate(pred).should be_true
+          handle.set({:at => today+1}).evaluate(pred).should be_false
+        end
   
       end
   

data/spec/unit/tools/test_varargs.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+module Alf
+  describe "Tools#varargs" do
+    
+    specify "with exact args" do
+      Tools.varargs([1, "hello"], [Integer, String]).should eq([1, "hello"])
+    end
+    
+    specify "with missing args" do
+      Tools.varargs(["hello"], [Integer, String]).should eq([nil, "hello"])
+      Tools.varargs([], [Integer, String]).should eq([nil, nil])
+      Tools.varargs([1, 2], [Integer, String, Integer]).should eq([1, nil, 2])
+    end
+
+  end
+end

data/tasks/{spec_test.rake → integration_test.rake}

@@ -1,36 +1,9 @@
-# Installs a rake task for for running examples written using rspec.
-#
-# This file installs the 'rake spec_test' (aliased as 'rake spec') as well as
-# extends 'rake test' to run spec tests, if any. It is automatically generated 
-# by Noe from your .noespec file, and should therefore be configured there, 
-# under the variables/rake_tasks/spec_test entry, as illustrated below:
-#
-# variables:
-#   rake_tasks:
-#     spec_test:
-#       pattern: spec/**/*_spec.rb
-#       verbose: true
-#       rspec_opts: [--color, --backtrace]
-#       ...
-#
-# If you have specific needs requiring manual intervention on this file, 
-# don't forget to set safe-override to false in your noe specification:
-# 
-# template-info:
-#   manifest:
-#     tasks/spec_test.rake:
-#       safe-override: false
-#
-# This file has been written to conform to RSpec v2.4.0. More information about 
-# rspec and options of the rake task defined below can be found on 
-# http://relishapp.com/rspec
-#
 begin
   require "rspec/core/rake_task"
   desc "Run RSpec code examples"
-  RSpec::Core::RakeTask.new(:spec_test) do |t|
+  RSpec::Core::RakeTask.new(:integration_test) do |t|
     # Glob pattern to match files.
-    t.pattern = "spec/**/test_*.rb"
+    t.pattern = "spec/integration/**/test_*.rb"
 
     # By default, if there is a Gemfile, the generated command will include
     # 'bundle exec'. Set this to true to ignore the presence of a Gemfile, 
@@ -70,10 +43,9 @@ begin
     t.rspec_opts = ["--color", "--backtrace"]
   end
 rescue LoadError => ex
-  task :spec_test do
+  task :integration_test do
     abort 'rspec is not available. In order to run spec, you must: gem install rspec'
   end
 ensure
-  task :spec => [:spec_test]
-  task :test => [:spec_test]
+  task :test => [:integration_test]
 end

data/tasks/regression_test.rake

@@ -0,0 +1,52 @@
+begin
+  require "rspec/core/rake_task"
+  desc "Run RSpec code examples"
+  RSpec::Core::RakeTask.new(:regression_test) do |t|
+    # Glob pattern to match files.
+    t.pattern = "spec/regression/**/test_*.rb"
+
+    # By default, if there is a Gemfile, the generated command will include
+    # 'bundle exec'. Set this to true to ignore the presence of a Gemfile, 
+    # and not add 'bundle exec' to the command.
+    t.skip_bundler = false
+
+    # Name of Gemfile to use
+    t.gemfile = "Gemfile"
+
+    # Whether or not to fail Rake when an error occurs (typically when 
+    # examples fail).
+    t.fail_on_error = true
+
+    # A message to print to stderr when there are failures.
+    t.failure_message = nil
+
+    # Use verbose output. If this is set to true, the task will print the
+    # executed spec command to stdout.
+    t.verbose = true
+
+    # Use rcov for code coverage?
+    t.rcov = false
+
+    # Path to rcov.
+    t.rcov_path = "rcov"
+
+    # Command line options to pass to rcov. See 'rcov --help' about this
+    t.rcov_opts = []
+
+    # Command line options to pass to ruby. See 'ruby --help' about this 
+    t.ruby_opts = []
+
+    # Path to rspec
+    t.rspec_path = "rspec"
+
+    # Command line options to pass to rspec. See 'rspec --help' about this
+    t.rspec_opts = ["--color", "--backtrace"]
+  end
+rescue LoadError => ex
+  task :regression_test do
+    abort 'rspec is not available. In order to run spec, you must: gem install rspec'
+  end
+ensure
+  task :spec => [:regression_test]
+  task :test => [:regression_test]
+end

data/tasks/unit_test.rake

@@ -1,77 +1,52 @@
-# Installs a rake task for for running unit tests.
-#
-# This file installs the 'rake unit_test' and extends 'rake test' to run unit 
-# tests, if any. It is automatically generated by Noe from your .noespec file, 
-# and should therefore be configured there, under the variables/rake_tasks/unit_test 
-# entry, as illustrated below:
-#
-# variables:
-#   rake_tasks:
-#     unit_test:
-#       pattern: test/test*.rb
-#       verbose: false
-#       warning: false
-#       ...
-#
-# If you have specific needs requiring manual intervention on this file, 
-# don't forget to set safe-override to false in your noe specification:
-# 
-# template-info:
-#   manifest:
-#     tasks/unit_test.rake:
-#       safe-override: false
-#
-# More info about the TestTask and its options can be found on 
-# http://rake.rubyforge.org/classes/Rake/TestTask.html
-#
 begin
-  require 'rake/testtask'
-  desc "Run unit tests"
-  Rake::TestTask.new(:unit_test) do |t|
+  require "rspec/core/rake_task"
+  desc "Run RSpec code examples"
+  RSpec::Core::RakeTask.new(:unit_test) do |t|
+    # Glob pattern to match files.
+    t.pattern = "spec/unit/**/test_*.rb"
 
-    # List of directories to added to $LOAD_PATH before running the
-    # tests. (default is 'lib')
-    t.libs = ["lib"]
+    # By default, if there is a Gemfile, the generated command will include
+    # 'bundle exec'. Set this to true to ignore the presence of a Gemfile, 
+    # and not add 'bundle exec' to the command.
+    t.skip_bundler = false
 
-    # True if verbose test output desired. (default is false)
-    t.verbose = false
+    # Name of Gemfile to use
+    t.gemfile = "Gemfile"
 
-    # Test options passed to the test suite.  An explicit TESTOPTS=opts 
-    # on the command line will override this. (default is NONE)
-    t.options = nil
+    # Whether or not to fail Rake when an error occurs (typically when 
+    # examples fail).
+    t.fail_on_error = true
 
-    # Request that the tests be run with the warning flag set.
-    # E.g. warning=true implies "ruby -w" used to run the tests.
-    t.warning = false
+    # A message to print to stderr when there are failures.
+    t.failure_message = nil
 
-    # Glob pattern to match test files. (default is 'test/test*.rb')
-    t.pattern = "test/test*.rb"
+    # Use verbose output. If this is set to true, the task will print the
+    # executed spec command to stdout.
+    t.verbose = true
 
-    # Style of test loader to use.  Options are:
-    #
-    # * :rake -- Rake provided test loading script (default).
-    # * :testrb -- Ruby provided test loading script.
-    # * :direct -- Load tests using command line loader.
-    # 
-    t.loader = :rake
+    # Use rcov for code coverage?
+    t.rcov = false
 
-    # Array of commandline options to pass to ruby when running test 
-    # loader.
+    # Path to rcov.
+    t.rcov_path = "rcov"
+
+    # Command line options to pass to rcov. See 'rcov --help' about this
+    t.rcov_opts = []
+
+    # Command line options to pass to ruby. See 'ruby --help' about this 
     t.ruby_opts = []
 
-    # Explicitly define the list of test files to be included in a
-    # test.  +list+ is expected to be an array of file names (a
-    # FileList is acceptable).  If both +pattern+ and +test_files+ are
-    # used, then the list of test files is the union of the two.
-    t.test_files = nil
+    # Path to rspec
+    t.rspec_path = "rspec"
 
+    # Command line options to pass to rspec. See 'rspec --help' about this
+    t.rspec_opts = ["--color", "--backtrace"]
   end
 rescue LoadError => ex
   task :unit_test do
     abort 'rspec is not available. In order to run spec, you must: gem install rspec'
   end
 ensure
-  desc "Run all tests"
+  task :spec => [:unit_test]
   task :test => [:unit_test]
 end
-