middleman-sprockets 3.0.10 → 3.0.11

data/.gitignore

@@ -4,3 +4,4 @@ tmp
 .rbenv-*
 .sass-cache
 pkg
+build

data/.travis.yml

@@ -12,6 +12,5 @@ env: TEST=true
 
 matrix:
   allow_failures:
-    - rvm: 2.0.0
     - rvm: jruby-18mode
     - rvm: jruby-19mode

data/Gemfile

@@ -1,10 +1,11 @@
 source 'https://rubygems.org'
 
-git "git://github.com/middleman/middleman.git", :branch => "3.0-stable" do
+git "git://github.com/middleman/middleman.git", :branch => "master" do
   gem "middleman"
   gem "middleman-core"
   gem "middleman-more"
 end
+#gem "middleman", :path => '../middleman'
 
 # Specify your gem's dependencies in middleman-blog.gemspec
 gemspec
@@ -14,13 +15,16 @@ gem "rake",     "~> 10.0.3"
 gem "yard",     "~> 0.8.0"
 
 # Test tools
-gem "cucumber", "~> 1.2.1"
+gem "cucumber" 
 gem "fivemat",  "~> 1.1.0"
-gem "aruba",    "~> 0.5.1"
+gem "aruba"
 gem "rspec",    "~> 2.12"
+gem 'gherkin', '<= 2.11.6'
 
 # For actual tests
-gem "jquery-rails", "2.0.1"
+gem "jquery-rails", '2.0.1', :require => false
+gem "bootstrap-sass", :require => false
 gem "ejs", "~> 1.1.1"
 gem "eco", "~> 1.0.0"
-gem "erubis", "~> 2.7.0"
+gem "erubis", "~> 2.7.0"
+gem 'jquery_mobile_rails', '~>1.2.0', :require => false

data/Rakefile

@@ -4,16 +4,21 @@ Bundler::GemHelper.install_tasks
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  ENV["TEST"] = "true"
-  ENV["AUTOLOAD_SPROCKETS"] = "true"
   t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
 end
 
 require 'rake/clean'
 
-task :test => ["cucumber"]
+task :test => [:destroy_sass_cache, "cucumber"]
 
 desc "Build HTML documentation"
 task :doc do
   sh 'bundle exec yard'
 end
+
+desc "Destroy the sass cache from fixtures in case it messes with results"
+task :destroy_sass_cache do
+  Dir["fixtures/*/.sass-cache"].each do |dir|
+    rm_rf dir
+  end
+end

data/features/asset_hash.feature

@@ -8,7 +8,7 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | images/100px-5fd6fb90.jpg |
       | images/100px-5fd6fb90.gif |
       | javascripts/application-df677242.js |
-      | stylesheets/site-50eaa978.css |
+      | stylesheets/site-b7f4d02f.css |
       | index.html |
       | subdir/index.html |
       | other/index.html |
@@ -20,50 +20,51 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | stylesheets/site.css |
       
     And the file "javascripts/application-df677242.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'"
-    And the file "stylesheets/site-50eaa978.css" should contain "background-image: url('../images/100px-5fd6fb90.jpg')"
-    And the file "index.html" should contain 'href="stylesheets/site-50eaa978.css"'
+    And the file "stylesheets/site-b7f4d02f.css" should contain 'background-image: url("../images/100px-5fd6fb90.jpg")'
+    And the file "index.html" should contain 'href="stylesheets/site-b7f4d02f.css"'
     And the file "index.html" should contain 'src="javascripts/application-df677242.js"'
     And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"'
-    And the file "subdir/index.html" should contain 'href="../stylesheets/site-50eaa978.css"'
+    And the file "subdir/index.html" should contain 'href="../stylesheets/site-b7f4d02f.css"'
     And the file "subdir/index.html" should contain 'src="../javascripts/application-df677242.js"'
     And the file "subdir/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
-    And the file "other/index.html" should contain 'href="../stylesheets/site-50eaa978.css"'
+    And the file "other/index.html" should contain 'href="../stylesheets/site-b7f4d02f.css"'
     And the file "other/index.html" should contain 'src="../javascripts/application-df677242.js"'
     And the file "other/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
     
   Scenario: Hashed assets work in preview server
     Given the Server is running at "asset-hash-app"
     When I go to "/"
-    Then I should see 'href="stylesheets/site-50eaa978.css"'
+    Then I should see 'href="stylesheets/site-b7f4d02f.css"'
     And I should see 'src="javascripts/application-df677242.js"'
     And I should see 'src="images/100px-5fd6fb90.jpg"'
     When I go to "/subdir/"
-    Then I should see 'href="../stylesheets/site-50eaa978.css"'
+    Then I should see 'href="../stylesheets/site-b7f4d02f.css"'
     And I should see 'src="../javascripts/application-df677242.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="../stylesheets/site-50eaa978.css"'
+    Then I should see 'href="../stylesheets/site-b7f4d02f.css"'
     And I should see 'src="../javascripts/application-df677242.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
     When I go to "/javascripts/application-df677242.js"
     Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
-    When I go to "/stylesheets/site-50eaa978.css"
-    Then I should see "background-image: url('../images/100px-5fd6fb90.jpg')"
+    When I go to "/stylesheets/site-b7f4d02f.css"
+    Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")'
+    When I go to "/stylesheets/jquery-mobile-67e48856.css"
+    Then I should see 'background-image: url("../images/jquery-mobile/icons-18-white-4a0ff57b.png")'
 
   Scenario: Enabling an asset host still produces hashed files and references  
     Given the Server is running at "asset-hash-host-app"
     When I go to "/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-171eb3c0.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-1fdf4fb5.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     When I go to "/subdir/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-171eb3c0.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-1fdf4fb5.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-171eb3c0.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-1fdf4fb5.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
-    # Asset helpers don't appear to work from Compass right now
-    # When I go to "/stylesheets/site-171eb3c0.css"
-    # Then I should see "background-image: url('http://middlemanapp.com/images/100px-5fd6fb90.jpg')"
+    When I go to "/stylesheets/site-1fdf4fb5.css"
+    Then I should see 'background-image: url("http://middlemanapp.com/images/100px-5fd6fb90.jpg")'
 
   Scenario: The asset hash should change when a SASS partial changes
     Given the Server is running at "asset-hash-app"
@@ -74,6 +75,7 @@ Feature: Assets get a file hash appended to their and references to them are upd
       """
     When I go to "/partials/"
     Then I should see 'href="../stylesheets/uses_partials-423a00f7.css'
+    And wait a second
     And the file "source/stylesheets/_partial.sass" has the contents
       """
       body
@@ -92,6 +94,7 @@ Feature: Assets get a file hash appended to their and references to them are upd
     Then I should see 'src="../javascripts/sprockets_base-0252a861.js'
     When I go to "/javascripts/sprockets_base-0252a861.js"
     Then I should see "sprockets_sub_function"
+    And wait a second
     And the file "source/javascripts/sprockets_sub.js" has the contents
       """
       function sprockets_sub2_function() { }

data/features/sass_partials.feature

@@ -17,6 +17,7 @@ Feature: Sass partials should work with Sprockets
     When I go to "/stylesheets/main2.css"
     Then I should see "color: red;"
     Then I should see "font-size: 14px"
+    And wait a second
     And the file "source/stylesheets/main2.css.sass" has the contents
       """
       //= require "_partial2.css.sass"
@@ -30,5 +31,6 @@ Feature: Sass partials should work with Sprockets
         font-size: 18px
       """
     When I go to "/stylesheets/main2.css"
-      Then I should see "color: blue;"
+    When I go to "/stylesheets/main2.css"
+    Then I should see "color: blue;"
     Then I should see "font-size: 18px"

data/features/sprockets.feature

@@ -73,4 +73,14 @@ Feature: Sprockets
   Scenario: Sprockets CSS require with custom :css_dir @import
     Given the Server is running at "sprockets-app"
     When I go to "/library/css/sprockets_base2.css"
-    Then I should see "hello"
+    Then I should see "hello"
+
+Scenario: Sprockets inline Images with asset_path and image_path helpers
+    Given the Server is running at "sprockets-images-app"
+    When I go to "/"
+    Then I should see 'src="/library/images/cat.jpg"'
+    And I should see 'src="/library/images/cat-2.jpg"'
+    When I go to "/library/images/cat.jpg"
+    Then I should get a response with status "200"
+    When I go to "/library/images/cat-2.jpg"
+    Then I should get a response with status "200"

data/features/sprockets_gems.feature

@@ -4,10 +4,10 @@ Feature: Sprockets Gems
     When I go to "/library/js/jquery_include.js"
     Then I should see "var jQuery ="
   
-  # Scenario: Sprockets can pull CSS from gem
-  #   Given the Server is running at "sprockets-app"
-  #   When I go to "/library/css/bootstrap_include.css"
-  #   Then I should see "Bootstrap"
+  Scenario: Sprockets can pull CSS from gem
+    Given the Server is running at "sprockets-app"
+    When I go to "/library/css/bootstrap_include.css"
+    Then I should see ".btn-mini"
   
   Scenario: Sprockets can pull js from vendored assets
     Given the Server is running at "sprockets-app"
@@ -17,4 +17,27 @@ Feature: Sprockets Gems
   Scenario: Sprockets can pull js from custom vendor dir
     Given the Server is running at "asset-paths-app"
     When I go to "/javascripts/vendored_include.js"
-    Then I should see "var vendored_js_included = true;"
+    Then I should see "var vendored_js_included = true;"
+
+  Scenario: Proper reference to images from a gem, in preview
+    Given the Server is running at "jquery-mobile-app"
+    When I go to "/stylesheets/base.css"
+    Then I should see 'url("/images/jquery-mobile/icons-36-white.png")'
+
+  Scenario: Proper reference to images from a gem, in build
+    Given a successfully built app at "jquery-mobile-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | stylesheets/base.css |
+      | images/jquery-mobile/icons-36-white.png |
+    And the file "stylesheets/base.css" should contain 'url("/images/jquery-mobile/icons-36-white.png")'
+
+  Scenario: Same thing, but with :relative_assets on
+    Given a fixture app "jquery-mobile-app"
+    And a file named "config.rb" with:
+      """
+      activate :relative_assets
+      """
+    Given the Server is running at "jquery-mobile-app"
+    When I go to "/stylesheets/base.css"
+    Then I should see 'url("../images/jquery-mobile/icons-36-white.png")'

data/features/step_definitions/server_steps.rb

@@ -1,3 +1,11 @@
 Then /^I should see$/ do |contents|
   @browser.last_response.body.should include(contents)
-end
+end
+
+Then /^I should get a response with status "(.*?)"$/ do |status|
+  @browser.last_response.status.should == status.to_i
+end
+
+Given /^wait a second$/ do
+  sleep(1)
+end

data/features/support/env.rb

@@ -1,5 +1,8 @@
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
+ENV['TEST'] = 'true'
+ENV["AUTOLOAD_SPROCKETS"] = "true"
 require "middleman-core"
 require "middleman-core/step_definitions"
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-sprockets')
-require "erubis"
+require "erubis"
+

data/fixtures/asset-hash-app/source/stylesheets/jquery-mobile.css.scss

@@ -0,0 +1 @@
+//= require jquery.mobile.theme

data/fixtures/asset-paths-app/config.rb

@@ -1 +1,4 @@
-set :js_assets_paths, ["#{root}/derp/javascripts/"]
+# Until Middleman is fixed to load Sprockets before config.rb, we have to do this
+after_configuration do
+  sprockets.append_path "#{root}/derp/javascripts/"
+end

data/fixtures/jquery-mobile-app/source/stylesheets/base.css.scss

@@ -0,0 +1,2 @@
+//= require jquery.mobile.theme
+//= require jquery.mobile.structure

data/fixtures/sprockets-images-app/config.rb

@@ -0,0 +1 @@
+set :images_dir, "library/images"

data/fixtures/sprockets-images-app/source/index.html.erb

@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+  <head>
+    <%= javascript_include_tag :plain, :data => { :name => "plain" } %>
+  </head>
+  <body>
+    <%= image_tag('cat.jpg') %>
+    <%= image_tag('cat-2.jpg') %>
+  </body>
+</html>

data/lib/middleman-sprockets/extension.rb

@@ -1,4 +1,5 @@
 require "sprockets"
+require "sprockets-sass"
 
 # Sprockets extension
 module Middleman::Sprockets
@@ -8,25 +9,15 @@ module Middleman::Sprockets
 
     # Once registered
     def registered(app)
-      # Location of javascripts external to source directory.
-      # @return [Array]
-      #   set :js_assets_paths, ["#{root}/assets/javascripts/", "/path/2/external/js/repository/"]
-    
       # Add class methods to context
       app.send :include, InstanceMethods
-      
-      require "middleman-sprockets/sass"
-      app.register Middleman::Sprockets::Sass
 
       app.after_configuration do
         helpers JavascriptTagHelper
-      end
 
-      # Once Middleman is setup
-      app.after_configuration do
         ::Tilt.register ::Sprockets::EjsTemplate, 'ejs'
         ::Tilt.register ::Sprockets::EcoTemplate, 'eco'
-        
+
         # Add any gems with (vendor|app|.)/assets/javascripts to paths
         # also add similar directories from project root (like in rails)
         try_paths = [
@@ -38,7 +29,12 @@ module Middleman::Sprockets
           %w{ lib },
           %w{ lib assets }
         ].inject([]) do |sum, v|
-          sum + [File.join(v, 'javascripts'), File.join(v, 'stylesheets')]
+          sum + [
+            File.join(v, 'javascripts'),
+            File.join(v, 'stylesheets'),
+            File.join(v, 'images'),
+            File.join(v, 'fonts')
+          ]
         end
 
         ([root] + ::Middleman.rubygems_latest_specs.map(&:full_gem_path)).each do |root_path|
@@ -52,9 +48,14 @@ module Middleman::Sprockets
 
         # Intercept requests to /javascripts and /stylesheets and pass to sprockets
         our_sprockets = sprockets
-        
+
         map("/#{js_dir}")  { run our_sprockets }
         map("/#{css_dir}") { run our_sprockets }
+        map("/#{images_dir}") { run our_sprockets }
+        map("/#{fonts_dir}") { run our_sprockets }
+
+        # register resource list manipulator to add assets_load_paths to sitemap
+        sitemap.register_resource_list_manipulator(:assets_load_paths, SitemapExtension.new(self), false)
       end
     end
     alias :included :registered
@@ -78,23 +79,59 @@ module Middleman::Sprockets
       context_class.send(:define_method, :app) { app }
 
       context_class.class_eval do
-        # Find the Middleman-compatible version of this file's path
-        def mm_path
-          @mm_path ||= app.sitemap.file_to_path(pathname.to_s)
+        def asset_path(path, options={})
+          # Handle people calling with the Middleman/Padrino asset path signature
+          if path.is_a?(::Symbol) && !options.is_a?(::Hash)
+            return app.asset_path(path, options)
+          end
+
+          kind = case options[:type]
+                 when :image then :images
+                 when :font then :fonts
+                 when :javascript then :js
+                 when :stylesheet then :css
+                 else options[:type]
+                 end
+
+          app.asset_path(kind, path)
+        end
+
+        # These helpers are already defined in later versions of Sprockets, but we define
+        # them ourself to help older versions and to provide extra options that Sass wants.
+
+        # Expand logical image asset path.
+        def image_path(path, options={})
+          asset_path(path, :type => :image)
+        end
+
+        # Expand logical font asset path.
+        def font_path(path, options={})
+          asset_path(path, :type => :font)
+        end
+
+        # Expand logical javascript asset path.
+        def javascript_path(path, options={})
+          asset_path(path, :type => :javascript)
+        end
+
+        # Expand logical stylesheet asset path.
+        def stylesheet_path(path, options={})
+          asset_path(path, :type => :stylesheet)
         end
 
         def method_missing(*args)
           name = args.first
           if app.respond_to?(name)
-            # Set the middleman application current path, since it won't
-            # be set if the request came in through Sprockets and helpers
-            # won't work without it.
-            app.current_path = mm_path unless app.current_path
             app.send(*args)
           else
             super
           end
         end
+
+        # Needed so that method_missing makes sense
+        def respond_to?(method, include_private = false)
+          super || app.respond_to?(method, include_private)
+        end
       end
 
       # Remove compressors, we handle these with middleware
@@ -104,14 +141,16 @@ module Middleman::Sprockets
       # configure search paths
       append_path app.js_dir
       append_path app.css_dir
+      append_path app.images_dir
+      append_path app.fonts_dir
 
       # add custom assets paths to the scope
-
       app.js_assets_paths.each do |p|
+        warn ":js_assets_paths is deprecated. Call sprockets.append_path instead."
         append_path p
       end if app.respond_to?(:js_assets_paths)
 
-      # Stylus support 
+      # Stylus support
       if defined?(::Stylus)
         require 'stylus/sprockets'
         ::Stylus.setup(self, app.styl)
@@ -128,18 +167,42 @@ module Middleman::Sprockets
       @digest.dup
     end
 
-    # Clear cache on error
+    # Invalidate sitemap when users mess with the sprockets load paths
+    def append_path(*args)
+      @app.sitemap.rebuild_resource_list!(:sprockets_paths)
+      super
+    end
+
+    def prepend_path(*args)
+      @app.sitemap.rebuild_resource_list!(:sprockets_paths)
+      super
+    end
+
+    def clear_paths
+      @app.sitemap.rebuild_resource_list!(:sprockets_paths)
+      super
+    end
+
+    def css_exception_response(exception)
+      raise exception if @app.build?
+      super
+    end
+
     def javascript_exception_response(exception)
-      expire_index!
-      super(exception)
+      raise exception if @app.build?
+      super
     end
 
-    # Clear cache on error
-    alias :css_exception_response :javascript_exception_response
+    def call(env)
+      # Set the app current path based on the full URL so that helpers work
+      full_path = File.join(env['SCRIPT_NAME'], env['PATH_INFO'])
+      @app.current_path = ::Middleman::Util.normalize_path(full_path)
+      super
+    end
   end
-  
+
   module JavascriptTagHelper
-    
+
     # extend padrinos javascript_include_tag with debug functionality
     # splits up script dependencies in individual files when
     # configuration variable :debug_assets is set to true
@@ -153,7 +216,7 @@ module Middleman::Sprockets
           dependencies_paths = sprockets[source].to_a.map do |dependency|
             # if sprockets sees "?body=1" it only gives back the body
             # of the script without the dependencies included
-            dependency.logical_path << "?body=1"
+            dependency.logical_path << "?body=1" unless dependency.logical_path.end_with?("?body=1")
           end
 
           super(dependencies_paths, options)
@@ -163,4 +226,33 @@ module Middleman::Sprockets
       end
     end
   end
+
+  class SitemapExtension
+    def initialize(app)
+      @app = app
+    end
+
+    # Add sitemap resource for every image in the sprockets load path
+    def manipulate_resource_list(resources)
+      resources_list = []
+       @app.sprockets.paths.each do |load_path|
+        output_dir = nil
+        if load_path.end_with?('/images')
+          output_dir = @app.images_dir
+        elsif load_path.end_with?('/fonts')
+          output_dir = @app.fonts_dir
+        end
+
+        if output_dir
+          @app.sprockets.each_entry(load_path) do |path|
+            next unless path.file?
+            base_path = path.sub("#{load_path}/", '')
+            new_path = File.join(output_dir, base_path)
+            resources_list << ::Middleman::Sitemap::Resource.new(@app.sitemap, new_path.to_s, path.to_s)
+          end
+        end
+      end
+      resources + resources_list
+    end
+  end
 end

data/lib/middleman-sprockets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sprockets
-    VERSION = "3.0.10"
+    VERSION = "3.0.11"
   end
 end

data/middleman-sprockets.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.add_dependency("middleman-more", [">= 3.0.11"])
-  s.add_dependency("sprockets", ["~> 2.1", "< 2.5"])
+  s.add_dependency("sprockets", ["~> 2.1"])
   s.add_dependency("sprockets-sass", ["~> 0.9.1"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sprockets
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-more
@@ -35,9 +35,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -46,9 +43,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +92,7 @@ files:
 - fixtures/asset-hash-app/source/other.html.erb
 - fixtures/asset-hash-app/source/partials.html.erb
 - fixtures/asset-hash-app/source/stylesheets/_partial.sass
+- fixtures/asset-hash-app/source/stylesheets/jquery-mobile.css.scss
 - fixtures/asset-hash-app/source/stylesheets/site.css.scss
 - fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass
 - fixtures/asset-hash-app/source/subdir/index.html.erb
@@ -119,6 +114,8 @@ files:
 - fixtures/glob-app/source/stylesheets/module2/_derp.sass
 - fixtures/glob-app/source/stylesheets/shared/3rd-party/bootstrap.sass
 - fixtures/glob-app/source/stylesheets/shared/shared.scss
+- fixtures/jquery-mobile-app/config.rb
+- fixtures/jquery-mobile-app/source/stylesheets/base.css.scss
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/content.html.erb
 - fixtures/preview-app/source/layout.erb
@@ -132,9 +129,6 @@ files:
 - fixtures/sprockets-app-debug-assets/source/javascripts/dependency1.js
 - fixtures/sprockets-app-debug-assets/source/javascripts/dependency2.js
 - fixtures/sprockets-app-debug-assets/source/javascripts/main.js
-- fixtures/sprockets-app/.sass-cache/be37f3d65d619a3996ff80c3e286084336419f31/bootstrap_include.css.scssc
-- fixtures/sprockets-app/.sass-cache/be37f3d65d619a3996ff80c3e286084336419f31/sprockets_base1.css.scssc
-- fixtures/sprockets-app/.sass-cache/be37f3d65d619a3996ff80c3e286084336419f31/sprockets_base2.css.scssc
 - fixtures/sprockets-app/config.rb
 - fixtures/sprockets-app/source/index.html.erb
 - fixtures/sprockets-app/source/library/css/bootstrap_include.css.scss
@@ -161,9 +155,12 @@ files:
 - fixtures/sprockets-app2/source/stylesheets/sprockets_base1.css.scss
 - fixtures/sprockets-app2/source/stylesheets/sprockets_base2.css.scss
 - fixtures/sprockets-app2/source/stylesheets/sprockets_sub.css.scss
+- fixtures/sprockets-images-app/config.rb
+- fixtures/sprockets-images-app/source/index.html.erb
+- fixtures/sprockets-images-app/source/library/images/cat.jpg
+- fixtures/sprockets-images-app/vendor/assets/images/cat-2.jpg
 - lib/middleman-sprockets.rb
 - lib/middleman-sprockets/extension.rb
-- lib/middleman-sprockets/sass.rb
 - lib/middleman-sprockets/version.rb
 - lib/middleman_extension.rb
 - middleman-sprockets.gemspec
@@ -181,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3520857813886938279
+      hash: -471944256885700963
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -190,10 +187,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3520857813886938279
+      hash: -471944256885700963
 requirements: []
 rubyforge_project: middleman-sprockets
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Sprockets support for Middleman
@@ -218,6 +215,7 @@ test_files:
 - fixtures/asset-hash-app/source/other.html.erb
 - fixtures/asset-hash-app/source/partials.html.erb
 - fixtures/asset-hash-app/source/stylesheets/_partial.sass
+- fixtures/asset-hash-app/source/stylesheets/jquery-mobile.css.scss
 - fixtures/asset-hash-app/source/stylesheets/site.css.scss
 - fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass
 - fixtures/asset-hash-app/source/subdir/index.html.erb
@@ -239,6 +237,8 @@ test_files:
 - fixtures/glob-app/source/stylesheets/module2/_derp.sass
 - fixtures/glob-app/source/stylesheets/shared/3rd-party/bootstrap.sass
 - fixtures/glob-app/source/stylesheets/shared/shared.scss
+- fixtures/jquery-mobile-app/config.rb
+- fixtures/jquery-mobile-app/source/stylesheets/base.css.scss
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/content.html.erb
 - fixtures/preview-app/source/layout.erb
@@ -252,9 +252,6 @@ test_files:
 - fixtures/sprockets-app-debug-assets/source/javascripts/dependency1.js
 - fixtures/sprockets-app-debug-assets/source/javascripts/dependency2.js
 - fixtures/sprockets-app-debug-assets/source/javascripts/main.js
-- fixtures/sprockets-app/.sass-cache/be37f3d65d619a3996ff80c3e286084336419f31/bootstrap_include.css.scssc
-- fixtures/sprockets-app/.sass-cache/be37f3d65d619a3996ff80c3e286084336419f31/sprockets_base1.css.scssc
-- fixtures/sprockets-app/.sass-cache/be37f3d65d619a3996ff80c3e286084336419f31/sprockets_base2.css.scssc
 - fixtures/sprockets-app/config.rb
 - fixtures/sprockets-app/source/index.html.erb
 - fixtures/sprockets-app/source/library/css/bootstrap_include.css.scss
@@ -281,4 +278,8 @@ test_files:
 - fixtures/sprockets-app2/source/stylesheets/sprockets_base1.css.scss
 - fixtures/sprockets-app2/source/stylesheets/sprockets_base2.css.scss
 - fixtures/sprockets-app2/source/stylesheets/sprockets_sub.css.scss
+- fixtures/sprockets-images-app/config.rb
+- fixtures/sprockets-images-app/source/index.html.erb
+- fixtures/sprockets-images-app/source/library/images/cat.jpg
+- fixtures/sprockets-images-app/vendor/assets/images/cat-2.jpg
 has_rdoc: 

data/lib/middleman-sprockets/sass.rb

@@ -1,86 +0,0 @@
-require "sprockets-sass"
-  
-module Middleman
-  module Sprockets
-    
-    # Sass renderer
-    module Sass
-  
-      # Setup extension
-      class << self
-    
-        # Once registered
-        def registered(app)
-
-          # Stick with Compass' asset functions
-          ::Sprockets::Sass.add_sass_functions = false
-          
-          # Tell Sprockets to use our custom Sass template
-          ::Sprockets.register_engine ".sass", SassPlusCSSFilenameTemplate
-          
-          # Tell Tilt to use it as well (for inline sass blocks)
-          ::Tilt.register 'sass', SassPlusCSSFilenameTemplate
-          ::Tilt.prefer(SassPlusCSSFilenameTemplate)
-          
-          # Tell Sprockets to use our custom Scss template
-          ::Sprockets.register_engine ".scss", ScssPlusCSSFilenameTemplate
-          
-          # Tell Tilt to use it as well (for inline scss blocks)
-          ::Tilt.register 'scss', ScssPlusCSSFilenameTemplate
-          ::Tilt.prefer(ScssPlusCSSFilenameTemplate)
-        end
-    
-        alias :included :registered
-      end
-      
-      # A SassTemplate for Sprockets/Tilt which outputs debug messages
-      class SassPlusCSSFilenameTemplate < ::Sprockets::Sass::SassTemplate
-        self.default_mime_type = 'text/css'
-          
-        # Add exception messaging
-        # @param [Class] context
-        # @param [Hash] locals
-        # @return [String]
-        def evaluate(context, locals, &block)
-          begin
-            super
-          rescue ::Sass::SyntaxError => e
-            ::Sass::SyntaxError.exception_to_css(e, :full_exception => true)
-          end
-        end
-        
-      protected
-        def cache_store
-          nil
-        end
-
-        # Change Sass path, for url functions, to the build folder if we're building
-        # @return [Hash]
-        def sass_options
-          orig = super
-
-          if context && context.app
-            location_of_sass_file = File.expand_path(context.app.source, context.app.root)
-            css_dir = File.join(location_of_sass_file, context.app.css_dir)
-            css_filename = File.expand_path(file, css_dir)
-            orig.merge!(:css_filename => css_filename)
-          end
-
-          orig
-        end
-      end
-        
-      # SCSS version of the above template
-      class ScssPlusCSSFilenameTemplate < SassPlusCSSFilenameTemplate
-        self.default_mime_type = 'text/css'
-          
-        # Define the expected syntax for the template
-        # @return [Symbol]
-        def syntax
-          :scss
-        end
-      end
-  
-    end
-  end
-end