mongoid-elasticsearch 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58ac499ba39b4b840bbf99df12f67d7e87008acb
-  data.tar.gz: 9ae20ac236948c7b2124239fb159e5b860d8e2a8
+  metadata.gz: e4f292ee8adb28db5b0013bf8357627c9df82865
+  data.tar.gz: 6cad535741df733ba787d29f1f4c0f2233dce2ee
 SHA512:
-  metadata.gz: 424670a23b52bc88031c52743c55a117d812913ac830bc7f5f1ac79709df33d329495f7abec3955849c50a728ae0dcac2feb5f7a09ea5983748c98e3aa4b38be
-  data.tar.gz: a11695126ec22930873d678a1fac9053a18e06d30ce5713ab20d4557eb0e2d02bcc5fa9c4cb9f5fdf90ca69a09ac8a72cb8ee8e9a08c146ace2d9faa61233137
+  metadata.gz: 4e410de984a20d827035416a6a6e44ea628f9b63c6710d2ff5447059dea1230505edbd58b1029a399699fc93fc490c1c54b164f0b441a8c4783de8b10ee469f3
+  data.tar.gz: 4a9509adc2252f866d0069ca080d462dea4bd81fd9628d50e4bf5affb7f5b22273a04029e1d50c8c9f328078547255a12bf1e144653a2438dcf7af40ad497050

data/README.md

@@ -96,7 +96,9 @@ Or install it yourself as:
 
 search syntax docs: http://rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions#search-instance_method
 
-more docs: http://rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions
+ES Actions docs: http://rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions
+
+ES Indices docs: http://rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Indices/Actions
 
 ES docs: http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/index.html
 
@@ -172,6 +174,12 @@ index definition options and custom model serialization:
 
 ### Reindexing
 
+#### Simple bulk
+
+This is the preferred (fastest) method to reindex everything
+    
+    Music::Video.es.index_all
+
 #### Simple
 
     Communities::Thread.es.index.reset
@@ -179,7 +187,7 @@ index definition options and custom model serialization:
       ingr.es_update
     end
 
-#### Bulk with progress bar
+#### Bulk with [progress bar](http://rubygems.org/gems/ruby-progressbar)
 
     pb = nil
     Music::Video.es.index_all do |steps, step|
@@ -195,7 +203,12 @@ index definition options and custom model serialization:
 - :model - create a model instance from data stored in elasticsearch
 
 See more examples in specs.
-    
+
+#### Util
+
+    # Escape string so it can be safely passed to ES (removes all special characters)
+    Mongoid::Elasticsearch::Utils.clean(s)
+
 ## Contributing
 
 1. Fork it

data/lib/mongoid/elasticsearch.rb

@@ -1,4 +1,4 @@
-require "mongoid/elasticsearch/version"
+require 'mongoid/elasticsearch/version'
 
 require 'elasticsearch'
 require 'active_support/concern'
@@ -16,8 +16,6 @@ end
 
 module Mongoid
   module Elasticsearch
-    INDEX_STEP = 300
-
     mattr_accessor :prefix
     self.prefix = ''
 

data/lib/mongoid/elasticsearch/es.rb

@@ -1,6 +1,7 @@
 module Mongoid
   module Elasticsearch
     class Es
+      INDEX_STEP = 100
       attr_reader :klass, :version
 
       def initialize(klass)
@@ -17,12 +18,12 @@ module Mongoid
         @index ||= Index.new(self)
       end
 
-      def index_all
+      def index_all(step_size = INDEX_STEP)
         index.reset
         q = klass.order_by(_id: 1)
-        steps = (q.count / INDEX_STEP) + 1
+        steps = (q.count / step_size) + 1
         steps.times do |step|
-          docs = q.skip(step * INDEX_STEP).limit(INDEX_STEP)
+          docs = q.skip(step * step_size).limit(step_size)
           docs = docs.map do |obj|
             { index: {data: obj.as_indexed_json}.merge(_id: obj.id.to_s) }
           end

data/lib/mongoid/elasticsearch/version.rb

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

metadata

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