closes #194

Author: catmando

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

@@ -71,7 +71,7 @@ def self.find_locally(model, attrs, new_only: nil)
       if (id_to_find = attrs[model.primary_key])
         !new_only && lookup_by_id(model, id_to_find)
       else
-        @records[model].detect do |r|
+        @records[model.base_class].detect do |r|
           (r.new? || !new_only) &&
             !attrs.detect { |attr, value| r.synced_attributes[attr] != value }
         end
@@ -150,7 +150,7 @@ def initialize(model, hash = {}, ar_instance = nil)
       @attributes = {}
       @changed_attributes = []
       @virgin = true
-      records[model] << self
+      records[model.base_class] << self
       Base.set_object_id_lookup(self)
     end
 

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

@@ -14,15 +14,15 @@ def class_scopes(model)
     end
 
     def waiting_for_save(model)
-      @waiting_for_save[model]
+      @waiting_for_save[model.base_class]
     end
 
     def wait_for_save(model, &block)
-      @waiting_for_save[model] << block
+      @waiting_for_save[model.base_class] << block
     end
 
     def clear_waiting_for_save(model)
-      @waiting_for_save[model] = []
+      @waiting_for_save[model.base_class] = []
     end
 
     def lookup_by_object_id(object_id)
@@ -33,8 +33,8 @@ def set_object_id_lookup(record)
       `#{@records_by_object_id}[#{record.object_id}] = #{record}`
     end
 
-    def lookup_by_id(*args) # model and id
-      `#{@records_by_id}[#{args}]` || nil
+    def lookup_by_id(model, id) # model and id
+      `#{@records_by_id}[#{[model.base_class, id]}]` || nil
     end
 
     def set_id_lookup(record)

ruby/hyper-model/spec/batch7/sti_spec.rb

@@ -130,6 +130,22 @@ class Scoped < ActiveRecord::Base
 
   end
 
+  it "Finders will work regardless of type" do
+    Sti::SubClass1.create(data: 'changeme')
+    expect_promise do
+      Hyperstack::Model.load do
+        Sti::Base.all.last
+      end.then do |from_base|
+        Hyperstack::Model.load do
+          Sti::SubClass1.find(from_base.id)
+        end.then do |from_subclass|
+          from_subclass.data = 'changed'
+          from_base.data
+        end
+      end
+    end.to eq('changed')
+  end
+
   it "will use the subclass name to set the type" do
     evaluate_ruby('Sti::SubClass1.create(data: "record 1")')
     expect_promise('Sti::Base.last.load(:type)').to eq('Sti::SubClass1')

ruby/hyper-model/spec/test_app/app/models/public/active_record_patch.rb

@@ -0,0 +1,5 @@
+class ActiveRecord::Base
+  def new?
+    raise 'Hypermodel internally using the deprecated new? method'
+  end
+end