avo 0.5.0.beta6 → 0.5.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: feb0f2107251ad2cef1a10c6980d4ffecde53332b8c584697ebcefb2f341edb5
-  data.tar.gz: 49d8bedcfd86bfdb44e8426c393e485451020ca5825528948a199af78f722995
+  metadata.gz: 48ae6c7207084645f7a7a14a462ebc7161f94801e100054d53f48722f758f9c2
+  data.tar.gz: dcc5caabc807328ddd1c52c640d446d88d84c58f786b693d59455f1e7d251744
 SHA512:
-  metadata.gz: c5fc2c13d27849cc5c7b5456b9bbb1dea9798f8209746e38cc1d26cbd8f7cd158beab29c8407be0eca1cd0feedc4bfb03a8290941b9a5e66d55dc300cffada06
-  data.tar.gz: cd2c38578315087e25b5584de1145bba9bb0454c301f8587ad620f1799158dcddab644e6a8d73677a463b8d344f082cba93aaf53fd2e5a5d1cc9a0a2b0573ff4
+  metadata.gz: '038536c5cc11eeae399c9cbb59d366868bb3affe39592075c8852d65df49f1a362917a9e96861c804e807a6ed0e2cb39932e5bb82cb04d54b9830301a44b7056'
+  data.tar.gz: b9d16aa4a175c5a43a0ec24059e4715febc755cea5b28be601b0b9fb22f9414881ec170b6ad9e1dbe2e51a77d6b8d5cae7e620d8d1d7dc95c4c01c988f9f09ca

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (0.5.0.beta6)
+    avo (0.5.0.beta7)
       active_link_to
       countries
       hotwire-rails

data/app/controllers/avo/application_controller.rb

@@ -155,7 +155,12 @@ module Avo
       # Gets the Avo resource for this request based on the request from the `resource_name` "param"
       # Ex: Avo::Resources::Project, Avo::Resources::Team, Avo::Resources::User
       def resource
-        App.get_resource @resource_name.to_s.camelize.singularize
+
+        resource = App.get_resource @resource_name.to_s.camelize.singularize
+
+        return resource if resource.present?
+
+        App.get_resource_by_controller_name @resource_name
       end
 
       def related_resource

data/lib/avo/app.rb

@@ -122,7 +122,7 @@ module Avo
 
       # Returns the Avo resource by camelized name
       #
-      # get_resource_by_name('User') => Avo::Resources::User
+      # get_resource_by_name('User') => UserResource
       def get_resource(resource)
         self.app[:resources].find do |available_resource|
           "#{resource}Resource".safe_constantize == available_resource.class
@@ -131,21 +131,31 @@ module Avo
 
       # Returns the Avo resource by singular snake_cased name
       #
-      # get_resource_by_name('user') => Avo::Resources::User
+      # get_resource_by_name('user') => UserResource
       def get_resource_by_name(name)
         self.get_resource name.singularize.camelize
       end
 
       # Returns the Avo resource by singular snake_cased name
       #
-      # get_resource_by_name('User') => Avo::Resources::User
-      # get_resource_by_name(User) => Avo::Resources::User
+      # get_resource_by_name('User') => UserResource
+      # get_resource_by_name(User) => UserResource
       def get_resource_by_model_name(name)
         get_resources.find do |resource|
           resource.model_class.model_name.name == name.to_s
         end
       end
 
+      # Returns the Avo resource by singular snake_cased name
+      #
+      # get_resource_by_controller_name('delayed_backend_active_record_jobs') => DelayedJobResource
+      # get_resource_by_controller_name('users') => UserResource
+      def get_resource_by_controller_name(name)
+        get_resources.find do |resource|
+          resource.model_class.to_s.pluralize.underscore.gsub('/', '_') == name.to_s
+        end
+      end
+
       # Returns the Rails model class by singular snake_cased name
       #
       # get_model_class_by_name('user') => User
@@ -174,11 +184,15 @@ module Avo
         Proc.new do
           BaseResource.descendants
             .select do |resource|
-              resource != :Resource
+              resource != :BaseResource
             end
             .map do |resource|
               if resource.is_a? Class
-                route_key = resource.to_s.underscore.gsub('_resource', '').downcase.pluralize.to_sym
+                if resource.model_class.present?
+                  route_key = resource.model_class.model_name.route_key
+                else
+                  route_key = resource.to_s.underscore.gsub('_resource', '').downcase.pluralize.to_sym
+                end
 
                 resources route_key
               end

data/lib/avo/base_resource.rb

@@ -11,6 +11,7 @@ module Avo
     class_attribute :title, default: :id
     class_attribute :search, default: [:id]
     class_attribute :includes, default: []
+    class_attribute :model_class
     class_attribute :translation_key
     class_attribute :default_view_type, default: :table
     class_attribute :devise_password_optional, default: false
@@ -158,6 +159,8 @@ module Avo
     end
 
     def model_class
+      return self.class.model_class if self.class.model_class.present?
+
       return @model.class if @model.present?
 
       self.class.name.demodulize.chomp('Resource').safe_constantize

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = '0.5.0.beta6'
+  VERSION = '0.5.0.beta7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta6
+  version: 0.5.0.beta7
 platform: ruby
 authors:
 - Adrian Marin