js_from_routes 2.0.3 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db1718354ae9ce8148221f6cb5331398809cb684450cf1d88d43636f5b2f0c40
-  data.tar.gz: d883f5e22c950ed87481ac9d8d1fca08ef669c5fe56b7fd51cc48124d9640077
+  metadata.gz: 9053499de4df17e1ef042b1b54e4c172ab8ab94b2c0c353e6b8035efa8d3c0e5
+  data.tar.gz: 6fc5926dfcf3b0f94bde9c7176af31522c36bf206d6636563415143655414c3e
 SHA512:
-  metadata.gz: 319b235a6fcc6bf8564517486de5fb9790fc5076fa0b3030b711eb49ea058c5ba877fc7b8a217976f9556cd330c8f78114e5a2361a11367536d25fad233ef013
-  data.tar.gz: 8ec656121b7a10bb0123ede54409a5327d215124d6fdd11f38f5aad34d1f56e0e982dc5139cada10a978037d6fe0767ed94ef1abdcdded1d61d104438a12ff9f
+  metadata.gz: 30c30f206f148dcb9ca5dac38f4f5eb07d0b6d49f5ca4c87dd4e358a3b7af12ce1fe0750cb0554c91c0655c2cadcaf6ad47438a35b9ee9678eaf3cf4945ba2d5
+  data.tar.gz: 2515d4737e9202d93e99b3f573f43667d2beea1dc61a2fafdabf2a3752478e36289fd742649fe55396185604b3ff8b04d0742048e6d8ec7ef7530627107e0931

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+## [2.0.6](https://github.com/ElMassimo/js_from_routes/compare/js_from_routes@2.0.5...js_from_routes@2.0.6) (2022-05-25)
+
+
+### Bug Fixes
+
+* should not attempt to export routes without controllers ([47f8f70](https://github.com/ElMassimo/js_from_routes/commit/47f8f70b0db98baa240470f8b2b891a730499518))
+
+
+
+## [2.0.5](https://github.com/ElMassimo/js_from_routes/compare/js_from_routes@2.0.4...js_from_routes@2.0.5) (2021-09-02)
+
+
+### Bug Fixes
+
+* ensure :export is not added as a required default in routes ([40126ac](https://github.com/ElMassimo/js_from_routes/commit/40126ac27caeee33abef1c7067ba1db88ea03660))
+
+
+
+## [2.0.4](https://github.com/ElMassimo/js_from_routes/compare/js_from_routes@2.0.3...js_from_routes@2.0.4) (2021-03-16)
+
+### Features
+
+* Allow importing individual helpers from "~/api" by adding exports ([2dfb8a2](https://github.com/ElMassimo/js_from_routes/commit/2dfb8a27d182376d75f0b037258bc772553e43f3)). Thanks @matias-capeletto!
+
+
 ## [2.0.3](https://github.com/ElMassimo/js_from_routes/compare/js_from_routes@2.0.2...js_from_routes@2.0.3) (2021-03-16)
 
 

data/lib/js_from_routes/generator.rb

@@ -8,28 +8,6 @@ require "pathname"
 # Public: Automatically generates JS for Rails routes with { export: true }.
 # Generates one file per controller, and one function per route.
 module JsFromRoutes
-  # Internal: Helper class used as a presenter for the all helpers template.
-  class AllRoutes
-    attr_reader :helpers
-
-    def initialize(helpers, config)
-      @helpers, @config = helpers, config
-    end
-
-    # Public: Used to check whether the file should be generated again, changes
-    # based on the configuration, and route definition.
-    def cache_key
-      helpers.map(&:import_filename).join + File.read(@config.template_all_path)
-    end
-
-    # Internal: Name of the JS file where all helpers will be exported.
-    def filename
-      path = @config.all_helpers_file
-      path = "index#{File.extname(@config.file_suffix)}" if path == true
-      @config.output_folder.join(path)
-    end
-  end
-
   # Internal: Helper class used as a presenter for the routes template.
   class ControllerRoutes
     attr_reader :routes
@@ -177,7 +155,18 @@ module JsFromRoutes
     def generate_file_for_all(routes)
       return unless config.all_helpers_file && !routes.empty?
 
-      Template.new(config.template_all_path).write_if_changed AllRoutes.new(routes, config)
+      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(
+        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(
+        cache_key: File.read(config.template_index_path),
+        filename: config.output_folder.join(index_file),
+      )
     end
 
     def default_config(root)
@@ -190,13 +179,14 @@ module JsFromRoutes
         output_folder: root.join("app", dir, "api"),
         template_path: File.expand_path("template.js.erb", __dir__),
         template_all_path: File.expand_path("template_all.js.erb", __dir__),
+        template_index_path: File.expand_path("template_index.js.erb", __dir__),
       }
     end
 
     # Internal: Returns exported routes grouped by controller name.
     def exported_routes_by_controller(routes)
       routes.select { |route|
-        route.defaults.fetch(:export, false)
+        route.defaults.fetch(:export, false) && route.requirements[:controller]
       }.group_by { |route|
         route.requirements.fetch(:controller)
       }

data/lib/js_from_routes/railtie.rb

@@ -24,4 +24,14 @@ class JsFromRoutes::Railtie < Rails::Railtie
       end
     end
   end
+
+  # Prevents Rails from interpreting the :export option as a required default,
+  # which would cause controller tests to fail.
+  initializer "js_from_routes.required_defaults" do |app|
+    ActionDispatch::Journey::Route.prepend Module.new {
+      def required_default?(key)
+        key == :export ? false : super
+      end
+    }
+  end
 end

data/lib/js_from_routes/template_all.js.erb

@@ -1,11 +1,5 @@
 //
 // DO NOT MODIFY: This file was automatically generated by JsFromRoutes.
 <% helpers.each do |helper| %>
-import <%= helper.js_name %> from '~/<%= helper.import_filename %>'
+export { default as <%= helper.js_name %> } from '~/<%= helper.import_filename %>'
 <% end %>
-
-export default {
-<% helpers.each do |helper| %>
-  <%= helper.js_name %>,
-<% end %>
-}

data/lib/js_from_routes/template_index.js.erb

@@ -0,0 +1,5 @@
+//
+// DO NOT MODIFY: This file was automatically generated by JsFromRoutes.
+import * as helpers from '~/api/all'
+export * from '~/api/all'
+export default helpers

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 = "2.0.3"
+  VERSION = "2.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js_from_routes
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.6
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -146,6 +146,7 @@ files:
 - lib/js_from_routes/railtie.rb
 - lib/js_from_routes/template.js.erb
 - lib/js_from_routes/template_all.js.erb
+- lib/js_from_routes/template_index.js.erb
 - lib/js_from_routes/version.rb
 homepage: https://github.com/ElMassimo/js_from_routes
 licenses:
@@ -166,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Generate JS automatically from Rails routes.