elastic_record 2.0.2 → 3.0.0

data/lib/elastic_record/relation/value_methods.rb

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

data/lib/elastic_record/tasks/index.rake

@@ -33,7 +33,7 @@ namespace :index do
       puts "Dropped #{model.name} index"
 
       if index.has_percolator
-        index_name = index.delete_percolator_index
+        index.delete_percolator_index
         puts "Dropped #{model.name} percolator index (#{index.percolator_name})"
       end
     end
@@ -63,7 +63,7 @@ namespace :index do
 
       puts "  Reindexing into #{index_name}"
       model.find_in_batches(batch_size: 100) do |records|
-        model.elastic_index.bulk_add(records, index_name)
+        model.elastic_index.bulk_add(records, index_name: index_name)
       end
 
       puts "  Deploying index..."

data/test/dummy/.env.example

@@ -0,0 +1 @@
+DATABASE_URL=postgres://localhost/elastic_record_development

data/test/dummy/.env.test

@@ -0,0 +1 @@
+DATABASE_URL=postgres://postgres:@localhost/elastic_record_test

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

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

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

@@ -4,7 +4,7 @@ module TestModel
   included do
     extend ActiveModel::Naming
     extend ActiveModel::Callbacks
-    define_model_callbacks :save, :destroy
+    define_model_callbacks :save, :update, :create, :destroy
 
     include ActiveModel::Dirty
     include ActiveModel::Validations
@@ -71,7 +71,8 @@ module TestModel
 
   def save
     @persisted = true
-    run_callbacks :save
+    callback_method = new_record? ? :create : :update
+    run_callbacks callback_method
   end
 
   def destroy

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

@@ -8,17 +8,17 @@ class Widget
   self.elastic_index.has_percolator = true
 
   self.elastic_index.mapping[:properties].update(
-    name: {
+    'name' => {
       type: 'multi_field',
       fields: {
         name: {type: 'string', index: 'not_analyzed'},
         analyzed: {type: 'string', index: 'analyzed'}
       }
     },
-    color: {
+    'color' => {
       type: 'string', index: 'not_analyzed'
     },
-    warehouse_id: {
+    'warehouse_id' => {
       type: 'string', index: 'not_analyzed'
     }
   )

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

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

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

@@ -0,0 +1,7 @@
+class CreateProjects < ActiveRecord::Migration
+  def change
+    create_table :projects do |t|
+      t.string :name, null: false
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,6 +11,13 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 0) do
+ActiveRecord::Schema.define(version: 20151211225259) do
+
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "projects", force: :cascade do |t|
+    t.string "name", null: false
+  end
 
 end

data/test/elastic_record/callbacks_test.rb

@@ -32,7 +32,7 @@ class ElasticRecord::CallbacksTest < MiniTest::Test
 
   def test_as_search
     Widget.new(id: '10', color: 'green').tap do |widget|
-      assert_equal({color: "green"}, widget.as_search)
+      assert_equal({"color" => "green"}, widget.as_search)
     end
 
     Widget.new(id: '10', color: '').tap do |widget|
@@ -40,7 +40,21 @@ class ElasticRecord::CallbacksTest < MiniTest::Test
     end
 
     Widget.new(id: '10', color: false).tap do |widget|
-      assert_equal({color: false}, widget.as_search)
+      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
 

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], ElasticRecord::Config.models
+    assert_equal [Warehouse, Widget, Project], ElasticRecord::Config.models
   end
 
   def test_servers
@@ -21,7 +21,6 @@ class ElasticRecord::ConfigTest < MiniTest::Test
     end
   end
 
-
   private
 
     def with_servers(values)

data/test/elastic_record/connection_test.rb

@@ -1,6 +1,14 @@
 require 'helper'
 
 class ElasticRecord::ConnectionTest < MiniTest::Test
+  def setup
+    ElasticRecord::JSON.parser = :active_support
+  end
+
+  def teardown
+    ElasticRecord::JSON.parser = :active_support
+  end
+
   def test_servers
     assert_equal ['foo'], ElasticRecord::Connection.new('foo').servers
     assert_equal ['foo', 'bar'], ElasticRecord::Connection.new(['foo', 'bar']).servers
@@ -12,16 +20,17 @@ class ElasticRecord::ConnectionTest < MiniTest::Test
   end
 
   def test_head
-    FakeWeb.register_uri(:head, %r[/success], status: ["200", "OK"])
+    stub_es_request(:head, "/success").to_return(status: 200)
+
     assert_equal "200", connection.head("/success")
 
-    FakeWeb.register_uri(:head, %r[/failure], status: ["404", "Not Found"])
+    stub_es_request(:head, "/failure").to_return(status: 404)
     assert_equal "404", connection.head("/failure")
   end
 
   def test_json_requests
     expected = {'foo' => 'bar'}
-    FakeWeb.register_uri(:any, %r[/test], status: ["200", "OK"], body: ActiveSupport::JSON.encode(expected))
+    stub_es_request(:any, "/test").to_return(status: 200, body: ElasticRecord::JSON.encode(expected))
 
     assert_equal expected, connection.json_delete("/test")
     assert_equal expected, connection.json_get("/test")
@@ -29,9 +38,14 @@ class ElasticRecord::ConnectionTest < MiniTest::Test
     assert_equal expected, connection.json_put("/test")
   end
 
-  def test_json_request_with_error_status
+  def test_json_requests_with_oj
+    ElasticRecord::JSON.parser = :oj
+    test_json_requests
+  end
+
+  def test_json_request_with_valid_error_status
     response_json = {'error' => 'Doing it wrong'}
-    FakeWeb.register_uri(:get, %r[/error], status: ["404", "Not Found"], body: ActiveSupport::JSON.encode(response_json))
+    stub_es_request(:get, "/error").to_return(status: 404, body: ElasticRecord::JSON.encode(response_json))
 
     error = assert_raises ElasticRecord::ConnectionError do
       connection.json_get("/error")
@@ -40,26 +54,55 @@ class ElasticRecord::ConnectionTest < MiniTest::Test
     assert_equal 'Doing it wrong', error.message
   end
 
-  def test_execute_retries
+  def test_retry_server_exceptions
     responses = [
       {exception: Errno::ECONNREFUSED},
-      {status: ["200", "OK"], body: ActiveSupport::JSON.encode('hello' => 'world')}
+      {status: ["200", "OK"], body: ElasticRecord::JSON.encode('hello' => 'world')}
     ]
 
     ElasticRecord::Connection.new(ElasticRecord::Config.servers, retries: 0).tap do |connection|
-      FakeWeb.register_uri :get, %r[/error], responses
+      stub_es_request(:get, "/error").to_return(*responses)
       assert_raises(Errno::ECONNREFUSED) { connection.json_get("/error") }
     end
 
     ElasticRecord::Connection.new(ElasticRecord::Config.servers, retries: 1).tap do |connection|
-      FakeWeb.register_uri :get, %r[/error], responses
+      stub_es_request(:get, "/error").to_return(*responses)
+      json = connection.json_get("/error")
+      assert_equal({'hello' => 'world'}, json)
+    end
+  end
+
+  def test_retry_server_500_errors
+    responses = [
+      {status: ["500", "OK"], body: {'error' => 'temporarily_unavailable'}.to_json},
+      {status: ["200", "OK"], body: {'hello' => 'world'}.to_json}
+    ]
+
+    ElasticRecord::Connection.new(ElasticRecord::Config.servers, retries: 0).tap do |connection|
+      stub_es_request(:get, "/error").to_return(*responses)
+
+      error = assert_raises ElasticRecord::ConnectionError do
+        connection.json_get("/error")
+      end
+
+      assert_equal '500', error.status_code
+      assert_equal '{"error":"temporarily_unavailable"}', error.message
+    end
+
+    ElasticRecord::Connection.new(ElasticRecord::Config.servers, retries: 1).tap do |connection|
+      stub_es_request(:get, "/error").to_return(*responses)
       json = connection.json_get("/error")
       assert_equal({'hello' => 'world'}, json)
     end
   end
 
   private
+
     def connection
       ElasticRecord::Connection.new(ElasticRecord::Config.servers)
     end
+
+    def stub_es_request(method, path)
+      stub_request(method, "#{connection.servers.first}#{path}")
+    end
 end

data/test/elastic_record/index/documents_test.rb

@@ -7,12 +7,6 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Test
     end
   end
 
-  def setup
-    super
-    index.disable_deferring!
-    index.reset
-  end
-
   def test_index_record
     record = Widget.new(id: '5', color: 'red')
 
@@ -29,12 +23,24 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Test
     refute index.record_exists?('xyz')
   end
 
+  def test_update_document
+    index.index_document('abc', warehouse_id: '5', color: 'red')
+    index.update_document('abc', color: 'blue')
+
+    expected = {'warehouse_id' => '5', 'color' => 'blue'}
+    assert_equal expected, index.get('abc')['_source']
+  end
+
   def test_delete_document
     index.index_document('abc', color: 'red')
     assert index.record_exists?('abc')
 
     index.delete_document('abc')
     refute index.record_exists?('abc')
+
+    assert_raises RuntimeError do
+      index.delete_document('')
+    end
   end
 
   def test_delete_by_query
@@ -47,6 +53,17 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Test
     assert index.record_exists?('joe')
   end
 
+  def test_create_scan_search
+    index.index_document('bob', name: 'bob')
+    index.index_document('joe', name: 'joe')
+
+    scan_search = index.create_scan_search('query' => {query_string: {query: 'name.analyzed:bob'}})
+
+    assert_equal 1, scan_search.total_hits
+    refute_nil scan_search.scroll_id
+    assert_equal 1, scan_search.request_more_ids.size
+  end
+
   def test_bulk_add
     record = Widget.new(id: 'abc', color: 'red')
 
@@ -61,12 +78,15 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Test
 
     index.bulk do
       index.index_document '5', color: 'green'
+      index.update_document '5', color: 'blue'
       index.delete_document '3'
 
       expected = [
         {index: {_index: index.alias_name, _type: "widget", _id: "5"}},
         {color: "green"},
-        {delete: {_index: index.alias_name, _type: "widget", _id: "3"}}
+        {update: {_index: "widgets", _type: "widget", _id: "5", _retry_on_conflict: 3}},
+        {doc: {color: "blue"}, doc_as_upsert: true},
+        {delete: {_index: index.alias_name, _type: "widget", _id: "3", _retry_on_conflict: 3}}
       ]
       assert_equal expected, index.current_bulk_batch
     end
@@ -75,29 +95,43 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Test
   end
 
   def test_bulk_error
-    index.bulk do
-      index.index_document '5', color: 'green'
-      index.index_document '3', color: {'bad' => 'stuff'}
+    without_deferring do
+      begin
+        index.bulk do
+          index.index_document '5', color: 'green'
+          index.index_document '3', color: {'bad' => 'stuff'}
+        end
+        refute index.record_exists?('3')
+        assert false, 'Expected ElasticRecord::BulkError'
+      rescue => e
+        assert_match '[{"index"', e.message
+      end
     end
-    assert false, 'Expected ElasticRecord::BulkError'
-  rescue => e
-    assert_match '[{"index"', e.message
   end
 
   def test_bulk_inheritence
-    index.bulk do
-      InheritedWidget.elastic_index.index_document '5', color: 'green'
-
-      expected = [
-        {index: {_index: index.alias_name, _type: "widget", _id: "5"}},
-        {color: "green"}
-      ]
-      assert_equal expected, index.current_bulk_batch
+    without_deferring do
+      index.bulk do
+        InheritedWidget.elastic_index.index_document '5', color: 'green'
+
+        expected = [
+          {index: {_index: index.alias_name, _type: "widget", _id: "5"}},
+          {color: "green"}
+        ]
+        assert_equal expected, index.current_bulk_batch
+      end
     end
   end
 
   private
 
+    def without_deferring
+      index.disable_deferring!
+      yield
+      index.reset
+      index.enable_deferring!
+    end
+
     def index
       @index ||= Widget.elastic_index
     end

data/test/elastic_record/index/mapping_test.rb

@@ -1,19 +1,9 @@
 require 'helper'
 
 class ElasticRecord::Index::MappingTest < MiniTest::Test
-  def test_delete_mapping
-    index_name = index.create
-    refute_nil index.get_mapping(index_name)['widget']
-
-    index.delete_mapping(index_name)
-
-    assert_nil index.get_mapping(index_name)
-  end
-
   def test_default_mapping
     mapping = index.mapping
 
-    refute_nil mapping[:_source]
     refute_nil mapping[:properties]
   end
 

data/test/elastic_record/integration/active_record_test.rb

@@ -48,7 +48,7 @@ class ElasticRecord::Mysql2Test < MiniTest::Test
     setup_project_database(
       'adapter'   => 'mysql2',
       'host'      => "localhost",
-      'database'  => 'elastic_record_test',
+      'database'  => 'elastic_record_subtest',
       'username'  => 'root'
     )
   end
@@ -63,9 +63,9 @@ class ElasticRecord::PostgresqlTest < MiniTest::Test
     setup_project_database(
       'adapter'   => 'postgresql',
       'encoding'  => 'unicode',
-      'database'  => 'content_system_development',
+      'database'  => 'elastic_record_subtest',
       'pool'      => 5,
-      'username'  => 'postgres',
+      'host'      => 'localhost',
       'password'  => ''
     )
   end