mongoid-elasticsearch 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db302ae88bbc75a63351caed73d74ee3e42ef460
-  data.tar.gz: 43dec6e93640ff4fb445f27207cdb9c811a71652
+  metadata.gz: 1f0c6eaa6812978af90ec347086edbcc03e71d8d
+  data.tar.gz: 9d8f30124b7a438dfab87a4e605f5c288050e466
 SHA512:
-  metadata.gz: 95acd9cd4b2ee4fb6a6110caadc49d5ff2a4602becfe663da3215027f3f0831ff0efa63760d25e66e63af1634d423abd31d062f98fa5ca527f6d03810c583f3b
-  data.tar.gz: 10ec98c4e4568bb234cb7ceb9087972e5379cede3901f5552b1d9e085c8eba7c426f983ff1e88286abcfec12e2df2cbc684c7865fd1cebddbe7a3f7f27fb9aa8
+  metadata.gz: 2f403b7966a91e238c8cdd7e4d3b990d5a5344f5cf60a51bf76178ed06cd75f998cb96efc5850a5a834c8e6a012709b52f40dd8df7cf7588daa039d4b1c799c9
+  data.tar.gz: 9396e8ac12fb662c50cc3e159d957a862952635747a9946c1fce4dc054eee67b491b067f7ff3ebb6f79e4a02d6f6c9cf175677aa1a4a98a303600ec0153589d4

data/.travis.yml

@@ -9,9 +9,12 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-19mode
+  - jruby-20mode
 
 gemfile:
   - Gemfile
+  - gemfiles/mongoid3.gemfile
   - gemfiles/es-git.gemfile
   - gemfiles/es-0.4.1.gemfile

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in mongoid_rating.gemspec
+# Specify your gem's dependencies in mongoid-elasticsearch.gemspec
 
 gemspec

data/gemfiles/mongoid3.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "mongoid", '~> 3.1.0'
+gem 'elasticsearch'
+gem 'mongoid_slug'
+
+gemspec path: "../"

data/lib/mongoid/elasticsearch/response.rb

@@ -61,7 +61,11 @@ module Mongoid
             hits.map do |h|
               s = h.delete('_source')
               m = Hashie::Mash.new(h.merge(s))
-              m.id = BSON::ObjectId.from_string(h['_id'])
+              if defined?(Moped::BSON)
+                m.id = Moped::BSON::ObjectId.from_string(h['_id'])
+              else
+                m.id = BSON::ObjectId.from_string(h['_id'])
+              end
               m._id = m.id
               m
             end
@@ -148,13 +152,26 @@ 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"])
+          if defined?(Moped::BSON)
+            source.each do |k,v|
+              if v.is_a?(Hash) && v.has_key?("$oid")
+                source[k] = Moped::BSON::ObjectId.from_string(v["$oid"])
+              end
+            end
+          else
+            source.each do |k,v|
+              if v.is_a?(Hash) && v.has_key?("$oid")
+                source[k] = BSON::ObjectId.from_string(v["$oid"])
+              end
             end
           end
           begin
             m = klass.new(h.merge(source))
+            if defined?(Moped::BSON)
+              m.id = Moped::BSON::ObjectId.from_string(h['_id'])
+            else
+              m.id = BSON::ObjectId.from_string(h['_id'])
+            end
           rescue Mongoid::Errors::UnknownAttribute
             klass.class_eval <<-RUBY, __FILE__, __LINE__+1
               attr_accessor :_type, :_score, :_source

data/lib/mongoid/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Elasticsearch
-    VERSION = "0.4.3"
+    VERSION = "0.5.0"
   end
 end

data/mongoid-elasticsearch.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mongoid", "~> 4.0.0.alpha1"
+  spec.add_dependency "mongoid", [">= 3.0", "< 4.1"]
   spec.add_dependency "elasticsearch", "~> 0.4.1"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "kaminari"

data/spec/models/article.rb

@@ -1,7 +1,7 @@
 class Article
   include Mongoid::Document
   include Mongoid::Timestamps::Short
-  include ActiveModel::ForbiddenAttributesProtection
+  #include ActiveModel::ForbiddenAttributesProtection
 
   field :name
 

data/spec/models/namespaced.rb

@@ -2,7 +2,7 @@ module Namespaced
   class Model
     include Mongoid::Document
     include Mongoid::Timestamps::Short
-    include ActiveModel::ForbiddenAttributesProtection
+    #include ActiveModel::ForbiddenAttributesProtection
 
     field :name
 

data/spec/models/post.rb

@@ -3,8 +3,13 @@ class Post
 
   field :name, type: String
   field :content, type: String
-
-  field :my_object_id, type: BSON::ObjectId
+  
+  if defined?(Moped::BSON)
+    field :my_object_id, type: Moped::BSON::ObjectId
+  else
+    field :my_object_id, type: BSON::ObjectId
+  end
+  
 
   include Mongoid::Elasticsearch
   elasticsearch!

data/spec/mongoid_elasticsearch_spec.rb

@@ -44,7 +44,14 @@ 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)
+      
+      if defined?(Moped::BSON)
+        @post_1 = Post.create!(name: 'object_id', my_object_id: Moped::BSON::ObjectId.new)
+      else
+        @post_1 = Post.create!(name: 'object_id', my_object_id: BSON::ObjectId.new)
+      end
+      
+      
       Article.es.index.refresh
       Post.es.index.refresh
     end
@@ -76,7 +83,12 @@ describe Article do
 
     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)
+      if defined?(Moped::BSON)
+        results.first.my_object_id.should be_kind_of(Moped::BSON::ObjectId)
+      else
+        results.first.my_object_id.should be_kind_of(BSON::ObjectId)
+      end
+      
       results.first.my_object_id.should eq(@post_1.my_object_id)
     end
 
@@ -254,6 +266,10 @@ describe "Multisearch" do
 
   it 'works' do
     response = Mongoid::Elasticsearch.search 'test'
+    #p response
+    #pp response.results
+    #pp response.raw_response
+    #pp @article_1
     response.length.should eq 4
     response.to_a.map(&:class).map(&:name).uniq.sort.should eq ['Article', 'Namespaced::Model', 'Post']
     response.select { |r| r.class == Article && r.id == @article_1.id }.first.should_not be_nil

data/spec/spec_helper.rb

@@ -22,6 +22,7 @@ require "database_cleaner"
 require "mongoid-elasticsearch"
 
 Mongoid::Elasticsearch.prefix = "mongoid_es_test_"
+I18n.enforce_available_locales = true
 
 Dir["#{MODELS}/*.rb"].each { |f| require f }
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <
       - !ruby/object:Gem::Version
-        version: 4.0.0.alpha1
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <
       - !ruby/object:Gem::Version
-        version: 4.0.0.alpha1
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +48,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +175,7 @@ files:
 - Rakefile
 - gemfiles/es-0.4.1.gemfile
 - gemfiles/es-git.gemfile
+- gemfiles/mongoid3.gemfile
 - lib/mongoid-elasticsearch.rb
 - lib/mongoid/elasticsearch.rb
 - lib/mongoid/elasticsearch/callbacks.rb
@@ -207,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Simple and easy integration of mongoid with the new elasticsearch gem