js_from_routes 3.0.2 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b4a7e4009c35ed9b21a6ea1010d157faaed01d21143086a7573d87ae1a21aae
-  data.tar.gz: 67db6af0cbae2656a450649384c86f19a9c890fd58e84ea99fa7f03299866dd0
+  metadata.gz: '0638fb2569cd2fb42213161ed2ac0f850edf79a3d383b067fbfef9ba28c91635'
+  data.tar.gz: 5dc8afb64a0ba08b94ac23f253c7934e485690d67af2811a0aff123ff97acb3e
 SHA512:
-  metadata.gz: 4b519fba61999909979dd313995733497c9536cb5fda7bdf0c0585e133ab718f4b733c46014d2b3b039fa81b7b70d6b8939e3e155656613dafc0577f64970041
-  data.tar.gz: 570cc1c4a497adf344b02e52c8c1da005877830be355638f85be7c9fe664094b03ee9d62c66a5295db1dfcd5d47993928581c0949f239b90f041e0d85f51c619
+  metadata.gz: 7df240239621acee87a8c216218dbd6aa138cf49b117929930da3153da651b4d242ec4cc27c2e0a734fee796fb632e5005a60f56848de807a8dd93faf84d0636
+  data.tar.gz: 4e179ae1663a0e77f300e7f6875246e58ad120f1d2fb9b4620a1f148621d9489d2f2897982e792a1f904b896650d7537caf6763ce363390e51b7a94533004053

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [4.0.1](https://github.com/ElMassimo/js_from_routes/compare/js_from_routes@4.0.0...js_from_routes@4.0.1) (2024-11-08)
+
+
+### Features
+
+* allow using with rails 8 ([ffcefb9](https://github.com/ElMassimo/js_from_routes/commit/ffcefb9c4eda530cec107b0e74e71d318f6e76a0)), closes [#53](https://github.com/ElMassimo/js_from_routes/issues/53)
+
+
+
+# [4.0.0](https://github.com/ElMassimo/js_from_routes/compare/js_from_routes@3.0.2...js_from_routes@4.0.0) (2024-10-11)
+
+
+### Features
+
+* allow customizing the namespace for path helpers ([#50](https://github.com/ElMassimo/js_from_routes/issues/50)) ([9d38c83](https://github.com/ElMassimo/js_from_routes/commit/9d38c8312ef1275b3b8c18c1129bc936da08bcd0))
+
+
+
 ## [3.0.2](https://github.com/ElMassimo/js_from_routes/compare/js_from_routes@3.0.1...js_from_routes@3.0.2) (2024-09-25)
 
 

data/lib/js_from_routes/generator.rb

@@ -15,8 +15,13 @@ module JsFromRoutes
     def initialize(controller, routes, config)
       @controller, @config = controller, config
       @routes = routes
-        .uniq { |route| route.requirements.fetch(:action) }
-        .map { |route| Route.new(route, config.helper_mappings) }
+        .reject { |route| route.requirements[:action] == "update" && route.verb == "PUT" }
+        .group_by { |route| route.requirements.fetch(:action) }
+        .flat_map { |action, routes|
+          routes.each_with_index.map { |route, index|
+            Route.new(route, mappings: config.helper_mappings, index:, controller:)
+          }
+        }
     end
 
     # Public: Used to check whether the file should be generated again, changes
@@ -53,8 +58,8 @@ module JsFromRoutes
 
   # Internal: A presenter for an individual Rails action.
   class Route
-    def initialize(route, mappings = {})
-      @route, @mappings = route, mappings
+    def initialize(route, mappings:, controller:, index: 0)
+      @route, @mappings, @controller, @index = route, mappings, controller, index
     end
 
     # Public: The `export` setting specified for the action.
@@ -64,7 +69,7 @@ module JsFromRoutes
 
     # Public: The HTTP verb for the action. Example: 'patch'
     def verb
-      @route.verb.downcase
+      @route.verb.split("|").last.downcase
     end
 
     # Public: The path for the action. Example: '/users/:id/edit'
@@ -74,8 +79,12 @@ module JsFromRoutes
 
     # Public: The name of the JS helper for the action. Example: 'destroyAll'
     def helper
-      action = @route.requirements.fetch(:action).camelize(:lower)
-      @mappings.fetch(action, action)
+      action = @route.requirements.fetch(:action)
+      if @index > 0
+        action = @route.name&.sub(@controller.tr(":/", "_"), "") || "#{action}#{verb.titleize}"
+      end
+      helper = action.camelize(:lower)
+      @mappings.fetch(helper, helper)
     end
 
     # Internal: Useful as a cache key for the route, and for debugging purposes.
@@ -145,6 +154,16 @@ module JsFromRoutes
     end
   end
 
+  class TemplateConfig
+    attr_reader :cache_key, :filename, :helpers
+
+    def initialize(cache_key:, filename:, helpers: nil)
+      @cache_key = cache_key
+      @filename = filename
+      @helpers = helpers
+    end
+  end
+
   class << self
     # Public: Configuration of the code generator.
     def config
@@ -164,7 +183,8 @@ module JsFromRoutes
 
     def generate_files(exported_routes)
       template = Template.new(config.template_path)
-      generate_file_for_all exported_routes.map { |controller, routes|
+      generate_file_for_all exported_routes.filter_map { |controller, routes|
+        next unless controller
         ControllerRoutes.new(controller, routes, config).tap do |routes|
           template.write_if_changed routes
         end
@@ -177,24 +197,28 @@ module JsFromRoutes
       preferred_extension = File.extname(config.file_suffix)
       index_file = (config.all_helpers_file == true) ? "index#{preferred_extension}" : config.all_helpers_file
 
-      Template.new(config.template_all_path).write_if_changed OpenStruct.new(
+      Template.new(config.template_all_path).write_if_changed TemplateConfig.new(
         cache_key: routes.map(&:import_filename).join + File.read(config.template_all_path),
         filename: config.output_folder.join("all#{preferred_extension}"),
         helpers: routes,
       )
-      Template.new(config.template_index_path).write_if_changed OpenStruct.new(
+      Template.new(config.template_index_path).write_if_changed TemplateConfig.new(
         cache_key: File.read(config.template_index_path),
         filename: config.output_folder.join(index_file),
       )
     end
 
+    def namespace_for_route(route)
+      if (export = route.defaults[:export]).is_a?(Hash)
+        export[:namespace]
+      end || route.requirements[:controller]
+    end
+
     # Internal: Returns exported routes grouped by controller name.
     def exported_routes_by_controller(routes)
-      routes.select { |route|
-        config.export_if.call(route) && route.requirements[:controller]
-      }.group_by { |route|
-        route.requirements.fetch(:controller)
-      }
+      routes
+        .select { |route| config.export_if.call(route) }
+        .group_by { |route| namespace_for_route(route)&.to_s }
     end
   end
 end

data/lib/js_from_routes/version.rb

@@ -4,5 +4,5 @@
 # Generates one file per controller, and one function per route.
 module JsFromRoutes
   # Public: This library adheres to semantic versioning.
-  VERSION = "3.0.2"
+  VERSION = "4.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js_from_routes
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.0.1
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-25 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -19,7 +19,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement