mongoid-elasticsearch 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b17ce3ea177fb613d714d573fc83a015970df61
-  data.tar.gz: 2cfef5f383d8b64631d068f8bc2f40823957eeb6
+  metadata.gz: 58ac499ba39b4b840bbf99df12f67d7e87008acb
+  data.tar.gz: 9ae20ac236948c7b2124239fb159e5b860d8e2a8
 SHA512:
-  metadata.gz: ca428b09d8d6821360b3bd47f506fa09f52988d64231a86c2d925a6b2702d3da42ede2862bc78d6f3b2df550a2fe28f72db1e7f3f293241ee10e1966f3cb117c
-  data.tar.gz: 26f366aef339cd4a7d55823beb6090128c25d86f9028758400c85251121a3eea5442b486d3e7f490dcc44b2095913dfb314892d37efb4a7720cf827c37dd117b
+  metadata.gz: 424670a23b52bc88031c52743c55a117d812913ac830bc7f5f1ac79709df33d329495f7abec3955849c50a728ae0dcac2feb5f7a09ea5983748c98e3aa4b38be
+  data.tar.gz: a11695126ec22930873d678a1fac9053a18e06d30ce5713ab20d4557eb0e2d02bcc5fa9c4cb9f5fdf90ca69a09ac8a72cb8ee8e9a08c146ace2d9faa61233137

data/README.md

@@ -149,7 +149,44 @@ index definition options and custom model serialization:
     end
     
 [Mapping definition docs](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-core-types.html)    
-    
+
+### Pagination
+
+```= paginate @posts``` should work as normal with Kaminari after you do:
+
+    @posts = Post.es.search(params[:search], page: params[:page])
+    # or
+    @posts = Post.es.search({
+      body: {
+        query: {
+          query_string: {
+            query: params[:search]
+          }
+        },
+        filter: {
+          term: {community_id: @community.id.to_s}
+        }
+      }},
+      page: params[:page], wrapper: :load
+    )
+
+### Reindexing
+
+#### Simple
+
+    Communities::Thread.es.index.reset
+    Communities::Thread.enabled.each do |ingr|
+      ingr.es_update
+    end
+
+#### Bulk with progress bar
+
+    pb = nil
+    Music::Video.es.index_all do |steps, step|
+      pb = ProgressBar.create(title: "videos", total: steps, format: '%t: %p%% %a |%b>%i| %E') if pb.nil?
+      pb.increment
+    end
+
 ### Possible wrappers for results:
 
 - :hash - raw hash from ES

data/lib/mongoid/elasticsearch/es.rb

@@ -17,6 +17,22 @@ module Mongoid
         @index ||= Index.new(self)
       end
 
+      def index_all
+        index.reset
+        q = klass.order_by(_id: 1)
+        steps = (q.count / INDEX_STEP) + 1
+        steps.times do |step|
+          docs = q.skip(step * INDEX_STEP).limit(INDEX_STEP)
+          docs = docs.map do |obj|
+            { index: {data: obj.as_indexed_json}.merge(_id: obj.id.to_s) }
+          end
+          client.bulk({body: docs}.merge(type_options))
+          if block_given?
+            yield steps, step
+          end
+        end
+      end
+
       def search(query, options = {})
         if query.is_a?(String)
           query = {q: Utils.clean(query)}

data/lib/mongoid/elasticsearch/version.rb

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

data/lib/mongoid/elasticsearch.rb

@@ -16,6 +16,8 @@ end
 
 module Mongoid
   module Elasticsearch
+    INDEX_STEP = 300
+
     mattr_accessor :prefix
     self.prefix = ''
 

data/spec/mongoid_elasticsearch_spec.rb

@@ -346,6 +346,17 @@ describe Namespaced::Model do
       Namespaced::Model.es.search(body: {query: {query_string: {query: 'test'}}}, size: 50).to_a.length.should eq 20
     end
 
+    it 'bulk index' do
+      Namespaced::Model.es.index.reset
+      Namespaced::Model.es.index_all
+      Namespaced::Model.es.index.refresh
+      Namespaced::Model.es.search('test', per_page: 10, page: 2).to_a.size.should eq 10
+      Namespaced::Model.es.search('test', per_page: 30, page: 2).to_a.size.should eq 0
+      Namespaced::Model.es.search('test', per_page: 2, page: 2).to_a.size.should eq 2
+      Namespaced::Model.es.search(body: {query: {query_string: {query: 'test'}}}, size: 50).to_a.length.should eq 20
+    end
+
+
     it '#all' do
       result = Namespaced::Model.es.all(per_page: 7, page: 3)
       result.num_pages.should eq 4

metadata

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