mongoid-elasticsearch 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 778c020401189d11719f94b9d46b3d4d305ceeb3
-  data.tar.gz: 88f8399a9fae8b0bc47107f8280bf6c0699713cf
+  metadata.gz: 1b17ce3ea177fb613d714d573fc83a015970df61
+  data.tar.gz: 2cfef5f383d8b64631d068f8bc2f40823957eeb6
 SHA512:
-  metadata.gz: e8083b417fcdac2cafc359e88fa4e87acd36b2fa3960da43b30a2d50901c5f63fd3234e9d2b049f0fc3fb7559756bec38c8201441f29f2f88485fe919dad4da5
-  data.tar.gz: bddf389a060fc7e46ace9946b04164a8c6e83c9faa410f2f8f4907aeec9dd1e9ebdb2109cb7957f88cf6d5ab1ab6c93950997c1c6cd22527c142d4270aa05ed7
+  metadata.gz: ca428b09d8d6821360b3bd47f506fa09f52988d64231a86c2d925a6b2702d3da42ede2862bc78d6f3b2df550a2fe28f72db1e7f3f293241ee10e1966f3cb117c
+  data.tar.gz: 26f366aef339cd4a7d55823beb6090128c25d86f9028758400c85251121a3eea5442b486d3e7f490dcc44b2095913dfb314892d37efb4a7720cf827c37dd117b

data/lib/mongoid/elasticsearch/response.rb

@@ -148,6 +148,11 @@ module Mongoid
         hits.map do |h|
           klass = find_klass(h['_type'])
           source = h.delete('_source')
+          source.each do |k,v|
+            if v.is_a?(Hash) && v.has_key?("$oid")
+              source[k] = BSON::ObjectId.from_string(v["$oid"])
+            end
+          end
           begin
             m = klass.new(h.merge(source))
           rescue Mongoid::Errors::UnknownAttribute

data/lib/mongoid/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Elasticsearch
-    VERSION = "0.3.8"
+    VERSION = "0.3.9"
   end
 end

data/spec/models/post.rb

@@ -4,10 +4,12 @@ class Post
   field :name, type: String
   field :content, type: String
 
+  field :my_object_id, type: BSON::ObjectId
+
   include Mongoid::Elasticsearch
   elasticsearch!
   def as_indexed_json
-    {name: name, content: content}
+    {name: name, content: content, my_object_id: my_object_id}
   end
 end
 

data/spec/mongoid_elasticsearch_spec.rb

@@ -44,7 +44,9 @@ describe Article do
       @article_1 = Article.create!(name: 'test article name likes', tags: 'likely')
       @article_2 = Article.create!(name: 'tests likely an another article title')
       @article_3 = Article.create!(name: 'a strange name for this stuff')
+      @post_1 = Post.create!(name: 'object_id', my_object_id: BSON::ObjectId.new)
       Article.es.index.refresh
+      Post.es.index.refresh
     end
 
     it 'searches and returns models' do
@@ -72,6 +74,12 @@ describe Article do
       expect(Article).to_not have_received(:find)
     end
 
+    it 'restores BSON::ObjectId with wrapper :model' do
+      results = Post.es.search 'object_id'
+      results.first.my_object_id.should be_kind_of(BSON::ObjectId)
+      results.first.my_object_id.should eq(@post_1.my_object_id)
+    end
+
 
     if Article.es.completion_supported?
       it 'completion' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid