alf 0.9.0 → 0.9.1

data/spec/unit/test_operator.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+module Alf
+  describe Operator do
+    
+    specify "each" do
+      ops = []
+      Operator.each{|m| ops << m}
+      nonrel = []
+      Operator::NonRelational.each{|m| nonrel << m}
+      rel = []
+      Operator::Relational.each{|m| rel << m}
+      ops.should == nonrel + rel
+    end
+    
+  end
+end

data/spec/{reader_spec.rb → unit/test_reader.rb}

@@ -21,6 +21,10 @@ module Alf
         lambda{ Reader.reader('.noone') }.should raise_error
       end
       
+      specify "when an IO" do
+        Reader.reader($stdin).should be_a(Reader::Rash)
+      end
+      
     end
 
   end

data/spec/unit/test_relation.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+module Alf
+  describe Relation do
+ 
+    let(:tuples){[
+      {:sid => 'S1', :name => 'Smith', :status => 20, :city => 'London'},
+      {:sid => 'S2', :name => 'Jones', :status => 10, :city => 'Paris'},
+      {:sid => 'S3', :name => 'Blake', :status => 30, :city => 'Paris'}
+    ]}
+    let(:tuples2){ tuples.sort{|t1,t2| t1[:name] <=> t2[:name]} }
+    
+    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 define == correctly" do
+      rel1.should == rel2
+      rel2.should == rel1
+      rel3.should_not == rel1
+    end
+    
+    it "should allow putting them in hashes" do
+      h = {}
+      h[rel1] = 1
+      h[rel2] = 2
+      h[rel3] = 3
+      h.size.should == 2
+      h[rel1].should == 2
+    end
+    
+    it "should be enumerable" do
+      rel1.to_a.sort{|t1,t2| t1[:sid] <=> t2[:sid]}.should == tuples
+    end
+    
+  end
+end

data/tasks/clean.rake

@@ -0,0 +1,3 @@
+task :clean do
+  Dir["**/*.rbc"].each{|f| FileUtils.rm_rf(f)}
+end

data/tasks/spec_test.rake

@@ -30,7 +30,7 @@ begin
   desc "Run RSpec code examples"
   RSpec::Core::RakeTask.new(:spec_test) do |t|
     # Glob pattern to match files.
-    t.pattern = "spec/**/*_spec.rb"
+    t.pattern = "spec/**/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, 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alf
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-19 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-07-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &80781680 !ruby/object:Gem::Requirement
+  requirement: &73619970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *80781680
+  version_requirements: *73619970
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &80781160 !ruby/object:Gem::Requirement
+  requirement: &73619720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *80781160
+  version_requirements: *73619720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &80780760 !ruby/object:Gem::Requirement
+  requirement: &73619490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *80780760
+  version_requirements: *73619490
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &80780420 !ruby/object:Gem::Requirement
+  requirement: &73619260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +54,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *80780420
+  version_requirements: *73619260
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &80780050 !ruby/object:Gem::Requirement
+  requirement: &73619030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +65,10 @@ dependencies:
         version: 2.0.9
   type: :development
   prerelease: false
-  version_requirements: *80780050
+  version_requirements: *73619030
 - !ruby/object:Gem::Dependency
   name: wlang
-  requirement: &80779450 !ruby/object:Gem::Requirement
+  requirement: &73618800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +76,10 @@ dependencies:
         version: 0.10.1
   type: :development
   prerelease: false
-  version_requirements: *80779450
+  version_requirements: *73618800
 - !ruby/object:Gem::Dependency
   name: noe
-  requirement: &80778880 !ruby/object:Gem::Requirement
+  requirement: &73618570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +87,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *80778880
+  version_requirements: *73618570
 - !ruby/object:Gem::Dependency
   name: quickl
-  requirement: &80778310 !ruby/object:Gem::Requirement
+  requirement: &73618340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,9 +98,12 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *80778310
-description: ! "Alf is a commandline tool and Ruby library to manipulate data with
-  all the \npower of a truly relational algebra approach. "
+  version_requirements: *73618340
+description: ! "Alf brings the relational algebra both in Shell and in Ruby. In Shell,
+  because \nmanipulating any relation-like data source should be as straightforward
+  as a \none-liner. In Ruby, because I've never understood why programming languages
+  \nprovide data structures like arrays, hashes, sets, trees and graphs but not \n_relations_...
+  Let's stop the segregation ;-)"
 email:
 - blambeau@gmail.com
 executables:
@@ -119,8 +121,6 @@ files:
 - examples/schema.yaml
 - examples/nulls.rash
 - examples/autonum.alf
-- examples/with.alf
-- examples/unnest.alf
 - examples/sort.alf
 - examples/quota.alf
 - examples/rename.alf
@@ -129,9 +129,12 @@ files:
 - examples/parts.rash
 - examples/cities.rash
 - examples/defaults.alf
+- examples/unwrap.alf
 - examples/join.alf
 - examples/union.alf
+- examples/pseudo-with.alf
 - examples/runall.sh
+- examples/wrap.alf
 - examples/database.alf
 - examples/extend.alf
 - examples/compact.alf
@@ -139,58 +142,72 @@ files:
 - examples/summarize.alf
 - examples/minus.alf
 - examples/clip.alf
-- examples/nest.alf
 - examples/restrict.alf
 - lib/alf.rb
+- lib/alf/relation.rb
 - lib/alf/loader.rb
 - lib/alf/renderer/yaml.rb
 - lib/alf/renderer/text.rb
 - lib/alf/version.rb
 - spec/spec_helper.rb
-- spec/examples_spec.rb
-- spec/reader/alf_file_spec.rb
-- spec/reader/input.rb
-- spec/reader/rash_spec.rb
-- spec/renderer_spec.rb
-- spec/alf_spec.rb
-- spec/aggregator_spec.rb
-- spec/lispy_spec.rb
-- spec/assumptions_spec.rb
-- spec/environment/explicit_spec.rb
-- spec/environment/folder_spec.rb
-- spec/tools/ordering_key_spec.rb
-- spec/tools/tuple_handle_spec.rb
-- spec/tools/projection_key_spec.rb
-- spec/tools/tools_spec.rb
-- spec/reader_spec.rb
-- spec/renderer/text/table_spec.rb
-- spec/renderer/text/row_spec.rb
-- spec/renderer/text/cell_spec.rb
-- spec/operator/command_methods_spec.rb
-- spec/operator/relational/extend_spec.rb
-- spec/operator/relational/union_spec.rb
-- spec/operator/relational/minus_spec.rb
-- spec/operator/relational/join/hash_based_spec.rb
-- spec/operator/relational/project_spec.rb
-- spec/operator/relational/group_spec.rb
-- spec/operator/relational/summarize_spec.rb
-- spec/operator/relational/rename_spec.rb
-- spec/operator/relational/unnest_spec.rb
-- spec/operator/relational/quota_spec.rb
-- spec/operator/relational/nest_spec.rb
-- spec/operator/relational/intersect_spec.rb
-- spec/operator/relational/restrict_spec.rb
-- spec/operator/relational/ungroup_spec.rb
-- spec/operator/relational/summarize/sort_based_spec.rb
-- spec/operator/non_relational/compact/sort_based_spec.rb
-- spec/operator/non_relational/compact/buffer_based.rb
-- spec/operator/non_relational/sort_spec.rb
-- spec/operator/non_relational/clip_spec.rb
-- spec/operator/non_relational/defaults_spec.rb
-- spec/operator/non_relational/autonum_spec.rb
-- spec/operator/non_relational/compact_spec.rb
+- spec/integration/test_examples.rb
+- spec/integration/test_alf_specs.rb
+- spec/integration/src/test_minus.alf
+- spec/integration/src/test_project.alf
+- spec/integration/test_alf.rb
+- spec/unit/test_operator.rb
+- spec/unit/test_relation.rb
+- spec/unit/relation/test_relops.rb
+- spec/unit/relation/test_inspect.rb
+- spec/unit/relation/test_coerce.rb
+- spec/unit/reader/input.rb
+- spec/unit/reader/test_rash.rb
+- spec/unit/reader/test_alf_file.rb
+- spec/unit/test_lispy.rb
+- spec/unit/test_aggregator.rb
+- spec/unit/environment/examples/suppliers.rash
+- spec/unit/environment/test_explicit.rb
+- spec/unit/environment/test_folder.rb
+- spec/unit/tools/test_projection_key.rb
+- spec/unit/tools/test_tools.rb
+- spec/unit/tools/test_ordering_key.rb
+- spec/unit/tools/test_tuple_handle.rb
+- spec/unit/test_assumptions.rb
+- spec/unit/renderer/text/test_cell.rb
+- spec/unit/renderer/text/test_table.rb
+- spec/unit/renderer/text/test_row.rb
+- spec/unit/test_renderer.rb
+- spec/unit/operator/test_non_relational.rb
+- spec/unit/operator/relational/test_join.rb
+- spec/unit/operator/relational/test_extend.rb
+- spec/unit/operator/relational/test_intersect.rb
+- spec/unit/operator/relational/test_summarize.rb
+- spec/unit/operator/relational/test_rename.rb
+- spec/unit/operator/relational/join/test_hash_based.rb
+- spec/unit/operator/relational/test_wrap.rb
+- spec/unit/operator/relational/test_restrict.rb
+- spec/unit/operator/relational/test_minus.rb
+- spec/unit/operator/relational/test_quota.rb
+- spec/unit/operator/relational/test_unwrap.rb
+- spec/unit/operator/relational/test_group.rb
+- spec/unit/operator/relational/test_union.rb
+- spec/unit/operator/relational/test_project.rb
+- spec/unit/operator/relational/summarize/test_hash_based.rb
+- spec/unit/operator/relational/summarize/test_sort_based.rb
+- spec/unit/operator/relational/test_ungroup.rb
+- spec/unit/operator/non_relational/test_defaults.rb
+- spec/unit/operator/non_relational/compact/test_sort_based.rb
+- spec/unit/operator/non_relational/compact/buffer_based.rb
+- spec/unit/operator/non_relational/test_sort.rb
+- spec/unit/operator/non_relational/test_clip.rb
+- spec/unit/operator/non_relational/test_autonum.rb
+- spec/unit/operator/non_relational/test_compact.rb
+- spec/unit/operator/test_command_methods.rb
+- spec/unit/operator/test_relational.rb
+- spec/unit/test_reader.rb
 - tasks/debug_mail.rake
 - tasks/yard.rake
+- tasks/clean.rake
 - tasks/gem.rake
 - tasks/spec_test.rake
 - tasks/unit_test.rake
@@ -205,7 +222,6 @@ files:
 - Manifest.txt
 - README.md
 - TODO.md
-has_rdoc: true
 homepage: http://rubydoc.info/github/blambeau/alf/master/frames
 licenses: []
 post_install_message: 
@@ -220,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1038168221
+      hash: 861666799
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -229,54 +245,67 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1038168221
+      hash: 861666799
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: Classy data-manipulation dressed in a DSL (+ commandline)
+summary: Relational Algebra at your fingertips
 test_files:
 - spec/spec_helper.rb
-- spec/examples_spec.rb
-- spec/reader/alf_file_spec.rb
-- spec/reader/input.rb
-- spec/reader/rash_spec.rb
-- spec/renderer_spec.rb
-- spec/alf_spec.rb
-- spec/aggregator_spec.rb
-- spec/lispy_spec.rb
-- spec/assumptions_spec.rb
-- spec/environment/explicit_spec.rb
-- spec/environment/folder_spec.rb
-- spec/tools/ordering_key_spec.rb
-- spec/tools/tuple_handle_spec.rb
-- spec/tools/projection_key_spec.rb
-- spec/tools/tools_spec.rb
-- spec/reader_spec.rb
-- spec/renderer/text/table_spec.rb
-- spec/renderer/text/row_spec.rb
-- spec/renderer/text/cell_spec.rb
-- spec/operator/command_methods_spec.rb
-- spec/operator/relational/extend_spec.rb
-- spec/operator/relational/union_spec.rb
-- spec/operator/relational/minus_spec.rb
-- spec/operator/relational/join/hash_based_spec.rb
-- spec/operator/relational/project_spec.rb
-- spec/operator/relational/group_spec.rb
-- spec/operator/relational/summarize_spec.rb
-- spec/operator/relational/rename_spec.rb
-- spec/operator/relational/unnest_spec.rb
-- spec/operator/relational/quota_spec.rb
-- spec/operator/relational/nest_spec.rb
-- spec/operator/relational/intersect_spec.rb
-- spec/operator/relational/restrict_spec.rb
-- spec/operator/relational/ungroup_spec.rb
-- spec/operator/relational/summarize/sort_based_spec.rb
-- spec/operator/non_relational/compact/sort_based_spec.rb
-- spec/operator/non_relational/compact/buffer_based.rb
-- spec/operator/non_relational/sort_spec.rb
-- spec/operator/non_relational/clip_spec.rb
-- spec/operator/non_relational/defaults_spec.rb
-- spec/operator/non_relational/autonum_spec.rb
-- spec/operator/non_relational/compact_spec.rb
+- spec/integration/test_examples.rb
+- spec/integration/test_alf_specs.rb
+- spec/integration/src/test_minus.alf
+- spec/integration/src/test_project.alf
+- spec/integration/test_alf.rb
+- spec/unit/test_operator.rb
+- spec/unit/test_relation.rb
+- spec/unit/relation/test_relops.rb
+- spec/unit/relation/test_inspect.rb
+- spec/unit/relation/test_coerce.rb
+- spec/unit/reader/input.rb
+- spec/unit/reader/test_rash.rb
+- spec/unit/reader/test_alf_file.rb
+- spec/unit/test_lispy.rb
+- spec/unit/test_aggregator.rb
+- spec/unit/environment/examples/suppliers.rash
+- spec/unit/environment/test_explicit.rb
+- spec/unit/environment/test_folder.rb
+- spec/unit/tools/test_projection_key.rb
+- spec/unit/tools/test_tools.rb
+- spec/unit/tools/test_ordering_key.rb
+- spec/unit/tools/test_tuple_handle.rb
+- spec/unit/test_assumptions.rb
+- spec/unit/renderer/text/test_cell.rb
+- spec/unit/renderer/text/test_table.rb
+- spec/unit/renderer/text/test_row.rb
+- spec/unit/test_renderer.rb
+- spec/unit/operator/test_non_relational.rb
+- spec/unit/operator/relational/test_join.rb
+- spec/unit/operator/relational/test_extend.rb
+- spec/unit/operator/relational/test_intersect.rb
+- spec/unit/operator/relational/test_summarize.rb
+- spec/unit/operator/relational/test_rename.rb
+- spec/unit/operator/relational/join/test_hash_based.rb
+- spec/unit/operator/relational/test_wrap.rb
+- spec/unit/operator/relational/test_restrict.rb
+- spec/unit/operator/relational/test_minus.rb
+- spec/unit/operator/relational/test_quota.rb
+- spec/unit/operator/relational/test_unwrap.rb
+- spec/unit/operator/relational/test_group.rb
+- spec/unit/operator/relational/test_union.rb
+- spec/unit/operator/relational/test_project.rb
+- spec/unit/operator/relational/summarize/test_hash_based.rb
+- spec/unit/operator/relational/summarize/test_sort_based.rb
+- spec/unit/operator/relational/test_ungroup.rb
+- spec/unit/operator/non_relational/test_defaults.rb
+- spec/unit/operator/non_relational/compact/test_sort_based.rb
+- spec/unit/operator/non_relational/compact/buffer_based.rb
+- spec/unit/operator/non_relational/test_sort.rb
+- spec/unit/operator/non_relational/test_clip.rb
+- spec/unit/operator/non_relational/test_autonum.rb
+- spec/unit/operator/non_relational/test_compact.rb
+- spec/unit/operator/test_command_methods.rb
+- spec/unit/operator/test_relational.rb
+- spec/unit/test_reader.rb

data/examples/nest.alf

@@ -1,2 +0,0 @@
-#!/usr/bin/env alf
-(nest :suppliers, [:city, :status], :loc_and_status)

data/examples/unnest.alf

@@ -1,4 +0,0 @@
-#!/usr/bin/env alf 
-(unnest \
-  (nest :suppliers, [:city, :status], :loc_and_status), 
-  :loc_and_status)

data/examples/with.alf

@@ -1,23 +0,0 @@
-#!/usr/bin/env alf
-
-# Compute the total qty supplied in each country together with the subset 
-# of products shipped there. Only consider suppliers that have a status
-# greater than 10, however.
-(summarize \
-  (join \
-    (join (restrict :suppliers, lambda{ status > 10 }), 
-          :supplies), 
-    :cities),
-  [:country],
-  :which => Agg::group(:pid),
-  :total => Agg::sum{ qty })
-
-# Another equivalent way to write it
-with( :kept_suppliers => (restrict :suppliers, lambda{ status > 10 }),
-      :with_countries => (join :kept_suppliers, :cities),
-      :supplying      => (join :with_countries, :supplies) ) do
-  (summarize :supplying,
-             [:country],
-             :which => Agg::group(:pid),
-             :total => Agg::sum{ qty })
-end

data/spec/operator/relational/summarize_spec.rb

@@ -1,41 +0,0 @@
-require 'spec_helper'
-module Alf
-  module Operator::Relational
-    describe Summarize do
-        
-      let(:operator_class){ Summarize }
-      it_should_behave_like("An operator class")
-        
-      let(:input) {[
-        {:a => "via_reader", :time => 2},
-        {:a => "via_method", :time => 1},
-        {:a => "via_method", :time => 2},
-        {:a => "via_reader", :time => 4},
-        {:a => "via_method", :time => 1},
-      ]}
-  
-      let(:expected) {[
-        {:a => "via_method", :time_sum => 4, :time_max => 2},
-        {:a => "via_reader", :time_sum => 6, :time_max => 4},
-      ]}
-  
-      subject{ operator.to_a }
-  
-      describe "When factored with commandline args" do
-        let(:opts){ ["--by=a"] }
-        let(:aggs){ ["time_sum", "sum(:time)", "time_max", "max(:time)"] }
-        let(:operator){ Summarize.run(opts + ["--"] +aggs) }
-        before{ operator.pipe(input) }
-        it { should == expected }
-      end
-  
-      describe "When factored with Lispy" do
-        let(:aggs){{:time_sum => Aggregator.sum(:time),
-                    :time_max => Aggregator.max(:time)}} 
-        let(:operator){ Lispy.summarize(input, [:a], aggs) }
-        it { should == expected }
-      end
-  
-    end 
-  end
-end

data/spec/reader/alf_file_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-module Alf
-  describe Reader::AlfFile do
-    
-    let(:io){ StringIO.new "(restrict :suppliers, lambda{status > 20})" }
-    let(:reader){ Reader::AlfFile.new(io, self) } 
-    def dataset(name)
-      [{:status => 10},{:status => 30}]
-    end
-    
-    subject{ reader.to_a }
-    it{ should == [{:status => 30}]}
-      
-  end
-end