mebla 1.1.5 → 1.1.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mebla (1.1.4)
+    mebla (1.1.5)
       mebla
       mongoid (~> 2.0.1)
       slingshot-rb (= 0.0.8)

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.6

data/lib/mebla/result_set.rb

@@ -20,39 +20,36 @@ module Mebla
       @total = response['hits']['total']       
       
       # Be efficient only query the database once
-      model_ids = {}
+      model_ids = []
       
       # Collect results' ids
       response['hits']['hits'].each do |hit|
         model_class = hit['_type'].camelize.constantize        
-        
+        model_ids << [model_class]
+
         if model_class.embedded?
-          unless model_ids[model_class]
-            model_ids[model_class] = {}
-          end
+          model_class_collection = model_ids.assoc(model_class)
           # collect parent ids
           # {class => {parent_id => [ids]}}
           parent_id = hit['_source']['_parent']
           
-          unless model_ids[model_class][parent_id]
-            model_ids[model_class][parent_id] = []
-          end
+          model_class_collection << [parent_id]
           
-          model_ids[model_class][parent_id].push hit['_source']['id']
+          model_class_collection.assoc(parent_id) << hit['_source']['id']
         else
-          unless model_ids[model_class]
-            model_ids[model_class] = []
-          end
           # collect ids
           # {class => [ids]}
-          model_ids[model_class] << hit['_source']['id']
+          model_ids.assoc(model_class) << hit['_source']['id']
         end
       end
       
       # Cast the results into their appropriate classes
       @entries = []
 
-      model_ids.each_pair do |model_class, ids|          
+      model_ids.each do |model_class_collection|          
+        model_class = model_class_collection.first
+        ids = model_class_collection.drop(1)
+
         unless model_class.embedded?
           # Retrieve the results from the database
           @entries += model_class.any_in(:_id => ids).entries
@@ -61,7 +58,10 @@ module Mebla
           parent_class = model_class.embedded_parent
           access_method = model_class.embedded_as
           
-          ids.each_pair do |parent_id, entries_ids|
+          ids.each do |parent_id_collection|
+            parent_id = parent_id_collection.first
+            entries_ids = parent_id_collection.drop(1)
+            
             parent = parent_class.find parent_id
             
             # Retrieve the results from the database

data/lib/mebla/search.rb

@@ -191,7 +191,7 @@ module Mebla
       # Log search query
       Mebla.log("Searching:\n#{@slingshot_search.to_json.to_s}", :debug)
       response = @slingshot_search.perform.json
-      Mebla.log("Response:\n#{response}", :info)
+      Mebla.log("Response:\n#{response.to_json.to_s}", :info)
       @results = Mebla::ResultSet.new(response)
       # Log results statistics
       Mebla.log("Searched for:\n#{@slingshot_search.to_json.to_s}\ngot #{@results.total} documents in #{@results.time} ms", :debug)

data/mebla.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mebla}
-  s.version = "1.1.5"
+  s.version = "1.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Omar Mekky"]
-  s.date = %q{2011-05-24}
+  s.date = %q{2011-05-25}
   s.description = %q{
     An elasticsearch wrapper for mongoid odm based on slingshot. Makes integration between ElasticSearch full-text 
     search engine and Mongoid documents seemless and simple.
@@ -127,6 +127,16 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mongoid-rspec>, ["= 1.4.1"])
       s.add_development_dependency(%q<database_cleaner>, ["= 0.6.4"])
       s.add_development_dependency(%q<bluecloth>, ["~> 2.1.0"])
+      s.add_development_dependency(%q<bson>, ["~> 1.3.0"])
+      s.add_development_dependency(%q<bson_ext>, ["~> 1.3.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<mongoid-rspec>, ["= 1.4.1"])
+      s.add_development_dependency(%q<database_cleaner>, ["= 0.6.4"])
+      s.add_development_dependency(%q<bluecloth>, ["~> 2.1.0"])
       s.add_runtime_dependency(%q<slingshot-rb>, ["= 0.0.8"])
       s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.1"])
       s.add_development_dependency(%q<bson>, ["~> 1.3.0"])
@@ -187,6 +197,16 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mongoid-rspec>, ["= 1.4.1"])
       s.add_dependency(%q<database_cleaner>, ["= 0.6.4"])
       s.add_dependency(%q<bluecloth>, ["~> 2.1.0"])
+      s.add_dependency(%q<bson>, ["~> 1.3.0"])
+      s.add_dependency(%q<bson_ext>, ["~> 1.3.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<mongoid-rspec>, ["= 1.4.1"])
+      s.add_dependency(%q<database_cleaner>, ["= 0.6.4"])
+      s.add_dependency(%q<bluecloth>, ["~> 2.1.0"])
       s.add_dependency(%q<slingshot-rb>, ["= 0.0.8"])
       s.add_dependency(%q<mongoid>, ["~> 2.0.1"])
       s.add_dependency(%q<bson>, ["~> 1.3.0"])
@@ -248,6 +268,16 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mongoid-rspec>, ["= 1.4.1"])
     s.add_dependency(%q<database_cleaner>, ["= 0.6.4"])
     s.add_dependency(%q<bluecloth>, ["~> 2.1.0"])
+    s.add_dependency(%q<bson>, ["~> 1.3.0"])
+    s.add_dependency(%q<bson_ext>, ["~> 1.3.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<mongoid-rspec>, ["= 1.4.1"])
+    s.add_dependency(%q<database_cleaner>, ["= 0.6.4"])
+    s.add_dependency(%q<bluecloth>, ["~> 2.1.0"])
     s.add_dependency(%q<slingshot-rb>, ["= 0.0.8"])
     s.add_dependency(%q<mongoid>, ["~> 2.0.1"])
     s.add_dependency(%q<bson>, ["~> 1.3.0"])