Merge pull request #192 from jsntv200/fix/module_path_from

Remove prepended forward slash when mapping.path is empty

Author: rafaelfranca

lib/importmap/map.rb

@@ -145,7 +145,7 @@ def module_name_from(filename, mapping)
     end
 
     def module_path_from(filename, mapping)
-      [ mapping.path || mapping.under, filename.to_s ].compact.join("/")
+      [ mapping.path || mapping.under, filename.to_s ].compact.reject(&:empty?).join("/")
     end
 
     def find_javascript_files_in_tree(path)

test/dummy/app/assets/config/manifest.js

@@ -1,4 +1,5 @@
 //= link_tree ../images
 //= link_directory ../stylesheets .css
 //= link_tree ../../javascript .js
+//= link_tree ../../components .js
 //= link_tree ../../../lib/assets/javascripts .js

test/dummy/app/components/another_component_controller.js

@@ -5,6 +5,7 @@
 
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
+Rails.application.config.assets.paths << Rails.root.join("app/components")
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets

test/dummy/app/components/spina/component_controller.js

@@ -14,6 +14,7 @@ def setup
         pin_all_from "app/javascript/spina/controllers", under: "controllers/spina", to: "spina/controllers", preload: true
         pin_all_from "app/javascript/helpers", under: "helpers", preload: true
         pin_all_from "lib/assets/javascripts", preload: true
+        pin_all_from "app/components", under: "controllers", to: "", preload: true
       end
     end
   end
@@ -52,6 +53,11 @@ def setup
     assert_match %r|assets/spina/controllers/deeper/again_controller-.*\.js|, generate_importmap_json["imports"]["controllers/spina/deeper/again_controller"]
   end
 
+  test "directory pin under custom asset path with empty to" do
+    assert_match %r|assets/spina/component_controller-.*\.js|, generate_importmap_json["imports"]["controllers/spina/component_controller"]
+    assert_match %r|assets/another_component_controller-.*\.js|, generate_importmap_json["imports"]["controllers/another_component_controller"]
+  end
+
   test "directory pin without path or under" do
     assert_match %r|assets/my_lib-.*\.js|, generate_importmap_json["imports"]["my_lib"]
   end