elastic_record 4.0.0 → 4.1.0

data/lib/elastic_record/index/mapping.rb

@@ -1,41 +1,22 @@
 module ElasticRecord
   class Index
     module Mapping
-      def mapping=(custom_mapping)
-        mapping.deep_merge!(custom_mapping)
-      end
-
       def update_mapping(index_name = alias_name)
-        connection.json_put "/#{index_name}/#{type}/_mapping", type => mapping
+        connection.json_put "/#{index_name}/_mapping", mapping_body
       end
 
       def get_mapping(index_name = alias_name)
-        json = connection.json_get "/#{index_name}/#{type}/_mapping"
+        json = connection.json_get "/#{index_name}/_mapping"
+
         unless json.empty?
           json.values.first['mappings']
         end
       end
 
-      def mapping
-        @mapping ||= {
-          properties: {
-          },
-          _all: {
-            enabled: false
-          },
-          dynamic_templates: [
-            {
-              no_string_analyzing: {
-                match: "*",
-                match_mapping_type: "string",
-                mapping: {
-                  type: "string",
-                  index: "not_analyzed"
-                }
-              }
-            }
-          ]
-        }
+      def mapping_body
+        doctypes.each_with_object({}) do |doctype, result|
+          result[doctype.name] = doctype.mapping
+        end
       end
     end
   end

data/lib/elastic_record/index/settings.rb

@@ -6,12 +6,27 @@ module ElasticRecord
       end
 
       def settings
-        @settings ||= {}
+        @settings ||=
+          begin
+            result = {}
+
+            if (analysis = analysis_body).any?
+              result['analysis'] = analysis
+            end
+
+            result
+          end
       end
 
       def update_settings(index_name = alias_name)
         connection.json_put "/#{index_name}/_settings", settings
       end
+
+      def analysis_body
+        doctypes.each_with_object({}) do |doctype, result|
+          result.deep_merge!(doctype.analysis)
+        end
+      end
     end
   end
-end
+end

data/lib/elastic_record/index.rb

@@ -1,12 +1,9 @@
 require 'elastic_record/index/analyze'
-require 'elastic_record/index/configurator'
 require 'elastic_record/index/deferred'
 require 'elastic_record/index/documents'
 require 'elastic_record/index/manage'
 require 'elastic_record/index/mapping'
-require 'elastic_record/index/percolator'
 require 'elastic_record/index/settings'
-require 'elastic_record/index/warmer'
 
 require 'active_support/core_ext/object/deep_dup'
 
@@ -26,30 +23,30 @@ module ElasticRecord
   #   Returns if the index exists
   # [get_mapping]
   #   Returns the mapping currently stored by elastic search.
-  # [put_mapping]
+  # [update_mapping]
   #   Update elastic search's mapping
   class Index
     include Documents
     include Manage
     include Mapping, Settings
-    include Percolator, Warmer
     include Analyze
     include Deferred
 
-    attr_accessor :model
+    attr_accessor :doctypes
 
     attr_accessor :disabled
-    attr_accessor :has_percolator
+    attr_accessor :model
     attr_accessor :partial_updates
 
-    def initialize(model)
-      @model = model
+    def initialize(models)
+      models = Array.wrap(models)
+      @model = models.first
+      @doctypes = models.map(&:doctype)
       @disabled = false
     end
 
     def initialize_copy(other)
       @settings = settings.deep_dup
-      @mapping = mapping.deep_dup
     end
 
     def alias_name=(name)
@@ -60,14 +57,6 @@ module ElasticRecord
       @alias_name ||= model.base_class.name.demodulize.underscore.pluralize
     end
 
-    def type=(name)
-      @type = name
-    end
-
-    def type
-      @type ||= model.base_class.name.demodulize.underscore
-    end
-
     def disable!
       @disabled = true
     end
@@ -80,12 +69,12 @@ module ElasticRecord
       model.elastic_connection
     end
 
-    def configure(&block)
-      Configurator.new(self).instance_eval(&block)
-    end
+    def get(end_path, doctype = nil, json = nil)
+      path = "/#{alias_name}"
+      path += "/#{doctype.name}" if doctype
+      path += "/#{end_path}"
 
-    def get(end_path, json = nil)
-      connection.json_get "/#{alias_name}/#{type}/#{end_path}", json
+      connection.json_get path, json
     end
 
     private
@@ -93,6 +82,5 @@ module ElasticRecord
       def new_index_name
         "#{alias_name}_#{Time.now.utc.strftime('%Y%m%d_%H%M%S')}"
       end
-
   end
 end

data/lib/elastic_record/model.rb

@@ -5,6 +5,7 @@ module ElasticRecord
         extend Searching
         extend ClassMethods
         include Callbacks
+        include AsDocument
 
         class_attribute :elastic_connection
         self.elastic_connection = ElasticRecord::Connection.new(ElasticRecord::Config.servers, ElasticRecord::Config.connection_options)
@@ -17,17 +18,22 @@ module ElasticRecord
 
         if child < child.base_class
           child.elastic_index = elastic_index.dup
+          child.doctype = doctype.dup
         end
       end
 
-      def elastic_relation
-        ElasticRecord::Relation.new(self)
-      end
-
       def arelastic
         Arelastic::Builders::Search
       end
 
+      def doctype
+        @doctype ||= Doctype.new(base_class.name.demodulize.underscore)
+      end
+
+      def doctype=(new_doctype)
+        @doctype = new_doctype
+      end
+
       def elastic_index
         @elastic_index ||= ElasticRecord::Index.new(self)
       end
@@ -44,5 +50,9 @@ module ElasticRecord
     def elastic_index
       self.class.elastic_index
     end
+
+    def doctype
+      self.class.doctype
+    end
   end
 end

data/lib/elastic_record/percolator_model.rb

@@ -0,0 +1,44 @@
+module ElasticRecord
+  module PercolatorModel
+    def self.included(base)
+      base.class_eval do
+        class_attribute :percolates_model
+
+        include Model
+        extend ClassMethods
+      end
+    end
+
+    module ClassMethods
+      def elastic_index
+        @elastic_index ||=
+          begin
+            index = ElasticRecord::Index.new([self, percolates_model])
+            index.partial_updates = false
+            index
+          end
+      end
+
+      def doctype
+        @doctype ||= Doctype.percolator_doctype
+      end
+
+      def percolate(document)
+        query = {
+          "query" => {
+            "percolate" => {
+              "field"         => "query",
+              "document_type" => percolates_model.doctype.name,
+              "document"      => document
+            }
+          }
+        }
+
+        hits = elastic_index.search(query)['hits']['hits']
+        ids = hits.map { |hits| hits['_id'] }
+
+        where(id: ids)
+      end
+    end
+  end
+end

data/lib/elastic_record/relation.rb

@@ -1,5 +1,4 @@
 require 'elastic_record/relation/value_methods'
-require 'elastic_record/relation/admin'
 require 'elastic_record/relation/batches'
 require 'elastic_record/relation/delegation'
 require 'elastic_record/relation/finder_methods'
@@ -9,7 +8,7 @@ require 'elastic_record/relation/search_methods'
 
 module ElasticRecord
   class Relation
-    include Admin, Batches, Delegation, FinderMethods, Merging, SearchMethods
+    include Batches, Delegation, FinderMethods, Merging, SearchMethods
 
     attr_reader :klass, :values
 

data/lib/elastic_record/searching.rb

@@ -1,5 +1,9 @@
 module ElasticRecord
   module Searching
+    def elastic_relation
+      ElasticRecord::Relation.new(self)
+    end
+
     def elastic_search
       if current_elastic_search
         current_elastic_search.clone
@@ -27,4 +31,4 @@ module ElasticRecord
       Thread.current["#{self}_current_elastic_search"] = relation
     end
   end
-end
+end

data/lib/elastic_record/tasks/index.rake

@@ -17,11 +17,6 @@ namespace :index do
       index = model.elastic_index
       index_name = index.create_and_deploy
       puts "Created #{model.name} index (#{index_name})"
-
-      if index.has_percolator
-        index_name = index.create_percolator_index
-        puts "Created #{model.name} percolator index (#{index_name})"
-      end
     end
   end
 
@@ -31,11 +26,6 @@ namespace :index do
       index = model.elastic_index
       index.delete_all
       puts "Dropped #{model.name} index"
-
-      if index.has_percolator
-        index.delete_percolator_index
-        puts "Dropped #{model.name} percolator index (#{index.percolator_name})"
-      end
     end
   end
 

data/lib/elastic_record.rb

@@ -3,13 +3,16 @@ require 'active_support/concern'
 require 'active_model'
 
 module ElasticRecord
+  autoload :AsDocument, 'elastic_record/as_document'
   autoload :Callbacks, 'elastic_record/callbacks'
   autoload :Config, 'elastic_record/config'
   autoload :Connection, 'elastic_record/connection'
+  autoload :Doctype, 'elastic_record/doctype'
   autoload :Index, 'elastic_record/index'
   autoload :JSON, 'elastic_record/json'
   autoload :Lucene, 'elastic_record/lucene'
   autoload :Model, 'elastic_record/model'
+  autoload :PercolatorModel, 'elastic_record/percolator_model'
   autoload :Relation, 'elastic_record/relation'
   autoload :Searching, 'elastic_record/searching'
 

data/test/dummy/app/models/mock_model.rb

@@ -0,0 +1,108 @@
+# Essentially a fake ActiveRecord::Base
+module MockModel
+  extend ActiveSupport::Concern
+
+  included do
+    extend ActiveModel::Naming
+    extend ActiveModel::Callbacks
+    define_model_callbacks :save, :update, :create, :destroy
+
+    include ActiveModel::Dirty
+    include ActiveModel::Validations
+  end
+
+  module ClassMethods
+    def find(ids)
+      ids.map { |id| new(id: id) }
+    end
+
+    def where(query)
+      find query[:id]
+    end
+
+    def primary_key
+      'id'
+    end
+
+    def base_class
+      self
+    end
+
+    def create(attributes = {})
+      record = new(attributes)
+      record.save
+      record
+    end
+
+    def define_attributes(attributes)
+      define_attribute_methods attributes
+
+      attributes.each do |attribute|
+        define_method attribute do
+          instance_variable_get("@#{attribute}")
+        end
+
+        define_method "#{attribute}=" do |value|
+          send("#{attribute}_will_change!")
+          instance_variable_set("@#{attribute}", value)
+        end
+      end
+
+      define_method 'attributes' do
+        Hash[attributes.map { |attr| [attr.to_s, send(attr)] }]
+      end
+    end
+  end
+
+  def initialize(attrs = {})
+    self.attributes = attrs
+  end
+
+  def attributes=(attrs)
+    attrs.each do |key, val|
+      send("#{key}=", val)
+    end
+  end
+
+  def id=(value)
+    @id = value
+  end
+
+  def id
+    @id ||= rand(10000).to_s
+  end
+
+  def save
+    @persisted = true
+    callback_method = new_record? ? :create : :update
+    run_callbacks callback_method
+  end
+
+  def destroy
+    @destroyed = true
+    run_callbacks :destroy
+  end
+
+  def ==(other)
+    id == other.id
+  end
+
+  def changed?
+    true
+  end
+
+  def new_record?
+    !@persisted
+  end
+
+  def persisted?
+    @persisted
+  end
+
+  def destroyed?
+    @destroyed
+  end
+
+  def reload
+  end
+end

data/test/dummy/app/models/project.rb

@@ -1,7 +1,7 @@
 class Project < ActiveRecord::Base
   include ElasticRecord::Model
 
-  self.elastic_index.mapping[:properties].update(
+  self.doctype.mapping[:properties].update(
     'name' => { type: 'string', index: 'not_analyzed' }
   )
 end