middleman-sprockets 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c368bc22bab155dbb04fa6a767a432d80a2e70bc
-  data.tar.gz: d02e8b1fc0c0964520f1378f01dd7ea5135c2753
+  metadata.gz: 2706ab113d91037dbef37ebada72f4d62a8cdc50
+  data.tar.gz: db48cea1c6e261cdbe473842e1982ffeba658598
 SHA512:
-  metadata.gz: 7d239a855d5ff1606ecf6b6090417f4e807eb1a99692f5f345147e9bdab300df6dd39c47ede15418f488d6278723b6a97226b418ed5a34589dbc16e7a356a596
-  data.tar.gz: b6c0e40d4378056862f11a9cccbbeabe4e29b442a0b1bfd7b4a28b542c77511f89f15b50d1e64688c887ad0a0b533e53f96e9370dc10d6f0ac742c2793e4061a
+  metadata.gz: dae92a7bca105c4fd757d307210f782240bd1f177b7cbae5e33e640d0c4a796d956b14ec96adcccec42fc4d26cbeb919bb6619391a5c46c9ac6641e098b77a93
+  data.tar.gz: 2261c1d32d5e6f4bb363bdb53dee89171644248785b165533e227dab2e653406e6fa2e7520d899d2ef2954697c37d5191f1fb983c8253e414107e1fe2f75e73b

data/.gitignore

@@ -6,3 +6,4 @@ tmp
 pkg
 build
 .ruby-version
+.cache

data/CHANGELOG.md

@@ -1,6 +1,20 @@
-master
+3.3.0
 ===
 
+* Prep work for Middleman v4.
+* Work around sstephenson/sprockets#533 by serving bower.json directly, skipping Sprockets.
+* Only attempt to patch up Sass if Sass is present.
+* :bower_dir is deprecated in favor of just adding your bower_components folder to the sprockets load path.
+* Convert to a new-style Middleman extension. #48
+* Use a file-based cache to persist compiled assets between sessions #47
+
+3.2.0
+===
+
+* Require Middleman 3.2 or later.
+* No longer require 'middleman-more'
+* Fix import_asset. #38
+
 3.1.3
 ===
 
@@ -37,11 +51,10 @@ master
 * When `:debug_assets` is on, do not add `?body=1` multiple times. #24
 * :js_assets_paths configuration is deprecated in favor of just calling sprockets.append_path. #22
 * Sprockets integration, especially with regard to helper methods, is significantly improved. #22
-* Images and fonts from gems added to the Sprockets load path will now be copied to the build output. #22 
+* Images and fonts from gems added to the Sprockets load path will now be copied to the build output. #22
 * Compatibility with newer Sprockets versions.
 
 3.0.10
 ===
 
 * No longer expire Sprockets index in development mode. #18
-

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "middleman-core", :github => "middleman/middleman"
+gem "middleman-core", :github => "middleman/middleman", :branch => "v3-stable"
 
 # Specify your gem's dependencies in middleman-sprockets.gemspec
 gemspec

data/features/bower.feature

@@ -9,4 +9,11 @@ Feature: Bower
     When I cd to "build"
     Then the following files should exist:
       | javascripts/get_jquery.js |
-    And the file "javascripts/get_jquery.js" should contain "window.jQuery ="
+    And the file "javascripts/get_jquery.js" should contain "window.jQuery ="
+
+  Scenario: Sprockets should not mess with bower.json
+    Given a successfully built app at "bower-json-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | javascripts/bower.json |
+    And the file "javascripts/bower.json" should contain '"name": "my-project",'

data/fixtures/bower-app/config.rb

@@ -1 +1,3 @@
-set :bower_dir, "components"
+ready do
+  sprockets.append_path "components"
+end

data/fixtures/bower-json-app/config.rb

@@ -0,0 +1 @@
+

data/fixtures/bower-json-app/source/javascripts/application.js.coffee

@@ -0,0 +1 @@
+# foo

data/fixtures/bower-json-app/source/javascripts/bower.json

@@ -0,0 +1,5 @@
+{
+  "name": "my-project",
+  "version": "1.0.0",
+  "main": "application.js"
+}

data/lib/middleman-sprockets.rb

@@ -2,5 +2,5 @@ require "middleman-core"
 
 Middleman::Extensions.register(:sprockets) do
   require "middleman-sprockets/extension"
-  Middleman::Sprockets
+  Middleman::SprocketsExtension
 end

data/lib/middleman-sprockets/asset_tag_helpers.rb

@@ -0,0 +1,59 @@
+module Middleman
+  module Sprockets
+    module AssetTagHelpers
+
+      # extend padrinos javascript_include_tag with debug functionality
+      # splits up script dependencies in individual files when
+      # configuration variable :debug_assets is set to true
+      def javascript_include_tag(*sources)
+        if debug_assets?
+          options = sources.extract_options!.symbolize_keys
+          sources.map do |source|
+            super(dependencies_paths('.js', source), options)
+          end.join("").gsub("body=1.js", "body=1")
+        else
+          super
+        end
+      end
+
+      # extend padrinos stylesheet_link_tag with debug functionality
+      # splits up stylesheets dependencies in individual files when
+      # configuration variable :debug_assets is set to true
+      def stylesheet_link_tag(*sources)
+        if debug_assets?
+          options = sources.extract_options!.symbolize_keys
+          sources.map do |source|
+            super(dependencies_paths('.css', source), options)
+          end.join("").gsub("body=1.css", "body=1")
+        else
+          super
+        end
+      end
+
+      private
+
+      # Should we "debug assets" by outputting each as an individual script tag instead of combining them?
+      def debug_assets?
+        !build? && (sprockets.options.debug_assets || (respond_to?(:debug_assets) && debug_assets))
+      end
+
+      # Find the paths for all the dependencies of a given source file.
+      def dependencies_paths(extension, source)
+        source_file_name = source.to_s
+
+        if source_file_name.start_with?('//', 'http')
+          # Don't touch external sources
+          source_file_name
+        else
+          source_file_name << extension unless source_file_name.end_with?(extension)
+
+          dependencies_paths = sprockets[source_file_name].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"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/middleman-sprockets/environment.rb

@@ -0,0 +1,201 @@
+module Middleman
+  module Sprockets
+    # Generic Middleman Sprockets env
+    class Environment < ::Sprockets::Environment
+      attr_accessor :options
+
+      # Setup
+      def initialize(app)
+        @imported_assets = []
+        @app = app
+        @options = {}
+
+        super app.source_dir
+
+        # By default, sprockets has no cache! Give it a file-based cache so that
+        # the cache is persisted between sessions
+        @cache = ::Sprockets::Cache::FileStore.new(File.join app.root, '.cache')
+
+        enhance_context_class!
+
+        # Remove compressors, we handle these with middleware
+        unregister_bundle_processor 'application/javascript', :js_compressor
+        unregister_bundle_processor 'text/css', :css_compressor
+
+        # configure search paths
+        append_path app.config[:js_dir]
+        append_path app.config[:css_dir]
+        append_path app.config[:images_dir]
+        append_path app.config[:fonts_dir]
+
+        if app.config.respond_to?(:bower_dir)
+          warn ":bower_dir is deprecated. Call sprockets.append_path from a 'ready' block instead."
+          append_path app.config[:bower_dir]
+        end
+
+        # add custom assets paths to the scope
+        app.config[:js_assets_paths].each do |p|
+          warn ":js_assets_paths is deprecated. Call sprockets.append_path from a 'ready' block instead."
+          append_path p
+        end if app.config.respond_to?(:js_assets_paths)
+
+        # Stylus support
+        if defined?(::Stylus)
+          require 'stylus/sprockets'
+          ::Stylus.setup(self, app.config[:styl])
+        end
+      end
+
+      # Add our own customizations to the Sprockets context class
+      def enhance_context_class!
+        app = @app
+
+        # Make the app context available to Sprockets
+        context_class.send(:define_method, :app) { app }
+
+        context_class.class_eval do
+          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={})
+            # Knock .fonts off the end, because Middleman < 3.1 doesn't handle fonts
+            # in asset_path
+            asset_path(path, :type => :font).sub(/\.fonts$/, '')
+          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)
+              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
+      end
+      private :enhance_context_class!
+
+      # Override Sprockets' default digest function to *not*
+      # change depending on the exact Sprockets version. It still takes
+      # into account "version" which is a user-suppliable version
+      # number that can be used to force assets to have a new
+      # hash.
+      def digest
+        @digest ||= Digest::SHA1.new.update(version.to_s)
+        @digest.dup
+      end
+
+      # Strip our custom 8-char hex/sha
+      def path_fingerprint(path)
+        path[/-([0-9a-f]{8})\.[^.]+$/, 1]
+      end
+
+      # 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)
+        raise exception if @app.build?
+        super
+      end
+
+      def call(env)
+        # Set the app current path based on the full URL so that helpers work
+        request_path = URI.decode(File.join(env['SCRIPT_NAME'], env['PATH_INFO']))
+        if request_path.respond_to? :force_encoding
+          request_path.force_encoding('UTF-8')
+        end
+        resource = @app.sitemap.find_resource_by_destination_path(request_path)
+
+        debug_assets = !@app.build? && (@options.debug_assets || (@app.respond_to?(:debug_assets) && @app.debug_assets))
+        if !resource && !debug_assets
+          response = ::Rack::Response.new
+          response.status = 404
+          response.write """<html><body><h1>File Not Found</h1><p>#{request_path}</p>
+        <p>If this is an an asset from a gem, add <tt>sprockets.import_asset '#{File.basename(request_path)}'</tt>
+        to your <tt>config.rb</tt>.</body>"""
+          return response.finish
+        end
+
+        if @app.respond_to?(:current_path=)
+          @app.current_path = request_path
+        end
+
+        # Fix https://github.com/sstephenson/sprockets/issues/533
+        if resource && File.basename(resource.path) == 'bower.json'
+          file = ::Rack::File.new nil
+          file.path = resource.source_file
+          response = file.serving({})
+          response[1]['Content-Type'] = resource.content_type
+          return response
+        end
+
+        super
+      end
+
+      # A list of Sprockets logical paths for assets that should be brought into the
+      # Middleman application and built.
+      attr_accessor :imported_assets
+
+      # Tell Middleman to build this asset, referenced as a logical path.
+      def import_asset(asset_logical_path)
+        imported_assets << asset_logical_path
+      end
+    end
+  end
+end

data/lib/middleman-sprockets/extension.rb

@@ -1,337 +1,90 @@
 require "sprockets"
 require "sprockets-sass"
-require "middleman-sprockets/sass_function_hack"
+require "middleman-sprockets/environment"
+require "middleman-sprockets/asset_tag_helpers"
 
 # Sprockets extension
-module Middleman::Sprockets
+module Middleman
+  class SprocketsExtension < Extension
+    option :debug_assets, false, 'Split up each required asset into its own script/style tag instead of combining them (development only)'
 
-  # Setup extension
-  class << self
+    def initialize(klass, options_hash={}, &block)
+      require "middleman-sprockets/sass_function_hack"
 
-    # Once registered
-    def registered(app)
-      # Add class methods to context
-      app.send :include, InstanceMethods
-
-      app.helpers JavascriptTagHelper
-      app.helpers StylesheetTagHelper
-
-      ::Tilt.register ::Sprockets::EjsTemplate, 'ejs'
-      ::Tilt.register ::Sprockets::EcoTemplate, 'eco'
-      ::Tilt.register ::Sprockets::JstProcessor, 'jst'
-
-      app.after_configuration do
-        template_extensions :jst => :js, :eco => :js, :ejs => :js 
-
-        sitemap.rebuild_resource_list!
-
-        # Add any gems with (vendor|app|.)/assets/javascripts to paths
-        # also add similar directories from project root (like in rails)
-        try_paths = [
-          %w{ assets },
-          %w{ app },
-          %w{ app assets },
-          %w{ vendor },
-          %w{ vendor assets },
-          %w{ lib },
-          %w{ lib assets }
-        ].inject([]) do |sum, v|
-          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|
-          try_paths.map {|p| File.join(root_path, p) }.
-            select {|p| File.directory?(p) }.
-            each {|path| sprockets.append_path(path) }
-        end
-
-        # Setup Sprockets Sass options
-        sass.each { |k, v| ::Sprockets::Sass.options[k] = v }
-
-        # 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
-  end
-
-  module InstanceMethods
-    # @return [Middleman::CoreExtensions::Sprockets::MiddlemanSprocketsEnvironment]
-    def sprockets
-      @sprockets ||= MiddlemanSprocketsEnvironment.new(self)
+      super
     end
-  end
-
-  # Generic Middleman Sprockets env
-  class MiddlemanSprocketsEnvironment < ::Sprockets::Environment
-    # Setup
-    def initialize(app)
-      @imported_assets = []
-      @app = app
-
-      super app.source_dir
 
-      # By default, sprockets has no cache! Give it an in-memory one using a Hash
-      @cache = {}
-
-      enhance_context_class!
-
-      # Remove compressors, we handle these with middleware
-      unregister_bundle_processor 'application/javascript', :js_compressor
-      unregister_bundle_processor 'text/css', :css_compressor
-
-      # configure search paths
-      append_path app.js_dir
-      append_path app.css_dir
-      append_path app.images_dir
-      append_path app.fonts_dir
-      append_path app.bower_dir if app.respond_to?(:bower_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
-      if defined?(::Stylus)
-        require 'stylus/sprockets'
-        ::Stylus.setup(self, app.styl)
+    helpers do
+      # The sprockets environment
+      # @return [Middleman::MiddlemanSprocketsEnvironment]
+      def sprockets
+        extensions[:sprockets].environment
       end
-    end
 
-    # Add our own customizations to the Sprockets context class
-    def enhance_context_class!
-      app = @app
-
-      # Make the app context available to Sprockets
-      context_class.send(:define_method, :app) { app }
-
-      context_class.class_eval do
-        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={})
-          # Knock .fonts off the end, because Middleman < 3.1 doesn't handle fonts
-          # in asset_path
-          asset_path(path, :type => :font).sub(/\.fonts$/, '')
-        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)
-            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
-    end
-    private :enhance_context_class!
-
-    # Override Sprockets' default digest function to *not*
-    # change depending on the exact Sprockets version. It still takes
-    # into account "version" which is a user-suppliable version
-    # number that can be used to force assets to have a new
-    # hash.
-    def digest
-      @digest ||= Digest::SHA1.new.update(version.to_s)
-      @digest.dup
+      include ::Middleman::Sprockets::AssetTagHelpers
     end
 
-    # Strip our custom 8-char hex/sha
-    def path_fingerprint(path)
-      path[/-([0-9a-f]{8})\.[^.]+$/, 1]
-    end
-
-    # 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
+    def environment
+      @sprockets ||= ::Middleman::Sprockets::Environment.new(app)
     end
 
-    def clear_paths
-      @app.sitemap.rebuild_resource_list!(:sprockets_paths)
-      super
+    def instance_available
+      if defined?(::Middleman::ConfigContext)
+        app.add_to_config_context :sprockets, &method(:environment)
+      end
     end
 
-    def css_exception_response(exception)
-      raise exception if @app.build?
-      super
-    end
+    def after_configuration
+      self.environment.options = options
 
-    def javascript_exception_response(exception)
-      raise exception if @app.build?
-      super
-    end
-
-    def call(env)
-      # Set the app current path based on the full URL so that helpers work
-      request_path = URI.decode(File.join(env['SCRIPT_NAME'], env['PATH_INFO']))
-      if request_path.respond_to? :force_encoding
-        request_path.force_encoding('UTF-8')
+      ::Tilt.register ::Sprockets::EjsTemplate, 'ejs'
+      ::Tilt.register ::Sprockets::EcoTemplate, 'eco'
+      ::Tilt.register ::Sprockets::JstProcessor, 'jst'
+      app.template_extensions :jst => :js, :eco => :js, :ejs => :js
+
+      app.sitemap.rebuild_resource_list!
+
+      # Add any gems with (vendor|app|.)/assets/javascripts to paths
+      # also add similar directories from project root (like in rails)
+      try_paths = [
+                   %w{ assets },
+                   %w{ app },
+                   %w{ app assets },
+                   %w{ vendor },
+                   %w{ vendor assets },
+                   %w{ lib },
+                   %w{ lib assets }
+                  ].inject([]) do |sum, v|
+        sum + [
+               File.join(v, 'javascripts'),
+               File.join(v, 'stylesheets'),
+               File.join(v, 'images'),
+               File.join(v, 'fonts')
+              ]
       end
-      resource = @app.sitemap.find_resource_by_destination_path(request_path)
 
-      debug_assets = @app.respond_to?(:debug_assets) && @app.debug_assets && !@app.build?
-      if !resource && !debug_assets
-        response = ::Rack::Response.new
-        response.status = 404
-        response.write """<html><body><h1>File Not Found</h1><p>#{request_path}</p>
-          <p>If this is an an asset from a gem, add <tt>sprockets.import_asset '#{File.basename(request_path)}'</tt>
-          to your <tt>config.rb</tt>.</body>"""
-        return response.finish
+      ([app.root] + ::Middleman.rubygems_latest_specs.map(&:full_gem_path)).each do |root_path|
+        try_paths.map {|p| File.join(root_path, p) }.
+          select {|p| File.directory?(p) }.
+          each {|path| self.environment.append_path(path) }
       end
 
-      @app.current_path = request_path
-
-      super
-    end
-
-    # A list of Sprockets logical paths for assets that should be brought into the
-    # Middleman application and built.
-    attr_accessor :imported_assets
-
-    # Tell Middleman to build this asset, referenced as a logical path.
-    def import_asset(asset_logical_path)
-      imported_assets << asset_logical_path
-    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
-    def javascript_include_tag(*sources)
-      if respond_to?(:debug_assets) && debug_assets && !build?
-        options = sources.extract_options!.symbolize_keys
-
-        # loop through all sources and the dependencies and
-        # output each as script tag in the correct order
-        sources.map do |source|
-          source_file_name = source.to_s
-
-          dependencies_paths = if source_file_name.start_with?('//', 'http')
-            # Don't touch external sources
-            source_file_name
-          else
-            source_file_name << ".js" unless source_file_name.end_with?(".js")
-
-            sprockets[source_file_name].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"
-            end
-          end
-
-          super(dependencies_paths, options)
-        end.join("").gsub("body=1.js", "body=1")
-      else
-        super
+      # Setup Sprockets Sass options
+      if app.config.respond_to?(:sass)
+        app.config[:sass].each { |k, v| ::Sprockets::Sass.options[k] = v }
       end
-    end
-  end
-
-  module StylesheetTagHelper
-
-    # extend padrinos stylesheet_link_tag with debug functionality
-    # splits up stylesheets dependencies in individual files when
-    # configuration variable :debug_assets is set to true
-    def stylesheet_link_tag(*sources)
-      if respond_to?(:debug_assets) && debug_assets && !build?
-        options = sources.extract_options!.symbolize_keys
-        # loop through all sources and the dependencies and
-        # output each as script tag in the correct order
-        
-        sources.map do |source|
-          source_file_name = source.to_s
 
-          dependencies_paths = if source_file_name.start_with?('//', 'http')
-            # Don't touch external sources
-            source_file_name
-          else
-            source_file_name << ".css" unless source_file_name.end_with?(".css")
+      # Intercept requests to /javascripts and /stylesheets and pass to sprockets
+      our_sprockets = self.environment
 
-            dependencies_paths = sprockets[source_file_name].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"
-            end
-          end
-
-          super(dependencies_paths, options)
-        end.join("").gsub("body=1.css", "body=1")
-      else
-        super
+      [app.config[:js_dir], app.config[:css_dir], app.config[:images_dir], app.config[:fonts_dir]].each do |dir|
+        app.map("/#{dir}") { run our_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)
-      sprockets = @app.sprockets
+      sprockets = self.environment
 
       imported_assets = []
       sprockets.imported_assets.each do |asset_logical_path|
@@ -349,15 +102,15 @@ module Middleman::Sprockets
         output_dir = nil
         export_all = false
         if load_path.end_with?('/images')
-          output_dir = @app.images_dir
+          output_dir = @app.config[:images_dir]
           export_all = true
         elsif load_path.end_with?('/fonts')
-          output_dir = @app.fonts_dir
+          output_dir = @app.config[:fonts_dir]
           export_all = true
         elsif load_path.end_with?('/stylesheets')
-          output_dir = @app.css_dir
+          output_dir = @app.config[:css_dir]
         elsif load_path.end_with?('/javascripts')
-          output_dir = @app.js_dir
+          output_dir = @app.config[:js_dir]
         end
 
         if output_dir

data/lib/middleman-sprockets/sass_function_hack.rb

@@ -4,22 +4,24 @@
 #
 # See https://github.com/middleman/middleman/issues/864 for more info.
 #
-module Sass::Script::Functions
-  def image_url(source, options = {}, cache_buster = nil)
-    # Work with the Compass #image_url API
-    if options.respond_to? :value
-      case options.value
-      when true
-        return ::Sass::Script::String.new sprockets_context.image_path(source.value).to_s, :string
-      else
-        options = {}
+if defined?(Sass)
+  module Sass::Script::Functions
+    def image_url(source, options = {}, cache_buster = nil)
+      # Work with the Compass #image_url API
+      if options.respond_to? :value
+        case options.value
+        when true
+          return ::Sass::Script::String.new sprockets_context.image_path(source.value).to_s, :string
+        else
+          options = {}
+        end
       end
+      ::Sass::Script::String.new "url(\"#{sprockets_context.image_path(source.value, map_options(options)).to_s}\")"
     end
-    ::Sass::Script::String.new "url(\"#{sprockets_context.image_path(source.value, map_options(options)).to_s}\")"
-  end
 
-  # Also override generated_image_url to use Sprockets a la https://github.com/Compass/compass-rails/blob/98e4b115c8bb6395a1c3351926d574321396778b/lib/compass-rails/patches/3_1.rb
-  def generated_image_url(path, only_path = nil)
-    asset_url(path, Sass::Script::String.new("image"))
+    # Also override generated_image_url to use Sprockets a la https://github.com/Compass/compass-rails/blob/98e4b115c8bb6395a1c3351926d574321396778b/lib/compass-rails/patches/3_1.rb
+    def generated_image_url(path, only_path = nil)
+      asset_url(path, Sass::Script::String.new("image"))
+    end
   end
 end

data/lib/middleman-sprockets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sprockets
-    VERSION = "3.2.0"
+    VERSION = "3.3.0"
   end
-end
+end

data/middleman-sprockets.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name = "middleman-sprockets"
   s.version = Middleman::Sprockets::VERSION
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Thomas Reynolds"]
-  s.email = ["me@tdreyno.com"]
+  s.authors = ["Thomas Reynolds", "Ben Hollis"]
+  s.email = ["me@tdreyno.com", "ben@benhollis.net"]
   s.homepage = "https://github.com/middleman/middleman-sprockets"
   s.summary = %q{Sprockets support for Middleman}
   s.description = %q{Sprockets support for Middleman}
@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files -z`.split("\0")
   s.test_files = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_paths = ["lib"]
-  s.add_dependency("middleman-core", ["~> 3.2"])
+  s.add_dependency("middleman-core", [">= 3.2"])
   s.add_dependency("sprockets", ["~> 2.1"])
   s.add_dependency("sprockets-sass", ["~> 1.0.0"])
   s.add_dependency("sprockets-helpers", ["~> 1.0.0"])
-end
+end

metadata

@@ -1,80 +1,82 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sprockets
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Thomas Reynolds
+- Ben Hollis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sprockets-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: Sprockets support for Middleman
 email:
 - me@tdreyno.com
+- ben@benhollis.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -133,6 +135,9 @@ files:
 - fixtures/bower-app/components/jquery/package.json
 - fixtures/bower-app/config.rb
 - fixtures/bower-app/source/javascripts/get_jquery.js
+- fixtures/bower-json-app/config.rb
+- fixtures/bower-json-app/source/javascripts/application.js.coffee
+- fixtures/bower-json-app/source/javascripts/bower.json
 - fixtures/glob-app/config.rb
 - fixtures/glob-app/source/stylesheets/main.css.scss
 - fixtures/glob-app/source/stylesheets/module1/_i-am-mod.scss
@@ -193,10 +198,11 @@ files:
 - 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/asset_tag_helpers.rb
+- lib/middleman-sprockets/environment.rb
 - lib/middleman-sprockets/extension.rb
 - lib/middleman-sprockets/sass_function_hack.rb
 - lib/middleman-sprockets/version.rb
-- lib/middleman_extension.rb
 - middleman-sprockets.gemspec
 homepage: https://github.com/middleman/middleman-sprockets
 licenses:
@@ -208,17 +214,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sprockets support for Middleman
@@ -275,6 +281,9 @@ test_files:
 - fixtures/bower-app/components/jquery/package.json
 - fixtures/bower-app/config.rb
 - fixtures/bower-app/source/javascripts/get_jquery.js
+- fixtures/bower-json-app/config.rb
+- fixtures/bower-json-app/source/javascripts/application.js.coffee
+- fixtures/bower-json-app/source/javascripts/bower.json
 - fixtures/glob-app/config.rb
 - fixtures/glob-app/source/stylesheets/main.css.scss
 - fixtures/glob-app/source/stylesheets/module1/_i-am-mod.scss

data/lib/middleman_extension.rb

@@ -1 +0,0 @@
-require "middleman-sprockets"