From 8e190350b2f160d3918eef2d6145927b66dddae2 Mon Sep 17 00:00:00 2001 From: "Katherine G. Pe" Date: Thu, 10 Apr 2014 16:22:10 +0800 Subject: [PATCH] Use first prefix is multiple prefixes are defined fix petebrowne/sprockets-helpers/#24 --- lib/sprockets/helpers.rb | 1 + spec/sprockets-helpers_spec.rb | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/lib/sprockets/helpers.rb b/lib/sprockets/helpers.rb index e5b374f..836979e 100755 --- a/lib/sprockets/helpers.rb +++ b/lib/sprockets/helpers.rb @@ -36,6 +36,7 @@ class << self # This defaults to '/assets'. def prefix @prefix ||= '/assets' + @prefix.is_a?(Array) ? "/#{@prefix.first}" : @prefix end attr_writer :prefix diff --git a/spec/sprockets-helpers_spec.rb b/spec/sprockets-helpers_spec.rb index e7ac7ab..fe52167 100755 --- a/spec/sprockets-helpers_spec.rb +++ b/spec/sprockets-helpers_spec.rb @@ -564,6 +564,20 @@ expect(Sprockets::Helpers.digest).to be_true end + it 'uses first prefix if assets_prefix is an array' do + custom_env = Sprockets::Environment.new + + app = Class.new(Sinatra::Base) do + set :sprockets, custom_env + set :assets_prefix, %w(assets vendor/assets) + + register Sinatra::Sprockets::Helpers + end + + expect(Sprockets::Helpers.environment).to be(custom_env) + expect(Sprockets::Helpers.prefix).to eq('/assets') + end + it 'manually configures with configure method' do custom_env = Sprockets::Environment.new