querybuilder 0.8.1 → 0.8.2

data/History.txt

@@ -1,3 +1,8 @@
+== 0.8.2 2010-08-30
+
+* 1 Major enhancement
+  * Added the possibility to overwrite defaults for a single query
+
 == 0.8.1 2010-08-30
 
 * 1 Major bug fix

data/lib/query_builder/info.rb

@@ -1,3 +1,3 @@
 module QueryBuilder
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/lib/query_builder/processor.rb

@@ -128,6 +128,7 @@ module QueryBuilder
     }
 
     def initialize(source, opts = {})
+      @default = opts.delete(:default) || {}
       @opts = opts
       @rubyless_helper = @opts[:rubyless_helper]
       if source.kind_of?(Processor)
@@ -187,8 +188,8 @@ module QueryBuilder
         @this = processor
       end
 
-      def default
-        self.class.defaults
+      def default(key)
+        @default[key] || self.class.defaults[key]
       end
 
       def process(sxp)
@@ -287,7 +288,7 @@ module QueryBuilder
       # [letters from friends] or [images in project]
       def process_query(args)
         this.process(args)
-        if @query.order.nil? && order = this.default[:order]
+        if @query.order.nil? && order = this.default(:order)
           sxp = Parser.parse("foo order by #{order}")
           order = sxp[1]
           order[1] = [:void] # replace [:relation, "foo"] by [:void]
@@ -732,7 +733,7 @@ module QueryBuilder
             context[:scope_type] = nil
             # post scope
             @query.add_table(use_name, table_name, avoid_alias)
-            apply_scope(context[:scope] || default[:scope])
+            apply_scope(context[:scope] || default(:scope))
           else
             # scope already applied / skip
             @query.add_table(use_name, table_name, avoid_alias)

data/querybuilder.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{querybuilder}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]

data/test/mock/user_processor.rb

@@ -14,7 +14,7 @@ class UserProcessor < QueryBuilder::Processor
   def process_relation(relation)
     case relation
     when 'objects'
-      this.apply_scope(default[:scope]) if context[:last]
+      this.apply_scope(default(:scope)) if context[:last]
       add_table('objects')
       @query.add_filter "#{table('objects')}.id = #{field_or_attr('node_id')}"
       change_processor 'DummyProcessor'

data/test/querybuilder_test.rb

@@ -32,8 +32,14 @@ class DummyQueryBuilder < Test::Unit::TestCase
     should 'return a query object on query' do
       assert_kind_of QueryBuilder::Query, subject.new('objects').query
     end
+
+    should 'overwrite defaults' do
+      assert_equal '%Q{SELECT objects.* FROM objects}', subject.new('objects', :default => {:scope => 'site'}).query.to_s
+      assert_equal '[%Q{SELECT objects.* FROM objects WHERE objects.project_id = ?}, project_id]', subject.new('objects', :default => {:scope => 'project'}).query.to_s
+      assert_equal '[%Q{SELECT objects.* FROM objects WHERE objects.parent_id = ?}, id]', subject.new('objects').query.to_s
+    end
   end
-  
+
   context 'Including QueryBuilder' do
     context 'in a class' do
       subject do
@@ -41,19 +47,19 @@ class DummyQueryBuilder < Test::Unit::TestCase
           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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Gaspard Bucher