elastic_record 0.11.1 → 0.12.0

data/lib/elastic_record/model.rb

@@ -9,13 +9,16 @@ module ElasticRecord
     end
 
     module ClassMethods
-      # def inherited(child)
-      #   super
-      #   child.elastic_index = elastic_index.dup
-      # end
+      def inherited(child)
+        super
+
+        if child < child.base_class
+          child.elastic_index = elastic_index.dup
+        end
+      end
 
       def elastic_connection
-        @elastic_connection ||= ElasticRecord::Connection.new(ElasticRecord::Config.servers)
+        @elastic_connection ||= ElasticRecord::Connection.new(ElasticRecord::Config.servers, ElasticRecord::Config.connection_options)
       end
 
       def elastic_connection=(connection)

data/lib/elastic_record/relation/batches.rb

@@ -8,6 +8,12 @@ module ElasticRecord
       end
 
       def find_in_batches(options = {})
+        find_ids_in_batches(options) do |ids|
+          yield klass.find(ids)
+        end
+      end
+
+      def find_ids_in_batches(options = {})
         scroll_keep_alive = '10m'
 
         options = {
@@ -19,7 +25,7 @@ module ElasticRecord
         scroll_id = klass.elastic_index.search(as_elastic, options)['_scroll_id']
 
         while (hit_ids = get_scroll_hit_ids(scroll_id, scroll_keep_alive)).any?
-          yield klass.find(hit_ids)
+          yield hit_ids
         end
       end
 
@@ -30,6 +36,7 @@ module ElasticRecord
       end
 
       private
+
         def get_scroll_hit_ids(scroll_id, scroll_keep_alive)
           json = klass.elastic_index.scroll(scroll_id, scroll_keep_alive)
           json['hits']['hits'].map { |hit| hit['_id'] }

data/lib/elastic_record/relation/finder_methods.rb

@@ -6,11 +6,11 @@ module ElasticRecord
       end
 
       def first
-        find_one order('_uid')
+        find_one self
       end
 
       def last
-        find_one order('color' => 'reverse')
+        find_one reverse_order
       end
 
       def all

data/lib/elastic_record/relation/none.rb

@@ -12,10 +12,10 @@ module ElasticRecord
       def facets
         {}
       end
-      
+
       def as_elastic
-        {}
+        Arelastic::Filters::Not.new(Arelastic::Queries::MatchAll.new).as_elastic
       end
     end
   end
-end
+end

data/lib/elastic_record/relation/search_methods.rb

@@ -85,10 +85,10 @@ module ElasticRecord
       end
 
       def facet(facet_or_name, options = {})
-        clone.facet! facet_or_name, options = {}
+        clone.facet! facet_or_name, options
       end
 
-      def order!(*args)
+      def order!(*args) # :nodoc:
         self.order_values += args.flatten
         self
       end
@@ -97,6 +97,18 @@ module ElasticRecord
         clone.order! *args
       end
 
+      # Reverse the existing order clause on the relation.
+      #
+      #   User.order('name').reverse_order # generated search has 'sort: {'name' => :desc}
+      def reverse_order
+        clone.reverse_order!
+      end
+
+      def reverse_order! # :nodoc:
+        self.reverse_order_value = !reverse_order_value
+        self
+      end
+
       def extending!(*modules, &block)
         modules << Module.new(&block) if block_given?
 
@@ -214,7 +226,25 @@ module ElasticRecord
         end
 
         def build_orders(orders)
-          Arelastic::Searches::Sort.new(orders) unless orders.empty?
+          unless orders.empty?
+            orders = reverse_query_order(orders) if reverse_order_value
+            Arelastic::Searches::Sort.new(orders) unless orders.empty?
+          end
+        end
+
+        def reverse_query_order(orders)
+          orders.reverse.map do |o|
+            case o
+            when String, Symbol
+              {o => :desc}
+            when Hash
+              o.each_with_object({}) do |(field, dir), memo|
+                memo[field] = (dir.to_sym == :asc ? :desc : :asc )
+              end
+            else
+              o
+            end
+          end
         end
     end
   end

data/lib/elastic_record/relation/value_methods.rb

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

data/lib/elastic_record/searches_many.rb

@@ -43,6 +43,10 @@ module ElasticRecord
       #   is used on the associate class (such as a Post class). You can also specify a custom counter
       #   cache column by providing a column name instead of a +true+/+false+ value to this
       #   option (e.g., <tt>:counter_cache => :my_custom_counter</tt>.)
+      # [:class_name]
+      #   Specify the class name of the association. Use it only if that name can't be inferred
+      #   from the association name. So <tt>has_one :manager</tt> will by default be linked to the Manager class, but
+      #   if the real class name is Person, you'll have to specify it with this option.
       # 
       # === Example
       # 

data/lib/elastic_record/searches_many/association.rb

@@ -19,6 +19,10 @@ module ElasticRecord
           other_record.is_a?(Hash) ? klass.new(other_record) : other_record
         end
 
+        delete(load_collection - other_records)
+        merge_collections(load_collection, other_records)
+        concat(other_records - load_collection)
+
         if reflection.counter_cache_column
           owner.send("#{reflection.counter_cache_column}=", other_records.size)
         end
@@ -26,10 +30,6 @@ module ElasticRecord
         if reflection.touch_column
           owner.send("#{reflection.touch_column}=", Time.current)
         end
-
-        delete(load_collection - other_records)
-        merge_collections(load_collection, other_records)
-        concat(other_records - load_collection)
       end
   
       def reader
@@ -55,15 +55,21 @@ module ElasticRecord
       end
 
       def delete(records)
-        if options[:autosave] || owner.new_record?
-          records.each(&:mark_for_destruction)
-        else
-          record.destroy
+        records.each do |record|
+          callback(:before_remove, record)
+
+          if options[:autosave] || owner.new_record?
+            record.mark_for_destruction
+          else
+            record.destroy
+          end
+
+          callback(:after_remove, record)
         end
       end
 
       def scope
-        search = klass.elastic_search.filter "#{reflection.belongs_to}_id" => owner.id
+        search = klass.elastic_search.filter("#{reflection.belongs_to}_id" => owner.id).limit(1000)
         if options[:as]
           search.filter! "#{reflection.belongs_to}_type" => owner.class.name
         end
@@ -76,7 +82,6 @@ module ElasticRecord
           @loaded = true
         end
 
-        loaded = true
         collection
       end
 
@@ -86,7 +91,13 @@ module ElasticRecord
         end
 
         def persisted_collection
-          scope.to_a
+          @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
         end
 
         def merge_collections(existing_records, new_records)
@@ -122,10 +133,10 @@ module ElasticRecord
 
         def callback(method, record)
           reflection.callbacks[method].each do |callback|
-            if callback.is_a?(Symbol)
-              owner.send(callback, record)
-            else
+            if callback.respond_to?(:call)
               callback.call(owner, record)
+            else
+              owner.send(callback, record)
             end
           end
         end

data/lib/elastic_record/searches_many/reflection.rb

@@ -13,7 +13,7 @@ module ElasticRecord
       end
 
       def klass_name
-        name.to_s.classify
+        options[:class_name] || name.to_s.classify
       end
 
       def belongs_to

data/lib/elastic_record/tasks/index.rake

@@ -14,32 +14,16 @@ namespace :index do
   desc "Create index for CLASS or all models."
   task create: :environment do
     ElasticRecord::Task.get_models.each do |model|
-      # begin
-        index_name = model.elastic_index.create_and_deploy
-        logger.info "Created #{model.name} index (#{index_name})"
-      # rescue => e
-      #   if e.message =~ /IndexAlreadyExistsException/
-      #     logger.info "#{model.name} index already exists"
-      #   else
-      #     raise e
-      #   end
-      # end
+      index_name = model.elastic_index.create_and_deploy
+      logger.info "Created #{model.name} index (#{index_name})"
     end
   end
 
   desc "Drop index for CLASS or all models."
   task drop: :environment do
     ElasticRecord::Task.get_models.each do |model|
-      # begin
-        model.elastic_index.delete_all
-        logger.info "Dropped #{model.name} index"
-      # rescue => e
-      #   if e.message =~ /IndexMissingException/
-      #     logger.info "#{model.name} index does not exist"
-      #   else
-      #     raise e
-      #   end
-      # end
+      model.elastic_index.delete_all
+      logger.info "Dropped #{model.name} index"
     end
   end
 
@@ -76,4 +60,4 @@ namespace :index do
       logger.info "  Done."
     end
   end
-end
+end

data/test/elastic_record/callbacks_test.rb

@@ -10,6 +10,15 @@ class ElasticRecord::CallbacksTest < MiniTest::Spec
     assert Widget.elastic_index.record_exists?(widget.id)
   end
 
+  def test_not_added_to_index_if_not_dirty
+    widget = Widget.new id: '10', color: 'green'
+    widget.changed_attributes.clear
+
+    widget.save
+
+    refute Widget.elastic_index.record_exists?(widget.id)
+  end
+
   def test_deleted_from_index
     widget = Widget.new id: '10', color: 'green'
     Widget.elastic_index.index_document(widget.id, widget.as_search)

data/test/elastic_record/connection_test.rb

@@ -24,7 +24,7 @@ class ElasticRecord::ConnectionTest < MiniTest::Spec
     assert_equal expected, connection.json_put("/test")
   end
 
-  def test_json_request_with_error
+  def test_json_request_with_error_status
     response_json = {'error' => 'Doing it wrong'}
     FakeWeb.register_uri(:get, %r[/error], status: ["404", "Not Found"], body: ActiveSupport::JSON.encode(response_json))
 
@@ -35,6 +35,24 @@ class ElasticRecord::ConnectionTest < MiniTest::Spec
     assert_equal 'Doing it wrong', error.message
   end
 
+  def test_execute_retries
+    responses = [
+      {exception: Errno::ECONNREFUSED},
+      {status: ["200", "OK"], body: ActiveSupport::JSON.encode('hello' => 'world')}
+    ]
+
+    ElasticRecord::Connection.new(ElasticRecord::Config.servers, retries: 0).tap do |connection|
+      FakeWeb.register_uri :get, %r[/error], 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
+      json = connection.json_get("/error")
+      assert_equal({'hello' => 'world'}, json)
+    end
+  end
+
   private
     def connection
       ElasticRecord::Connection.new(ElasticRecord::Config.servers)

data/test/elastic_record/index/configurator_test.rb

@@ -0,0 +1,18 @@
+require 'helper'
+
+class ElasticRecord::Index::ConfiguratorTest < MiniTest::Spec
+  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/documents_test.rb

@@ -1,6 +1,12 @@
 require 'helper'
 
 class ElasticRecord::Index::DocumentsTest < MiniTest::Spec
+  class InheritedWidget < Widget
+    def self.base_class
+      Widget
+    end
+  end
+
   def setup
     super
     index.disable_deferring!
@@ -32,7 +38,7 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Spec
   end
 
   def test_bulk
-    assert_nil index.instance_variable_get(:@batch)
+    assert_nil index.instance_variable_get(:@_batch)
 
     index.bulk do
       index.index_document '5', color: 'green'
@@ -43,13 +49,26 @@ 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.instance_variable_get(:@_batch)
     end
 
-    assert_nil index.instance_variable_get(:@batch)
+    assert_nil index.instance_variable_get(:@_batch)
+  end
+
+  def test_bulk_inheritence
+    index.bulk do
+      InheritedWidget.elastic_index.index_document '5', color: 'green'
+
+      expected = [
+        {index: {_index: "widgets", _type: "widget", _id: "5"}},
+        {color: "green"}
+      ]
+      assert_equal expected, index.instance_variable_get(:@_batch)
+    end
   end
 
   private
+
     def index
       @index ||= Widget.elastic_index
     end

data/test/elastic_record/index/manage_test.rb

@@ -26,6 +26,13 @@ class ElasticRecord::Index::ManageTest < MiniTest::Spec
     assert !index.exists?('widgets_bar')
   end
 
+  def test_type_exists
+    index.create 'widgets_foo'
+
+    assert index.type_exists?('widgets_foo')
+    assert !index.type_exists?('widgets_bar')    
+  end
+
   def test_deploy
     index.create 'widgets_foo'
     

data/test/elastic_record/index/mapping_test.rb

@@ -1,6 +1,17 @@
 require 'helper'
 
 class ElasticRecord::Index::MappingTest < MiniTest::Spec
+  def test_delete_mapping
+    index_name = index.create
+    index.get_mapping(index_name)
+
+    index.delete_mapping(index_name)
+    
+    assert_raises ElasticRecord::ConnectionError do
+      index.get_mapping(index_name)
+    end
+  end
+
   def test_default_mapping
     mapping = index.mapping