elastic_record 4.0.0 → 4.1.0

data/test/elastic_record/index/settings_test.rb

@@ -6,9 +6,42 @@ class ElasticRecord::Index::SettingsTest < MiniTest::Test
     assert_equal expected, ElasticRecord::Index.new(Widget).settings
   end
 
+  class ModelWithAnalyzers
+    include TestModel
+
+    doctype.analysis = {
+      "analyzer": {
+        "my_custom_analyzer": {
+          "type":      "custom",
+          "tokenizer": "standard"
+        }
+      }
+    }
+
+    elastic_index.settings = {
+      "number_of_shards" => 10
+    }
+  end
+
+  def test_settings
+    expected = {
+      "analysis" => {
+        "analyzer": {
+          "my_custom_analyzer": {
+            "type":      "custom",
+            "tokenizer": "standard"
+          }
+        }
+      },
+      "number_of_shards" => 10
+    }
+
+    assert_equal expected, ModelWithAnalyzers.elastic_index.settings
+  end
+
   private
 
     def index
       @index ||= ElasticRecord::Index.new(Widget)
     end
-end
+end

data/test/elastic_record/index_test.rb

@@ -5,12 +5,14 @@ class ElasticRecord::IndexTest < MiniTest::Test
     copied = index.dup
 
     refute_equal copied.settings.object_id, index.settings.object_id
-    refute_equal copied.mapping.object_id, index.mapping.object_id
   end
 
-  def test_model_name
+  def test_doctypes
+    assert_equal [Widget.doctype], index.doctypes
+  end
+
+  def test_alias_name
     assert_equal 'widgets', index.alias_name
-    assert_equal 'widget', index.type
   end
 
   def test_disable
@@ -26,19 +28,9 @@ class ElasticRecord::IndexTest < MiniTest::Test
     refute index.disabled
   end
 
-  def test_configure
-    context = nil
-
-    index.configure do
-      context = self
-    end
-
-    assert_kind_of ElasticRecord::Index::Configurator, context
-  end
+  private
 
-  private;
-  
     def index
       @index ||= ElasticRecord::Index.new(Widget)
     end
-end
+end

data/test/elastic_record/model_test.rb

@@ -11,13 +11,6 @@ class ElasticRecord::ModelTest < MiniTest::Test
     assert_equal ElasticRecord::Config.connection_options.symbolize_keys, connection.options
   end
 
-  def test_elastic_relation
-    relation = Widget.elastic_relation
-
-    assert_equal Widget, relation.klass
-    assert_equal Widget.arelastic, relation.arelastic
-  end
-
   def test_elastic_index
     index = Widget.elastic_index
 
@@ -26,5 +19,6 @@ class ElasticRecord::ModelTest < MiniTest::Test
 
   def test_elastic_index_inheritence
     refute_equal Widget.elastic_index.object_id, InheritedModel.elastic_index.object_id
+    refute_equal Widget.doctype.object_id, InheritedModel.doctype.object_id
   end
 end

data/test/elastic_record/percolator_model_test.rb

@@ -0,0 +1,54 @@
+require 'helper'
+
+class ElasticRecord::PercolatorModelTest < MiniTest::Test
+  def test_elastic_index
+    assert_equal [WidgetQuery.doctype, Widget.doctype], index.doctypes
+    refute index.partial_updates
+    assert_equal({}, index.settings)
+  end
+
+  def test_doctype
+    assert_equal ElasticRecord::Doctype.percolator_doctype, WidgetQuery.doctype
+  end
+
+  def test_as_search_document
+    query = WidgetQuery.new(name: 'foo', color: 'red')
+
+    expected = {
+      "query" => {
+        "bool" => {
+          "filter" => {
+            "bool" => {
+              "must" => [
+                { "term" => { :name=>"foo" } },
+                { "term" => { :color => "red" } }
+              ]
+            }
+          }
+        }
+      }
+    }
+
+    assert_equal expected, query.as_search_document
+  end
+
+  def test_percolate_when_no_hits
+    query = WidgetQuery.create(name: 'foo', color: 'red')
+    should_not_hit = { name: 'bar', color: 'blue' }
+
+    assert_empty WidgetQuery.percolate(should_not_hit)
+  end
+
+  def test_percolate_when_hits
+    query = WidgetQuery.create(color: 'red')
+    should_hit = { name: 'foo', color: 'red' }
+
+    assert_equal [query], WidgetQuery.percolate(should_hit)
+  end
+
+  private
+
+    def index
+      @index ||= WidgetQuery.elastic_index
+    end
+end

data/test/elastic_record/relation/batches_test.rb

@@ -63,7 +63,6 @@ class ElasticRecord::Relation::BatchesTest < MiniTest::Test
 
   private
     def create_widgets
-      Widget.elastic_index.delete_all
       Widget.elastic_index.bulk_add [
         Widget.new(id: 5, color: 'red'),
         Widget.new(id: 10, color: 'blue'),

data/test/elastic_record/relation/delegation_test.rb

@@ -2,7 +2,6 @@ require 'helper'
 
 class ElasticRecord::Relation::DelegationTest < MiniTest::Test
   def test_delegate_to_array
-    Widget.elastic_index.delete_all
     Widget.elastic_index.index_document('5', color: 'red')
 
     records = []

data/test/elastic_record/relation/finder_methods_test.rb

@@ -69,7 +69,6 @@ class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Test
   private
 
     def create_widgets
-      Widget.elastic_index.delete_all
       Widget.elastic_index.bulk_add [
         Widget.new(color: 'red', id: '05'),
         Widget.new(color: 'blue', id: '10'),

data/test/elastic_record/relation_test.rb

@@ -28,14 +28,12 @@ class ElasticRecord::RelationTest < MiniTest::Test
   end
 
   def test_to_ids
-    Widget.elastic_index.delete_all
     create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
 
     assert_equal ['5', '10'].to_set, Widget.elastic_relation.to_ids.to_set
   end
 
   def test_to_a
-    Widget.elastic_index.delete_all
     create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
 
     array = Widget.elastic_relation.to_a

data/test/elastic_record/searching_test.rb

@@ -1,6 +1,13 @@
 require 'helper'
 
 class ElasticRecord::SearchingTest < MiniTest::Test
+  def test_elastic_relation
+    relation = Widget.elastic_relation
+
+    assert_equal Widget, relation.klass
+    assert_equal Widget.arelastic, relation.arelastic
+  end
+
   def test_elastic_search
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -54,28 +54,27 @@ files:
 - Rakefile
 - elastic_record.gemspec
 - lib/elastic_record.rb
+- lib/elastic_record/as_document.rb
 - lib/elastic_record/callbacks.rb
 - lib/elastic_record/config.rb
 - lib/elastic_record/connection.rb
+- lib/elastic_record/doctype.rb
 - lib/elastic_record/errors.rb
 - lib/elastic_record/index.rb
 - lib/elastic_record/index/analyze.rb
-- lib/elastic_record/index/configurator.rb
 - lib/elastic_record/index/deferred.rb
 - lib/elastic_record/index/documents.rb
 - lib/elastic_record/index/manage.rb
 - lib/elastic_record/index/mapping.rb
-- lib/elastic_record/index/percolator.rb
 - lib/elastic_record/index/settings.rb
-- lib/elastic_record/index/warmer.rb
 - lib/elastic_record/json.rb
 - lib/elastic_record/log_subscriber.rb
 - lib/elastic_record/lucene.rb
 - lib/elastic_record/model.rb
+- lib/elastic_record/percolator_model.rb
 - lib/elastic_record/railtie.rb
 - lib/elastic_record/railties/controller_runtime.rb
 - lib/elastic_record/relation.rb
-- lib/elastic_record/relation/admin.rb
 - lib/elastic_record/relation/batches.rb
 - lib/elastic_record/relation/delegation.rb
 - lib/elastic_record/relation/finder_methods.rb
@@ -98,10 +97,13 @@ files:
 - test/dummy/app/mailers/.keep
 - test/dummy/app/models/.keep
 - test/dummy/app/models/concerns/.keep
+- test/dummy/app/models/mock_model.rb
 - test/dummy/app/models/project.rb
 - test/dummy/app/models/test_model.rb
+- test/dummy/app/models/test_percolator_model.rb
 - test/dummy/app/models/warehouse.rb
 - test/dummy/app/models/widget.rb
+- test/dummy/app/models/widget_query.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
@@ -135,24 +137,23 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/elastic_record/as_document_test.rb
 - test/elastic_record/callbacks_test.rb
 - test/elastic_record/config_test.rb
 - test/elastic_record/connection_test.rb
+- test/elastic_record/doctype_test.rb
 - test/elastic_record/index/analyze_test.rb
-- test/elastic_record/index/configurator_test.rb
 - test/elastic_record/index/documents_test.rb
 - test/elastic_record/index/manage_test.rb
 - test/elastic_record/index/mapping_test.rb
-- test/elastic_record/index/percolator_test.rb
 - test/elastic_record/index/settings_test.rb
-- test/elastic_record/index/warmer_test.rb
 - test/elastic_record/index_test.rb
 - test/elastic_record/integration/active_record_test.rb
 - test/elastic_record/log_subscriber_test.rb
 - test/elastic_record/lucene_test.rb
 - test/elastic_record/model_test.rb
+- test/elastic_record/percolator_model_test.rb
 - test/elastic_record/railties/controller_runtime_test.rb
-- test/elastic_record/relation/admin_test.rb
 - test/elastic_record/relation/batches_test.rb
 - test/elastic_record/relation/delegation_test.rb
 - test/elastic_record/relation/finder_methods_test.rb

data/lib/elastic_record/index/configurator.rb

@@ -1,18 +0,0 @@
-module ElasticRecord
-  class Index
-    class Configurator
-      attr_reader :index
-      def initialize(index)
-        @index = index
-      end
-
-      def property(name, options)
-        index.mapping[:properties][name.to_sym] = options
-      end
-
-      def has_percolator!
-        index.has_percolator = true
-      end
-    end
-  end
-end

data/lib/elastic_record/index/percolator.rb

@@ -1,50 +0,0 @@
-module ElasticRecord
-  class Index
-    module Percolator
-      def create_percolator(name, elastic_query)
-        connection.json_put "/#{percolator_name}/.percolator/#{name}", elastic_query
-      end
-
-      def delete_percolator(name)
-        connection.json_delete "/#{percolator_name}/.percolator/#{name}"
-      end
-
-      def percolator_exists?(name)
-        connection.head("/#{percolator_name}/.percolator/#{name}") == '200'
-      end
-
-      def get_percolator(name)
-        json = connection.json_get("/#{percolator_name}/.percolator/#{name}")
-        json['_source'] if json['found']
-      end
-
-      def percolate(document)
-        hits = connection.json_get("/#{percolator_name}/#{type}/_percolate", 'doc' => document)['matches']
-        hits.map { |hits| hits['_id'] }
-      end
-
-      def all_percolators
-        if hits = connection.json_get("/#{percolator_name}/.percolator/_search?q=*&size=500")['hits']
-          hits['hits'].map { |hit| hit['_id'] }
-        end
-      end
-
-      def create_percolator_index
-        create(percolator_name) unless exists?(percolator_name)
-      end
-
-      def delete_percolator_index
-        delete(percolator_name) if exists?(percolator_name)
-      end
-
-      def reset_percolators
-        delete_percolator_index
-        create_percolator_index
-      end
-
-      def percolator_name
-        "#{alias_name}_percolator"
-      end
-    end
-  end
-end

data/lib/elastic_record/index/warmer.rb

@@ -1,24 +0,0 @@
-module ElasticRecord
-  class Index
-    module Warmer
-      def create_warmer(name, elastic_query)
-        connection.json_put "/#{alias_name}/#{type}/_warmer/#{name}", elastic_query
-      end
-
-      def delete_warmer(name)
-        connection.json_delete "/#{alias_name}/_warmer/#{name}"
-      end
-
-      def get_warmer(name)
-        json = connection.json_get("/#{alias_name}/#{type}/_warmer/#{name}")
-        if json.any?
-          json.values.first['warmers'][name]
-        end
-      end
-
-      def warmer_exists?(name)
-        !get_warmer(name).nil?
-      end
-    end
-  end
-end

data/lib/elastic_record/relation/admin.rb

@@ -1,13 +0,0 @@
-module ElasticRecord
-  class Relation
-    module Admin
-      def create_percolator(name)
-        klass.elastic_index.create_percolator(name, as_elastic)
-      end
-
-      def create_warmer(name)
-        klass.elastic_index.create_warmer(name, as_elastic)
-      end
-    end
-  end
-end

data/test/elastic_record/index/configurator_test.rb

@@ -1,18 +0,0 @@
-require 'helper'
-
-class ElasticRecord::Index::ConfiguratorTest < MiniTest::Test
-  def test_property
-    configurator.property :am_i_cool, type: "boolean"
-
-    expected = {type: "boolean"}
-    assert_equal expected, configurator.index.mapping[:properties][:am_i_cool]
-  end
-
-  private
-    def configurator
-      @configurator ||= begin
-        index = ElasticRecord::Index.new(Widget)
-        ElasticRecord::Index::Configurator.new(index)
-      end
-    end
-end

data/test/elastic_record/index/percolator_test.rb

@@ -1,45 +0,0 @@
-require 'helper'
-
-class ElasticRecord::Index::PercolatorTest < MiniTest::Test
-  def test_create_percolator
-    index.disable_deferring!
-
-    index.delete_percolator('green') if index.percolator_exists?('green')
-    index.delete_percolator('blue') if index.percolator_exists?('blue')
-
-    index.create_percolator('green', 'query' => {'match' => {'color' => 'green'}})
-
-    assert index.percolator_exists?('green')
-    refute index.percolator_exists?('blue')
-  end
-
-  def test_delete_percolator
-    index.disable_deferring!
-
-    index.create_percolator('green', 'query' => {'match' => {'color' => 'green'}})
-    assert index.percolator_exists?('green')
-
-    index.delete_percolator('green')
-    refute index.percolator_exists?('green')
-  end
-
-  def test_reset_percolators
-    index.disable_deferring!
-
-    index.create_percolator('green', 'query' => {'match' => {'color' => 'green'}})
-    assert index.percolator_exists?('green')
-
-    index.reset_percolators
-
-    refute index.percolator_exists?('green')
-  end
-
-  def test_percolate
-  end
-
-  private
-
-    def index
-      Widget.elastic_index
-    end
-end