motor-admin 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc4b3959711130ff5e711c91a8a3ae30f996dcbbf83c98a6d2bb108ffed665e6
-  data.tar.gz: c5090823346eb41d62bb400cce5b7c4c4c17b9a9261017aa374a31fa33ca3630
+  metadata.gz: e1189d1c955046a61940254f58bc78e3743e51e912a6c1e1443ffa9d4df8b22e
+  data.tar.gz: 69cbcc3fcc34ee51c03979896f6862ada18d9bd410c297141d14959009e5f38f
 SHA512:
-  metadata.gz: c46b67ac2fe96276806252c3c56e0472b32b6f91aa2351dd7d8ae76485de59260e2079dd42336c61beb1d28de9f6c0177e32e60d9a5e35c9b7dd8b9e770ff0bf
-  data.tar.gz: d49105316054eab5561cfbbad123cf4e106d7d837446cab63f91149f225022466c7ef3e10442e20789c4c920e9a222dbf27ad552a253cd23267e71356d34fa68
+  metadata.gz: 57f991559988e88d2a8abc00bc302946dc986fa75b5e6bc6953a1d05552810339a95d5ef5aae8b0c3bc98c806d7ecfc1b2bacf051471fd2088e10594c8e6fed6
+  data.tar.gz: d72ff24ee69ea6db86585efb92dfab69582fb6c712d12c97b19bbd16f5a506b41e72f95d1fea05a153fa430e9a1c014542db8e684dc91dd948027ae9464a5b73

data/lib/motor/resources/fetch_configured_model.rb

@@ -10,26 +10,19 @@ module Motor
       def call(model, cache_key:)
         configs = Motor::Configs::LoadFromCache.load_resources(cache_key: cache_key)
 
-        return model if configs.blank?
+        return model if configs.blank? || sti_model?(model)
 
         maybe_fetch_from_cache(
           model,
           cache_key.to_s + model.object_id.to_s,
-          lambda {
-            resource_config = configs.find { |r| r.name == model.name.underscore }
-
-            if resource_config
-              build_configured_model(model, resource_config.preferences)
-            else
-              define_class_name_method(Class.new(model), model)
-            end
-          },
+          -> { build_configured_model_from_configs(model, configs) },
           ->(klass) { configure_reflection_classes(klass, cache_key) }
         )
       end
 
       def build_configured_model(model, config)
         klass = Class.new(model)
+        klass.inheritance_column = nil if model.superclass.abstract_class
 
         define_class_name_method(klass, model)
 
@@ -199,6 +192,20 @@ module Motor
           postprocess_block.call(result)
         end
       end
+
+      def build_configured_model_from_configs(model, configs)
+        resource_config = configs.find { |r| r.name == model.name.underscore }
+
+        if resource_config
+          build_configured_model(model, resource_config.preferences)
+        else
+          define_class_name_method(Class.new(model), model)
+        end
+      end
+
+      def sti_model?(model)
+        !model.superclass.abstract_class && model.columns_hash[model.inheritance_column.to_s]
+      end
     end
   end
 end

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.18'
+  VERSION = '0.2.19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Pete Matsyburka