elastic_record 4.0.0 → 4.1.0

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

@@ -2,108 +2,7 @@ module TestModel
   extend ActiveSupport::Concern
 
   included do
-    extend ActiveModel::Naming
-    extend ActiveModel::Callbacks
-    define_model_callbacks :save, :update, :create, :destroy
-
-    include ActiveModel::Dirty
-    include ActiveModel::Validations
-
+    include MockModel
     include ElasticRecord::Model
   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/test_percolator_model.rb

@@ -0,0 +1,8 @@
+module TestPercolatorModel
+  extend ActiveSupport::Concern
+
+  included do
+    include MockModel
+    include ElasticRecord::PercolatorModel
+  end
+end

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

@@ -5,13 +5,10 @@ class Widget
 
   define_attributes [:name, :color, :warehouse_id]
 
-  self.elastic_index.has_percolator = true
-
-  self.elastic_index.mapping[:properties].update(
+  self.doctype.mapping[:properties].update(
     'name' => {
-      type: 'string',
+      type: 'string', index: 'not_analyzed',
       fields: {
-        name: {type: 'string', index: 'not_analyzed'},
         analyzed: {type: 'string', index: 'analyzed'}
       }
     },

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

@@ -0,0 +1,14 @@
+class WidgetQuery
+  include TestPercolatorModel
+
+  define_attributes [:name, :color]
+
+  self.percolates_model = Widget
+
+  def as_search_document
+    filters = {}
+    filters[:name] = name if name
+    filters[:color] = color if color
+    percolates_model.elastic_search.filter(filters).as_elastic
+  end
+end

data/test/dummy/config/environments/test.rb

@@ -12,9 +12,9 @@ Rails.application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  # Configure public file server for tests with Cache-Control for performance.
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/test/dummy/config/initializers/elastic_record.rb

@@ -1,3 +1,3 @@
 ElasticRecord.configure do |config|
-  config.model_names = %w(Warehouse Widget Project)
+  config.model_names = %w(Warehouse Widget WidgetQuery Project)
 end

data/test/elastic_record/as_document_test.rb

@@ -0,0 +1,65 @@
+require 'helper'
+
+class ElasticRecord::AsDocumentTest < MiniTest::Test
+  def test_as_search_document
+    Widget.new(id: '10', color: 'green').tap do |widget|
+      assert_equal({"color" => "green"}, widget.as_search_document)
+    end
+
+    Widget.new(id: '10', color: '').tap do |widget|
+      assert_equal({}, widget.as_search_document)
+    end
+
+    Widget.new(id: '10', color: false).tap do |widget|
+      assert_equal({"color" => false}, widget.as_search_document)
+    end
+  end
+
+  def test_as_dirty_search
+    Widget.new(id: '10', color: 'green').tap do |widget|
+      assert_equal({'color' => 'green'}, widget.as_partial_update_document)
+    end
+
+    Widget.new(id: '10').tap do |widget|
+      assert_equal({}, widget.as_partial_update_document)
+    end
+
+    Widget.new(id: '10', color: '').tap do |widget|
+      assert_equal({'color' => nil}, widget.as_partial_update_document)
+    end
+  end
+
+  class SpecialFieldsModel
+    include TestModel
+
+    class Author
+      def as_search_document
+        {name: 'Jonny'}
+      end
+    end
+
+    self.doctype.mapping[:properties].update(
+      author: {
+        type: :object
+      },
+      commenters: {
+        type: :nested
+      }
+    )
+
+    def author
+      Author.new
+    end
+
+    def commenters
+      [Author.new, Author.new]
+    end
+  end
+
+  def test_as_search_document_with_special_fields
+    doc = SpecialFieldsModel.new.as_search_document
+
+    assert_equal({name: 'Jonny'}, doc[:author])
+    assert_equal([{name: 'Jonny'}, {name: 'Jonny'}], doc[:commenters])
+  end
+end

data/test/elastic_record/callbacks_test.rb

@@ -21,7 +21,7 @@ class ElasticRecord::CallbacksTest < MiniTest::Test
 
   def test_deleted_from_index
     widget = Widget.new id: '10', color: 'green'
-    Widget.elastic_index.index_document(widget.id, widget.as_search)
+    Widget.elastic_index.index_document(widget.id, widget.as_search_document)
 
     assert Widget.elastic_index.record_exists?(widget.id)
 
@@ -30,95 +30,20 @@ class ElasticRecord::CallbacksTest < MiniTest::Test
     refute Widget.elastic_index.record_exists?(widget.id)
   end
 
-  def test_as_search
-    Widget.new(id: '10', color: 'green').tap do |widget|
-      assert_equal({"color" => "green"}, widget.as_search)
-    end
-
-    Widget.new(id: '10', color: '').tap do |widget|
-      assert_equal({}, widget.as_search)
-    end
-
-    Widget.new(id: '10', color: false).tap do |widget|
-      assert_equal({"color" => false}, widget.as_search)
-    end
-  end
-
-  def test_as_dirty_search
-    Widget.new(id: '10', color: 'green').tap do |widget|
-      assert_equal({'color' => 'green'}, widget.as_partial_update_document)
-    end
-
-    Widget.new(id: '10').tap do |widget|
-      assert_equal({}, widget.as_partial_update_document)
-    end
-
-    Widget.new(id: '10', color: '').tap do |widget|
-      assert_equal({'color' => nil}, widget.as_partial_update_document)
-    end
-  end
-
-  class SpecialFieldsModel
-    include TestModel
-
-    class Author
-      def as_search
-        {name: 'Jonny'}
-      end
-    end
-
-    self.elastic_index.mapping[:properties].update(
-      author: {
-        type: :object
-      },
-      commenters: {
-        type: :nested
-      }
-    )
-
-    def author
-      Author.new
-    end
-
-    def commenters
-      [Author.new, Author.new]
-    end
-  end
-
-  def test_as_search_with_special_fields
-    doc = SpecialFieldsModel.new.as_search
-
-    assert_equal({name: 'Jonny'}, doc[:author])
-    assert_equal([{name: 'Jonny'}, {name: 'Jonny'}], doc[:commenters])
-  end
-
   class DisablingModel
     include TestModel
 
-    attr_accessor :called_as_search
-
     define_attributes [:height]
 
-    self.elastic_index.mapping[:properties].update(
+    self.doctype.mapping[:properties].update(
       height: {
-        type: 'string', index: 'not_analyzed'
+        type: 'keyword'
       }
     )
 
-    def as_search
-      @called_as_search = true
+    def as_search_document
+      raise StandardError.new("Should never be called!")
       super
     end
-
-  end
-
-  def test_disabled_skip_document
-    DisablingModel.elastic_index.disable!
-
-    model = DisablingModel.new id: '5', height: '9 feets'
-    model.save
-
-    refute Widget.elastic_index.record_exists?(model.id)
-    refute model.called_as_search
   end
-end
+end

data/test/elastic_record/config_test.rb

@@ -8,7 +8,7 @@ class ElasticRecord::ConfigTest < MiniTest::Test
   def test_models
     ElasticRecord::Config.model_names = %w(Widget)
 
-    assert_equal [Warehouse, Widget, Project], ElasticRecord::Config.models
+    assert_equal [Warehouse, Widget, WidgetQuery, Project], ElasticRecord::Config.models
   end
 
   def test_servers

data/test/elastic_record/doctype_test.rb

@@ -0,0 +1,45 @@
+require 'helper'
+
+class ElasticRecord::DoctypeTest < MiniTest::Test
+  def test_default_mapping
+    doctype = ElasticRecord::Doctype.new('widget')
+
+    refute_nil doctype.mapping[:properties]
+  end
+
+  def test_default_analysis
+    doctype = ElasticRecord::Doctype.new('widget')
+
+    assert_empty doctype.analysis
+  end
+
+  def test_merge_mapping
+    doctype = ElasticRecord::Doctype.new('widget')
+    doctype.mapping[:properties] = {
+      color: { type: 'string' },
+      name: { type: 'string' }
+    }
+
+    custom = { properties: { color: { type: 'integer' } }}
+    doctype.mapping = custom
+
+    expected = {
+      properties: {
+        color: { type: 'integer' },
+        name: { type: 'string' }
+      },
+      _all: {
+        enabled: false
+      }
+    }
+
+    assert_equal expected, doctype.mapping
+  end
+
+  def test_percolator_doctype
+    doctype = ElasticRecord::Doctype.percolator_doctype
+
+    assert_equal 'queries', doctype.name
+    assert_equal ElasticRecord::Doctype::PERCOLATOR_MAPPING, doctype.mapping
+  end
+end

data/test/elastic_record/index/documents_test.rb

@@ -28,7 +28,7 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Test
     index.update_document('abc', color: 'blue')
 
     expected = {'warehouse_id' => '5', 'color' => 'blue'}
-    assert_equal expected, index.get('abc')['_source']
+    assert_equal expected, index.get('abc', Widget.doctype)['_source']
   end
 
   def test_delete_document

data/test/elastic_record/index/mapping_test.rb

@@ -1,23 +1,26 @@
 require 'helper'
 
 class ElasticRecord::Index::MappingTest < MiniTest::Test
-  def test_default_mapping
-    mapping = index.mapping
+  def test_get_mapping
+    expected = {
+      "widget" => {
+        "_all" => { "enabled" => false },
+        "properties" => {
+          "color" => { "type" => "keyword" },
+          "name" => {
+            "type" => "keyword",
+            "fields" => { "analyzed" => { "type" => "text" } }
+          },
+          "warehouse_id" => { "type" => "keyword" }
+        }
+      }
+    }
 
-    refute_nil mapping[:properties]
-  end
-
-  def test_merge_mapping
-    index.mapping.clear
-    index.mapping[:properties] = {color: {type: 'string'}}
-
-    custom = {properties: {color: {type: 'integer'}}, other: 'stuff'}
-    index.mapping = custom
-
-    assert_equal custom, index.mapping
+    assert_equal expected, index.get_mapping
   end
 
   private
+
     def index
       @index ||= ElasticRecord::Index.new(Widget)
     end