alf 0.9.3 → 0.10.0

data/spec/integration/__database__/group.alf

@@ -1,3 +1,3 @@
 #!/usr/bin/env alf
 (group :supplies, [:pid, :qty], :supplying)
-(group :supplies, [:sid], :supplying, true)
+(group :supplies, [:sid], :supplying, :allbut => true)

data/spec/integration/__database__/suppliers_csv.csv

@@ -0,0 +1,6 @@
+sid,name,status,city
+S1,Smith,20,London
+S2,Jones,10,Paris
+S3,Blake,30,Paris
+S4,Clark,20,London
+S5,Adams,30,Athens

data/spec/integration/command/alf/alf_env_sqlite.cmd

@@ -0,0 +1 @@
+alf --env=$(_("command/alf/alf.db",__FILE__)) show suppliers

data/spec/integration/command/alf/alf_env_sqlite.stdout

@@ -0,0 +1,9 @@
++------+-------+---------+--------+
+| :sid | :name | :status | :city  |
++------+-------+---------+--------+
+| S1   | Smith |      20 | London |
+| S2   | Jones |      10 | Paris  |
+| S3   | Blake |      30 | Paris  |
+| S4   | Clark |      20 | London |
+| S5   | Adams |      30 | Athens |
++------+-------+---------+--------+

data/spec/integration/command/alf/alf_help.cmd

@@ -0,0 +1 @@
+alf --help

data/spec/integration/command/alf/alf_help.stdout

@@ -0,0 +1,67 @@
+
+alf - Relational algebra at your fingertips
+
+SYNOPSIS
+
+    alf [--version] [--help] 
+    alf -e '(lispy command)'
+    alf [FILE.alf]
+    alf [alf opts] OPERATOR [operator opts] ARGS ...
+    alf help OPERATOR
+
+OPTIONS
+
+    -e, --execute                    Execute one line of script (Lispy API)
+    --rash                       Render output as ruby hashes
+    --text                       Render output as a text table
+    --yaml                       Render output as a yaml output
+    --csv                        Render output as a csv file
+    --env=ENV                    Set the environment to use
+    --input-reader=READER        Specify the kind of reader when reading on $stdin (rash,alf,csv,logs)
+    -Idirectory                      Specify $LOAD_PATH directory (may be used more than once)
+    -rlibrary                        Require the library, before executing alf
+    -h, --help                       Show help
+    -v, --version                    Show version
+
+RELATIONAL OPERATORS
+
+    project          Relational projection (clip + compact)
+    extend           Relational extension (additional, computed attributes)
+    rename           Relational renaming (rename some attributes)
+    restrict         Relational restriction (aka where, predicate filtering)
+    join             Relational join (and cartesian product)
+    intersect        Relational intersection (aka a logical and)
+    minus            Relational minus (aka difference)
+    union            Relational union
+    matching         Relational matching (join + project back on left)
+    not-matching     Relational not matching (inverse of matching)
+    wrap             Relational wrapping (tuple-valued attributes)
+    unwrap           Relational un-wrapping (inverse of wrap)
+    group            Relational grouping (relation-valued attributes)
+    ungroup          Relational un-grouping (inverse of group)
+    summarize        Relational summarization (group-by + aggregate ops)
+    rank             Relational ranking (explicit tuple positions)
+
+EXPERIMENTAL RELATIONAL OPERATORS
+
+    quota     Generalized quota-queries (position, sum progression, etc.)
+
+NON-RELATIONAL OPERATORS
+
+    autonum       Extend its operand with an unique autonumber attribute
+    defaults      Force default values on missing/nil attributes
+    compact       Remove tuple duplicates
+    sort          Sort input tuples according to an order relation
+    clip          Clip input tuples to a subset of attributes
+    coerce        Force attribute coercion according to a heading
+    generator     Generate a relation with an auto-numbered attribute
+
+OTHER NON-RELATIONAL COMMANDS
+
+    exec     Executes an .alf file on current environment
+    help     Show help about a specific command
+    show     Output input tuples through a specific renderer (text, yaml, ...)
+
+See 'alf help COMMAND' for details about a specific command.
+
+SystemExit

data/spec/integration/command/autonum/autonum_0.cmd

@@ -1 +1 @@
-alf --text autonum           suppliers
+alf --text autonum suppliers

data/spec/integration/command/coerce/coerce_1.cmd

@@ -0,0 +1 @@
+alf coerce suppliers_csv -- sid Symbol status Integer

data/spec/integration/command/coerce/coerce_1.stdout

@@ -0,0 +1,5 @@
+{:sid => :S1, :name => "Smith", :status => 20, :city => "London"}
+{:sid => :S2, :name => "Jones", :status => 10, :city => "Paris"}
+{:sid => :S3, :name => "Blake", :status => 30, :city => "Paris"}
+{:sid => :S4, :name => "Clark", :status => 20, :city => "London"}
+{:sid => :S5, :name => "Adams", :status => 30, :city => "Athens"}

data/spec/integration/command/defaults/defaults_0.cmd

@@ -1 +1 @@
-alf --text defaults          suppliers -- country "'Belgium'"
+alf --text defaults suppliers -- country "'Belgium'"

data/spec/integration/command/defaults/defaults_0.stdout

@@ -1,9 +1,9 @@
-+----------+------+-------+---------+--------+
-| :country | :sid | :name | :status | :city  |
-+----------+------+-------+---------+--------+
-| Belgium  | S1   | Smith |      20 | London |
-| Belgium  | S2   | Jones |      10 | Paris  |
-| Belgium  | S3   | Blake |      30 | Paris  |
-| Belgium  | S4   | Clark |      20 | London |
-| Belgium  | S5   | Adams |      30 | Athens |
-+----------+------+-------+---------+--------+
++------+-------+---------+--------+----------+
+| :sid | :name | :status | :city  | :country |
++------+-------+---------+--------+----------+
+| S1   | Smith |      20 | London | Belgium  |
+| S2   | Jones |      10 | Paris  | Belgium  |
+| S3   | Blake |      30 | Paris  | Belgium  |
+| S4   | Clark |      20 | London | Belgium  |
+| S5   | Adams |      30 | Athens | Belgium  |
++------+-------+---------+--------+----------+

data/spec/integration/command/defaults/defaults_2.cmd

@@ -0,0 +1 @@
+alf --text defaults suppliers -- country "city"

data/spec/integration/command/defaults/defaults_2.stdout

@@ -0,0 +1,9 @@
++------+-------+---------+--------+----------+
+| :sid | :name | :status | :city  | :country |
++------+-------+---------+--------+----------+
+| S1   | Smith |      20 | London | London   |
+| S2   | Jones |      10 | Paris  | Paris    |
+| S3   | Blake |      30 | Paris  | Paris    |
+| S4   | Clark |      20 | London | London   |
+| S5   | Adams |      30 | Athens | Athens   |
++------+-------+---------+--------+----------+

data/spec/integration/command/generator/generator_1.cmd

@@ -0,0 +1 @@
+alf generator

data/spec/integration/command/generator/generator_1.stdout

@@ -0,0 +1,10 @@
+{:num => 1}
+{:num => 2}
+{:num => 3}
+{:num => 4}
+{:num => 5}
+{:num => 6}
+{:num => 7}
+{:num => 8}
+{:num => 9}
+{:num => 10}

data/spec/integration/command/generator/generator_2.cmd

@@ -0,0 +1 @@
+alf generator -- 5

data/spec/integration/command/generator/generator_2.stdout

@@ -0,0 +1,5 @@
+{:num => 1}
+{:num => 2}
+{:num => 3}
+{:num => 4}
+{:num => 5}

data/spec/integration/command/generator/generator_3.cmd

@@ -0,0 +1 @@
+alf generator -- 5 -- id

data/spec/integration/command/generator/generator_3.stdout

@@ -0,0 +1,5 @@
+{:id => 1}
+{:id => 2}
+{:id => 3}
+{:id => 4}
+{:id => 5}

data/spec/integration/command/group/group_0.cmd

@@ -1 +1 @@
-alf --text group             supplies  -- pid qty supplying
+alf --text group supplies  -- pid qty -- supplying

data/spec/integration/command/group/group_1.cmd

@@ -1 +1 @@
-alf --text group --allbut    supplies  -- sid supplying
+alf --text group --allbut supplies -- sid -- supplying

data/spec/integration/command/help/help_1.cmd

@@ -0,0 +1 @@
+alf help show

data/spec/integration/command/help/help_1.stdout

@@ -0,0 +1,22 @@
+
+Output input tuples through a specific renderer (text, yaml, ...)
+
+SYNOPSIS
+
+    alf show DATASET
+
+OPTIONS
+
+    --rash                       Render output as ruby hashes
+    --text                       Render output as a text table
+    --yaml                       Render output as a yaml output
+    --csv                        Render output as a csv file
+
+DESCRIPTION
+
+When a dataset name is specified as commandline arg, request the 
+environment to provide this dataset and prints it. Otherwise, take what 
+comes on standard input.
+
+Note that this command is not an operator and should not be piped anymore.
+

data/spec/integration/command/quota/quota_0.cmd

@@ -1 +1 @@
-alf --text quota             supplies  -- --by=sid --order=qty position count sum_qty "sum(:qty)"
+alf --text quota supplies -- sid -- qty -- position "count()" sum_qty "sum{ qty }"

data/spec/integration/command/rank/rank_1.cmd

@@ -1 +1 @@
-alf --text rank parts --order=weight
+alf --text rank parts -- weight

data/spec/integration/command/rank/rank_1.stdout

@@ -1,10 +1,10 @@
-+------+-------+--------+------------+--------+-------+
-| :pid | :name | :color | :weight    | :city  | :rank |
-+------+-------+--------+------------+--------+-------+
-| P1   | Nut   | Red    | 12.0000000 | London |     0 |
-| P5   | Cam   | Blue   | 12.0000000 | Paris  |     0 |
-| P4   | Screw | Red    | 14.0000000 | London |     2 |
-| P2   | Bolt  | Green  | 17.0000000 | Paris  |     3 |
-| P3   | Screw | Blue   | 17.0000000 | Oslo   |     3 |
-| P6   | Cog   | Red    | 19.0000000 | London |     5 |
-+------+-------+--------+------------+--------+-------+
++------+-------+--------+---------+--------+-------+
+| :pid | :name | :color | :weight | :city  | :rank |
++------+-------+--------+---------+--------+-------+
+| P1   | Nut   | Red    |  12.000 | London |     0 |
+| P5   | Cam   | Blue   |  12.000 | Paris  |     0 |
+| P4   | Screw | Red    |  14.000 | London |     2 |
+| P2   | Bolt  | Green  |  17.000 | Paris  |     3 |
+| P3   | Screw | Blue   |  17.000 | Oslo   |     3 |
+| P6   | Cog   | Red    |  19.000 | London |     5 |
++------+-------+--------+---------+--------+-------+

data/spec/integration/command/rank/rank_2.cmd

@@ -1 +1 @@
-alf --text rank parts --order=weight -- pos
+alf --text rank parts -- weight -- pos

data/spec/integration/command/rank/rank_2.stdout

@@ -1,10 +1,10 @@
-+------+-------+--------+------------+--------+------+
-| :pid | :name | :color | :weight    | :city  | :pos |
-+------+-------+--------+------------+--------+------+
-| P1   | Nut   | Red    | 12.0000000 | London |    0 |
-| P5   | Cam   | Blue   | 12.0000000 | Paris  |    0 |
-| P4   | Screw | Red    | 14.0000000 | London |    2 |
-| P2   | Bolt  | Green  | 17.0000000 | Paris  |    3 |
-| P3   | Screw | Blue   | 17.0000000 | Oslo   |    3 |
-| P6   | Cog   | Red    | 19.0000000 | London |    5 |
-+------+-------+--------+------------+--------+------+
++------+-------+--------+---------+--------+------+
+| :pid | :name | :color | :weight | :city  | :pos |
++------+-------+--------+---------+--------+------+
+| P1   | Nut   | Red    |  12.000 | London |    0 |
+| P5   | Cam   | Blue   |  12.000 | Paris  |    0 |
+| P4   | Screw | Red    |  14.000 | London |    2 |
+| P2   | Bolt  | Green  |  17.000 | Paris  |    3 |
+| P3   | Screw | Blue   |  17.000 | Oslo   |    3 |
+| P6   | Cog   | Red    |  19.000 | London |    5 |
++------+-------+--------+---------+--------+------+

data/spec/integration/command/rank/rank_3.cmd

@@ -1 +1 @@
-alf --text rank parts --order=weight,pid
+alf --text rank parts -- weight pid

data/spec/integration/command/rank/rank_3.stdout

@@ -1,10 +1,10 @@
-+------+-------+--------+------------+--------+-------+
-| :pid | :name | :color | :weight    | :city  | :rank |
-+------+-------+--------+------------+--------+-------+
-| P1   | Nut   | Red    | 12.0000000 | London |     0 |
-| P5   | Cam   | Blue   | 12.0000000 | Paris  |     1 |
-| P4   | Screw | Red    | 14.0000000 | London |     2 |
-| P2   | Bolt  | Green  | 17.0000000 | Paris  |     3 |
-| P3   | Screw | Blue   | 17.0000000 | Oslo   |     4 |
-| P6   | Cog   | Red    | 19.0000000 | London |     5 |
-+------+-------+--------+------------+--------+-------+
++------+-------+--------+---------+--------+-------+
+| :pid | :name | :color | :weight | :city  | :rank |
++------+-------+--------+---------+--------+-------+
+| P1   | Nut   | Red    |  12.000 | London |     0 |
+| P5   | Cam   | Blue   |  12.000 | Paris  |     1 |
+| P4   | Screw | Red    |  14.000 | London |     2 |
+| P2   | Bolt  | Green  |  17.000 | Paris  |     3 |
+| P3   | Screw | Blue   |  17.000 | Oslo   |     4 |
+| P6   | Cog   | Red    |  19.000 | London |     5 |
++------+-------+--------+---------+--------+-------+

data/spec/integration/command/rank/rank_4.cmd

@@ -1 +1 @@
-alf rank parts --order=weight,desc -- position
+alf rank parts -- weight desc -- position

data/spec/integration/command/rank/rank_5.cmd

@@ -1 +1 @@
-alf rank parts --order=weight,desc,pid,asc -- position
+alf rank parts -- weight desc pid asc -- position

data/spec/integration/command/show/show_csv.cmd

@@ -0,0 +1 @@
+alf show suppliers --csv

data/spec/integration/command/show/show_csv.stdout

@@ -0,0 +1,6 @@
+sid,name,status,city
+S1,Smith,20,London
+S2,Jones,10,Paris
+S3,Blake,30,Paris
+S4,Clark,20,London
+S5,Adams,30,Athens

data/spec/integration/command/show/show_rash_2.cmd

@@ -1 +1 @@
-alf -rdate extend suppliers -- date "Date.parse('2011-07-22')"
+alf -ruri extend suppliers -- uri "URI.parse(name)"

data/spec/integration/command/show/show_rash_2.stdout

@@ -1,5 +1,5 @@
-{:sid => "S1", :name => "Smith", :status => 20, :city => "London", :date => Marshal.load("\x04\bU:\tDate[\bU:\rRational[\ai\x03\xA9\xF1Ji\ai\x00i\x03\x19\x15#")}
-{:sid => "S2", :name => "Jones", :status => 10, :city => "Paris", :date => Marshal.load("\x04\bU:\tDate[\bU:\rRational[\ai\x03\xA9\xF1Ji\ai\x00i\x03\x19\x15#")}
-{:sid => "S3", :name => "Blake", :status => 30, :city => "Paris", :date => Marshal.load("\x04\bU:\tDate[\bU:\rRational[\ai\x03\xA9\xF1Ji\ai\x00i\x03\x19\x15#")}
-{:sid => "S4", :name => "Clark", :status => 20, :city => "London", :date => Marshal.load("\x04\bU:\tDate[\bU:\rRational[\ai\x03\xA9\xF1Ji\ai\x00i\x03\x19\x15#")}
-{:sid => "S5", :name => "Adams", :status => 30, :city => "Athens", :date => Marshal.load("\x04\bU:\tDate[\bU:\rRational[\ai\x03\xA9\xF1Ji\ai\x00i\x03\x19\x15#")}
+{:sid => "S1", :name => "Smith", :status => 20, :city => "London", :uri => Marshal.load("\x04\bo:\x11URI::Generic\x10:\f@scheme0:\n@user0:\x0E@password0:\n@host0:\n@port0:\n@pathI\"\nSmith\x06:\x06ET:\v@query0:\f@opaque0:\x0E@registry0:\x0E@fragment0:\f@parser0")}
+{:sid => "S2", :name => "Jones", :status => 10, :city => "Paris", :uri => Marshal.load("\x04\bo:\x11URI::Generic\x10:\f@scheme0:\n@user0:\x0E@password0:\n@host0:\n@port0:\n@pathI\"\nJones\x06:\x06ET:\v@query0:\f@opaque0:\x0E@registry0:\x0E@fragment0:\f@parser0")}
+{:sid => "S3", :name => "Blake", :status => 30, :city => "Paris", :uri => Marshal.load("\x04\bo:\x11URI::Generic\x10:\f@scheme0:\n@user0:\x0E@password0:\n@host0:\n@port0:\n@pathI\"\nBlake\x06:\x06ET:\v@query0:\f@opaque0:\x0E@registry0:\x0E@fragment0:\f@parser0")}
+{:sid => "S4", :name => "Clark", :status => 20, :city => "London", :uri => Marshal.load("\x04\bo:\x11URI::Generic\x10:\f@scheme0:\n@user0:\x0E@password0:\n@host0:\n@port0:\n@pathI\"\nClark\x06:\x06ET:\v@query0:\f@opaque0:\x0E@registry0:\x0E@fragment0:\f@parser0")}
+{:sid => "S5", :name => "Adams", :status => 30, :city => "Athens", :uri => Marshal.load("\x04\bo:\x11URI::Generic\x10:\f@scheme0:\n@user0:\x0E@password0:\n@host0:\n@port0:\n@pathI\"\nAdams\x06:\x06ET:\v@query0:\f@opaque0:\x0E@registry0:\x0E@fragment0:\f@parser0")}

data/spec/integration/command/sort/sort_0.cmd

@@ -1 +1 @@
-alf --text sort              suppliers -- name asc
+alf --text sort suppliers -- name

data/spec/integration/command/sort/sort_1.cmd

@@ -1 +1 @@
-alf --text sort              suppliers -- city desc name asc
+alf --text sort suppliers -- name desc

data/spec/integration/command/sort/sort_1.stdout

@@ -1,9 +1,9 @@
 +------+-------+---------+--------+
 | :sid | :name | :status | :city  |
 +------+-------+---------+--------+
-| S3   | Blake |      30 | Paris  |
+| S1   | Smith |      20 | London |
 | S2   | Jones |      10 | Paris  |
 | S4   | Clark |      20 | London |
-| S1   | Smith |      20 | London |
+| S3   | Blake |      30 | Paris  |
 | S5   | Adams |      30 | Athens |
 +------+-------+---------+--------+

data/spec/integration/command/sort/sort_2.cmd

@@ -0,0 +1 @@
+alf --text sort suppliers -- city name

data/spec/integration/command/sort/sort_2.stdout

@@ -0,0 +1,9 @@
++------+-------+---------+--------+
+| :sid | :name | :status | :city  |
++------+-------+---------+--------+
+| S5   | Adams |      30 | Athens |
+| S4   | Clark |      20 | London |
+| S1   | Smith |      20 | London |
+| S3   | Blake |      30 | Paris  |
+| S2   | Jones |      10 | Paris  |
++------+-------+---------+--------+

data/spec/integration/command/sort/sort_3.cmd

@@ -0,0 +1 @@
+alf --text sort suppliers -- city desc name asc

data/spec/integration/command/sort/sort_3.stdout

@@ -0,0 +1,9 @@
++------+-------+---------+--------+
+| :sid | :name | :status | :city  |
++------+-------+---------+--------+
+| S3   | Blake |      30 | Paris  |
+| S2   | Jones |      10 | Paris  |
+| S4   | Clark |      20 | London |
+| S1   | Smith |      20 | London |
+| S5   | Adams |      30 | Athens |
++------+-------+---------+--------+

data/spec/integration/command/summarize/summarize_0.cmd

@@ -1 +1 @@
-alf --text summarize         supplies  -- --by=sid total_qty "sum(:qty)"
+alf --text summarize supplies -- sid -- total_qty "sum{ qty }"

data/spec/integration/command/ungroup/ungroup_0.cmd

@@ -1 +1 @@
-alf --text ungroup           group     -- supplying
+alf --text ungroup group -- supplying

data/spec/integration/command/wrap/wrap_0.cmd

@@ -1 +1 @@
-alf --text wrap              suppliers -- city status loc_and_status
+alf --text wrap suppliers -- city status -- loc_and_status

data/spec/integration/semantics/test_project.alf

@@ -1,9 +1,8 @@
-cities = relation(
-  {:city => 'London'}, 
-  {:city => 'Paris'}, 
-  {:city => 'Athens'}
-)
+cities = Relation(
+  Tuple(:city => 'London'), 
+  Tuple(:city => 'Paris'), 
+  Tuple(:city => 'Athens'))
 (specify \
   "(project ..., [...]) should remove duplicates",
   (rel_equal \
-    (project :suppliers, [:city]), cities))
+    (project :suppliers, [:city]), cities))

data/spec/integration/semantics/test_rank.alf

@@ -1,34 +1,34 @@
-input = rel(
-  {:id => 1, :weight => 10.0},
-  {:id => 2, :weight => 12.0},
-  {:id => 3, :weight => 12.0}
+input = Relation(
+  Tuple(:id => 1, :weight => 10.0),
+  Tuple(:id => 2, :weight => 12.0),
+  Tuple(:id => 3, :weight => 12.0)
 )
 
 (specify "rank should respect < by default",
   (rel_equal \
-    (rel (tuple :id => 1, :weight => 10.0, :rank => 0),
-         (tuple :id => 2, :weight => 12.0, :rank => 1),
-         (tuple :id => 3, :weight => 12.0, :rank => 1)),
+    (Relation Tuple(:id => 1, :weight => 10.0, :rank => 0),
+              Tuple(:id => 2, :weight => 12.0, :rank => 1),
+              Tuple(:id => 3, :weight => 12.0, :rank => 1)),
     (rank input, [:weight])))
 
 (specify "rank should support a strict order",
   (rel_equal \
-    (rel (tuple :id => 1, :weight => 10.0, :rank => 0),
-         (tuple :id => 2, :weight => 12.0, :rank => 1),
-         (tuple :id => 3, :weight => 12.0, :rank => 2)),
+    (Relation Tuple(:id => 1, :weight => 10.0, :rank => 0),
+              Tuple(:id => 2, :weight => 12.0, :rank => 1),
+              Tuple(:id => 3, :weight => 12.0, :rank => 2)),
     (rank input, [:weight, :id])))
       
 (specify "rank should support a reverse order",
   (rel_equal \
-    (rel (tuple :id => 1, :weight => 10.0, :rank => 2),
-         (tuple :id => 2, :weight => 12.0, :rank => 0),
-         (tuple :id => 3, :weight => 12.0, :rank => 0)),
+    (Relation Tuple(:id => 1, :weight => 10.0, :rank => 2),
+              Tuple(:id => 2, :weight => 12.0, :rank => 0),
+              Tuple(:id => 3, :weight => 12.0, :rank => 0)),
     (rank input, [[:weight, :desc]])))
 
 (specify "rank should allow specifying a name",
   (rel_equal \
-    (rel (tuple :id => 1, :weight => 10.0, :pos => 0),
-         (tuple :id => 2, :weight => 12.0, :pos => 1),
-         (tuple :id => 3, :weight => 12.0, :pos => 1)),
+    (Relation Tuple(:id => 1, :weight => 10.0, :pos => 0),
+              Tuple(:id => 2, :weight => 12.0, :pos => 1),
+              Tuple(:id => 3, :weight => 12.0, :pos => 1)),
     (rank input, [:weight], :pos)))
       

data/spec/integration/test_command.rb

@@ -6,17 +6,23 @@ describe "Alf's alf command / " do
     specify{ cmd.should =~ /^alf / }
   
     describe "#{File.basename(input)}: #{cmd}" do
-      let(:argv)     { Alf::Tools::parse_commandline_args(cmd)[1..-1] }
+      let(:argv)     { Quickl.parse_commandline_args(cmd)[1..-1] }
       let(:stdout)   { File.join(File.dirname(input), "#{File.basename(input, ".cmd")}.stdout") }
-      let(:expected) { wlang(File.read(stdout), binding) }
+      let(:stderr)   { File.join(File.dirname(input), "#{File.basename(input, ".cmd")}.stderr") }
+      let(:stdout_expected) { File.exists?(stdout) ? wlang(File.read(stdout), binding) : "" }
+      let(:stderr_expected) { File.exists?(stderr) ? wlang(File.read(stderr), binding) : "" }
 
       before{ 
         $oldstdout = $stdout 
+        $oldstderr = $stderr
         $stdout = StringIO.new
+        $stderr = StringIO.new
       }
       after { 
         $stdout = $oldstdout
+        $stderr = $oldstderr
         $oldstdout = nil 
+        $oldstderr = nil 
       }
       
       specify{
@@ -25,12 +31,17 @@ describe "Alf's alf command / " do
           main = Alf::Command::Main.new
           main.environment = Alf::Environment.folder(dir)
           main.run(argv, __FILE__)
-        rescue SystemExit
-          $stdout << SystemExit << "\n"
+        rescue => ex
+          begin
+            Alf::Command::Main.handle_error(ex, main)
+          rescue SystemExit
+            $stdout << "SystemExit" << "\n"
+          end
         end
-        $stdout.string.should(eq(expected)) unless RUBY_VERSION < "1.9"
+        $stdout.string.should(eq(stdout_expected)) unless RUBY_VERSION < "1.9"
+        $stderr.string.should(eq(stderr_expected)) unless RUBY_VERSION < "1.9"
       }
     end
   end
     
-end
+end

data/spec/integration/test_examples.rb

@@ -7,7 +7,7 @@ Dir["#{File.expand_path('../../../examples', __FILE__)}/**/*.alf"].each do |file
     let(:example_env) { Alf::Environment.folder(example_dir) }
 
     it "should run without error" do
-      Alf.lispy(example_env).compile(File.read(example_path)).to_rel
+      Alf.lispy(example_env).compile(File.read(example_path), example_path).to_rel
     end
 
   end

data/spec/regression/logs/apache_combined.log

@@ -0,0 +1,5 @@
+125.76.230.10 - - [02/Sep/2009:03:33:46 +0200] "GET /cart/install.txt HTTP/1.1" 404 214 "-" "Toata dragostea mea pentru diavola"
+125.76.230.10 - - [02/Sep/2009:03:33:47 +0200] "GET /store/install.txt HTTP/1.1" 404 215 "-" "Toata dragostea mea pentru diavola"
+10.0.1.1 - - [02/Sep/2009:05:08:33 +0200] "GET / HTTP/1.1" 200 30 "-" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-us) AppleWebKit/531.9 (KHTML, like Gecko) Version/4.0.3 Safari/531.9"
+10.0.1.1 - - [02/Sep/2009:06:41:51 +0200] "GET / HTTP/1.1" 200 30 "-" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-us) AppleWebKit/531.9 (KHTML, like Gecko) Version/4.0.3 Safari/531.9"
+69.41.0.45 - - [02/Sep/2009:12:02:40 +0200] "GET //phpMyAdmin/ HTTP/1.1" 404 209 "-" "Mozilla/4.0 (compatible; MSIE 6.0; Windows 98)"

data/spec/regression/logs/test_path_attribute.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+describe "path attributes in log" do
+  
+  let(:env){ Alf::Environment.folder(File.dirname(__FILE__)) }
+    
+  subject{ 
+    Alf.lispy(env).evaluate <<-EOF
+      (restrict :apache_combined, lambda{ path =~ /install.txt/ })
+    EOF
+  }
+  
+  specify {
+    subject.should be_a(Alf::Relation)
+    projected = subject.project([:path])
+    projected.should == Alf::Relation[
+      {:path => "/cart/install.txt" }, 
+      {:path => "/store/install.txt"}
+    ]
+    projected.extend(:short_path => lambda{ path[0..1] }).should == Alf::Relation[
+      {:path => "/cart/install.txt",  :short_path => "/c" }, 
+      {:path => "/store/install.txt", :short_path => "/s"}
+    ]
+  }
+  
+end

data/spec/regression/relation/test_relation_allbut_all.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'date'
+module Alf
+  describe Relation, "allbut" do
+  
+    describe "when all attributes are projected away" do
+      subject{ 
+        Relation[{:sid => "P1"}].allbut([:sid]) 
+      }
+      it{ should eql(Relation[{}]) }
+    end
+    
+  end
+end

data/spec/shared/an_operator_class.rb

@@ -1,7 +1,6 @@
 shared_examples_for "An operator class" do
 
-  it "should not have public set_args, _each and _prepare methods" do
-    operator_class.public_method_defined?(:set_args).should be_false
+  it "should not have public _each and _prepare methods" do
     operator_class.public_method_defined?(:_each).should be_false
     operator_class.public_method_defined?(:_prepare).should be_false
   end
@@ -26,10 +25,16 @@ shared_examples_for "An operator class" do
     operator_class.should respond_to(:binary?)
   end
   
+  it "should have a nullary? class method" do
+    operator_class.should respond_to(:nullary?)
+  end
+  
   it "should implement unary? and binary? accurately" do
-    operator_class.unary?.should_not eq(operator_class.binary?)
-    operator_class.unary?.should eq(operator_class.ancestors.include?(Alf::Operator::Unary))
-    operator_class.binary?.should eq(operator_class.ancestors.include?(Alf::Operator::Binary))
+    op = operator_class
+    (op.nullary? || op.unary? || op.binary?).should be_true
+    (op.nullary? && op.unary?).should be_false
+    (op.nullary? && op.binary?).should be_false
+    (op.unary? && op.binary?).should be_false
   end
 
 end