Skip to content

Commit

Permalink
Merge pull request #60 from bogdanRada/master
Browse files Browse the repository at this point in the history
Use global scope when referring to classes instead of local scope, avoiding conflicts with other gems
  • Loading branch information
kalasjocke authored Aug 24, 2016
2 parents 3e2c6bc + b21d0e0 commit dbbb967
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions lib/sinatra/asset_pipeline.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
module Sinatra
module AssetPipeline
def self.registered(app)
app.set_default :sprockets, Sprockets::Environment.new
app.set_default :sprockets, ::Sprockets::Environment.new
app.set_default :assets_paths, %w(assets)
app.set_default :assets_precompile, %w(app.js app.css *.png *.jpg *.svg *.eot *.ttf *.woff *.woff2)
app.set_default :assets_public_path, -> { File.join(public_folder, "assets") }
Expand All @@ -24,7 +24,7 @@ def self.registered(app)
app.sprockets.append_path File.join(app.root, path)
end

Sprockets::Helpers.configure do |config|
::Sprockets::Helpers.configure do |config|
config.environment = app.sprockets
config.digest = app.assets_digest
config.prefix = app.assets_prefix unless app.assets_prefix.nil?
Expand All @@ -33,7 +33,7 @@ def self.registered(app)
end

app.configure :staging, :production do
Sprockets::Helpers.configure do |config|
::Sprockets::Helpers.configure do |config|
config.manifest = Sprockets::Manifest.new(app.sprockets, app.assets_public_path)
config.prefix = app.assets_prefix unless app.assets_prefix.nil?
end
Expand All @@ -43,14 +43,14 @@ def self.registered(app)
app.sprockets.css_compressor = app.assets_css_compressor unless app.assets_css_compressor.nil?
app.sprockets.js_compressor = app.assets_js_compressor unless app.assets_js_compressor.nil?

Sprockets::Helpers.configure do |config|
::Sprockets::Helpers.configure do |config|
config.protocol = app.assets_protocol
config.asset_host = app.assets_host unless app.assets_host.nil?
config.prefix = app.assets_prefix unless app.assets_prefix.nil?
end
end

app.helpers Sprockets::Helpers
app.helpers ::Sprockets::Helpers

app.configure :test, :development do
app.get "#{app.assets_prefix}/*" do |path|
Expand Down

0 comments on commit dbbb967

Please sign in to comment.