ember-cli-rails-assets 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09d4079f97e405aafa40b0b3663fdeaed6ae362e55e84839563856169225aed7'
-  data.tar.gz: 2f329df8fb400ff28c6ddb7105589a7a76ff7054606e9007d6955d2090848e61
+  metadata.gz: b93721604a8a9ba4f8f875767c6d95a84fd44cb973a8cd34713f9d1c9148e917
+  data.tar.gz: 7d262c1513d85634eb62d9f5eda6326be49ebb1aa9d48492d194852afe488884
 SHA512:
-  metadata.gz: 97f6951bc89beb25aa963e554679415758069fdecb817753c8ce2148137669d159e8bc9384e22cd778ea2aebe371d3b57c9b530188700b442a27f7d8fb07586d
-  data.tar.gz: 574368c875b462fd04a08613e8fece7ed186e4b95a8918e3429e37251c3385d3993795feb2c58d34c2777058e0b67323151f0ed73a2de3494512fa686ed065fd
+  metadata.gz: 636d49bed887eae52fb1d74078fd195b5e9d861235004c2225c0a23b940b5ccdfdcc3e6933f3ceef2e57c501caaadd68d30b7c644d22f2dced62b709ee3b3999
+  data.tar.gz: f62f364b4ee98dca076cd7dd6ff11b35687e658d85df97781c42f15f1e54610e5e946afdf5bfb36d0aa6dd248a1c69669562fc52b10a4810b87156a3b3d1cbc8

data/lib/ember_cli/assets/asset_map.rb

@@ -39,20 +39,26 @@ module EmberCli
         elsif Url.remote?(url)
           url
         else
-          asset_matching(/#{Regexp.escape(File.basename(url))}\z/)
+          asset_matching(url)
         end
       end
 
-      def asset_matching(regex)
-        matching_asset = files.detect { |asset| asset =~ regex }
+      def asset_matching(url)
+        matching_asset = path_suffixes(url).find { |suffix| files.include?(suffix) }
 
-        if matching_asset.to_s.empty?
-          raise_missing_asset(regex)
+        unless matching_asset
+          raise_missing_asset(url)
         end
 
         prepend + matching_asset
       end
 
+      def path_suffixes(url)
+        segments = url.split("/").reject(&:empty?)
+
+        segments.each_index.map { |index| segments[index..].join("/") }
+      end
+
       def prepend
         asset_map["prepend"].to_s
       end
@@ -65,8 +71,8 @@ module EmberCli
         asset_map["assets"] || {}
       end
 
-      def raise_missing_asset(regex)
-        raise BuildError.new("Failed to find assets matching `#{regex}`")
+      def raise_missing_asset(url)
+        raise BuildError.new("Failed to find assets matching `#{url}`")
       end
 
       def assert_asset_map!

data/lib/ember_cli/assets/directory_asset_map.rb

@@ -1,3 +1,5 @@
+require "pathname"
+
 module EmberCli
   module Assets
     class DirectoryAssetMap
@@ -18,7 +20,7 @@ module EmberCli
 
       def files_with_data
         files.reduce({}) do |manifest, file|
-          name = File.basename(file.path)
+          name = file.relative_path_from(directory).to_s
 
           manifest[name] = name
 
@@ -26,9 +28,8 @@ module EmberCli
         end
       end
 
-
       def files
-        directory.children.map { |path| File.new(path) }
+        directory.glob("**/*", File::FNM_DOTMATCH).select(&:file?)
       end
     end
   end

data/lib/ember_cli/assets/version.rb

@@ -1,5 +1,5 @@
 module EmberCli
   module Assets
-    VERSION = "0.9.1"
+    VERSION = "0.9.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails-assets
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Sean Doyle
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Include EmberCLI-generated JavaScript and CSS stylesheet tags in your Rails
   layouts