querybuilder 0.5.9 → 0.7.0

data/test/{query_builder → querybuilder}/custom.yml

@@ -4,50 +4,50 @@ it_should_be_available:
   context:
     custom_query_group: test
   src: "abc"
-  res: "\"SELECT a,34 AS number,c FROM test WHERE 3 AND 2 AND 1 ORDER BY a ASC\""
+  res: "%Q{SELECT a,34 AS number,c FROM test WHERE 3 AND 2 AND 1 ORDER BY a ASC}"
 
 it_should_be_customizable:
   context:
     custom_query_group: test
   src: "foo where name < 50"
-  res: "\"SELECT foo FROM foot WHERE objects.name < 50 ORDER BY f DESC\""
+  res: "%Q{SELECT foo FROM objects WHERE objects.name < 50 ORDER BY f DESC}"
 
 it_should_be_customizable_with_select_attributes:
   context:
     custom_query_group: test
   src: "abc where number < 50"
-  res: "\"SELECT a,34 AS number,c FROM test WHERE (34) < 50 AND 3 AND 2 AND 1 ORDER BY a ASC\""
+  res: "%Q{SELECT a,34 AS number,c FROM test WHERE (34) < 50 AND 3 AND 2 AND 1 ORDER BY a ASC}"
 
 it_should_not_find_queries_not_in_group:
   context:
     custom_query_group: test
   src: "bar"
-  res: "unknown relation 'bar'"
+  res: "Unknown relation 'bar'."
 
 # test2 context (queries = [foo,bar])
 it_should_not_find_queries_not_in_file_named_group:
   context:
     custom_query_group: test2
   src: "abc"
-  res: "unknown relation 'abc'"
+  res: "Unknown relation 'abc'."
 
 it_should_find_queries_in_group_list:
   context:
     custom_query_group: test2
   src: "bar"
-  res: "\"SELECT bar FROM bart\""
+  res: "%Q{SELECT bar FROM bart}"
 
-it_should_use_the_first_table_as_main:
+it_should_not_use_the_first_table_as_main:
   context:
     custom_query_group: test
-  src: "two_table where x = '4' and name like 'B%'"
-  res: "[\"SELECT x,IF(table_one.y,table_one.y,table_two.z) AS y,table_two.name FROM table_one,table_two WHERE (x) = ? AND (table_two.name) LIKE ?\", \"4\", \"B%\"]"
+  src: "two_table where x = '4' and name like 'b%'"
+  res: "%Q{SELECT x AS x,IF(table_one.y,table_one.y,table_two.z) AS y,table_two.name FROM table_one,table_two WHERE (x) = '4' AND table_one.name LIKE 'b%'}"
 
 it_should_use_main_table_as_main:
   context:
     custom_query_group: test
   src: "two_table_main where name = '4'"
-  res: "[\"SELECT x FROM table_one,foo,table_two WHERE foo.name = ?\", \"4\"]"
+  res: "%Q{SELECT x FROM foo,table_one,table_two WHERE foo.name = '4'}"
 
 it_should_limit_the_entries:
   context:
@@ -59,4 +59,4 @@ it_should_paginate_the_entries:
   context:
     custom_query_group: test
   src: "abc limit 4 paginate foo"
-  res: "[\"SELECT a,34 AS number,c FROM test WHERE 3 AND 2 AND 1 ORDER BY a ASC LIMIT 4 OFFSET ?\", ((foo.to_i > 0 ? foo.to_i : 1)-1)*4]"
+  res: "[%Q{SELECT a,34 AS number,c FROM test WHERE 3 AND 2 AND 1 ORDER BY a ASC LIMIT 4 OFFSET ?}, ((foo.to_i > 0 ? foo.to_i : 1)-1)*4]"

data/test/querybuilder/errors.yml

@@ -0,0 +1,32 @@
+bad_relation:
+  src: "bolobolo"
+  res: "Unknown relation 'bolobolo'."
+
+bad_relation_in_alternate_query:
+  src: "(bolobolo) or (letters in project)"
+  res: "Unknown relation 'bolobolo'."
+
+order:
+  src: "objects in project order by bad asc"
+  res: "Unknown field 'bad'."
+
+offset_without_limit:
+  src: "objects in project offset 3"
+  res: "Invalid offset (used without limit)."
+
+legacy_many_clauses:
+  src: letters or foo
+  res: "Unknown relation 'foo'."
+
+bad_equation:
+  src: "objects where event_at > 2006.04.01"
+  res: 'Syntax error near ".04.01".'
+
+bad_plus_plus:
+  src: "objects where 1 + 3 + + 5 > event_at"
+  res: 'Syntax error near " + + 5 > event_at".'
+
+or_clause_with_filter:
+  src: "recipients where name = 'foo' or objects"
+  sxp: '[:query, [:filter, [:relation, "recipients"], [:or, [:"=", [:field, "name"], [:string, "foo"]], [:field, "objects"]]]]'
+  res: "Unknown field 'objects'."

data/test/querybuilder/filters.yml

@@ -0,0 +1,115 @@
+simple:
+  src: "objects where name = 'foo' in site"
+  sxp: '[:query, [:scope, [:filter, [:relation, "objects"], [:"=", [:field, "name"], [:string, "foo"]]], "site"]]'
+  res: "%Q{SELECT objects.* FROM objects WHERE objects.name = 'foo'}"
+
+recipients_where_kpath:
+  src: "recipients where kpath like 'NRCC%'"
+  res: "[%Q{SELECT objects.* FROM links,objects WHERE objects.kpath LIKE 'NRCC%' AND objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?}, id]"
+
+hand_made_class_filter:
+  src: "recipients where kpath like 'NRCC%'"
+  res: "[%Q{SELECT objects.* FROM links,objects WHERE objects.kpath LIKE 'NRCC%' AND objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?}, id]"
+
+better_class_filter:
+  src: "recipients where class = 'Client'"
+  res: "[%Q{SELECT objects.* FROM links,objects WHERE objects.kpath LIKE ? AND objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?}, \"NRCC%\", id]"
+
+like_filter_with_scope:
+  src: "letters where name like 'a%' in site"
+  sxp: '[:query, [:scope, [:filter, [:relation, "letters"], [:like, [:field, "name"], [:string, "a%"]]], "site"]]'
+  res: "%Q{SELECT objects.* FROM objects WHERE objects.name LIKE 'a%' AND objects.kpath LIKE 'NNL%'}"
+
+not_like_with_scope:
+  src: "letters where name not like 'a%' in site"
+  sxp: '[:query, [:scope, [:filter, [:relation, "letters"], [:not, [:like, [:field, "name"], [:string, "a%"]]]], "site"]]'
+  res: "%Q{SELECT objects.* FROM objects WHERE objects.name NOT LIKE 'a%' AND objects.kpath LIKE 'NNL%'}"
+
+letters_group_by_name:
+  sxp: '[:query, [:group, [:relation, "letters"], [:field, "name"]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.kpath LIKE 'NNL%' AND objects.parent_id = ? GROUP BY objects.name}, id]"
+
+recipients_group_by_name:
+  sxp: '[:query, [:group, [:relation, "recipients"], [:field, "name"]]]'
+  res: "[%Q{SELECT objects.* FROM links,objects WHERE objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? GROUP BY objects.name}, id]"
+
+custom_query_having:
+  context:
+    custom_query_group: test
+  src: "abc where number > 12"
+  res: "%Q{SELECT a,34 AS number,c FROM test WHERE (34) > 12 AND 3 AND 2 AND 1 ORDER BY a ASC}"
+
+equation_in_filter:
+  src: "objects where event_at > REF_DATE + custom_a months"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:>, [:field, "event_at"], [:+, [:field, "REF_DATE"], [:interval, [:field, "custom_a"], "month"]]]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.event_at > now() + INTERVAL objects.custom_a MONTH AND objects.parent_id = ?}, id]"
+
+equation_in_filter_using_gt:
+  src: "objects where event_at gt REF_DATE + custom_a months"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:gt, [:field, "event_at"], [:+, [:field, "REF_DATE"], [:interval, [:field, "custom_a"], "month"]]]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.event_at > now() + INTERVAL objects.custom_a MONTH AND objects.parent_id = ?}, id]"
+
+equation_in_filter_using_ge:
+  src: "objects where event_at ge REF_DATE + custom_a months"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:ge, [:field, "event_at"], [:+, [:field, "REF_DATE"], [:interval, [:field, "custom_a"], "month"]]]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.event_at >= now() + INTERVAL objects.custom_a MONTH AND objects.parent_id = ?}, id]"
+
+equation_in_filter_using_eq:
+  src: "objects where event_at eq REF_DATE + custom_a months"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:eq, [:field, "event_at"], [:+, [:field, "REF_DATE"], [:interval, [:field, "custom_a"], "month"]]]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.event_at = now() + INTERVAL objects.custom_a MONTH AND objects.parent_id = ?}, id]"
+
+equation_in_filter_using_le:
+  src: "objects where event_at le REF_DATE + custom_a months"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:le, [:field, "event_at"], [:+, [:field, "REF_DATE"], [:interval, [:field, "custom_a"], "month"]]]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.event_at <= now() + INTERVAL objects.custom_a MONTH AND objects.parent_id = ?}, id]"
+
+equation_in_filter_using_lt:
+  src: "objects where event_at lt REF_DATE + custom_a months"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:lt, [:field, "event_at"], [:+, [:field, "REF_DATE"], [:interval, [:field, "custom_a"], "month"]]]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.event_at < now() + INTERVAL objects.custom_a MONTH AND objects.parent_id = ?}, id]"
+
+equation_in_filter_using_ne:
+  src: "objects where event_at ne REF_DATE + custom_a months"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:ne, [:field, "event_at"], [:+, [:field, "REF_DATE"], [:interval, [:field, "custom_a"], "month"]]]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.event_at <> now() + INTERVAL objects.custom_a MONTH AND objects.parent_id = ?}, id]"
+
+
+equation_with_date_interval:
+  src: "objects where event_at > '2006-04-01' + 6 week"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:>, [:field, "event_at"], [:+, [:string, "2006-04-01"], [:interval, [:integer, "6"], "week"]]]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.event_at > '2006-04-01' + INTERVAL 6 WEEK AND objects.parent_id = ?}, id]"
+
+equation_and_or_par:
+  src: "objects where event_at > '2006-04-01' or name like 'foo%'"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:or, [:>, [:field, "event_at"], [:string, "2006-04-01"]], [:like, [:field, "name"], [:string, "foo%"]]]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE (objects.event_at > '2006-04-01' OR objects.name LIKE 'foo%') AND objects.parent_id = ?}, id]"
+
+equation_par:
+  src: "objects where (1 > 2 or 2 > 3) and 4 = 5 "
+  sxp: '[:query, [:filter, [:relation, "objects"], [:and, [:par, [:or, [:>, [:integer, "1"], [:integer, "2"]], [:>, [:integer, "2"], [:integer, "3"]]]], [:"=", [:integer, "4"], [:integer, "5"]]]]]'
+#  res: "[%Q{SELECT objects.* FROM objects WHERE objects.parent_id = ? AND (1 > 2 OR 2 > 3) AND 4 = 5}, id]"
+
+is_not_null:
+  src: "objects where name is not null"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:is, [:field, "name"], [:raw, "not null"]]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.name IS NOT NULL AND objects.parent_id = ?}, id]"
+
+is_null:
+  src: "objects where name is null"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:is, [:field, "name"], [:raw, "null"]]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.name IS NULL AND objects.parent_id = ?}, id]"
+
+match:
+  src: "objects where fulltext match 'one'"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:match, [:field, "fulltext"], [:string, "one"]]]]'
+
+functions:
+  src: "objects where event_at.year = REF_DATE.year"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:"=", [:function, [:field, "event_at"], [:method, "year"]], [:function, [:field, "REF_DATE"], [:method, "year"]]]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE strftime('%Y',objects.event_at) = strftime('%Y',now()) AND objects.parent_id = ?}, id]"
+
+filter_empty_literal:
+  src: "objects where \"\" = ''"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:"=", [:dstring, ""], [:string, ""]]]]'
+  sql: "SELECT objects.* FROM objects WHERE '' = '' AND objects.parent_id = 123"

data/test/querybuilder/group.yml

@@ -0,0 +1,7 @@
+group_by_function:
+  src: "objects in site group by event_at.year"
+  res: "%Q{SELECT objects.* FROM objects GROUP BY strftime('%Y',objects.event_at)}"
+
+group_and_order:
+  src: "objects in site group by event_at.year order by event_at asc"
+  res: "%Q{SELECT objects.* FROM objects GROUP BY strftime('%Y',objects.event_at) ORDER BY objects.event_at ASC}"

data/test/querybuilder/joins.yml

@@ -0,0 +1,37 @@
+
+icons_from_recipients:
+  sxp: '[:query, [:from, [:relation, "icons"], [:relation, "recipients"]]]'
+  res: "[%Q{SELECT objects.* FROM links,links AS li1,objects,objects AS ob1 WHERE objects.id = li1.source_id AND li1.relation_id = 5 AND li1.target_id = ob1.id AND ob1.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? GROUP BY objects.id}, id]"
+
+icons_from_recipients_from_letters:
+  sxp: '[:query, [:from, [:from, [:relation, "icons"], [:relation, "recipients"]], [:relation, "letters"]]]'
+
+letters_from_recipients:
+  res: "[%Q{SELECT objects.* FROM links,objects,objects AS ob1 WHERE objects.kpath LIKE 'NNL%' AND objects.parent_id = ob1.id AND ob1.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? GROUP BY objects.id}, id]"
+
+objects_from_recipients:
+  res: "[%Q{SELECT objects.* FROM links,objects,objects AS ob1 WHERE objects.parent_id = ob1.id AND ob1.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? GROUP BY objects.id}, id]"
+
+parent_from_parent:
+  sxp: '[:query, [:from, [:relation, "parent"], [:relation, "parent"]]]'
+  res: "[%Q{SELECT objects.* FROM objects,objects AS ob1 WHERE objects.id = ob1.parent_id AND ob1.id = ? GROUP BY objects.id}, parent_id]"
+
+children_from_objects_in_project:
+  res: "[%Q{SELECT objects.* FROM objects,objects AS ob1 WHERE objects.parent_id = ob1.id AND ob1.project_id = ? GROUP BY objects.id}, project_id]"
+  
+tags:
+  sxp: '[:query, [:relation, "tags"]]'
+  res: "%Q{SELECT objects.* FROM objects INNER JOIN tags ON objects.id = tags.node_id}"
+
+complex_from_with_scopes:
+  src: "letters where name = 'foo' in project from letters in section"
+  sxp: '[:query, [:from, [:scope, [:filter, [:relation, "letters"], [:"=", [:field, "name"], [:string, "foo"]]], "project"], [:scope, [:relation, "letters"], "section"]]]'
+  
+letters_in_project_from_letters:
+  sxp: '[:query, [:from, [:scope, [:relation, "letters"], "project"], [:relation, "letters"]]]'
+  res: "[%Q{SELECT objects.* FROM objects,objects AS ob1 WHERE objects.kpath LIKE 'NNL%' AND objects.project_id = ob1.id AND ob1.kpath LIKE 'NNL%' AND ob1.parent_id = ? GROUP BY objects.id}, id]"
+
+letters_in_project_from_letters_group_by:
+  src: "letters in project from letters group by name,id"
+  sxp: '[:query, [:group, [:from, [:scope, [:relation, "letters"], "project"], [:relation, "letters"]], [:field, "name"], [:field, "id"]]]'
+  res: "[%Q{SELECT objects.* FROM objects,objects AS ob1 WHERE objects.kpath LIKE 'NNL%' AND objects.project_id = ob1.id AND ob1.kpath LIKE 'NNL%' AND ob1.parent_id = ? GROUP BY objects.name, objects.id}, id]"

data/test/querybuilder/mixed.yml

@@ -0,0 +1,18 @@
+users_from_objects:
+  sxp: '[:query, [:from, [:relation, "users"], [:relation, "objects"]]]'
+  res: "TestUser: [%Q{SELECT users.* FROM objects AS ob1,users WHERE users.node_id = ob1.id AND ob1.parent_id = ? GROUP BY users.id ORDER BY users.name ASC, users.first_name ASC}, id]"
+
+users_where_name_from_objects:
+  src: "users where name eq 'bob' from objects"
+  res: "TestUser: [%Q{SELECT users.* FROM objects AS ob1,users WHERE users.name = 'bob' AND users.node_id = ob1.id AND ob1.parent_id = ? GROUP BY users.id ORDER BY users.name ASC, users.first_name ASC}, id]"
+  
+objects_from_users_from_objects:
+  src: "objects from users where name = 'foo' from objects where event_at > REF_DATE order by event_at asc"
+  res: "[%Q{SELECT objects.* FROM objects,objects AS ob1,users AS us1 WHERE objects.id = us1.node_id AND us1.name = 'foo' AND us1.node_id = ob1.id AND ob1.event_at > now() AND ob1.parent_id = ? GROUP BY objects.id ORDER BY objects.event_at ASC}, id]"
+
+users:
+  res: "TestUser: [%Q{SELECT users.* FROM users WHERE users.node_id = ? ORDER BY users.name ASC, users.first_name ASC}, id]"
+
+users_with_filter:
+  src: "users where name = 'foo'"
+  res: "TestUser: [%Q{SELECT users.* FROM users WHERE users.name = 'foo' AND users.node_id = ? ORDER BY users.name ASC, users.first_name ASC}, id]"

data/test/querybuilder/rubyless.yml

@@ -0,0 +1,15 @@
+parsing:
+  src: 'objects where name like "#{name}%" or event_at > #{params[:blow]} or name = #{this.is.ruby("with more #{stuff}")}'
+  sxp: '[:query, [:filter, [:relation, "objects"], [:or, [:or, [:like, [:field, "name"], [:dstring, "\#{name}%"]], [:>, [:field, "event_at"], [:rubyless, "params[:blow]"]]], [:"=", [:field, "name"], [:rubyless, "this.is.ruby(\"with more \#{stuff}\")"]]]]]'
+
+dstring_eval:
+  src: 'objects where name like "#{params[:name]}%"'
+  res: '[%Q{SELECT objects.* FROM objects WHERE objects.name LIKE ? AND objects.parent_id = ?}, "#{get_params[:name]}%", id]'
+
+eval:
+  src: 'objects where name = #{params[:name]}'
+  res: '[%Q{SELECT objects.* FROM objects WHERE objects.name = ? AND objects.parent_id = ?}, get_params[:name], id]'
+
+date_function:
+  src: 'objects where name = #{params[:name]}.year'
+  res: "/objects.name = strftime\('%Y',\?\)/"

data/test/querybuilder_test.rb

@@ -0,0 +1,111 @@
+require 'test_helper'
+require 'benchmark'
+
+class StringHash
+end
+
+class DummyQueryBuilder < Test::Unit::TestCase
+  yamltest
+  include RubyLess::SafeClass
+  safe_method :params => {:class => StringHash, :method => 'get_params'}
+  safe_method :id => Number, :parent_id => Number, :project_id => Number
+
+  safe_method_for StringHash, [:[], Symbol] => String
+  safe_method_for StringHash, [:[], String] => String
+
+  def id;         123;  end
+  def parent_id;  333;  end
+  def project_id; 9999; end
+  def connection; self; end
+
+  context 'A query processor' do
+    subject do
+      DummyProcessor
+    end
+
+    should 'raise a QueryBuilder::SyntaxError on syntax errors' do
+      assert_raise(QueryBuilder::SyntaxError) do
+        subject.new('this is a bad source')
+      end
+    end
+
+    should 'return a query object on query' do
+      assert_kind_of QueryBuilder::Query, subject.new('objects').query
+    end
+  end
+  
+  context 'Including QueryBuilder' do
+    context 'in a class' do
+      subject do
+        Class.new do
+          include QueryBuilder
+        end
+      end
+    
+      should 'receive class method query_compiler' do
+        assert_nothing_raised do
+          subject.query_compiler = 'Foo'
+          assert_equal 'Foo', subject.query_compiler
+        end
+      end
+      
+      should 'receive class method query_compiler on sub_class' do
+        sub_class = Class.new(subject)
+        subject.query_compiler = 'Foo'
+        assert_equal 'Foo', subject.query_compiler
+        
+        sub_class.query_compiler = 'Bar'
+        assert_equal 'Bar', sub_class.query_compiler
+        assert_equal 'Foo', subject.query_compiler
+      end
+    end
+  end # Including QueryBuilder
+
+
+  def yt_parse(key, source, opts)
+    opts = {:rubyless_helper => self}.merge(Hash[*(opts.map{|k,v| [k.to_sym, v]}.flatten)])
+
+    case key
+    when 'res'
+
+      begin
+        query = DummyProcessor.new(source, opts).query
+        (query.main_class != DummyClass ? "#{query.main_class}: " : '') + query.to_s
+      rescue QueryBuilder::Error => err
+        err.message
+      end
+    when 'sxp'
+      # s-expression
+      QueryBuilder::Parser.parse(source).inspect
+    when 'sql'
+      DummyProcessor.new(source, opts).query.sql(binding)
+    when 'count'
+      DummyProcessor.new(source, opts).query.to_s(:count)
+    when 'count_sql'
+      DummyProcessor.new(source, opts).query.sql(binding, :count)
+    else
+      "parse not implemented for '#{key}' in querybuilder_test.rb"
+    end
+  end
+=begin
+  def test_benchmark
+    Benchmark.bmbm do |x|
+      ['basic', 'errors', 'filters'].each do |file_name|
+        x.report("#{file_name}:") do
+          @@test_strings[file_name].each do |name, keys|
+            src = keys['src'] || name.gsub('_', ' ')
+            100.times do
+              begin
+                QueryBuilder::Parser.parse(src)
+              rescue QueryBuilder::Error => err
+                #
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+=end
+  yt_make
+end

data/test/test_helper.rb

@@ -1,7 +1,12 @@
+require 'pathname'
+$LOAD_PATH.unshift((Pathname(__FILE__).dirname +  '..' + 'lib').expand_path)
 require 'stringio'
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/QueryBuilder'
-require File.dirname(__FILE__) + '/mock/dummy_query'
-require File.dirname(__FILE__) + '/mock/user_query'
 require 'rubygems'
+require 'querybuilder'
+require 'shoulda'
 require 'yamltest'
+
+require 'mock/dummy_processor'
+require 'mock/user_processor'
+require 'mock/dummy'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 9
-  version: 0.5.9
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +02:00
+date: 2010-05-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: yamltest
+  name: rubyless
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -29,8 +29,34 @@ dependencies:
         - 5
         - 0
         version: 0.5.0
-  type: :development
+  type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: yamltest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  type: :development
+  version_requirements: *id003
 description: |-
   QueryBuilder is an interpreter for the "pseudo sql" language. This language
       can be used for two purposes:
@@ -50,24 +76,42 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
+- lib/extconf.rb
 - lib/query_builder.rb
+- lib/query_builder/error.rb
+- lib/query_builder/info.rb
+- lib/query_builder/parser.rb
+- lib/query_builder/processor.rb
+- lib/query_builder/query.rb
 - lib/querybuilder.rb
+- lib/querybuilder_ext.c
+- lib/querybuilder_ext.rl
+- lib/querybuilder_rb.rb
+- lib/querybuilder_rb.rl
+- lib/querybuilder_syntax.rl
+- old_QueryBuilder.rb
 - querybuilder.gemspec
 - script/console
 - script/destroy
 - script/generate
+- tasks/build.rake
+- test/dummy_test.rb
 - test/mock/custom_queries/test.yml
-- test/mock/dummy_query.rb
+- test/mock/dummy.rb
+- test/mock/dummy_processor.rb
 - test/mock/queries/bar.yml
 - test/mock/queries/foo.yml
-- test/mock/user_query.rb
-- test/query_builder/basic.yml
-- test/query_builder/custom.yml
-- test/query_builder/errors.yml
-- test/query_builder/filters.yml
-- test/query_builder/joins.yml
-- test/query_builder/mixed.yml
-- test/query_builder_test.rb
+- test/mock/user_processor.rb
+- test/query_test.rb
+- test/querybuilder/basic.yml
+- test/querybuilder/custom.yml
+- test/querybuilder/errors.yml
+- test/querybuilder/filters.yml
+- test/querybuilder/group.yml
+- test/querybuilder/joins.yml
+- test/querybuilder/mixed.yml
+- test/querybuilder/rubyless.yml
+- test/querybuilder_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://zenadmin.org/524
@@ -98,9 +142,12 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: QueryBuilder is an interpreter for the "pseudo sql" language
+summary: QueryBuilder is an interpreter for the "pseudo sql" language.
 test_files: 
-- test/mock/dummy_query.rb
-- test/mock/user_query.rb
-- test/query_builder_test.rb
+- test/dummy_test.rb
+- test/mock/dummy.rb
+- test/mock/dummy_processor.rb
+- test/mock/user_processor.rb
+- test/query_test.rb
+- test/querybuilder_test.rb
 - test/test_helper.rb