elastics-models 1.0.7 → 1.0.8

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

data/lib/elastics/model_tasks.rb

@@ -43,8 +43,8 @@ module Elastics
 
     def default_options
       @default_options ||= { :force          => false,
-                             :timeout        => 20,
-                             :batch_size     => 1000,
+                             :timeout        => 60,
+                             :batch_size     => 500,
                              :import_options => { },
                              :models         => Conf.elastics_models,
                              :config_file    => Conf.config_file,
@@ -52,6 +52,7 @@ module Elastics
     end
 
     def import_models
+      Prompter.say_title "Import models: #{models.map(&:to_s).inspect}" if options[:verbose]
       Conf.http_client.options[:timeout] = options[:timeout]
       deleted = []
       models.each do |model|
@@ -65,14 +66,14 @@ module Elastics
           unless deleted.include?(index)
             delete_index(index)
             deleted << index
-            puts "#{index} index deleted" if options[:verbose]
+            Prompter.say_warning "#{index} index deleted" if options[:verbose]
           end
         end
 
         # block never called during live-reindex, since prefix_index creates it
         unless exist?(index)
           create(index)
-          puts "#{index} index created" if options[:verbose]
+          Prompter.say_ok "#{index} index created" if options[:verbose]
         end
 
         if defined?(Mongoid::Document) && model.include?(Mongoid::Document)

data/lib/elastics/models_live_reindex.rb

@@ -3,7 +3,6 @@ module Elastics
   module LiveReindex
 
     def reindex_models(opts={})
-
       raise NotImplementedError, 'Elastics::LiveReindex.reindex_models requires the "elastics-admin" gem. Please, install it.' \
             unless defined?(Elastics::Admin)
 
@@ -21,6 +20,8 @@ module Elastics
 
       yield self if block_given?
 
+      opts[:verbose]  = true unless opts.has_key?(:verbose)
+
       # we override the on_reindex eventually set
       on_reindex do
         opts = opts.merge(:force => false)
@@ -31,6 +32,7 @@ module Elastics
     end
 
     def reindex_active_models(opts={})
+      Conf.http_client.options[:timeout] = opts[:timeout] || 60
 
       raise NotImplementedError, 'Elastics::LiveReindex.reindex_models requires the "elastics-admin" gem. Please, install it.' \
             unless defined?(Elastics::Admin)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastics-models
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elastics-client
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: elastics-scopes
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement