sprockets-helpers 0.9.1 → 1.0.0

data/Appraisals

@@ -25,3 +25,15 @@ end
 appraise 'sprockets-2.6' do
   gem 'sprockets', '~> 2.6.0'
 end
+
+appraise 'sprockets-2.7' do
+  gem 'sprockets', '~> 2.7.0'
+end
+
+appraise 'sprockets-2.8' do
+  gem 'sprockets', '~> 2.8.0'
+end
+
+appraise 'sprockets-2.9' do
+  gem 'sprockets', '~> 2.9.0'
+end

data/README.md

@@ -1,5 +1,4 @@
-sprockets-helpers
-=================
+# sprockets-helpers
 
 **Asset path helpers for Sprockets 2.x applications**
 
@@ -12,17 +11,13 @@ Sprockets::Helpers adds the asset_path helpers, familiar to Rails developers, to
 * Optionally outputs digest paths.
 * Falls back to file paths in the public directory & adds cache busting timestamp.
 
-
-Installation
-------------
+## Installation
 
 ``` bash
 $ gem install sprockets-helpers
 ```
 
-
-Setup
------
+## Setup
 
 Let's build a simple Sinatra app using Sprockets and Sprockets::Helpers (See my fork of [sinatra-asset-pipeline](https://github.com/petebrowne/sinatra-asset-pipeline) for complete setup):
 
@@ -67,9 +62,7 @@ class App < Sinatra::Base
 end
 ```
 
-
-Usage in Assets
----------------
+## Usage in Assets
 
 Simply requiring sprockets-helpers will add the asset path helpers to the Sprocket context, making them available within any asset. For example, a file `assets/javascripts/paths.js.erb`:
 
@@ -83,9 +76,7 @@ Would be transformed into:
 var Paths = { railsImage: '/assets/rails.png' };
 ```
 
-
-Usage in the App
-----------------
+## Usage in the App
 
 The helpers can also be used in the app itself. You just include the `Sprockets::Helpers` module and set Sprockets::Helpers.environment to the Sprockets environment to search for the assets. Alternatively you can define an #assets_environment method in the context of #asset_path, which returns a reference to the Sprockets environment (see above).
 
@@ -159,9 +150,7 @@ Would become:
 </html>
 ```
 
-
-Fallback to Public Directory
-----------------------------
+## Fallback to Public Directory
 
 If the source is not an asset in the Sprockets environment, Sprockets::Helpers will fallback to looking for the file in the application's public directory. It will also append the cache busting timestamp of the file. For example:
 
@@ -177,11 +166,9 @@ Would become:
 <img src='/images/logo.jpg?1320093919'>
 ```
 
+## Manifest Usage
 
-Manifest Usage
---------------
-
-**New in 0.4**: Sprockets::Helpers will use the latest fingerprinted filename directly from a `manifest.json` file:
+Sprockets::Helpers will use the latest fingerprinted filename directly from a `manifest.json` file:
 
 
 ``` ruby
@@ -195,8 +182,41 @@ end
 # ...
 ```
 
+## Sinatra Integration
+
+**New in 1.0**: there is an easier way to integrate with Sinatra applications. You can register the `Sinatra::Sprockets::Helpers` extension and it will automatically include the helpers:
+
+``` ruby
+require 'sinatra/base'
+require 'sprockets'
+require 'sinatra/sprockets-helpers'
+
+class App < Sinatra::Base
+  register Sinatra::Sprockets::Helpers
+  set :sprockets, Sprockets::Environment.new(root)
+  set :assets_prefix, '/assets'
+  set :digest_assets, true
+
+  configure do
+    # Setup Sprockets
+    sprockets.append_path File.join(root, 'assets', 'stylesheets')
+    sprockets.append_path File.join(root, 'assets', 'javascripts')
+    sprockets.append_path File.join(root, 'assets', 'images')
+
+    configure_sprockets_helpers do |helpers|
+      # This will automatically configure Sprockets::Helpers based on the
+      # `sprockets`, `public_folder`, `assets_prefix`, and `digest_assets`
+      # settings if they exist. Otherwise you can configure as normal:
+      helpers.asset_host = 'some-bucket.s3.amazon.com'
+    end
+  end
+
+  get '/' do
+    erb :index
+  end
+end
+```
 
-Copyright
----------
+## Copyright
 
 Copyright (c) 2011 [Peter Browne](http://petebrowne.com). See LICENSE for details.

data/gemfiles/sprockets_2.7.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "sprockets", "~> 2.7.0"
+
+gemspec :path=>"../"

data/gemfiles/sprockets_2.8.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "sprockets", "~> 2.8.0"
+
+gemspec :path=>"../"

data/gemfiles/sprockets_2.9.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "sprockets", "~> 2.9.0"
+
+gemspec :path=>"../"

data/lib/sinatra/sprockets-helpers.rb

@@ -0,0 +1 @@
+require 'sinatra/sprockets/helpers'

data/lib/sinatra/sprockets/helpers.rb

@@ -0,0 +1,34 @@
+require 'sinatra/base'
+require 'sprockets/helpers'
+
+module Sinatra
+  module Sprockets
+    module Helpers
+      def self.registered(app)
+        app.helpers ::Sprockets::Helpers
+        app.configure_sprockets_helpers
+      end
+
+      def configure_sprockets_helpers(&block)
+        ::Sprockets::Helpers.configure do |helpers|
+          with_setting(:sprockets) { |value| helpers.environment = value }
+          with_setting(:public_folder) { |value| helpers.public_path = value }
+          with_setting(:digest_assets) { |value| helpers.digest = value }
+          with_setting(:assets_prefix) { |value| helpers.prefix = value }
+        end
+        ::Sprockets::Helpers.configure(&block) if block_given?
+      end
+
+      private
+
+        def with_setting(name, &block)
+          return unless settings.respond_to?(name)
+
+          value = settings.__send__(name)
+          yield value unless value.nil?
+        end
+    end
+  end
+
+  register Sprockets::Helpers
+end

data/lib/sprockets/helpers/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Helpers
-    VERSION = '0.9.1'
+    VERSION = '1.0.0'
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require 'sprockets'
 require 'sprockets-helpers'
+require 'sinatra/base'
+require 'sinatra/sprockets/helpers'
 require 'construct'
 require 'pathname'
 
@@ -10,6 +12,11 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 RSpec.configure do |config|
   config.include Construct::Helpers
 
+  # Disable old `should` syntax
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
   # Returns a Sprockets environment. Automatically
   # appends the 'assets' path if available.
   def env
@@ -44,5 +51,4 @@ RSpec.configure do |config|
       c.file('assets/b.css')
     }.call(construct)
   end
-
 end

data/spec/sprockets-helpers_spec.rb

@@ -6,12 +6,12 @@ describe Sprockets::Helpers do
       within_construct do |c|
         c.file 'assets/main.css'
 
-        context.asset_path('main.css').should == '/assets/main.css'
+        expect(context.asset_path('main.css')).to eq('/assets/main.css')
         Sprockets::Helpers.configure do |config|
           config.digest = true
           config.prefix = '/themes'
         end
-        context.asset_path('main.css').should =~ %r(/themes/main-[0-9a-f]+.css)
+        expect(context.asset_path('main.css')).to match(%r(/themes/main-[0-9a-f]+.css))
         Sprockets::Helpers.digest = nil
         Sprockets::Helpers.prefix = nil
       end
@@ -23,9 +23,9 @@ describe Sprockets::Helpers do
       within_construct do |c|
         c.file 'assets/main.js'
 
-        context.asset_path('main', :ext => 'js').should == '/assets/main.js'
+        expect(context.asset_path('main', :ext => 'js')).to eq('/assets/main.js')
         Sprockets::Helpers.digest = true
-        context.asset_path('main', :ext => 'js').should =~ %r(/assets/main-[0-9a-f]+.js)
+        expect(context.asset_path('main', :ext => 'js')).to match(%r(/assets/main-[0-9a-f]+.js))
         Sprockets::Helpers.digest = nil
       end
     end
@@ -39,7 +39,7 @@ describe Sprockets::Helpers do
         custom_env = Sprockets::Environment.new
         custom_env.append_path 'themes'
         Sprockets::Helpers.environment = custom_env
-        context.asset_path('main.css').should == '/assets/main.css'
+        expect(context.asset_path('main.css')).to eq('/assets/main.css')
         Sprockets::Helpers.environment = nil
       end
     end
@@ -53,8 +53,8 @@ describe Sprockets::Helpers do
           c.file 'public/logo.jpg'
 
           Sprockets::Helpers.asset_host = 'assets.example.com'
-          context.asset_path('main.js').should == 'http://assets.example.com/assets/main.js'
-          context.asset_path('logo.jpg').should =~ %r(http://assets.example.com/logo.jpg\?\d+)
+          expect(context.asset_path('main.js')).to eq('http://assets.example.com/assets/main.js')
+          expect(context.asset_path('logo.jpg')).to match(%r(http://assets.example.com/logo.jpg\?\d+))
           Sprockets::Helpers.asset_host = nil
         end
       end
@@ -66,8 +66,8 @@ describe Sprockets::Helpers do
             c.file 'public/logo.jpg'
 
             Sprockets::Helpers.asset_host = 'assets%d.example.com'
-            context.asset_path('main.css').should =~ %r(http://assets[0-3].example.com/assets/main.css)
-            context.asset_path('logo.jpg').should =~ %r(http://assets[0-3].example.com/logo.jpg\?\d+)
+            expect(context.asset_path('main.css')).to match(%r(http://assets[0-3].example.com/assets/main.css))
+            expect(context.asset_path('logo.jpg')).to match(%r(http://assets[0-3].example.com/logo.jpg\?\d+))
             Sprockets::Helpers.asset_host = nil
           end
         end
@@ -81,8 +81,8 @@ describe Sprockets::Helpers do
           c.file 'public/logo.jpg'
 
           Sprockets::Helpers.asset_host = Proc.new { |source| File.basename(source, File.extname(source)) + '.assets.example.com' }
-          context.asset_path('main.js').should == 'http://main.assets.example.com/assets/main.js'
-          context.asset_path('logo.jpg').should =~ %r(http://logo.assets.example.com/logo.jpg\?\d+)
+          expect(context.asset_path('main.js')).to eq('http://main.assets.example.com/assets/main.js')
+          expect(context.asset_path('logo.jpg')).to match(%r(http://logo.assets.example.com/logo.jpg\?\d+))
           Sprockets::Helpers.asset_host = nil
         end
       end
@@ -94,9 +94,9 @@ describe Sprockets::Helpers do
       within_construct do |c|
         c.file 'assets/logo.jpg'
 
-        context.asset_path('logo.jpg').should == '/assets/logo.jpg'
+        expect(context.asset_path('logo.jpg')).to eq('/assets/logo.jpg')
         Sprockets::Helpers.prefix = '/images'
-        context.asset_path('logo.jpg').should == '/images/logo.jpg'
+        expect(context.asset_path('logo.jpg')).to eq('/images/logo.jpg')
         Sprockets::Helpers.prefix = nil
       end
     end
@@ -110,8 +110,8 @@ describe Sprockets::Helpers do
 
         Sprockets::Helpers.asset_host = 'assets.example.com'
         Sprockets::Helpers.protocol   = 'https'
-        context.asset_path('main.js').should == 'https://assets.example.com/assets/main.js'
-        context.asset_path('logo.jpg').should =~ %r(https://assets.example.com/logo.jpg\?\d+)
+        expect(context.asset_path('main.js')).to eq('https://assets.example.com/assets/main.js')
+        expect(context.asset_path('logo.jpg')).to match(%r(https://assets.example.com/logo.jpg\?\d+))
         Sprockets::Helpers.asset_host = nil
         Sprockets::Helpers.protocol   = nil
       end
@@ -125,8 +125,8 @@ describe Sprockets::Helpers do
 
           Sprockets::Helpers.asset_host = 'assets.example.com'
           Sprockets::Helpers.protocol   = :relative
-          context.asset_path('main.js').should == '//assets.example.com/assets/main.js'
-          context.asset_path('logo.jpg').should =~ %r(\A//assets.example.com/logo.jpg\?\d+)
+          expect(context.asset_path('main.js')).to eq('//assets.example.com/assets/main.js')
+          expect(context.asset_path('logo.jpg')).to match(%r(\A//assets.example.com/logo.jpg\?\d+))
           Sprockets::Helpers.asset_host = nil
           Sprockets::Helpers.protocol   = nil
         end
@@ -139,9 +139,9 @@ describe Sprockets::Helpers do
       within_construct do |c|
         c.file 'output/main.js'
 
-        context.asset_path('main.js').should == '/main.js'
+        expect(context.asset_path('main.js')).to eq('/main.js')
         Sprockets::Helpers.public_path = './output'
-        context.asset_path('main.js').should =~ %r(/main.js\?\d+)
+        expect(context.asset_path('main.js')).to match(%r(/main.js\?\d+))
         Sprockets::Helpers.public_path = nil
       end
     end
@@ -150,31 +150,28 @@ describe Sprockets::Helpers do
   describe '#asset_path' do
     context 'with URIs' do
       it 'returns URIs untouched' do
-        context.asset_path('https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js').should ==
-          'https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js'
-        context.asset_path('http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js').should ==
-          'http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js'
-        context.asset_path('//ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js').should ==
-          '//ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js'
+        expect(context.asset_path('https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js')).to eq('https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js')
+        expect(context.asset_path('http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js')).to eq('http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js')
+        expect(context.asset_path('//ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js')).to eq('//ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js')
       end
     end
 
     context 'with regular files' do
       it 'returns absolute paths' do
-        context.asset_path('/path/to/file.js').should == '/path/to/file.js'
-        context.asset_path('/path/to/file.jpg').should == '/path/to/file.jpg'
-        context.asset_path('/path/to/file.eot?#iefix').should == '/path/to/file.eot?#iefix'
+        expect(context.asset_path('/path/to/file.js')).to eq('/path/to/file.js')
+        expect(context.asset_path('/path/to/file.jpg')).to eq('/path/to/file.jpg')
+        expect(context.asset_path('/path/to/file.eot?#iefix')).to eq('/path/to/file.eot?#iefix')
       end
 
       it 'appends the extension for javascripts and stylesheets' do
-        context.asset_path('/path/to/file', :ext => 'js').should == '/path/to/file.js'
-        context.asset_path('/path/to/file', :ext => 'css').should == '/path/to/file.css'
+        expect(context.asset_path('/path/to/file', :ext => 'js')).to eq('/path/to/file.js')
+        expect(context.asset_path('/path/to/file', :ext => 'css')).to eq('/path/to/file.css')
       end
 
       it 'prepends a base dir' do
-        context.asset_path('main', :dir => 'stylesheets', :ext => 'css').should == '/stylesheets/main.css'
-        context.asset_path('main', :dir => 'javascripts', :ext => 'js').should == '/javascripts/main.js'
-        context.asset_path('logo.jpg', :dir => 'images').should == '/images/logo.jpg'
+        expect(context.asset_path('main', :dir => 'stylesheets', :ext => 'css')).to eq('/stylesheets/main.css')
+        expect(context.asset_path('main', :dir => 'javascripts', :ext => 'js')).to eq('/javascripts/main.js')
+        expect(context.asset_path('logo.jpg', :dir => 'images')).to eq('/images/logo.jpg')
       end
 
       it 'appends a timestamp if the file exists in the output path' do
@@ -184,10 +181,10 @@ describe Sprockets::Helpers do
           c.file 'public/font.eot'
           c.file 'public/font.svg'
 
-          context.asset_path('main', :ext => 'js').should =~ %r(/main.js\?\d+)
-          context.asset_path('/favicon.ico').should =~ %r(/favicon.ico\?\d+)
-          context.asset_path('font.eot?#iefix').should =~ %r(/font.eot\?\d+#iefix)
-          context.asset_path('font.svg#FontName').should =~ %r(/font.svg\?\d+#FontName)
+          expect(context.asset_path('main', :ext => 'js')).to match(%r{/main.js\?\d+})
+          expect(context.asset_path('/favicon.ico')).to match(%r{/favicon.ico\?\d+})
+          expect(context.asset_path('font.eot?#iefix')).to match(%r{/font.eot\?\d+#iefix})
+          expect(context.asset_path('font.svg#FontName')).to match(%r{/font.svg\?\d+#FontName})
         end
       end
     end
@@ -199,9 +196,9 @@ describe Sprockets::Helpers do
           c.file 'assets/main.js'
           c.file 'assets/main.css'
 
-          context.asset_path('main', :ext => 'css').should == '/assets/main.css'
-          context.asset_path('main', :ext => 'js').should == '/assets/main.js'
-          context.asset_path('logo.jpg').should == '/assets/logo.jpg'
+          expect(context.asset_path('main', :ext => 'css')).to eq('/assets/main.css')
+          expect(context.asset_path('main', :ext => 'js')).to eq('/assets/main.js')
+          expect(context.asset_path('logo.jpg')).to eq('/assets/logo.jpg')
         end
       end
 
@@ -209,8 +206,8 @@ describe Sprockets::Helpers do
         within_construct do |c|
           c.file 'assets/logo.jpg'
 
-          context.asset_path('logo.jpg').should == '/assets/logo.jpg'
-          context.asset_path('logo.jpg', :prefix => '/images').should == '/images/logo.jpg'
+          expect(context.asset_path('logo.jpg')).to eq('/assets/logo.jpg')
+          expect(context.asset_path('logo.jpg', :prefix => '/images')).to eq('/images/logo.jpg')
         end
       end
 
@@ -220,10 +217,10 @@ describe Sprockets::Helpers do
           c.file 'assets/font.eot'
           c.file 'assets/font.svg'
 
-          context.asset_path('main', :ext => 'js').should == '/assets/main.js'
-          context.asset_path('main', :ext => 'js', :digest => true).should =~ %r(/assets/main-[0-9a-f]+.js)
-          context.asset_path('font.eot?#iefix', :digest => true).should =~ %r(/assets/font-[0-9a-f]+.eot\?#iefix)
-          context.asset_path('font.svg#FontName', :digest => true).should =~ %r(/assets/font-[0-9a-f]+.svg#FontName)
+          expect(context.asset_path('main', :ext => 'js')).to eq('/assets/main.js')
+          expect(context.asset_path('main', :ext => 'js', :digest => true)).to match(%r{/assets/main-[0-9a-f]+.js})
+          expect(context.asset_path('font.eot?#iefix', :digest => true)).to match(%r{/assets/font-[0-9a-f]+.eot\?#iefix})
+          expect(context.asset_path('font.svg#FontName', :digest => true)).to match(%r{/assets/font-[0-9a-f]+.svg#FontName})
         end
       end
 
@@ -233,9 +230,9 @@ describe Sprockets::Helpers do
           c.file 'assets/font.eot'
           c.file 'assets/font.svg'
 
-          context.asset_path('main', :ext => 'js', :body => true).should == '/assets/main.js?body=1'
-          context.asset_path('font.eot?#iefix', :body => true).should == '/assets/font.eot?body=1#iefix'
-          context.asset_path('font.svg#FontName', :body => true).should == '/assets/font.svg?body=1#FontName'
+          expect(context.asset_path('main', :ext => 'js', :body => true)).to eq('/assets/main.js?body=1')
+          expect(context.asset_path('font.eot?#iefix', :body => true)).to eq('/assets/font.eot?body=1#iefix')
+          expect(context.asset_path('font.svg#FontName', :body => true)).to eq('/assets/font.svg?body=1#FontName')
         end
       end
     end
@@ -246,7 +243,7 @@ describe Sprockets::Helpers do
           c.file 'assets/main.js'
 
           Sprockets::Helpers.digest = true
-          context.asset_path('main.js', :debug => true).should == '/assets/main.js'
+          expect(context.asset_path('main.js', :debug => true)).to eq('/assets/main.js')
           Sprockets::Helpers.digest = nil
         end
       end
@@ -256,7 +253,7 @@ describe Sprockets::Helpers do
           c.file 'assets/main.js'
 
           Sprockets::Helpers.asset_host = 'assets.example.com'
-          context.asset_path('main.js', :debug => true).should == '/assets/main.js'
+          expect(context.asset_path('main.js', :debug => true)).to eq('/assets/main.js')
           Sprockets::Helpers.asset_host = nil
         end
       end
@@ -279,7 +276,7 @@ describe Sprockets::Helpers do
             end
 
             asset_file.delete
-            context.asset_path('application.js').should =~ %r(/assets/application-[0-9a-f]+.js)
+            expect(context.asset_path('application.js')).to match(%r(/assets/application-[0-9a-f]+.js))
 
             Sprockets::Helpers.digest = nil
             Sprockets::Helpers.prefix = nil
@@ -301,7 +298,7 @@ describe Sprockets::Helpers do
                 config.manifest = Sprockets::Manifest.new(env, manifest_file)
               end
 
-              context.asset_path('application.js', :debug => true).should == '/assets/application.js'
+              expect(context.asset_path('application.js', :debug => true)).to eq('/assets/application.js')
 
               Sprockets::Helpers.digest = nil
               Sprockets::Helpers.prefix = nil
@@ -315,13 +312,13 @@ describe Sprockets::Helpers do
   describe '#javascript_path' do
     context 'with regular files' do
       it 'appends the js extension' do
-        context.javascript_path('/path/to/file').should == '/path/to/file.js'
-        context.javascript_path('/path/to/file.min').should == '/path/to/file.min.js'
+        expect(context.javascript_path('/path/to/file')).to eq('/path/to/file.js')
+        expect(context.javascript_path('/path/to/file.min')).to eq('/path/to/file.min.js')
       end
 
       it 'prepends the javascripts dir' do
-        context.javascript_path('main').should == '/javascripts/main.js'
-        context.javascript_path('main.min').should == '/javascripts/main.min.js'
+        expect(context.javascript_path('main')).to eq('/javascripts/main.js')
+        expect(context.javascript_path('main.min')).to eq('/javascripts/main.min.js')
       end
     end
   end
@@ -329,13 +326,13 @@ describe Sprockets::Helpers do
   describe '#stylesheet_path' do
     context 'with regular files' do
       it 'appends the css extension' do
-        context.stylesheet_path('/path/to/file').should == '/path/to/file.css'
-        context.stylesheet_path('/path/to/file.min').should == '/path/to/file.min.css'
+        expect(context.stylesheet_path('/path/to/file')).to eq('/path/to/file.css')
+        expect(context.stylesheet_path('/path/to/file.min')).to eq('/path/to/file.min.css')
       end
 
       it 'prepends the stylesheets dir' do
-        context.stylesheet_path('main').should == '/stylesheets/main.css'
-        context.stylesheet_path('main.min').should == '/stylesheets/main.min.css'
+        expect(context.stylesheet_path('main')).to eq('/stylesheets/main.css')
+        expect(context.stylesheet_path('main.min')).to eq('/stylesheets/main.min.css')
       end
     end
   end
@@ -343,7 +340,7 @@ describe Sprockets::Helpers do
   describe '#image_path' do
     context 'with regular files' do
       it 'prepends the images dir' do
-        context.image_path('logo.jpg').should == '/images/logo.jpg'
+        expect(context.image_path('logo.jpg')).to eq('/images/logo.jpg')
       end
     end
   end
@@ -351,7 +348,7 @@ describe Sprockets::Helpers do
   describe '#font_path' do
     context 'with regular files' do
       it 'prepends the fonts dir' do
-        context.font_path('font.ttf').should == '/fonts/font.ttf'
+        expect(context.font_path('font.ttf')).to eq('/fonts/font.ttf')
       end
     end
   end
@@ -359,7 +356,7 @@ describe Sprockets::Helpers do
   describe '#video_path' do
     context 'with regular files' do
       it 'prepends the videos dir' do
-        context.video_path('video.mp4').should == '/videos/video.mp4'
+        expect(context.video_path('video.mp4')).to eq('/videos/video.mp4')
       end
     end
   end
@@ -367,7 +364,7 @@ describe Sprockets::Helpers do
   describe '#audio_path' do
     context 'with regular files' do
       it 'prepends the audios dir' do
-        context.audio_path('audio.mp3').should == '/audios/audio.mp3'
+        expect(context.audio_path('audio.mp3')).to eq('/audios/audio.mp3')
       end
     end
   end
@@ -375,7 +372,7 @@ describe Sprockets::Helpers do
   describe '#asset_tag' do
     it 'receives block to generate tag' do
       actual = context.asset_tag('main.js') { |path| "<script src=#{path}></script>" }
-      actual.should == '<script src=/main.js></script>'
+      expect(actual).to eq('<script src=/main.js></script>')
     end
 
     it 'raises when called without block' do
@@ -407,10 +404,10 @@ describe Sprockets::Helpers do
           tags = context.asset_tag('main.js', :expand => true) do |path|
             "<script src=\"#{path}\"></script>"
           end
-          tags.split("</script>").should have(3).scripts
-          tags.should include('<script src="/assets/main.js?body=1"></script>')
-          tags.should include('<script src="/assets/a.js?body=1"></script>')
-          tags.should include('<script src="/assets/b.js?body=1"></script>')
+          expect(tags.split('</script>')).to have(3).scripts
+          expect(tags).to include('<script src="/assets/main.js?body=1"></script>')
+          expect(tags).to include('<script src="/assets/a.js?body=1"></script>')
+          expect(tags).to include('<script src="/assets/b.js?body=1"></script>')
         end
       end
 
@@ -419,15 +416,15 @@ describe Sprockets::Helpers do
 
   describe '#javascript_tag' do
     it 'generates script tag' do
-      context.javascript_tag('/main.js').should == '<script src="/main.js"></script>'
+      expect(context.javascript_tag('/main.js')).to eq('<script src="/main.js"></script>')
     end
 
     it 'appends extension' do
-      context.javascript_tag('/main').should == '<script src="/main.js"></script>'
+      expect(context.javascript_tag('/main')).to eq('<script src="/main.js"></script>')
     end
 
     it 'prepends the javascript dir' do
-      context.javascript_tag('main').should == '<script src="/javascripts/main.js"></script>'
+      expect(context.javascript_tag('main')).to eq('<script src="/javascripts/main.js"></script>')
     end
 
     describe 'when expanding' do
@@ -435,9 +432,9 @@ describe Sprockets::Helpers do
         within_construct do |construct|
           assets_layout(construct)
           tags = context.javascript_tag('main.js', :expand => true)
-          tags.should include('<script src="/assets/main.js?body=1"></script>')
-          tags.should include('<script src="/assets/a.js?body=1"></script>')
-          tags.should include('<script src="/assets/b.js?body=1"></script>')
+          expect(tags).to include('<script src="/assets/main.js?body=1"></script>')
+          expect(tags).to include('<script src="/assets/a.js?body=1"></script>')
+          expect(tags).to include('<script src="/assets/b.js?body=1"></script>')
         end
       end
     end
@@ -445,15 +442,15 @@ describe Sprockets::Helpers do
 
   describe '#stylesheet_tag' do
     it 'generates stylesheet tag' do
-      context.stylesheet_tag('/main.css').should == '<link rel="stylesheet" href="/main.css">'
+      expect(context.stylesheet_tag('/main.css')).to eq('<link rel="stylesheet" href="/main.css">')
     end
 
     it 'appends extension' do
-      context.stylesheet_tag('/main').should == '<link rel="stylesheet" href="/main.css">'
+      expect(context.stylesheet_tag('/main')).to eq('<link rel="stylesheet" href="/main.css">')
     end
 
     it 'prepends the stylesheets dir' do
-      context.stylesheet_tag('main').should == '<link rel="stylesheet" href="/stylesheets/main.css">'
+      expect(context.stylesheet_tag('main')).to eq('<link rel="stylesheet" href="/stylesheets/main.css">')
     end
 
     describe 'when expanding' do
@@ -461,11 +458,56 @@ describe Sprockets::Helpers do
         within_construct do |construct|
           assets_layout(construct)
           tags = context.stylesheet_tag('main.css', :expand => true)
-          tags.should include('<link rel="stylesheet" href="/assets/main.css?body=1">')
-          tags.should include('<link rel="stylesheet" href="/assets/a.css?body=1">')
-          tags.should include('<link rel="stylesheet" href="/assets/b.css?body=1">')
+          expect(tags).to include('<link rel="stylesheet" href="/assets/main.css?body=1">')
+          expect(tags).to include('<link rel="stylesheet" href="/assets/a.css?body=1">')
+          expect(tags).to include('<link rel="stylesheet" href="/assets/b.css?body=1">')
         end
       end
     end
   end
+
+  describe 'Sinatra integration' do
+    it 'adds the helpers' do
+      app = Class.new(Sinatra::Base) do
+        register Sinatra::Sprockets::Helpers
+      end
+
+      expect(app).to include(Sprockets::Helpers)
+    end
+
+    it 'automatically configures' do
+      custom_env = Sprockets::Environment.new
+
+      app = Class.new(Sinatra::Base) do
+        set :sprockets, custom_env
+        set :assets_prefix, '/static'
+        set :digest_assets, true
+
+        register Sinatra::Sprockets::Helpers
+      end
+
+      expect(Sprockets::Helpers.environment).to be(custom_env)
+      expect(Sprockets::Helpers.prefix).to eq('/static')
+      expect(Sprockets::Helpers.digest).to be_true
+    end
+
+    it 'manually configures with configure method' do
+      custom_env = Sprockets::Environment.new
+
+      app = Class.new(Sinatra::Base) do
+        register Sinatra::Sprockets::Helpers
+
+        set :sprockets, custom_env
+        set :assets_prefix, '/static'
+
+        configure_sprockets_helpers do |helpers|
+          helpers.expand = true
+        end
+      end
+
+      expect(Sprockets::Helpers.environment).to be(custom_env)
+      expect(Sprockets::Helpers.prefix).to eq('/static')
+      expect(Sprockets::Helpers.expand).to be_true
+    end
+  end
 end

data/sprockets-helpers.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency             'sprockets',      '~> 2.0'
-  s.add_development_dependency 'appraisal',      '~> 0.4'
-  s.add_development_dependency 'rspec',          '~> 2.6'
+  s.add_development_dependency 'appraisal',      '~> 0.5'
+  s.add_development_dependency 'rspec',          '~> 2.13'
   s.add_development_dependency 'test-construct', '~> 1.2'
+  s.add_development_dependency 'sinatra',        '~> 1.4'
   s.add_development_dependency 'rake'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-helpers
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70117526611900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,43 +21,79 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70117526611900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70117526611360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70117526611360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70117526610900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *70117526610900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: test-construct
-  requirement: &70117526610340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :development
   prerelease: false
-  version_requirements: *70117526610340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70117526609960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70117526609960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Asset path helpers for Sprockets 2.x applications
 email:
 - me@petebrowne.com
@@ -79,13 +120,18 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/sprockets-2.0.gemfile
-- gemfiles/sprockets-2.1.gemfile
-- gemfiles/sprockets-2.2.gemfile
-- gemfiles/sprockets-2.3.gemfile
-- gemfiles/sprockets-2.4.gemfile
-- gemfiles/sprockets-2.5.gemfile
-- gemfiles/sprockets-2.6.gemfile
+- gemfiles/sprockets_2.0.gemfile
+- gemfiles/sprockets_2.1.gemfile
+- gemfiles/sprockets_2.2.gemfile
+- gemfiles/sprockets_2.3.gemfile
+- gemfiles/sprockets_2.4.gemfile
+- gemfiles/sprockets_2.5.gemfile
+- gemfiles/sprockets_2.6.gemfile
+- gemfiles/sprockets_2.7.gemfile
+- gemfiles/sprockets_2.8.gemfile
+- gemfiles/sprockets_2.9.gemfile
+- lib/sinatra/sprockets-helpers.rb
+- lib/sinatra/sprockets/helpers.rb
 - lib/sprockets-helpers.rb
 - lib/sprockets/helpers.rb
 - lib/sprockets/helpers/asset_path.rb
@@ -110,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2044833446584008479
+      hash: -4510165657637312689
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,10 +165,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2044833446584008479
+      hash: -4510165657637312689
 requirements: []
 rubyforge_project: sprockets-helpers
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Asset path helpers for Sprockets 2.x applications