middleman 2.0.13.1 → 2.0.14.pre

data/features/sprockets.feature

@@ -1,16 +1,16 @@
 Feature: Sprockets
 
-  Scenario: Sprockets require
+  Scenario: Sprockets JS require
     Given the Server is running at "test-app"
     When I go to "/javascripts/sprockets_base.js"
     Then I should see "sprockets_sub_function"
     
-  Scenario: Sprockets require with custom :js_dir
+  Scenario: Sprockets JS require with custom :js_dir
     Given the Server is running at "sprockets-app"
     When I go to "/library/javascripts/sprockets_base.js"
     Then I should see "sprockets_sub_function"
     
-  Scenario: Sprockets should have access to yaml data
+  Scenario: Sprockets JS should have access to yaml data
     Given the Server is running at "test-app"
     When I go to "/javascripts/multiple_engines.js"
     Then I should see "Hello One"
@@ -18,4 +18,24 @@ Feature: Sprockets
   Scenario: Multiple engine files should build correctly
     Given a built app at "test-app"
     Then "javascripts/multiple_engines.js" should exist at "test-app" and include "Hello One"
-    And cleanup built app at "test-app"
+    And cleanup built app at "test-app"
+  
+  Scenario: Sprockets CSS require //require
+    Given the Server is running at "test-app"
+    When I go to "/stylesheets/sprockets_base1.css"
+    Then I should see "hello"
+    
+  Scenario: Sprockets CSS require @import
+    Given the Server is running at "test-app"
+    When I go to "/stylesheets/sprockets_base2.css"
+    Then I should see "hello"
+
+  Scenario: Sprockets CSS require with custom :css_dir //require
+    Given the Server is running at "sprockets-app"
+    When I go to "/library/stylesheets/sprockets_base1.css"
+    Then I should see "hello"
+    
+  Scenario: Sprockets CSS require with custom :css_dir @import
+    Given the Server is running at "sprockets-app"
+    When I go to "/library/stylesheets/sprockets_base2.css"
+    Then I should see "hello"

data/features/sprockets_gems.feature

@@ -1,7 +1,5 @@
-@wip
 Feature: Sprockets Gems
-
   Scenario: Sprockets can pull jQuery from gem
     Given the Server is running at "sprockets-app"
-    When I go to "/javascripts/jquery_include.js"
+    When I go to "/library/javascripts/jquery_include.js"
     Then I should see "var jQuery ="

data/fixtures/sprockets-app/config.rb

@@ -1 +1,2 @@
-set :js_dir, "library/javascripts"
+set :js_dir, "library/javascripts"
+set :css_dir, "library/stylesheets"

data/fixtures/sprockets-app/source/library/stylesheets/sprockets_base1.css.scss

@@ -0,0 +1 @@
+//= require "sprockets_sub"

data/fixtures/sprockets-app/source/library/stylesheets/sprockets_base2.css.scss

@@ -0,0 +1 @@
+@import "sprockets_sub";

data/fixtures/sprockets-app/source/library/stylesheets/sprockets_sub.css.scss

@@ -0,0 +1 @@
+hello { world: "hi"; }

data/fixtures/test-app/source/stylesheets/sprockets_base1.css.scss

@@ -0,0 +1 @@
+//= require "sprockets_sub"

data/fixtures/test-app/source/stylesheets/sprockets_base2.css.scss

@@ -0,0 +1 @@
+@import "sprockets_sub";

data/fixtures/test-app/source/stylesheets/sprockets_sub.css.scss

@@ -0,0 +1 @@
+hello { world: "hi"; }

data/lib/middleman/core_extensions/compass.rb

@@ -68,7 +68,7 @@ module Middleman::CoreExtensions::Compass
           config.asset_cache_buster :none
           config.output_style = :nested
 
-          config.add_import_path(config.sass_dir)
+          # config.add_import_path(config.sass_dir)
         end
         
         # Required for relative paths
@@ -84,8 +84,9 @@ module Middleman::CoreExtensions::Compass
         end
         
         app.execute_after_compass_init!
+        app.execute_after_compass_config!
         
-        app.set :sass, ::Compass.configuration.to_sass_engine_options
+        # app.set :sass, ::Compass.configuration.to_sass_engine_options
       end
     end
     alias :included :registered
@@ -102,5 +103,15 @@ module Middleman::CoreExtensions::Compass
       @run_after_compass ||= []
       @run_after_compass.each { |block| block.call(::Compass.configuration) }
     end
+    
+    def after_compass_config(&block)
+      @run_after_compass_config ||= []
+      @run_after_compass_config << block
+    end
+    
+    def execute_after_compass_config!
+      @run_after_compass_config ||= []
+      @run_after_compass_config.each { |block| block.call() }
+    end
   end
 end

data/lib/middleman/core_extensions/sprockets.rb

@@ -33,10 +33,20 @@ module Middleman::CoreExtensions::Sprockets
         app.map "/#{app.js_dir}" do
           run js_env
         end
+      end
+        
+      app.after_compass_config do
+        css_env = Middleman::CoreExtensions::Sprockets::StylesheetEnvironment.new(app)
+        css_dir = File.join("vendor", "assets", "stylesheets")
+        gems_with_css = ::Middleman.rubygems_latest_specs.select do |spec|
+          ::Middleman.spec_has_file?(spec, css_dir)
+        end.each do |spec|
+          css_env.append_path File.join(spec.full_gem_path, css_dir)
+        end
         
-        # app.map "/#{app.css_dir}" do
-        #   run Middleman::CoreExtensions::Sprockets::StylesheetEnvironment.new(app)
-        # end
+        app.map "/#{app.css_dir}" do
+          run css_env
+        end
       end
     end
     alias :included :registered
@@ -82,21 +92,20 @@ module Middleman::CoreExtensions::Sprockets
     end
   end
   
-  # class StylesheetEnvironment < MiddlemanEnvironment
-  #   def initialize(app)
-  #     super
-  # 
-  #     # Disable js
-  #     unregister_processor "application/javascript", ::Sprockets::DirectiveProcessor
-  # 
-  #     # configure search paths
-  #     stylesheets_path = File.join(File.expand_path(app.views), app.css_dir)
-  #     append_path stylesheets_path
-  #   end
-  #
-  #   def css_exception_response(exception)
-  #     expire_index!
-  #     super(exception)
-  #   end
-  # end
+  class StylesheetEnvironment < MiddlemanEnvironment
+    def initialize(app)
+      super
+  
+      # Disable js
+      unregister_processor "application/javascript", ::Sprockets::DirectiveProcessor
+  
+      # configure search paths
+      append_path app.css_dir
+    end
+  
+    def css_exception_response(exception)
+      expire_index!
+      super(exception)
+    end
+  end
 end

data/lib/middleman/renderers/sass.rb

@@ -1,5 +1,6 @@
+require "sprockets"
+require "sprockets-sass"
 require "sass"
-require "sass/plugin"
 
 module Middleman::Renderers::Sass
   class << self
@@ -9,41 +10,50 @@ module Middleman::Renderers::Sass
     end
     alias :included :registered
   end
-  
-  class SassPlusCSSFilenameTemplate < ::Tilt::SassTemplate
-    def sass_options_with_scope(scope)
-      return sass_options if basename.nil?
-    
-      location_of_sass_file = if scope.build?
-        File.join(scope.root, scope.build_dir)
-      else
-        scope.views
-      end
-    
-      parts = basename.split('.')
-      parts.pop
-      css_filename = File.join(location_of_sass_file, scope.css_dir, parts.join("."))
-      sass_options.merge(scope.settings.sass).merge(:css_filename => css_filename)
-    end
 
-    def evaluate(scope, locals, &block)
-      @engine = ::Sass::Engine.new(data, sass_options_with_scope(scope.class))
-        
+  class SassPlusCSSFilenameTemplate < ::Sprockets::Sass::SassTemplate
+    self.default_mime_type = "text/css"
+    
+    # Add exception messaging
+    def evaluate(context, locals, &block)
       begin
         super
       rescue Sass::SyntaxError => e
         Sass::SyntaxError.exception_to_css(e, :full_exception => true)
       end
     end
+  
+  protected
+    def sass_options
+      location_of_sass_file = if @context.build?
+        File.expand_path(@context.build_dir, @context.root)
+      else
+        File.expand_path(@context.views, @context.root)
+      end
+      
+      parts = basename.split('.')
+      parts.pop
+      css_filename = File.join(location_of_sass_file, @context.css_dir, parts.join("."))
+      
+      super.merge(
+        :css_filename => css_filename
+      )
+    end
   end
+  ::Sprockets.register_engine ".sass", SassPlusCSSFilenameTemplate
   ::Tilt.register 'sass', SassPlusCSSFilenameTemplate
   ::Tilt.prefer(SassPlusCSSFilenameTemplate)
-
+  
   class ScssPlusCSSFilenameTemplate < SassPlusCSSFilenameTemplate
-    def sass_options_with_scope(scope)
-      super.merge(:syntax => :scss)
+    self.default_mime_type = "text/css"
+    
+    # Define the expected syntax for the template
+    def syntax
+      :scss
     end
   end
+  
+  ::Sprockets.register_engine ".scss", ScssPlusCSSFilenameTemplate
   ::Tilt.register 'scss', ScssPlusCSSFilenameTemplate
   ::Tilt.prefer(ScssPlusCSSFilenameTemplate)
 end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.13.1"
+  VERSION = "2.0.14.pre"
 end

data/middleman-x86-mingw32.gemspec

@@ -51,6 +51,7 @@ eos
   s.add_dependency("compass", ["~> 0.11.3"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("sprockets", ["~> 2.0.3"])
+  s.add_dependency("sprockets-sass", ["~> 0.3.0"])
   s.add_dependency("padrino-core", ["~> 0.10.5"])
   s.add_dependency("padrino-helpers", ["~> 0.10.5"])
   
@@ -68,5 +69,6 @@ eos
   s.add_development_dependency("cucumber", ["~> 1.0.2"])
   s.add_development_dependency("rake", ["~> 0.9.2"])
   s.add_development_dependency("rspec", ["~> 2.6.0"])
+  s.add_development_dependency("jquery-rails")
 end
 

data/middleman.gemspec

@@ -53,6 +53,7 @@ eos
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("execjs", ["~> 1.2.7"])
   s.add_dependency("sprockets", ["~> 2.0.3"])
+  s.add_dependency("sprockets-sass", ["~> 0.3.0"])
   s.add_dependency("padrino-core", ["~> 0.10.5"])
   s.add_dependency("padrino-helpers", ["~> 0.10.5"])
   
@@ -65,5 +66,6 @@ eos
   s.add_development_dependency("cucumber", ["~> 1.0.2"])
   s.add_development_dependency("rake", ["~> 0.9.2"])
   s.add_development_dependency("rspec", ["~> 2.6.0"])
+  s.add_development_dependency("jquery-rails")
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 89
-  prerelease: 
+  hash: 961915996
+  prerelease: 7
   segments: 
   - 2
   - 0
-  - 13
-  - 1
-  version: 2.0.13.1
+  - 14
+  - pre
+  version: 2.0.14.pre
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -16,10 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 -07:00
+date: 2011-10-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +32,11 @@ dependencies:
         - 3
         - 5
         version: 1.3.5
-  version_requirements: *id001
-  name: rack
-  prerelease: false
   type: :runtime
+  name: rack
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,11 +48,11 @@ dependencies:
         - 2
         - 11
         version: 1.2.11
-  version_requirements: *id002
-  name: thin
-  prerelease: false
   type: :runtime
+  name: thin
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,11 +64,11 @@ dependencies:
         - 14
         - 0
         version: 0.14.0
-  version_requirements: *id003
-  name: thor
-  prerelease: false
   type: :runtime
+  name: thor
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,11 +80,11 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  version_requirements: *id004
-  name: tilt
-  prerelease: false
   type: :runtime
+  name: tilt
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -95,11 +96,11 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  version_requirements: *id005
-  name: maruku
-  prerelease: false
   type: :runtime
+  name: maruku
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -111,11 +112,11 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  version_requirements: *id006
-  name: sinatra
-  prerelease: false
   type: :runtime
+  name: sinatra
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -127,11 +128,11 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
-  version_requirements: *id007
-  name: rack-test
-  prerelease: false
   type: :runtime
+  name: rack-test
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -143,11 +144,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id008
-  name: uglifier
-  prerelease: false
   type: :runtime
+  name: uglifier
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -159,11 +160,11 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  version_requirements: *id009
-  name: slim
-  prerelease: false
   type: :runtime
+  name: slim
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -175,11 +176,11 @@ dependencies:
         - 1
         - 0
         version: 3.1.0
-  version_requirements: *id010
-  name: haml
-  prerelease: false
   type: :runtime
+  name: haml
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -191,11 +192,11 @@ dependencies:
         - 1
         - 7
         version: 3.1.7
-  version_requirements: *id011
-  name: sass
-  prerelease: false
   type: :runtime
+  name: sass
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -207,11 +208,11 @@ dependencies:
         - 11
         - 3
         version: 0.11.3
-  version_requirements: *id012
-  name: compass
-  prerelease: false
   type: :runtime
+  name: compass
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -223,11 +224,11 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  version_requirements: *id013
-  name: coffee-script
-  prerelease: false
   type: :runtime
+  name: coffee-script
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -239,11 +240,11 @@ dependencies:
         - 2
         - 7
         version: 1.2.7
-  version_requirements: *id014
-  name: execjs
-  prerelease: false
   type: :runtime
+  name: execjs
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -255,12 +256,28 @@ dependencies:
         - 0
         - 3
         version: 2.0.3
-  version_requirements: *id015
+  type: :runtime
   name: sprockets
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
+  name: sprockets-sass
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -271,12 +288,12 @@ dependencies:
         - 10
         - 5
         version: 0.10.5
-  version_requirements: *id016
-  name: padrino-core
-  prerelease: false
   type: :runtime
+  name: padrino-core
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -287,12 +304,12 @@ dependencies:
         - 10
         - 5
         version: 0.10.5
-  version_requirements: *id017
-  name: padrino-helpers
-  prerelease: false
   type: :runtime
+  name: padrino-helpers
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -303,12 +320,12 @@ dependencies:
         - 6
         - 2
         version: 0.6.2
-  version_requirements: *id018
-  name: guard
-  prerelease: false
   type: :runtime
+  name: guard
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -319,12 +336,12 @@ dependencies:
         - 2
         - 0
         version: 0.2.0
-  version_requirements: *id019
-  name: middleman-livereload
-  prerelease: false
   type: :runtime
+  name: middleman-livereload
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -335,12 +352,12 @@ dependencies:
         - 1
         - 1
         version: 0.1.1
-  version_requirements: *id020
-  name: coffee-filter
-  prerelease: false
   type: :development
+  name: coffee-filter
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -351,12 +368,12 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  version_requirements: *id021
-  name: liquid
-  prerelease: false
   type: :development
+  name: liquid
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -367,12 +384,12 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  version_requirements: *id022
-  name: cucumber
-  prerelease: false
   type: :development
+  name: cucumber
+  version_requirements: *id023
 - !ruby/object:Gem::Dependency 
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -383,12 +400,12 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  version_requirements: *id023
-  name: rake
-  prerelease: false
   type: :development
+  name: rake
+  version_requirements: *id024
 - !ruby/object:Gem::Dependency 
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -399,10 +416,23 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  version_requirements: *id024
+  type: :development
   name: rspec
+  version_requirements: *id025
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  requirement: &id026 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  name: jquery-rails
+  version_requirements: *id026
 description: A static site generator based on Sinatra. Providing dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.
 email: 
 - me@tdreyno.com
@@ -496,9 +526,12 @@ files:
 - fixtures/relative-app/source/images/blank.gif
 - fixtures/relative-app/source/stylesheets/relative_assets.css.sass
 - fixtures/sprockets-app/config.rb
-- fixtures/sprockets-app/source/jquery_include.js
+- fixtures/sprockets-app/source/library/javascripts/jquery_include.js
 - fixtures/sprockets-app/source/library/javascripts/sprockets_base.js
 - fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js
+- fixtures/sprockets-app/source/library/stylesheets/sprockets_base1.css.scss
+- fixtures/sprockets-app/source/library/stylesheets/sprockets_base2.css.scss
+- fixtures/sprockets-app/source/library/stylesheets/sprockets_sub.css.scss
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/data/test2.json
@@ -567,6 +600,9 @@ files:
 - fixtures/test-app/source/stylesheets/relative_assets.css.sass
 - fixtures/test-app/source/stylesheets/site.css.sass
 - fixtures/test-app/source/stylesheets/site_scss.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_base1.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_base2.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_sub.css.scss
 - fixtures/test-app/source/stylesheets/static.css
 - fixtures/test-app/source/sub1/page-classes.html.haml
 - fixtures/test-app/source/sub1/sub2/page-classes.html.haml
@@ -745,12 +781,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -827,9 +865,12 @@ test_files:
 - fixtures/relative-app/source/images/blank.gif
 - fixtures/relative-app/source/stylesheets/relative_assets.css.sass
 - fixtures/sprockets-app/config.rb
-- fixtures/sprockets-app/source/jquery_include.js
+- fixtures/sprockets-app/source/library/javascripts/jquery_include.js
 - fixtures/sprockets-app/source/library/javascripts/sprockets_base.js
 - fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js
+- fixtures/sprockets-app/source/library/stylesheets/sprockets_base1.css.scss
+- fixtures/sprockets-app/source/library/stylesheets/sprockets_base2.css.scss
+- fixtures/sprockets-app/source/library/stylesheets/sprockets_sub.css.scss
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/data/test2.json
@@ -898,6 +939,9 @@ test_files:
 - fixtures/test-app/source/stylesheets/relative_assets.css.sass
 - fixtures/test-app/source/stylesheets/site.css.sass
 - fixtures/test-app/source/stylesheets/site_scss.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_base1.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_base2.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_sub.css.scss
 - fixtures/test-app/source/stylesheets/static.css
 - fixtures/test-app/source/sub1/page-classes.html.haml
 - fixtures/test-app/source/sub1/sub2/page-classes.html.haml