elastic_record 1.1.4 → 1.1.5

data/test/elastic_record/log_subscriber_test.rb

@@ -26,6 +26,17 @@ class ElasticRecord::LogSubscriberTest < ActiveSupport::TestCase
     assert_match %r['#{ActiveSupport::JSON.encode('foo' => 'bar')}'], @logger.logged(:debug)[0]
   end
 
+  def test_request_notification_escaping
+    FakeWeb.register_uri(:any, %r[/test?v=%DB], status: ["200", "OK"], body: ActiveSupport::JSON.encode('the' => 'response', 'has %DB' => 'odd %DB stuff'))
+    Widget.elastic_connection.json_get "/test?v=%DB", {'foo' => 'bar', 'escape %DB ' => 'request %DB'}
+
+    wait
+
+    assert_equal 1, @logger.logged(:debug).size
+    assert_match /GET (.*)test/, @logger.logged(:debug)[0]
+    assert_match %r['#{ActiveSupport::JSON.encode('foo' => 'bar', 'escape %DB ' => 'request %DB')}'], @logger.logged(:debug)[0]
+  end
+
   def test_initializes_runtime
     Thread.new { assert_equal 0, ElasticRecord::LogSubscriber.runtime }.join
   end

data/test/elastic_record/lucene_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::LuceneTest < MiniTest::Spec
+class ElasticRecord::LuceneTest < MiniTest::Unit::TestCase
   def test_escape
     assert_equal "\\\\", ElasticRecord::Lucene.escape("\\")
     assert_equal "Matt \\&& Joe", ElasticRecord::Lucene.escape("Matt && Joe")

data/test/elastic_record/model_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::ModelTest < MiniTest::Spec
+class ElasticRecord::ModelTest < MiniTest::Unit::TestCase
   class InheritedModel < Widget
   end
 

data/test/elastic_record/railties/controller_runtime_test.rb

@@ -1,7 +1,7 @@
 require 'helper'
 require "elastic_record/railties/controller_runtime"
 
-class ElasticRecord::Railties::ControllerRuntimeTest < MiniTest::Spec
+class ElasticRecord::Railties::ControllerRuntimeTest < MiniTest::Unit::TestCase
   class TestRuntime
     def self.log_process_action(payload)
       ['sweet']

data/test/elastic_record/relation/admin_test.rb

@@ -1,22 +1,28 @@
 require 'helper'
 
-class ElasticRecord::Relation::AdminTest < MiniTest::Spec
+class ElasticRecord::Relation::AdminTest < MiniTest::Unit::TestCase
   def test_create_percolator
-    Widget.elastic_index.reset_percolator
+    index.delete_percolator('green') if index.percolator_exists?('green')
 
-    Widget.elastic_relation.filter(color: 'green').create_percolator('green')
-    Widget.elastic_relation.filter(color: 'blue').create_percolator('blue')
-    widget = Widget.new(color: 'green')
+    relation = Widget.elastic_relation.filter('color' => 'green')
+    relation.create_percolator('green')
 
-    assert_equal ['green'], Widget.elastic_index.percolate(widget.as_search)
+    assert_equal relation.as_elastic, index.get_percolator('green')
   end
 
   def test_create_warmer
-    Widget.elastic_index.delete_warmer('green') if Widget.elastic_index.warmer_exists?('green')
+    index.delete_warmer('green') if index.warmer_exists?('green')
 
     relation = Widget.elastic_relation.filter('color' => 'green')
     relation.create_warmer('green')
 
     assert_equal relation.as_elastic, Widget.elastic_index.get_warmer('green')['source']
   end
+
+  private
+
+    def index
+      Widget.elastic_index
+    end
+
 end

data/test/elastic_record/relation/batches_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Relation::BatchesTest < MiniTest::Spec
+class ElasticRecord::Relation::BatchesTest < MiniTest::Unit::TestCase
   def setup
     super
     create_widgets
@@ -50,6 +50,22 @@ class ElasticRecord::Relation::BatchesTest < MiniTest::Spec
     assert_equal [['5', '10'].to_set], results.map(&:to_set)
   end
 
+  def test_find_offset_shards
+    create_additional_widgets
+
+    #assert_queries 3 do
+      results = []
+      Widget.elastic_relation.find_ids_in_batches(batch_size: 1) do |ids|
+        results << ids
+      end
+    #end
+
+    assert_equal 8, results.size
+    results.each do |r| assert_equal 1, r.size end
+    assert_equal ['5', '10', '15', '20', '25', '30', '35', '40'].to_set, results.flatten.to_set
+
+  end
+
   private
     def create_widgets
       Widget.elastic_index.bulk_add [
@@ -58,4 +74,14 @@ class ElasticRecord::Relation::BatchesTest < MiniTest::Spec
         Widget.new(id: 15, color: 'green'),
       ]
     end
+
+    def create_additional_widgets
+      Widget.elastic_index.bulk_add [
+          Widget.new(id: 20, color: 'yellow'),
+          Widget.new(id: 25, color: 'violet'),
+          Widget.new(id: 30, color: 'indigo'),
+          Widget.new(id: 35, color: 'orange'),
+          Widget.new(id: 40, color: 'black'),
+      ]
+    end
 end

data/test/elastic_record/relation/delegation_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Relation::DelegationTest < MiniTest::Spec
+class ElasticRecord::Relation::DelegationTest < MiniTest::Unit::TestCase
   def test_delegate_to_array
     Widget.elastic_index.index_document('5', color: 'red')
     

data/test/elastic_record/relation/finder_methods_test.rb

@@ -1,11 +1,6 @@
 require 'helper'
 
-module ActiveRecord
-  class RecordNotFound < StandardError
-  end
-end
-
-class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Spec
+class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Unit::TestCase
   def setup
     super
     create_widgets
@@ -20,6 +15,19 @@ class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Spec
     end
   end
 
+  def test_find_passed_an_array
+    assert_equal 2, Widget.elastic_relation.find(['05', '10']).size
+    assert_equal 2, Widget.elastic_relation.filter('color' => ['red', 'blue']).find(['05', '10']).size
+    assert_equal 0, Widget.elastic_relation.find(['15', '20']).size
+    assert_equal 0, Widget.elastic_relation.filter('color' => ['purple', 'gold']).find(['05', '10']).size
+  end
+
+  def test_find_passed_an_empty_args
+    assert_raises ActiveRecord::RecordNotFound do
+      Widget.elastic_relation.find()
+    end
+  end
+
   def test_first
     assert_equal '10', Widget.elastic_relation.order('color').first.id
     assert_equal '05', Widget.elastic_relation.order('color').filter('color' => 'red').first.id
@@ -27,6 +35,13 @@ class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Spec
     assert_nil Widget.elastic_relation.filter('color' => 'green').first
   end
 
+  def test_first_with_bang
+    assert_equal '10', Widget.elastic_relation.order('color').first!.id
+    assert_raises ActiveRecord::RecordNotFound do
+      Widget.elastic_relation.filter('color' => 'green').first!
+    end
+  end
+
   def test_last
     assert_equal '05', Widget.elastic_relation.order('color').last.id
     assert_equal '05', Widget.elastic_relation.order('color' => 'asc').last.id
@@ -44,6 +59,6 @@ class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Spec
       Widget.elastic_index.bulk_add [
         Widget.new(color: 'red', id: '05'),
         Widget.new(color: 'blue', id: '10'),
-      ]      
+      ]
     end
-end
+end

data/test/elastic_record/relation/merging_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Relation::MergingTest < MiniTest::Spec
+class ElasticRecord::Relation::MergingTest < MiniTest::Unit::TestCase
   def test_merge_single_values
     relation = Widget.elastic_relation.limit(5)
     other = Widget.elastic_relation.limit(10)

data/test/elastic_record/relation/none_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Relation::NoneTest < MiniTest::Spec
+class ElasticRecord::Relation::NoneTest < MiniTest::Unit::TestCase
   def test_none
     none = Widget.elastic_relation.none
 

data/test/elastic_record/relation/search_methods_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Spec
+class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Unit::TestCase
   def test_query_with_no_queries
     expected = {"match_all" => {}}
 
@@ -57,6 +57,19 @@ class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Spec
     assert_equal expected, relation.as_elastic['query']
   end
 
+  def test_find_by
+    Widget.elastic_index.bulk_add [
+      Widget.new(color: 'red', id: '05'),
+      Widget.new(color: 'blue', id: '10'),
+    ]
+
+    assert_equal '05', relation.find_by(color: 'red').id
+    assert_equal '05', relation.find_by!(color: 'red').id
+    assert_raises ActiveRecord::RecordNotFound do
+      relation.find_by!(color: 'green')
+    end
+  end
+
   def test_query_with_only_query
     relation.query!('foo')
 
@@ -224,4 +237,4 @@ class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Spec
     def relation
       @relation ||= Widget.elastic_relation
     end
-end
+end

data/test/elastic_record/relation_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::RelationTest < MiniTest::Spec
+class ElasticRecord::RelationTest < MiniTest::Unit::TestCase
   def test_count
     create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
 
@@ -25,10 +25,57 @@ class ElasticRecord::RelationTest < MiniTest::Spec
     # assert Widget.elastic_relation.search_results.is_a?(ElasticSearch::Api::Hits)
   end
 
+  def test_eager_loading?
+    assert Widget.elastic_relation.eager_load(:options).eager_loading?
+  end
+
+  def test_eager_loading_is_not_default
+    assert !Widget.elastic_relation.eager_loading?
+  end
+
+  def test_eager_load_on_collection_proxy
+
+    warehouse = Warehouse.new
+    widget = Widget.new(warehouse_id: warehouse.id)
+    Widget.elastic_index.bulk_add [ widget ]
+
+    Option.elastic_index.bulk_add [
+      Option.new(id:  5, widget_id: widget.id),
+      Option.new(id: 10, widget_id: widget.id),
+    ]
+
+    widgets = warehouse.widgets.eager_load(:options)
+    widgets = widgets.to_a
+
+    assert_no_queries do
+      assert_equal ["5", "10"].to_set, widgets.first.options.map(&:id).to_set
+    end
+
+  end
+
+  def test_eager_load_on_relation
+
+    widget = Widget.new
+    Widget.elastic_index.bulk_add [ widget ]
+
+    Option.elastic_index.bulk_add [
+      Option.new(id:  5, widget_id: widget.id),
+      Option.new(id: 10, widget_id: widget.id),
+    ]
+
+    widgets = Widget.elastic_relation.eager_load(:options)
+    widgets = widgets.to_a
+
+    assert_no_queries do
+      assert_equal ["5", "10"].to_set, widgets.first.options.map(&:id).to_set
+    end
+
+  end
+
   def test_to_ids
     create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
 
-    assert_equal ['5', '10'], Widget.elastic_relation.to_ids
+    assert_equal ['5', '10'].to_set, Widget.elastic_relation.to_ids.to_set
   end
 
   def test_to_a
@@ -57,4 +104,4 @@ class ElasticRecord::RelationTest < MiniTest::Spec
     def create_widgets(widgets)
       Widget.elastic_index.bulk_add(widgets)
     end
-end
+end

data/test/elastic_record/searches_many/association_test.rb

@@ -0,0 +1,47 @@
+require 'helper'
+
+class ElasticRecord::SearchesMany::AssociationTest < MiniTest::Spec
+
+  def test_writer_assignment_from_hash
+    warehouse = Warehouse.new
+    warehouse.widgets = [{color: 'blue', name: 'thing'}]
+
+    assert_equal 1, warehouse.widgets.all.count
+    expected = {
+      'color' => 'blue',
+      'name' => 'thing',
+      'warehouse_id' => warehouse.id,
+    }
+    assert_equal expected, warehouse.widgets[0].attributes
+  end
+
+  def test_writer
+    warehouse = Warehouse.new
+
+    warehouse.widgets = [{color: 'blue', name: 'thing'}]
+
+    assert_equal 1, warehouse.widgets.all.count
+
+    warehouse.widgets = [ {color: 'red', name: 'device'}, {color: 'blue', name: 'thing'} ]
+
+    assert_equal 3, warehouse.widgets.all.count
+    assert warehouse.widgets[0].marked_for_destruction?
+    refute warehouse.widgets[1].marked_for_destruction?
+    refute warehouse.widgets[2].marked_for_destruction?
+
+    expected = {
+      'color' => 'red',
+      'name' => 'device',
+      'warehouse_id' => warehouse.id,
+    }
+    assert_equal expected, warehouse.widgets[1].attributes
+
+    expected = {
+      'color' => 'blue',
+      'name' => 'thing',
+      'warehouse_id' => warehouse.id,
+    }
+    assert_equal expected, warehouse.widgets[2].attributes
+  end
+
+end

data/test/elastic_record/searches_many/autosave_test.rb

@@ -1,31 +1,32 @@
 require 'helper'
 
-class ElasticRecord::SearchesMany::AutosaveTest < MiniTest::Spec
-  def test_save_associations_callback
+class ElasticRecord::SearchesMany::AutosaveTest < MiniTest::Unit::TestCase
+  def test_save_associations_autosave_callback
     warehouse = Warehouse.new
     widget = Widget.new
     warehouse.widgets = [widget]
+    assert warehouse.new_record?
     assert widget.new_record?
-  
+
     warehouse.save
-  
+
     assert widget.persisted?
   end
 
-  def test_validate_associations_callback
+  def test_validate_associations_autosave_callback
     warehouse = Warehouse.new
     widget = Widget.new color: 123
     warehouse.widgets = [widget]
-  
+
     assert warehouse.invalid?
     assert_equal ["is invalid"], warehouse.errors['widgets.color']
   end
-  
+
   def test_mark_for_destruction
     widget = Widget.new
-  
+
     widget.mark_for_destruction
-  
+
     assert widget.marked_for_destruction?
   end
-end
+end

data/test/elastic_record/searches_many/collection_proxy_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::SearchesMany::CollectionProxyTest < MiniTest::Spec
+class ElasticRecord::SearchesMany::CollectionProxyTest < MiniTest::Unit::TestCase
   def test_add_to_new_record
     warehouse = Warehouse.new
     widget = Widget.new

data/test/elastic_record/searches_many/reflection_test.rb

@@ -1,6 +1,12 @@
 require 'helper'
 
-class ElasticRecord::SearchesMany::ReflectionTest < MiniTest::Spec
+class ElasticRecord::SearchesMany::ReflectionTest < MiniTest::Unit::TestCase
+
+  def test_foreiegn_key
+    assert_equal 'warehouse_id', reflection_class.new(Warehouse, :widgets, {}).foreign_key
+    assert_equal 'foo_id', reflection_class.new(Warehouse, :widgets, {:foreign_key => 'foo_id' }).foreign_key
+  end
+
   def test_klass_name
     assert_equal 'Product', reflection_class.new(Warehouse, :widgets, {class_name: 'Product'}).klass_name
     assert_equal 'Widget', reflection_class.new(Warehouse, :widgets, {}).klass_name

data/test/elastic_record/searches_many_test.rb

@@ -1,20 +1,20 @@
 require 'helper'
 
-class ElasticRecord::SearchesManyTest < MiniTest::Spec
+class ElasticRecord::SearchesManyTest < MiniTest::Unit::TestCase
   def test_reader
     warehouse = Warehouse.create
     related_widget = Widget.create warehouse: warehouse
     unrelated_widget = Widget.create
-  
+
     assert_equal [related_widget], warehouse.widgets
   end
 
   def test_write_with_objects
     warehouse = Warehouse.new
     widget = Widget.new
-  
+
     warehouse.widgets = [widget]
-  
+
     assert widget.new_record?
     assert_equal warehouse.id, widget.warehouse_id
     # assert_equal 1, warehouse.widgets_count
@@ -23,14 +23,14 @@ class ElasticRecord::SearchesManyTest < MiniTest::Spec
 
   def test_write_with_attributes
     warehouse = Warehouse.new
-  
+
     warehouse.widgets = [
       {
         color:  'blue',
         name:   'Toy'
       }
     ]
-  
+
     widgets = warehouse.widgets
     assert_equal 1, widgets.size
   end
@@ -38,9 +38,9 @@ class ElasticRecord::SearchesManyTest < MiniTest::Spec
   def test_write_marks_destroyed
     warehouse = Warehouse.new
     widget = Widget.create warehouse: warehouse
-  
+
     warehouse.widgets = []
-  
+
     association = warehouse.searches_many_association(:widgets)
     assert_equal 1, association.reader.size
     assert association.reader.first.marked_for_destruction?
@@ -49,14 +49,14 @@ class ElasticRecord::SearchesManyTest < MiniTest::Spec
   def test_write_existing_record
     widget = Widget.create name: 'Toy', color: 'green'
     warehouse = Warehouse.new widgets: [widget]
-  
+
     warehouse.widgets = [
       {
         id: widget.id,
         color:   "blue"
       }
     ]
-  
+
     widgets = warehouse.widgets
     assert_equal 1, widgets.size
     assert_equal "blue", widgets.first.color
@@ -73,4 +73,4 @@ class ElasticRecord::SearchesManyTest < MiniTest::Spec
 
     assert_equal [], warehouse.widgets
   end
-end
+end