mongoid-elasticsearch 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73ff0a4562b7d652802bc8bc1f26343cef63cefe
-  data.tar.gz: 878f97484fb4b5a1b52773353d3d1df1a33ba529
+  metadata.gz: 5b0899d5817a5ab9f5bfaf6a20b2b243e736602e
+  data.tar.gz: 635577852d5d8211b44e7302b72c41aa041b292a
 SHA512:
-  metadata.gz: 0a87c268fde4d52029ac6d667369bc555b868bff9d8efbc7621c6584b6de8558b7236bce519e095d5a07f16be94dd78cbae4a76fec7d39f5546d6aeb9cf20732
-  data.tar.gz: 0325cd6d0b05bb8ddd236971f9b4b2685269c7300b47a07f715b783026665974355ceaf9137aaf84122c8f0f826f2ccd9400f23a9e2854e199110437ac89380b
+  metadata.gz: 20c7c9629a178118337e935f94e7431a39e5bcd192bc2547d12a134a4ef0b8e9c441a64327e4a07d98bb639f7e42572c46c9b28f0b474a4cff6f0bbb5016de45
+  data.tar.gz: 7eea04cc6d7137cd6b15abcb780e4533729862fa3d9c6b75dc52f643d0fdca47ed832a9bfa26c964692f68d180f9ad6e0b656df078a2a174e2f41071583599dd

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## 0.8.0 (March 4, 2014) ##
+
+* fix results with :load wrapper #6 (by [@xronos-i-am](https://github.com/xronos-i-am))
+* Added option to prevent automatic creating of index. #7 (thx [@intrica](https://github.com/intrica))
+* use after_initalize to create indexes later in the app boot process
+
+Set Mongoid::Elasticsearch.autocreate_indexes to false in an initalizer to prevent automatic creation for all indexes.
+
+You can always use ```rake es:create``` to create all indexes or call Mongoid::Elasticsearch.create_all_indexes!.
+
+Indexes defined with skip_create: true are not created with all other indexes and must be created manually with Model.es.index.create

data/README.md

@@ -205,27 +205,23 @@ Example mapping with boost field:
 
 ### Reindexing
 
-#### Simple bulk
+#### All models
+
+```rake es:reindex``` will reindex all indices managed by Mongoid::Elasticsearch
+
+#### One model - Simple bulk
 
 This is the preferred (fastest) method to reindex everything
     
     Music::Video.es.index_all
 
-#### Simple
+#### One model - Simple
 
     Communities::Thread.es.index.reset
     Communities::Thread.enabled.each do |ingr|
       ingr.es_update
     end
 
-#### Bulk with [progress bar](http://rubygems.org/gems/ruby-progressbar)
-
-    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
@@ -235,6 +231,17 @@ This is the preferred (fastest) method to reindex everything
 
 See more examples in specs.
 
+### Index creation
+
+This gem by default automatically creates indexes for all configured models on application startup.
+
+Set ```Mongoid::Elasticsearch.autocreate_indexes = false``` in an initalizer to prevent automatic creation for all indexes.
+
+You can always use ```rake es:create``` to create all indexes or call ```Mongoid::Elasticsearch.create_all_indexes!```.
+
+Indexes defined with option ```skip_create: true``` are not created with all other indexes and must be created manually with ```Model.es.index.create```
+
+
 #### Util
 
     # Escape string so it can be safely passed to ES (removes all special characters)

data/lib/mongoid/elasticsearch.rb

@@ -14,6 +14,9 @@ require 'mongoid/elasticsearch/monkeypatches'
 
 module Mongoid
   module Elasticsearch
+    mattr_accessor :autocreate_indexes
+    self.autocreate_indexes = true
+    
     mattr_accessor :prefix
     self.prefix = ''
 
@@ -51,23 +54,28 @@ module Mongoid
           index_options: {},
           index_mappings: nil,
           wrapper: :model,
-          callbacks: true
+          callbacks: true,
+          skip_create: false
         }.merge(options)
         
         if options[:wrapper] == :model
           attr_accessor :_type, :_score, :_source
         end
 
-        cattr_accessor :es_client_options, :es_index_name, :es_index_options, :es_wrapper
+        cattr_accessor :es_client_options, :es_index_name, :es_index_options, :es_wrapper, :es_skip_create
 
         self.es_client_options = Mongoid::Elasticsearch.client_options.dup.merge(options[:client_options])
         self.es_index_name     = (options[:prefix_name] ? Mongoid::Elasticsearch.prefix : '') + (options[:index_name] || model_name.plural)
         self.es_index_options  = options[:index_options]
         self.es_wrapper        = options[:wrapper]
+        self.es_skip_create    = options[:skip_create]
 
         Mongoid::Elasticsearch.registered_indexes.push self.es_index_name
+        Mongoid::Elasticsearch.registered_indexes.uniq!
+        
         Mongoid::Elasticsearch.registered_models.push self.name
-
+        Mongoid::Elasticsearch.registered_models.uniq!
+        
         unless options[:index_mappings].nil?
           self.es_index_options = self.es_index_options.deep_merge({
             :mappings => {
@@ -84,9 +92,10 @@ module Mongoid
     end
 
     def self.create_all_indexes!
-      puts "creating ES indexes"
+      # puts "creating ES indexes"
       Mongoid::Elasticsearch.registered_models.each do |model_name|
-        model_name.constantize.es.index.create
+        model = model_name.constantize
+        model.es.index.create unless model.es_skip_create
       end
     end
 

data/lib/mongoid/elasticsearch/callbacks.rb

@@ -4,13 +4,26 @@ module Mongoid
       extend ActiveSupport::Concern
 
       included do
-        after_save do
+        after_save :update_es_index
+        after_destroy :update_es_index
+        
+        def update_es_index
           es_update
         end
+      end
 
-        after_destroy do
-          es_update
-        end
+      module ClassMethods
+        def without_es_update!( &block )
+          skip_callback( :save, :after, :update_es_index )
+          skip_callback( :destroy, :after, :update_es_index )
+          
+          result = yield
+
+          set_callback( :save, :after, :update_es_index )
+          set_callback( :destroy, :after, :update_es_index )
+          
+          result
+        end        
       end
     end
   end

data/lib/mongoid/elasticsearch/railtie.rb

@@ -4,8 +4,8 @@ module Mongoid::Elasticsearch
       require File.expand_path('../tasks', __FILE__)
     end
     
-    initializer 'elasticsearch.load_app' do
-      Mongoid::Elasticsearch.create_all_indexes!
+    config.after_initialize do
+      Mongoid::Elasticsearch.create_all_indexes! if Mongoid::Elasticsearch.autocreate_indexes
     end
   end
 end

data/lib/mongoid/elasticsearch/response.rb

@@ -55,7 +55,12 @@ module Mongoid
             if @multi
               multi_with_load
             else
-              @model.find(hits.map { |h| h['_id'] })
+              records = @model.find(hits.map { |h| h['_id'] })
+              hits.map do |item|
+                records.detect do |record|
+                  record.id.to_s == item['_id'].to_s
+                end
+              end
             end
           when :mash
             hits.map do |h|

data/lib/mongoid/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Elasticsearch
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/spec/models/no_autocreate.rb

@@ -0,0 +1,9 @@
+class NoAutocreate
+  include Mongoid::Document
+
+  field :name, type: String
+
+  include Mongoid::Elasticsearch
+  elasticsearch! skip_create: true
+end
+

data/spec/mongoid_elasticsearch_spec.rb

@@ -1,4 +1,5 @@
-# coding: utf-8
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Article do
@@ -39,6 +40,7 @@ describe Article do
     end
   end
 
+
   context 'searching' do
     before :each do
       @article_1 = Article.create!(name: 'test article name likes', tags: 'likely')
@@ -71,6 +73,11 @@ describe Article do
       results.first.to_param.should eq @article_2.name.to_url
     end
 
+    it 'mongoid_slug with sort and wrapper: :load' do
+      results = Article.es.search body: { query: { match_all: {} }, sort: { 'name.raw' => 'desc' } }
+      results.map( &:id ).should eq Article.all.desc( :name ).map( &:id )
+    end
+
     it 'mongoid_slug with wrapper: :model' do
       sleep 3
       results = Article.es.search 'likely', wrapper: :model
@@ -103,6 +110,7 @@ describe Article do
     else
       pending "completion suggester not supported in ES version #{Article.es.version}"
     end
+
   end
 
   context 'pagination' do
@@ -401,3 +409,19 @@ describe 'utils' do
     Mongoid::Elasticsearch::Utils.clean('    test     test    ').should eq 'test test'
   end
 end
+
+
+describe 'no autocreate' do
+  it "desn't create index automatically" do
+    NoAutocreate.es.index.delete
+    NoAutocreate.es.index.exists?.should be_false
+    
+    Mongoid::Elasticsearch.create_all_indexes!
+    NoAutocreate.es.index.exists?.should be_false
+    
+    NoAutocreate.es.index.force_create
+    NoAutocreate.es.index.exists?.should be_true
+    
+    NoAutocreate.es.index.delete
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -197,6 +197,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE.txt
 - README.md
@@ -219,6 +220,7 @@ files:
 - mongoid-elasticsearch.gemspec
 - spec/models/article.rb
 - spec/models/namespaced.rb
+- spec/models/no_autocreate.rb
 - spec/models/nowrapper.rb
 - spec/models/post.rb
 - spec/mongoid_elasticsearch_spec.rb
@@ -250,6 +252,7 @@ summary: Simple and easy integration of mongoid with the new elasticsearch gem
 test_files:
 - spec/models/article.rb
 - spec/models/namespaced.rb
+- spec/models/no_autocreate.rb
 - spec/models/nowrapper.rb
 - spec/models/post.rb
 - spec/mongoid_elasticsearch_spec.rb