querybuilder 1.2.1 → 1.2.2

data/lib/querybuilder_syntax.rl

@@ -40,9 +40,9 @@
 
   scope    = ws+ 'in' ws var %scope;
 
-  offset   = ws+ 'offset' %offset integer;
+  offset   = ws+ 'offset' %offset literal;
   paginate = ws+ 'paginate' %paginate var %param;
-  limit    = ws+ 'limit' %limit integer (ws* ',' integer)?;
+  limit    = ws+ 'limit' %limit literal (ws* ',' literal)?;
   direction= ws+ ('asc' | 'desc' | 'ASC' | 'DESC') $str_a %direction;
   order    = ws+ 'order' ws+ 'by' %order field (direction)? (ws* ',' field (direction)?)*;
   group    = ws+ 'group'  ws+ 'by' %group field (ws* ',' field)*;

data/querybuilder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{querybuilder}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2013-03-11}
+  s.date = %q{2013-05-07}
   s.description = %q{QueryBuilder is an interpreter for the "pseudo sql" language. This language
     can be used for two purposes:
 

data/test/querybuilder/basic.yml

@@ -53,6 +53,11 @@ limit_with_order:
   src: "objects in project order by name desc limit 10"
   res: "[%Q{SELECT objects.* FROM objects WHERE objects.project_id = ? ORDER BY objects.name DESC LIMIT 10}, project_id]"
 
+limit_dyn:
+  src: "objects in project limit #{num || 10}"
+  sxp: '[:query, [:limit, [:scope, [:relation, "objects"], "project"], [:rubyless, "num || 10"]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.project_id = ? LIMIT ?}, project_id, (num or 10)]"
+
 offset_in_limit:
   src: "objects in project limit 3,2"
   res: "[%Q{SELECT objects.* FROM objects WHERE objects.project_id = ? LIMIT 2 OFFSET 3}, project_id]"
@@ -62,6 +67,16 @@ offset:
   sxp: '[:query, [:offset, [:limit, [:scope, [:relation, "objects"], "project"], [:integer, "2"]], [:integer, "3"]]]'
   res: "[%Q{SELECT objects.* FROM objects WHERE objects.project_id = ? LIMIT 2 OFFSET 3}, project_id]"
 
+offset_dyn:
+  src: "objects in project limit 2 offset #{num || 0}"
+  sxp: '[:query, [:offset, [:limit, [:scope, [:relation, "objects"], "project"], [:integer, "2"]], [:rubyless, "num || 0"]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.project_id = ? LIMIT 2 OFFSET ?}, project_id, (num or 0)]"
+
+limit_offset_dyn:
+  src: "objects in project limit #{num || 10}, #{num || 0}"
+  sxp: '[:query, [:limit, [:scope, [:relation, "objects"], "project"], [:rubyless, "num || 10"], [:rubyless, "num || 0"]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.project_id = ? LIMIT ? OFFSET ?}, project_id, (num or 0), (num or 10)]"
+  
 paginate:
   src: "objects in site limit 2 paginate p"
   sxp: '[:query, [:paginate, [:limit, [:scope, [:relation, "objects"], "site"], [:integer, "2"]], [:param, "p"]]]'

data/test/querybuilder/errors.yml

@@ -49,4 +49,13 @@ bad_select:
 
 bad_having:
   src: "letters select name as fname having foo = 'foo'"
-  res: "Unknown field 'foo'."
+  res: "Unknown field 'foo'."
+
+offset_dyn_nil:
+  src: "objects in project limit 2 offset #{num}"
+  sxp: '[:query, [:offset, [:limit, [:scope, [:relation, "objects"], "project"], [:integer, "2"]], [:rubyless, "num"]]]'
+  res: "Invalid offset (value could be nil)"
+
+paginate_dyn_limit:
+  src: "objects in project limit #{num} paginate p"
+  res: "Limit value must be a fixed number to use pagination."

data/test/querybuilder_test.rb

@@ -9,11 +9,13 @@ class DummyQueryBuilder < Test::Unit::TestCase
   include RubyLess::SafeClass
   safe_method :params => {:class => StringHash, :method => 'get_params'}
   safe_method :id => Number, :parent_id => Number, :project_id => Number
+  safe_method :num => {:class => Number, :nil => true}
 
   safe_method_for StringHash, [:[], Symbol] => String
   safe_method_for StringHash, [:[], String] => String
 
   def id;         123;  end
+  def num;          2;  end
   def parent_id;  333;  end
   def project_id; 9999; end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: querybuilder
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-11 00:00:00 +01:00
+date: 2013-05-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency