Merge pull request hyperstack-org#219 from hyperstack-org/issue-215

adamcreekroad · web-flow · commit 9555bbd711c8 · 2019-11-19T08:16:08.000-05:00
Fixes hyperstack-org#215
diff --git a/ruby/hyper-model/lib/reactive_record/active_record/reactive_record/collection.rb b/ruby/hyper-model/lib/reactive_record/active_record/reactive_record/collection.rb
@@ -618,8 +618,22 @@ def empty?
       count.zero?
     end
 
-    def any?
-      !count.zero?
+    def any?(*args, &block)
+      # If there are any args passed in, then the collection is being used in the condition
+      #   and we must load it all into memory.
+      return all.any?(*args, &block) if args&.length&.positive? || block.present?
+
+      # Otherwise we can just check the count for efficiency
+      !empty?
+    end
+
+    def none?(*args, &block)
+      # If there are any args passed in, then the collection is being used in the condition
+      #   and we must load it all into memory.
+      return all.none?(*args, &block) if args&.length&.positive? || block.present?
+
+      # Otherwise we can just check the count for efficiency
+      empty?
     end
 
     def method_missing(method, *args, &block)
diff --git a/ruby/hyper-model/spec/batch2/collection_aggregate_methods_spec.rb b/ruby/hyper-model/spec/batch2/collection_aggregate_methods_spec.rb
@@ -32,22 +32,61 @@
     size_window(:small, :portrait)
   end
 
-  [:count, :empty?, :any?].each do |method|
+  %i[count empty? any? none?].each do |method|
     it "will not retrieve the entire collection when using #{method}" do
       FactoryBot.create(:test_model)
 
-      expect_promise(<<-RUBY
-        Hyperstack::Model
-        .load { TestModel.#{method} }
-        .then do |val|
-          if TestModel.all.instance_variable_get('@collection')
-            "unnecessary fetch of all"
-          else
-            val
+      expect_promise(
+        <<~RUBY
+          Hyperstack::Model
+          .load { TestModel.#{method} }
+          .then do |val|
+            if TestModel.all.instance_variable_get('@collection')
+              "unnecessary fetch of all"
+            else
+              val
+            end
           end
-        end
-      RUBY
-    ).to eq(TestModel.all.send(method))
+        RUBY
+      ).to eq(TestModel.all.send(method))
+    end
+  end
+
+  %i[any? none?].each do |method|
+    it 'will retrieve the entire collection when using any? if an arg is passed in' do
+      FactoryBot.create(:test_model)
+
+      expect_promise(
+        <<~RUBY
+          Hyperstack::Model.load do
+            TestModel.#{method}(TestModel)
+          end.then do |val|
+            if TestModel.all.instance_variable_get('@collection')
+              'necessary fetch of all'
+            else
+              val
+            end
+          end
+        RUBY
+      ).to eq('necessary fetch of all')
+    end
+
+    it 'will retrieve the entire collection when using any? if a block is passed in' do
+      FactoryBot.create(:test_model)
+
+      expect_promise(
+        <<~RUBY
+          Hyperstack::Model.load do
+            TestModel.#{method} { |test_model| test_model }
+          end.then do |val|
+            if TestModel.all.instance_variable_get('@collection')
+              'necessary fetch of all'
+            else
+              val
+            end
+          end
+        RUBY
+      ).to eq('necessary fetch of all')
     end
   end
 end
