mongoid-elasticsearch 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ab2a507244af6596bf9c5770642ff8e0437018d
-  data.tar.gz: 7cc3aa09ebab9cf69d471ddab31ec2f3f6e041ad
+  metadata.gz: 0fe059b63d7362ec40846b313bbd295c00c241d5
+  data.tar.gz: cd8078c6a3ab9f84c47c6e7bfafb2e10ba2a58a4
 SHA512:
-  metadata.gz: a3f54a1d33748829d1bd94f5ac9c05ffb0c926a217e2568de570a45225cff7bf30a53a964c9bed295c2391fb679706196e76338137b90110bf0f2d12ef7679fa
-  data.tar.gz: e878bfa26f9274669d554914be9a462d34f0d55dc607ea48aa4c875a4bd2cc4471ae28f4038a8692444294a3160fd686b01cb3b3ed0e08308c8ea3b6209adc7c
+  metadata.gz: 9d4f1dc1f2cf58b1f31823353de26bcee60ef058645d1e610e816a987ceb2b295cf341b7a3d4d9243bbb812df6dcdf7e516ef199ff05863e1104eee2f5111f31
+  data.tar.gz: 64af9b66fa3977519d375b2533a5f33b920acb7203b87edea9bd84aa2eab3b29c843faf8242917b16819af92d0db52c5571189874a0bb4fdea65f8ec5b0cd1b8

data/.travis.yml

@@ -7,11 +7,10 @@ notifications:
 
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.1
-  - jruby-20mode
+  - 2.1.2
+  - jruby-head
 
 gemfile:
   - Gemfile
   - gemfiles/mongoid3.gemfile
-  - gemfiles/es-git.gemfile
+

data/README.md

@@ -3,8 +3,7 @@
 [![Build Status](https://travis-ci.org/rs-pro/mongoid-elasticsearch.png?branch=master)](https://travis-ci.org/rs-pro/mongoid-elasticsearch)
 [![Coverage Status](https://coveralls.io/repos/rs-pro/mongoid-elasticsearch/badge.png?branch=master)](https://coveralls.io/r/rs-pro/mongoid-elasticsearch?branch=master)
 [![Gem Version](https://badge.fury.io/rb/mongoid-elasticsearch.png)](http://badge.fury.io/rb/mongoid-elasticsearch)
-[![Dependency Status](https://gemnasium.com/rs-pro/mongoid-elasticsearch.png)](https://gemnasium.com/rs-pro/mongoid-elasticsearch)
-
+[![Dependency Status](https://www.versioneye.com/ruby/mongoid-elasticsearch/0.8.2/badge.svg)](https://www.versioneye.com/ruby/mongoid-elasticsearch/0.8.2)
 
 Use [Elasticsearch](http://www.elasticsearch.org/) with mongoid with just a few
 lines of code

data/lib/mongoid/elasticsearch/es.rb

@@ -45,14 +45,14 @@ module Mongoid
         end
 
         page = options[:page]
-        per_page = options[:per_page]
+        per_page = options[:per_page].nil? ? options[:per] : options[:per_page]
 
         query[:size] = ( per_page.to_i ) if per_page
         query[:from] = ( page.to_i <= 1 ? 0 : (per_page.to_i * (page.to_i-1)) ) if page && per_page
 
         options[:wrapper] ||= klass.es_wrapper
 
-        Response.new(client, query.merge(type_options), false, klass, options)
+        Response.new(client, query.merge(custom_type_options(options)), false, klass, options)
       end
 
       def all(options = {})
@@ -63,6 +63,14 @@ module Mongoid
         {id: obj.id.to_s}.merge type_options
       end
 
+      def custom_type_options(options)
+        if !options[:include_type].nil? && options[:include_type] == false
+          {index: index.name}
+        else
+          type_options
+        end
+      end
+
       def type_options
         {index: index.name, type: index.type}
       end

data/lib/mongoid/elasticsearch/pagination.rb

@@ -10,7 +10,7 @@ module Mongoid
       end
 
       def per_page
-        (@options[:per_page] || @options[:size] || 10 ).to_i
+        (@options[:per_page] || @options[:per] || @options[:size] || 10 ).to_i
       end
 
       def total_pages

data/lib/mongoid/elasticsearch/response.rb

@@ -104,7 +104,7 @@ module Mongoid
       end
 
       def inspect
-        "#<Mongoid::Elasticsearch::Response @size:#{size} @results:#{results.inspect} @error=#{success? ? "none" : error} @raw_response=#{raw_response}>"
+        "#<Mongoid::Elasticsearch::Response @size:#{@results.nil? ? 'not run yet' : size} @results:#{@results.inspect} @raw_response=#{@raw_response}>"
       end
 
       def count

data/lib/mongoid/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Elasticsearch
-    VERSION = "0.8.2"
+    VERSION = "0.8.3"
   end
 end

data/spec/mongoid_elasticsearch_spec.rb

@@ -126,7 +126,6 @@ describe Article do
 
     it 'paging works with empty results' do
       result = Article.es.search('bad_request', per_page: 7, page: 1)
-      p result
       expect(result.num_pages).to eq 0
       expect(result.current_page).to eq 1
       expect(result.total_entries).to eq 0
@@ -354,6 +353,20 @@ describe Namespaced::Model do
       expect(results.first.id).to eq @article_2.id
       expect(results.first.name).to eq @article_2.name
     end
+
+    it 'searches in field' do
+      results = Namespaced::Model.es.search body: {query: {terms: {name: ['likely']}}}
+      expect(results.count).to eq 1
+      expect(results.to_a.count).to eq 1
+      expect(results.first.id).to eq @article_2.id
+      expect(results.first.name).to eq @article_2.name
+    end
+
+    it 'searches in field - when no match' do
+      results = Namespaced::Model.es.search body: {query: {terms: {name: ['not_matched']}}}
+      expect(results.count).to eq 0
+      expect(results.to_a.count).to eq 0
+    end
   end
 
   context 'pagination' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid