From b21d0e070b86d6c953d4f953a2c803d0fcfae7c1 Mon Sep 17 00:00:00 2001
From: Rada Bogdan Raul <raoul_ice@yahoo.com>
Date: Wed, 24 Aug 2016 08:36:32 +0300
Subject: [PATCH] avoid conflicts with other gems

---
 lib/sinatra/asset_pipeline.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/sinatra/asset_pipeline.rb b/lib/sinatra/asset_pipeline.rb
index 72c538b..2dd31b3 100644
--- a/lib/sinatra/asset_pipeline.rb
+++ b/lib/sinatra/asset_pipeline.rb
@@ -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") }
@@ -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?
@@ -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
@@ -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|