mongoid-elasticsearch 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4677ca4d511880593ad4caaa3db6a94d7b94eb8
-  data.tar.gz: ce66a3fd85bf6b7ac28049076071fed86fbd935e
+  metadata.gz: fc7964bb909dec223e809ac38cdb534018ff9938
+  data.tar.gz: b3aaa57c0651bd32ab4af8968160c1f8834bef41
 SHA512:
-  metadata.gz: 2d49b4a4f21afde4f6b0f9bc567c90867a543b43738f067fe48dbdf90fbb6fd84bc948606dc6b08c700352b56be795e596f93d89c7810524da45c252a20c8e1e
-  data.tar.gz: c1adf29ebb70a6afc79a0180c7f690902520b91a660b91dcb4b5664cbfd9c4e601365199d3a7888798756a214be267639e541e8162d48b20b9cb71fd72b79a60
+  metadata.gz: 31af2bedb2d4154c70ae323ab30c8d4d52afae338c7015a6e5a4d4d41e365688a05b3e64f9a2e2fab15fa8e604b243c5b8b253afaf2eef822599bba859274b11
+  data.tar.gz: 9256b06ffcd1a22a09c438893118356692f35cd1533b20126946634fa9d3f2ab10003731faedce938ad7d1a055e62d5942eb3b63b581a9ef65e06e45229d1e3d

data/.travis.yml

@@ -7,10 +7,8 @@ notifications:
 
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.1
-  - jruby-19mode
   - jruby-20mode
 
 gemfile:

data/Gemfile

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

data/gemfiles/es-git.gemfile

@@ -1,7 +1,6 @@
 source "https://rubygems.org"
 
-gem "mongoid", github: "mongoid/mongoid", branch: "master"
+gem "mongoid", "~> 4.0.0.beta1"
 gem 'elasticsearch', github: 'elasticsearch/elasticsearch-ruby', branch: "master"
-gem 'mongoid_slug', github: 'glebtv/mongoid-slug'
 
 gemspec path: "../"

data/gemfiles/mongoid3.gemfile

@@ -2,6 +2,5 @@ source "https://rubygems.org"
 
 gem "mongoid", '~> 3.1.0'
 gem 'elasticsearch'
-gem 'mongoid_slug'
 
 gemspec path: "../"

data/lib/mongoid/elasticsearch.rb

@@ -100,7 +100,7 @@ module Mongoid
 
       options[:wrapper] ||= :model
 
-      client = ::Elasticsearch::Client.new Mongoid::Elasticsearch.client_options
+      client = ::Elasticsearch::Client.new Mongoid::Elasticsearch.client_options.dup
       Response.new(client, query, true, nil, options)
     end
   end

data/lib/mongoid/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Elasticsearch
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/mongoid-elasticsearch.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "hashie"
   spec.add_development_dependency "mongoid_slug"
+  spec.add_development_dependency "glebtv-httpclient"
 end

data/spec/mongoid_elasticsearch_spec.rb

@@ -7,7 +7,7 @@ describe Article do
     Article.es.index.name.should eq 'mongoid_es_news'
     Article.es.index.type.should eq 'article'
     Article.es_wrapper.should eq :load
-    Article.es_client_options.should eq({})
+    Article.es_client_options.should eq(DEFAULT_OPT)
   end
 
   context 'index operations' do
@@ -171,7 +171,7 @@ describe Post do
   it 'properly uses options' do
     Post.es_index_name.should eq 'mongoid_es_test_posts'
     Post.es_wrapper.should eq :model
-    Post.es_client_options.should eq({})
+    Post.es_client_options.should eq(DEFAULT_OPT)
   end
 
   context 'index operations' do
@@ -289,7 +289,7 @@ describe Namespaced::Model do
     Namespaced::Model.es.index.name.should eq 'mongoid_es_test_namespaced_models'
     Namespaced::Model.es.index.type.should eq 'namespaced/model'
     Namespaced::Model.es_wrapper.should eq :model
-    Namespaced::Model.es_client_options.should eq({})
+    Namespaced::Model.es_client_options.should eq(DEFAULT_OPT)
   end
 
   context 'index operations' do

data/spec/spec_helper.rb

@@ -21,6 +21,14 @@ require "database_cleaner"
 
 require "mongoid-elasticsearch"
 
+if ENV['CI_ADAPTER'] == 'httpclient'
+  require 'httpclient'
+  DEFAULT_OPT = {adapter: :httpclient}
+else
+  DEFAULT_OPT = {}
+end
+Mongoid::Elasticsearch.client_options = DEFAULT_OPT.dup
+
 # Mongoid::Elasticsearch.client_options = {log: true}
 
 Mongoid::Elasticsearch.prefix = "mongoid_es_test_"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -156,6 +156,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: glebtv-httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple and easy integration of mongoid with the new elasticsearch gem
 email:
 - glebtv@gmail.com