querybuilder 0.5.7 → 0.5.8

data/.gitignore

@@ -0,0 +1,4 @@
+.*
+pkg
+*.gem
+coverage

data/History.txt

@@ -1,8 +1,15 @@
+== 0.5.8 2010-02-15
+
+* 1 major enhancement
+  * Const_get code was not included in gem
+
 == 0.5.7 2010-02-08
+
 * 1 minor enhancement
   * Fixed class const_get to enable custom queries on classes in modules
 
 == 0.5.6 2009-10-15
+
 * 1 minor enhancement
   * Fixed library name (was not loaded on case sensitive systems)
 

data/Rakefile

@@ -1,27 +1,52 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/query_builder'
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('querybuilder', QueryBuilder::VERSION) do |p|
-  p.developer('Gaspard Bucher', 'gaspard@teti.ch')
-  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.rubyforge_name       = 'querybuilder'
-  p.extra_deps           = [
-    ['yamltest','>= 0.5.0'],
-  ]
-  p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
-  ]
-
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
+require 'pathname'
+$LOAD_PATH.unshift((Pathname(__FILE__).dirname +  'lib').expand_path)
+
+require 'querybuilder'
+require 'rake'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |test|
+  test.libs     << 'lib' << 'test'
+  test.pattern  = 'test/**/**_test.rb'
+  test.verbose  = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test' << 'lib'
+    test.pattern = 'test/**/**_test.rb'
+    test.verbose = true
+    test.rcov_opts = ['-T', '--exclude-only', '"test\/,^\/"']
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install rcov"
+  end
 end
 
-require 'newgem/tasks' # load /tasks/*.rake
-Dir['tasks/**/*.rake'].each { |t| load t }
+task :default => :test
+
+# GEM management
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.version = QueryBuilder::VERSION
+    gemspec.name = "querybuilder"
+    gemspec.summary = %Q{QueryBuilder is an interpreter for the "pseudo sql" language}
+    gemspec.description = %Q{QueryBuilder is an interpreter for the "pseudo sql" language. This language
+    can be used for two purposes:
+
+     1. protect your database from illegal SQL by securing queries
+     2. ease writing complex relational queries by abstracting table internals}
+    gemspec.email = "gaspard@teti.ch"
+    gemspec.homepage = "http://zenadmin.org/524"
+    gemspec.authors = ["Gaspard Bucher"]
+
+    gemspec.add_development_dependency('yamltest', '>= 0.5.0')
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
 
-# TODO - want other tests/tasks run by default? Add them to the list
-# task :default => [:spec, :features]

data/lib/query_builder.rb

@@ -10,7 +10,7 @@ Syntax of a query is "RELATION [where ...|] [in ...|from SUB_QUERY|]".
 =end
 class QueryBuilder
   attr_reader :tables, :where, :errors, :join_tables, :distinct, :final_parser, :page_size
-  VERSION = '0.5.7'
+  VERSION = '0.5.8'
 
   @@main_table = {}
   @@main_class = {}
@@ -70,7 +70,11 @@ class QueryBuilder
             definitions = YAML::load(File.read(File.join(dir,file)))
             custom_query_groups = [definitions.delete('groups') || definitions.delete('group') || custom_query_groups].flatten
             definitions.each do |klass,v|
-              klass = Module.const_get(klass)
+              constant = nil
+              klass.split('::').each do |m|
+                constant = constant ? constant.const_get(m) : Module.const_get(m)
+              end
+              klass = constant
               raise ArgumentError.new("invalid class for CustomQueries (#{klass})") unless klass.ancestors.include?(QueryBuilder)
               @@custom_queries[klass] ||= {}
               custom_query_groups.each do |custom_query_group|
@@ -205,7 +209,11 @@ class QueryBuilder
   # DummyQuery.new("comments from nodes in project").main_class
   # => Comment
   def main_class
-    Module.const_get(@@main_class[self.class])
+    constant = nil
+    @@main_class[self.class].split('::').each do |m|
+      constant = constant ? constant.const_get(m) : Module.const_get(m)
+    end
+    constant
   end
 
   protected

data/querybuilder.gemspec

@@ -0,0 +1,73 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{querybuilder}
+  s.version = "0.5.8"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Gaspard Bucher"]
+  s.date = %q{2010-02-15}
+  s.description = %q{QueryBuilder is an interpreter for the "pseudo sql" language. This language
+    can be used for two purposes:
+
+     1. protect your database from illegal SQL by securing queries
+     2. ease writing complex relational queries by abstracting table internals}
+  s.email = %q{gaspard@teti.ch}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "Manifest.txt",
+     "README.rdoc",
+     "Rakefile",
+     "lib/query_builder.rb",
+     "lib/querybuilder.rb",
+     "querybuilder.gemspec",
+     "script/console",
+     "script/destroy",
+     "script/generate",
+     "test/mock/custom_queries/test.yml",
+     "test/mock/dummy_query.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/test_helper.rb"
+  ]
+  s.homepage = %q{http://zenadmin.org/524}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{QueryBuilder is an interpreter for the "pseudo sql" language}
+  s.test_files = [
+    "test/mock/dummy_query.rb",
+     "test/mock/user_query.rb",
+     "test/query_builder_test.rb",
+     "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<yamltest>, [">= 0.5.0"])
+    else
+      s.add_dependency(%q<yamltest>, [">= 0.5.0"])
+    end
+  else
+    s.add_dependency(%q<yamltest>, [">= 0.5.0"])
+  end
+end
+

data/test/mock/queries/bar.yml

@@ -0,0 +1,8 @@
+group: test2
+
+DummyQuery:
+  bar:
+    select:
+      - bar
+    tables:
+      - bart

data/test/mock/queries/foo.yml

@@ -0,0 +1,11 @@
+groups:
+  - test
+  - test2
+
+DummyQuery:
+  foo:
+    select:
+      - foo
+    tables:
+      - foot
+    order: f DESC

data/test/query_builder/custom.yml

@@ -0,0 +1,62 @@
+# test2 context (queries = [abc,foo])
+
+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\""
+
+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\""
+
+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\""
+
+it_should_not_find_queries_not_in_group:
+  context:
+    custom_query_group: test
+  src: "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'"
+
+it_should_find_queries_in_group_list:
+  context:
+    custom_query_group: test2
+  src: "bar"
+  res: "\"SELECT bar FROM bart\""
+
+it_should_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%\"]"
+
+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\"]"
+
+it_should_limit_the_entries:
+  context:
+    custom_query_group: test
+  src: "abc limit 4"
+  res: "/LIMIT 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]"

data/test/{test_QueryBuilder.rb → query_builder_test.rb}

@@ -1,19 +1,19 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 
-class DummyQueryBuilder < Test::Unit::TestCase
+class QueryBuilderTest < Test::Unit::TestCase
   yamltest
-  
+
   def id;         123;  end
   def parent_id;  333;  end
   def project_id; 9999; end
   def connection; self; end
-  
-  
+
+
   def yt_parse(key, source, opts)
     opts = Hash[*(opts.map{|k,v| [k.to_sym, v]}.flatten)]
     query = DummyQuery.new(source, opts)
-    
+
     case key
     when 'res'
       (query.main_class != DummyQueryClass ? "#{query.main_class.to_s}: " : '') + if res = query.to_s
@@ -31,6 +31,6 @@ class DummyQueryBuilder < Test::Unit::TestCase
       "parse not implemented for '#{key}' in query_builder_test.rb"
     end
   end
-  
+
   yt_make
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: querybuilder
 version: !ruby/object:Gem::Version 
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -9,83 +9,64 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 +01:00
+date: 2010-02-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yamltest
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.5.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 0.5.0
     version: 
 description: |-
   QueryBuilder is an interpreter for the "pseudo sql" language. This language
-  can be used for two purposes:
+      can be used for two purposes:
   
-   1. protect your database from illegal SQL by securing queries
-   2. ease writing complex relational queries by abstracting table internals
-email: 
-- gaspard@teti.ch
+       1. protect your database from illegal SQL by securing queries
+       2. ease writing complex relational queries by abstracting table internals
+email: gaspard@teti.ch
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
 - README.rdoc
 files: 
+- .gitignore
 - History.txt
 - Manifest.txt
 - README.rdoc
 - Rakefile
 - lib/query_builder.rb
 - lib/querybuilder.rb
+- querybuilder.gemspec
 - script/console
 - script/destroy
 - script/generate
 - test/mock/custom_queries/test.yml
 - test/mock/dummy_query.rb
+- test/mock/queries/bar.yml
+- test/mock/queries/foo.yml
 - test/mock/user_query.rb
-- test/QueryBuilder/basic.yml
-- test/QueryBuilder/errors.yml
-- test/QueryBuilder/filters.yml
-- test/QueryBuilder/joins.yml
-- test/QueryBuilder/mixed.yml
+- 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/test_helper.rb
-- test/test_QueryBuilder.rb
 has_rdoc: true
-homepage: http://github.com/zena/querybuilder/tree/master
+homepage: http://zenadmin.org/524
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -102,11 +83,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: querybuilder
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 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/test_helper.rb
-- test/test_QueryBuilder.rb