middleman-sprockets 3.0.1 → 3.0.2

data/features/asset_hash.feature

@@ -7,8 +7,8 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | images/100px-1242c368.png |
       | images/100px-5fd6fb90.jpg |
       | images/100px-5fd6fb90.gif |
-      | javascripts/application-df677242.js |
-      | stylesheets/site-ed8c2d12.css |
+      | javascripts/application-1d8d5276.js |
+      | stylesheets/site-50eaa978.css |
       | index.html |
       | subdir/index.html |
       | other/index.html |
@@ -19,50 +19,50 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | javascripts/application.js |
       | stylesheets/site.css |
       
-    And the file "javascripts/application-df677242.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'"
-    And the file "stylesheets/site-ed8c2d12.css" should contain "background-image: url('../images/100px-5fd6fb90.jpg')"
-    And the file "index.html" should contain 'href="stylesheets/site-ed8c2d12.css"'
-    And the file "index.html" should contain 'src="javascripts/application-df677242.js"'
+    And the file "javascripts/application-1d8d5276.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 "index.html" should contain 'src="javascripts/application-1d8d5276.js"'
     And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"'
-    And the file "subdir/index.html" should contain 'href="../stylesheets/site-ed8c2d12.css"'
-    And the file "subdir/index.html" should contain 'src="../javascripts/application-df677242.js"'
+    And the file "subdir/index.html" should contain 'href="../stylesheets/site-50eaa978.css"'
+    And the file "subdir/index.html" should contain 'src="../javascripts/application-1d8d5276.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-ed8c2d12.css"'
-    And the file "other/index.html" should contain 'src="../javascripts/application-df677242.js"'
+    And the file "other/index.html" should contain 'href="../stylesheets/site-50eaa978.css"'
+    And the file "other/index.html" should contain 'src="../javascripts/application-1d8d5276.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-ed8c2d12.css"'
-    And I should see 'src="javascripts/application-df677242.js"'
+    Then I should see 'href="stylesheets/site-50eaa978.css"'
+    And I should see 'src="javascripts/application-1d8d5276.js"'
     And I should see 'src="images/100px-5fd6fb90.jpg"'
     When I go to "/subdir/"
-    Then I should see 'href="../stylesheets/site-ed8c2d12.css"'
-    And I should see 'src="../javascripts/application-df677242.js"'
+    Then I should see 'href="../stylesheets/site-50eaa978.css"'
+    And I should see 'src="../javascripts/application-1d8d5276.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="../stylesheets/site-ed8c2d12.css"'
-    And I should see 'src="../javascripts/application-df677242.js"'
+    Then I should see 'href="../stylesheets/site-50eaa978.css"'
+    And I should see 'src="../javascripts/application-1d8d5276.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
-    When I go to "/javascripts/application-df677242.js"
+    When I go to "/javascripts/application-1d8d5276.js"
     Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
-    When I go to "/stylesheets/site-ed8c2d12.css"
+    When I go to "/stylesheets/site-50eaa978.css"
     Then I should see "background-image: url('../images/100px-5fd6fb90.jpg')"
 
   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-e5a31a3e.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-171eb3c0.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-e5a31a3e.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-171eb3c0.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-e5a31a3e.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-171eb3c0.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-e5a31a3e.css"
+    # When I go to "/stylesheets/site-171eb3c0.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
@@ -73,14 +73,14 @@ Feature: Assets get a file hash appended to their and references to them are upd
         font-size: 14px
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-8b948098.css'
+    Then I should see 'href="../stylesheets/uses_partials-423a00f7.css'
     And the file "source/stylesheets/_partial.sass" has the contents
       """
       body
         font-size: 18px !important
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-1f9f0ed2.css'
+    Then I should see 'href="../stylesheets/uses_partials-e8c3d4eb.css'
 
   Scenario: The asset hash should change when a Javascript partial changes
     Given the Server is running at "asset-hash-app"
@@ -89,14 +89,14 @@ Feature: Assets get a file hash appended to their and references to them are upd
       function sprockets_sub_function() { }
       """
     When I go to "/partials/"
-    Then I should see 'src="../javascripts/sprockets_base-0252a861.js'
-    When I go to "/javascripts/sprockets_base-0252a861.js"
+    Then I should see 'src="../javascripts/sprockets_base-095c3f3f.js'
+    When I go to "/javascripts/sprockets_base-095c3f3f.js"
     Then I should see "sprockets_sub_function"
     And the file "source/javascripts/sprockets_sub.js" has the contents
       """
       function sprockets_sub2_function() { }
       """
     When I go to "/partials/"
-    Then I should see 'src="../javascripts/sprockets_base-5121d891.js'
-    When I go to "/javascripts/sprockets_base-5121d891.js"
+    Then I should see 'src="../javascripts/sprockets_base-095c3f3f.js'
+    When I go to "/javascripts/sprockets_base-095c3f3f.js"
     Then I should see "sprockets_sub2_function"

data/features/sprockets.feature

@@ -4,6 +4,11 @@ Feature: Sprockets
     Given the Server is running at "sprockets-app2"
     When I go to "/javascripts/sprockets_base.js"
     Then I should see "sprockets_sub_function"
+
+  Scenario: asset_path helper
+    Given the Server is running at "sprockets-app2"
+    When I go to "/javascripts/asset_path.js"
+    Then I should see "templates.js"
     
   Scenario: Sprockets JS require with custom :js_dir
     Given the Server is running at "sprockets-app"
@@ -20,6 +25,22 @@ Feature: Sprockets
     When I go to "/javascripts/multiple_engines.js"
     Then I should see "Hello One"
     
+  Scenario: Sprockets JS should only contain body when requested
+    Given the Server is running at "sprockets-app2"
+    When I go to "/javascripts/sprockets_base.js?body=1"
+    Then I should see "base"
+    And I should not see "sprockets_sub_function"
+    
+  Scenario: Script tags should be provided individually while debugging assets
+    Given the Server is running at "sprockets-app-debug-assets"
+    When I go to "/index.html"
+    Then I should see 
+      """
+      <script src="/javascripts/dependency2.js?body=1" type="text/javascript"></script>
+      <script src="/javascripts/dependency1.js?body=1" type="text/javascript"></script>
+      <script src="/javascripts/main.js?body=1" type="text/javascript"></script>
+      """
+    
   Scenario: Multiple engine files should build correctly
     Given a successfully built app at "sprockets-app2"
     When I cd to "build"

data/features/sprockets_gems.feature

@@ -12,4 +12,9 @@ Feature: Sprockets Gems
   Scenario: Sprockets can pull js from vendored assets
     Given the Server is running at "sprockets-app"
     When I go to "/library/js/vendored_include.js"
+    Then I should see "var vendored_js_included = true;"
+  
+  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;"

data/features/step_definitions/server_steps.rb

@@ -0,0 +1,3 @@
+Then /^I should see$/ do |contents|
+  @browser.last_response.body.should include(contents)
+end

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

@@ -0,0 +1 @@
+set :js_assets_paths, ["#{root}/derp/javascripts/"]

data/fixtures/asset-paths-app/derp/javascripts/vendored_js.js

@@ -0,0 +1 @@
+var vendored_js_included = true;

data/fixtures/asset-paths-app/source/javascripts/vendored_include.js

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

data/fixtures/sprockets-app-debug-assets/config.rb

@@ -0,0 +1 @@
+set :debug_assets, true

data/fixtures/sprockets-app-debug-assets/source/index.html.erb

@@ -0,0 +1 @@
+<%= javascript_include_tag "main" %>

data/fixtures/sprockets-app-debug-assets/source/javascripts/dependency1.js

@@ -0,0 +1,3 @@
+//= require dependency2
+
+function dependency1() {}

data/fixtures/sprockets-app-debug-assets/source/javascripts/dependency2.js

@@ -0,0 +1 @@
+function dependency2() {}

data/fixtures/sprockets-app-debug-assets/source/javascripts/main.js

@@ -0,0 +1,3 @@
+//= require dependency1
+
+function main() {}

data/fixtures/sprockets-app2/source/javascripts/asset_path.js.erb

@@ -0,0 +1,3 @@
+//= require_self
+
+templatesURL = "<%= asset_path(:js, :templates) %>";

data/lib/middleman-sprockets/extension.rb

@@ -11,7 +11,6 @@ module Middleman::Sprockets
       # Location of javascripts external to source directory.
       # @return [Array]
       #   set :js_assets_paths, ["#{root}/assets/javascripts/", "/path/2/external/js/repository/"]
-      app.set :js_assets_paths, []
     
       # Add class methods to context
       app.send :include, InstanceMethods
@@ -19,8 +18,12 @@ module Middleman::Sprockets
       require "middleman-sprockets/sass"
       app.register Middleman::Sprockets::Sass
 
+      app.after_configuration do
+        helpers JavascriptTagHelper
+      end
+
       # Once Middleman is setup
-      app.ready do
+      app.after_configuration do
         ::Tilt.register ::Sprockets::EjsTemplate, 'ejs'
         ::Tilt.register ::Sprockets::EcoTemplate, 'eco'
         
@@ -93,9 +96,10 @@ module Middleman::Sprockets
       append_path app.css_dir
 
       # add custom assets paths to the scope
+
       app.js_assets_paths.each do |p|
         append_path p
-      end
+      end if app.respond_to?(:js_assets_paths)
     end
 
     # Override Sprockets' default digest function to *not*
@@ -123,4 +127,32 @@ module Middleman::Sprockets
     # Clear cache on error
     alias :css_exception_response :javascript_exception_response
   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)
+      options = sources.extract_options!.symbolize_keys
+
+      if respond_to?(:debug_assets) && debug_assets
+
+        # loop through all sources and the dependencies and
+        # output each as script tag in the correct order
+        sources.map do |source|
+          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"
+          end
+
+          super(dependencies_paths)
+        end.join("")
+
+      else
+        super
+      end
+    end
+  end
 end

data/lib/middleman-sprockets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sprockets
-    VERSION = "3.0.1"
+    VERSION = "3.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sprockets
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-more
@@ -77,6 +77,7 @@ files:
 - features/sass_partials.feature
 - features/sprockets.feature
 - features/sprockets_gems.feature
+- features/step_definitions/server_steps.rb
 - features/support/env.rb
 - fixtures/asset-hash-app/config.rb
 - fixtures/asset-hash-app/source/images/100px.gif
@@ -102,6 +103,9 @@ files:
 - fixtures/asset-hash-host-app/source/other.html.erb
 - fixtures/asset-hash-host-app/source/stylesheets/site.css.scss
 - fixtures/asset-hash-host-app/source/subdir/index.html.erb
+- fixtures/asset-paths-app/config.rb
+- fixtures/asset-paths-app/derp/javascripts/vendored_js.js
+- fixtures/asset-paths-app/source/javascripts/vendored_include.js
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/content.html.erb
 - fixtures/preview-app/source/layout.erb
@@ -110,6 +114,11 @@ files:
 - fixtures/preview-app/source/stylesheets/main.css.sass
 - fixtures/preview-app/source/stylesheets/main2.css.sass
 - fixtures/preview-app/source/stylesheets/plain.css.sass
+- fixtures/sprockets-app-debug-assets/config.rb
+- fixtures/sprockets-app-debug-assets/source/index.html.erb
+- 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
@@ -130,6 +139,7 @@ files:
 - fixtures/sprockets-app2/data/test2.json
 - fixtures/sprockets-app2/source/javascripts/_templates/test.jst.ejs
 - fixtures/sprockets-app2/source/javascripts/_templates/test2.jst.eco
+- fixtures/sprockets-app2/source/javascripts/asset_path.js.erb
 - fixtures/sprockets-app2/source/javascripts/multiple_engines.js.coffee.erb
 - fixtures/sprockets-app2/source/javascripts/sprockets_base.js
 - fixtures/sprockets-app2/source/javascripts/sprockets_sub.js
@@ -157,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -836714385759751023
+      hash: 905335292850793182
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -166,10 +176,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -836714385759751023
+      hash: 905335292850793182
 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
@@ -179,6 +189,7 @@ test_files:
 - features/sass_partials.feature
 - features/sprockets.feature
 - features/sprockets_gems.feature
+- features/step_definitions/server_steps.rb
 - features/support/env.rb
 - fixtures/asset-hash-app/config.rb
 - fixtures/asset-hash-app/source/images/100px.gif
@@ -204,6 +215,9 @@ test_files:
 - fixtures/asset-hash-host-app/source/other.html.erb
 - fixtures/asset-hash-host-app/source/stylesheets/site.css.scss
 - fixtures/asset-hash-host-app/source/subdir/index.html.erb
+- fixtures/asset-paths-app/config.rb
+- fixtures/asset-paths-app/derp/javascripts/vendored_js.js
+- fixtures/asset-paths-app/source/javascripts/vendored_include.js
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/content.html.erb
 - fixtures/preview-app/source/layout.erb
@@ -212,6 +226,11 @@ test_files:
 - fixtures/preview-app/source/stylesheets/main.css.sass
 - fixtures/preview-app/source/stylesheets/main2.css.sass
 - fixtures/preview-app/source/stylesheets/plain.css.sass
+- fixtures/sprockets-app-debug-assets/config.rb
+- fixtures/sprockets-app-debug-assets/source/index.html.erb
+- 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
@@ -232,6 +251,7 @@ test_files:
 - fixtures/sprockets-app2/data/test2.json
 - fixtures/sprockets-app2/source/javascripts/_templates/test.jst.ejs
 - fixtures/sprockets-app2/source/javascripts/_templates/test2.jst.eco
+- fixtures/sprockets-app2/source/javascripts/asset_path.js.erb
 - fixtures/sprockets-app2/source/javascripts/multiple_engines.js.coffee.erb
 - fixtures/sprockets-app2/source/javascripts/sprockets_base.js
 - fixtures/sprockets-app2/source/javascripts/sprockets_sub.js