querybuilder 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.1
+
+* Minor enhancements
+  * Added support for 'all' group in custom queries.
+
 == 1.0.0 2011-05-10
 
 * Major enhancements

data/lib/query_builder/info.rb

@@ -1,3 +1,3 @@
 module QueryBuilder
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/query_builder/processor.rb

@@ -76,7 +76,7 @@ module QueryBuilder
       def load_custom_queries!
         return unless list = self.custom_query_files
         klass = nil
-        self.custom_queries ||= {}
+        self.custom_queries ||= {'all' => {}}
         Dir.glob(list.flatten).each do |dir|
           if File.directory?(dir)
             Dir.foreach(dir) do |file|
@@ -708,19 +708,19 @@ module QueryBuilder
       def custom_query_without_loading(relation)
         return false unless first? && last?  # current safety net until "from" is correctly implemented and tested
 
-        custom_queries = self.class.custom_queries
-        if custom_queries &&
-           custom_queries[@opts[:custom_query_group]] &&
-           custom_query = custom_queries[@opts[:custom_query_group]][relation.singularize]
-
-          custom_query.each do |k,v|
-            @query.send(:instance_variable_set, "@#{k}", prepare_custom_query_arguments(k.to_sym, v))
+        if custom_queries = self.class.custom_queries
+          queries = custom_queries[@opts[:custom_query_group]] || {}
+          rel     = relation.singularize
+          if custom_query = queries[rel] || custom_queries['all'][rel]
+            custom_query.each do |k,v|
+              @query.send(:instance_variable_set, "@#{k}", prepare_custom_query_arguments(k.to_sym, v))
+            end
+            # rebuild table alias
+            @query.rebuild_tables!
+            # rebuild 'select' aliases
+            @query.rebuild_attributes_hash!
+            true
           end
-          # rebuild table alias
-          @query.rebuild_tables!
-          # rebuild 'select' aliases
-          @query.rebuild_attributes_hash!
-          true
         end
       end
 

data/querybuilder.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: querybuilder
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 +02:00
+date: 2011-07-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency