mebla 1.1.11 → 1.1.12

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-1.1.11
+1.1.12

data/lib/mebla/result_set.rb

@@ -30,7 +30,7 @@ module Mebla
         if model_class.embedded?
           model_class_collection = model_ids.assoc(model_class)
           # collect parent ids
-          # {class => {parent_id => [ids]}}
+          # [class, [parent_id, ids]]
           parent_id = hit['_source']['_parent']
           
           model_class_collection << [parent_id]
@@ -38,7 +38,7 @@ module Mebla
           model_class_collection.assoc(parent_id) << hit['_source']['id']
         else
           # collect ids
-          # {class => [ids]}
+          # [class, ids]
           model_ids.assoc(model_class) << hit['_source']['id']
         end
       end
@@ -52,7 +52,9 @@ module Mebla
 
         unless model_class.embedded?
           # Retrieve the results from the database
-          @entries += model_class.any_in(:_id => ids).entries
+          ids.each do |id|
+            @entries << model_class.find(id)
+          end
         else
           # Get the parent
           parent_class = model_class.embedded_parent
@@ -65,7 +67,9 @@ module Mebla
             parent = parent_class.find parent_id
             
             # Retrieve the results from the database
-            @entries += parent.send(access_method.to_sym).any_in(:_id => entries_ids).entries
+            entries_ids.each do |entry_id|
+              @entries << parent.send(access_method.to_sym).find(entry_id)
+            end
           end
         end
       end

data/mebla.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mebla}
-  s.version = "1.1.11"
+  s.version = "1.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Omar Mekky"]
-  s.date = %q{2011-06-23}
+  s.date = %q{2011-07-07}
   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.
@@ -207,6 +207,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"])
@@ -347,6 +357,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"])
@@ -488,6 +508,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"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mebla
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 1
-  - 11
-  version: 1.1.11
+  - 12
+  version: 1.1.12
 platform: ruby
 authors: 
 - Omar Mekky
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 +02:00
+date: 2011-07-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -2024,8 +2024,166 @@ dependencies:
   version_requirements: *id127
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :runtime
+  type: :development
   requirement: &id128 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  name: bson
+  version_requirements: *id128
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id129 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  name: bson_ext
+  version_requirements: *id129
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id130 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  name: rspec
+  version_requirements: *id130
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id131 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  name: yard
+  version_requirements: *id131
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id132 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  name: bundler
+  version_requirements: *id132
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id133 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
+  name: jeweler
+  version_requirements: *id133
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id134 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rcov
+  version_requirements: *id134
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id135 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 4
+        - 1
+        version: 1.4.1
+  name: mongoid-rspec
+  version_requirements: *id135
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id136 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 6
+        - 4
+        version: 0.6.4
+  name: database_cleaner
+  version_requirements: *id136
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id137 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
+  name: bluecloth
+  version_requirements: *id137
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  requirement: &id138 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -2037,11 +2195,11 @@ dependencies:
         - 8
         version: 0.0.8
   name: slingshot-rb
-  version_requirements: *id128
+  version_requirements: *id138
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  requirement: &id129 !ruby/object:Gem::Requirement 
+  requirement: &id139 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -2053,11 +2211,11 @@ dependencies:
         - 1
         version: 2.0.1
   name: mongoid
-  version_requirements: *id129
+  version_requirements: *id139
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id130 !ruby/object:Gem::Requirement 
+  requirement: &id140 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -2069,11 +2227,11 @@ dependencies:
         - 0
         version: 1.3.0
   name: bson
-  version_requirements: *id130
+  version_requirements: *id140
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id131 !ruby/object:Gem::Requirement 
+  requirement: &id141 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -2085,11 +2243,11 @@ dependencies:
         - 0
         version: 1.3.0
   name: bson_ext
-  version_requirements: *id131
+  version_requirements: *id141
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id132 !ruby/object:Gem::Requirement 
+  requirement: &id142 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -2101,11 +2259,11 @@ dependencies:
         - 0
         version: 2.3.0
   name: rspec
-  version_requirements: *id132
+  version_requirements: *id142
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id133 !ruby/object:Gem::Requirement 
+  requirement: &id143 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -2117,11 +2275,11 @@ dependencies:
         - 0
         version: 0.6.0
   name: yard
-  version_requirements: *id133
+  version_requirements: *id143
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id134 !ruby/object:Gem::Requirement 
+  requirement: &id144 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -2133,11 +2291,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  version_requirements: *id134
+  version_requirements: *id144
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id135 !ruby/object:Gem::Requirement 
+  requirement: &id145 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -2149,11 +2307,11 @@ dependencies:
         - 2
         version: 1.5.2
   name: jeweler
-  version_requirements: *id135
+  version_requirements: *id145
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id136 !ruby/object:Gem::Requirement 
+  requirement: &id146 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -2163,11 +2321,11 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  version_requirements: *id136
+  version_requirements: *id146
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id137 !ruby/object:Gem::Requirement 
+  requirement: &id147 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -2179,11 +2337,11 @@ dependencies:
         - 1
         version: 1.4.1
   name: mongoid-rspec
-  version_requirements: *id137
+  version_requirements: *id147
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id138 !ruby/object:Gem::Requirement 
+  requirement: &id148 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -2195,11 +2353,11 @@ dependencies:
         - 4
         version: 0.6.4
   name: database_cleaner
-  version_requirements: *id138
+  version_requirements: *id148
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id139 !ruby/object:Gem::Requirement 
+  requirement: &id149 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -2211,7 +2369,7 @@ dependencies:
         - 0
         version: 2.1.0
   name: bluecloth
-  version_requirements: *id139
+  version_requirements: *id149
 description: "\n    An elasticsearch wrapper for mongoid odm based on slingshot. Makes integration between ElasticSearch full-text \n    search engine and Mongoid documents seemless and simple.\n  "
 email: omar.mekky@mashsolvents.com
 executables: []