Skip to content

Commit

Permalink
Assets helpers now accept multiple file names
Browse files Browse the repository at this point in the history
  • Loading branch information
jodosha committed Oct 27, 2014
1 parent b45c896 commit 4d1250f
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 4 deletions.
12 changes: 8 additions & 4 deletions lib/lotus/assets/helpers.rb
@@ -1,12 +1,16 @@
module Lotus
module Assets
module Helpers
def javascript(file)
%(<script src="/#{ javascript_path(file) }.js" type="text/javascript"></script>)
def javascript(*files)
files.map do |file|
%(<script src="/#{ javascript_path(file) }.js" type="text/javascript"></script>)
end.join("\n")
end

def stylesheet(file)
%(<link href="/#{ stylesheet_path(file) }.css" type="text/css" rel="stylesheet">)
def stylesheet(*files)
files.map do |file|
%(<link href="/#{ stylesheet_path(file) }.css" type="text/css" rel="stylesheet">)
end.join("\n")
end

private
Expand Down
6 changes: 6 additions & 0 deletions test/fixtures.rb
Expand Up @@ -39,3 +39,9 @@ def _assets_prefix
'prefix'
end
end

class RenderMultipleAssets < View
def self.template
__dir__ + '/fixtures/multi-template.erb'
end
end
2 changes: 2 additions & 0 deletions test/fixtures/multi-template.erb
@@ -0,0 +1,2 @@
<%= javascript 'feature-a', 'feature-b' %>
<%= stylesheet 'grid', 'main' %>
16 changes: 16 additions & 0 deletions test/integration/rendering_test.rb
Expand Up @@ -42,4 +42,20 @@
@result.must_include %(<link href="/prefix/assets/main.css" type="text/css" rel="stylesheet">)
end
end

describe 'with multiple assets' do
before do
@result = RenderMultipleAssets.new.render
end

it 'resolves javascript tags' do
@result.must_include %(<script src="/assets/feature-a.js" type="text/javascript"></script>)
@result.must_include %(<script src="/assets/feature-b.js" type="text/javascript"></script>)
end

it 'resolves stylesheets tag' do
@result.must_include %(<link href="/assets/grid.css" type="text/css" rel="stylesheet">)
@result.must_include %(<link href="/assets/main.css" type="text/css" rel="stylesheet">)
end
end
end

0 comments on commit 4d1250f

Please sign in to comment.