forest_liana 1.5.22 → 1.5.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66115c380e28a1968e472cb604a4cc6e2cfa6336
-  data.tar.gz: 89487bf26d2e6c4bd59f01315307a452cbcdae46
+  metadata.gz: 5e3830a496e84b24397137ab4b61c3a11dc0eea9
+  data.tar.gz: 0bd3a0aa17c384f9d8c6f8d0f30e6e8d46e535ae
 SHA512:
-  metadata.gz: d13e6768b5ee702c5b8f0be5f6f9c5c1ebacd02759b1453611800506bbfa5e739612330bdc39dcffd65a8f144657b0ae9b617ef6d4056587e9f27bc86f25f117
-  data.tar.gz: 08d88a90f1cfdd1647fc33d75df18f8df5b642991fbb0993cf22f98f1ccb32488e908ccc5ee360edb0ec12d52d1a9d8050a786ae88c329819264459adfc91833
+  metadata.gz: e434a6e17a9fded4ead12220c140491de45227fe9f75cb381b2bf8abe9ed36f12137441edb524ba6c22322a6e7cac93e0fab0271f78c0ce4f2b68f74ecd0dd00
+  data.tar.gz: 808304e8300720bffe02bad42128aa75658a19f895fa9025610aa7857e5c4f2253b48ff98c254358c4fa268a77b7dc0a8d065878b58ef59d8a7ca396f25ddcfe

data/app/services/forest_liana/schema_adapter.rb

@@ -223,6 +223,7 @@ module ForestLiana
     def get_schema_for_column(column)
       schema = { field: column.name, type: get_type_for(column) }
       add_enum_values_if_is_enum(schema, column)
+      add_enum_values_if_is_sti_model(schema, column)
     end
 
     def get_schema_for_association(association)
@@ -271,6 +272,23 @@ module ForestLiana
       column_schema
     end
 
+    def add_enum_values_if_is_sti_model(column_schema, column)
+      if sti_column?(column)
+        column_schema[:enums] = []
+        column_schema[:type] = 'Enum'
+        @model.descendants.each do |sti_model|
+          column_schema[:enums] << sti_model.name
+        end
+      end
+
+      column_schema
+    end
+
+    def sti_column?(column)
+      (@model.inheritance_column &&
+       column.name == @model.inheritance_column) || column.name == 'type'
+    end
+
     def get_ref_for(association)
       if association.options[:polymorphic] == true
         '*.id'

data/app/services/forest_liana/schema_utils.rb

@@ -70,5 +70,14 @@ module ForestLiana
     def self.habtm?(model)
       model.name.starts_with?('HABTM')
     end
+
+    def self.sti?(model)
+       inheritance_column = model.columns.find do |c|
+         (model.inheritance_column && c.name == model.inheritance_column) ||
+           c.name == 'type'
+       end
+
+       return inheritance_column.present?
+    end
   end
 end

data/lib/forest_liana/bootstraper.rb

@@ -31,20 +31,9 @@ module ForestLiana
 
     private
 
-    def fetch_sti_models(model)
-      type_field = model.columns.find { |c| c.name == 'type' }
-      if type_field
-        model.descendants.each do |sti_model|
-          if analyze_model?(sti_model)
-            ForestLiana.models << sti_model
-          end
-        end
-      end
-    end
-
     def analyze_model?(model)
       return model && model.table_exists? && !SchemaUtils.habtm?(model) &&
-        SchemaUtils.model_included?(model)
+        SchemaUtils.model_included?(model) && !SchemaUtils.sti?(model)
     end
 
     def fetch_models
@@ -56,8 +45,6 @@ module ForestLiana
         if model.abstract_class?
           model.descendants.each { |submodel| fetch_model(submodel) }
         else
-          fetch_sti_models(model) if model.try(:table_exists?)
-
           if analyze_model?(model)
             ForestLiana.models << model
           end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.5.22"
+  VERSION = "1.5.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.5.22
+  version: 1.5.23
 platform: ruby
 authors:
 - Sandro Munda