elastic_record 4.1.8 → 5.1.0

data/lib/elastic_record/percolator_model.rb

@@ -10,35 +10,27 @@ module ElasticRecord
     end
 
     module ClassMethods
+      DEFAULT_PERCOLATOR_MAPPING = {
+        properties: {
+          query: { type: 'percolator' }
+        }
+      }
       def elastic_index
         @elastic_index ||=
           begin
-            index = ElasticRecord::Index.new([self, percolates_model])
+            index = ElasticRecord::Index.new(self)
+            index.mapping = DEFAULT_PERCOLATOR_MAPPING
+            index.mapping = percolates_model.elastic_index.mapping
+            index.analysis = percolates_model.elastic_index.analysis
             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
-            }
-          },
-          "size" => 1000
-        }
-
-        hits = elastic_index.search(query)['hits']['hits']
-        ids = hits.map { |hits| hits['_id'] }
+        query = Arelastic::Queries::Percolate.new("query", document)
 
-        where(id: ids)
+        elastic_search.filter(query).limit(5000)
       end
     end
   end

data/lib/elastic_record/relation.rb

@@ -2,19 +2,20 @@ require 'elastic_record/relation/value_methods'
 require 'elastic_record/relation/batches'
 require 'elastic_record/relation/delegation'
 require 'elastic_record/relation/finder_methods'
+require 'elastic_record/relation/hits'
 require 'elastic_record/relation/merging'
 require 'elastic_record/relation/none'
 require 'elastic_record/relation/search_methods'
 
 module ElasticRecord
   class Relation
-    include Batches, Delegation, FinderMethods, Merging, SearchMethods
+    include Batches, Delegation, FinderMethods, Hits, Merging, SearchMethods
 
     attr_reader :klass, :values
 
-    def initialize(klass)
+    def initialize(klass, values = {})
       @klass = klass
-      @values = {}
+      @values = values
     end
 
     def count
@@ -22,7 +23,10 @@ module ElasticRecord
     end
 
     def aggregations
-      search_results['aggregations']
+      @aggregations ||= begin
+        results = search_results['aggregations']
+        ElasticRecord::AggregationResponse::Builder.extract(results)
+      end
     end
 
     def explain(id)
@@ -35,11 +39,7 @@ module ElasticRecord
     end
 
     def to_a
-      @records ||= load_hits
-    end
-
-    def to_ids
-      search_hits.map { |hit| hit['_id'] }
+      @records ||= load_hits(search_hits)
     end
 
     def delete_all
@@ -64,30 +64,9 @@ module ElasticRecord
 
     private
 
-      def search_hits
-        search_results['hits']['hits']
-      end
-
       def reset
         @search_results = @records = nil
       end
 
-      def search_results
-        @search_results ||= begin
-          options = search_type_value ? {search_type: search_type_value} : {}
-          search = as_elastic.update('_source' => klass.elastic_index.load_from_source)
-
-          klass.elastic_index.search(search, options)
-        end
-      end
-
-      def load_hits
-        if klass.elastic_index.load_from_source
-           search_hits.map { |hit| klass.new(hit['_source'].update('id' => hit['_id'])) }
-        else
-          scope = select_values.any? ? klass.select(select_values) : klass
-          scope.find(to_ids)
-        end
-      end
   end
 end

data/lib/elastic_record/relation/batches.rb

@@ -8,13 +8,15 @@ module ElasticRecord
       end
 
       def find_in_batches(options = {})
-        find_ids_in_batches(options) do |ids|
-          yield klass.where(id: ids)
+        build_scroll_enumerator(options).each_slice do |hits|
+          yield load_hits(hits)
         end
       end
 
       def find_ids_in_batches(options = {}, &block)
-        build_scroll_enumerator(options).each_slice(&block)
+        build_scroll_enumerator(options).each_slice do |hits|
+          yield map_hits_to_ids(hits)
+        end
       end
 
       def build_scroll_enumerator(options)

data/lib/elastic_record/relation/delegation.rb

@@ -10,15 +10,19 @@ module ElasticRecord
       end
 
       private
+        def respond_to_missing?(method, include_private = false)
+          super || klass.respond_to?(method, include_private) || Array.method_defined?(method)
+        end
+
         def method_missing(method, *args, &block)
-          if klass.respond_to?(method)
-            scoping { klass.send(method, *args, &block) }
-          elsif Array.method_defined?(method)
+          if Array.method_defined?(method)
             to_a.send(method, *args, &block)
+          elsif klass.respond_to?(method)
+            scoping { klass.send(method, *args, &block) }
           else
             super
           end
         end
     end
   end
-end
+end

data/lib/elastic_record/relation/finder_methods.rb

@@ -27,6 +27,14 @@ module ElasticRecord
         to_a
       end
 
+      def find_by(*args)
+        filter(*args).first
+      end
+
+      def find_by!(*args)
+        filter(*args).first!
+      end
+
       private
 
         def find_one(relation)

data/lib/elastic_record/relation/hits.rb

@@ -0,0 +1,34 @@
+module ElasticRecord
+  class Relation
+    module Hits
+      def to_ids
+        map_hits_to_ids search_hits
+      end
+
+      def load_hits(search_hits)
+        if klass.elastic_index.load_from_source
+           search_hits.map { |hit| klass.new(hit['_source'].update('id' => hit['_id'])) }
+        else
+          klass.find map_hits_to_ids(search_hits)
+        end
+      end
+
+      def map_hits_to_ids(hits)
+        hits.map { |hit| hit['_id'] }
+      end
+
+      def search_hits
+        search_results['hits']['hits']
+      end
+
+      def search_results
+        @search_results ||= begin
+          options = {typed_keys: true}
+          options[:search_type] = search_type_value if search_type_value
+
+          klass.elastic_index.search(as_elastic, options)
+        end
+      end
+    end
+  end
+end

data/lib/elastic_record/relation/search_methods.rb

@@ -48,6 +48,22 @@ module ElasticRecord
         end
       end
 
+      %i(
+        includes
+        joins
+        select
+        where
+      ).each do |ar_method|
+        define_method ar_method do |*args, &block|
+          result = klass.send(ar_method, *args, &block)
+          if result.is_a?(ActiveRecord::Relation)
+            self.class.new(result, values)
+          else
+            result
+          end
+        end
+      end
+
       def query!(value)
         self.query_value = value
         self
@@ -70,14 +86,6 @@ module ElasticRecord
         end
       end
 
-      def find_by(*args)
-        filter(*args).first
-      end
-
-      def find_by!(*args)
-        filter(*args).first!
-      end
-
       def limit!(value)
         self.limit_value = value
         self
@@ -96,19 +104,6 @@ module ElasticRecord
         clone.offset! value
       end
 
-      def select!(*args)
-        self.select_values += args.flatten
-        self
-      end
-
-      def select(*args, &block)
-        if block_given?
-          to_a.select(&block)
-        else
-          clone.select! *args
-        end
-      end
-
       def search_options!(options)
         self.search_options_value ||= {}
         self.search_options_value.merge! options
@@ -233,7 +228,7 @@ module ElasticRecord
             if filter.is_a?(Arelastic::Nodes::Node)
               nodes << filter
             elsif filter.is_a?(ElasticRecord::Relation)
-              nodes << Arelastic::Queries::HasChild.new(filter.elastic_index.type, filter.as_elastic['query'])
+              nodes << Arelastic::Queries::HasChild.new(filter.elastic_index.mapping_type, filter.as_elastic['query'])
             else
               filter.each do |field, terms|
                 case terms

data/lib/elastic_record/relation/value_methods.rb

@@ -1,6 +1,6 @@
 module ElasticRecord
   class Relation
-    MULTI_VALUE_METHODS  = [:extending, :filter, :order, :select, :aggregation]
+    MULTI_VALUE_METHODS  = [:extending, :filter, :order, :aggregation]
     SINGLE_VALUE_METHODS = [:query, :limit, :offset, :search_options, :search_type, :reverse_order]
   end
 end

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

@@ -1,7 +1,19 @@
-class Project < ActiveRecord::Base
+class Project
+  class << self
+    def base_class
+      self
+    end
+  end
+
+  include ActiveModel::Model
   include ElasticRecord::Model
 
-  self.doctype.mapping[:properties].update(
-    'name' => { type: 'string', index: 'not_analyzed' }
-  )
+  attr_accessor :id, :name
+  alias_method :as_json, :as_search_document
+
+  elastic_index.load_from_source = true
+
+  def as_search_document
+    { name: name }
+  end
 end

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

@@ -1,19 +1,8 @@
-class Warehouse
-  class << self
-    def base_class
-      self
-    end
-  end
-
-  include ActiveModel::Model
+class Warehouse < ActiveRecord::Base
   include ElasticRecord::Model
 
-  attr_accessor :id, :name
-  alias_method :as_json, :as_search_document
-
-  elastic_index.load_from_source = true
-
-  def as_search_document
-    { name: name }
-  end
+  elastic_index.mapping_type = 'warehouse'
+  elastic_index.mapping[:properties].update(
+    'name' => { type: 'keyword' }
+  )
 end

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

@@ -1,22 +1,37 @@
-class Widget
-  include TestModel
+class Widget < ActiveRecord::Base
+  include ElasticRecord::Model
+  self.elastic_index.partial_updates = true
 
+  belongs_to :warehouse
   validates :color, format: {with: /[a-z]/}
 
-  define_attributes [:name, :color, :warehouse_id]
+  class WidgetPart
+    include ElasticRecord::Model
+    attr_accessor :name
+  end
 
-  self.doctype.mapping[:properties].update(
+  self.elastic_index.mapping_type = 'widget'
+  self.elastic_index.mapping[:properties].update(
     'name' => {
-      type: 'string', index: 'not_analyzed',
+      type: 'text',
       fields: {
-        analyzed: {type: 'string', index: 'analyzed'}
+        raw: { type: 'keyword' }
       }
     },
     'color' => {
-      type: 'string', index: 'not_analyzed'
+      type: 'keyword'
     },
     'warehouse_id' => {
-      type: 'string', index: 'not_analyzed'
+      type: 'keyword'
+    },
+    'price' => {
+      type: 'long'
+    },
+    'widget_part' => {
+      type: 'object',
+      properties: {
+        'name' => { type: 'keyword' }
+      }
     }
   )
 
@@ -31,8 +46,4 @@ class Widget
       end
     end
   end
-
-  def warehouse=(other)
-    self.warehouse_id = other.id
-  end
 end

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

@@ -4,6 +4,7 @@ class WidgetQuery
   define_attributes [:name, :color]
 
   self.percolates_model = Widget
+  self.elastic_index.mapping_type = 'widget'
 
   def as_search_document
     filters = {}

data/test/dummy/db/migrate/20151211225259_create_warehouses.rb

@@ -0,0 +1,7 @@
+class CreateWarehouses < ActiveRecord::Migration[5.1]
+  def change
+    create_table :warehouses do |t|
+      t.string :name, null: false
+    end
+  end
+end

data/test/dummy/db/migrate/20180215140125_create_widgets.rb

@@ -0,0 +1,11 @@
+class CreateWidgets < ActiveRecord::Migration[5.1]
+  def change
+    create_table :widgets do |t|
+      t.string :warehouse_id
+      t.string :name
+      t.string :color
+      t.integer :price
+      t.jsonb :widget_part
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,13 +10,21 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151211225259) do
+ActiveRecord::Schema.define(version: 20180215140125) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "projects", force: :cascade do |t|
+  create_table "warehouses", force: :cascade do |t|
     t.string "name", null: false
   end
 
+  create_table "widgets", force: :cascade do |t|
+    t.string "warehouse_id"
+    t.string "name"
+    t.string "color"
+    t.integer "price"
+    t.jsonb "widget_part"
+  end
+
 end