cowtech-rails 2.7.0.0 → 2.7.1.0

data/app/helpers/cowtech/ruby_on_rails/helpers/mongoid_crud_helper.rb

@@ -122,21 +122,25 @@ module Cowtech
             expr = self.mongo_parse_search(search_query)
 
             # Build the query
+						or_query = []
             (args[:fields] || []).each do |field|
-              @mongo_query = @mongo_query.any_of(field.to_sym => Regexp.new(expr, Regexp::EXTENDED | Regexp::MULTILINE | Regexp::IGNORECASE))
+              or_query << {field.to_sym => Regexp.new(expr, Regexp::EXTENDED | Regexp::MULTILINE | Regexp::IGNORECASE)}
             end
 
             # Now add external fields
             # TODO: Can we enhance this?
             (args[:external] || []).each do |external|
               external_query = external[:class].not_deleted
+							eor_query = []
               (external[:fields] || []).each do |field|
-                external_query = external_query.any_of(field.to_sym => Regexp.new(expr, Regexp::EXTENDED | Regexp::MULTILINE | Regexp::IGNORECASE))
+                eor_query << {field.to_sym => Regexp.new(expr, Regexp::EXTENDED | Regexp::MULTILINE | Regexp::IGNORECASE)}
               end
 
-              ids = external_query.only(:id).all.collect {|r| r.id }
-              @mongo_query = @mongo_query.any_of(:cliente_id.in => ids) if ids.count > 0
+              ids = external_query.any_of(eor_query).only(:id).all.collect {|r| r.id }
+              or_query << {external[:foreign_key].in => ids} if ids.count > 0
             end    
+
+						@mongo_query = @mongo_query.any_of(or_query)						
           end
 
           @mongo_query

data/lib/cowtech/version.rb

@@ -9,7 +9,7 @@ module Cowtech
     module Version
       MAJOR = 2
       MINOR = 7
-      PATCH = 0
+      PATCH = 1
       BUILD = 0
 
       STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cowtech-rails
 version: !ruby/object:Gem::Version
-  version: 2.7.0.0
+  version: 2.7.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000Z
+date: 2012-01-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cowtech-extensions
-  requirement: &70308162700160 !ruby/object:Gem::Requirement
+  requirement: &70220120113560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308162700160
+  version_requirements: *70220120113560
 description: A general purpose Rails utility plugin.
 email: shogun_panda@me.com
 executables: []