avo 1.18.1 → 1.18.2.pre.0

data/app/helpers/avo/application_helper.rb

@@ -154,5 +154,23 @@ module Avo
 
       classes
     end
+
+    def get_model_class(model)
+      if model.instance_of?(Class)
+        model
+      else
+        model.class.base_class
+      end
+    end
+
+    def singular_name(model_or_class)
+      model_class = get_model_class model_or_class
+
+      if ActiveModel::Naming.uncountable? model_class
+        model_class.base_class.model_name.route_key.singularize.gsub('_index', '')
+      else
+        model_class.base_class.model_name.route_key.singularize
+      end
+    end
   end
 end

data/db/factories.rb

@@ -44,4 +44,13 @@ FactoryBot.define do
   factory :comment do
     body { Faker::Lorem.paragraphs(number: rand(4...10)).join("\n") }
   end
+
+  factory :person do
+    name { "#{Faker::Name.first_name} #{Faker::Name.last_name}" }
+  end
+
+  factory :spouse do
+    name { "#{Faker::Name.first_name} #{Faker::Name.last_name}" }
+    type { "Spouse" }
+  end
 end

data/lib/avo/base_resource.rb

@@ -74,7 +74,7 @@ module Avo
     end
 
     def initialize
-      self.class.model_class = model_class
+      self.class.model_class = model_class.base_class
     end
 
     def hydrate(model: nil, view: nil, user: nil, params: nil)
@@ -198,10 +198,13 @@ module Avo
     end
 
     def model_class
+      # get the model class off of the static property
       return self.class.model_class if self.class.model_class.present?
 
-      return @model.class if @model.present?
+      # get the model class off of the model
+      return @model.base_class if @model.present?
 
+      # generate a model class
       class_name_without_resource.safe_constantize
     end
 
@@ -410,5 +413,9 @@ module Avo
     rescue
       nil
     end
+
+    def form_scope
+      model.class.base_class.to_s.downcase
+    end
   end
 end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.18.1"
+  VERSION = "1.18.2.pre.0"
 end