mongoid-elasticsearch 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc7964bb909dec223e809ac38cdb534018ff9938
-  data.tar.gz: b3aaa57c0651bd32ab4af8968160c1f8834bef41
+  metadata.gz: 73ff0a4562b7d652802bc8bc1f26343cef63cefe
+  data.tar.gz: 878f97484fb4b5a1b52773353d3d1df1a33ba529
 SHA512:
-  metadata.gz: 31af2bedb2d4154c70ae323ab30c8d4d52afae338c7015a6e5a4d4d41e365688a05b3e64f9a2e2fab15fa8e604b243c5b8b253afaf2eef822599bba859274b11
-  data.tar.gz: 9256b06ffcd1a22a09c438893118356692f35cd1533b20126946634fa9d3f2ab10003731faedce938ad7d1a055e62d5942eb3b63b581a9ef65e06e45229d1e3d
+  metadata.gz: 0a87c268fde4d52029ac6d667369bc555b868bff9d8efbc7621c6584b6de8558b7236bce519e095d5a07f16be94dd78cbae4a76fec7d39f5546d6aeb9cf20732
+  data.tar.gz: 0325cd6d0b05bb8ddd236971f9b4b2685269c7300b47a07f715b783026665974355ceaf9137aaf84122c8f0f826f2ccd9400f23a9e2854e199110437ac89380b

data/lib/mongoid-elasticsearch.rb

@@ -1,2 +1 @@
-require 'elasticsearch'
 require 'mongoid/elasticsearch'

data/lib/mongoid/elasticsearch.rb

@@ -1,6 +1,6 @@
+require 'elasticsearch'
 require 'mongoid/elasticsearch/version'
 
-require 'elasticsearch'
 require 'active_support/concern'
 
 require 'mongoid/elasticsearch/utils'
@@ -22,6 +22,9 @@ module Mongoid
 
     mattr_accessor :registered_indexes
     self.registered_indexes = []
+    
+    mattr_accessor :registered_models
+    self.registered_models = []
 
     extend ActiveSupport::Concern
     included do
@@ -63,6 +66,7 @@ module Mongoid
         self.es_wrapper        = options[:wrapper]
 
         Mongoid::Elasticsearch.registered_indexes.push self.es_index_name
+        Mongoid::Elasticsearch.registered_models.push self.name
 
         unless options[:index_mappings].nil?
           self.es_index_options = self.es_index_options.deep_merge({
@@ -76,8 +80,13 @@ module Mongoid
 
         include Indexing
         include Callbacks if options[:callbacks]
+      end
+    end
 
-        es.index.create
+    def self.create_all_indexes!
+      puts "creating ES indexes"
+      Mongoid::Elasticsearch.registered_models.each do |model_name|
+        model_name.constantize.es.index.create
       end
     end
 
@@ -105,3 +114,7 @@ module Mongoid
     end
   end
 end
+
+if defined? Rails
+  require 'mongoid/elasticsearch/railtie'
+end

data/lib/mongoid/elasticsearch/railtie.rb

@@ -0,0 +1,11 @@
+module Mongoid::Elasticsearch
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      require File.expand_path('../tasks', __FILE__)
+    end
+    
+    initializer 'elasticsearch.load_app' do
+      Mongoid::Elasticsearch.create_all_indexes!
+    end
+  end
+end

data/lib/mongoid/elasticsearch/tasks.rb

@@ -0,0 +1,28 @@
+# require this file to load the tasks
+require 'rake'
+
+# Require sitemap_generator at runtime. If we don't do this the ActionView helpers are included
+# before the Rails environment can be loaded by other Rake tasks, which causes problems
+# for those tasks when rendering using ActionView.
+namespace :es do
+  # Require sitemap_generator only. When installed as a plugin the require will fail, so in
+  # that case, load the environment first.
+  task :require do
+    Rake::Task['environment'].invoke
+    require 'ruby-progressbar'
+  end
+  desc "create all indexes"
+  task :create => ['es:require'] do
+    Mongoid::Elasticsearch.create_all_indexes!
+  end
+  desc "reindex all ES models"
+  task :reindex => ['es:require'] do
+    Mongoid::Elasticsearch.registered_models.each do |model_name|
+      pb = nil
+      model_name.constantize.es.index_all do |steps, step|
+        pb = ProgressBar.create(title: model_name, total: steps, format: '%t: %p%% %a |%b>%i| %E') if pb.nil?
+        pb.increment
+      end
+    end
+  end
+end

data/lib/mongoid/elasticsearch/version.rb

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

data/mongoid-elasticsearch.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mongoid", [">= 3.0", "< 4.1"]
   spec.add_dependency "elasticsearch", "~> 1.0.1"
+  spec.add_dependency "ruby-progressbar"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - glebtv
@@ -44,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +211,9 @@ files:
 - lib/mongoid/elasticsearch/indexing.rb
 - lib/mongoid/elasticsearch/monkeypatches.rb
 - lib/mongoid/elasticsearch/pagination.rb
+- lib/mongoid/elasticsearch/railtie.rb
 - lib/mongoid/elasticsearch/response.rb
+- lib/mongoid/elasticsearch/tasks.rb
 - lib/mongoid/elasticsearch/utils.rb
 - lib/mongoid/elasticsearch/version.rb
 - mongoid-elasticsearch.gemspec