avo 1.14.0 → 1.15.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 629b21141b1ec354e7438f5e18cc8c5da295d255efecf5ecbdd8a01ab49bae69
-  data.tar.gz: 0dcf8a16ea1875213f781205ce06ef960b6cedf0eb1db2a18c1aa1725de42980
+  metadata.gz: d383ac646109d2df17ad55051991565b86751396b90f07bed6febd2c74ec2a3b
+  data.tar.gz: 165d98536e64218b88b4cd4e3191cabf1ccda0469d3bd85d84d1498097c1404f
 SHA512:
-  metadata.gz: aafa9e05b6298fef31a0501a9904a81f91227f6a5c55929a606072ac627936fedb884207d613fd073d760f4e21669c88ba8f3606644629cbb20b12a500d95334
-  data.tar.gz: 70c2ad426664105c49ee2c83211c0778126f4f36e8e8bcb93aecc3295bd585f3b25cc248d03d0a8a9c0ed3b450748cae223facc909e79e908e871569e7b49f86
+  metadata.gz: d3981465a470c93bef51cea94d4fe2b1cd3473e0e07bcbd5e7bdd2dcc7749d14ad9560fe2b46794e8e41a4554725cefaab61b68908ede56d3f6cf1bda54d42b7
+  data.tar.gz: c96ee899de497fa540760abab565bbca84b4d40b074159e73403661604fefffa3bca342bbf8407c07a27bbaad0c95d3c2cf5f1dccd4f72376b3ce73a508d7c5f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.14.0)
+    avo (1.15.0.pre.1)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/app/controllers/avo/application_controller.rb

@@ -97,9 +97,9 @@ module Avo
     end
 
     def resource_path(model = nil, resource_id: nil, keep_query_params: false, **args)
-      return avo.send :"resources_#{model.model_name.route_key.singularize}_path", resource_id, **args if resource_id.present?
+      return avo.send :"resources_#{singular_name(model)}_path", resource_id, **args if resource_id.present?
 
-      avo.send :"resources_#{model.model_name.route_key.singularize}_path", model, **args
+      avo.send :"resources_#{singular_name(model)}_path", model, **args
     end
 
     def resource_attach_path(model_name, model_id, related_name, related_id = nil)
@@ -119,11 +119,11 @@ module Avo
     end
 
     def new_resource_path(model, **args)
-      avo.send :"new_resources_#{model.model_name.route_key.singularize}_path", **args
+      avo.send :"new_resources_#{singular_name(model)}_path", **args
     end
 
     def edit_resource_path(model, **args)
-      avo.send :"edit_resources_#{model.model_name.route_key.singularize}_path", model, **args
+      avo.send :"edit_resources_#{singular_name(model)}_path", model.id, **args
     end
 
     private
@@ -283,5 +283,23 @@ module Avo
     def on_api_path
       request.original_url.match?(/.*#{Avo::App.root_path}\/avo_api\/.*/)
     end
+
+    def get_model_class(model)
+      if model.instance_of?(Class)
+        model
+      else
+        model.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.model_name.route_key.singularize.gsub('_index', '')
+      else
+        model_class.model_name.route_key.singularize
+      end
+    end
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -161,7 +161,7 @@ module Avo
     private
 
     def model_route_key
-      @resource.model_class.model_name.route_key.singularize
+      singular_name @resource.model_class
     end
 
     def model_params

data/lib/avo/app.rb

@@ -169,6 +169,8 @@ module Avo
                 resource.to_s.underscore.gsub("_resource", "").downcase.pluralize.to_sym
               end
 
+              # Handle uncountable routes
+              route_key = route_key.to_sym
               resources route_key
             end
         end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.14.0"
+  VERSION = "1.15.0.pre.1"
 end