Merge branch 'issue-113' into edge

Author: catmando

ruby/hyper-model/lib/active_record_base.rb

@@ -87,7 +87,7 @@ def finder_method(name, &block)
               this.acting_user = acting_user
               # returns a PsuedoRelationArray which will respond to the
               # __secure_collection_check method
-              ReactiveRecordPsuedoRelationArray.new([this.instance_exec(*args, &block)])
+              ReactiveRecordPsuedoRelationArray.new([*this.instance_exec(*args, &block)])
             ensure
               this.acting_user = old
             end

ruby/hyper-model/lib/reactive_record/active_record/reactive_record/collection.rb

@@ -546,12 +546,16 @@ def empty?
     end
 
     def method_missing(method, *args, &block)
-      if [].respond_to? method
+      if args.count == 1 && method.start_with?('find_by_')
+        apply_scope(:___hyperstack_internal_scoped_find_by, method.sub(/^find_by_/, '') => args.first).first
+      elsif args.count == 1 && method == :find_by
+        apply_scope(:___hyperstack_internal_scoped_find_by, args.first).first
+      elsif args.count == 1 && method == :find
+        apply_scope(:___hyperstack_internal_scoped_find_by, @target_klass.primary_key => args.first).first
+      elsif [].respond_to? method
         all.send(method, *args, &block)
       elsif ScopeDescription.find(@target_klass, method)
         apply_scope(method, *args)
-      elsif args.count == 1 && method.start_with?('find_by_')
-        apply_scope(:___hyperstack_internal_scoped_find_by, method.sub(/^find_by_/, '') => args.first).first
       elsif @target_klass.respond_to?(method) && ScopeDescription.find(@target_klass, "_#{method}")
         apply_scope("_#{method}", *args).first
       else

ruby/hyper-model/spec/batch3/edge_cases_spec.rb

@@ -124,22 +124,54 @@ class TestComponent77 < HyperComponent
     end
   end
 
-  it 'can use find_by method on scopes' do
-    isomorphic do
-      Todo.finder_method :with_title do |title|
-        find_by_title(title)
+  describe 'can use finder methods on scopes' do
+    before(:each) do
+      isomorphic do
+        Todo.finder_method :with_title do |title|
+          find_by_title(title)
+        end
+        Todo.scope :completed, -> () { where(completed: true) }
       end
-      Todo.scope :completed, -> () { where(completed: true) }
+      FactoryBot.create(:todo, title: 'todo 1', completed: true)
+      FactoryBot.create(:todo, title: 'todo 2', completed: true)
+      FactoryBot.create(:todo, title: 'todo 1', completed: false)
+      FactoryBot.create(:todo, title: 'todo 2', completed: false)
+    end
+    it 'find_by_xxx' do
+      expect_promise do
+        Hyperstack::Model.load do
+          Todo.completed.find_by_title('todo 2').id
+        end
+      end.to eq(Todo.completed.find_by_title('todo 2').id)
+      expect_promise do
+        Hyperstack::Model.load do
+          Todo.completed.find_by_title('todo 3')
+        end
+      end.to be_falsy
+    end
+    it 'find' do
+      expect_promise do
+        Hyperstack::Model.load do
+          Todo.completed.find(2).title
+        end
+      end.to eq(Todo.completed.find(2).title)
+      expect_promise do
+        Hyperstack::Model.load do
+          Todo.completed.find(3)
+        end
+      end.to be_falsy
+    end
+    it 'find_by' do
+      expect_promise do
+        Hyperstack::Model.load do
+          Todo.completed.find_by(title: 'todo 2').id
+        end
+      end.to eq(Todo.completed.find_by(title: 'todo 2').id)
+      expect_promise do
+        Hyperstack::Model.load do
+          Todo.completed.find_by(title: 'todo 3')
+        end
+      end.to be_falsy
     end
-    FactoryBot.create(:todo, title: 'todo 1', completed: true)
-    FactoryBot.create(:todo, title: 'todo 2', completed: true)
-    FactoryBot.create(:todo, title: 'todo 1', completed: false)
-    FactoryBot.create(:todo, title: 'todo 2', completed: false)
-    expect_promise do
-      Hyperstack::Model.load do
-        Todo.completed.find_by_title('todo 2').id
-      end
-    end.to eq(Todo.completed.find_by_title('todo 2').id)
   end
-
 end