elastic_record 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb2dad78eb2851499ca2b7099f7774d79c375b5a180001bd612113353dfba33c
-  data.tar.gz: ff1262c6527d45f1e9b0e8eb46e24dc881cdb10b5cb51b93e40f72f5a2f366dc
+  metadata.gz: fbc183b9807acb14f1ba0b3d2f860c7be2eddbcf7360d542cbf9f1a9ea9df166
+  data.tar.gz: cbcb08f9fff903a87f0fa35b4f5ceb1542870ec1b176605e559eb99111f53b72
 SHA512:
-  metadata.gz: b1c4fab2b261935713156c78ebf2fd675a7a7b107ac5a415a25dd20c8364690492f566d82b4685e9c223818abafbaf21ef2083d89ad3ad1e2a60bb93ed150685
-  data.tar.gz: 8f9d7ad4d081fe9096c65872c8b0e4fd0c2d4a3fa2df79bd7a8a8a3975fd7a7055c48b664a5f47beb2b7fcea07020e542f64b4f64e188c125e66c27ee11ad70f
+  metadata.gz: da4b87dc02cb1bd4f0db4fdd02923584b96137ad1c8b115f94c906244f66f77aa8f021721724333a14f33b15f950d1df57a863c566ee96265b00f5586509a784
+  data.tar.gz: ed8050784a85135ac6e3a9c650608e20d168221349bb84bc4b35588a474ac475b45f2e0605d358577f0b9147644c4254b303885db3153b8a169ef087b8ae4593

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '5.1.0'
+  s.version = '5.2.0'
   s.summary = 'An Elasticsearch querying ORM'
   s.description = 'Find your records with Elasticsearch'
 

data/lib/elastic_record/relation/finder_methods.rb

@@ -2,12 +2,15 @@ module ElasticRecord
   class Relation
     module FinderMethods
       def find(*ids)
-        ids = ids.flatten
+        return [] if ids.first.is_a?(Array) && ids.first.empty?
+        ids       = ids.flatten
+        id_filter = filter(arelastic.filter.ids(ids))
+        id_filter = id_filter.limit(ids.size) unless limit_value
+
         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))
+        when 1; id_filter.first!
+        else id_filter
         end
       end
 

data/test/elastic_record/relation/finder_methods_test.rb

@@ -16,6 +16,12 @@ class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Test
     end
   end
 
+  def test_find_exceed_default_limit
+    widgets = ('a'..'l').map {|color| Widget.create(color: color) }
+    assert_equal 12, Widget.elastic_relation.find(widgets.map(&:id)).size
+    assert_equal 11, Widget.elastic_relation.limit(11).find(widgets.map(&:id)).size
+  end
+
   def test_find_passed_an_array
     assert_equal 2, Widget.elastic_relation.find([@red_widget.id, @blue_widget.id]).size
     assert_equal 2, Widget.elastic_relation.filter('color' => ['red', 'blue']).find([@red_widget.id, @blue_widget.id]).size
@@ -23,6 +29,7 @@ class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Test
   end
 
   def test_find_passed_an_empty_args
+    assert_equal [], Widget.elastic_relation.find([])
     assert_raises ActiveRecord::RecordNotFound do
       Widget.elastic_relation.find
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: An Elasticsearch querying ORM