Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

use full path when creating static file

  • Loading branch information...
commit 27e6d633b6050b93949a63ff73238d5a42596e48 1 parent fd44e54
@matthodan authored
Showing with 54 additions and 2 deletions.
  1. +2 −1  lib/jekyll_asset_pipeline/extensions/liquid/liquid_block_extensions.rb
  2. +1 −1  spec/extensions/liquid/liquid_block_extensions_spec.rb
  3. +3 −0  spec/resources/source/.asset_pipeline/assets/bar.css
  4. +3 −0  spec/resources/source/.asset_pipeline/assets/foo.css
  5. +3 −0  spec/resources/source/.asset_pipeline/assets/foobar-ad62ebfde422ae57ce0340e7110e9d7f.css
  6. +1 −0  spec/resources/source/.asset_pipeline/assets/foobar-ad62ebfde422ae57ce0340e7110e9d7f.css.gz
  7. +1 −0  spec/resources/source/.asset_pipeline/assets/foobar-b7ca03b465975cb85e820480931957f8.css
  8. +7 −0 spec/resources/source/.asset_pipeline/assets/foobar-eb0873729ecb5c4b0e721d31ea93de7d.css
  9. +1 −0  spec/resources/source/.asset_pipeline/assets/global-74c867dc6d91e7df0d8d76ddbb3469aa.css
  10. +1 −0  spec/resources/source/.asset_pipeline/assets/global-7d289556d82197f109415ba3e77989ef.css
  11. +1 −0  spec/resources/source/.asset_pipeline/assets/global-d3c2b9001a608999550c374e98bf345a.css
  12. +7 −0 spec/resources/source/.asset_pipeline/assets/global-e1ef5f8e5f5e655acad024e305778779.js
  13. +1 −0  spec/resources/source/.asset_pipeline/assets/global-e1efeae0fd078de4e8a0ebf028b81d0b.css
  14. +1 −0  spec/resources/source/.asset_pipeline/assets/global-e7e5214cb066ea360b7b7f89733d65dd.css
  15. +7 −0 spec/resources/source/.asset_pipeline/assets/global-eb0873729ecb5c4b0e721d31ea93de7d.css
  16. +7 −0 spec/resources/source/.asset_pipeline/assets/global-eb0873729ecb5c4b0e721d31ea93de7d.js
  17. +7 −0 spec/resources/source/.asset_pipeline/foobar_assets/global-b6f3d7d2c6ea93667e49bb713c3d7e98.css
View
3  lib/jekyll_asset_pipeline/extensions/liquid/liquid_block_extensions.rb
@@ -22,7 +22,8 @@ def render(context)
# Prevent Jekyll from cleaning up saved assets if new pipeline
pipeline.assets.each do |asset|
config = JekyllAssetPipeline::DEFAULTS.merge(config)
- site.static_files << Jekyll::StaticFile.new(site, config['staging_path'],
+ staging_path = File.expand_path(File.join(site.source, config['staging_path']))
+ site.static_files << Jekyll::StaticFile.new(site, staging_path,
asset.output_path, asset.filename)
end unless cached
View
2  spec/extensions/liquid/liquid_block_extensions_spec.rb
@@ -74,7 +74,7 @@ def self.output_type
let(:site) do
site = MiniTest::Mock.new
site.expect(:config, {})
- site.expect(:source, source_path)
+ 2.times { site.expect(:source, source_path) }
2.times { site.expect(:dest, temp_path) }
site.expect(:static_files, [])
site
View
3  spec/resources/source/.asset_pipeline/assets/bar.css
@@ -0,0 +1,3 @@
+.bar {
+ display: inline;
+}
View
3  spec/resources/source/.asset_pipeline/assets/foo.css
@@ -0,0 +1,3 @@
+.foo {
+ display: inline;
+}
View
3  spec/resources/source/.asset_pipeline/assets/foobar-ad62ebfde422ae57ce0340e7110e9d7f.css
@@ -0,0 +1,3 @@
+.foo {
+ display: inline;
+}
View
1  spec/resources/source/.asset_pipeline/assets/foobar-ad62ebfde422ae57ce0340e7110e9d7f.css.gz
@@ -0,0 +1 @@
+gzipped
View
1  spec/resources/source/.asset_pipeline/assets/foobar-b7ca03b465975cb85e820480931957f8.css
@@ -0,0 +1 @@
+converted
View
7 spec/resources/source/.asset_pipeline/assets/foobar-eb0873729ecb5c4b0e721d31ea93de7d.css
@@ -0,0 +1,7 @@
+.foo {
+ display: inline;
+}
+
+.bar {
+ display: inline;
+}
View
1  spec/resources/source/.asset_pipeline/assets/global-74c867dc6d91e7df0d8d76ddbb3469aa.css
@@ -0,0 +1 @@
+converted
View
1  spec/resources/source/.asset_pipeline/assets/global-7d289556d82197f109415ba3e77989ef.css
@@ -0,0 +1 @@
+compressed
View
1  spec/resources/source/.asset_pipeline/assets/global-d3c2b9001a608999550c374e98bf345a.css
@@ -0,0 +1 @@
+converted to bar
View
7 spec/resources/source/.asset_pipeline/assets/global-e1ef5f8e5f5e655acad024e305778779.js
@@ -0,0 +1,7 @@
+.foo {
+ display: inline;
+}
+
+.bar {
+ display: inline;
+}
View
1  spec/resources/source/.asset_pipeline/assets/global-e1efeae0fd078de4e8a0ebf028b81d0b.css
@@ -0,0 +1 @@
+converted to baz
View
1  spec/resources/source/.asset_pipeline/assets/global-e7e5214cb066ea360b7b7f89733d65dd.css
@@ -0,0 +1 @@
+converted
View
7 spec/resources/source/.asset_pipeline/assets/global-eb0873729ecb5c4b0e721d31ea93de7d.css
@@ -0,0 +1,7 @@
+.foo {
+ display: inline;
+}
+
+.bar {
+ display: inline;
+}
View
7 spec/resources/source/.asset_pipeline/assets/global-eb0873729ecb5c4b0e721d31ea93de7d.js
@@ -0,0 +1,7 @@
+.foo {
+ display: inline;
+}
+
+.bar {
+ display: inline;
+}
View
7 ...esources/source/.asset_pipeline/foobar_assets/global-b6f3d7d2c6ea93667e49bb713c3d7e98.css
@@ -0,0 +1,7 @@
+.foo {
+ display: inline;
+}
+
+.bar {
+ display: inline;
+}
Please sign in to comment.
Something went wrong with that request. Please try again.