elastics-models 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/elastics-models.rb

@@ -2,8 +2,6 @@ require 'elastics-client'
 require 'elastics-scopes'
 require 'active_attr'
 
-require 'elastics/struct/mergeable'
-
 require 'elastics/class_proxy/model_syncer'
 require 'elastics/instance_proxy/model_syncer'
 require 'elastics/model_syncer'
@@ -28,13 +26,22 @@ require 'elastics/result/document_loader'
 require 'elastics/result/search_loader'
 require 'elastics/result/active_model'
 
+require 'elastics/models_indices'
 require 'elastics/model_tasks'
 
 Elastics::LIB_PATHS << File.dirname(__FILE__)
 
 # get_docs calls super so we make sure the result is extended by Scope first
-Elastics::Conf.result_extenders  |= [ Elastics::Result::DocumentLoader,
-                                     Elastics::Result::SearchLoader,
-                                     Elastics::Result::ActiveModel ]
+Elastics::Conf.result_extenders      |= [ Elastics::Result::DocumentLoader,
+                                          Elastics::Result::SearchLoader,
+                                          Elastics::Result::ActiveModel ]
 Elastics::Conf.elastics_models        = []
 Elastics::Conf.elastics_active_models = []
+
+Elastics::Conf.instance_eval do
+
+  def indices
+    @indices ||= Elastics::ModelsIndices.new(config_file)
+  end
+
+end

data/lib/elastics/model_tasks.rb

@@ -1,23 +1,5 @@
-require 'elastics/tasks'
-
 module Elastics
 
-  class Tasks
-    # patches the Elastics::Tasks#config_hash so it evaluates also the default mapping for models
-    # it modifies also the index:create task
-    alias_method :original_config_hash, :config_hash
-    def config_hash
-      @config_hash ||= begin
-                         default = {}.extend Struct::Mergeable
-                         (Conf.elastics_models + Conf.elastics_active_models).each do |m|
-                           m = eval"::#{m}" if m.is_a?(String)
-                           default.deep_merge! m.elastics.default_mapping
-                         end
-                         default.deep_merge(original_config_hash)
-                       end
-    end
-  end
-
   class ModelTasks < Elastics::Tasks
 
     attr_reader :options
@@ -29,15 +11,6 @@ module Elastics
       options[:batch_size] = options[:batch_size].to_i   if options[:batch_size]
       options[:models]     = options[:models].split(',') if options[:models]
 
-      if options[:import_options]
-        import_options = {}
-        options[:import_options].split('&').each do |pair|
-          k, v  = pair.split('=')
-          import_options[k.to_sym] = v
-        end
-        options[:import_options] = import_options
-      end
-
       @options = default_options.merge(options).merge(overrides)
     end
 
@@ -45,9 +18,7 @@ module Elastics
       @default_options ||= { :force          => false,
                              :timeout        => 60,
                              :batch_size     => 500,
-                             :import_options => { },
                              :models         => Conf.elastics_models,
-                             :config_file    => Conf.config_file,
                              :verbose        => true }
     end
 
@@ -64,22 +35,22 @@ module Elastics
         # block never called during live-reindex, since it doesn't exist
         if options[:force]
           unless deleted.include?(index)
-            delete_index(index)
+            Elastics.delete_index(:index => index)
             deleted << index
             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)
+        unless Elastics.exist?(:index => index)
+          Conf.indices.create_index(index)
           Prompter.say_ok "#{index} index created" if options[:verbose]
         end
 
         pbar = ProgBar.new(model.count, options[:batch_size], "Model #{model}: ") if options[:verbose]
 
         model.elastics_in_batches(:batch_size => options[:batch_size]) do |batch|
-          result = Elastics.post_bulk_collection(batch, options[:import_options]) || next
+          result = Elastics.post_bulk_collection(batch) || next
           pbar.process_result(result, batch.size) if options[:verbose]
         end
 
@@ -91,7 +62,7 @@ module Elastics
 
     def models
       @models ||= begin
-                    models = options[:models] || Conf.elastics_models
+                    models = options[:models]
                     raise ArgumentError, 'no class defined. Please use MODELS=ClassA,ClassB ' +
                                          'or set the Elastics::Configuration.elastics_models properly' \
                                          if models.nil? || models.empty?

data/lib/elastics/models_indices.rb

@@ -0,0 +1,14 @@
+module Elastics
+  class ModelsIndices < Indices
+
+    def initialize(config_path)
+      default = {}.extend Struct::Mergeable
+      (Conf.elastics_models + Conf.elastics_active_models).each do |m|
+        m = eval"::#{m}" if m.is_a?(String)
+        default.deep_merge! m.elastics.default_mapping
+      end
+      replace default.deep_merge(super)
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastics-models
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-15 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.1.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: elastics-scopes
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
@@ -84,12 +84,12 @@ files:
 - lib/elastics/model_indexer.rb
 - lib/elastics/model_syncer.rb
 - lib/elastics/model_tasks.rb
+- lib/elastics/models_indices.rb
 - lib/elastics/models_live_reindex.rb
 - lib/elastics/refresh_callbacks.rb
 - lib/elastics/result/active_model.rb
 - lib/elastics/result/document_loader.rb
 - lib/elastics/result/search_loader.rb
-- lib/elastics/struct/mergeable.rb
 - lib/tasks.rake
 - VERSION
 - LICENSE

data/lib/elastics/struct/mergeable.rb

@@ -1,38 +0,0 @@
-module Elastics
-  module Struct
-    # allows deep merge between Hashes
-    module Mergeable
-
-      def deep_merge(*hashes)
-        merged = deep_dup
-        hashes.each {|h2| merged.replace(deep_merge_hash(merged,h2))}
-        merged
-      end
-
-      def deep_merge!(*hashes)
-        replace deep_merge(*hashes)
-      end
-
-      def deep_dup
-        Marshal.load(Marshal.dump(self))
-      end
-
-  private
-
-      def deep_merge_hash(h1, h2)
-        h2 ||= {}
-        h1.merge(h2) do |key, oldval, newval|
-          case
-          when oldval.is_a?(::Hash) && newval.is_a?(::Hash)
-            deep_merge_hash(oldval, newval)
-          when oldval.is_a?(::Array) && newval.is_a?(::Array)
-              oldval + newval
-          else
-            newval
-          end
-        end
-      end
-
-    end
-  end
-end