fix: take into account subclasses of ActiveRecord models (#569)

Author: FraDim

lib/forest_liana/bootstrapper.rb

@@ -96,39 +96,25 @@ def generate_apimap
       end
     end
 
-    def is_sti_parent_model?(model)
-      return false unless model.try(:table_exists?)
-
-      model.inheritance_column && model.columns.find { |column| column.name == model.inheritance_column }
-    end
-
     def analyze_model?(model)
       model && model.table_exists? && !SchemaUtils.habtm?(model) &&
         SchemaUtils.model_included?(model)
     end
 
     def fetch_models
-      ActiveRecord::Base.subclasses.each { |model| fetch_model(model) }
+      ActiveRecord::Base.descendants.each { |model| fetch_model(model) }
     end
 
     def fetch_model(model)
-      begin
-        if model.abstract_class?
-          model.subclasses.each { |submodel| fetch_model(submodel) }
-        else
-          if is_sti_parent_model?(model)
-            model.subclasses.each { |submodel_sti| fetch_model(submodel_sti) }
-          end
-
-          if analyze_model?(model)
-            ForestLiana.models << model unless ForestLiana.models.include?(model)
-          end
-        end
-      rescue => exception
-        FOREST_REPORTER.report exception
-        FOREST_LOGGER.error "Cannot fetch properly model #{model.name}:\n" \
+      return if model.abstract_class?
+      return if ForestLiana.models.include?(model)
+      return unless analyze_model?(model)
+
+      ForestLiana.models << model
+    rescue => exception
+      FOREST_REPORTER.report exception
+      FOREST_LOGGER.error "Cannot fetch properly model #{model.name}:\n" \
           "#{exception}"
-      end
     end
 
     def cast_to_array value

spec/dummy/app/models/town.rb

@@ -0,0 +1,2 @@
+class Town < Location
+end

spec/lib/forest_liana/bootstrapper_spec.rb

@@ -14,24 +14,32 @@ module ForestLiana
     end
 
     describe 'models' do
-      let(:expected_models) do
+      let(:application_models) do
+        ForestLiana.models.reject do |model|
+          rails_models.any? { |rails_model| model <= rails_model }
+        end
+      end
+      let(:rails_models) { [ActiveRecord::InternalMetadata, ActiveRecord::SchemaMigration] }
+
+      let(:expected_application_models) do
         [
           Island,
           Location,
           Owner,
           Product,
           Reference,
+          Town,
           Tree,
           User
         ]
       end
 
       it 'should populate the models correctly' do
         ForestLiana::Bootstrapper.new
-        rails_models = [ActiveRecord::InternalMetadata, ActiveRecord::SchemaMigration]
 
         expect(ForestLiana.models).to match_array(ForestLiana.models.uniq)
-        expect(ForestLiana.models).to match_array(expected_models + rails_models)
+        expect(ForestLiana.models).to include(*rails_models)
+        expect(application_models).to match_array(expected_application_models)
       end
 
       it 'should generate serializers for all models' do
@@ -40,7 +48,7 @@ module ForestLiana
 
         ForestLiana::Bootstrapper.new
 
-        expected_models.each do |model|
+        expected_application_models.each do |model|
           expect(factory).to have_received(:serializer_for).with(model).once
         end
       end
@@ -51,7 +59,7 @@ module ForestLiana
 
         ForestLiana::Bootstrapper.new
 
-        expected_models.each do |model|
+        expected_application_models.each do |model|
           expect(factory).to have_received(:controller_for).with(model).once
         end
       end