Merge branch 'fix_precompilation' of https://github.com/rickenharp/as…

…sets into rickenharp-fix_precompilation
hanami · May 20, 2016 · 505a919 · 505a919
2 parents 9b22a28 + e07607c
commit 505a919
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/lib/hanami/assets/compiler.rb b/lib/hanami/assets/compiler.rb
@@ -151,7 +151,7 @@ def fresh?
       # @since 0.1.0
       # @api private
       def compile?
-        @compile ||= ::File.fnmatch(COMPILE_PATTERN, source.to_s) &&
+        @compile ||= ::File.fnmatch(COMPILE_PATTERN, ::File.basename(source.to_s)) &&
           !EXTENSIONS[::File.extname(source.to_s)]
       end
 

diff --git a/test/fixtures/stylesheets/folder.dot/other_style.foobar b/test/fixtures/stylesheets/folder.dot/other_style.foobar
@@ -0,0 +1 @@
+This is a foobar file.
diff --git a/test/fixtures/stylesheets/style.foobar b/test/fixtures/stylesheets/style.foobar
@@ -0,0 +1 @@
+This is a foobar file.
diff --git a/test/integration/compiler_test.rb b/test/integration/compiler_test.rb
@@ -108,6 +108,22 @@
     directory.must_be :exist?
   end
 
+  it 'copies unknown asset' do
+    Hanami::Assets::Compiler.compile(@config, 'style.foobar')
+
+    target  = @config.public_directory.join('assets', 'style.foobar')
+    content = target.read
+    content.must_equal "This is a foobar file.\n"
+  end
+
+  it 'copies unknown asset in folder with a dot in it' do
+    Hanami::Assets::Compiler.compile(@config, 'other_style.foobar')
+
+    target  = @config.public_directory.join('assets', 'other_style.foobar')
+    content = target.read
+    content.must_equal "This is a foobar file.\n"
+  end
+
   it "won't compile/copy if the source hasn't changed" do
     Hanami::Assets::Compiler.compile(@config, 'unchanged.js')