yep_searchable 0.0.4 → 0.0.5

data/lib/yep_searchable/searchable_resource.rb

@@ -182,6 +182,7 @@ module YepSearchable
           end
           
           query_string = ""
+          entity_counter = 0
           
           reflec_keys = self.reflections.keys
           
@@ -193,6 +194,8 @@ module YepSearchable
               
               if ids.nil? or ids.empty?
                 next
+              else
+                entity_counter += 1
               end
                           
               if query_string.empty?
@@ -209,6 +212,12 @@ module YepSearchable
               query_string = "#{query_string})" 
             end
           end
+
+          if entity_counter > 1
+            (entity_counter-1).times do
+              query_string = "#{query_string})"
+            end
+          end
           
           return query_string
           
@@ -225,7 +234,8 @@ module YepSearchable
           end
 
           query_string = ""
-          
+          entity_counter = 0
+
           yep_res.each do |resource|
             if !resource[:class_name].to_s.camelize.constantize.superclass.to_s.eql?"YepSearchable::YepResource"
               raise SearchableError, "Only classes that implement YepResource are allowed"
@@ -235,6 +245,8 @@ module YepSearchable
               
             if ids.nil? or ids.empty?
               next
+            else
+              entity_counter += 1
             end
                         
             if query_string.empty?
@@ -248,10 +260,16 @@ module YepSearchable
             end
             
             query_string = query_string[0, query_string.size - 1]
-            query_string = "#{query_string})" 
+            query_string = "#{query_string})"
             
           end
           
+          if entity_counter > 1
+            (entity_counter -1).times do
+              query_string = "#{query_string})"
+            end
+          end
+          
           return query_string
         end
     end

data/lib/yep_searchable/version.rb

@@ -1,3 +1,3 @@
 module YepSearchable
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yep_searchable
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -68,7 +68,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: YepSearchable-0.0.4
+summary: YepSearchable-0.0.5
 test_files:
 - test/performance/browsing_test.rb
 - test/test_helper.rb