elastic_record 1.1.4 → 1.1.5

data/lib/elastic_record/relation/batches.rb

@@ -25,9 +25,12 @@ module ElasticRecord
           search_type: 'scan'
         }.update(options)
 
-        scroll_id = klass.elastic_index.search(as_elastic, options)['_scroll_id']
+        search_result = klass.elastic_index.search(as_elastic, options)
+        scroll_id = search_result['_scroll_id']
+        hit_count = 0
 
         while (hit_ids = get_scroll_hit_ids(scroll_id, scroll_keep_alive)).any?
+          hit_count += hit_ids.size
           hit_ids.each_slice(size, &block)
         end
       end

data/lib/elastic_record/relation/finder_methods.rb

@@ -1,14 +1,24 @@
 module ElasticRecord
   class Relation
     module FinderMethods
-      def find(id)
-        filter(arelastic.filter.ids(id)).to_a.first || (raise ActiveRecord::RecordNotFound)
+      def find(*ids)
+        ids = ids.flatten
+        case ids.size
+        when 0; raise ActiveRecord::RecordNotFound.new('empty argument')
+        when 1; filter(arelastic.filter.ids(ids)).first!
+        else
+          filter(arelastic.filter.ids(ids))
+        end
       end
 
       def first
         find_one self
       end
 
+      def first!
+        first or raise ActiveRecord::RecordNotFound
+      end
+
       def last
         find_one reverse_order
       end
@@ -24,4 +34,4 @@ module ElasticRecord
         end
     end
   end
-end
+end

data/lib/elastic_record/relation/search_methods.rb

@@ -39,6 +39,23 @@ module ElasticRecord
         clone.filter!(*args)
       end
 
+      def find_by(*args)
+        filter(*args).first
+      end
+
+      def find_by!(*args)
+        filter(*args).first!
+      end
+
+      def eager_load!(*args)
+        self.eager_load_values += args.flatten
+        self
+      end
+
+      def eager_load(*args)
+        clone.eager_load! *args
+      end
+
       def limit!(value)
         self.limit_value = value
         self

data/lib/elastic_record/relation/value_methods.rb

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

data/lib/elastic_record/searches_many.rb

@@ -97,4 +97,4 @@ module ElasticRecord
         searches_many_cache[name.to_sym] = association
       end
   end
-end
+end

data/lib/elastic_record/searches_many/association.rb

@@ -31,7 +31,7 @@ module ElasticRecord
           owner.send("#{reflection.touch_column}=", Time.current)
         end
       end
-  
+
       def reader
         CollectionProxy.new(self)
       end
@@ -69,7 +69,7 @@ module ElasticRecord
       end
 
       def scope
-        search = klass.elastic_search.filter("#{reflection.belongs_to}_id" => owner.id).limit(1000)
+        search = klass.elastic_search.filter("#{reflection.belongs_to}_id" => owner.id).limit(1000000)
         if options[:as]
           search.filter! "#{reflection.belongs_to}_type" => owner.class.name
         end
@@ -85,19 +85,23 @@ module ElasticRecord
         collection
       end
 
+      def eager_loaded_collection(records)
+        unless @loaded
+          @collection = records
+          @loaded = true
+        end
+
+        collection
+      end
+
       private
+
         def load_persisted_collection?
           !loaded? || owner.new_record?
         end
 
         def persisted_collection
-          @persisted_collection ||= begin
-            if reflection.counter_cache_column && (owner.send(reflection.counter_cache_column).nil? || owner.send(reflection.counter_cache_column) == 0)
-              []
-            else
-              scope.to_a
-            end
-          end
+          @persisted_collection ||= scope.to_a
         end
 
         def merge_collections(existing_records, new_records)
@@ -142,4 +146,4 @@ module ElasticRecord
         end
     end
   end
-end
+end

data/lib/elastic_record/searches_many/builder.rb

@@ -10,14 +10,14 @@ module ElasticRecord
         @model, @name, @options = model, name, options
       end
 
-      def build        
+      def build
         define_writer
         define_reader
 
         reflection = ElasticRecord::SearchesMany::Reflection.new(model, name, options)
         model.searches_many_reflections = model.searches_many_reflections.merge(name => reflection)
 
-        model.add_autosave_callbacks(reflection) # if options[:autosave]
+        model.add_autosave_callbacks(reflection) if options[:autosave]
       end
 
       def mixin
@@ -39,4 +39,4 @@ module ElasticRecord
       end
     end
   end
-end
+end

data/lib/elastic_record/searches_many/collection_proxy.rb

@@ -3,12 +3,18 @@ module ElasticRecord
     class CollectionProxy < ElasticRecord::Relation
       def initialize(association)
         @association = association
-        super association.klass, association.klass.arelastic
+        super association.klass
         merge! association.scope
       end
 
+      def eager_loaded(records)
+        @association.eager_loaded_collection(records)
+      end
+
       def to_a
-        @association.load_collection.reject(&:destroyed?)
+        records = @association.load_collection.reject(&:destroyed?)
+        records = eager_load_associations(records) if eager_loading?
+        records
       end
 
       def <<(*records)
@@ -17,4 +23,4 @@ module ElasticRecord
       alias_method :push, :<<
     end
   end
-end
+end

data/lib/elastic_record/searches_many/reflection.rb

@@ -20,6 +20,10 @@ module ElasticRecord
         options[:as] ? options[:as].to_s : model.name.to_s.demodulize.underscore
       end
 
+      def foreign_key
+        options[:foreign_key] ? options[:foreign_key].to_s : "#{model.name.to_s.demodulize.underscore}_id"
+      end
+
       CALLBACKS = [:before_add, :after_add, :before_remove, :after_remove]
       def define_callbacks(options)
         Hash[CALLBACKS.map { |callback_name| [callback_name, Array(options[callback_name.to_sym])] }]

data/test/elastic_record/callbacks_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::CallbacksTest < MiniTest::Spec
+class ElasticRecord::CallbacksTest < MiniTest::Unit::TestCase
   def test_added_to_index
     widget = Widget.new id: '10', color: 'green'
     refute Widget.elastic_index.record_exists?(widget.id)
@@ -43,4 +43,68 @@ class ElasticRecord::CallbacksTest < MiniTest::Spec
       assert_equal({color: false}, widget.as_search)
     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(
+      height: {
+        type: 'string', index: 'not_analyzed'
+      }
+    )
+
+    def as_search
+      @called_as_search = true
+      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

data/test/elastic_record/config_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::ConfigTest < MiniTest::Spec
+class ElasticRecord::ConfigTest < MiniTest::Unit::TestCase
   def test_defaults
     assert_equal '5m', ElasticRecord::Config.scroll_keep_alive
   end
@@ -8,6 +8,6 @@ class ElasticRecord::ConfigTest < MiniTest::Spec
   def test_models
     ElasticRecord::Config.model_names = %w(Widget)
 
-    assert_equal [Warehouse, Widget], ElasticRecord::Config.models
+    assert_equal [Warehouse, Widget, Option], ElasticRecord::Config.models
   end
-end
+end

data/test/elastic_record/connection_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::ConnectionTest < MiniTest::Spec
+class ElasticRecord::ConnectionTest < MiniTest::Unit::TestCase
   def test_servers
     assert_equal ['foo', 'bar'], ElasticRecord::Connection.new('foo,bar').servers
     assert_equal ['foo', 'bar'], ElasticRecord::Connection.new(['foo', 'bar']).servers

data/test/elastic_record/index/configurator_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Index::ConfiguratorTest < MiniTest::Spec
+class ElasticRecord::Index::ConfiguratorTest < MiniTest::Unit::TestCase
   def test_property
     configurator.property :am_i_cool, type: "boolean"
 

data/test/elastic_record/index/documents_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Index::DocumentsTest < MiniTest::Spec
+class ElasticRecord::Index::DocumentsTest < MiniTest::Unit::TestCase
   class InheritedWidget < Widget
     def self.base_class
       Widget
@@ -13,6 +13,15 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Spec
     index.reset
   end
 
+  def test_index_record
+    record = Widget.new(id: '5', color: 'red')
+
+    index.index_record(record)
+
+    assert index.record_exists?('5')
+    refute index.record_exists?('7')
+  end
+
   def test_index_document
     index.index_document('abc', color: 'red')
 
@@ -59,10 +68,20 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Spec
         {color: "green"},
         {delete: {_index: "widgets", _type: "widget", _id: "3"}}
       ]
-      assert_equal expected, index.instance_variable_get(:@_batch)
+      assert_equal expected, index.current_bulk_batch
     end
 
-    assert_nil index.instance_variable_get(:@_batch)
+    assert_nil index.current_bulk_batch
+  end
+
+  def test_bulk_error
+    index.bulk do
+      index.index_document '5', color: 'green'
+      index.index_document '3', color: {'bad' => 'stuff'}
+    end
+    assert false, 'Expected ElasticRecord::BulkError'
+  rescue => e
+    assert_match '[{"index"', e.message
   end
 
   def test_bulk_inheritence
@@ -73,7 +92,7 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Spec
         {index: {_index: "widgets", _type: "widget", _id: "5"}},
         {color: "green"}
       ]
-      assert_equal expected, index.instance_variable_get(:@_batch)
+      assert_equal expected, index.current_bulk_batch
     end
   end
 

data/test/elastic_record/index/manage_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Index::ManageTest < MiniTest::Spec
+class ElasticRecord::Index::ManageTest < MiniTest::Unit::TestCase
   class Felon
     include TestModel
   end

data/test/elastic_record/index/mapping_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Index::MappingTest < MiniTest::Spec
+class ElasticRecord::Index::MappingTest < MiniTest::Unit::TestCase
   def test_delete_mapping
     index_name = index.create
     index.get_mapping(index_name)

data/test/elastic_record/index/percolator_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Index::PercolatorTest < MiniTest::Spec
+class ElasticRecord::Index::PercolatorTest < MiniTest::Unit::TestCase
   def test_create_percolator
     index.disable_deferring!
 

data/test/elastic_record/index/settings_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Index::SettingsTest < MiniTest::Spec
+class ElasticRecord::Index::SettingsTest < MiniTest::Unit::TestCase
   def test_default_settings
     expected = {}
     assert_equal expected, ElasticRecord::Index.new(Widget).settings

data/test/elastic_record/index/warmer_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Index::WarmerTest < MiniTest::Spec
+class ElasticRecord::Index::WarmerTest < MiniTest::Unit::TestCase
   def test_create_warmer
     index.delete_warmer('green') if index.warmer_exists?('green')
     refute index.warmer_exists?('green')

data/test/elastic_record/index_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::IndexTest < MiniTest::Spec
+class ElasticRecord::IndexTest < MiniTest::Unit::TestCase
   def test_copy
     copied = index.dup
 

data/test/elastic_record/integration/active_record_test.rb

@@ -0,0 +1,39 @@
+require 'helper'
+
+require 'active_record'
+require 'mysql2'
+
+ActiveSupport.on_load :active_record do
+  ActiveRecord::Base.establish_connection(
+    adapter: 'mysql2',
+    host: "localhost",
+    database: "elastic_record_test",
+    username: "root"
+  )
+
+  `mysqladmin -u root -f drop elastic_record_test`
+  `mysqladmin -u root create elastic_record_test`
+
+  ActiveRecord::Migration.create_table :projects do |t|
+    t.string :name, null: false
+  end
+end
+
+require 'elastic_record/integration/active_record'
+class Project < ActiveRecord::Base
+  include ElasticRecord::Model
+
+  self.elastic_index.mapping[:properties].update(
+    name: { type: 'string', index: 'not_analyzed' }
+  )
+end
+
+class ElasticRecord::ActiveRecordTest < MiniTest::Unit::TestCase
+  def test_load_elastic_record_hits
+    poo_product = Project.create! name: "Poo"
+    bear_product = Project.create! name: "Bear"
+
+    assert_equal [poo_product, bear_product], Project.load_elastic_record_hits([poo_product.id, bear_product.id])
+    assert_equal [bear_product, poo_product], Project.load_elastic_record_hits([bear_product.id, poo_product.id])
+  end
+end